fixing text(str, x, y, w, h) closes #339

Author: lauren mccarthy

lib/p5.js

@@ -1,4 +1,4 @@
-/*! p5.js v0.3.4 August 27, 2014 */
+/*! p5.js v0.3.4 August 28, 2014 */
 var shim = function (require) {
     window.requestDraw = function () {
       return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || window.oRequestAnimationFrame || window.msRequestAnimationFrame || function (callback, element) {
@@ -4457,7 +4457,8 @@ var typographyloading_displaying = function (require, core, canvas) {
     var p5 = core;
     var canvas = canvas;
     p5.prototype.text = function () {
-      this.drawingContext.font = this._textStyle + ' ' + this._textSize + 'px ' + this._textFont;
+      var str = this._textStyle + ' ' + this._textSize + 'px ' + this._textFont;
+      this.drawingContext.font = str;
       if (arguments.length === 3) {
         if (this._doFill) {
           this.drawingContext.fillText(arguments[0], arguments[1], arguments[2]);
@@ -4469,32 +4470,32 @@ var typographyloading_displaying = function (require, core, canvas) {
         var words = arguments[0].split(' ');
         var line = '';
         var vals = canvas.modeAdjust(arguments[1], arguments[2], arguments[3], arguments[4], this._rectMode);
-        vals.y += this._textLeading;
+        var y = vals.y + this._textLeading;
         for (var n = 0; n < words.length; n++) {
           var testLine = line + words[n] + ' ';
           var metrics = this.drawingContext.measureText(testLine);
           var testWidth = metrics.width;
-          if (vals.y > vals.h) {
+          if (y > vals.y + vals.h) {
             break;
           } else if (testWidth > vals.w && n > 0) {
             if (this._doFill) {
-              this.drawingContext.fillText(line, vals.x, vals.y);
+              this.drawingContext.fillText(line, vals.x, y);
             }
             if (this._doStroke) {
-              this.drawingContext.strokeText(line, vals.x, vals.y);
+              this.drawingContext.strokeText(line, vals.x, y);
             }
             line = words[n] + ' ';
-            vals.y += this._textLeading;
+            y += this._textLeading;
           } else {
             line = testLine;
           }
         }
-        if (vals.y <= vals.h) {
+        if (y <= vals.y + vals.h) {
           if (this._doFill) {
-            this.drawingContext.fillText(line, vals.x, vals.y);
+            this.drawingContext.fillText(line, vals.x, y);
           }
           if (this._doStroke) {
-            this.drawingContext.strokeText(line, vals.x, vals.y);
+            this.drawingContext.strokeText(line, vals.x, y);
           }
         }
       }