foray-commit — FOray repository commit log messages

[FOray-commit] SF.net SVN: foray: [7407] trunk/foray/foray-fotree/src/java/org/foray/fotree

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

Revision: 7407
Author:   victormote
Date:     2006-06-05 09:28:17 -0700 (Mon, 05 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7407&view=rev

Log Message:
-----------
Remove "auto" dimension methods, which were interfering with viewport computations.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-06-05 15:54:49 UTC (rev 7406)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-06-05 16:28:17 UTC (rev 7407)
@@ -25,7 +25,6 @@
 package org.foray.fotree;
 
 import org.foray.common.XMLCharacter;
-import org.foray.fotree.fo.prop.Dimension;
 
 import org.axsl.common.Constants;
 import org.axsl.foR.FOTreeException;
@@ -2484,24 +2483,6 @@
     }
     
     /**
-     * Allows a subclass to set the inline-progression-dimension when that
-     * property is set to "auto" by the user. 
-     * @return The "auto" value for the inline-progression-dimension.
-     */
-    protected int autoIPDimension() {
-        return Dimension.DIMENSION_AUTO;
-    }
-    
-    /**
-     * Allows a subclass to set the inline-progression-dimension when that
-     * property is set to "auto" by the user. 
-     * @return The "auto" value for the inline-progression-dimension.
-     */
-    protected int autoBPDimension() {
-        return Dimension.DIMENSION_AUTO;
-    }
-    
-    /**
      * {@inheritDoc}
      */
     public org.axsl.foR.FObj getPreviousSiblingFObj() {

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2006-06-05 15:54:49 UTC (rev 7406)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2006-06-05 16:28:17 UTC (rev 7407)
@@ -1571,57 +1571,33 @@
     }
 
     public int traitBPDimensionMin(int parentAreaCR_BPD) {
-        int nominal = getRelativeDimension(Constants.AXIS_BP,
-                Property.MINIMUM, parentAreaCR_BPD);
-        if (nominal == Dimension.DIMENSION_AUTO) {
-            return this.getFObj().autoBPDimension();
-        }
-        return nominal;
+        return getRelativeDimension(Constants.AXIS_BP, Property.MINIMUM,
+                parentAreaCR_BPD);
     }
 
     public int traitBPDimensionOpt(int parentAreaCR_BPD) {
-        int nominal = getRelativeDimension(Constants.AXIS_BP,
-                Property.OPTIMUM, parentAreaCR_BPD);
-        if (nominal == Dimension.DIMENSION_AUTO) {
-            return this.getFObj().autoBPDimension();
-        }
-        return nominal;
+        return getRelativeDimension(Constants.AXIS_BP, Property.OPTIMUM,
+                parentAreaCR_BPD);
     }
 
     public int traitBPDimensionMax(int parentAreaCR_BPD) {
-        int nominal = getRelativeDimension(Constants.AXIS_BP,
-                Property.MAXIMUM, parentAreaCR_BPD);
-        if (nominal == Dimension.DIMENSION_AUTO) {
-            return this.getFObj().autoBPDimension();
-        }
-        return nominal;
+        return getRelativeDimension(Constants.AXIS_BP, Property.MAXIMUM,
+                parentAreaCR_BPD);
     }
 
     public int traitIPDimensionMin(int parentAreaCR_IPD) {
-        int nominal = getRelativeDimension(Constants.AXIS_IP,
-                Property.MINIMUM, parentAreaCR_IPD);
-        if (nominal == Dimension.DIMENSION_AUTO) {
-            return this.getFObj().autoIPDimension();
-        }
-        return nominal;
+        return getRelativeDimension(Constants.AXIS_IP, Property.MINIMUM,
+                parentAreaCR_IPD);
     }
 
     public int traitIPDimensionOpt(int parentAreaCR_IPD) {
-        int nominal = getRelativeDimension(Constants.AXIS_IP,
-                Property.OPTIMUM, parentAreaCR_IPD);
-        if (nominal == Dimension.DIMENSION_AUTO) {
-            return this.getFObj().autoIPDimension();
-        }
-        return nominal;
+        return getRelativeDimension(Constants.AXIS_IP, Property.OPTIMUM,
+                parentAreaCR_IPD);
     }
 
     public int traitIPDimensionMax(int parentAreaCR_IPD) {
-        int nominal = getRelativeDimension(Constants.AXIS_IP,
-                Property.MAXIMUM, parentAreaCR_IPD);
-        if (nominal == Dimension.DIMENSION_AUTO) {
-            return this.getFObj().autoIPDimension();
-        }
-        return nominal;
+        return getRelativeDimension(Constants.AXIS_IP, Property.MAXIMUM,
+                parentAreaCR_IPD);
     }
 
     public String[] getFontFamily() {

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java	2006-06-05 15:54:49 UTC (rev 7406)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java	2006-06-05 16:28:17 UTC (rev 7407)
@@ -106,14 +106,6 @@
         return traitIPDimensionOpt(lineLength);
     }
 
-    protected int autoIPDimension() {
-        return intrinsicContentWidth();
-    }
-
-    protected int autoBPDimension() {
-        return intrinsicContentHeight();
-    }
-
     /**
      * {@inheritDoc}
      */

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java	2006-06-05 15:54:49 UTC (rev 7406)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java	2006-06-05 16:28:17 UTC (rev 7407)
@@ -87,14 +87,6 @@
         return traitIPDimensionMax(lineLength);
     }
 
-    protected int autoIPDimension() {
-        return intrinsicContentWidth();
-    }
-
-    protected int autoBPDimension() {
-        return intrinsicContentHeight();
-    }
-
     /**
      * {@inheritDoc}
      */


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

[FOray-commit] SF.net SVN: foray: [7406] trunk/foray/foray-fotree/src/java/org/foray/fotree

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

