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

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

Revision: 8552
          http://svn.sourceforge.net/foray/?rev=8552&view=rev
Author:   victormote
Date:     2007-01-30 17:37:05 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
Conform to axsl changes for a new inner enumeration class.

Modified Paths:
--------------
    trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java
    trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java
    trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java
    trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java
    trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontOutput.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFString.java

Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java	2007-01-31 01:25:18 UTC (rev 8551)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java	2007-01-31 01:37:05 UTC (rev 8552)
@@ -91,7 +91,7 @@
      * {@link org.axsl.fontR.Font#FONT_SIMPLE},
      * {@link org.axsl.fontR.Font#FONT_COMPOSITE}, and
      * {@link org.axsl.fontR.Font#FONT_COMPLEXITY_UNKNOWN}. */
-    private byte fontComplexity = org.axsl.fontR.Font.FONT_COMPLEXITY_UNKNOWN;
+    private byte fontComplexity = org.axsl.fontR.Font.Complexity.UNKNOWN;
 
     /** The Panose for this font. */
     private Panose panose;

Modified: trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java	2007-01-31 01:25:18 UTC (rev 8551)
+++ trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java	2007-01-31 01:37:05 UTC (rev 8552)
@@ -34,6 +34,8 @@
 import org.foray.font.format.TTFFont;
 import org.foray.font.format.TTFSubSetFile;
 
+import org.axsl.fontR.Font;
+
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -97,7 +99,7 @@
          * TODO: Right now, all TTF fonts are treated as complex fonts. Not
          * sure this is right.
          */
-        this.setFontComplexity(FOrayFont.FONT_COMPOSITE);
+        this.setFontComplexity(Font.Complexity.COMPOSITE);
         this.setPostscriptName(stripWhiteSpace(this.ttf.getPostscriptName()));
         this.setFontName(this.ttf.getFontName());
         this.setFamilyName(this.ttf.getFamilyName());

Modified: trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java	2007-01-31 01:25:18 UTC (rev 8551)
+++ trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java	2007-01-31 01:37:05 UTC (rev 8552)
@@ -39,6 +39,7 @@
 import org.foray.ps.encode.EncodingVector;
 import org.foray.ps.filter.PSFilter;
 
+import org.axsl.fontR.Font;
 import org.axsl.fontR.FontException;
 
 import java.io.IOException;
@@ -114,7 +115,7 @@
             throw new FontException("Unusable Internal Encoding: "
                     + reader.getDescription());
         }
-        this.setFontComplexity(FOrayFont.FONT_SIMPLE);
+        this.setFontComplexity(Font.Complexity.SIMPLE);
         this.setPostscriptName(this.metricsFile.getPostscriptName());
         this.setFontName(this.metricsFile.getFontName());
         this.setFamilyName(this.metricsFile.getFontFamilyName());

Modified: trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java	2007-01-31 01:25:18 UTC (rev 8551)
+++ trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java	2007-01-31 01:37:05 UTC (rev 8552)
@@ -269,7 +269,7 @@
             return false;
         }
         /* Don't try to subset simple fonts. */
-        if (getFontComplexity() == FONT_SIMPLE) {
+        if (getFontComplexity() == Font.Complexity.SIMPLE) {
             return false;
         }
         /* TODO: We don't know how to subset CFF fonts yet. */

Modified: trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontOutput.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontOutput.java	2007-01-31 01:25:18 UTC (rev 8551)
+++ trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontOutput.java	2007-01-31 01:37:05 UTC (rev 8552)
@@ -36,6 +36,7 @@
 import org.foray.font.Subset;
 import org.foray.font.charset.CharSet;
 
+import org.axsl.fontR.Font;
 import org.axsl.fontR.FontUse;
 import org.axsl.fontR.output.FontOutput;
 import org.axsl.fontR.output.FontPDF;
@@ -209,7 +210,7 @@
         if (fsf == null) {
             return null;
         }
-        if (fsf.getFontComplexity() != FOrayFont.FONT_SIMPLE) {
+        if (fsf.getFontComplexity() != Font.Complexity.SIMPLE) {
             final Subset subset = this.fontUse.getSubset();
             if (subset == null) {
                 return fsf.getWidths();

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java	2007-01-31 01:25:18 UTC (rev 8551)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java	2007-01-31 01:37:05 UTC (rev 8552)
@@ -330,7 +330,7 @@
      * {@link PDFFont#TRUETYPE}.
      */
     public static byte getFontSubtype(final FontUse font) {
-        if (font.getFont().getFontComplexity() == Font.FONT_COMPOSITE) {
+        if (font.getFont().getFontComplexity() == Font.Complexity.COMPOSITE) {
             return PDFFont.TYPE0;
         }
         if (font.getFont().getFontFormat() == Font.FORMAT_TYPE1) {

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFString.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFString.java	2007-01-31 01:25:18 UTC (rev 8551)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFString.java	2007-01-31 01:37:05 UTC (rev 8552)
@@ -87,7 +87,7 @@
     private void addCharToBuffer(final StringBuffer buffer,
             final int glyphIndex) {
         final Font font = this.font.getFontUse().getFont();
-        if (font.getFontComplexity() == Font.FONT_COMPOSITE) {
+        if (font.getFontComplexity() == Font.Complexity.COMPOSITE) {
             buffer.append(PDFString.getUnicodeString(glyphIndex));
             return;
         }
@@ -138,7 +138,7 @@
 
     private char startTextDelimiter() {
         final Font font = this.font.getFontUse().getFont();
-        if (font.getFontComplexity() == Font.FONT_COMPOSITE) {
+        if (font.getFontComplexity() == Font.Complexity.COMPOSITE) {
             return '<';
         }
         return '(';
@@ -146,7 +146,7 @@
 
     private char endTextDelimiter() {
         final Font font = this.font.getFontUse().getFont();
-        if (font.getFontComplexity() == Font.FONT_COMPOSITE) {
+        if (font.getFontComplexity() == Font.Complexity.COMPOSITE) {
             return '>';
         }
         return ')';


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