Factor column transcriber for each font

kriskowal · Apr 11, 2015 · 6cf7abe · 6cf7abe
1 parent 7e13526
commit 6cf7abe
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 28 deletions.
diff --git a/tengwar-annatar.js b/tengwar-annatar.js
@@ -339,27 +339,32 @@ function transcribe(sections, options) {
             return beginParagraph + paragraph.map(function (line) {
                 return line.map(function (word) {
                     return word.map(function (column) {
-                        var tengwa = column.tengwa || "anna";
-                        var tehtar = [];
-                        if (column.above) tehtar.push(column.above);
-                        if (column.below) tehtar.push(column.below);
-                        if (column.tildeBelow) tehtar.push("tilde-below");
-                        if (column.tildeAbove) tehtar.push("tilde-above");
-                        if (column.following) tehtar.push(column.following);
-                        var html = tengwar[tengwa] + tehtar.map(function (tehta) {
-                            return tehtaForTengwa(tengwa, tehta);
-                        }).join("");
-                        if (column.errors && !plain) {
-                            html = "<abbr class=\"error\" title=\"" + column.errors.join("\n").replace(/"/g, "&quot;") + "\">" + html + "</abbr>";
-                        }
-                        return html;
+                        return transcribeColumn(column, options);
                     }).join("");
                 }).join(" ");;
             }).join(delimitParagraph + "\n") + endParagraph;
         }).join("\n\n");
     }).join("\n\n\n");
 }
 
+exports.transcribeColumn = transcribeColumn;
+function transcribeColumn(column, options) {
+    var tengwa = column.tengwa || "anna";
+    var tehtar = [];
+    if (column.above) tehtar.push(column.above);
+    if (column.below) tehtar.push(column.below);
+    if (column.tildeBelow) tehtar.push("tilde-below");
+    if (column.tildeAbove) tehtar.push("tilde-above");
+    if (column.following) tehtar.push(column.following);
+    var html = tengwar[tengwa] + tehtar.map(function (tehta) {
+        return tehtaForTengwa(tengwa, tehta);
+    }).join("");
+    if (column.errors && !plain) {
+        html = "<abbr class=\"error\" title=\"" + column.errors.join("\n").replace(/"/g, "&quot;") + "\">" + html + "</abbr>";
+    }
+    return html;
+}
+
 exports.tehtaForTengwa = tehtaForTengwa;
 function tehtaForTengwa(tengwa, tehta) {
     var tehtaKey = tehtaKeyForTengwa(tengwa, tehta);

diff --git a/tengwar-parmaite.js b/tengwar-parmaite.js
@@ -305,27 +305,32 @@ function transcribe(sections, options) {
             return beginParagraph + paragraph.map(function (line) {
                 return line.map(function (word) {
                     return word.map(function (column) {
-                        var tengwa = column.tengwa || "anna";
-                        var tehtar = [];
-                        if (column.above) tehtar.push(column.above);
-                        if (column.below) tehtar.push(column.below);
-                        if (column.tildeBelow) tehtar.push("tilde-below");
-                        if (column.tildeAbove) tehtar.push("tilde-above");
-                        if (column.following) tehtar.push(column.following);
-                        var html = tengwar[tengwa] + tehtar.map(function (tehta) {
-                            return tehtaForTengwa(tengwa, tehta);
-                        }).join("");
-                        if (column.errors && !plain) {
-                            html = "<abbr class=\"error\" title=\"" + column.errors.join("\n").replace(/"/g, "&quot;") + "\">" + html + "</abbr>";
-                        }
-                        return html;
+                        return transcribeColumn(column);
                     }).join("");
                 }).join(" ");;
             }).join(delimitParagraph + "\n") + endParagraph;
         }).join("\n\n");
     }).join("\n\n\n");
 }
 
+exports.transcribeColumn = transcribeColumn;
+function transcribeColumn(column) {
+    var tengwa = column.tengwa || "anna";
+    var tehtar = [];
+    if (column.above) tehtar.push(column.above);
+    if (column.below) tehtar.push(column.below);
+    if (column.tildeBelow) tehtar.push("tilde-below");
+    if (column.tildeAbove) tehtar.push("tilde-above");
+    if (column.following) tehtar.push(column.following);
+    var html = tengwar[tengwa] + tehtar.map(function (tehta) {
+        return tehtaForTengwa(tengwa, tehta);
+    }).join("");
+    if (column.errors) { // TODO && !plain
+        html = "<abbr class=\"error\" title=\"" + column.errors.join("\n").replace(/"/g, "&quot;") + "\">" + html + "</abbr>";
+    }
+    return html;
+}
+
 exports.tehtaForTengwa = tehtaForTengwa;
 function tehtaForTengwa(tengwa, tehta) {
     var tehtaKey = tehtaKeyForTengwa(tengwa, tehta);