fixing long lines, building w new type stuff

Author: lauren mccarthy

lib/p5.js

@@ -1,4 +1,4 @@
-/*! p5.js v0.3.6 September 11, 2014 */
+/*! p5.js v0.3.6 September 14, 2014 */
 var shim = function (require) {
     window.requestDraw = function () {
       return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || window.oRequestAnimationFrame || window.msRequestAnimationFrame || function (callback, element) {
@@ -4520,14 +4520,13 @@ var typographyattributes = function (require, core, constants) {
     p5.prototype._textFont = 'sans-serif';
     p5.prototype._textSize = 12;
     p5.prototype._textStyle = constants.NORMAL;
+    p5.prototype._textAscent = null;
+    p5.prototype._textDescent = null;
     p5.prototype.textAlign = function (a) {
       if (a === constants.LEFT || a === constants.RIGHT || a === constants.CENTER) {
         this.drawingContext.textAlign = a;
       }
     };
-    p5.prototype.textHeight = function (s) {
-      return this.drawingContext.measureText(s).height;
-    };
     p5.prototype.textLeading = function (l) {
       this._setProperty('_textLeading', l);
     };
@@ -4544,10 +4543,68 @@ var typographyattributes = function (require, core, constants) {
     p5.prototype.textWidth = function (s) {
       return this.drawingContext.measureText(s).width;
     };
+    p5.prototype.textAscent = function () {
+      if (this._textAscent == null) {
+        this._updateTextMetrics();
+      }
+      return this._textAscent;
+    };
+    p5.prototype.textDescent = function () {
+      if (this._textDescent == null) {
+        this._updateTextMetrics();
+      }
+      return this._textDescent;
+    };
     p5.prototype._applyTextProperties = function () {
+      this._setProperty('_textAscent', null);
+      this._setProperty('_textDescent', null);
       var str = this._textStyle + ' ' + this._textSize + 'px ' + this._textFont;
       this.drawingContext.font = str;
     };
+    p5.prototype._updateTextMetrics = function () {
+      var text = document.createElement('span');
+      text.style.fontFamily = this._textFont;
+      text.style.fontSize = this._textSize + 'px';
+      text.innerHTML = 'ABCjgq|';
+      var block = document.createElement('div');
+      block.style.display = 'inline-block';
+      block.style.width = '1px';
+      block.style.height = '0px';
+      var container = document.createElement('div');
+      container.appendChild(text);
+      container.appendChild(block);
+      container.style.height = '0px';
+      container.style.overflow = 'hidden';
+      document.body.appendChild(container);
+      block.style.verticalAlign = 'baseline';
+      var blockOffset = this._calculateOffset(block);
+      var textOffset = this._calculateOffset(text);
+      var ascent = blockOffset[1] - textOffset[1];
+      block.style.verticalAlign = 'bottom';
+      blockOffset = this._calculateOffset(block);
+      textOffset = this._calculateOffset(text);
+      var height = blockOffset[1] - textOffset[1];
+      var descent = height - ascent;
+      document.body.removeChild(container);
+      this._setProperty('_textAscent', ascent);
+      this._setProperty('_textDescent', descent);
+    };
+    p5.prototype._calculateOffset = function (object) {
+      var currentLeft = 0, currentTop = 0;
+      if (object.offsetParent) {
+        do {
+          currentLeft += object.offsetLeft;
+          currentTop += object.offsetTop;
+        } while (object = object.offsetParent);
+      } else {
+        currentLeft += object.offsetLeft;
+        currentTop += object.offsetTop;
+      }
+      return [
+        currentLeft,
+        currentTop
+      ];
+    };
     return p5;
   }({}, core, constants);
 var typographyloading_displaying = function (require, core, canvas) {