bring back older style ascent/descent values

benfry · benfry · commit 9f18caba3a8e · 2010-03-11T12:15:09.000Z
diff --git a/core/src/processing/core/PFont.java b/core/src/processing/core/PFont.java
@@ -195,8 +195,11 @@ public PFont(Font font, boolean smooth, char charset[]) {
     lazyMetrics = lazyGraphics.getFontMetrics();
     lazySamples = new int[mbox3 * mbox3];
 
-    ascent = lazyMetrics.getAscent();
-    descent = lazyMetrics.getDescent();
+    // These values are terrible/unusable. Verified again for Processing 1.1.
+    // They vary widely per-platform and per-font, so instead we'll use the 
+    // calculate-by-hand method of measuring pixels in characters.
+    //ascent = lazyMetrics.getAscent();
+    //descent = lazyMetrics.getDescent();
 
     if (charset != null) {
       // charset needs to be sorted to make index lookup run more quickly
@@ -239,6 +242,28 @@ public PFont(Font font, boolean smooth, char charset[]) {
 //        }
 //      }
     }
+
+    // If not already created, just create these two characters to calculate 
+    // the ascent and descent values for the font. This was tested to only 
+    // require 5-10 ms on a 2.4 GHz MacBook Pro.
+    // In versions 1.0.9 and earlier, fonts that could not display d or p
+    // used the max up/down values as calculated by looking through the font.
+    // That's no longer valid with the auto-generating fonts, so we'll just
+    // use getAscent() and getDescent() in such (minor) cases.
+    if (ascent == 0) {
+      if (font.canDisplay('d')) {
+        new Glyph('d');
+      } else {
+        ascent = lazyMetrics.getAscent();
+      }
+    }
+    if (descent == 0) {
+      if (font.canDisplay('p')) {
+        new Glyph('p');
+      } else {
+        descent = lazyMetrics.getDescent();
+      }
+    }
   }
 
 
diff --git a/todo.txt b/todo.txt
@@ -4,9 +4,13 @@ X updated about.jpg
 X Cannot find PDF library
 X   http://dev.processing.org/bugs/show_bug.cgi?id=1473
 X new examples.zip
+o Fixes for invoking Processing from arbitrary locations
+X   already fixed with earlier code
+X   http://dev.processing.org/bugs/show_bug.cgi?id=1214
+X bring back old-style textAscent() 
+X   needs to just quickly run characters d and p
+X   only takes a couple ms, so no problem
 
-_ bring back old-style textAscent() 
-_   needs to just quickly run characters H and q or whatever
 _ pdf library
 _   throw an error with the black boxes
 _   throw an error if loading fonts from a file, and not using mode(SHAPE)
