Refactor text-wrapper.js, now that we have a signer. Closes #4.

renderer/text-wrapper.js

@@ -2,48 +2,42 @@ var smartquotes = require("smartquotes").string;
 
 module.exports = function(theme) {
 
-  // Do some typechecking
-  var left = ifNumeric(theme.captionLeft, 0),
-      right = ifNumeric(theme.captionRight, theme.width),
-      bottom = ifNumeric(theme.captionBottom, null),
-      top = ifNumeric(theme.captionTop, null),
-      citationLeft = ifNumeric(theme.citationLeft, 0),
-      citationRight = ifNumeric(theme.citationRight, theme.width),
-      citationBottom = ifNumeric(theme.citationBottom, null),
-      citationTop = ifNumeric(theme.citationTop, null),
-      labelLeft = ifNumeric(theme.labelLeft, 0),
-      labelRight = ifNumeric(theme.labelRight, theme.width),
-      labelBottom = ifNumeric(theme.labelBottom, null),
-      labelTop = ifNumeric(theme.labelTop, null),
-
-      renderfunctions ;
-
-  if (bottom === null && top === null) {
-    top = 0;
-  }
-
-  if (labelBottom === null && labelTop === null) {
-    labelTop = 0;
-  }
-
-  var captionWidth = right - left,
-      citationWidth = citationRight - citationLeft;
-      labelWidth = labelRight - labelLeft;
-
-  return function(context, caption, type) {
-
-    if (!caption) {
+  return function(context, language, type) {
+    // Do some typechecking
+    var left = ifNumeric(theme[type + 'Left'], 0),
+        right = ifNumeric(theme[type + 'Right'], theme.width),
+        bottom = ifNumeric(theme[type + 'Bottom'], null),
+        top = ifNumeric(theme[type + 'Top'], null);
+
+    if (!language || language === 'None') {
       return;
     }
 
-    if (type === 'caption') {
+    calculate(language, type);
+
+    function calculate (txt, type) {
       var lines = [[]],
-          maxWidth = 0,
-          words = smartquotes(caption + "").trim().replace(/\s\s+/g, " \n").split(/ /g);
+          wrap_width = right - left,
+          max_width = 0,
+          words = smartquotes(txt + "").trim().replace(/\s\s+/g, " \n").split(/ /g),
+          indent;
+
+      if (type === 'caption') {
+        // negative indentation for opening quotes
+        indent = 20;
+      }
+      else if (type === 'citation') {
+        // negative indentation for opening em dash
+        indent = 50;
+      }
 
-      context.font = theme.captionFont;
+      if (bottom === null && top === null) {
+        top = 0;
+      }
+
+      context.font = theme[type + 'Font'];
       context.textBaseline = "top";
-      context.textAlign = theme.captionAlign || "center";
+      context.textAlign = theme[type + 'Align'] || "center";
 
       // Check whether each word exceeds the width limit
       // Wrap onto next line as needed
@@ -51,7 +45,7 @@ module.exports = function(theme) {
 
         var width = context.measureText(lines[lines.length - 1].concat([word]).join(" ")).width;
 
-        if (word[0] === "\n" || (lines[lines.length - 1].length && width > captionWidth)) {
+        if (word[0] === "\n" || (lines[lines.length - 1].length && width > wrap_width)) {
 
           word = word.trim();
           lines.push([word]);
@@ -59,18 +53,20 @@ module.exports = function(theme) {
 
         } else {
 
+          // automatically prepend em dash to citation
+          word = (type === 'citation' && i === 0) ? '— ' + word : word;
           lines[lines.length - 1].push(word);
 
         }
 
-        maxWidth = Math.max(maxWidth,width);
+        max_width = Math.max(max_width, width);
 
       });
 
-      var totalHeight = lines.length * theme.captionLineHeight + (lines.length - 1) * theme.captionLineSpacing;
+      var totalHeight = lines.length * theme[type + 'LineHeight'] + (lines.length - 1) * theme[type + 'LineSpacing'];
 
       // horizontal alignment
-      var x = theme.captionAlign === "left" ? left : theme.captionAlign === "right" ? right : (left + right) / 2;
+      var x = theme[type + 'Align'] === "left" ? left : theme[type + 'Align'] === "right" ? right : (left + right) / 2;
 
       // Vertical alignment
       var y;
@@ -86,146 +82,23 @@ module.exports = function(theme) {
         y = top;
       }
 
-      // draw caption
-      context.fillStyle = theme.captionColor;
-      lines.forEach(function(line, i){
-
-        // negative indentation for opening quotes
-        var indented_x = (x + 28);
-
-        if (i === 0 && /^“/.test(line[0])) {
-          context.fillText(line.join(" "), x, y + i * (theme.captionLineHeight + theme.captionLineSpacing));
-        }
-        else {
-          context.fillText(line.join(" "), indented_x, y + i * (theme.captionLineHeight + theme.captionLineSpacing));
-        }
-      });
-    } // end if caption
-
-
-    if (type === 'citation') {
-      var lines = [[]],
-          maxWidth = 0,
-          words = smartquotes(caption + "").trim().replace(/\s\s+/g, " \n").split(/ /g);
-
-      context.font = theme.citationFont;
-      context.textBaseline = "top";
-      context.textAlign = theme.citationAlign || "center";
-
-      // Check whether each word exceeds the width limit
-      // Wrap onto next line as needed
-      words.forEach(function(word,i){
-
-        var width = context.measureText(lines[lines.length - 1].concat([word]).join(" ")).width;
-
-        if (word[0] === "\n" || (lines[lines.length - 1].length && width > citationWidth)) {
-
-          word = word.trim();
-          lines.push([word]);
-          width = context.measureText(word).width;
-
-        } else {
-
-          word = (i === 0) ? '— ' + word : word;
-          lines[lines.length - 1].push(word);
-
-        }
-
-        maxWidth = Math.max(maxWidth,width);
-
-      });
-
-      var totalHeight = lines.length * theme.citationLineHeight + (lines.length - 1) * theme.citationLineSpacing;
-
-      // horizontal alignment
-      var x = theme.citationAlign === "left" ? left : theme.citationAlign === "right" ? right : (left + right) / 2;
-
-      // Vertical alignment
-      var y;
-
-      if (citationTop !== null && citationBottom !== null) {
-        // Vertical center
-        y = (citationBottom + citationTop - totalHeight) / 2;
-      } else if (citationBottom !== null) {
-        // Vertical align bottom
-        y = citationBottom - totalHeight;
-      } else {
-        // Vertical align top
-        y = citationTop;
-      }
-
-      // draw citation
-      context.fillStyle = theme.citationColor;
+      // draw text
+      context.fillStyle = theme[type + 'Color'];
       lines.forEach(function(line, i){
 
-        // negative indentation for opening em dash
-        var indented_x = (x + 50);
-
-        if (i === 0 && /^—/.test(line[0])) {
-          context.fillText(line.join(" "), x, y + i * (theme.citationLineHeight + theme.citationLineSpacing));
+        if (/caption|citation/.test(type)) {
+          if (i === 0 && /^“|^—/.test(line[0])) {
+            context.fillText(line.join(" "), x, y + i * (theme[type + 'LineHeight'] + theme[type + 'LineSpacing']));
+          }
+          else {
+            context.fillText(line.join(" "), (x + indent), y + i * (theme[type + 'LineHeight'] + theme[type + 'LineSpacing']));
+          }
         }
-        else {
-          context.fillText(line.join(" "), indented_x, y + i * (theme.citationLineHeight + theme.citationLineSpacing));
+        else { // you're a label
+          context.fillText(line.join(" "), x, y + i * (theme[type + 'LineHeight'] + theme[type + 'LineSpacing']));
         }
       });
-    } // end if citation
-
-
-    if (type === 'label' && caption != 'None') {
-      var lines = [[]],
-          maxWidth = 0,
-          words = smartquotes(caption + "").trim().replace(/\s\s+/g, " \n").split(/ /g);
-
-      context.font = theme.labelFont;
-      context.textBaseline = "top";
-      context.textAlign = theme.labelAlign || "center";
-
-      // Check whether each word exceeds the width limit
-      // Wrap onto next line as needed
-      words.forEach(function(word,i){
-
-        var width = context.measureText(lines[lines.length - 1].concat([word]).join(" ")).width;
-
-        if (word[0] === "\n" || (lines[lines.length - 1].length && width > labelWidth)) {
-
-          word = word.trim();
-          lines.push([word]);
-          width = context.measureText(word).width;
 
-        } else {
-
-          lines[lines.length - 1].push(word);
-
-        }
-
-        maxWidth = Math.max(maxWidth,width);
-
-      });
-
-      var totalHeight = lines.length * theme.labelLineHeight + (lines.length - 1) * theme.labelLineSpacing;
-
-      // horizontal alignment
-      var x = theme.labelAlign === "left" ? labelLeft : theme.labelAlign === "right" ? labelRight : (labelLeft + labelRight) / 2;
-
-      // Vertical alignment
-      var y;
-
-      if (labelTop !== null && labelBottom !== null) {
-        // Vertical center
-        y = (labelBottom + labelTop - totalHeight) / 2;
-      } else if (labelBottom !== null) {
-        // Vertical align bottom
-        y = labelBottom - totalHeight;
-      } else {
-        // Vertical align top
-        y = labelTop;
-      }
-
-      // draw label
-      context.fillStyle = theme.labelColor;
-      lines.forEach(function(line, i){
-        context.fillText(line.join(" "), x, y + i * (theme.labelLineHeight + theme.labelLineSpacing));
-      });
     }
 
  };