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

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

Revision: 10730
          http://foray.svn.sourceforge.net/foray/?rev=10730&view=rev
Author:   victormote
Date:     2009-04-21 14:42:52 +0000 (Tue, 21 Apr 2009)

Log Message:
-----------
Push the conversion from FontUse to FontPdf further upstream.

Modified Paths:
--------------
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java
    trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java

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	2009-04-21 14:35:31 UTC (rev 10729)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java	2009-04-21 14:42:52 UTC (rev 10730)
@@ -28,16 +28,14 @@
 
 package org.foray.pdf.object;
 
-import org.foray.common.Mime;
 import org.foray.common.WKConstants;
 import org.foray.pdf.PDFGraphicsState;
 
 import org.axsl.font.FontConsumer;
-import org.axsl.font.FontUse;
-import org.axsl.font.output.FontPdf;
 import org.axsl.graphic.Graphic;
 import org.axsl.graphic.GraphicException;
 import org.axsl.pdf.PdfException;
+import org.axsl.pdf.PdfFont;
 import org.axsl.pdf.PdfLineCapStyle;
 import org.axsl.pdf.PdfTextRenderingMode;
 
@@ -128,18 +126,16 @@
     /**
      * {@inheritDoc}
      */
-    public void setFont(final FontUse newFont, final float newFontSize) throws PdfException {
-        final FontPdf fontPdf = (FontPdf) newFont.getFontOutput(Mime.PDF.getMimeString());
-        final PDFFont pdfFont = this.getPDFDocument().getPdfFont(fontPdf);
+    public void setFont(final PdfFont newFont, final float newFontSize) throws PdfException {
         openTextObject();
         boolean anyChange = false;
-        anyChange |= this.getGS().setFont(pdfFont);
+        anyChange |= this.getGS().setFont(newFont);
         anyChange |= this.getGS().setFontSize(newFontSize);
         if (! anyChange) {
             // Nothing needs to change.
             return;
         }
-        final String psStyleName = pdfFont.getName();
+        final String psStyleName = newFont.getName();
         add("/" + psStyleName + " " + newFontSize + " Tf" + EOL);
     }
 

Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2009-04-21 14:35:31 UTC (rev 10729)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2009-04-21 14:42:52 UTC (rev 10730)
@@ -33,6 +33,7 @@
 
 package org.foray.render.pdf;
 
+import org.foray.common.Mime;
 import org.foray.common.WKConstants;
 import org.foray.output.OutputConfig;
 import org.foray.render.PrintRenderer;
@@ -43,6 +44,7 @@
 import org.axsl.common.value.RuleStyle;
 import org.axsl.font.Font;
 import org.axsl.font.FontUse;
+import org.axsl.font.output.FontPdf;
 import org.axsl.galley.Area;
 import org.axsl.galley.AreaNode;
 import org.axsl.galley.Bookmark;
@@ -66,6 +68,7 @@
 import org.axsl.pdf.PdfDocument;
 import org.axsl.pdf.PdfEncryption;
 import org.axsl.pdf.PdfException;
+import org.axsl.pdf.PdfFont;
 import org.axsl.pdf.PdfLineCapStyle;
 import org.axsl.pdf.PdfOutlineItem;
 import org.axsl.pdf.PdfOutlineParent;
@@ -465,7 +468,9 @@
         if (size < 1) {
             return;
         }
-        getContentStream().setFont(fontUse, toPoints(area.traitFontSize()));
+        final FontPdf fontPdf = (FontPdf) fontUse.getFontOutput(Mime.PDF.getMimeString());
+        final PdfFont pdfFont = this.getPDFDocument().getPdfFont(fontPdf);
+        getContentStream().setFont(pdfFont, toPoints(area.traitFontSize()));
 
         /* Paint the text. */
         final CharSequence textToWrite = text.subSequence(startIndex, startIndex + size);


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