Added lineIndent option to the SplitText PlugIn

Author: diegocr

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jspdf",
-  "version": "1.0.116",
+  "version": "1.0.118",
   "homepage": "https://github.com/mrrio/jspdf",
   "description": "PDF Document creation from JavaScript",
   "main": "dist/jspdf.min.js",

build.sh

@@ -90,6 +90,6 @@ if [ "$git_push" = "1" ]; then
 fi
 if [ "$git_tag" = "1" ]; then
 	commit=`git rev-parse --short=10 HEAD`
-	git tag -m "v${version} ${commit}" -s v${version}
+	git tag -m "${build} ${commit}" -s v${version}
 	git push upstream v${version}
 fi

dist/jspdf.debug.js

@@ -1,7 +1,7 @@
 /** @preserve
  * jsPDF - PDF Document creation from JavaScript
- * Version 1.0.116-git Built on 2014-04-26T23:33
- *                           CommitID cbe6766903
+ * Version 1.0.118-git Built on 2014-04-28T19:38
+ *                           CommitID ce42cbafba
  *
  * Copyright (c) 2010-2014 James Hall, https://github.com/MrRio/jsPDF
  *               2010 Aaron Spike, https://github.com/acspike
@@ -1693,7 +1693,7 @@ var jsPDF = (function(global) {
 	 * pdfdoc.mymethod() // <- !!!!!!
 	 */
 	jsPDF.API = {events:[]};
