Add svg library, move itextpdf jar to library folder

monkstone · monkstone · commit 9272c59d9840 · 2021-03-17T16:21:02.000Z
diff --git a/library/pdf/pdf.rb b/library/pdf/pdf.rb
@@ -2,5 +2,6 @@
 
 # @TODO usage
 class Processing::App
+  require_relative 'itextpdf-5.5.13.2.jar'
   java_import Java::ProcessingPdf::PGraphicsPDF
 end
diff --git a/library/svg/svg.rb b/library/svg/svg.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# @TODO usage
+class Processing::App
+  require_relative 'batik-all-1.14.jar'
+  java_import Java::ProcessingSvg::PGraphicsSVG
+end
diff --git a/picrate.gemspec b/picrate.gemspec
@@ -27,7 +27,8 @@ Gem::Specification.new do |gem|
   gem.files << 'lib/jogl-all-natives-linux-amd64.jar'
   gem.files << 'lib/jogl-all-natives-linux-armv6hf.jar'
   gem.files << 'lib/jogl-all-natives-linux-aarch64.jar'
-  gem.files << 'lib/itextpdf-5.5.13.2.jar'
+  gem.files << 'library/pdf/itextpdf-5.5.13.2.jar'
+  gem.files << 'library/svg/batik-all-1.14.jar'
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.add_development_dependency 'minitest', '~> 5.10'
diff --git a/pom.rb b/pom.rb
@@ -24,6 +24,7 @@
   issue_management 'https://github.com/ruby-processing/PiCrate/issues', 'Github'
   # Need to update to jogl 2.4.1 as soon as available, then make a dependency
   properties('jogl.version' => '2.3.2',
+             'batik.version' => '1.14',
              'itextpdf.version' => '5.5.13.2',
              'jruby.api' => 'http://jruby.org/apidocs/',
              'source.directory' => 'src',
@@ -36,6 +37,7 @@
   jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
   jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
   jar 'org.processing:video:3.0.2'
+  jar 'org.apache.xmlgraphics:batik-all:${batik.version}'
   jar 'com.itextpdf:itextpdf:${itextpdf.version}'
 end
 
@@ -44,13 +46,19 @@
   plugin :dependency, '3.1.2' do
     execute_goals( id: 'default-cli',
       artifactItems:[
-      { groupId: 'com.itextpdf',
-        artifactId: 'itextpdf',
-        version: '${itextpdf.version}',
-        type: 'jar',
-        outputDirectory: '${picrate.basedir}/lib'
-      }
-    ]
+        { groupId: 'com.itextpdf',
+          artifactId: 'itextpdf',
+          version: '${itextpdf.version}',
+          type: 'jar',
+          outputDirectory: '${propane.basedir}/library/pdf'
+        },
+        { groupId: 'org.apache.xmlgraphics',
+          artifactId: 'batik-all',
+          version: '${batik.version}',
+          type: 'jar',
+          outputDirectory: '${propane.basedir}/library/svg'
+        }
+      ]
     )
   end
   plugin(:compiler, '3.8.1',
diff --git a/pom.xml b/pom.xml
@@ -64,6 +64,7 @@ DO NOT MODIFY - GENERATED CODE
     <url>https://github.com/ruby-processing/PiCrate/issues</url>
   </issueManagement>
   <properties>
+    <batik.version>1.14</batik.version>
     <itextpdf.version>5.5.13.2</itextpdf.version>
     <jogl.version>2.3.2</jogl.version>
     <jruby.api>http://jruby.org/apidocs/</jruby.api>
@@ -95,6 +96,11 @@ DO NOT MODIFY - GENERATED CODE
       <artifactId>video</artifactId>
       <version>3.0.2</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.xmlgraphics</groupId>
+      <artifactId>batik-all</artifactId>
+      <version>${batik.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.itextpdf</groupId>
       <artifactId>itextpdf</artifactId>
@@ -140,7 +146,14 @@ DO NOT MODIFY - GENERATED CODE
                     <artifactId>itextpdf</artifactId>
                     <version>${itextpdf.version}</version>
                     <type>jar</type>
-                    <outputDirectory>${picrate.basedir}/lib</outputDirectory>
+                    <outputDirectory>${propane.basedir}/library/pdf</outputDirectory>
+                  </artifactItem>
+                  <artifactItem>
+                    <groupId>org.apache.xmlgraphics</groupId>
+                    <artifactId>batik-all</artifactId>
+                    <version>${batik.version}</version>
+                    <type>jar</type>
+                    <outputDirectory>${propane.basedir}/library/svg</outputDirectory>
                   </artifactItem>
                 </artifactItems>
               </configuration>
diff --git a/src/main/java/processing/pdf/PGraphicsPDF.java b/src/main/java/processing/pdf/PGraphicsPDF.java
@@ -52,13 +52,8 @@
 /**
  * Thin wrapper for the iText PDF library that handles writing PDF files. The
  * majority of the work in this library is done by
- * <a href="http://www.lowagie.com/iText/">iText</a>.
- * This is currently using iText 2.1.7.
- * The issue is that versions from the 5.x series were slow to handle lots of
- * fonts with the DefaultFontMapper. 2.x seemed a little slower than 1.x, but
- * 5.x took up to 10 times the time to load, meaning a lag of several seconds
- * when starting sketches on a machine that had a good handful of fonts
- * installed. (Like, say, anyone in our target audience. Or me.)
+ * <a href="https://github.com/itext/itextpdf">itextpdf</a>. This is currently using
+ * itextpdf-5.5.13.2.
  */
 public class PGraphicsPDF extends PGraphicsJava2D {
 
@@ -81,10 +76,6 @@ public class PGraphicsPDF extends PGraphicsJava2D {
     static protected DefaultFontMapper mapper;
     static protected String[] fontList;
 
-    /**
-     * 
-     * @param path 
-     */
     @Override
     public void setPath(String path) {
         this.path = path;
@@ -167,12 +158,10 @@ public void beginDraw() {
     static protected DefaultFontMapper getMapper() {
         if (mapper == null) {
             mapper = new DefaultFontMapper();
-            if (PApplet.platform == PConstants.LINUX) {
-                checkDir("/usr/share/fonts/", mapper);
-                checkDir("/usr/local/share/fonts/", mapper);
-                checkDir(System.getProperty("user.home") + "/.fonts", mapper);
+                    checkDir("/usr/share/fonts/", mapper);
+                    checkDir("/usr/local/share/fonts/", mapper);
+                    checkDir(System.getProperty("user.home") + "/.fonts", mapper);
             }
-        }
         return mapper;
     }
 
@@ -186,8 +175,10 @@ static protected void checkDir(String path, DefaultFontMapper mapper) {
 
     /**
      * Recursive walk to get all subdirectories for font fun.Patch submitted by
- Matthias Breuer.(<a href="http://dev.processing.org/bugs/show_bug.cgi?id=1566">Bug
- 1566</a>)
+     * Matthias
+     * Breuer.(<a href="http://dev.processing.org/bugs/show_bug.cgi?id=1566">Bug
+     * 1566</a>)
+     *
      * @param folder
      * @param mapper
      */
@@ -258,45 +249,6 @@ public boolean displayable() {
         return false;
     }
 
-    /*
-  protected void finalize() throws Throwable {
-    System.out.println("calling finalize");
-  //document.close();  // do this in dispose instead?
-  }
-     */
-    //////////////////////////////////////////////////////////////
-    /*
-  public void endRecord() {
-    super.endRecord();
-    dispose();
-  }
-
-
-  public void endRaw() {
-    System.out.println("ending raw");
-    super.endRaw();
-    System.out.println("disposing");
-    dispose();
-    System.out.println("done");
-  }
-     */
-    //////////////////////////////////////////////////////////////
-    /*
-  protected void rectImpl(float x1, float y1, float x2, float y2) {
-    //rect.setFrame(x1, y1, x2-x1, y2-y1);
-    //draw_shape(rect);
-    System.out.println("rect implements");
-    g2.fillRect((int)x1, (int)y1, (int) (x2-x1), (int) (y2-y1));
-  }
-  *
-
-  /*
-  public void clear() {
-    g2.setColor(Color.red);
-    g2.fillRect(0, 0, width, height);
-  }
-     */
-    //////////////////////////////////////////////////////////////
     @Override
     protected void imageImpl(PImage image,
             float x1, float y1, float x2, float y2,
@@ -321,49 +273,36 @@ protected void imageImpl(PImage image,
     public void textFont(PFont which) {
         super.textFont(which);
         checkFont();
-        // Make sure a native version of the font is available.
-//    if (textFont.getFont() == null) {
-//      throw new RuntimeException("Use createFont() instead of loadFont() " +
-//                                 "when drawing text using the PDF library.");
-//    }
-        // Make sure that this is a font that the PDF library can deal with.
-//    if ((textMode != SHAPE) && !checkFont(which.getName())) {
-//      System.err.println("Use PGraphicsPDF.listFonts() to get a list of available fonts.");
-//      throw new RuntimeException("The font “" + which.getName() + "” cannot be used with PDF Export.");
-//    }
     }
 
     /**
-     * Change the textMode() to either SHAPE or MODEL.
-     * This resets all renderer settings, and therefore must be called
+     * Change the textMode() to either SHAPE or MODEL. 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.
      */
-    @Override
-    public void textMode(int mode) {
-        if (textMode != mode) {
-            switch (mode) {
-                case SHAPE:
-                    textMode = SHAPE;
-                    g2.dispose();
-                    //        g2 = content.createGraphicsShapes(width, height);
-                    g2 = createGraphics();
-                    break;
-                case MODEL:
-                    textMode = MODEL;
-                    g2.dispose();
-                    //        g2 = content.createGraphics(width, height, mapper);
-                    g2 = createGraphics();
-//        g2 = template.createGraphics(width, height, mapper);
-                    break;
-                case SCREEN:
-                    throw new RuntimeException("textMode(SCREEN) not supported with PDF");
-                default:
-                    throw new RuntimeException("That textMode() does not exist");
-            }
-        }
-    }
+     @Override
+     public void textMode(int mode) {
+         if (textMode != mode) {
+             switch (mode) {
+                 case SHAPE:
+                     textMode = SHAPE;
+                     g2.dispose();
+                     g2 = createGraphics();
+                     break;
+                 case MODEL:
+                     textMode = MODEL;
+                     g2.dispose();
+                     g2 = createGraphics();
+                     break;
+                 case SCREEN:
+                     throw new RuntimeException("textMode(SCREEN) not supported with PDF");
+                 default:
+                     throw new RuntimeException("That textMode() does not exist");
+             }
+         }
+     }
 
     @Override
     protected void textLineImpl(char buffer[], int start, int stop,
@@ -418,7 +357,6 @@ public void set(int x, int y, PImage image) {
     }
 
     //
-
     /**
      *
      * @param alpha
@@ -516,6 +454,7 @@ public boolean save(String filename) {
      * On Linux or any other platform, you'll need to add the directories by
      * hand. (If there are actual standards here that we can use as a starting
      * point, please file a bug to make a note of it)
+     *
      * @param directory
      */
     public void addFonts(String directory) {
@@ -555,7 +494,8 @@ protected void checkFont() {
 
     /**
      * List the fonts known to the PDF renderer.This is like PFont.list(),
- however not all those fonts are available by default.
+     * however not all those fonts are available by default.
+     *
      * @return
      */
     static public String[] listFonts() {
diff --git a/src/main/java/processing/svg/PGraphicsSVG.java b/src/main/java/processing/svg/PGraphicsSVG.java
