axsl-commit — aXSL repository commit log messages

[aXSL-commit] SF.net SVN: axsl: [525] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW

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

Revision: 525
Author:   victormote
Date:     2006-05-07 07:41:22 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=525&view=rev

Log Message:
-----------
Rename Exception classes for consistency and clarity.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTree.java

Added Paths:
-----------
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaRException.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaWException.java

Removed Paths:
-------------
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaOutException.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaInException.java
Deleted: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaOutException.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaOutException.java	2006-05-07 01:06:06 UTC (rev 524)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaOutException.java	2006-05-07 14:41:22 UTC (rev 525)
@@ -1,58 +0,0 @@
-/*
- * Copyright 2006 The aXSL Project.
- *      http://www.axsl.org
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- */
-
-/* $Id$ */
- 
-package org.axsl.areaR;
-
-/**
- * Exception thrown when an axslAreaOut implementation has a problem.
- */
-public class AreaOutException extends Exception {
-
-    static final long serialVersionUID = 99053201977048201L;
-
-    /**
-     * Create a new AreaOutException.
-     * Identical to {@link Exception#Exception(java.lang.String)}
-     * @see Exception#Exception(java.lang.String)
-     */
-    public AreaOutException(String message) {
-        super(message);
-    }
-
-    /**
-     * Create a new AreaOutException.
-     * Identical to {@link Exception#Exception(java.lang.Throwable)}
-     * @see Exception#Exception(java.lang.Throwable)
-     */
-    public AreaOutException(Throwable cause) {
-        super(cause);
-    }
-
-    /**
-     * Create a new AreaOutException.
-     * Identical to {@link Exception#Exception(java.lang.String,
-     * java.lang.Throwable)}
-     * @see Exception#Exception(java.lang.String, java.lang.Throwable)
-     */
-    public AreaOutException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}

Copied: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaRException.java (from rev 509, trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaOutException.java)
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaRException.java	                        (rev 0)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaRException.java	2006-05-07 14:41:22 UTC (rev 525)
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
+/* $Id$ */
+ 
+package org.axsl.areaR;
+
+/**
+ * Exception thrown when an axslAreaOut implementation has a problem.
+ */
+public class AreaRException extends Exception {
+
+    static final long serialVersionUID = 99053201977048201L;
+
+    /**
+     * Create a new AreaOutException.
+     * Identical to {@link Exception#Exception(java.lang.String)}
+     * @see Exception#Exception(java.lang.String)
+     */
+    public AreaRException(String message) {
+        super(message);
+    }
+
+    /**
+     * Create a new AreaOutException.
+     * Identical to {@link Exception#Exception(java.lang.Throwable)}
+     * @see Exception#Exception(java.lang.Throwable)
+     */
+    public AreaRException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Create a new AreaOutException.
+     * Identical to {@link Exception#Exception(java.lang.String,
+     * java.lang.Throwable)}
+     * @see Exception#Exception(java.lang.String, java.lang.Throwable)
+     */
+    public AreaRException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}

Deleted: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaInException.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaInException.java	2006-05-07 01:06:06 UTC (rev 524)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaInException.java	2006-05-07 14:41:22 UTC (rev 525)
@@ -1,58 +0,0 @@
-/*
- * Copyright 2006 The aXSL Project.
- *      http://www.axsl.org
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- */
-
-/* $Id$ */
- 
-package org.axsl.areaW;
-
-/**
- * Exception thrown when an axslAreaIn implementation has a problem.
- */
-public class AreaInException extends Exception {
-
-    static final long serialVersionUID = 14437113209894753L;
-
-    /**
-     * Create a new AreaInException.
-     * Identical to {@link Exception#Exception(java.lang.String)}
-     * @see Exception#Exception(java.lang.String)
-     */
-    public AreaInException(String message) {
-        super(message);
-    }
-
-    /**
-     * Create a new AreaInException.
-     * Identical to {@link Exception#Exception(java.lang.Throwable)}
-     * @see Exception#Exception(java.lang.Throwable)
-     */
-    public AreaInException(Throwable cause) {
-        super(cause);
-    }
-
-    /**
-     * Create a new AreaInException.
-     * Identical to {@link Exception#Exception(java.lang.String,
-     * java.lang.Throwable)}
-     * @see Exception#Exception(java.lang.String, java.lang.Throwable)
-     */
-    public AreaInException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}

Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTree.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTree.java	2006-05-07 01:06:06 UTC (rev 524)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTree.java	2006-05-07 14:41:22 UTC (rev 525)
@@ -40,6 +40,6 @@
      * @param rootFObj The Root instance that is the grand ancestor of the
      * FOTree that was parsed.
      */
-    public void layoutDocumentNodes(Root rootFObj) throws AreaInException ;
+    public void layoutDocumentNodes(Root rootFObj) throws AreaWException ;
 
 }

Copied: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaWException.java (from rev 509, trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaInException.java)
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaWException.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaWException.java	2006-05-07 14:41:22 UTC (rev 525)
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
+/* $Id$ */
+ 
+package org.axsl.areaW;
+
+/**
+ * Exception thrown when an axslAreaIn implementation has a problem.
+ */
+public class AreaWException extends Exception {
+
+    static final long serialVersionUID = 14437113209894753L;
+
+    /**
+     * Create a new AreaInException.
+     * Identical to {@link Exception#Exception(java.lang.String)}
+     * @see Exception#Exception(java.lang.String)
+     */
+    public AreaWException(String message) {
+        super(message);
+    }
+
+    /**
+     * Create a new AreaInException.
+     * Identical to {@link Exception#Exception(java.lang.Throwable)}
+     * @see Exception#Exception(java.lang.Throwable)
+     */
+    public AreaWException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Create a new AreaInException.
+     * Identical to {@link Exception#Exception(java.lang.String,
+     * java.lang.Throwable)}
+     * @see Exception#Exception(java.lang.String, java.lang.Throwable)
+     */
+    public AreaWException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}


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

