Skip to content

Commit

Permalink
Fix bug with text/plain transcription
Browse files Browse the repository at this point in the history
  • Loading branch information
kriskowal committed Apr 12, 2015
1 parent 0075854 commit d6a97f1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tengwar-annatar.js
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,6 @@ var positions = exports.positions = {
exports.transcribe = transcribe;
function transcribe(sections, options) {
options = options || {};
var plain = options.plain || false;
var block = options.block || false;
var beginParagraph = block ? "<p>" : "";
var delimitParagraph = "<br>";
Expand All @@ -349,6 +348,7 @@ function transcribe(sections, options) {

exports.transcribeColumn = transcribeColumn;
function transcribeColumn(column, options) {
var plain = options.plain || false;
var tengwa = column.tengwa || "anna";
var tehtar = [];
if (column.above) tehtar.push(column.above);
Expand Down
8 changes: 4 additions & 4 deletions tengwar-parmaite.js
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ var positions = exports.positions = {
exports.transcribe = transcribe;
function transcribe(sections, options) {
options = options || {};
var plain = options.plain || false;
var block = options.block || false;
var beginParagraph = block ? "<p>" : "";
var delimitParagraph = "<br>";
Expand All @@ -305,7 +304,7 @@ function transcribe(sections, options) {
return beginParagraph + paragraph.map(function (line) {
return line.map(function (word) {
return word.map(function (column) {
return transcribeColumn(column);
return transcribeColumn(column, options);
}).join("");
}).join(" ");;
}).join(delimitParagraph + "\n") + endParagraph;
Expand All @@ -314,7 +313,8 @@ function transcribe(sections, options) {
}

exports.transcribeColumn = transcribeColumn;
function transcribeColumn(column) {
function transcribeColumn(column, options) {
var plain = options.plain || false;
var tengwa = column.tengwa || "anna";
var tehtar = [];
if (column.above) tehtar.push(column.above);
Expand All @@ -325,7 +325,7 @@ function transcribeColumn(column) {
var html = tengwar[tengwa] + tehtar.map(function (tehta) {
return tehtaForTengwa(tengwa, tehta);
}).join("");
if (column.errors) { // TODO && !plain
if (column.errors && !plain) {
html = "<abbr class=\"error\" title=\"" + column.errors.join("\n").replace(/"/g, "&quot;") + "\">" + html + "</abbr>";
}
return html;
Expand Down

0 comments on commit d6a97f1

Please sign in to comment.