[FOray-commit] SF.net SVN: foray: [7312] trunk/foray/foray-areatree/src/java/org/foray/area

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

Revision: 7312
Author:   victormote
Date:     2006-05-29 14:49:32 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7312&view=rev

Log Message:
-----------
Handle axsl changes regarding cursor positioning methods.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java	2006-05-29 21:49:18 UTC (rev 7311)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java	2006-05-29 21:49:32 UTC (rev 7312)
@@ -29,9 +29,13 @@
 import org.axsl.common.Constants;
 import org.axsl.foR.FObj;
 
-
+/**
+ * Common superclass for all areas generated by inline formatting objects.
+ * This should not be confused with the more specific class {@link InlineArea}
+ * which specifically handles areas generated by the fo:inline object.
+ */
 public abstract class AbstractInlineArea extends AreaFlexible
-        implements GeneralInlineArea{
+        implements GeneralInlineArea {
 
     public AbstractInlineArea(FObj generatedBy, Area parentArea) {
         super(generatedBy, parentArea);
@@ -65,12 +69,17 @@
         return crOriginX() + this.ancestorLineArea().alignmentAdjustment();
     }
 
-    public int alignmentPointX() {
-        return this.ancestorLineArea().alignmentPointX();
+    public int baselineX() {
+        return this.rrOriginX();
     }
 
-    public int alignmentPointY() {
-        return this.ancestorLineArea().alignmentPointY();
+    public int baselineY() {
+        return this.ancestorLineArea().alignmentPointY()
+                - this.traitBaselineShift();
     }
 
+    public int traitBaselineShift() {
+        return traitGeneratedBy().traitBaselineShift();
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-05-29 21:49:18 UTC (rev 7311)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-05-29 21:49:32 UTC (rev 7312)
@@ -564,7 +564,16 @@
     }
 
     /**
-     * {@inheritDoc}
+     * Provides the number which would, when added to the before-edge of the
+     * line-area in the block-progression-dimension, produce the
+     * alignment-point for text on this line.
+     * We believe the alignment point, which is defined in XSL-FO Standard 1.0,
+     * Section 7.8.1, to be the same point which is described in the PDF
+     * Reference, Second Edition, Section 5.1.3, as the "glyph origin".
+     * Renderers should rely on this behavior.
+     * @return The distance, in millipoints, between the before-edge of this
+     * line-area and a line parallel to it that runs through the
+     * alignment-point.
      */
     public int alignmentPointOffset() {
         int axis = this.getWritingMode().getAbsoluteAxis(Constants.AXIS_IP);


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