-	jsPDF.version = "1.0.116-debug 2014-04-26T23:33:diegocr";
+	jsPDF.version = "1.0.118-debug 2014-04-28T19:38:diegocr";
 
 	if (typeof define === 'function') {
 		define(function() {
@@ -4112,11 +4112,11 @@ jsPDFAPI.addSVG = function(svgtext, x, y, w, h) {
 }
 
 })(jsPDF.API);
-/** @preserve 
-jsPDF split_text_to_size plugin
-Copyright (c) 2012 Willow Systems Corporation, willow-systems.com
-MIT license.
-*/
+/** @preserve
+ * jsPDF split_text_to_size plugin - MIT license.
+ * Copyright (c) 2012 Willow Systems Corporation, willow-systems.com
+ *               2014 Diego Casorran, https://github.com/diegocr
+ */
 /**
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -4125,10 +4125,10 @@ MIT license.
  * distribute, sublicense, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be
  * included in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -4162,20 +4162,19 @@ var getCharWidthsArray = API.getCharWidthsArray = function(text, options){
 	, widthsFractionOf = widths.fof ? widths.fof : 1
 	, kerning = options.kerning ? options.kerning : this.internal.getFont().metadata.Unicode.kerning
 	, kerningFractionOf = kerning.fof ? kerning.fof : 1
-	
+
 	// console.log("widths, kergnings", widths, kerning)
 
 	var i, l
 	, char_code
-	, char_width
 	, prior_char_code = 0 // for kerning
 	, default_char_width = widths[0] || widthsFractionOf
 	, output = []
 
 	for (i = 0, l = text.length; i < l; i++) {
 		char_code = text.charCodeAt(i)
 		output.push(
-			( widths[char_code] || default_char_width ) / widthsFractionOf + 
+			( widths[char_code] || default_char_width ) / widthsFractionOf +
 			( kerning[char_code] && kerning[char_code][prior_char_code] || 0 ) / kerningFractionOf
 		)
 		prior_char_code = char_code
@@ -4210,7 +4209,7 @@ var getStringUnitWidth = API.getStringUnitWidth = function(text, options) {
 	return getArraySum(getCharWidthsArray.call(this, text, options))
 }
 
-/** 
+/**
 returns array of lines
 */
 var splitLongWord = function(word, widths_array, firstLineMaxLen, maxLen){
@@ -4256,25 +4255,50 @@ var splitParagraphIntoLines = function(text, maxlen, options){
 		options = {}
 	}
 
-	var spaceCharWidth = getCharWidthsArray(' ', options)[0]
-
-	var words = text.split(' ')
-
 	var line = []
 	, lines = [line]
 	, line_length = options.textIndent || 0
 	, separator_length = 0
 	, current_word_length = 0
 	, word
 	, widths_array
+	, words = text.split(' ')
+	, spaceCharWidth = getCharWidthsArray(' ', options)[0]
+	, i, l, tmp, lineIndent
+
+	if(options.lineIndent === -1) {
+		lineIndent = words[0].length +2;
+	} else {
+		lineIndent = options.lineIndent || 0;
+	}
+	if(lineIndent) {
+		var pad = Array(lineIndent).join(" "), wrds = [];
+		words.map(function(wrd) {
+			wrd = wrd.split(/\s*\n/);
+			if(wrd.length > 1) {
+				wrds = wrds.concat(wrd.map(function(wrd, idx) {
+					return (idx && wrd.length ? "\n":"") + wrd;
+				}));
+			} else {
+				wrds.push(wrd[0]);
+			}
+		});
+		words = wrds;
+		lineIndent = getStringUnitWidth(pad, options);
+	}
 
-	var i, l, tmp
 	for (i = 0, l = words.length; i < l; i++) {
+		var force = 0;
+
 		word = words[i]
+		if(lineIndent && word[0] == "\n") {
+			word = word.substr(1);
+			force = 1;
+		}
 		widths_array = getCharWidthsArray(word, options)
 		current_word_length = getArraySum(widths_array)
 
-		if (line_length + separator_length + current_word_length > maxlen) {
+		if (line_length + separator_length + current_word_length > maxlen || force) {
 			if (current_word_length > maxlen) {
 				// this happens when you have space-less long URLs for example.
 				// we just chop these to size. We do NOT insert hiphens
@@ -4295,8 +4319,7 @@ var splitParagraphIntoLines = function(text, maxlen, options){
 
 			// now we attach new line to lines
 			lines.push(line)
-
-			line_length = current_word_length
+			line_length = current_word_length + lineIndent
 			separator_length = spaceCharWidth
 
 		} else {
@@ -4307,12 +4330,15 @@ var splitParagraphIntoLines = function(text, maxlen, options){
 		}
 	}
 
-	var output = []
-	for (i = 0, l = lines.length; i < l; i++) {
-		output.push( lines[i].join(' ') )
+	if(lineIndent) {
+		var postProcess = function(ln, idx) {
+			return (idx ? pad : '') + ln.join(" ");
+		};
+	} else {
+		var postProcess = function(ln) { return ln.join(" ")};
 	}
-	return output
 
+	return lines.map(postProcess);
 }
 
 /**
@@ -4360,7 +4386,7 @@ API.splitTextToSize = function(text, maxlen, options) {
 			return 	{
 				widths: options.widths
 				, kerning: options.kerning
-			}			
+			}
 		}
 
 		// then use default values
@@ -4371,11 +4397,11 @@ API.splitTextToSize = function(text, maxlen, options) {
 	}).call(this, options)
 
 	// first we split on end-of-line chars
-	var paragraphs 
-	if (text.match(/[\n\r]/)) {
-		paragraphs = text.split(/\r\n|\r|\n/g)
+	var paragraphs
+	if(Array.isArray(text)) {
+		paragraphs = text;
 	} else {
-		paragraphs = [text]
+		paragraphs = text.split(/\r?\n/);
 	}
 
 	// now we convert size (max length of line) into "font size units"
@@ -4386,13 +4412,14 @@ API.splitTextToSize = function(text, maxlen, options) {
 	// this may change in the future?
 	// until then, proportional_maxlen is likely to be in 'points'
 
-	// If first line is to be indented (shorter or longer) than maxLen 
+	// If first line is to be indented (shorter or longer) than maxLen
 	// we indicate that by using CSS-style "text-indent" option.
 	// here it's in font units too (which is likely 'points')
 	// it can be negative (which makes the first line longer than maxLen)
-	newOptions.textIndent = options.textIndent ? 
-		options.textIndent * 1.0 * this.internal.scaleFactor / fsize : 
+	newOptions.textIndent = options.textIndent ?
+		options.textIndent * 1.0 * this.internal.scaleFactor / fsize :
 		0
+	newOptions.lineIndent = options.lineIndent;
 
 	var i, l
 	, output = []
@@ -4406,7 +4433,7 @@ API.splitTextToSize = function(text, maxlen, options) {
 		)
 	}
 
-	return output 
+	return output
 }
 
 })(jsPDF.API);
@@ -7563,7 +7590,7 @@ var Deflater = (function(obj) {
     APNG_BLEND_OP_OVER = 1;
 
     function PNG(data) {
-      var chunkSize, colors, palLen, delayDen, delayNum, frame, i, index, key, section, short, text, _i, _j, _ref;
+      var chunkSize, colors, palLen, delayDen, delayNum, frame, i, index, key, section, palShort, text, _i, _j, _ref;
       this.data = data;
       this.pos = 8;
       this.palette = [];
@@ -7642,10 +7669,10 @@ var Deflater = (function(obj) {
                 /*
                  * According to the PNG spec trns should be increased to the same size as palette if shorter
                  */
-                //short = 255 - this.transparency.indexed.length;
-                short = palLen - this.transparency.indexed.length;
-                if (short > 0) {
-                  for (i = _j = 0; 0 <= short ? _j < short : _j > short; i = 0 <= short ? ++_j : --_j) {
+                //palShort = 255 - this.transparency.indexed.length;
+                palShort = palLen - this.transparency.indexed.length;
+                if (palShort > 0) {
+                  for (i = _j = 0; 0 <= palShort ? _j < palShort : _j > palShort; i = 0 <= palShort ? ++_j : --_j) {
                     this.transparency.indexed.push(255);
                   }
                 }
@@ -7728,7 +7755,7 @@ var Deflater = (function(obj) {
     };
 
     PNG.prototype.decodePixels = function(data) {
-      var byte, c, col, i, left, length, p, pa, paeth, pb, pc, pixelBytes, pixels, pos, row, scanlineLength, upper, upperLeft, _i, _j, _k, _l, _m;
+      var abyte, c, col, i, left, length, p, pa, paeth, pb, pc, pixelBytes, pixels, pos, row, scanlineLength, upper, upperLeft, _i, _j, _k, _l, _m;
       if (data == null) {
         data = this.imgData;
       }
@@ -7753,31 +7780,31 @@ var Deflater = (function(obj) {
             break;
           case 1:
             for (i = _j = 0; _j < scanlineLength; i = _j += 1) {
-              byte = data[pos++];
+              abyte = data[pos++];
               left = i < pixelBytes ? 0 : pixels[c - pixelBytes];
-              pixels[c++] = (byte + left) % 256;
+              pixels[c++] = (abyte + left) % 256;
             }
             break;
           case 2:
             for (i = _k = 0; _k < scanlineLength; i = _k += 1) {
-              byte = data[pos++];
+              abyte = data[pos++];
               col = (i - (i % pixelBytes)) / pixelBytes;
               upper = row && pixels[(row - 1) * scanlineLength + col * pixelBytes + (i % pixelBytes)];
-              pixels[c++] = (upper + byte) % 256;
+              pixels[c++] = (upper + abyte) % 256;
             }
             break;
           case 3:
             for (i = _l = 0; _l < scanlineLength; i = _l += 1) {
-              byte = data[pos++];
+              abyte = data[pos++];
               col = (i - (i % pixelBytes)) / pixelBytes;
               left = i < pixelBytes ? 0 : pixels[c - pixelBytes];
               upper = row && pixels[(row - 1) * scanlineLength + col * pixelBytes + (i % pixelBytes)];
-              pixels[c++] = (byte + Math.floor((left + upper) / 2)) % 256;
+              pixels[c++] = (abyte + Math.floor((left + upper) / 2)) % 256;
             }
             break;
           case 4:
             for (i = _m = 0; _m < scanlineLength; i = _m += 1) {
-              byte = data[pos++];
+              abyte = data[pos++];
               col = (i - (i % pixelBytes)) / pixelBytes;
               left = i < pixelBytes ? 0 : pixels[c - pixelBytes];
               if (row === 0) {
@@ -7797,7 +7824,7 @@ var Deflater = (function(obj) {
               } else {
                 paeth = upperLeft;
               }
-              pixels[c++] = (byte + paeth) % 256;
+              pixels[c++] = (abyte + paeth) % 256;
             }
             break;
           default: