cleaning up pdf and font selection

benfry · benfry · commit 9d4052e6341f · 2011-03-07T23:30:15.000Z
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -7339,7 +7339,7 @@ static public void runSketch(String args[], final PApplet constructedApplet) {
 
     // remove the grow box by default
     // users who want it back can call frame.setResizable(true)
-    //frame.setResizable(false);
+//    frame.setResizable(false);
     // moved later (issue #467)
 
     // Set the trimmings around the image
diff --git a/core/todo.txt b/core/todo.txt
@@ -10,26 +10,28 @@ X need to finish font changes wrt native fonts before any release
 X   right now not in a good place--default font will be bitmapped and ugly
 X   http://code.google.com/p/processing/issues/detail?id=416
 o   need to have some kind of subsetting mode, but 'subsetting' a bad name
+X changing PDF to use textMode(SHAPE) by default
+_   need to update the reference for textMode(MODEL)
+
+_ saving a PGraphics as jpg using save() makes a cmyk file
+_   need to shut off the alpha channel when writing
+_   http://code.google.com/p/processing/issues/detail?id=415
+
+_ present mode is no longer centering on osx?
+_ bug: textAlign(RIGHT) is shutting off native fonts
+_   makes salaryper super ugly
 
 _ make sure that loadXxxx() methods are used after init()
 _   nasty errors when loadImage/Font/createFont/etc used outside
 
 _ selectInput() and selectOutput() freeze on OS X
 _   http://code.google.com/p/processing/issues/detail?id=445
 
-_ saving a PGraphics as jpg using save() makes a cmyk file
-_   need to shut off the alpha channel when writing
-_   http://code.google.com/p/processing/issues/detail?id=415
-
 _ definite present-mode weirdness with background colors
 
 _ OpenGL Applets won't load with JRE 6 update 21 or higher
 _   http://code.google.com/p/processing/issues/detail?id=429
 
-_ present mode is no longer centering on osx?
-_ bug: textAlign(RIGHT) is shutting off native fonts
-_   makes salaryper super ugly
-
 _ clipping
 _   http://mrl.nyu.edu/~perlin/experiments/borg/render/index.html
 _   http://en.wikipedia.org/wiki/Clip_Mapping
diff --git a/java/libraries/pdf/src/processing/pdf/PGraphicsPDF.java b/java/libraries/pdf/src/processing/pdf/PGraphicsPDF.java
@@ -1,7 +1,7 @@
 /*
   Part of the Processing project - http://processing.org
 
-  Copyright (c) 2005-10 Ben Fry and Casey Reas
+  Copyright (c) 2005-11 Ben Fry and Casey Reas
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -21,6 +21,7 @@
 package processing.pdf;
 
 import java.awt.Font;
+import java.awt.Graphics2D;
 import java.io.*;
 import java.util.*;
 
@@ -100,6 +101,12 @@ protected void allocate() {
   }
 
 
+  protected void defaultSettings() {  // ignore
+    super.defaultSettings();
+    textMode = SHAPE;
+  }
+  
+  
   public void beginDraw() {
 //    long t0 = System.currentTimeMillis();
 
@@ -125,7 +132,13 @@ public void beginDraw() {
       }
 
 //      System.out.println("beginDraw fonts " + (System.currentTimeMillis() - t));
-      g2 = content.createGraphics(width, height, getMapper());
+//      g2 = content.createGraphics(width, height, getMapper());
+//      if (textMode == SHAPE) {
+      g2 = content.createGraphicsShapes(width, height);
+//      } else if (textMode == MODEL) {
+//        g2 = content.createGraphics(width, height, getMapper());
+//      }
+//      g2 = createGraphics();
 //      g2 = template.createGraphics(width, height, mapper);
     }
 //    System.out.println("beginDraw " + (System.currentTimeMillis() - t0));
@@ -299,13 +312,20 @@ public void nextPage() {
     } catch (Exception e) {
       e.printStackTrace();
     }
+    g2 = createGraphics();
+    beginDraw();
+    style(savedStyle);
+  }
+  
+  
+  protected Graphics2D createGraphics() {
     if (textMode == SHAPE) {
-      g2 = content.createGraphicsShapes(width, height);
+      return content.createGraphicsShapes(width, height);
     } else if (textMode == MODEL) {
-      g2 = content.createGraphics(width, height, mapper);
+      return content.createGraphics(width, height, getMapper());
     }
-    beginDraw();
-    style(savedStyle);
+    // Should not be reachable...
+    throw new RuntimeException("Invalid textMode() selected for PDF.");
   }
 
 
@@ -417,7 +437,7 @@ public void textFont(PFont which) {
   /**
    * Change the textMode() to either SHAPE or MODEL.
    * <br/>
-   * This resets all renderer settings, and should therefore
+   * This resets all renderer settings, and therefore must
    * be called <EM>before</EM> any other commands that set the fill()
    * or the textFont() or anything. Unlike other renderers,
    * use textMode() directly after the size() command.
@@ -427,11 +447,13 @@ public void textMode(int mode) {
       if (mode == SHAPE) {
         textMode = SHAPE;
         g2.dispose();
-        g2 = content.createGraphicsShapes(width, height);
+//        g2 = content.createGraphicsShapes(width, height);
+        g2 = createGraphics();
       } else if (mode == MODEL) {
         textMode = MODEL;
         g2.dispose();
-        g2 = content.createGraphics(width, height, mapper);
+//        g2 = content.createGraphics(width, height, mapper);
+        g2 = createGraphics();
 //        g2 = template.createGraphics(width, height, mapper);
       } else if (mode == SCREEN) {
         throw new RuntimeException("textMode(SCREEN) not supported with PDF");
@@ -591,10 +613,18 @@ protected void checkFont() {
                                    ".ttf and .otf files with createFont().");
       } else if (mapper.getAliases().get(textFont.getName()) == null) {
         //System.out.println("alias for " + name + " = " + mapper.getAliases().get(name));
-        System.err.println("Use PGraphicsPDF.listFonts() to get a list of " +
-                           "fonts that can be used with PDF.");
-        throw new RuntimeException("The font “" + textFont.getName() + "” " +
-                                   "cannot be used with PDF Export.");
+//        System.err.println("Use PGraphicsPDF.listFonts() to get a list of " +
+//                           "fonts that can be used with PDF.");
+//        throw new RuntimeException("The font “" + textFont.getName() + "” " +
+//                                   "cannot be used with PDF Export.");
+        if (textFont.getName().equals("Lucida Sans")) {
+          throw new RuntimeException("Use textMode(SHAPE) with the default " +
+          		                       "font when exporting to PDF.");
+        } else {
+          throw new RuntimeException("Use textMode(SHAPE) with " +
+        	  	                       "“" + textFont.getName() + "” " +
+                                     "when exporting to PDF.");
+        }
       }
     }
   }
diff --git a/todo.txt b/todo.txt
@@ -112,6 +112,9 @@ X make sure that android is working again
 X export is broken in 0192
 X   http://code.google.com/p/processing/issues/detail?id=487
 
+*** 
+_ exceptions in setup() are locking the PDE
+
 _ strange window flicker when first opened
 _ test libraries on android
 _ test .java files on desktop version
