Fix annotation regressions

diff --git a/classical.js b/classical.js
index a7d0568..c6bdf4a 100644 (file)
--- a/classical.js
+++ b/classical.js
@@ -424,7 +424,7 @@ function parseTehta(callback, options, previous) {
                 } else if (previous && previous.canAddAbove("a")) {
                     return callback([previous.addAbove("a", {from: "a"})])(character);
                 } else {
-                    return callback([previous, makeColumn("short-carrier", {from: "a"}).addAbove("", {from: ""})])(character);
+                    return callback([previous, makeColumn("short-carrier", {from: "a"}).addAbove("a", {from: ""})])(character);
                 }
             };
         } else if (character === "e" || character === "ë") {
@@ -495,7 +495,7 @@ function parseTehta(callback, options, previous) {
         } else if (character === "é") {
             return callback([previous, makeColumn("long-carrier", {from: "é"}).addAbove(swapDotSlash("e", options), {from: ""})]);
         } else if (character === "í") {
-            return callback([previous, makeColumn("long-carrier", {from: "í"}).addAbove(swapDotSlash("i", options)), {from: ""}]);
+            return callback([previous, makeColumn("long-carrier", {from: "í"}).addAbove(swapDotSlash("i", options), {from: ""})]);
         } else if (character === "ó") {
             if (previous && previous.canAddAbove("ó")) {
                 return callback([previous.addAbove(reverseCurls("ó", options), {from: "ó"})]);

diff --git a/general-use.js b/general-use.js
index c18a337..4e0d961 100644 (file)
--- a/general-use.js
+++ b/general-use.js
@@ -196,13 +196,11 @@ function parseWord(callback, options) {
             } else if (word === "of'the") {
                 return callback([
                     makeOf(makeColumn),
-                    makeThe(makeColumn)
-                ]);
+                ])("t")("h")("e");
             } else if (word === "of'the'") {
                 return callback([
-                    makeOfPrime(makeColumn),
-                    makeThePrime(makeColumn)
-                ]);
+                    makeOfPrime(makeColumn)
+                ])("t")("h")("e")("'");
             } else if (word === "and") {
                 return callback([
                     makeAnd(makeColumn)