adding support for \n and \t closes processing#446'

Author: Lauren McCarthy

lib/p5.js

@@ -4921,58 +4921,53 @@ var typographyattributes = function (require, core, constants) {
     };
     return p5;
   }({}, core, constants);
-var typographyloading_displaying = function (require, core, canvas) {
+var typographyloading_displaying = function (require, core) {
     'use strict';
     var p5 = core;
-    var canvas = canvas;
-    p5.prototype.text = function () {
-      if (arguments.length === 3) {
-        if (this._doFill) {
-          this.drawingContext.fillText(arguments[0], arguments[1], arguments[2]);
-        }
-        if (this._doStroke) {
-          this.drawingContext.strokeText(arguments[0], arguments[1], arguments[2]);
-        }
-      } else if (arguments.length === 5) {
-        var words = arguments[0].split(' ');
+    p5.prototype.text = function (str, x, y, maxWidth, maxHeight) {
+      if (typeof maxWidth !== 'undefined') {
+        y += this._textLeading;
+        maxHeight += y;
+      }
+      str = str.replace(/(\t)/g, '  ');
+      var cars = str.split('\n');
+      for (var ii = 0; ii < cars.length; ii++) {
         var line = '';
-        var vals = canvas.modeAdjust(arguments[1], arguments[2], arguments[3], arguments[4], this._rectMode);
-        var y = vals.y + this._textLeading;
+        var words = cars[ii].split(' ');
         for (var n = 0; n < words.length; n++) {
-          var testLine = line + words[n] + ' ';
-          var metrics = this.drawingContext.measureText(testLine);
-          var testWidth = metrics.width;
-          if (y > vals.y + vals.h) {
-            break;
-          } else if (testWidth > vals.w && n > 0) {
-            if (this._doFill) {
-              this.drawingContext.fillText(line, vals.x, y);
-            }
-            if (this._doStroke) {
-              this.drawingContext.strokeText(line, vals.x, y);
+          if (y + this._textLeading <= maxHeight || typeof maxHeight === 'undefined') {
+            var testLine = line + words[n] + ' ';
+            var metrics = this.drawingContext.measureText(testLine);
+            var testWidth = metrics.width;
+            if (typeof maxWidth !== 'undefined' && testWidth > maxWidth) {
+              if (this._doFill) {
+                this.drawingContext.fillText(line, x, y);
+              }
+              if (this._doStroke) {
+                this.drawingContext.strokeText(line, x, y);
+              }
+              line = words[n] + ' ';
+              y += this._textLeading;
+            } else {
+              line = testLine;
             }
-            line = words[n] + ' ';
-            y += this._textLeading;
-          } else {
-            line = testLine;
           }
         }
-        if (y <= vals.y + vals.h) {
-          if (this._doFill) {
-            this.drawingContext.fillText(line, vals.x, y);
-          }
-          if (this._doStroke) {
-            this.drawingContext.strokeText(line, vals.x, y);
-          }
+        if (this._doFill) {
+          this.drawingContext.fillText(line, x, y);
         }
+        if (this._doStroke) {
+          this.drawingContext.strokeText(line, x, y);
+        }
+        y += this._textLeading;
       }
     };
     p5.prototype.textFont = function (str) {
       this._setProperty('_textFont', str);
       this._applyTextProperties();
     };
     return p5;
-  }({}, core, canvas);
+  }({}, core);
 var src_app = function (require, core, p5Color, p5Element, p5Graphics, p5Image, p5Vector, p5TableRow, p5Table, colorcreating_reading, colorsetting, constants, dataconversion, dataarray_functions, datastring_functions, environment, imageimage, imageloading_displaying, imagepixels, inputfiles, inputkeyboard, inputmouse, inputtime_date, inputtouch, mathmath, mathcalculation, mathrandom, mathnoise, mathtrigonometry, outputfiles, outputimage, outputtext_area, renderingrendering, shape2d_primitives, shapeattributes, shapecurves, shapevertex, structure, transform, typographyattributes, typographyloading_displaying) {
     'use strict';
     var p5 = core;