Merge pull request #7523 from dhowe/dev-2.0

Text adjustments

Author: davepagurek

src/core/p5.Renderer2D.js

@@ -1030,12 +1030,12 @@ class Renderer2D extends Renderer {
   }
 
   //////////////////////////////////////////////
-  // TYPOGRAPHY
+  // TYPOGRAPHY (see src/type/textCore.js)
   //
   //////////////////////////////////////////////
 
 
-
+  /*
   _renderText(p, line, x, y, maxY, minY) {
     if (y < minY || y >= maxY) {
       return; // don't render lines beyond our minY/maxY bounds (see #5785)
@@ -1100,7 +1100,7 @@ class Renderer2D extends Renderer {
     return p;
   }
 
-  /*_applyTextProperties() {
+  _applyTextProperties() {
     let font;
     const p = this._pInst;
 

src/type/index.js

@@ -1,9 +1,9 @@
 
-import text2d from './text2d.js';
+import textCore from './textCore.js';
 import p5font from './p5.Font.js';
 
 export default function(p5){
-  p5.registerAddon(text2d);
+  p5.registerAddon(textCore);
   p5.registerAddon(p5font);
 }
 

src/type/text2d.js renamed to src/type/textCore.js

@@ -2,11 +2,11 @@ import { Renderer } from '../core/p5.Renderer';
 
 /**
  * @module Type
- * @submodule text2d
+ * @submodule textCore
  * @for p5
  * @requires core
  */
-function text2d(p5, fn) {
+function textCore(p5, fn) {
 
   // additional constants
   fn.IDEOGRAPHIC = 'ideographic';
@@ -1255,8 +1255,8 @@ function text2d(p5, fn) {
   }
 }
 
-export default text2d;
+export default textCore;
 
 if (typeof p5 !== 'undefined') {
-  text2d(p5, p5.prototype);
+  textCore(p5, p5.prototype);
 }