Revision: 7406
Author:   victormote
Date:     2006-06-05 08:54:49 -0700 (Mon, 05 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7406&view=rev

Log Message:
-----------
Remove code supporting no longer needed axsl methods FObj.getHeight and FObj.getWidth.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-06-05 15:50:55 UTC (rev 7405)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-06-05 15:54:49 UTC (rev 7406)
@@ -387,20 +387,6 @@
     /**
      * {@inheritDoc}
      */
-    public int getWidth(int parentAreaCR_width) {
-        return propertyList.getWidth(parentAreaCR_width);
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
-    public int getHeight(int parentAreaCR_height) {
-        return propertyList.getHeight(parentAreaCR_height);
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
     public int getMarginLeft(int widthContainingBlock) {
         return propertyList.getMarginLeft(widthContainingBlock);
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2006-06-05 15:50:55 UTC (rev 7405)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2006-06-05 15:54:49 UTC (rev 7406)
@@ -1257,20 +1257,6 @@
         return TextIndent.getValueNoInstance(fobj, widthContainingBlock);
     }
 
-    public int getWidth(int parentAreaCR_width) {
-        if (getWritingMode().getBPAxis() == Constants.AXIS_HORIZONTAL) {
-            return traitBPDimensionOpt(parentAreaCR_width);
-        }
-        return traitIPDimensionOpt(parentAreaCR_width);
-    }
-
-    public int getHeight(int parentAreaCR_height) {
-        if (getWritingMode().getBPAxis() == Constants.AXIS_VERTICAL) {
-            return traitBPDimensionOpt(parentAreaCR_height);
-        }
-        return traitIPDimensionOpt(parentAreaCR_height);
-    }
-
     public short getPosition() {
         Enumerated property = (Enumerated) getProperty(Constants
                 .FOPROP_POSITION);


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

[FOray-commit] SF.net SVN: foray: [7405] trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java

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

Revision: 7405
Author:   victormote
Date:     2006-06-05 08:50:55 -0700 (Mon, 05 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7405&view=rev

Log Message:
-----------
Remove dependencies on getWidth() method.

Modified Paths:
--------------
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java	2006-06-05 15:47:35 UTC (rev 7404)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java	2006-06-05 15:50:55 UTC (rev 7405)
@@ -290,7 +290,7 @@
     public int calcFixedColumnWidths(TableArea tableArea,
             int maxAllocationWidth) {
         Table node = getTableFO(); 
-        int tableWidth = node.getWidth(maxAllocationWidth);
+        int tableWidth = node.traitIPDimensionOpt(tableArea.crIPD());
         /* Accumulates the total table units used in columns in this table. */
         double totalTableUnits = 0.0;
         /*


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

[FOray-commit] SF.net SVN: foray: [7403] trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java

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

Revision: 7403
Author:   victormote
Date:     2006-06-05 08:36:36 -0700 (Mon, 05 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7403&view=rev

Log Message:
-----------
Remove some unused code.

Modified Paths:
--------------
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java	2006-06-04 14:36:53 UTC (rev 7402)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java	2006-06-05 15:36:36 UTC (rev 7403)
@@ -49,13 +49,6 @@
             setProgress(0);
         }
         
-        // Compute effective width & height of containing Area
-        int height = node.getHeight(area.crBPDNearestGeneratedByBlockLevelFO());
-        int width = node.getWidth(area.crIPDNearestGeneratedByBlockLevelFO());
-        if ((width == 0) && (height == 0)) {
-            width = node.traitRight(0) - node.traitLeft(0);
-            height = node.traitBottom(0) - node.traitTop(0);
-        }
         BlockContainerRA blockContainer = area.makeBlockContainerArea(node);
 
         for (int i = this.getProgress(); i < node.getChildCount(); i++) {


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

[FOray-commit] SF.net SVN: foray: [7401] trunk/foray/doc/web/dev/test.html

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

Revision: 7401
Author:   victormote
Date:     2006-06-04 07:35:27 -0700 (Sun, 04 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7401&view=rev

Log Message:
-----------
Make link to NIST suite an external link.

Modified Paths:
--------------
    trunk/foray/doc/web/dev/test.html
Modified: trunk/foray/doc/web/dev/test.html
===================================================================
--- trunk/foray/doc/web/dev/test.html	2006-06-04 01:21:29 UTC (rev 7400)
+++ trunk/foray/doc/web/dev/test.html	2006-06-04 14:35:27 UTC (rev 7401)
@@ -55,8 +55,8 @@
 
 <h2><a name="resource"/>Resources</h2>
 <ul>
-  <li>The
-<a href="http://xw2k.sdct.itl.nist.gov/brady/xml/generate.asp?tech=../../carmelo/XSL">NIST
+  <li>The <a rel="external"
+href="http://xw2k.sdct.itl.nist.gov/brady/xml/generate.asp?tech=../../carmelo/XSL">NIST
 XSL-FO test suite</a>.</li>
 </ul>
 


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

[FOray-commit] SF.net SVN: foray: [7402] trunk/foray/doc/web/00-rsrc/include/leftmenu-dev.html

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

Revision: 7402
Author:   victormote
Date:     2006-06-04 07:36:53 -0700 (Sun, 04 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7402&view=rev

Log Message:
-----------
Make link to testing page *not* external, and move to proper place on menu.

Modified Paths:
--------------
    trunk/foray/doc/web/00-rsrc/include/leftmenu-dev.html
Modified: trunk/foray/doc/web/00-rsrc/include/leftmenu-dev.html
===================================================================
--- trunk/foray/doc/web/00-rsrc/include/leftmenu-dev.html	2006-06-04 14:35:27 UTC (rev 7401)
+++ trunk/foray/doc/web/00-rsrc/include/leftmenu-dev.html	2006-06-04 14:36:53 UTC (rev 7402)
@@ -52,14 +52,13 @@
     <tr>
       <td class="Bullet1">&nbsp;</td>
       <td class="Menu1">
-        <a class="Menu" rel="external"
-            href="/dev/test.html">Testing</a>
+        <a class="Menu" href="/dev/extensions.html">Extensions</a>
       </td>
     </tr>
     <tr>
       <td class="Bullet1">&nbsp;</td>
       <td class="Menu1">
-        <a class="Menu" href="/dev/extensions.html">Extensions</a>
+        <a class="Menu" href="/dev/test.html">Testing</a>
       </td>
     </tr>
     <tr class="MenuHead">


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

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

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

Revision: 7424
Author:   victormote
Date:     2006-06-05 17:53:11 -0700 (Mon, 05 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7424&view=rev

Log Message:
-----------
Fix computation of size of before-float-area.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java	2006-06-06 00:51:33 UTC (rev 7423)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java	2006-06-06 00:53:11 UTC (rev 7424)
@@ -80,4 +80,17 @@
         return "before-float";
     }
 
+    public RegionRABody getRegionBodyArea() {
+        /* Cast verified at construction. */
+        return (RegionRABody) getParentArea();
+    }
+
+    public void setProgressionDimension(int progressionDimension) {
+        this.getRegionBodyArea().setBeforeFloatDimension(progressionDimension);
+    }
+
+    public void incrementProgressionDimension(int incrementAmount) {
+        this.getRegionBodyArea().incrementBeforeFloatDimension(incrementAmount);
+    }
+
 }


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

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

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

Revision: 7423
Author:   victormote
Date:     2006-06-05 17:51:33 -0700 (Mon, 05 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7423&view=rev

Log Message:
-----------
1. Revert change of three region-body areas to AreaFlexible (change back to AreaFixed).
2. Fix computation of size of footnote-area.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java
    trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java	2006-06-05 23:36:10 UTC (rev 7422)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java	2006-06-06 00:51:33 UTC (rev 7423)
@@ -30,9 +30,10 @@
 
 /**
  * Subclasses are block-areas that do not need to store their own size or
- * spacing information. This includes the page itself, regions, before-float
- * RAs, footnote RAs, the main RA, and absolutely-positioned blocks. The
- * opposite of AreaFixed is {@link AreaFlexible}.
+ * spacing information.
+ * This includes the page itself, regions, before-float RAs, footnote RAs, and
+ * the main RA.
+ * The opposite of AreaFixed is {@link AreaFlexible}.
  */
 public abstract class AreaFixed extends Area {
 

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java	2006-06-05 23:36:10 UTC (rev 7422)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java	2006-06-06 00:51:33 UTC (rev 7423)
@@ -32,7 +32,7 @@
  * Manages the before-float-reference-area. Its parent should always be an
  * instance of RegionRABody.
  */
-public class BeforeFloatRA extends AreaFlexible
+public class BeforeFloatRA extends AreaFixed
         implements org.axsl.areaR.BeforeFloatArea,
         org.axsl.areaW.BeforeFloatRA {
 

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java	2006-06-05 23:36:10 UTC (rev 7422)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java	2006-06-06 00:51:33 UTC (rev 7423)
@@ -31,7 +31,7 @@
 /**
  * Manages the footnote reference area for a page.
  */
-public class FootnoteRA extends AreaFlexible
+public class FootnoteRA extends AreaFixed
     implements org.axsl.areaR.FootnoteArea, org.axsl.areaW.FootnoteRA {
 
     public FootnoteRA(FObj generatedBy, RegionRABody parentArea) {
@@ -66,7 +66,7 @@
         // The bpd of the main-reference-area ...
         int offset = getParentArea().crBPD();
         // ... less the size of the footnote-reference-area
-        offset -= ((RegionRABody) getParentArea()).getDimensionFootnoteRA();
+        offset -= getRegionBodyArea().getDimensionFootnoteRA();
         return offset;
     }
 
@@ -91,4 +91,17 @@
         return "footnote";
     }
 
+    public RegionRABody getRegionBodyArea() {
+        /* Cast verified at construction. */
+        return (RegionRABody) getParentArea();
+    }
+
+    public void setProgressionDimension(int progressionDimension) {
+        this.getRegionBodyArea().setFootnoteDimension(progressionDimension);
+    }
+
+    public void incrementProgressionDimension(int incrementAmount) {
+        this.getRegionBodyArea().incrementFootnoteDimension(incrementAmount);
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java	2006-06-05 23:36:10 UTC (rev 7422)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java	2006-06-06 00:51:33 UTC (rev 7423)
@@ -39,7 +39,7 @@
  * Manages the main-reference-area. Its parent should always be an instance of
  * RegionRABody, and its children should always be instances of SpanRA.
  */
-public class MainRA extends AreaFlexible implements MainReferenceArea,
+public class MainRA extends AreaFixed implements MainReferenceArea,
         org.axsl.areaW.MainRA {
 
     private boolean isNewSpanArea;

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2006-06-05 23:36:10 UTC (rev 7422)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2006-06-06 00:51:33 UTC (rev 7423)
@@ -208,4 +208,20 @@
         return "region-body";
     }
 
+    public void setFootnoteDimension(int newDimension) {
+        this.dimensionFootnoteRA = newDimension;
+    }
+
+    public void incrementFootnoteDimension(int newDimension) {
+        this.dimensionFootnoteRA += newDimension;
+    }
+
+    public void setBeforeFloatDimension(int newDimension) {
+        this.dimensionBeforeFloatRA = newDimension;
+    }
+
+    public void incrementBeforeFloatDimension(int incrementAmount) {
+        this.dimensionBeforeFloatRA += incrementAmount;
+    }
+
 }


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

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

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

Revision: 7422
Author:   victormote
Date:     2006-06-05 16:36:10 -0700 (Mon, 05 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7422&view=rev

Log Message:
-----------
Make the three region-body areas AreaFlexible so that their size will adjust.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java	2006-06-05 23:35:14 UTC (rev 7421)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java	2006-06-05 23:36:10 UTC (rev 7422)
@@ -32,7 +32,7 @@
  * Manages the before-float-reference-area. Its parent should always be an
  * instance of RegionRABody.
  */
-public class BeforeFloatRA extends AreaFixed
+public class BeforeFloatRA extends AreaFlexible
         implements org.axsl.areaR.BeforeFloatArea,
         org.axsl.areaW.BeforeFloatRA {
 

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java	2006-06-05 23:35:14 UTC (rev 7421)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java	2006-06-05 23:36:10 UTC (rev 7422)
@@ -31,7 +31,7 @@
 /**
  * Manages the footnote reference area for a page.
  */
-public class FootnoteRA extends AreaFixed
+public class FootnoteRA extends AreaFlexible
     implements org.axsl.areaR.FootnoteArea, org.axsl.areaW.FootnoteRA {
 
     public FootnoteRA(FObj generatedBy, RegionRABody parentArea) {

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java	2006-06-05 23:35:14 UTC (rev 7421)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java	2006-06-05 23:36:10 UTC (rev 7422)
@@ -39,7 +39,7 @@
  * Manages the main-reference-area. Its parent should always be an instance of
  * RegionRABody, and its children should always be instances of SpanRA.
  */
-public class MainRA extends AreaFixed implements MainReferenceArea,
+public class MainRA extends AreaFlexible implements MainReferenceArea,
         org.axsl.areaW.MainRA {
 
     private boolean isNewSpanArea;


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

[FOray-commit] SF.net SVN: foray: [7421] trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java

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

Revision: 7421
Author:   victormote
Date:     2006-06-05 16:35:14 -0700 (Mon, 05 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7421&view=rev

Log Message:
-----------
Conform to axsl change in which AreaFixed and AreaFlexible interfaces are removed.

Modified Paths:
--------------
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java	2006-06-05 22:58:00 UTC (rev 7420)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java	2006-06-05 23:35:14 UTC (rev 7421)
@@ -25,7 +25,6 @@
 package org.foray.pioneer;
 
 import org.axsl.areaW.Area;
-import org.axsl.areaW.AreaFlexible;
 
 import org.axsl.areaW.AreaWException;
 import org.axsl.foR.fo.Block;
@@ -66,13 +65,6 @@
         int status;
         BlockPL blockPL = (BlockPL) getLayoutProxy(block);
         status = blockPL.layout(area);
-        /*
-         * I guess this code allows list-item-label and list-item-body to
-         * be side-by-side.
-         */
-        if (area instanceof AreaFlexible) {
-//           area.addDisplaySpace(-block.getAreaHeight());
-        }
         return status;
     }
 


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

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

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

Revision: 7420
Author:   victormote
Date:     2006-06-05 15:58:00 -0700 (Mon, 05 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7420&view=rev

Log Message:
-----------
Remove absolutely-positioned items from the computation of parent size.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2006-06-05 20:20:23 UTC (rev 7419)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2006-06-05 22:58:00 UTC (rev 7420)
@@ -959,6 +959,8 @@
      */
     public abstract int progressionDimensionAvailable();
 
+    public abstract int getProgressionDimension();
+
     public abstract void setProgressionDimension(int progressionDimension);
 
     public abstract void setMinimumProgressionDimension(int minimumPD);
@@ -1221,4 +1223,23 @@
         return true;
     }
 
+    public boolean shouldAdjustParentPD() {
+        /* If not in the normal flow, the parent's dimensions are not used up
+         * as this grows. */
+        if (! this.isInNormalFlow()) {
+            return false;
+        }
+        Area parent = getParentArea();
+        if (parent instanceof LineArea) {
+            /* LineArea children grow in the IPD, LineArea grows in the BPD. */
+            return false;
+        }
+        if (parent instanceof TableRowContainer) {
+            /* TableRowContainer children grow in the IPD, LineArea grows in the
+             * BPD. */
+            return false;
+        }
+        return true;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java	2006-06-05 20:20:23 UTC (rev 7419)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java	2006-06-05 22:58:00 UTC (rev 7420)
@@ -55,6 +55,14 @@
         return dimension;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int getProgressionDimension() {
+        /* No-op. Exists here to minimize casts. */
+        return 0;
+    }
+
     public void setProgressionDimension(int progressionDimension) {
         // No-op. Exists here to minimize casts.
         return;

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java	2006-06-05 20:20:23 UTC (rev 7419)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java	2006-06-05 22:58:00 UTC (rev 7420)
@@ -142,54 +142,27 @@
      * @param progressionDimension The progressionDimension to set.
      */
     public void setProgressionDimension(int progressionDimension) {
-        Area parent = getParentArea();
-        if (parent instanceof AreaFlexible && ! (parent instanceof LineArea)
-                && ! (parent instanceof TableRowContainer)) {
-            /*
-             * LineArea and TableRowContainer use progressionDimension
-             * differently than other classes, because they are "pivots" that
-             * switch between inline-progress-direction and
-             * block-progression-direction.
-             */
-            AreaFlexible afParent = (AreaFlexible) parent;
-            adjustParentPD(progressionDimension, afParent);
+        if (shouldAdjustParentPD()) {
+            Area parent = getParentArea();
+            /* The new value. */
+            int incrementAmount = progressionDimension;
+            /* Subtract the old value. */
+            incrementAmount -= this.getProgressionDimension();
+            parent.incrementProgressionDimension(incrementAmount);
         }
         this.progressionDimension = progressionDimension;
     }
 
     /**
-     * @param progressionDimension
-     * @param afParent
-     */
-    protected void adjustParentPD(int progressionDimension,
-            AreaFlexible afParent) {
-        int value = afParent.getProgressionDimension();
-        // Subtract the old value
-        value -= this.getProgressionDimension();
-        // Add the new value
-        value += progressionDimension;
-        // Set the recomputed value;
-        afParent.setProgressionDimension(value);
-    }
-
-    /**
      * Change the progressionDimension for this Area by incrementAmount.
      * See {@link #getProgressionDimension()} for a description of
      * "progression dimension".
      * @param incrementAmount The amount to adjust the progressionDimension.
      */
     public void incrementProgressionDimension(int incrementAmount) {
-        Area parent = getParentArea();
-        if (parent instanceof AreaFlexible
-                && ! (parent instanceof LineArea)
-                && this.isInNormalFlow()) {
-            /*
-             * LineArea uses progressionDimension differently than any other
-             * class, because it is the "pivot" that switches between
-             * inline-progress-direction and block-progression-dimension.
-             */
-            AreaFlexible afParent = (AreaFlexible) parent;
-            afParent.incrementProgressionDimension(incrementAmount);
+        if (shouldAdjustParentPD()) {
+            Area parent = getParentArea();
+            parent.incrementProgressionDimension(incrementAmount);
         }
         this.progressionDimension += incrementAmount;
     }


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

[FOray-commit] SF.net SVN: foray: [7400] trunk/foray/doc/web/dev

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

Revision: 7400
Author:   victormote
Date:     2006-06-03 18:21:29 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7400&view=rev

Log Message:
-----------
Add a testing document.

Modified Paths:
--------------
    trunk/foray/doc/web/00-rsrc/include/leftmenu-dev.html
    trunk/foray/doc/web/dev/index.html

Added Paths:
-----------
    trunk/foray/doc/web/dev/test.html
Modified: trunk/foray/doc/web/00-rsrc/include/leftmenu-dev.html
===================================================================
--- trunk/foray/doc/web/00-rsrc/include/leftmenu-dev.html	2006-06-04 00:46:49 UTC (rev 7399)
+++ trunk/foray/doc/web/00-rsrc/include/leftmenu-dev.html	2006-06-04 01:21:29 UTC (rev 7400)
@@ -52,6 +52,13 @@
     <tr>
       <td class="Bullet1">&nbsp;</td>
       <td class="Menu1">
+        <a class="Menu" rel="external"
+            href="/dev/test.html">Testing</a>
+      </td>
+    </tr>
+    <tr>
+      <td class="Bullet1">&nbsp;</td>
+      <td class="Menu1">
         <a class="Menu" href="/dev/extensions.html">Extensions</a>
       </td>
     </tr>

Modified: trunk/foray/doc/web/dev/index.html
===================================================================
--- trunk/foray/doc/web/dev/index.html	2006-06-04 00:46:49 UTC (rev 7399)
+++ trunk/foray/doc/web/dev/index.html	2006-06-04 01:21:29 UTC (rev 7400)
@@ -28,7 +28,6 @@
   <li><a href="#indy-api">Independent APIs</a></li>
   <li><a href="#data">Data Model</a></li>
   <li><a href="#settled">Settled Principles</a></li>
-  <li><a href="#test">Automated Testing</a></li>
   <li><a href="#patches">Patches</a></li>
   <li><a href="#infra">Infrastructure</a></li>
   <li><a href="#misc">Miscellaneous Notes</a></li>
@@ -202,32 +201,6 @@
 development, not vice versa.</li>
 </ul>
 
-<h2><a name="test"/>Automated Testing</h2>
-<p>FOray would like to move toward a test-driven development model.
-The most important step seems to be to provide a framework for functional
-testing.
-Unit testing may be beneficial in the long-run, but the functional testing
-hole needs to get filled first.
-Then perhaps a strategy for unit testing will become more clear.
-There are three main places where testing can and should be done:</p>
-
-<ul>
-  <li>FOTree. This tests parsing, properties, inheritance, computed values,
-etc.
-This can probably be done against the aXSL interface, so that the tests can be
-used by other projects.</li>
-  <li>AreaTree. This tests the layout engine and the supporting AreaTree
-capabilities.
-FOP has developed a suitable strategy for this task which essentially puts
-the resulting AreaTree into a DOM, then uses XPath expressionis to see if
-what is there is correct.
-This is probably worth using.</li>
-  <li>Rendering. This tests the actual output document.
-Both PDF and PostScript can be created in text format, so using a simple
-"diff" against expected output should work well.
-The NCIS test suite should be investigated for this.</li>
-</ul>
-
 <h2><a name="patches"/>Patches</h2>
 <p>Patches and any other contributions of code or other resources must be owned
 by the person submitting or contributing. In other words, don’t give it away

Added: trunk/foray/doc/web/dev/test.html
===================================================================
--- trunk/foray/doc/web/dev/test.html	                        (rev 0)
+++ trunk/foray/doc/web/dev/test.html	2006-06-04 01:21:29 UTC (rev 7400)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+
+<head>
+  <title>FOray: Testing</title>
+  <meta name="content-revised"
+    content="$Date$"/>
+  <!--#include virtual="/00-rsrc/include/standard-head.html" -->
+</head>
+
+<body>
+<!--#include virtual="/00-rsrc/include/leftmenu-dev.html" -->
+
+<h1>FOray: Testing</h1>
+
+<h2>Contents</h2>
+<ul>
+  <li><a href="#intro">Introduction</a></li>
+  <li><a href="#resource">Resources</a></li>
+</ul>
+
+<h2><a name="intro"/>Introduction</h2>
+<p>Although not realized yet, FOray desires to operate in a test-driven
+environment.
+This page will be used to document the various testing tools as they are
+built.</p>
+
+<p>The most important step seems to be to provide a framework for functional
+testing.
+Unit testing may be beneficial in the long-run, but the functional testing
+hole needs to get filled first.
+Then perhaps a strategy for unit testing will become more clear.
+There are three main places where testing can and should be done:</p>
+
+<ul>
+  <li>FOTree. This tests parsing, properties, inheritance, computed values,
+etc.
+This can probably be done against the aXSL interface, so that the tests can be
+used by other projects.</li>
+  <li>AreaTree. This tests the layout engine and the supporting AreaTree
+capabilities.
+FOP has developed a suitable strategy for this task which essentially puts
+the resulting AreaTree into a DOM, then uses XPath expressionis to see if
+what is there is correct.
+This is probably worth using.</li>
+  <li>Rendering. This tests the actual output document.
+Both PDF and PostScript can be created in text format, so using a simple
+"diff" against expected output should work well.
+The NIST test suite should be investigated for this.</li>
+</ul>
+
+<h2><a name="resource"/>Resources</h2>
+<ul>
+  <li>The
+<a href="http://xw2k.sdct.itl.nist.gov/brady/xml/generate.asp?tech=../../carmelo/XSL">NIST
+XSL-FO test suite</a>.</li>
+</ul>
+
+
+<!--#include virtual="/00-rsrc/include/leftmenu-end.html" -->
+</body>
+</html>


Property changes on: trunk/foray/doc/web/dev/test.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native


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

[FOray-commit] SF.net SVN: foray: [7399] trunk/foray/foray-app/src/java/org/foray/demo/embed/tools

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

Revision: 7399
Author:   victormote
Date:     2006-06-03 17:46:49 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7399&view=rev

Log Message:
-----------
Add some missing package-level javadoc.

Added Paths:
-----------
    trunk/foray/foray-app/src/java/org/foray/demo/embed/model/package.html
    trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/package.html
Added: trunk/foray/foray-app/src/java/org/foray/demo/embed/model/package.html
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/embed/model/package.html	                        (rev 0)
+++ trunk/foray/foray-app/src/java/org/foray/demo/embed/model/package.html	2006-06-04 00:46:49 UTC (rev 7399)
@@ -0,0 +1,7 @@
+<html>
+<title>org.foray.font Package</title>
+<body>
+<p>A sample application demonstrating use of FOray embedded in another
+application.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-app/src/java/org/foray/demo/embed/model/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/package.html
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/package.html	                        (rev 0)
+++ trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/package.html	2006-06-04 00:46:49 UTC (rev 7399)
@@ -0,0 +1,6 @@
+<html>
+<title>org.foray.font Package</title>
+<body>
+<p>Utility classes useful when embedding FOray in other applications.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native


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

[FOray-commit] SF.net SVN: foray: [7398] trunk/foray/foray-ps/src/java/org/foray/ps

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

Revision: 7398
Author:   victormote
Date:     2006-06-03 17:40:46 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7398&view=rev

Log Message:
-----------
Add some missing package-level javadoc.

Modified Paths:
--------------
    trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/package.html
    trunk/foray/foray-ps/src/java/org/foray/ps/package.html

Added Paths:
-----------
    trunk/foray/foray-app/src/java/org/foray/app/test/package.html
    trunk/foray/foray-app/src/java/org/foray/demo/embed/package.html
    trunk/foray/foray-app/src/java/org/foray/demo/package.html
    trunk/foray/foray-app/src/java/org/foray/demo/servlet/package.html
    trunk/foray/foray-common/src/java/org/foray/common/package.html
    trunk/foray/foray-font/src/java/org/foray/font/charset/package.html
    trunk/foray/foray-font/src/java/org/foray/font/format/package.html
    trunk/foray/foray-font/src/java/org/foray/font/output/package.html
    trunk/foray/foray-font/src/java/org/foray/font/package.html
    trunk/foray/foray-graphic/src/java/org/foray/graphic/package.html
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/package.html
    trunk/foray/foray-ps/src/java/org/foray/ps/filter/package.html
    trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/package.html
    trunk/foray/foray-ps/src/java/org/foray/ps/java2d/package.html
    trunk/foray/foray-ps/src/java/org/foray/ps/pdf/package.html
    trunk/foray/foray-ps/src/java/org/foray/ps/readonly/package.html
    trunk/foray/foray-text/src/java/org/foray/text/line/package.html
    trunk/foray/foray-text/src/java/org/foray/text/line/solitary/package.html
    trunk/foray/foray-text/src/java/org/foray/text/package.html
Added: trunk/foray/foray-app/src/java/org/foray/app/test/package.html
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/test/package.html	                        (rev 0)
+++ trunk/foray/foray-app/src/java/org/foray/app/test/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,6 @@
+<html>
+<title>org.foray.app.test Package</title>
+<body>
+<p>Classes useful for testing the FOray application and its various modules.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-app/src/java/org/foray/app/test/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-app/src/java/org/foray/demo/embed/package.html
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/embed/package.html	                        (rev 0)
+++ trunk/foray/foray-app/src/java/org/foray/demo/embed/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,6 @@
+<html>
+<title>org.foray.font Package</title>
+<body>
+<p>Classes useful for demonstrating FOray embedded in other applications.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-app/src/java/org/foray/demo/embed/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-app/src/java/org/foray/demo/package.html
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/package.html	                        (rev 0)
+++ trunk/foray/foray-app/src/java/org/foray/demo/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,7 @@
+<html>
+<title>org.foray.font Package</title>
+<body>
+<p>Classes useful for demonstrating FOray's capabilities, which may be useful
+superclasses for actual applications.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-app/src/java/org/foray/demo/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-app/src/java/org/foray/demo/servlet/package.html
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/servlet/package.html	                        (rev 0)
+++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,6 @@
+<html>
+<title>org.foray.font Package</title>
+<body>
+<p>Classes demonstrating use of FOray as a servlet.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-app/src/java/org/foray/demo/servlet/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-common/src/java/org/foray/common/package.html
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/package.html	                        (rev 0)
+++ trunk/foray/foray-common/src/java/org/foray/common/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,7 @@
+<html>
+<title>org.foray.common Package</title>
+<body>
+<p>Low-level utility classes accessible to the entire application.
+These classes are generally not instantiable and have static methods.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-common/src/java/org/foray/common/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-font/src/java/org/foray/font/charset/package.html
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/charset/package.html	                        (rev 0)
+++ trunk/foray/foray-font/src/java/org/foray/font/charset/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,6 @@
+<html>
+<title>org.foray.font.charset Package</title>
+<body>
+<p>Classes representing various character sets.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-font/src/java/org/foray/font/charset/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-font/src/java/org/foray/font/format/package.html
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/package.html	                        (rev 0)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,7 @@
+<html>
+<title>org.foray.font.format Package</title>
+<body>
+<p>Classes handling the low-level details of specific font formats, such as
+Type 1, TrueType, Adobe Font Metrics, etc.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-font/src/java/org/foray/font/format/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-font/src/java/org/foray/font/output/package.html
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/output/package.html	                        (rev 0)
+++ trunk/foray/foray-font/src/java/org/foray/font/output/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,7 @@
+<html>
+<title>org.foray.font.output Package</title>
+<body>
+<p>Helper classes useful for embedding fonts or obtaining font information that
+is specific to an output format (like PDF or PostScript).</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-font/src/java/org/foray/font/output/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-font/src/java/org/foray/font/package.html
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/package.html	                        (rev 0)
+++ trunk/foray/foray-font/src/java/org/foray/font/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,6 @@
+<html>
+<title>org.foray.font Package</title>
+<body>
+<p>Classes providing read-only access to font files and system font classes.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-font/src/java/org/foray/font/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/package.html
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/package.html	2006-06-04 00:01:41 UTC (rev 7397)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -1,6 +1,7 @@
-<HTML>
-<TITLE>org.foray.graphic.analyzer Package</TITLE>
-<BODY>
-<P>Classes for reading Image files.</P>
-</BODY>
-</HTML>
\ No newline at end of file
+<html>
+<title>org.foray.graphic.factory Package</title>
+<body>
+<p>Factory classes that identify graphic formats and create instances to
+read them.</p>
+</body>
+</html>
\ No newline at end of file

Added: trunk/foray/foray-graphic/src/java/org/foray/graphic/package.html
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/package.html	                        (rev 0)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,6 @@
+<html>
+<title>org.foray.graphic Package</title>
+<body>
+<p>Classes providing read-only access to graphic files.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-graphic/src/java/org/foray/graphic/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-ps/src/java/org/foray/ps/encode/package.html
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/package.html	                        (rev 0)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,7 @@
+<html>
+<title>org.foray.ps.encode Package</title>
+<body>
+<p>Classes modelling the various encoding vector and CMap concepts that map a
+Unicode code point to a font glyph index.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-ps/src/java/org/foray/ps/encode/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-ps/src/java/org/foray/ps/filter/package.html
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/filter/package.html	                        (rev 0)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/filter/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,7 @@
+<html>
+<title>org.foray.font Package</title>
+<body>
+<p>Classes managing the various PostScript filter concepts, such as Flate
+and ASCII85.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-ps/src/java/org/foray/ps/filter/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/package.html
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/package.html	                        (rev 0)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,6 @@
+<html>
+<title>org.foray.ps.java2d.demo Package</title>
+<body>
+<p>Classes demonstrating the Java2D PostScript implementation.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-ps/src/java/org/foray/ps/java2d/package.html
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/java2d/package.html	                        (rev 0)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/java2d/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,7 @@
+<html>
+<title>org.foray.ps.java2d Package</title>
+<body>
+<p>An implementation of the PostScript interpreter that renders to the Java AWT
+system.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-ps/src/java/org/foray/ps/java2d/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/package.html
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/package.html	2006-06-04 00:01:41 UTC (rev 7397)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -1,6 +1,6 @@
-<HTML>
-<TITLE>org.foray.psinterpret Package</TITLE>
-<BODY>
-<P>Classes for handling the intepretation of PostScript input.</P>
-</BODY>
-</HTML>
+<html>
+<title>org.foray.psinterpret Package</title>
+<body>
+<p>Classes for handling the intepretation of PostScript input.</p>
+</body>
+</html>

Added: trunk/foray/foray-ps/src/java/org/foray/ps/pdf/package.html
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/pdf/package.html	                        (rev 0)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/pdf/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,6 @@
+<html>
+<title>org.foray.ps.pdf Package</title>
+<body>
+<p>An implementation of the PostScript interpreter that converts to PDF.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-ps/src/java/org/foray/ps/pdf/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-ps/src/java/org/foray/ps/readonly/package.html
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/readonly/package.html	                        (rev 0)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/readonly/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,8 @@
+<html>
+<title>org.foray.ps.readonly Package</title>
+<body>
+<p>An implementation of the PostScript interpreter that writes no output, but makes
+the PostScript dictionaries and state available.
+This is useful for obtaining information from Type 1 fonts.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-ps/src/java/org/foray/ps/readonly/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-text/src/java/org/foray/text/line/package.html
===================================================================
--- trunk/foray/foray-text/src/java/org/foray/text/line/package.html	                        (rev 0)
+++ trunk/foray/foray-text/src/java/org/foray/text/line/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,6 @@
+<html>
+<title>org.foray.text.line Package</title>
+<body>
+<p>Abstract classes for handling line-breaking.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-text/src/java/org/foray/text/line/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-text/src/java/org/foray/text/line/solitary/package.html
===================================================================
--- trunk/foray/foray-text/src/java/org/foray/text/line/solitary/package.html	                        (rev 0)
+++ trunk/foray/foray-text/src/java/org/foray/text/line/solitary/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,6 @@
+<html>
+<title>org.foray.text.line.solitary Package</title>
+<body>
+<p>A concrete "eager" line-breaking strategy.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-text/src/java/org/foray/text/line/solitary/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-text/src/java/org/foray/text/package.html
===================================================================
--- trunk/foray/foray-text/src/java/org/foray/text/package.html	                        (rev 0)
+++ trunk/foray/foray-text/src/java/org/foray/text/package.html	2006-06-04 00:40:46 UTC (rev 7398)
@@ -0,0 +1,6 @@
+<html>
+<title>org.foray.text Package</title>
+<body>
+<p>Classes for handling text services like hyphenation and line-breaking.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-text/src/java/org/foray/text/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native


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

[FOray-commit] SF.net SVN: foray: [7397] trunk/foray/foray-render/src/java/org/foray/render

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

Revision: 7397
Author:   victormote
Date:     2006-06-03 17:01:41 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7397&view=rev

Log Message:
-----------
Add some missing package-level javadoc.

Modified Paths:
--------------
    trunk/foray/foray-output/src/java/org/foray/output/package.html
    trunk/foray/foray-render/src/java/org/foray/render/package.html
    trunk/foray/foray-render/src/java/org/foray/render/ps/package.html

Added Paths:
-----------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/package.html
    trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/package.html
    trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/package.html
    trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/package.html
    trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/package.html
    trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/package.html
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/package.html
    trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/package.html
    trunk/foray/foray-pretty/src/java/org/foray/pretty/package.html
    trunk/foray/foray-render/src/java/org/foray/render/awt/package.html
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/package.html
Added: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/package.html
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/package.html	                        (rev 0)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/package.html	2006-06-04 00:01:41 UTC (rev 7397)
@@ -0,0 +1,7 @@
+<html>
+<title>Package org.foray.fotree.fo</title>
+<body>
+<p>Namespace and Factory classes for objects in the fo: (XSL Formatting Objects)
+namespace.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/package.html
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/package.html	                        (rev 0)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/package.html	2006-06-04 00:01:41 UTC (rev 7397)
@@ -0,0 +1,6 @@
+<html>
+<title>Package org.foray.fotree.foray</title>
+<body>
+<p>Namespace and Factory classes for objects in the foray: (custom) namespace.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/package.html
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/package.html	                        (rev 0)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/package.html	2006-06-04 00:01:41 UTC (rev 7397)
@@ -0,0 +1,7 @@
+<html>
+<title>Package org.foray.fotree.svg.obj</title>
+<body>
+<p>Classes representing objects in the svg: (Scalable Vector
+Graphics) namespace.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/package.html
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/package.html	                        (rev 0)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/package.html	2006-06-04 00:01:41 UTC (rev 7397)
@@ -0,0 +1,7 @@
+<html>
+<title>Package org.foray.fotree.svg</title>
+<body>
+<p>Namespace and Factory classes for objects in the svg: (Scalable Vector
+Graphics) namespace.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/package.html
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/package.html	                        (rev 0)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/package.html	2006-06-04 00:01:41 UTC (rev 7397)
@@ -0,0 +1,7 @@
+<html>
+<title>Package org.foray.fotree.xml</title>
+<body>
+<p>Namespace and Factory classes for objects in the xml: (Generic XML)
+namespace.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/package.html
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/package.html	                        (rev 0)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/package.html	2006-06-04 00:01:41 UTC (rev 7397)
@@ -0,0 +1,6 @@
+<html>
+<title>Package org.foray.fotree.xml.prop</title>
+<body>
+<p>Classes representing generic XML properties.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Modified: trunk/foray/foray-output/src/java/org/foray/output/package.html
===================================================================
--- trunk/foray/foray-output/src/java/org/foray/output/package.html	2006-06-03 23:30:16 UTC (rev 7396)
+++ trunk/foray/foray-output/src/java/org/foray/output/package.html	2006-06-04 00:01:41 UTC (rev 7397)
@@ -1,7 +1,14 @@
 <html>
-<title>Package org.foray.render.mif Package</title>
+<title>Package org.foray.output</title>
 <body>
-<p>Classes for rendering the Area Tree to MIF (Maker Interchange Format, used
-by Adobe FrameMaker).</p>
+<p>Classes for converting an FO Tree (not an Area Tree) to some specific output
+medium.
+Classes in this package are useful for converting an FO document to an output
+medium that knows how to do its own layout.
+Examples include Rich Text Format (RTF), readable by Microsoft Word,
+and Maker Interchange Format (MIF), readable by Adobe FrameMaker.
+For output media that must be laid out prior to creation, that is, that should be
+created from an Area Tree, see the org.foray.render package.
+</p>
 </body>
 </html>

Added: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/package.html
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/package.html	                        (rev 0)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/package.html	2006-06-04 00:01:41 UTC (rev 7397)
@@ -0,0 +1,7 @@
+<html>
+<title>Package org.foray.pdf.object</title>
+<body>
+<p>Classes representing various PDF objects, used in the construction of a
+PDF document.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/package.html
===================================================================
--- trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/package.html	                        (rev 0)
+++ trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/package.html	2006-06-04 00:01:41 UTC (rev 7397)
@@ -0,0 +1,6 @@
+<html>
+<title>Package org.foray.pretty.dtd</title>
+<body>
+<p>Classes partially modelling an XML Document Type Definition (DTD).</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-pretty/src/java/org/foray/pretty/package.html
===================================================================
--- trunk/foray/foray-pretty/src/java/org/foray/pretty/package.html	                        (rev 0)
+++ trunk/foray/foray-pretty/src/java/org/foray/pretty/package.html	2006-06-04 00:01:41 UTC (rev 7397)
@@ -0,0 +1,6 @@
+<html>
+<title>Package org.foray.pretty</title>
+<body>
+<p>Classes for pretty-printing XML documents.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-pretty/src/java/org/foray/pretty/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-render/src/java/org/foray/render/awt/package.html
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/package.html	                        (rev 0)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/package.html	2006-06-04 00:01:41 UTC (rev 7397)
@@ -0,0 +1,7 @@
+<html>
+<title>Package org.foray.render.awt</title>
+<body>
+<p>Classes for rendering the Area Tree to Java's Abstract Windowing Toolkit
+  (AWT).</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-render/src/java/org/foray/render/awt/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/package.html
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/package.html	                        (rev 0)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/package.html	2006-06-04 00:01:41 UTC (rev 7397)
@@ -0,0 +1,6 @@
+<html>
+<title>Package org.foray.render.awt</title>
+<body>
+<p>Classes for displaying a rendered AWT document to the screen.</p>
+</body>
+</html>


Property changes on: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/package.html
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Modified: trunk/foray/foray-render/src/java/org/foray/render/package.html
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/package.html	2006-06-03 23:30:16 UTC (rev 7396)
+++ trunk/foray/foray-render/src/java/org/foray/render/package.html	2006-06-04 00:01:41 UTC (rev 7397)
@@ -1,9 +1,9 @@
 <html>
-<title>org.foray.render Package</title>
+<title>Package org.foray.render</title>
 <body>
-  <p>Each Renderer is responsible to convert the contents of an AreaTree into
-an output medium. For example, the PDF Renderer converts an AreaTree into a
-PDF document. This package contains an abstract Renderer and some other classes
+  <p>Classes for rendering an Area Tree to some output medium.
+For example, the PDF Renderer converts an AreaTree into a PDF document.
+This package contains an abstract Renderer and some other classes
 helpful to the rendering process. The Renderers themselves are in
 sub-packages.</p>
 </body>

Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/package.html
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/package.html	2006-06-03 23:30:16 UTC (rev 7396)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/package.html	2006-06-04 00:01:41 UTC (rev 7397)
@@ -1,5 +1,5 @@
 <html>
-<title>Package org.foray.render.ps Package</title>
+<title>Package org.foray.render.ps</title>
 <body>
 <p>Classes for rendering the Area Tree to Postscript.</p>
 </body>


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

[FOray-commit] SF.net SVN: foray: [7396] trunk/foray/foray-render/src/java/org/foray/render

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

Revision: 7396
Author:   victormote
Date:     2006-06-03 16:30:16 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7396&view=rev

Log Message:
-----------
Conform to axsl change: For greater flexibility with other color spaces, return a java Color instead of the r, g, b components.

Modified Paths:
--------------
    trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
Modified: trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java	2006-06-03 23:30:08 UTC (rev 7395)
+++ trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java	2006-06-03 23:30:16 UTC (rev 7396)
@@ -173,18 +173,12 @@
         if (th != 0) {
             switch (st) {
             case Constants.FOVAL_DOUBLE:
-                drawLine(rx, ry, rx + w, ry, th / 3, st,
-                        new Color(area.getRed(), area.getGreen(),
-                                     area.getBlue()));
+                drawLine(rx, ry, rx + w, ry, th / 3, st, area.getColor());
                 drawLine(rx, ry + (2 * th / 3), rx + w, ry + (2 * th / 3),
-                        th / 3, st,
-                        new Color(area.getRed(), area.getGreen(),
-                                     area.getBlue()));
+                        th / 3, st, area.getColor());
                 break;
             case Constants.FOVAL_GROOVE:
-                drawLine(rx, ry, rx + w, ry, th / 2, st,
-                        new Color(area.getRed(), area.getGreen(),
-                                     area.getBlue()));
+                drawLine(rx, ry, rx + w, ry, th / 2, st, area.getColor());
                 drawLine(rx, ry + (th / 2), rx + w, ry + (th / 2), th / 2, st,
                         new Color(255, 255, 255));
                 break;
@@ -192,13 +186,10 @@
                 drawLine(rx, ry, rx + w, ry, th / 2, st,
                         new Color(255, 255, 255));
                 drawLine(rx, ry + (th / 2), rx + w, ry + (th / 2), th / 2, st,
-                        new Color(area.getRed(), area.getGreen(),
-                                     area.getBlue()));
+                        area.getColor());
                 break;
             default:
-                drawLine(rx, ry, rx + w, ry, th, st,
-                        new Color(area.getRed(), area.getGreen(),
-                                     area.getBlue()));
+                drawLine(rx, ry, rx + w, ry, th, st, area.getColor());
             }
         }
     }

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java	2006-06-03 23:30:08 UTC (rev 7395)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java	2006-06-03 23:30:16 UTC (rev 7396)
@@ -558,9 +558,9 @@
         FontUse font = area.getPrimaryFont();
         int size = area.traitFontSize();
 
-        float red = area.getRed();
-        float green = area.getGreen();
-        float blue = area.getBlue();
+        float red = area.getColor().getRed() / 255f;
+        float green = area.getColor().getGreen() / 255f;
+        float blue = area.getColor().getBlue() / 255f;
 
         if ((font != this.currentFont)
                 || (size != this.currentFontSize)) {
@@ -681,9 +681,9 @@
         int ry = area.rrOriginY();
         int w = area.rrIPD();
         int th = area.traitRuleThickness();
-        float r = area.getRed();
-        float g = area.getGreen();
-        float b = area.getBlue();
+        float r = area.getColor().getRed() / 255f;
+        float g = area.getColor().getGreen() / 255f;
+        float b = area.getColor().getBlue() / 255f;
         Color oldColor = graphics.getColor();
 
         graphics.setColor(new Color(r, g, b));

Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java	2006-06-03 23:30:08 UTC (rev 7395)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java	2006-06-03 23:30:16 UTC (rev 7396)
@@ -131,9 +131,7 @@
 
     private PSFont currentPSFont;
     private int currentFontSize;
-    private float currRed;
-    private float currGreen;
-    private float currBlue;
+    private Color currentColor;
 
     private int psLevel = 3;
 
@@ -809,7 +807,7 @@
         FontUse fontUse = area.getPrimaryFont();
         PSFont psFont = (PSFont) this.fontMap.get(fontUse);
         useFont(psFont, area.traitFontSize());
-        useColor(area.getRed(), area.getGreen(), area.getBlue());
+        useColor(area.getColor());
         write(moveTo(area));
         StringBuffer sb = new StringBuffer();
         String s = new String(text);
@@ -909,7 +907,7 @@
             if (area.traitRuleStyle() == Constants.FOVAL_NONE) {
                 break;
             }
-            useColor(area.getRed(), area.getGreen(), area.getBlue());
+            useColor(area.getColor());
             write("gsave");
             write("0 setlinecap");
             switch (area.traitRuleStyle()) {
@@ -919,7 +917,7 @@
                 write(th + " setlinewidth");
                 write(rx + " " + ry + " M");
                 write(w + " 0 rlineto");
-                useColor(area.getRed(), area.getGreen(), area.getBlue());
+                useColor(area.getColor());
                 write("stroke");
                 break;
             case Constants.FOVAL_DASHED:
@@ -928,7 +926,7 @@
                 write(th + " setlinewidth");
                 write(rx + " " + ry + " M");
                 write(w + " 0 rlineto");
-                useColor(area.getRed(), area.getGreen(), area.getBlue());
+                useColor(area.getColor());
                 write("stroke");
                 break;
             case Constants.FOVAL_SOLID:
@@ -936,7 +934,7 @@
                 write(th + " setlinewidth");
                 write(rx + " " + ry + " M");
                 write(w + " 0 rlineto");
-                useColor(area.getRed(), area.getGreen(), area.getBlue());
+                useColor(area.getColor());
                 write("stroke");
                 break;
             case Constants.FOVAL_DOUBLE:
@@ -946,7 +944,7 @@
                 write(w + " 0 rlineto");
                 write(rx + " " + (ry + th3) + " M");
                 write(w + " 0 rlineto");
-                useColor(area.getRed(), area.getGreen(), area.getBlue());
+                useColor(area.getColor());
                 write("stroke");
                 break;
             case Constants.FOVAL_GROOVE:
@@ -954,12 +952,12 @@
                 write("newpath");
                 write(rx + " " + (ry - th4) + " M");
                 write(w + " 0 rlineto");
-                useColor(area.getRed(), area.getGreen(), area.getBlue());
+                useColor(area.getColor());
                 write("stroke");
                 write("newpath");
                 write(rx + " " + (ry + th4) + " M");
                 write(w + " 0 rlineto");
-                useColor(1, 1, 1);    // white
+                useColor(Color.WHITE);
                 write("stroke");
                 break;
             case Constants.FOVAL_RIDGE:
@@ -967,12 +965,12 @@
                 write("newpath");
                 write(rx + " " + (ry - th4) + " M");
                 write(w + " 0 rlineto");
-                useColor(1, 1, 1);    // white
+                useColor(Color.WHITE);
                 write("stroke");
                 write("newpath");
                 write(rx + " " + (ry + th4) + " M");
                 write(w + " 0 rlineto");
-                useColor(area.getRed(), area.getGreen(), area.getBlue());
+                useColor(area.getColor());
                 write("stroke");
                 break;
             }
@@ -1039,17 +1037,12 @@
     }
 
     private void useColor(Color col) {
-        useColor(col.getRed() / 255f, col.getGreen() / 255f,
-                col.getBlue() / 255f);
-    }
-
-    private void useColor(float red, float green, float blue) {
-        if ((red != currRed) || (green != currGreen) || (blue != currBlue)) {
-            write(red + " " + green + " " + blue + " setrgbcolor");
-            currRed = red;
-            currGreen = green;
-            currBlue = blue;
+        if (col.equals(this.currentColor)) {
+            return;
         }
+        write(col.getRed() / 255f + " " + col.getGreen() / 255f + " "
+                + col.getBlue() / 255f + " setrgbcolor");
+        this.currentColor = col;
     }
 
     /**

Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2006-06-03 23:30:08 UTC (rev 7395)
+++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2006-06-03 23:30:16 UTC (rev 7396)
@@ -689,11 +689,11 @@
     }
 
     public void outputColor(AreaFlexible area, StringBuffer buffer) {
-        String color = area.getRed()
+        String color = area.getColor().getRed() / 255
                 + ", "
-                + area.getGreen()
+                + area.getColor().getGreen() / 255
                 + ", "
-                + area.getBlue();
+                + area.getColor().getBlue() / 255;
         outputAttribute(buffer, "rgb", color);
     }
 


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

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

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

Revision: 7395
Author:   victormote
Date:     2006-06-03 16:30:08 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7395&view=rev

Log Message:
-----------
Conform to axsl change: For greater flexibility with other color spaces, return a java Color instead of the r, g, b components.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2006-06-03 23:12:08 UTC (rev 7394)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2006-06-03 23:30:08 UTC (rev 7395)
@@ -965,18 +965,10 @@
 
     public abstract void incrementProgressionDimension(int incrementAmount);
 
-    public float getRed() {
-        return traitColor().getRed() / 255f;
+    public Color getColor() {
+        return traitColor();
     }
 
-    public float getGreen() {
-        return traitColor().getGreen() / 255f;
-    }
-
-    public float getBlue() {
-        return traitColor().getBlue() / 255f;
-    }
-
     /**
      * This method is used by child Areas to ask the parent Area into which
      * Area the child Area's overflow should be placed.


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

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

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

Revision: 7394
Author:   victormote
Date:     2006-06-03 16:12:08 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7394&view=rev

Log Message:
-----------
Fix javadoc warning.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2006-06-03 22:52:11 UTC (rev 7393)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2006-06-03 23:12:08 UTC (rev 7394)
@@ -955,7 +955,7 @@
     }
 
     /**
-     * {@inherit}
+     * {@inheritDoc}
      */
     public abstract int progressionDimensionAvailable();
 


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

[FOray-commit] SF.net SVN: foray: [7393] trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java

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

Revision: 7393
Author:   victormote
Date:     2006-06-03 15:52:11 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7393&view=rev

Log Message:
-----------
Conform to axsl change: Add dim attribute to block-container.

Modified Paths:
--------------
    trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2006-06-03 22:33:37 UTC (rev 7392)
+++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2006-06-03 22:52:11 UTC (rev 7393)
@@ -219,6 +219,7 @@
     public void render(BlockContainerArea area) {
         StringBuffer buffer = new StringBuffer();
         outputGeneratedBy(area, buffer);
+        outputDimension(area, buffer);
         writeStartTag(area, buffer);
         outputAllRectangles(area);
         renderChildren(area);


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

[FOray-commit] SF.net SVN: foray: [7392] trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java

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

Revision: 7392
Author:   victormote
Date:     2006-06-03 15:33:37 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7392&view=rev

Log Message:
-----------
Minor change to beautify the output.

Modified Paths:
--------------
    trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2006-06-03 21:56:51 UTC (rev 7391)
+++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2006-06-03 22:33:37 UTC (rev 7392)
@@ -587,8 +587,10 @@
         buffer.append("    PUBLIC \"-//aXSL//DTD Area Tree V0.1//EN\"\n");
         buffer.append("    \"http://www.axsl.org/dtds/0.1/en/");
         buffer.append("axsl-area-tree.dtd\">\n");
+        buffer.append("\n");
         buffer.append("<!-- produced by " + this.getApplicationNameShort() + " "
                 + getApplicationVersion() + " -->\n");
+        buffer.append("\n");
         this.writer.write(buffer.toString());
         this.writer.write("<area-tree>\n");
     }


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

[FOray-commit] SF.net SVN: foray: [7391] trunk/foray/foray-fotree/src/java/org/foray/fotree/value

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

Revision: 7391
Author:   victormote
Date:     2006-06-03 14:56:51 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7391&view=rev

Log Message:
-----------
Allow DtSpace to contain an expression that can evaluate to a length.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LetterSpacing.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeSpace.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WordSpacing.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtSpace.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprAdditiveOper.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprMultiplicativeOper.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LetterSpacing.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LetterSpacing.java	2006-06-03 20:50:05 UTC (rev 7390)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LetterSpacing.java	2006-06-03 21:56:51 UTC (rev 7391)
@@ -91,28 +91,20 @@
     public int getValue(int subProperty, FObj fobj) {
         if (this.value instanceof DtSpace) {
             DtSpace spaceDT = (DtSpace) this.value;
-            DtLength length = null;
             switch (subProperty) {
             case MINIMUM: {
-                length = spaceDT.getLengthMinimum();
-                break;
+                return spaceDT.getLengthMinimum(fobj.traitFontSize(), 0);
             }
             case OPTIMUM: {
-                length = spaceDT.getLengthOptimum();
-                break;
+                return spaceDT.getLengthOptimum(fobj.traitFontSize(), 0);
             }
             case MAXIMUM: {
-                length = spaceDT.getLengthMaximum();
-                break;
+                return spaceDT.getLengthMaximum(fobj.traitFontSize(), 0);
             }
             default: {
                 return 0;
             }
             }
-            if (length == null) {
-                return 0;
-            }
-            return length.getValue(fobj.traitFontSize(), 0);
         }
         if (this.value instanceof DtLength) {
             DtLength length = (DtLength) this.value;

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java	2006-06-03 20:50:05 UTC (rev 7390)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java	2006-06-03 21:56:51 UTC (rev 7391)
@@ -142,28 +142,15 @@
         }
         if (this.value instanceof DtSpace) {
             DtSpace space = (DtSpace) this.value;
-            DtLength length = null;
             switch (rangeID) {
             case MINIMUM: {
-                length = space.getLengthMinimum();
-                if (length == null) {
-                    return (int) Math.round(fobj.traitFontSize() * 1.2);
-                }
-                return length.getValue(fobj.traitFontSize(), 0);
+                return space.getLengthMinimum(fobj.traitFontSize(), 0);
             }
             case OPTIMUM: {
-                length = space.getLengthOptimum();
-                if (length == null) {
-                    return (int) Math.round(fobj.traitFontSize() * 1.2);
-                }
-                return length.getValue(fobj.traitFontSize(), 0);
+                return space.getLengthOptimum(fobj.traitFontSize(), 0);
             }
             case MAXIMUM: {
-                length = space.getLengthMaximum();
-                if (length == null) {
-                    return (int) Math.round(fobj.traitFontSize() * 1.2);
-                }
-                return length.getValue(fobj.traitFontSize(), 0);
+                return space.getLengthMaximum(fobj.traitFontSize(), 0);
             }
             }
         }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeSpace.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeSpace.java	2006-06-03 20:50:05 UTC (rev 7390)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeSpace.java	2006-06-03 21:56:51 UTC (rev 7391)
@@ -32,6 +32,7 @@
 import org.foray.fotree.value.DtLength;
 import org.foray.fotree.value.DtPercentage;
 import org.foray.fotree.value.DtSpace;
+import org.foray.fotree.value.Expr;
 import org.foray.fotree.value.PropertyKeyword;
 import org.foray.fotree.value.PropertyValue;
 
@@ -67,10 +68,12 @@
             return pv;
         }
         pv = standardParse(propertyList, value, false, false);
-        if (pv instanceof DtLength) {
-            DtLength length = (DtLength) pv;
-            return new DtSpace(length, length, length, Constants.FOVAL_DISCARD,
-                    0);
+        if (pv instanceof Expr) {
+            Expr expr = (Expr) pv;
+            if (expr.unitPower() == 1) {
+                return new DtSpace(expr, expr, expr, Constants.FOVAL_DISCARD,
+                        0);
+            }
         }
         if (pv instanceof DtPercentage) {
             switch (getPropertyType()) {
@@ -100,28 +103,20 @@
             int ipdAncestorBlockArea) {
         if (this.value instanceof DtSpace) {
             DtSpace spaceDT = (DtSpace) this.value;
-            DtLength length = null;
             switch (subProperty) {
             case MINIMUM: {
-                length = spaceDT.getLengthMinimum();
-                break;
+                return spaceDT.getLengthMinimum(fobj.traitFontSize(), 0);
             }
             case OPTIMUM: {
-                length = spaceDT.getLengthOptimum();
-                break;
+                return spaceDT.getLengthOptimum(fobj.traitFontSize(), 0);
             }
             case MAXIMUM: {
-                length = spaceDT.getLengthMaximum();
-                break;
+                return spaceDT.getLengthMaximum(fobj.traitFontSize(), 0);
             }
             default: {
                 return 0;
             }
             }
-            if (length == null) {
-                return 0;
-            }
-            return length.getValue(fobj.traitFontSize(), 0);
         }
         /*
          * Percentages are only valid for space-start and space-end, but any

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WordSpacing.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WordSpacing.java	2006-06-03 20:50:05 UTC (rev 7390)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WordSpacing.java	2006-06-03 21:56:51 UTC (rev 7391)
@@ -90,28 +90,20 @@
     public int getValue(int subProperty, FObj fobj) {
         if (this.value instanceof DtSpace) {
             DtSpace spaceDT = (DtSpace) this.value;
-            DtLength length = null;
             switch (subProperty) {
             case MINIMUM: {
-                length = spaceDT.getLengthMinimum();
-                break;
+                return spaceDT.getLengthMinimum(fobj.traitFontSize(), 0);
             }
             case OPTIMUM: {
-                length = spaceDT.getLengthOptimum();
-                break;
+                return spaceDT.getLengthOptimum(fobj.traitFontSize(), 0);
             }
             case MAXIMUM: {
-                length = spaceDT.getLengthMaximum();
-                break;
+                return spaceDT.getLengthMaximum(fobj.traitFontSize(), 0);
             }
             default: {
                 return 0;
             }
             }
-            if (length == null) {
-                return 0;
-            }
-            return length.getValue(fobj.traitFontSize(), 0);
         }
         if (this.value instanceof DtLength) {
             DtLength length = (DtLength) this.value;

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtSpace.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtSpace.java	2006-06-03 20:50:05 UTC (rev 7390)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtSpace.java	2006-06-03 21:56:51 UTC (rev 7391)
@@ -47,17 +47,23 @@
             Constants.FOVAL_FORCE,
     };
 
-    private DtLength lengthMinimum;
-    private DtLength lengthOptimum;
-    private DtLength lengthMaximum;
+    private Expr lengthMinimum;
+    private Expr lengthOptimum;
+    private Expr lengthMaximum;
     private short conditionality;
     private int precedence;
 
     /**
      * Constructor.
      */
-    public DtSpace(DtLength lengthMinimum, DtLength lengthOptimum,
-            DtLength lengthMaximum, short conditionality, int precedence) {
+    public DtSpace(Expr lengthMinimum, Expr lengthOptimum,
+            Expr lengthMaximum, short conditionality, int precedence)
+            throws PropertyException {
+        if (lengthMinimum.unitPower() != 1
+                || lengthOptimum.unitPower() != 1
+                || lengthMaximum.unitPower() != 1) {
+            throw new PropertyException("Invalid length");
+        }
         this.lengthMinimum = lengthMinimum;
         this.lengthOptimum = lengthOptimum;
         this.lengthMaximum = lengthMaximum;
@@ -85,16 +91,16 @@
         this.precedence = precedence;
     }
 
-    public DtLength getLengthMinimum() {
-        return this.lengthMinimum;
+    public int getLengthMinimum(int pointSize, int percentBase) {
+        return this.lengthMinimum.evalUnitPower1(pointSize, percentBase);
     }
 
-    public DtLength getLengthOptimum() {
-        return this.lengthOptimum;
+    public int getLengthOptimum(int pointSize, int percentBase) {
+        return this.lengthOptimum.evalUnitPower1(pointSize, percentBase);
     }
 
-    public DtLength getLengthMaximum() {
-        return this.lengthMaximum;
+    public int getLengthMaximum(int pointSize, int percentBase) {
+        return this.lengthMaximum.evalUnitPower1(pointSize, percentBase);
     }
 
     public short getConditionality() {
@@ -164,7 +170,7 @@
      * {@inheritDoc}
      */
     public byte unitPower() {
-        return -1;
+        return UNIT_POWER_LENGTH;
     }
 
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprAdditiveOper.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprAdditiveOper.java	2006-06-03 20:50:05 UTC (rev 7390)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprAdditiveOper.java	2006-06-03 21:56:51 UTC (rev 7391)
@@ -91,7 +91,9 @@
      * {@inheritDoc}
      */
     public byte unitPower() {
-        return -1;
+        /* We already tested that the unit powers were equal at construction,
+         * so all we need to do here is return one of them. */
+        return operand1.unitPower();
     }
 
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprMultiplicativeOper.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprMultiplicativeOper.java	2006-06-03 20:50:05 UTC (rev 7390)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprMultiplicativeOper.java	2006-06-03 21:56:51 UTC (rev 7391)
@@ -116,7 +116,14 @@
      * {@inheritDoc}
      */
     public byte unitPower() {
-        return -1;
+        /* For multiplication, the unit power of the product is the sum
+         * of the unit powers of the operands.
+         * For example, 3 meters * 5 = 15 meters.
+         * The first operand has a unit power of 1, the second has a unit power
+         * of 0.
+         * 1 + 0 = 1, which is intuitively correct, because our product is in
+         * meters, which has a unit power of 1.*/
+        return (byte) (operand1.unitPower() + operand2.unitPower());
     }
 
 }


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

[FOray-commit] SF.net SVN: foray: [7390] trunk/foray/foray-fotree/src/java/org/foray/fotree/value

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

Revision: 7390
Author:   victormote
Date:     2006-06-03 13:50:05 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7390&view=rev

Log Message:
-----------
Make unitPower() method abstract, so that each class controls it independently.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtAngle.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtCharacter.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtColor.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtCountry.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtFrequency.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtKeep.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLanguage.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthBPIPDirection.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthConditional.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthRange.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtName.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtPercentage.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtRectangle.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtScript.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtShadowEffect.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtSpace.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtString.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtTextDeco.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtTime.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtURI.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtWritingMode.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/Expr.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprAdditiveOper.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprInner.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprMultiplicativeOper.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprUnaryOper.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnAbs.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnBodyStart.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnCeiling.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFloor.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromParent.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromTableColumn.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnLabelEnd.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMax.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMin.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnProportionalColWidth.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRGB.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRound.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/PropertyKeyword.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtAngle.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtAngle.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtAngle.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -148,4 +148,12 @@
         }
         return true;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtCharacter.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtCharacter.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtCharacter.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -47,4 +47,11 @@
         return value;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtColor.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtColor.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtColor.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -518,4 +518,11 @@
         return newColor;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtCountry.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtCountry.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtCountry.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -585,4 +585,11 @@
         return new DtCountry(countryCode);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtFrequency.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtFrequency.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtFrequency.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -105,4 +105,11 @@
         }
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtKeep.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtKeep.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtKeep.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -78,4 +78,11 @@
         return new DtKeep(Keep.AUTO, Keep.AUTO, Keep.AUTO);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLanguage.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLanguage.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLanguage.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -664,4 +664,11 @@
         return new DtLanguage(languageCode);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthBPIPDirection.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthBPIPDirection.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthBPIPDirection.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -57,4 +57,11 @@
         return this.ipdLength;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthConditional.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthConditional.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthConditional.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -57,4 +57,11 @@
         return this.conditionality;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthRange.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthRange.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthRange.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -89,4 +89,11 @@
         return false;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtName.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtName.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtName.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -63,4 +63,11 @@
         return new DtName(input);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtPercentage.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtPercentage.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtPercentage.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -84,4 +84,11 @@
         return new DtPercentage(quantity);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtRectangle.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtRectangle.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtRectangle.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -152,4 +152,11 @@
         }
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtScript.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtScript.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtScript.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -183,4 +183,11 @@
         return false;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtShadowEffect.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtShadowEffect.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtShadowEffect.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -132,4 +132,11 @@
                 blurRadius, color);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtSpace.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtSpace.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtSpace.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -160,4 +160,11 @@
         return false;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtString.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtString.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtString.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -47,4 +47,11 @@
         return value;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtTextDeco.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtTextDeco.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtTextDeco.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -102,4 +102,12 @@
     public void setUnderlined(boolean isUnderlined) {
         this.isUnderlined = isUnderlined;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtTime.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtTime.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtTime.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -105,4 +105,11 @@
         }
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtURI.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtURI.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtURI.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -83,4 +83,11 @@
         return tokenizedList;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtWritingMode.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtWritingMode.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtWritingMode.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -678,4 +678,11 @@
         return -1;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/Expr.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/Expr.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/Expr.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -36,11 +36,23 @@
     public static final byte OPERATION_MOD          = '%';
     public static final byte OPERATION_NEGATION     = '-';
 
-    public byte unitPower() {
-        return -1;
-    }
+    public static final byte UNIT_POWER_NON_NUMERIC = -1;
+    public static final byte UNIT_POWER_NUMERIC = 0;
+    public static final byte UNIT_POWER_LENGTH = 1;
+    public static final byte UNIT_POWER_AREA = 2;
 
     /**
+     * Returns the unit power for this expression.
+     * Unit power is the number of dimensions to which a numeric item applies.
+     * Lengths have a unit power of 1, areas have a unit power of 2.
+     * Valid values are {@link #UNIT_POWER_NON_NUMERIC},
+     * {@link #UNIT_POWER_NUMERIC}, {@link #UNIT_POWER_LENGTH},
+     * {@link #UNIT_POWER_AREA}.
+     * @return The unit power to which this expression evaluates.
+     */
+    public abstract byte unitPower() ;
+
+    /**
      * Indicates whether this expression can be evaluated to a unit power = 1
      * (length) or not.
      * @return True if the expression can be evaluated to a unit power of 1

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprAdditiveOper.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprAdditiveOper.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprAdditiveOper.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -87,4 +87,11 @@
         return 0;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprInner.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprInner.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprInner.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -44,4 +44,8 @@
         return false;
     }
 
+    public byte unitPower() {
+        return this.enclosedExpression.unitPower();
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprMultiplicativeOper.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprMultiplicativeOper.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprMultiplicativeOper.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -112,4 +112,11 @@
         return (int) Math.round(rawValue);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprUnaryOper.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprUnaryOper.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprUnaryOper.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -68,4 +68,11 @@
         return 0;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnAbs.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnAbs.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnAbs.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -57,5 +57,11 @@
         return new DtNumber(value);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }
-

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnBodyStart.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnBodyStart.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnBodyStart.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -92,4 +92,11 @@
         return lengthDT;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnCeiling.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnCeiling.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnCeiling.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -55,4 +55,11 @@
         return new DtNumber(value);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFloor.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFloor.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFloor.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -54,4 +54,11 @@
         return new DtNumber(value);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromParent.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromParent.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromParent.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -97,4 +97,11 @@
         return ps.getPropertyValue();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromTableColumn.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromTableColumn.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromTableColumn.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -71,4 +71,11 @@
                 + "'from-table-column'");
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -88,4 +88,11 @@
         return ps.getPropertyValue();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnLabelEnd.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnLabelEnd.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnLabelEnd.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -99,4 +99,11 @@
         return lengthDT;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMax.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMax.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMax.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -59,4 +59,11 @@
         return new DtNumber(value);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMin.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMin.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMin.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -61,4 +61,11 @@
         return new DtNumber(value);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -87,4 +87,11 @@
         return ps.getPropertyValue();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnProportionalColWidth.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnProportionalColWidth.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnProportionalColWidth.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -80,4 +80,11 @@
         return (ExprNumeric) args[0];
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRGB.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRGB.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRGB.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -86,4 +86,11 @@
         return eval();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRound.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRound.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRound.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -58,4 +58,11 @@
         return new DtInteger((int) value);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/PropertyKeyword.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/PropertyKeyword.java	2006-06-03 20:15:37 UTC (rev 7389)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/PropertyKeyword.java	2006-06-03 20:50:05 UTC (rev 7390)
@@ -40,4 +40,11 @@
         return value;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte unitPower() {
+        return -1;
+    }
+
 }


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

[FOray-commit] SF.net SVN: foray: [7389] trunk/foray/foray-fotree/src/java/org/foray/fotree

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

Revision: 7389
Author:   victormote
Date:     2006-06-03 13:15:37 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7389&view=rev

Log Message:
-----------
Catch PropertyException further upstream so that the context can be included as part of the message.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java	2006-06-03 19:27:21 UTC (rev 7388)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java	2006-06-03 20:15:37 UTC (rev 7389)
@@ -199,8 +199,6 @@
             rootFObj.addId(fobj);
             // Let Root register an unmatched "ref-id", if any.
             rootFObj.checkUnmatchedReference(fobj);
-        } catch (PropertyException e) {
-            throw new SAXException(e);
         } catch (FOTreeException e) {
             throw new SAXException(e);
         }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java	2006-06-03 19:27:21 UTC (rev 7388)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java	2006-06-03 20:15:37 UTC (rev 7389)
@@ -130,7 +130,7 @@
 
     public abstract void parseAttributes(PropertyList list,
             Attributes attlist, FObj currentFObj, Locator locator,
-            FOTreeBuilder builder) throws PropertyException;
+            FOTreeBuilder builder) throws FOTreeException;
 
     /**
      * Reads through the list of attributes and returns an array that contains

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java	2006-06-03 19:27:21 UTC (rev 7388)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java	2006-06-03 20:15:37 UTC (rev 7389)
@@ -62,10 +62,14 @@
 
     public void parseAttributes(PropertyList propertyList, Attributes attlist,
             FObj currentFObj, Locator locator, FOTreeBuilder builder)
-            throws PropertyException {
+            throws FOTreeException {
         int[] attributeSort = sortAttributes(attlist);
-        makeList(propertyList, attlist, currentFObj, attributeSort, locator,
-                builder);
+        try {
+            makeList(propertyList, attlist, currentFObj, attributeSort, locator,
+                    builder);
+        } catch (PropertyException e) {
+            currentFObj.throwException(e.getMessage());
+        }
     }
 
     public Property parseAttributeForNS(Attributes attributes,

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java	2006-06-03 19:27:21 UTC (rev 7388)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java	2006-06-03 20:15:37 UTC (rev 7389)
@@ -62,10 +62,14 @@
 
     public void parseAttributes(PropertyList propertyList, Attributes attlist,
             FObj currentFObj, Locator locator, FOTreeBuilder builder)
-            throws PropertyException {
+            throws FOTreeException {
         int[] attributeSort = sortAttributes(attlist);
-        makeList(propertyList, attlist, currentFObj, attributeSort,
-                locator, builder);
+        try {
+            makeList(propertyList, attlist, currentFObj, attributeSort,
+                    locator, builder);
+        } catch (PropertyException e) {
+            currentFObj.throwException(e.getMessage());
+        }
     }
 
     public Property parseAttributeForNS(Attributes attributes,

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java	2006-06-03 19:27:21 UTC (rev 7388)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java	2006-06-03 20:15:37 UTC (rev 7389)
@@ -69,8 +69,7 @@
     }
 
     public void parseAttributes(PropertyList propertyList, Attributes attlist,
-            FObj currentFObj, Locator locator, FOTreeBuilder builder)
-            throws PropertyException {
+            FObj currentFObj, Locator locator, FOTreeBuilder builder) {
         /*
          * There is nothing to do here. We passed the raw attributes when
          * we created the propertyList instance.

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java	2006-06-03 19:27:21 UTC (rev 7388)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java	2006-06-03 20:15:37 UTC (rev 7389)
@@ -60,8 +60,7 @@
     }
 
     public void parseAttributes(PropertyList propertyList, Attributes attlist,
-            FObj currentFObj, Locator locator, FOTreeBuilder builder)
-            throws PropertyException {
+            FObj currentFObj, Locator locator, FOTreeBuilder builder) {
         // This isn't needed for the xml: namespace.
         return;
     }


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

[FOray-commit] SF.net SVN: foray: [7388] trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java

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

Revision: 7388
Author:   victormote
Date:     2006-06-03 12:27:21 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7388&view=rev

Log Message:
-----------
Conform to axsl changes: Add methods or parameters to methods that allow the line-breaking system to know whether the TextArea that is being created will be the last item on the line.

Modified Paths:
--------------
    trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java
Modified: trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java
===================================================================
--- trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java	2006-06-03 19:27:11 UTC (rev 7387)
+++ trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java	2006-06-03 19:27:21 UTC (rev 7388)
@@ -326,10 +326,19 @@
      */
     private void createLineContent(int startIndex, int endIndex, int sizeInline,
             boolean isHyphenated) throws TextException {
-        handler.handleLineBreakText(this.currentOutput,
-                (LineText) this.currentLineContent, startIndex,
+        LineText lineText = (LineText) this.currentLineContent;
+        boolean everythingWritten = endIndex >= lineText.inlineText().length;
+        boolean isLastItemOnLine = true;
+        if (everythingWritten) {
+            /* If everything was written, this may not be the last item on 
+             * the line, unless this is the last item in the block. */
+            if (! lineText.isLastItemInBlock()) {
+                isLastItemOnLine = false;
+            }
+        }
+        handler.handleLineBreakText(this.currentOutput, lineText, startIndex,
                 endIndex - startIndex + 1, sizeInline, isHyphenated,
-                inLowerCase);
+                inLowerCase, isLastItemOnLine);
     }
 
     /**


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

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

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

Revision: 7387
Author:   victormote
Date:     2006-06-03 12:27:11 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7387&view=rev

Log Message:
-----------
Conform to axsl changes: Add methods or parameters to methods that allow the line-breaking system to know whether the TextArea that is being created will be the last item on the line.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-06-03 19:26:59 UTC (rev 7386)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-06-03 19:27:11 UTC (rev 7387)
@@ -817,7 +817,7 @@
      */
     public org.axsl.areaW.TextArea makeTextArea(FOText foText, int ipd,
             int startOffset, int sizeInChars, boolean hasDiscretionaryHyphen,
-            boolean hasFauxSmallCaps) {
+            boolean hasFauxSmallCaps, boolean isLastItemOnLine) {
 
         /* If the raw text is empty, don't create the TextArea. */
         if (sizeInChars < 1) {
@@ -829,11 +829,6 @@
         boolean isFirstItemOnline = this.children.size() == 0;
         int ignoreAtStart = TextArea.ignoreAtStart(rawText, startOffset,
                 sizeInChars, isFirstItemOnline, traitWhiteSpaceTreatment());
-        /* TODO: Add a parameter to this method that tells us whether this is
-         * the last item on the line. The line-breaking logic should be able
-         * to tell us this, if it is informed whether the object passed to it
-         * is the last item in the block. */
-        boolean isLastItemOnLine = false;
         int ignoreAtEnd = TextArea.ignoreAtEnd(rawText, startOffset,
                 sizeInChars, isLastItemOnLine, traitWhiteSpaceTreatment());
         if (ignoreAtStart + ignoreAtEnd >= sizeInChars) {


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