[aXSL-commit] SF.net SVN: axsl: [526] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java

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

Revision: 526
Author:   victormote
Date:     2006-05-07 09:05:07 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=526&view=rev

Log Message:
-----------
Expose needed method.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java	2006-05-07 14:41:22 UTC (rev 525)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java	2006-05-07 16:05:07 UTC (rev 526)
@@ -20,6 +20,12 @@
 
 package org.axsl.areaW;
 
+import org.axsl.foR.fo.PageSequence;
+import org.axsl.foR.fo.Region;
+
 public interface LayoutStrategy {
 
+    public void layoutStaticContent(PageSequence pageSequence,
+            Region region, RegionArea regionArea) throws AreaWException ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [517] trunk/axsl/scripts/build.xml

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

Revision: 517
Author:   victormote
Date:     2006-05-06 06:29:57 -0700 (Sat, 06 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=517&view=rev

Log Message:
-----------
Include writable Area Tree in compile.

Modified Paths:
--------------
    trunk/axsl/scripts/build.xml
Modified: trunk/axsl/scripts/build.xml
===================================================================
--- trunk/axsl/scripts/build.xml	2006-05-06 13:23:37 UTC (rev 516)
+++ trunk/axsl/scripts/build.xml	2006-05-06 13:29:57 UTC (rev 517)
@@ -82,6 +82,7 @@
       <src path="${project.root}/axsl-graphic-r/src/java"/>
       <src path="${project.root}/axsl-text/src/java"/>
       <src path="${project.root}/axsl-fo-r/src/java"/>
+      <src path="${project.root}/axsl-area-w/src/java"/>
       <src path="${project.root}/axsl-area-r/src/java"/>
       <src path="${project.root}/axsl-pdf-w/src/java"/>
     </javac>


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

[aXSL-commit] SF.net SVN: axsl: [529] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW

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

Revision: 529
Author:   victormote
Date:     2006-05-07 11:10:54 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=529&view=rev

Log Message:
-----------
Fix some of the Area hierarchies.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTree.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LineArea.java

Added Paths:
-----------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/BlockArea.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTree.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTree.java	2006-05-07 17:55:19 UTC (rev 528)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTree.java	2006-05-07 18:10:54 UTC (rev 529)
@@ -28,7 +28,7 @@
 /**
  * An AreaTree is a document that has been laid out on pages.
  */
-public interface AreaTree {
+public interface AreaTree extends AreaNode {
 
     public PageCollection makePageCollection(PageSequence pageSequence) ;
 

Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/BlockArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/BlockArea.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/BlockArea.java	2006-05-07 18:10:54 UTC (rev 529)
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
+/* $Id$ */
+
+package org.axsl.areaW;
+
+public interface BlockArea extends AreaFlexible {
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/BlockArea.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LineArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LineArea.java	2006-05-07 17:55:19 UTC (rev 528)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LineArea.java	2006-05-07 18:10:54 UTC (rev 529)
@@ -23,7 +23,7 @@
 import org.axsl.fontR.FontConsumer;
 import org.axsl.text.TextServer;
 
-public interface LineArea {
+public interface LineArea extends BlockArea {
 
     public TextServer getTextServer();
 


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

[aXSL-commit] SF.net SVN: axsl: [559] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW

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

Revision: 559
Author:   victormote
Date:     2006-05-08 10:49:55 -0700 (Mon, 08 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=559&view=rev

Log Message:
-----------
Add some useful methods.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LineArea.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LineArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LineArea.java	2006-05-08 17:40:57 UTC (rev 558)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LineArea.java	2006-05-08 17:49:55 UTC (rev 559)
@@ -59,4 +59,11 @@
      */
     public LineOutput asLineOutput() ;
 
+    public boolean isEmpty() ;
+
+    /**
+     * Balance (vertically) the inline areas within this line.
+     */
+    public void verticalAlign() ;
+
 }

Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java	2006-05-08 17:40:57 UTC (rev 558)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java	2006-05-08 17:49:55 UTC (rev 559)
@@ -52,4 +52,6 @@
 
     public void setPendingFootnotes(List newFootnotes) ;
 
+    public void addLineArea(LineArea lineArea) ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [523] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW

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

Revision: 523
Author:   victormote
Date:     2006-05-06 17:30:23 -0700 (Sat, 06 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=523&view=rev

Log Message:
-----------
Add needed interfaces.

Added Paths:
-----------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionArea.java
Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java	2006-05-07 00:30:23 UTC (rev 523)
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
+/* $Id$ */
+
+package org.axsl.areaW;
+
+public interface PageArea {
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionArea.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionArea.java	2006-05-07 00:30:23 UTC (rev 523)
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+/* $Id$ */
+
+package org.axsl.areaW;
+
+public interface RegionArea {
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionArea.java
___________________________________________________________________
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.

[aXSL-commit] SF.net SVN: axsl: [524] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW

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

Revision: 524
Author:   victormote
Date:     2006-05-06 18:06:06 -0700 (Sat, 06 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=524&view=rev

Log Message:
-----------
Enhance writable area interfaces.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java	2006-05-07 00:30:23 UTC (rev 523)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java	2006-05-07 01:06:06 UTC (rev 524)
@@ -20,6 +20,20 @@
 
 package org.axsl.areaW;
 
+import org.axsl.foR.fo.SimplePageMaster;
+
 public interface PageArea {
 
+    public PageCollection getWritablePageCollection() ;
+
+    public SimplePageMaster getPageMaster() ;
+
+    public RegionArea getWritableRegionAfter() ;
+
+    public RegionArea getWritableRegionBefore() ;
+
+    public RegionArea getWritableRegionStart() ;
+
+    public RegionArea getWritableRegionEnd() ;
+
 }

Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java	2006-05-07 00:30:23 UTC (rev 523)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java	2006-05-07 01:06:06 UTC (rev 524)
@@ -20,6 +20,8 @@
  
 package org.axsl.areaW;
 
+import org.axsl.foR.fo.PageSequence;
+
 /**
  * A PageCollection is a collection of formatted pages.
  * It is the immediate child of {@link AreaTree}, and the parent of one or
@@ -27,6 +29,8 @@
  */
 public interface PageCollection {
 
-    public AreaTree getAreaTree() ;
+    public AreaTree getWritableAreaTree() ;
 
+    public PageSequence getPageSequence() ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [537] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW

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

Revision: 537
Author:   victormote
Date:     2006-05-07 15:51:07 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=537&view=rev

Log Message:
-----------
Add more useful methods.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-07 22:44:50 UTC (rev 536)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-07 22:51:07 UTC (rev 537)
@@ -41,4 +41,6 @@
 
     public int siblingIndex();
 
+    public PageArea getWritablePage() ;
+
 }

Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java	2006-05-07 22:44:50 UTC (rev 536)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java	2006-05-07 22:51:07 UTC (rev 537)
@@ -36,4 +36,6 @@
 
     public RegionArea getWritableRegionEnd() ;
 
+    public int getNumber() ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [557] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java

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

Revision: 557
Author:   victormote
Date:     2006-05-08 10:28:00 -0700 (Mon, 08 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=557&view=rev

Log Message:
-----------
Make method more versatile.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java	2006-05-08 17:17:16 UTC (rev 556)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java	2006-05-08 17:28:00 UTC (rev 557)
@@ -24,7 +24,7 @@
  
 package org.axsl.areaW;
 
-import org.axsl.foR.fo.Block;
+import org.axsl.foR.FObj;
 import org.axsl.foR.fo.TableBody;
 import org.axsl.foR.fo.TableFooter;
 import org.axsl.foR.fo.TableHeader;
@@ -56,7 +56,7 @@
     public TableFooterContainer makeTableFooterContainer(
             TableFooter tableFooter);
 
-    public NormalBlockArea makeNormalBlockArea(Block block);
+    public NormalBlockArea makeNormalBlockArea(FObj fobj);
 
     /**
      * @return The amount of space, in millipoints, available in this Area for


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

[aXSL-commit] SF.net SVN: axsl: [556] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW

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

Revision: 556
Author:   victormote
Date:     2006-05-08 10:17:16 -0700 (Mon, 08 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=556&view=rev

Log Message:
-----------
Add some useful methods.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-08 16:59:17 UTC (rev 555)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-08 17:17:16 UTC (rev 556)
@@ -23,6 +23,8 @@
 import org.axsl.foR.FONode;
 import org.axsl.foR.FObj;
 
+import java.util.List;
+
 public interface AreaNode {
 
     public AreaNode getWritableParent() ;
@@ -40,6 +42,8 @@
 
     public boolean hasChildren();
 
+    public List getChildren() ;
+
     public int siblingIndex();
 
     public PageArea getWritablePage() ;

Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java	2006-05-08 16:59:17 UTC (rev 555)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java	2006-05-08 17:17:16 UTC (rev 556)
@@ -20,8 +20,10 @@
 
 package org.axsl.areaW;
 
-public interface NormalBlockArea {
+import org.axsl.foR.fo.FootnoteBody;
 
+public interface NormalBlockArea extends BlockArea {
+
     /**
      * Notify this block that the area has completed layout.
      * Indicates the the block has been fully laid out, this will
@@ -42,4 +44,6 @@
 
     public LineArea createNextLineArea();
 
+    public void addFootnote(FootnoteBody fb) ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [518] trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONodeProxy.java

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

Revision: 518
Author:   victormote
Date:     2006-05-06 08:56:26 -0700 (Sat, 06 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=518&view=rev

Log Message:
-----------
Since it must be recast anyway, just make FONodeProxy a marker interface.

Modified Paths:
--------------
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONodeProxy.java
Modified: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONodeProxy.java
===================================================================
--- trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONodeProxy.java	2006-05-06 13:29:57 UTC (rev 517)
+++ trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONodeProxy.java	2006-05-06 15:56:26 UTC (rev 518)
@@ -21,7 +21,7 @@
 package org.axsl.foR;
 
 /**
- * <p>Interface that allows pluggable extension of FONodes in the FOTree
+ * <p>Marker interface that allows pluggable extension of FONodes in the FOTree
  * without the need to subclass.
  * If subclassing is vertical extension, then FONodeProxy is a horizontal
  * extension.
@@ -35,15 +35,8 @@
  * information.</p>
  *
  * <p>More information about the <em>proxy</em> design pattern can be found
- * in the Gang of Four literature. This specific implementation shares some
- * characteristics of the Protection Proxy and of the Smart Reference.</p>
+ * in the Gang of Four literature.</p>
  */
 public interface FONodeProxy {
 
-    /**
-     * Returns the FONode for which this proxy stands.
-     * @return The FONode that is attached to this proxy.
-     */
-    public FONode getFONode() ;
-
 }


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

[aXSL-commit] SF.net SVN: axsl: [520] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/FOLinkage.java

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

Revision: 520
Author:   victormote
Date:     2006-05-06 14:28:01 -0700 (Sat, 06 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=520&view=rev

Log Message:
-----------
Add features to FOLinkage.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/FOLinkage.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/FOLinkage.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/FOLinkage.java	2006-05-06 16:10:32 UTC (rev 519)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/FOLinkage.java	2006-05-06 21:28:01 UTC (rev 520)
@@ -20,13 +20,54 @@
 
 package org.axsl.areaW;
 
-import org.axsl.areaW.AreaNode;
+import org.axsl.foR.FONode;
+import org.axsl.foR.FONodeResult;
 
 /**
  * Keeps track of which FONode generated which AreaNode(s).
  */
-public interface FOLinkage {
+public interface FOLinkage extends FONodeResult {
 
+    public FONode getFONode() ;
+
     public void registerGeneratedArea(AreaNode areaNode) ;
 
+    public void unregisterGeneratedArea(AreaNode areaNode) ;
+
+    public AreaNode getFirstGeneratedBy() ;
+
+    public AreaNode getPreviousGeneratedBy(AreaNode area) ;
+
+    public AreaNode getNextGeneratedBy(AreaNode area) ;
+
+    /**
+     * @param area An Area instance.
+     * @return True iff area is the first Area generated by this.
+     */
+    public boolean isFirstGeneratedBy(AreaNode area) ;
+
+    /**
+     * @param area An Area instance.
+     * @return True iff area is the first Area generated by this.
+     */
+    public boolean isLastGeneratedBy(AreaNode area) ;
+
+    /**
+     * @return The current count of areas that have been generated by the FObj.
+     */
+    public int qtyAreasGenerated() ;
+
+    /**
+     * @return The last AreaNode generated by the parent FObj.
+     */
+    public AreaNode getLastGeneratedBy() ;
+
+    /**
+     * @return The last Area generated by the parent FObj.
+     */
+    public Area getLastAreaGeneratedBy() ;
+
+    public Area firstNormalAreaReturned() ;
+
+    public Area lastNormalAreaReturned() ;
 }


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

[aXSL-commit] SF.net SVN: axsl: [521] trunk/axsl/axsl-area-w

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

Revision: 521
Author:   victormote
Date:     2006-05-06 15:49:43 -0700 (Sat, 06 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=521&view=rev

Log Message:
-----------
Add some new interfaces.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/.classpath

Added Paths:
-----------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LineArea.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java
Modified: trunk/axsl/axsl-area-w/.classpath
===================================================================
--- trunk/axsl/axsl-area-w/.classpath	2006-05-06 21:28:01 UTC (rev 520)
+++ trunk/axsl/axsl-area-w/.classpath	2006-05-06 22:49:43 UTC (rev 521)
@@ -6,5 +6,6 @@
 	<classpathentry kind="src" path="/axslGraphic-R"/>
 	<classpathentry kind="src" path="/axslCommon"/>
 	<classpathentry kind="src" path="/axslFO-R"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/axslText"/>
 	<classpathentry kind="output" path="build/eclipse"/>
 </classpath>

Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LineArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LineArea.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LineArea.java	2006-05-06 22:49:43 UTC (rev 521)
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
+/* $Id$ */
+
+package org.axsl.areaW;
+
+import org.axsl.fontR.FontConsumer;
+import org.axsl.text.TextServer;
+
+public interface LineArea {
+
+    public TextServer getTextServer();
+
+    public FontConsumer getFontConsumer();
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LineArea.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java	2006-05-06 22:49:43 UTC (rev 521)
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
+/* $Id$ */
+
+package org.axsl.areaW;
+
+public interface NormalBlockArea {
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java
___________________________________________________________________
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.

[aXSL-commit] SF.net SVN: axsl: [527] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW

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

Revision: 527
Author:   victormote
Date:     2006-05-07 10:00:17 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=527&view=rev

Log Message:
-----------
Expose some needed methods.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java	2006-05-07 16:05:07 UTC (rev 526)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java	2006-05-07 17:00:17 UTC (rev 527)
@@ -28,4 +28,13 @@
     public void layoutStaticContent(PageSequence pageSequence,
             Region region, RegionArea regionArea) throws AreaWException ;
 
+    /**
+     * Create the needed content in the given PageCollection to satisfy
+     * the PageCollection's PageSequence in the FOTree.
+     * @param pageCollection The PageCollection instance to be laid out.
+     * @throws AreaWException For errors during layout.
+     */
+    public void formatPageSequence(PageCollection pageCollection)
+            throws AreaWException ;
+
 }

Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java	2006-05-07 16:05:07 UTC (rev 526)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java	2006-05-07 17:00:17 UTC (rev 527)
@@ -33,4 +33,32 @@
 
     public PageSequence getPageSequence() ;
 
+    /**
+     * Creates any blank pages that are needed at the beginning of
+     * a PageCollection to meet the related PageSequence's constraints.
+     * @throws AreaWException
+     */
+    public void padPagesAtBeginning() throws AreaWException ;
+
+    /**
+     * Creates any blank pages that are needed at the end of a
+     * PageCollection to meet the related PageSequence's constraints.
+     * @throws AreaWException
+     */
+    public void padPagesAtEnd() throws AreaWException ;
+
+    public int getCurrentPageNumber() ;
+
+    /**
+     * Creates a new page area for the given parameters
+     * @param isBlank True iff this page will be empty (e.g. forced even or
+     * odd break, or forced page count).
+     * @return A Page layout object based on the page master selected from the
+     * params.
+     */
+    public PageArea getNextPage(boolean forceOdd, boolean forceEven,
+            boolean isBlank) throws AreaWException ;
+
+    public int getPageCount() ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [528] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java

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

Revision: 528
Author:   victormote
Date:     2006-05-07 10:55:19 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=528&view=rev

Log Message:
-----------
Add method to get an FOLinkage for an FONode.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-07 17:00:17 UTC (rev 527)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-07 17:55:19 UTC (rev 528)
@@ -34,4 +34,11 @@
 
     public FONode getGeneratedBy() ;
 
+    /**
+     * Returns the FOLinkage for a given FONode, creating it if necessary.
+     * @param foNode The FONode for who a linkage record is needed.
+     * @return The FOLinkage item associated with <code>foNode</code>.
+     */
+    public FOLinkage getFOLinkage(FONode foNode) ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [542] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java

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

Revision: 542
Author:   victormote
Date:     2006-05-07 17:03:45 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=542&view=rev

Log Message:
-----------
Add useful methods.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java	2006-05-08 00:03:04 UTC (rev 541)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java	2006-05-08 00:03:45 UTC (rev 542)
@@ -21,6 +21,7 @@
 package org.axsl.areaW;
 
 import org.axsl.foR.fo.FootnoteBody;
+import org.axsl.foR.fo.PageSequence;
 import org.axsl.foR.fo.SimplePageMaster;
 
 import java.util.List;
@@ -49,4 +50,8 @@
 
     public void setPendingFootnotes(List footnotes) ;
 
+    public void layoutComplete() throws AreaWException ;
+
+    public PageSequence getPageSequence() ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [543] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java

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

Revision: 543
Author:   victormote
Date:     2006-05-07 17:04:22 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=543&view=rev

Log Message:
-----------
Add useful method.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java	2006-05-08 00:03:45 UTC (rev 542)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java	2006-05-08 00:04:22 UTC (rev 543)
@@ -26,4 +26,10 @@
 
 public interface Area extends AreaNode {
 
+    /**
+     * @return The block-progression-dimension of the content-rectangle for
+     * this Area.
+     */
+    public abstract int crBPD() ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [544] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionRABody.java

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

Revision: 544
Author:   victormote
Date:     2006-05-07 17:05:00 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=544&view=rev

Log Message:
-----------
Add useful methods.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionRABody.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionRABody.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionRABody.java	2006-05-08 00:04:22 UTC (rev 543)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionRABody.java	2006-05-08 00:05:00 UTC (rev 544)
@@ -24,4 +24,10 @@
 
     public MainRA getWritableMainRA() ;
 
+    public FootnoteRA getFootnoteReferenceArea() ;
+
+    public PageArea getWritablePage() ;
+
+    public int getFootnoteState() ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [549] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LineArea.java

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

Revision: 549
Author:   victormote
Date:     2006-05-08 07:59:32 -0700 (Mon, 08 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=549&view=rev

Log Message:
-----------
Add some useful methods.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LineArea.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LineArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LineArea.java	2006-05-08 14:51:38 UTC (rev 548)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LineArea.java	2006-05-08 14:59:32 UTC (rev 549)
@@ -28,6 +28,7 @@
 import org.axsl.foR.fo.PageNumberCitation;
 import org.axsl.fontR.FontConsumer;
 import org.axsl.text.TextServer;
+import org.axsl.text.line.LineOutput;
 
 public interface LineArea extends BlockArea {
 
@@ -52,4 +53,10 @@
             int sizeInChars, boolean hasDiscretionaryHyphen,
             boolean hasFauxSmallCaps) ;
 
+    /**
+     * Return <code>this</code> cast as a LineOutput implementation.
+     * @return This cast as a LineOuput implementation.
+     */
+    public LineOutput asLineOutput() ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [550] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW

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

Revision: 550
Author:   victormote
Date:     2006-05-08 08:12:54 -0700 (Mon, 08 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=550&view=rev

Log Message:
-----------
Add new interfaces.

Added Paths:
-----------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableArea.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableRowContainer.java
Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableArea.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableArea.java	2006-05-08 15:12:54 UTC (rev 550)
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
+/* $Id$ */
+
+package org.axsl.areaW;
+
+public interface TableArea extends NormalBlockArea {
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableArea.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableRowContainer.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableRowContainer.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableRowContainer.java	2006-05-08 15:12:54 UTC (rev 550)
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
+/* $Id$ */
+
+package org.axsl.areaW;
+
+public interface TableRowContainer extends AreaFlexible {
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableRowContainer.java
___________________________________________________________________
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.

[aXSL-commit] SF.net SVN: axsl: [554] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW

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

Revision: 554
Author:   victormote
Date:     2006-05-08 09:41:38 -0700 (Mon, 08 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=554&view=rev

Log Message:
-----------
Add needed methods.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java	2006-05-08 16:23:08 UTC (rev 553)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java	2006-05-08 16:41:38 UTC (rev 554)
@@ -36,6 +36,12 @@
      */
     public int crBPD() ;
 
+    /**
+     * @return The inline-progression-dimension of the content-rectangle for
+     * this Area.
+     */
+    public int crIPD() ;
+
     public void incrementProgressionDimension(int incrementAmount);
 
     public short traitAbsolutePosition() ;

Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-08 16:23:08 UTC (rev 553)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-08 16:41:38 UTC (rev 554)
@@ -50,4 +50,11 @@
 
     public void removeChild(AreaNode areaNode) ;
 
+    /**
+     * Finds either "this" or the nearest ancestor area that was generated by
+     * a block-level formatting object.
+     * @return The Area generated by a block-level FO.
+     */
+    public Area nearestGeneratedByBlockLevelFO() ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [515] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW

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

Revision: 515
Author:   victormote
Date:     2006-05-05 19:11:22 -0700 (Fri, 05 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=515&view=rev

Log Message:
-----------
1. Add new interface for the linkage between FO and Area Trees.
2. Add needed methods to writable AreaNode.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java

Added Paths:
-----------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/FOLinkage.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-05 19:10:14 UTC (rev 514)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-06 02:11:22 UTC (rev 515)
@@ -24,6 +24,14 @@
  
 package org.axsl.areaW;
 
+import org.axsl.foR.FONode;
+
 public interface AreaNode {
 
+    public AreaNode getWritableParent() ;
+
+    public Area getWritableParentArea() ;
+
+    public FONode getGeneratedBy() ;
+
 }

Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/FOLinkage.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/FOLinkage.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/FOLinkage.java	2006-05-06 02:11:22 UTC (rev 515)
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+/* $Id$ */
+
+package org.axsl.areaW;
+
+import org.axsl.areaW.AreaNode;
+
+/**
+ * Keeps track of which FONode generated which AreaNode(s).
+ */
+public interface FOLinkage {
+
+    public void registerGeneratedArea(AreaNode areaNode) ;
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/FOLinkage.java
___________________________________________________________________
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.

[aXSL-commit] SF.net SVN: axsl: [514] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW

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

Revision: 514
Author:   victormote
Date:     2006-05-05 12:10:14 -0700 (Fri, 05 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=514&view=rev

Log Message:
-----------
Add some more basic interfaces.

Added Paths:
-----------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaFixed.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaFlexible.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/MainRA.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalFlowRA.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionRABody.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/SpanRA.java
Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaFixed.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaFixed.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaFixed.java	2006-05-05 19:10:14 UTC (rev 514)
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
+/* $Id$ */
+
+package org.axsl.areaW;
+
+/**
+ * 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}.
+ */
+public interface AreaFixed extends Area {
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaFixed.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaFlexible.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaFlexible.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaFlexible.java	2006-05-05 19:10:14 UTC (rev 514)
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
+/* $Id$ */
+
+package org.axsl.areaW;
+
+/**
+ * Subclasses are areas that need to store their own size and spacing
+ * information.
+ */
+public interface AreaFlexible extends Area {
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaFlexible.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/MainRA.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/MainRA.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/MainRA.java	2006-05-05 19:10:14 UTC (rev 514)
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
+/* $Id$ */
+ 
+package org.axsl.areaW;
+
+/**
+ * Manages the main-reference-area. Its parent should always be an instance of
+ * RegionRABody, and its children should always be instances of SpanRA.
+ */
+public interface MainRA extends AreaFixed {
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/MainRA.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalFlowRA.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalFlowRA.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalFlowRA.java	2006-05-05 19:10:14 UTC (rev 514)
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
+/* $Id$ */
+ 
+package org.axsl.areaW;
+
+/**
+ * Represents a normal-flow-reference-area.
+ */
+public interface NormalFlowRA extends AreaFlexible {
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalFlowRA.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionRABody.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionRABody.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionRABody.java	2006-05-05 19:10:14 UTC (rev 514)
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
+/* $Id$ */
+ 
+package org.axsl.areaW;
+
+public interface RegionRABody extends AreaFixed {
+
+    public MainRA getMainRA() ;
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionRABody.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/SpanRA.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/SpanRA.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/SpanRA.java	2006-05-05 19:10:14 UTC (rev 514)
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
+/* $Id$ */
+ 
+package org.axsl.areaW;
+
+/**
+ * Represents a span-reference-area.
+ * The standard does not seem to tell us what if any FO generates a
+ * span-reference-area. The best guess is that it is generated by the
+ * region-body fo.
+ */
+public interface SpanRA extends AreaFlexible {
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/SpanRA.java
___________________________________________________________________
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.

[aXSL-commit] SF.net SVN: axsl: [513] trunk/axsl/scripts/build.xml

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

Revision: 513
Author:   victormote
Date:     2006-05-05 11:14:59 -0700 (Fri, 05 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=513&view=rev

Log Message:
-----------
Update javadoc generation with correct paths and better descriptions.

Modified Paths:
--------------
    trunk/axsl/scripts/build.xml
Modified: trunk/axsl/scripts/build.xml
===================================================================
--- trunk/axsl/scripts/build.xml	2006-05-05 18:12:42 UTC (rev 512)
+++ trunk/axsl/scripts/build.xml	2006-05-05 18:14:59 UTC (rev 513)
@@ -155,15 +155,15 @@
         <package name="org.axsl.common"/>
         <package name="org.axsl.common.*"/>
       </group>
-      <group title="The aXSL PostScript Access Module">
+      <group title="The aXSL PostScript Reader Module">
         <package name="org.axsl.psR"/>
         <package name="org.axsl.psR.*"/>
       </group>
-      <group title="The aXSL Graphic Access Module">
+      <group title="The aXSL Graphic Reader Module">
         <package name="org.axsl.graphicR"/>
         <package name="org.axsl.graphicR.*"/>
       </group>
-      <group title="The aXSL Font Access Module">
+      <group title="The aXSL Font Reader Module">
         <package name="org.axsl.fontR"/>
         <package name="org.axsl.fontR.*"/>
       </group>
@@ -171,19 +171,19 @@
         <package name="org.axsl.text"/>
         <package name="org.axsl.text.*"/>
       </group>
-      <group title="The aXSL FOTree Access Module">
+      <group title="The aXSL FO Tree Reader Module">
         <package name="org.axsl.foR"/>
         <package name="org.axsl.foR.*"/>
       </group>
-      <group title="The aXSL AreaTree Creation Module">
+      <group title="The aXSL Area Tree Writer Module">
         <package name="org.axsl.areaW"/>
         <package name="org.axsl.areaW.*"/>
       </group>
-      <group title="The aXSL AreaTree Access Module">
+      <group title="The aXSL Area Tree Writer Module">
         <package name="org.axsl.areaR"/>
         <package name="org.axsl.areaR.*"/>
       </group>
-      <group title="The aXSL PDF Creation Module">
+      <group title="The aXSL PDF Writer Module">
         <package name="org.axsl.pdfW"/>
         <package name="org.axsl.pdfW.*"/>
       </group>


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

[aXSL-commit] SF.net SVN: axsl: [512] trunk/axsl/doc/web

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

Revision: 512
Author:   victormote
Date:     2006-05-05 11:12:42 -0700 (Fri, 05 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=512&view=rev

Log Message:
-----------
Update names and locations of module docs to match new scheme.

Modified Paths:
--------------
    trunk/axsl/doc/web/area-r/index.html
    trunk/axsl/doc/web/fo-r/index.html
    trunk/axsl/doc/web/font-r/configure.html
    trunk/axsl/doc/web/font-r/index.html
    trunk/axsl/doc/web/graphic-r/index.html
    trunk/axsl/doc/web/modules.html
    trunk/axsl/doc/web/pdf-w/index.html
    trunk/axsl/doc/web/ps-r/index.html
Modified: trunk/axsl/doc/web/area-r/index.html
===================================================================
--- trunk/axsl/doc/web/area-r/index.html	2006-05-05 17:48:06 UTC (rev 511)
+++ trunk/axsl/doc/web/area-r/index.html	2006-05-05 18:12:42 UTC (rev 512)
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 
 <head>
-  <title>aXSL: axslArea-Out</title>
+  <title>The aXSL Area Tree Reader Module</title>
   <meta name="content-revised"
     content="$Date$"/>
   <!--#include virtual="/00-rsrc/include/standard-head.html" -->
@@ -16,7 +16,7 @@
 
 <!--#include virtual="/00-rsrc/include/leftmenu.html" -->
 
-<h1>aXSL: axslArea-Out</h1>
+<h1>The aXSL Area Tree Reader Module</h1>
 <h2>Contents</h2>
 <ul>
   <li><a href="#intro">Introduction</a></li>

Modified: trunk/axsl/doc/web/fo-r/index.html
===================================================================
--- trunk/axsl/doc/web/fo-r/index.html	2006-05-05 17:48:06 UTC (rev 511)
+++ trunk/axsl/doc/web/fo-r/index.html	2006-05-05 18:12:42 UTC (rev 512)
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 
 <head>
-  <title>aXSL: axslFOTree</title>
+  <title>The aXSL FO Tree Reader Module</title>
   <meta name="content-revised"
     content="$Date$"/>
   <!--#include virtual="/00-rsrc/include/standard-head.html" -->
@@ -16,7 +16,7 @@
 
 <!--#include virtual="/00-rsrc/include/leftmenu.html" -->
 
-<h1>aXSL: axslFOTree</h1>
+<h1>The aXSL FO Tree Reader Module</h1>
 <h2>Contents</h2>
 <ul>
   <li><a href="#intro">Introduction</a></li>

Modified: trunk/axsl/doc/web/font-r/configure.html
===================================================================
--- trunk/axsl/doc/web/font-r/configure.html	2006-05-05 17:48:06 UTC (rev 511)
+++ trunk/axsl/doc/web/font-r/configure.html	2006-05-05 18:12:42 UTC (rev 512)
@@ -51,7 +51,7 @@
   such information, so that users can avoid the need to maintain multiple
   configurations for multiple applications.
   A <a rel="external"
-  href="http://svn.sourceforge.net/viewcvs.cgi/axsl/trunk/axsl/axsl-font/config/sample-axsl-font-config.xml?view=markup">sample
+  href="http://svn.sourceforge.net/viewcvs.cgi/axsl/trunk/axsl/axsl-font-r/config/sample-axsl-font-config.xml?view=markup">sample
   configuration file</a> is also provided, which may be useful either for
   cut-and-paste or consultation as font-configuration files are created.</p>
 

Modified: trunk/axsl/doc/web/font-r/index.html
===================================================================
--- trunk/axsl/doc/web/font-r/index.html	2006-05-05 17:48:06 UTC (rev 511)
+++ trunk/axsl/doc/web/font-r/index.html	2006-05-05 18:12:42 UTC (rev 512)
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 
 <head>
-  <title>aXSL: axslFont</title>
+  <title>The aXSL Font Reader Module</title>
   <meta name="content-revised"
     content="$Date$"/>
   <!--#include virtual="/00-rsrc/include/standard-head.html" -->
@@ -16,7 +16,7 @@
 
 <!--#include virtual="/00-rsrc/include/leftmenu.html" -->
 
-<h1>aXSL: axslFont</h1>
+<h1>The aXSL Font Reader Module</h1>
 <h2>Contents</h2>
 <ul>
   <li><a href="#intro">Introduction</a></li>

Modified: trunk/axsl/doc/web/graphic-r/index.html
===================================================================
--- trunk/axsl/doc/web/graphic-r/index.html	2006-05-05 17:48:06 UTC (rev 511)
+++ trunk/axsl/doc/web/graphic-r/index.html	2006-05-05 18:12:42 UTC (rev 512)
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 
 <head>
-  <title>aXSL: axslGraphic</title>
+  <title>The aXSL Graphic Reader Module</title>
   <meta name="content-revised"
     content="$Date$"/>
   <!--#include virtual="/00-rsrc/include/standard-head.html" -->
@@ -16,7 +16,7 @@
 
 <!--#include virtual="/00-rsrc/include/leftmenu.html" -->
 
-<h1>aXSL: axslGraphic</h1>
+<h1>The aXSL Graphic Reader Module</h1>
 <h2>Contents</h2>
 <ul>
   <li><a href="#intro">Introduction</a></li>

Modified: trunk/axsl/doc/web/modules.html
===================================================================
--- trunk/axsl/doc/web/modules.html	2006-05-05 17:48:06 UTC (rev 511)
+++ trunk/axsl/doc/web/modules.html	2006-05-05 18:12:42 UTC (rev 512)
@@ -60,50 +60,50 @@
     <td colspan="4">Standalone Modules</td>
   </tr>
   <tr>
-    <td><a class="Menu" href="/ps/">axslPS</a></td>
+    <td><a class="Menu" href="/ps-r/">axslPS-R</a></td>
     <td>axsl-ps</td>
     <td>Interfaces for handling encoding issues.</td>
     <td>None.</td>
   </tr>
   <tr>
-    <td><a class="Menu" href="/graphic/">axslGraphic</a></td>
+    <td><a class="Menu" href="/graphic-r/">axslGraphic-R</a></td>
     <td>axsl-graphic</td>
     <td>Interfaces for handling graphics, both bitmapped images and vector
 drawings.</td>
     <td>SVG library.</td>
   </tr>
   <tr>
-    <td><a class="Menu" href="/font/">axslFont</a></td>
+    <td><a class="Menu" href="/font-r/">axslFont-R</a></td>
     <td>axsl-font</td>
     <td>Interfaces for handling fonts.</td>
-    <td>axslCommon, axslPS.</td>
+    <td>axslCommon, axslPS-R.</td>
   </tr>
   <tr>
     <td><a class="Menu" href="/text/">axslText</a></td>
     <td>axsl-text</td>
     <td>Interfaces for hyphenation and line-breaking.</td>
-    <td>axslText.</td>
+    <td>axslFont-R</td>
   </tr>
   <tr>
-    <td><a class="Menu" href="/pdf-out/">axslPDF</a></td>
+    <td><a class="Menu" href="/pdf-w/">axslPDF-W</a></td>
     <td>axsl-pdf</td>
     <td>Interfaces for creating PDF files.</td>
-    <td>SVG Library, axslGraphic, axslFont.</td>
+    <td>SVG Library, axslGraphic-R, axslFont-R.</td>
   </tr>
   <tr class="Heading1">
     <td colspan="4">Document Processing Modules</td>
   </tr>
   <tr>
-    <td><a class="Menu" href="/fotree/">axslFOTree</a></td>
+    <td><a class="Menu" href="/fo-r/">axslFO-R</a></td>
     <td>axsl-fotree</td>
     <td>Interfaces for making XSL-FO content available.</td>
-    <td>SVG Library, axslCommon, axslGraphic, axslFont, axslText.</td>
+    <td>SVG Library, axslCommon, axslGraphic-R, axslFont-R, axslText.</td>
   </tr>
   <tr>
-    <td><a class="Menu" href="/area-out/">axslAreaOut</a></td>
+    <td><a class="Menu" href="/area-r/">axslArea-R</a></td>
     <td>axsl-area-out</td>
     <td>Interfaces for making Area Tree contents available to renderers.</td>
-    <td>SVG Library, axslCommon, axslGraphic, axslFont.</td>
+    <td>SVG Library, axslCommon, axslGraphic-R, axslFont-R.</td>
   </tr>
 </table>
 

Modified: trunk/axsl/doc/web/pdf-w/index.html
===================================================================
--- trunk/axsl/doc/web/pdf-w/index.html	2006-05-05 17:48:06 UTC (rev 511)
+++ trunk/axsl/doc/web/pdf-w/index.html	2006-05-05 18:12:42 UTC (rev 512)
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 
 <head>
-  <title>aXSL: axslPDF-Out</title>
+  <title>The aXSL PDF Writer Module</title>
   <meta name="content-revised"
     content="$Date$"/>
   <!--#include virtual="/00-rsrc/include/standard-head.html" -->
@@ -16,7 +16,7 @@
 
 <!--#include virtual="/00-rsrc/include/leftmenu.html" -->
 
-<h1>aXSL: axslPDF-Out</h1>
+<h1>The aXSL PDF Writer Module</h1>
 <h2>Contents</h2>
 <ul>
   <li><a href="#intro">Introduction</a></li>

Modified: trunk/axsl/doc/web/ps-r/index.html
===================================================================
--- trunk/axsl/doc/web/ps-r/index.html	2006-05-05 17:48:06 UTC (rev 511)
+++ trunk/axsl/doc/web/ps-r/index.html	2006-05-05 18:12:42 UTC (rev 512)
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 
 <head>
-  <title>aXSL: PS</title>
+  <title>The aXSL PostScript Reader Module</title>
   <meta name="content-revised"
     content="$Date$"/>
   <!--#include virtual="/00-rsrc/include/standard-head.html" -->
@@ -16,7 +16,7 @@
 
 <!--#include virtual="/00-rsrc/include/leftmenu.html" -->
 
-<h1>aXSL: PS</h1>
+<h1>The aXSL PostScript Reader Module</h1>
 <h2>Contents</h2>
 <ul>
   <li><a href="#intro">Introduction</a></li>


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