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

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

Revision: 10329
          http://foray.svn.sourceforge.net/foray/?rev=10329&view=rev
Author:   victormote
Date:     2008-02-02 10:22:25 -0800 (Sat, 02 Feb 2008)

Log Message:
-----------
Conform to axsl changes removing a dependency in Font on Common.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
    trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
    trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java
    trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java
    trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2008-02-02 17:16:43 UTC (rev 10328)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2008-02-02 18:22:25 UTC (rev 10329)
@@ -43,6 +43,7 @@
 import org.axsl.fo.fo.Block;
 import org.axsl.fo.fo.prop.IdPa;
 import org.axsl.fo.fo.prop.WritingModePa;
+import org.axsl.font.Font;
 import org.axsl.galley.BackgroundArea;
 
 import java.awt.geom.Rectangle2D;
@@ -1038,4 +1039,16 @@
      */
     public abstract int traitPaddingAfter();
 
+    /**
+     * Returns the {@link Font.WritingMode} associated with this Area.
+     * @return The writing mode (vertical or horizontal) that is associated with this Area.
+     */
+    public Font.WritingMode getFontWritingMode() {
+        final AbsoluteAxis axis = this.getWritingMode().getIpAxis();
+        if (axis == AbsoluteAxis.VERTICAL) {
+            return Font.WritingMode.VERTICAL;
+        }
+        return Font.WritingMode.HORIZONTAL;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2008-02-02 17:16:43 UTC (rev 10328)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2008-02-02 18:22:25 UTC (rev 10329)
@@ -31,7 +31,6 @@
 import org.foray.common.OrderedTreeNode;
 
 import org.axsl.area.AreaTreeException;
-import org.axsl.common.value.AbsoluteAxis;
 import org.axsl.common.value.Baseline;
 import org.axsl.common.value.Conditionality;
 import org.axsl.common.value.LineStackingStrategy;
@@ -727,8 +726,7 @@
      * alignment-point.
      */
     public int alignmentPointOffset() {
-        final AbsoluteAxis axis = this.getWritingMode().getAbsoluteAxis(
-                RelativeAxis.INLINE_PROGRESSION);
+        final Font.WritingMode axis = this.getFontWritingMode();
         /* TODO: The following line is commented out because it relied on logic
          * that is no longer valid, that is, the idea that dominant-baseline
          * could be set on a line or any other block or reference area. This

Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java	2008-02-02 17:16:43 UTC (rev 10328)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java	2008-02-02 18:22:25 UTC (rev 10329)
@@ -30,7 +30,6 @@
 import org.foray.font.charset.CharSet;
 import org.foray.font.format.Kerning;
 
-import org.axsl.common.value.AbsoluteAxis;
 import org.axsl.common.value.Baseline;
 import org.axsl.common.value.Iso15924;
 import org.axsl.font.Font;
@@ -375,7 +374,7 @@
     /**
      * {@inheritDoc}
      */
-    public int baselineOffset(final AbsoluteAxis writingMode,
+    public int baselineOffset(final Font.WritingMode writingMode,
             final Baseline baselineType, final int fontSize) {
         final int baseline = extractBaseline(writingMode, baselineType,
                 fontSize);
@@ -388,30 +387,30 @@
     /**
      * Returns the font's explicit definition of the baseline, if possible.
      * @param writingMode Same as for
-     * {@link #baselineOffset(AbsoluteAxis, Baseline, int)}.
+     * {@link #baselineOffset(Font.WritingMode, Baseline, int)}.
      * @param baselineType Same as for
-     * {@link #baselineOffset(AbsoluteAxis, Baseline, int)}.
+     * {@link #baselineOffset(Font.WritingMode, Baseline, int)}.
      * @param fontSize Same as for
-     * {@link #baselineOffset(AbsoluteAxis, Baseline, int)}.
+     * {@link #baselineOffset(Font.WritingMode, Baseline, int)}.
      * @return The extracted Baseline, as described for
-     * {@link #baselineOffset(AbsoluteAxis, Baseline, int)}, if it exists.
+     * {@link #baselineOffset(Font.WritingMode, Baseline, int)}, if it exists.
      * Otherwise, returns {@link Integer#MIN_VALUE}.
      */
-    public abstract int extractBaseline(AbsoluteAxis writingMode,
+    public abstract int extractBaseline(Font.WritingMode writingMode,
             Baseline baselineType, int fontSize);
 
     /**
      * Provides reasonable estimates of the various baseline values for the
      * font, based on other font metrics.
      * @param writingMode Same as for
-     * {@link #baselineOffset(AbsoluteAxis, Baseline, int)}.
+     * {@link #baselineOffset(Font.WritingMode, Baseline, int)}.
      * @param baselineType Same as for
-     * {@link #baselineOffset(AbsoluteAxis, Baseline, int)}.
+     * {@link #baselineOffset(Font.WritingMode, Baseline, int)}.
      * @param fontSize Same as for
-     * {@link #baselineOffset(AbsoluteAxis, Baseline, int)}.
+     * {@link #baselineOffset(Font.WritingMode, Baseline, int)}.
      * @return The estimated value of the baseline.
      */
-    public int estimateBaseline(final AbsoluteAxis writingMode,
+    public int estimateBaseline(final Font.WritingMode writingMode,
             final Baseline baselineType, final int fontSize) {
         if (baselineType == Baseline.ALPHABETIC) {
             return fontSize + this.getDescender(fontSize);

Modified: trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java	2008-02-02 17:16:43 UTC (rev 10328)
+++ trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java	2008-02-02 18:22:25 UTC (rev 10329)
@@ -35,7 +35,6 @@
 import org.foray.font.format.Panose;
 import org.foray.ps.encode.Encoding;
 
-import org.axsl.common.value.AbsoluteAxis;
 import org.axsl.common.value.Baseline;
 import org.axsl.font.Font;
 
@@ -396,7 +395,7 @@
     /**
      * {@inheritDoc}
      */
-    public int extractBaseline(final AbsoluteAxis writingMode,
+    public int extractBaseline(final Font.WritingMode writingMode,
             final Baseline baselineType, final int fontSize) {
         return Integer.MIN_VALUE;
     }

Modified: trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java	2008-02-02 17:16:43 UTC (rev 10328)
+++ trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java	2008-02-02 18:22:25 UTC (rev 10329)
@@ -34,7 +34,6 @@
 import org.foray.font.format.FontFileReader;
 import org.foray.font.format.Kerning;
 
-import org.axsl.common.value.AbsoluteAxis;
 import org.axsl.common.value.Baseline;
 import org.axsl.font.FontException;
 
@@ -531,7 +530,7 @@
     /**
      * {@inheritDoc}
      */
-    public int extractBaseline(final AbsoluteAxis writingMode,
+    public int extractBaseline(final org.axsl.font.Font.WritingMode writingMode,
             final Baseline baselineType, final int fontSize) {
         return Integer.MIN_VALUE;
     }


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