[FOray-commit] SF.net SVN: foray: [9749] trunk/foray

[<vic...@us...>]

Revision: 9749
          http://svn.sourceforge.net/foray/?rev=9749&view=rev
Author:   victormote
Date:     2007-06-11 13:17:34 -0700 (Mon, 11 Jun 2007)

Log Message:
-----------
1. Change default SVG text handling to use the fonts.
2. Clean up some bugs related to SVG text rendering.

Modified Paths:
--------------
    trunk/foray/foray-core/src/java/org/foray/core/SessionConfig.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java

Modified: trunk/foray/foray-core/src/java/org/foray/core/SessionConfig.java
===================================================================
--- trunk/foray/foray-core/src/java/org/foray/core/SessionConfig.java	2007-06-11 19:17:42 UTC (rev 9748)
+++ trunk/foray/foray-core/src/java/org/foray/core/SessionConfig.java	2007-06-11 20:17:34 UTC (rev 9749)
@@ -74,7 +74,7 @@
         // Skip font-configuration as it can be null.
         // Skip hyphenation-base-directory as it is tied to base-directory.
         put("language", "en", PRECEDENCE_DEFAULT);
-        put("stroke-svg-text", Boolean.TRUE, PRECEDENCE_DEFAULT);
+        put("stroke-svg-text", Boolean.FALSE, PRECEDENCE_DEFAULT);
         put("verbosity", "normal", PRECEDENCE_DEFAULT);
         put("xml-catalog", null, PRECEDENCE_DEFAULT);
         put("mode", "render", PRECEDENCE_DEFAULT);

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java	2007-06-11 19:17:42 UTC (rev 9748)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java	2007-06-11 20:17:34 UTC (rev 9749)
@@ -324,12 +324,6 @@
             final FontConsumer fontConsumer,
             final boolean strokeSVGText) {
         closeTextObject();
-        final PDFGraphics2D graphics = getPDFContent4SVG(contentRectangle,
-                fontConsumer, doc, strokeSVGText);
-        if (graphics == null) {
-            // Error messages have already been logged.
-            return;
-        }
 
         add("q" + EOL);
         if (contentRectangle.width != 0 && contentRectangle.height != 0) {
@@ -347,11 +341,20 @@
             add("W" + EOL);
             add("n" + EOL);
         }
-        add(graphics.getString());
-        add("Q" + EOL);
 
+
+        final PDFGraphics2D graphics = getPDFContent4SVG(contentRectangle,
+                fontConsumer, doc, strokeSVGText);
+        if (graphics == null) {
+            // Error messages have already been logged.
+            return;
+        }
+        final String svgString = graphics.getString();
+        add(svgString);
         // Add annotation accumulated to the list for the current page.
         this.page.addAnnotationList(graphics.getAnnotList());
+
+        add("Q" + EOL);
     }
 
     /**
@@ -422,14 +425,7 @@
         ctx.putBridge(aBridge);
 
         GraphicsNode root;
-        try {
-            root = builder.build(ctx, svgDocument);
-        } catch (final Exception e) {
-            getLogger().error("svg graphic could not be built: "
-                    + e.getMessage());
-            getLogger().error(e.getMessage());
-            return null;
-        }
+        root = builder.build(ctx, svgDocument);
         ctx = null;
         builder = null;
 
@@ -438,13 +434,7 @@
                 contentRectangle, svgDocument, fontConsumer);
         graphics.setGraphicContext(new GraphicContext());
 
-        try {
-            root.paint(graphics);
-        } catch (final Exception e) {
-            getLogger().error("svg graphic could not be rendered: "
-                    + e.getMessage());
-            getLogger().error(e.getMessage());
-        }
+        root.paint(graphics);
         return graphics;
     }
 

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java	2007-06-11 19:17:42 UTC (rev 9748)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java	2007-06-11 20:17:34 UTC (rev 9749)
@@ -91,6 +91,7 @@
      */
     public PDFTextPainter(final Log logger, final FontConsumer consumer) {
         this.logger = logger;
+        this.fontConsumer = consumer;
     }
 
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.