Merge pull request #1917 from processing/dhowe-patch-2

Minor API change: textFont() should return current font

Author: lmccart

src/typography/loading_displaying.js

@@ -75,8 +75,8 @@ p5.prototype.text = function(str, x, y, maxWidth, maxHeight) {
  * @method textFont
  * @param {Object|String} f a font loaded via loadFont(), or a String
  * representing a <a href="https://mzl.la/2dOw8WD">web safe font</a> (a font
- * that is generally available across all systems).
- * @return {Object} this
+ * that is generally available across all systems)
+ * @return {Object|String} the current font
  * @example
  * <div>
  * <code>
@@ -134,7 +134,7 @@ p5.prototype.textFont = function(theFont, theSize) {
     return this._renderer._applyTextProperties();
   }
 
-  return this;
+  return this._renderer._textFont;
 };
 
 module.exports = p5;