axsl-commit — aXSL repository commit log messages

[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.

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

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

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

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

Modified Paths:
--------------
    trunk/axsl/doc/web/00-rsrc/include/leftmenu.html

Added Paths:
-----------
    trunk/axsl/doc/web/area-r/
    trunk/axsl/doc/web/area-r/index.html
    trunk/axsl/doc/web/fo-r/
    trunk/axsl/doc/web/fo-r/index.html
    trunk/axsl/doc/web/font-r/
    trunk/axsl/doc/web/font-r/configure.html
    trunk/axsl/doc/web/font-r/encoding.html
    trunk/axsl/doc/web/font-r/index.html
    trunk/axsl/doc/web/graphic-r/
    trunk/axsl/doc/web/graphic-r/index.html
    trunk/axsl/doc/web/pdf-w/
    trunk/axsl/doc/web/pdf-w/index.html
    trunk/axsl/doc/web/ps-r/
    trunk/axsl/doc/web/ps-r/index.html

Removed Paths:
-------------
    trunk/axsl/doc/web/area-out/
    trunk/axsl/doc/web/area-r/index.html
    trunk/axsl/doc/web/fo-r/index.html
    trunk/axsl/doc/web/font/
    trunk/axsl/doc/web/font-r/configure.html
    trunk/axsl/doc/web/font-r/encoding.html
    trunk/axsl/doc/web/font-r/index.html
    trunk/axsl/doc/web/fotree/
    trunk/axsl/doc/web/graphic/
    trunk/axsl/doc/web/graphic-r/index.html
    trunk/axsl/doc/web/pdf-out/
    trunk/axsl/doc/web/pdf-w/index.html
    trunk/axsl/doc/web/ps/
    trunk/axsl/doc/web/ps-r/index.html
Modified: trunk/axsl/doc/web/00-rsrc/include/leftmenu.html
===================================================================
--- trunk/axsl/doc/web/00-rsrc/include/leftmenu.html	2006-05-05 17:39:01 UTC (rev 510)
+++ trunk/axsl/doc/web/00-rsrc/include/leftmenu.html	2006-05-05 17:48:06 UTC (rev 511)
@@ -47,19 +47,19 @@
     <tr>
       <td class="Bullet1">&nbsp;</td>
       <td class="Menu1">
-        <a class="Menu" href="/ps/">axslPS</a>
+        <a class="Menu" href="/ps-r/">axslPS-R</a>
       </td>
     </tr>
     <tr>
       <td class="Bullet1">&nbsp;</td>
       <td class="Menu1">
-        <a class="Menu" href="/graphic/">axslGraphic</a>
+        <a class="Menu" href="/graphic-r/">axslGraphic-R</a>
       </td>
     </tr>
     <tr>
       <td class="Bullet1">&nbsp;</td>
       <td class="Menu1">
-        <a class="Menu" href="/font/">axslFont</a>
+        <a class="Menu" href="/font-r/">axslFont-R</a>
       </td>
     </tr>
     <tr>
@@ -71,19 +71,19 @@
     <tr>
       <td class="Bullet1">&nbsp;</td>
       <td class="Menu1">
-        <a class="Menu" href="/pdf-out/">axslPDF-Out</a>
+        <a class="Menu" href="/pdf-w/">axslPDF-W</a>
       </td>
     </tr>
     <tr>
       <td class="Bullet1">&nbsp;</td>
       <td class="Menu1">
-        <a class="Menu" href="/fotree/">axslFOTree</a>
+        <a class="Menu" href="/fo-r/">axslFO-R</a>
       </td>
     </tr>
     <tr>
       <td class="Bullet1">&nbsp;</td>
       <td class="Menu1">
-        <a class="Menu" href="/area-out/">axslArea-Out</a>
+        <a class="Menu" href="/area-r/">axslArea-R</a>
       </td>
     </tr>
     <tr class="MenuHead">

Copied: trunk/axsl/doc/web/area-r (from rev 508, trunk/axsl/doc/web/area-out)

Deleted: trunk/axsl/doc/web/area-r/index.html
===================================================================
--- trunk/axsl/doc/web/area-out/index.html	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/doc/web/area-r/index.html	2006-05-05 17:48:06 UTC (rev 511)
@@ -1,46 +0,0 @@
-<?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>aXSL: axslArea-Out</title>
-  <meta name="content-revised"
-    content="$Date$"/>
-  <!--#include virtual="/00-rsrc/include/standard-head.html" -->
-</head>
-
-<body>
-
-<!--#include virtual="/00-rsrc/include/leftmenu.html" -->
-
-<h1>aXSL: axslArea-Out</h1>
-<h2>Contents</h2>
-<ul>
-  <li><a href="#intro">Introduction</a></li>
-  <li><a href="#implementations">Known Implementations</a></li>
-  <li><a href="#reference-apps">Reference Applications</a></li>
-</ul>
-
-<h2><a name="intro">Introduction</a></h2>
-<p>The Area-Out module provides interfaces for making Area Tree content
-available to rendering applications.</p>
-
-<h2><a name="implementations">Known Implementations</a></h2>
-<p>The known implementations of axslArea-Out are:</p>
-<ul>
-  <li>[open source] <a rel="external"
-href="http://www.foray.org/module/text/">FOrayArea</a></li>
-</ul>
-
-<h2><a name="reference-apps">Reference Applications</a></h2>
-<p>Reference applications contain working code that <em>uses </em>axslArea-Out:</p>
-<ul>
-  <li>[open source] <a rel="external" href="http://www.foray.org/">FOray</a></li>
-</ul>
-
-<!--#include virtual="/00-rsrc/include/leftmenu-end.html" -->
-</body>
-</html>

Copied: trunk/axsl/doc/web/area-r/index.html (from rev 510, trunk/axsl/doc/web/area-out/index.html)
===================================================================
--- trunk/axsl/doc/web/area-r/index.html	                        (rev 0)
+++ trunk/axsl/doc/web/area-r/index.html	2006-05-05 17:48:06 UTC (rev 511)
@@ -0,0 +1,46 @@
+<?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>aXSL: axslArea-Out</title>
+  <meta name="content-revised"
+    content="$Date$"/>
+  <!--#include virtual="/00-rsrc/include/standard-head.html" -->
+</head>
+
+<body>
+
+<!--#include virtual="/00-rsrc/include/leftmenu.html" -->
+
+<h1>aXSL: axslArea-Out</h1>
+<h2>Contents</h2>
+<ul>
+  <li><a href="#intro">Introduction</a></li>
+  <li><a href="#implementations">Known Implementations</a></li>
+  <li><a href="#reference-apps">Reference Applications</a></li>
+</ul>
+
+<h2><a name="intro">Introduction</a></h2>
+<p>The Area-Out module provides interfaces for making Area Tree content
+available to rendering applications.</p>
+
+<h2><a name="implementations">Known Implementations</a></h2>
+<p>The known implementations of axslArea-Out are:</p>
+<ul>
+  <li>[open source] <a rel="external"
+href="http://www.foray.org/module/text/">FOrayArea</a></li>
+</ul>
+
+<h2><a name="reference-apps">Reference Applications</a></h2>
+<p>Reference applications contain working code that <em>uses </em>axslArea-Out:</p>
+<ul>
+  <li>[open source] <a rel="external" href="http://www.foray.org/">FOray</a></li>
+</ul>
+
+<!--#include virtual="/00-rsrc/include/leftmenu-end.html" -->
+</body>
+</html>

Copied: trunk/axsl/doc/web/fo-r (from rev 508, trunk/axsl/doc/web/fotree)

Deleted: trunk/axsl/doc/web/fo-r/index.html
===================================================================
--- trunk/axsl/doc/web/fotree/index.html	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/doc/web/fo-r/index.html	2006-05-05 17:48:06 UTC (rev 511)
@@ -1,65 +0,0 @@
-<?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>aXSL: axslFOTree</title>
-  <meta name="content-revised"
-    content="$Date$"/>
-  <!--#include virtual="/00-rsrc/include/standard-head.html" -->
-</head>
-
-<body>
-
-<!--#include virtual="/00-rsrc/include/leftmenu.html" -->
-
-<h1>aXSL: axslFOTree</h1>
-<h2>Contents</h2>
-<ul>
-  <li><a href="#intro">Introduction</a></li>
-  <li><a href="#missing">Missing Interfaces?</a></li>
-  <li><a href="#implementations">Known Implementations</a></li>
-  <li><a href="#reference-apps">Reference Applications</a></li>
-</ul>
-
-<h2><a name="intro">Introduction</a></h2>
-<p>The FOTree module provides access to the XSL-FO objects and properties in the
-underlying document content. Implementations parse an FO file or content stream
-and make that data available to client applications.</p>
-
-<h2><a name="missing">Missing Interfaces?</a></h2>
-<p>There are several pagination-related XSL-FO objects that do not have
-corresponding classes in the aXSL FOTree.
-These are not unimportant, but their operation is entirely internal to the
-FOTree.
-Client applications only need to know what SimplePageMaster they should use, so
-the "details" of these classes are hidden from the client applications:</p>
-
-<ul>
-  <li>LayoutMasterSet</li>
-  <li>PageSequenceMaster</li>
-  <li>SinglePageMasterReference</li>
-  <li>RepeatablePageMasterReference</li>
-  <li>RepeatablePageMasterAlternatives</li>
-  <li>ConditionalPageMasterReference</li>
-</ul>
-
-<h2><a name="implementations">Known Implementations</a></h2>
-<p>The known implementations of axslFOTree are:</p>
-<ul>
-  <li>[open source] <a rel="external"
-href="http://www.foray.org/module/fotree/">FOrayFOTree</a></li>
-</ul>
-
-<h2><a name="reference-apps">Reference Applications</a></h2>
-<p>Reference applications contain working code that <em>uses </em>axslFOTree:</p>
-<ul>
-  <li>[open source] <a rel="external" href="http://www.foray.org/">FOray</a></li>
-</ul>
-
-<!--#include virtual="/00-rsrc/include/leftmenu-end.html" -->
-</body>
-</html>

Copied: trunk/axsl/doc/web/fo-r/index.html (from rev 510, trunk/axsl/doc/web/fotree/index.html)
===================================================================
--- trunk/axsl/doc/web/fo-r/index.html	                        (rev 0)
+++ trunk/axsl/doc/web/fo-r/index.html	2006-05-05 17:48:06 UTC (rev 511)
@@ -0,0 +1,65 @@
+<?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>aXSL: axslFOTree</title>
+  <meta name="content-revised"
+    content="$Date$"/>
+  <!--#include virtual="/00-rsrc/include/standard-head.html" -->
+</head>
+
+<body>
+
+<!--#include virtual="/00-rsrc/include/leftmenu.html" -->
+
+<h1>aXSL: axslFOTree</h1>
+<h2>Contents</h2>
+<ul>
+  <li><a href="#intro">Introduction</a></li>
+  <li><a href="#missing">Missing Interfaces?</a></li>
+  <li><a href="#implementations">Known Implementations</a></li>
+  <li><a href="#reference-apps">Reference Applications</a></li>
+</ul>
+
+<h2><a name="intro">Introduction</a></h2>
+<p>The FOTree module provides access to the XSL-FO objects and properties in the
+underlying document content. Implementations parse an FO file or content stream
+and make that data available to client applications.</p>
+
+<h2><a name="missing">Missing Interfaces?</a></h2>
+<p>There are several pagination-related XSL-FO objects that do not have
+corresponding classes in the aXSL FOTree.
+These are not unimportant, but their operation is entirely internal to the
+FOTree.
+Client applications only need to know what SimplePageMaster they should use, so
+the "details" of these classes are hidden from the client applications:</p>
+
+<ul>
+  <li>LayoutMasterSet</li>
+  <li>PageSequenceMaster</li>
+  <li>SinglePageMasterReference</li>
+  <li>RepeatablePageMasterReference</li>
+  <li>RepeatablePageMasterAlternatives</li>
+  <li>ConditionalPageMasterReference</li>
+</ul>
+
+<h2><a name="implementations">Known Implementations</a></h2>
+<p>The known implementations of axslFOTree are:</p>
+<ul>
+  <li>[open source] <a rel="external"
+href="http://www.foray.org/module/fotree/">FOrayFOTree</a></li>
+</ul>
+
+<h2><a name="reference-apps">Reference Applications</a></h2>
+<p>Reference applications contain working code that <em>uses </em>axslFOTree:</p>
+<ul>
+  <li>[open source] <a rel="external" href="http://www.foray.org/">FOray</a></li>
+</ul>
+
+<!--#include virtual="/00-rsrc/include/leftmenu-end.html" -->
+</body>
+</html>

Copied: trunk/axsl/doc/web/font-r (from rev 508, trunk/axsl/doc/web/font)

Deleted: trunk/axsl/doc/web/font-r/configure.html
===================================================================
--- trunk/axsl/doc/web/font/configure.html	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/doc/web/font-r/configure.html	2006-05-05 17:48:06 UTC (rev 511)
@@ -1,403 +0,0 @@
-<?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>axslFont: Font Configuration</title>
-  <meta name="content-revised"
-    content="$Date$"/>
-  <!--#include virtual="/00-rsrc/include/standard-head.html" -->
-</head>
-
-<body>
-
-<!--#include virtual="/00-rsrc/include/leftmenu.html" -->
-
-<h1>axslFont: Font Configuration</h1>
-<h2>Contents</h2>
-<ul>
-  <li><a href="#intro">Introduction</a></li>
-  <li><a href="#root">&lt;axsl-font-config&gt; element</a></li>
-  <li><a href="#server">&lt;server&gt; element</a></li>
-  <li><a href="#parameter">&lt;parameter&gt; element</a></li>
-  <li><a href="#glyph-list">&lt;glyph-list&gt; element</a></li>
-  <li><a href="#encoding">&lt;encoding&gt; element</a></li>
-  <li><a href="#font-group">&lt;font-group&gt; element</a></li>
-  <li><a href="#font">&lt;font&gt; element</a></li>
-  <li><a href="#font-family">&lt;font-family&gt; element</a></li>
-  <li><a href="#font-desc">&lt;font-description&gt; element</a></li>
-  <li><a href="#font-family-alias">&lt;font-family-alias&gt;
-    element</a></li>
-  <li><a href="#alias-configuration">&lt;font-family-alias&gt;
-    element</a></li>
-</ul>
-
-<p class="Warning">Future changes to the font configuration are expected, so
-that more features can be added.</p>
-
-<h3><a name="intro">Introduction</a></h3>
-<p>Some applications are able to obtain all of the information that they need
-  about available fonts from some universal system registry, usually
-  maintained by the operating system.
-  In such cases, a font-configuration is not needed.
-  However, in any case where such information is not available, may not be
-  available, or not adequate for the application, some standard method of
-  communicating information about available fonts is needed.
-  The <a rel="external" href="/dtds/0.1/en/axsl-font-config.dtd">aXSL
-  font-configuration DTD</a> is an attempt to standardize the format of
-  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
-  configuration file</a> is also provided, which may be useful either for
-  cut-and-paste or consultation as font-configuration files are created.</p>
-
-<p>The configuration contemplates two general types of fonts. First are those
-for which at least some information is available from some other registry.
-In this document, these are referred to as System Fonts (SF). Second are those
-for which no external information is available at all. These are referred to
-as Free-standing Fonts (FSF).</p>
-
-<p>The aXSL font-configuration is optimized for flexibility, which makes it
-somewhat more verbose and complex than it could be.
-It draws a sharp distinction between configuration of the font itself, which
-is generally done in the &lt;font&gt; element, and configuration of the way it
-is used and selected by an application, which is generally done in the
-&lt;font-description&gt; element.
-This distincion allows a font to be used in more than one way.
-Here are some examples where this may possibly be useful:</p>
-<ul>
-  <li>The same font to be used with more than one encoding.</li>
-  <li>The same font can be used in the same or different ways in more than
-  one font family.</li>
-</ul>
-
-<h3><a name="root">&lt;axsl-font-config&gt; element</a></h3>
-  <p>All attributes of axsl-font-config set global defaults that can be
-  overridden by subsidiary elements.</p>
-  <ul>
-    <li><strong>xml:base</strong> sets the global base URL from which all
-      relative subsidiary URLs will be located.</li>
-    <li><strong>embed</strong> sets the global default value for the embed
-      attribute used by the font element.</li>
-  </ul>
-
-<h3><a name="server">&lt;server&gt; element</a></h3>
-<p><strong>Important:</strong> Most users do not need to configure server
-  elements and can safely skip this section.</p>
-
-<pre>&lt;server
-    setup-free-standing-fonts="true"
-    setup-system-fonts="false"/&gt;</pre>
-
-<ul>
-  <li><strong>setup-free-standing-fonts</strong> should be set to either
-    "true" or "false" depending on whether free-standing fonts should be
-    configured.</li>
-  <li><strong>setup-system-fonts</strong> should be set to either "true" or
-    "false" depending on whether system fonts should be configured.</li>
-</ul>
-
-<h3><a name="parameter">&lt;parameter&gt; element</a></h3>
-<pre>&lt;parameter
-    key="font-root"
-    value="file://C:/some/path"/&gt;</pre>
-<p>A parameter contains two attributes, "key" and either "value" or
-"from-environment".
-These are used within the configuration file as a simple substitution.
-Wherever the text of "key", enclosed in curly braces, occurs in attributes,
-it will be substituted with the text of "value" or with the value of the
-environment variable named in "from-environment".
-This is useful especially for making the paths to files more flexible.</p>
-
-<p>Note that support for environment variables may vary from one programming
-language to another, from one environment to another, and from one
-implementation to another.
-For example, some java platforms only support environment variables set using
-the java "-D" switch.
-Others can get environment variables from the operating system.
-Consult the documentation for your implementation to determine the exact level
-of support for this feature.</p>
-
-<h3><a name="glyph-list">&lt;glyph-list&gt; element</a></h3>
-<p><strong>Important: </strong> Most users do not need to configure custom
-glyph-list elements and can safely skip this section.
-If you do need to specify or create a glyph-list see the
-<a href="encoding.html">Encoding</a> documentation.</p>
-
-<h3><a name="encoding">&lt;encoding&gt; element</a></h3>
-<p><strong>Important: </strong> Most users do not need to configure custom
-encoding elements and can safely skip this section.
-If you do need to specify or create an encoding see the
-<a href="encoding.html">Encoding</a> documentation.</p>
-
-<h3><a name="font-group">&lt;font-group&gt; element</a></h3>
-<p>The only purpose of the font-group element is as a wrapper for font
-elements that have similar attributes, or that should be grouped together
-for some other reason.
-An attribute set on font-group will be inherited by contained font elements,
-unless those elements override the attibute.</p>
-  <ul>
-    <li><strong>label</strong> is for identification purposes only, and is
-    not used by the system.</li>
-    <li><strong>xml:base</strong> sets the base URL from which all
-      relative subsidiary URLs will be located.</li>
-    <li><strong>embed</strong> sets the default value for the embed
-      attribute used by the font element.</li>
-  </ul>
-  
-  
-<h3><a name="font">&lt;font&gt; element</a></h3>
-<p>Here is a sample &lt;font&gt; element in the font configuration file:</p>
-
-<pre>&lt;font
-    id="DomCasual-Adobe"
-    embed="subset"
-    metrics-file="type1/adobe/091/dc______.afm"
-    font-file="type1/adobe/091/dc______.pfb"&gt;
-&lt;/font&gt;</pre>
-
-<ul>
-  <li><strong>id</strong> is an XML ID type attribute, and must be unique within
-the font-configuration file.
-It is used to identify the font, specifically as the target of "font"
-attributes in
-<a href="#font-desc">&lt;font-description&gt;</a> elements.</li>
-  <li><strong>embed</strong> may be set to <code>all</code>, <code>subset</code>,
-or <code>none</code>, and defaults to <code>none</code>. If the font is not embedded
-in the output, the document will be created correctly, but the user may not be able
-to view it correctly, depending on their local viewer environment.</li>
-  <li><strong>metrics-file</strong> provides a URL that contains
-font metric information for this font.
-TrueType and OpenType fonts do not need to specifiy a metrics file, because the
-font-file contains all metric information.
-However, Type 1 fonts and device-embedded fonts must provide a metrics file.
-
-    <p>Both PFM and AFM font metrics files are supported. However,
-it is highly recommended that AFM files be used where possible for the
-following reasons:</p>
-    <ul>
-      <li>As far as we can tell, PFM files are only usable for fonts that
-        are encoded using WinAnsiEncoding. We do not know how to map Unicode
-        characters to symbolic fonts or other non-ANSI character sets.</li>
-      <li>Since only WinAnsiEncoding is supported, only characters available
-        in that encoding can be used. Many fonts have additional characters
-        that can be accessed using other encodings, but that encoding data is
-        not stored in a PFM file.</li>
-      <li>PFM files are limited to 512 kerning pairs. Many fonts have more
-        than 512 pairs, so some pairs that would be kerned using an AFM file
-        will not be kerned using a PFM file.</li>
-      <li>The PFM format is a Microsoft format that appears to be no longer
-        supported by them.</li>
-      <li>PFM files are binary files, not readily edited. AFM files on the
-        other hand are text files, which can be edited. This of course is both
-        useful and dangerous.</li>
-    </ul>
-  </li>
-  <li><strong>font-file</strong> provides a file path or URL to the font file
-itself.
-Required for fonts that will be embedded and for fonts that do not have a
-separate metrics file.</li>
-</ul>
-
-<p>For both metrics-file and font-file, relative paths and URLs are resolved
-relative to any parent xml:base attribute.
-Relative xml:base attributes are themselves resolved relative to any parent
-xml:base attribute.
-If no xml:base attribute is set on the root element, applications my set the
-base either to some configured value known to them, or to the current working
-directory.</p>
-
-<p>The description above is for the typical configuration of a free-standing
-  font.
-  Some applications need to be able to concurrently support and configure
-  system fonts along with free-standing fonts.
-  These can be obtained in one of two ways:</p>
-<ul>
-  <li>If the applications supports it, SFs can be obtained by simply asking
-    for them by name.
-    To specify this, exclude the "embed", "metrics-file", and "font-file"
-    attributes.</li>
-  <li>If the application supports it, SFs can be manufactured from a font file
-    in much the same manner as a free-standing font.
-    The advantage to this method is that the font can be embedded in an output
-    document.
-    To use this approach, you must include the "embed" and "font-file"
-    attributes in the same way that you would for a free-standing font.</li>
-</ul>
-<p>In either of these cases, the following attribute must be included for the
-  &lt;font&gt; element.</p>
-<ul>
-  <li><strong>system-name</strong> (optional) is the name which should be
-  supplied to the external registry when requesting the System Font.
-  Note that this is the name of the <em>font</em>, not the
-  <em>font-family</em>.</li>
-</ul>
-
-<p>The &lt;font&gt; is intended to represent exactly one logical font.
-This font can be a simple SF, a simple FSF, or a font that can manifest itself
-as both an SF and an FSF.
-In some cases it is possible to abuse the &lt;font&gt; element to represent
-one SF and a different FSF.
-This practice is discouraged.
-A better solution is to use the &lt;font-family-alias&gt; and related
-&lt;alias-configuration&gt; elements to alias different fonts in different
-circumstances.</p>
-
-<h3><a name="font-family">&lt;font-family&gt; element</a></h3>
-<p>The font-family element contains one or more font-description elements.
-When the font-family is selected in a document, the font-description elements
-are searched for a match on the remaining descriptive items (weight, style,
-etc.)</p>
-
-<ul>
-  <li><strong>name</strong> (required) is the value that should be matched
-    against the font-family provided in the document.</li>
-  <li><strong>embed</strong> (optional) is the default embed value for all
-    contained font-description elements.</li>
-  <li><strong>simulate-small-caps</strong> (optional) is the default
-    simulate-small-caps value for all contained font-description elements.</li>
-</ul>
-
-<h3><a name="font-desc">&lt;font-description&gt; element</a></h3>
-<pre>&lt;font-description
-    font="NewBaskervilleItalic-Adobe"
-    style="italic"
-    weight="normal"
-    simulate-small-caps="80%"
-    encoding="WinAnsiEncoding"/&gt;</pre>
-
-<ul>
-  <li><strong>font</strong> (required) is an XML IDREF type attribute, and
-    must match the "id" attribute of some &lt;font&gt; element.</li>
-  <li><strong>style</strong> (optional, default "normal") = normal | italic
-    | oblique | backslant.
-    Corresponds to the XSL-FO font-style property.</li>
-  <li><strong>weight</strong> (optional, default "normal") = 100 | 200 | 300
-    | (normal | 400) | 500 | 600 | (bold | 700) | 800 | 900.
-    Corresponds to the XSL-FO font-weight property. Following is an
-    unofficial guide to the weight values:
-    <table>
-      <thead>
-        <tr>
-          <td>Description</td>
-          <td>Weight</td>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td>Ultralight</td>
-          <td>100</td>
-        </tr>
-        <tr>
-          <td>Light</td>
-          <td>200</td>
-        </tr>
-        <tr>
-          <td>SemiLight</td>
-          <td>300</td>
-        </tr>
-        <tr>
-          <td>Normal, Regular, Roman, Book</td>
-          <td>400</td>
-        </tr>
-        <tr>
-          <td>Medium</td>
-          <td>500</td>
-        </tr>
-        <tr>
-          <td>SemiBold</td>
-          <td>600</td>
-        </tr>
-        <tr>
-          <td>Bold</td>
-          <td>700</td>
-        </tr>
-        <tr>
-          <td>Black</td>
-          <td>800</td>
-        </tr>
-        <tr>
-          <td>UltraBlack</td>
-          <td>900</td>
-        </tr>
-      </tbody>
-      
-    </table>
-  </li>
-  <li><strong>simulate-small-caps</strong> takes a percentage, and the "%"
-    character should be included.
-    It performs two functions for applications that can simulate small-caps.
-    First, in the font-selection process, the existence of this attribute
-    indicates that this font-description can be selected when small-caps are
-    needed (it can also be selected when small-caps are not needed).
-    Second, if selected, it tells the application what percentage of the
-    font-size that is used for regular caps should be used for the simulated
-    small-cap glyphs.
-    For example, a value of "80%", when applied to a font-size of 12 points,
-    will result in small-caps at 9.6 points.
-  </li>
-  <li><strong>encoding</strong> (optional, default "InternalEncoding")
-    corresponds to a defined encoding scheme.
-    This attribute is generally useful only for Type 1 fonts.
-    It should typically be set to "WinAnsiEncoding" for fonts using a standard
-    Roman character set, and to "InternalEncoding" (the default) for most other
-    fonts.
-    However, other standard encodings are available, and custom encodings can
-    be created if needed.
-    See <a href="encoding.html">Encoding</a> for details.</li>
-</ul>
-
-<p>Note that the purpose of separating a font-description from its underlying
-font is to allow the same font to be used multiple ways.
-The same font can be used within different font-family entries, and can be
-defined with different characteristics.</p>
-
-<p>The result of defining two font-description elements with identical
-characteristics in the same font family is undefined.
-With 9 font-stretch possibilities, 4 for font-style, 2 for font-variant, and 9
-for font-weight, there are 648 possible fonts in a font-family.</p>
-
-<h3><a name="font-family-alias">&lt;font-family-alias&gt; element</a></h3>
-  <pre>&lt;font-family-alias alias="sans-serif"     
-    default-family="Base14-Helvetica"&gt;
-  &lt;alias-configuration name="pdf"          font-family="Base14-Helvetica"/&gt;
-  &lt;alias-configuration name="awt"          font-family="AWT-sans-serif"/&gt;
-&lt;/font-family-alias&gt;</pre>
-<p>The &lt;font-family-alias&gt; and child &lt;alias-configuration&gt;
-elements are designed to allow a font-configuration to be used for different
-purposes.
-The combination of the two allows a font-family to be accessed using more than
-one name, and allows more than one font-family to be accessed using the same
-name.
-In the example above, the font-family "Base14-Helvetica" can be accessed using
-either the font-family name "Base14-Helvetica" or its alias "sans-serif".
-On the other hand, the alias "sans-serif" can point to either "Base14-Helvetica"
-or "AWT-sans-serif", depending on the context or active configuration.</p>
-
-<ul>
-  <li><strong>alias</strong> (required) defines the alias name that should be
-    matched to the font-family requested.</li>
-  <li>default-family (required) indicates the name of the font-family that
-    should be substituted for the alias if no matching child
-    &lt;alias-configuration&gt; element is found.</li>
-</ul>
-
-<h3><a name="alias-configuration">&lt;alias-configuration&gt; element</a></h3>
-<p>The &lt;alias-configuration&gt; element is an optional child to the
-&lt;font-family-alias&gt; element, and allows an alias name to point to
-different font-family elements depending upon some configuration name.
-The configuration name is application-dependent.
-Some applications may choose not to use them at all, and others may have
-a complex scheme for determining which configuration to use in a given
-circumstance.
-A typical use is to distinguish between fonts available for print applications,
-like PDF and PostScript, from those available for viewing documents on the
-screen, such as AWT applications.</p>
-  
-<!--#include virtual="/00-rsrc/include/leftmenu-end.html" -->
-</body>
-</html>

Copied: trunk/axsl/doc/web/font-r/configure.html (from rev 510, trunk/axsl/doc/web/font/configure.html)
===================================================================
--- trunk/axsl/doc/web/font-r/configure.html	                        (rev 0)
+++ trunk/axsl/doc/web/font-r/configure.html	2006-05-05 17:48:06 UTC (rev 511)
@@ -0,0 +1,403 @@
+<?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>axslFont: Font Configuration</title>
+  <meta name="content-revised"
+    content="$Date$"/>
+  <!--#include virtual="/00-rsrc/include/standard-head.html" -->
+</head>
+
+<body>
+
+<!--#include virtual="/00-rsrc/include/leftmenu.html" -->
+
+<h1>axslFont: Font Configuration</h1>
+<h2>Contents</h2>
+<ul>
+  <li><a href="#intro">Introduction</a></li>
+  <li><a href="#root">&lt;axsl-font-config&gt; element</a></li>
+  <li><a href="#server">&lt;server&gt; element</a></li>
+  <li><a href="#parameter">&lt;parameter&gt; element</a></li>
+  <li><a href="#glyph-list">&lt;glyph-list&gt; element</a></li>
+  <li><a href="#encoding">&lt;encoding&gt; element</a></li>
+  <li><a href="#font-group">&lt;font-group&gt; element</a></li>
+  <li><a href="#font">&lt;font&gt; element</a></li>
+  <li><a href="#font-family">&lt;font-family&gt; element</a></li>
+  <li><a href="#font-desc">&lt;font-description&gt; element</a></li>
+  <li><a href="#font-family-alias">&lt;font-family-alias&gt;
+    element</a></li>
+  <li><a href="#alias-configuration">&lt;font-family-alias&gt;
+    element</a></li>
+</ul>
+
+<p class="Warning">Future changes to the font configuration are expected, so
+that more features can be added.</p>
+
+<h3><a name="intro">Introduction</a></h3>
+<p>Some applications are able to obtain all of the information that they need
+  about available fonts from some universal system registry, usually
+  maintained by the operating system.
+  In such cases, a font-configuration is not needed.
+  However, in any case where such information is not available, may not be
+  available, or not adequate for the application, some standard method of
+  communicating information about available fonts is needed.
+  The <a rel="external" href="/dtds/0.1/en/axsl-font-config.dtd">aXSL
+  font-configuration DTD</a> is an attempt to standardize the format of
+  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
+  configuration file</a> is also provided, which may be useful either for
+  cut-and-paste or consultation as font-configuration files are created.</p>
+
+<p>The configuration contemplates two general types of fonts. First are those
+for which at least some information is available from some other registry.
+In this document, these are referred to as System Fonts (SF). Second are those
+for which no external information is available at all. These are referred to
+as Free-standing Fonts (FSF).</p>
+
+<p>The aXSL font-configuration is optimized for flexibility, which makes it
+somewhat more verbose and complex than it could be.
+It draws a sharp distinction between configuration of the font itself, which
+is generally done in the &lt;font&gt; element, and configuration of the way it
+is used and selected by an application, which is generally done in the
+&lt;font-description&gt; element.
+This distincion allows a font to be used in more than one way.
+Here are some examples where this may possibly be useful:</p>
+<ul>
+  <li>The same font to be used with more than one encoding.</li>
+  <li>The same font can be used in the same or different ways in more than
+  one font family.</li>
+</ul>
+
+<h3><a name="root">&lt;axsl-font-config&gt; element</a></h3>
+  <p>All attributes of axsl-font-config set global defaults that can be
+  overridden by subsidiary elements.</p>
+  <ul>
+    <li><strong>xml:base</strong> sets the global base URL from which all
+      relative subsidiary URLs will be located.</li>
+    <li><strong>embed</strong> sets the global default value for the embed
+      attribute used by the font element.</li>
+  </ul>
+
+<h3><a name="server">&lt;server&gt; element</a></h3>
+<p><strong>Important:</strong> Most users do not need to configure server
+  elements and can safely skip this section.</p>
+
+<pre>&lt;server
+    setup-free-standing-fonts="true"
+    setup-system-fonts="false"/&gt;</pre>
+
+<ul>
+  <li><strong>setup-free-standing-fonts</strong> should be set to either
+    "true" or "false" depending on whether free-standing fonts should be
+    configured.</li>
+  <li><strong>setup-system-fonts</strong> should be set to either "true" or
+    "false" depending on whether system fonts should be configured.</li>
+</ul>
+
+<h3><a name="parameter">&lt;parameter&gt; element</a></h3>
+<pre>&lt;parameter
+    key="font-root"
+    value="file://C:/some/path"/&gt;</pre>
+<p>A parameter contains two attributes, "key" and either "value" or
+"from-environment".
+These are used within the configuration file as a simple substitution.
+Wherever the text of "key", enclosed in curly braces, occurs in attributes,
+it will be substituted with the text of "value" or with the value of the
+environment variable named in "from-environment".
+This is useful especially for making the paths to files more flexible.</p>
+
+<p>Note that support for environment variables may vary from one programming
+language to another, from one environment to another, and from one
+implementation to another.
+For example, some java platforms only support environment variables set using
+the java "-D" switch.
+Others can get environment variables from the operating system.
+Consult the documentation for your implementation to determine the exact level
+of support for this feature.</p>
+
+<h3><a name="glyph-list">&lt;glyph-list&gt; element</a></h3>
+<p><strong>Important: </strong> Most users do not need to configure custom
+glyph-list elements and can safely skip this section.
+If you do need to specify or create a glyph-list see the
+<a href="encoding.html">Encoding</a> documentation.</p>
+
+<h3><a name="encoding">&lt;encoding&gt; element</a></h3>
+<p><strong>Important: </strong> Most users do not need to configure custom
+encoding elements and can safely skip this section.
+If you do need to specify or create an encoding see the
+<a href="encoding.html">Encoding</a> documentation.</p>
+
+<h3><a name="font-group">&lt;font-group&gt; element</a></h3>
+<p>The only purpose of the font-group element is as a wrapper for font
+elements that have similar attributes, or that should be grouped together
+for some other reason.
+An attribute set on font-group will be inherited by contained font elements,
+unless those elements override the attibute.</p>
+  <ul>
+    <li><strong>label</strong> is for identification purposes only, and is
+    not used by the system.</li>
+    <li><strong>xml:base</strong> sets the base URL from which all
+      relative subsidiary URLs will be located.</li>
+    <li><strong>embed</strong> sets the default value for the embed
+      attribute used by the font element.</li>
+  </ul>
+  
+  
+<h3><a name="font">&lt;font&gt; element</a></h3>
+<p>Here is a sample &lt;font&gt; element in the font configuration file:</p>
+
+<pre>&lt;font
+    id="DomCasual-Adobe"
+    embed="subset"
+    metrics-file="type1/adobe/091/dc______.afm"
+    font-file="type1/adobe/091/dc______.pfb"&gt;
+&lt;/font&gt;</pre>
+
+<ul>
+  <li><strong>id</strong> is an XML ID type attribute, and must be unique within
+the font-configuration file.
+It is used to identify the font, specifically as the target of "font"
+attributes in
+<a href="#font-desc">&lt;font-description&gt;</a> elements.</li>
+  <li><strong>embed</strong> may be set to <code>all</code>, <code>subset</code>,
+or <code>none</code>, and defaults to <code>none</code>. If the font is not embedded
+in the output, the document will be created correctly, but the user may not be able
+to view it correctly, depending on their local viewer environment.</li>
+  <li><strong>metrics-file</strong> provides a URL that contains
+font metric information for this font.
+TrueType and OpenType fonts do not need to specifiy a metrics file, because the
+font-file contains all metric information.
+However, Type 1 fonts and device-embedded fonts must provide a metrics file.
+
+    <p>Both PFM and AFM font metrics files are supported. However,
+it is highly recommended that AFM files be used where possible for the
+following reasons:</p>
+    <ul>
+      <li>As far as we can tell, PFM files are only usable for fonts that
+        are encoded using WinAnsiEncoding. We do not know how to map Unicode
+        characters to symbolic fonts or other non-ANSI character sets.</li>
+      <li>Since only WinAnsiEncoding is supported, only characters available
+        in that encoding can be used. Many fonts have additional characters
+        that can be accessed using other encodings, but that encoding data is
+        not stored in a PFM file.</li>
+      <li>PFM files are limited to 512 kerning pairs. Many fonts have more
+        than 512 pairs, so some pairs that would be kerned using an AFM file
+        will not be kerned using a PFM file.</li>
+      <li>The PFM format is a Microsoft format that appears to be no longer
+        supported by them.</li>
+      <li>PFM files are binary files, not readily edited. AFM files on the
+        other hand are text files, which can be edited. This of course is both
+        useful and dangerous.</li>
+    </ul>
+  </li>
+  <li><strong>font-file</strong> provides a file path or URL to the font file
+itself.
+Required for fonts that will be embedded and for fonts that do not have a
+separate metrics file.</li>
+</ul>
+
+<p>For both metrics-file and font-file, relative paths and URLs are resolved
+relative to any parent xml:base attribute.
+Relative xml:base attributes are themselves resolved relative to any parent
+xml:base attribute.
+If no xml:base attribute is set on the root element, applications my set the
+base either to some configured value known to them, or to the current working
+directory.</p>
+
+<p>The description above is for the typical configuration of a free-standing
+  font.
+  Some applications need to be able to concurrently support and configure
+  system fonts along with free-standing fonts.
+  These can be obtained in one of two ways:</p>
+<ul>
+  <li>If the applications supports it, SFs can be obtained by simply asking
+    for them by name.
+    To specify this, exclude the "embed", "metrics-file", and "font-file"
+    attributes.</li>
+  <li>If the application supports it, SFs can be manufactured from a font file
+    in much the same manner as a free-standing font.
+    The advantage to this method is that the font can be embedded in an output
+    document.
+    To use this approach, you must include the "embed" and "font-file"
+    attributes in the same way that you would for a free-standing font.</li>
+</ul>
+<p>In either of these cases, the following attribute must be included for the
+  &lt;font&gt; element.</p>
+<ul>
+  <li><strong>system-name</strong> (optional) is the name which should be
+  supplied to the external registry when requesting the System Font.
+  Note that this is the name of the <em>font</em>, not the
+  <em>font-family</em>.</li>
+</ul>
+
+<p>The &lt;font&gt; is intended to represent exactly one logical font.
+This font can be a simple SF, a simple FSF, or a font that can manifest itself
+as both an SF and an FSF.
+In some cases it is possible to abuse the &lt;font&gt; element to represent
+one SF and a different FSF.
+This practice is discouraged.
+A better solution is to use the &lt;font-family-alias&gt; and related
+&lt;alias-configuration&gt; elements to alias different fonts in different
+circumstances.</p>
+
+<h3><a name="font-family">&lt;font-family&gt; element</a></h3>
+<p>The font-family element contains one or more font-description elements.
+When the font-family is selected in a document, the font-description elements
+are searched for a match on the remaining descriptive items (weight, style,
+etc.)</p>
+
+<ul>
+  <li><strong>name</strong> (required) is the value that should be matched
+    against the font-family provided in the document.</li>
+  <li><strong>embed</strong> (optional) is the default embed value for all
+    contained font-description elements.</li>
+  <li><strong>simulate-small-caps</strong> (optional) is the default
+    simulate-small-caps value for all contained font-description elements.</li>
+</ul>
+
+<h3><a name="font-desc">&lt;font-description&gt; element</a></h3>
+<pre>&lt;font-description
+    font="NewBaskervilleItalic-Adobe"
+    style="italic"
+    weight="normal"
+    simulate-small-caps="80%"
+    encoding="WinAnsiEncoding"/&gt;</pre>
+
+<ul>
+  <li><strong>font</strong> (required) is an XML IDREF type attribute, and
+    must match the "id" attribute of some &lt;font&gt; element.</li>
+  <li><strong>style</strong> (optional, default "normal") = normal | italic
+    | oblique | backslant.
+    Corresponds to the XSL-FO font-style property.</li>
+  <li><strong>weight</strong> (optional, default "normal") = 100 | 200 | 300
+    | (normal | 400) | 500 | 600 | (bold | 700) | 800 | 900.
+    Corresponds to the XSL-FO font-weight property. Following is an
+    unofficial guide to the weight values:
+    <table>
+      <thead>
+        <tr>
+          <td>Description</td>
+          <td>Weight</td>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>Ultralight</td>
+          <td>100</td>
+        </tr>
+        <tr>
+          <td>Light</td>
+          <td>200</td>
+        </tr>
+        <tr>
+          <td>SemiLight</td>
+          <td>300</td>
+        </tr>
+        <tr>
+          <td>Normal, Regular, Roman, Book</td>
+          <td>400</td>
+        </tr>
+        <tr>
+          <td>Medium</td>
+          <td>500</td>
+        </tr>
+        <tr>
+          <td>SemiBold</td>
+          <td>600</td>
+        </tr>
+        <tr>
+          <td>Bold</td>
+          <td>700</td>
+        </tr>
+        <tr>
+          <td>Black</td>
+          <td>800</td>
+        </tr>
+        <tr>
+          <td>UltraBlack</td>
+          <td>900</td>
+        </tr>
+      </tbody>
+      
+    </table>
+  </li>
+  <li><strong>simulate-small-caps</strong> takes a percentage, and the "%"
+    character should be included.
+    It performs two functions for applications that can simulate small-caps.
+    First, in the font-selection process, the existence of this attribute
+    indicates that this font-description can be selected when small-caps are
+    needed (it can also be selected when small-caps are not needed).
+    Second, if selected, it tells the application what percentage of the
+    font-size that is used for regular caps should be used for the simulated
+    small-cap glyphs.
+    For example, a value of "80%", when applied to a font-size of 12 points,
+    will result in small-caps at 9.6 points.
+  </li>
+  <li><strong>encoding</strong> (optional, default "InternalEncoding")
+    corresponds to a defined encoding scheme.
+    This attribute is generally useful only for Type 1 fonts.
+    It should typically be set to "WinAnsiEncoding" for fonts using a standard
+    Roman character set, and to "InternalEncoding" (the default) for most other
+    fonts.
+    However, other standard encodings are available, and custom encodings can
+    be created if needed.
+    See <a href="encoding.html">Encoding</a> for details.</li>
+</ul>
+
+<p>Note that the purpose of separating a font-description from its underlying
+font is to allow the same font to be used multiple ways.
+The same font can be used within different font-family entries, and can be
+defined with different characteristics.</p>
+
+<p>The result of defining two font-description elements with identical
+characteristics in the same font family is undefined.
+With 9 font-stretch possibilities, 4 for font-style, 2 for font-variant, and 9
+for font-weight, there are 648 possible fonts in a font-family.</p>
+
+<h3><a name="font-family-alias">&lt;font-family-alias&gt; element</a></h3>
+  <pre>&lt;font-family-alias alias="sans-serif"     
+    default-family="Base14-Helvetica"&gt;
+  &lt;alias-configuration name="pdf"          font-family="Base14-Helvetica"/&gt;
+  &lt;alias-configuration name="awt"          font-family="AWT-sans-serif"/&gt;
+&lt;/font-family-alias&gt;</pre>
+<p>The &lt;font-family-alias&gt; and child &lt;alias-configuration&gt;
+elements are designed to allow a font-configuration to be used for different
+purposes.
+The combination of the two allows a font-family to be accessed using more than
+one name, and allows more than one font-family to be accessed using the same
+name.
+In the example above, the font-family "Base14-Helvetica" can be accessed using
+either the font-family name "Base14-Helvetica" or its alias "sans-serif".
+On the other hand, the alias "sans-serif" can point to either "Base14-Helvetica"
+or "AWT-sans-serif", depending on the context or active configuration.</p>
+
+<ul>
+  <li><strong>alias</strong> (required) defines the alias name that should be
+    matched to the font-family requested.</li>
+  <li>default-family (required) indicates the name of the font-family that
+    should be substituted for the alias if no matching child
+    &lt;alias-configuration&gt; element is found.</li>
+</ul>
+
+<h3><a name="alias-configuration">&lt;alias-configuration&gt; element</a></h3>
+<p>The &lt;alias-configuration&gt; element is an optional child to the
+&lt;font-family-alias&gt; element, and allows an alias name to point to
+different font-family elements depending upon some configuration name.
+The configuration name is application-dependent.
+Some applications may choose not to use them at all, and others may have
+a complex scheme for determining which configuration to use in a given
+circumstance.
+A typical use is to distinguish between fonts available for print applications,
+like PDF and PostScript, from those available for viewing documents on the
+screen, such as AWT applications.</p>
+  
+<!--#include virtual="/00-rsrc/include/leftmenu-end.html" -->
+</body>
+</html>

Deleted: trunk/axsl/doc/web/font-r/encoding.html
===================================================================
--- trunk/axsl/doc/web/font/encoding.html	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/doc/web/font-r/encoding.html	2006-05-05 17:48:06 UTC (rev 511)
@@ -1,229 +0,0 @@
-<?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>axslFont: Font Encoding</title>
-  <meta name="content-revised"
-    content="$Date$"/>
-  <!--#include virtual="/00-rsrc/include/standard-head.html" -->
-</head>
-
-<body>
-
-<!--#include virtual="/00-rsrc/include/leftmenu.html" -->
-
-<h1>axslFont: Font Encoding</h1>
-<h2>Contents</h2>
-<ul>
-  <li><a href="#encoding-select">Encoding Selection</a></li>
-  <li><a href="#encoding-custom">Custom Encodings</a></li>
-  <li><a href="#gl-select">Glyph Lists Selection</a></li>
-  <li><a href="#gl-custom">Custom Glyph Lists</a></li>
-</ul>
-
-<h2><a name="encoding-select">Encoding Selection</a></h2>
-<p>Type 1 fonts can address a maximum of about 224 glyphs at one time (256 is
-the maximum that can be addressed with 1 byte, and the first 32 are considered
-control codes).
-However, a Type 1 font can contain many more glyphs than that.
-This is possible because a different set of glyphs can be addressed by
-selecting different <em>encoding vectors</em>.
-When using a Type 1 font, you may select which encoding vector should
-be used by specifying the "encoding" attribute on a font-description element
-in the font-configuration.</p>
-
-<p>Support of various encoding schemes is application dependent. However, the
-following named encoding vectors are hard-coded, well-documented encoding
-schemes that many applications will make available:</p>
-
-  <table>
-    <thead>
-      <tr>
-        <th>Encoding Vector Name</th>
-        <th>Predefined Encoding For</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td>AdobeStandardEncoding (can also be referenced as
-          "StandardEncoding"). Closely matches ISO 8859-1.</td>
-        <td>PostScript</td>
-      </tr>
-      <tr>
-        <td>ISOLatin1Encoding</td>
-        <td>PostScript</td>
-      </tr>
-      <tr>
-        <td>WinAnsiEncoding (matches Microsoft Windows code page 1252).</td>
-        <td>PDF</td>
-      </tr>
-      <tr>
-        <td>SymbolEncoding</td>
-        <td>n/a</td>
-      </tr>
-      <tr>
-        <td>ZapfDingbatsEncoding</td>
-        <td>n/a</td>
-      </tr>
-      <tr>
-        <td>CEEncoding (matches Microsoft Windows code page 1250).</td>
-        <td>n/a</td>
-      </tr>
-      <tr>
-        <td>MacRomanEncoding</td>
-        <td>PDF</td>
-      </tr>
-      <tr>
-        <td>PDFDocEncoding</td>
-        <td>n/a</td>
-      </tr>
-      <tr>
-        <td>MacExpertEncoding</td>
-        <td>PDF</td>
-      </tr>
-      <tr>
-        <td>ExpertEncoding</td>
-        <td>n/a</td>
-      </tr>
-      <tr>
-        <td>ExpertSubsetEncoding</td>
-        <td>n/a</td>
-      </tr>
-      <tr>
-        <td>MacStandardEncoding (this is the "Standard Macintosh Ordering" that
-          is used within some TrueType fonts).</td>
-      </tr>
-    </tbody>
-  </table>
-
-<p>Note that selection of an encoding that is not predefined for the output
-medium will result in the need to write that encoding into the output
-document.
-The only drawbacks to this are the (probably unnoticable) performance penalty
-for writing the encoding into the output, and the somewhat larger output
-itself.</p>
-
-<h2><a name="encoding-custom">Custom Encodings</a></h2>
-<p>Custom encodings can also be defined in the font-configuration file.
-Once that is done, they are available to be used in font-description entries
-just like the predefined encodings.</p>
-
-<p>To create a custom encoding, first place the data defining the encoding
-into a text file.
-(The files to create the predefined encodings can be cut-and-pasted
-from PostScript and PDF documentation).
-The format of the file containing a custom encoding is best documented by
-providing an example.
-Here is an example from the Latin encodings for PostScript:</p>
-
-<pre>#                         -- Encoding  --
-# Character Name          STD   ISO   CE
-# --------------          ---   ---   ---
-
-A                         101   101   101
-AE                        341   306   -
-Aacute                    -     301   301</pre>
-
-<p>Each line of the file is a record.
-Each record consists of two or more fields delimited by whitespace.
-The first field is the glyph name.
-All additional fields are glyph indexes to which the glyph name points within
-specific encoding.
-Multiple encodings can be described within a single encoding file by adding
-more than two columns.
-The illustration above includes encoding information for "StandardEncoding",
-"ISOLatin1Encoding", and "CEEncoding", which share enough common characters
-to make it useful to place them in the same file.
-Blank lines and line starting with an octothorp (#) are ignored.
-When processing a specific column of the file, a hyphen in that column serves
-to indicate that the line should be ignored for that encoding.</p>
-
-<p>The glyph index value may be specified using any radix.
-The examples above are in octal (base- or radix-8).
-Encoding schemes are also sometimes expressed in hexadecimal (radix-16) or
-decimal (radix-10).
-When creating a custom encoding in the font-configuration, you must specify
-the radix that should be used for parsing.</p>
-
-<p>After creating the encoding file, make it available to your application
-by creating an encoding element in the font-configuration file:</p>
-
-<pre>&lt;encoding
-    name="my-encoding"
-    glyph-lists="my-glyph-list another-glyph-list"/
-    file="file://C:/some/path/encoding.txt"
-    column-to-parse="2"
-    radix="8"&gt;</pre>
-
-  <ul>
-    <li><strong>name</strong> indicates the name by which this encoding
-      should be referred.</li>
-    <li><strong>glyph-lists</strong> is an ordered, space-delimited list of
-      glyph lists which should be consulted at parse-time to convert glyph
-      names into Unicode code points. Glyph lists earlier in the list will be
-      checked before those listed later in the list.
-      See the <a href="#gl-select">Glyph List</a> documentation for more
-      details.
-    </li>
-    <li><strong>file</strong> indicates the URL of the file which should be
-      parsed to obtain the encoding.</li>
-    <li><strong>column-to-parse</strong> indicates which column of the file
-      should be used to obtain values for this encoding.
-      Columns are numbered from the first column with an encoding, which is
-      actually the second column in the file.
-      The first column of the file contains the glyph name.
-      The second column is numbered "1" for purposes of specifing a
-      column-to-parse.
-    </li>
-    <li><strong>radix</strong> indicates the numbering system used to specify
-      the glyph indexes for the encoding being parsed. If the indexes are
-      decimal, use radix 10; if octal, use radix 8. If hexadecimal, use radix
-      16.</li>
-  </ul>
-
-<h2><a name="gl-select">Glyph List Selection</a></h2>
-<p>In order to create an EncodingVector instance, an application needs to
-have some way of mapping a glyph name to a Unicode code point.
-A "glyph list" is used to define this mapping.
-Adobe provides two standard glyph lists, both of which are readily available,
-and possibly hard-coded into your application.
-If so, they are available by reference to their names: "AGL" (the Adobe Glyph
-List), and "ZapfDingbats".
-Unless the font you are using has a very unusual character set, these should be
-sufficient for creation of custom encodings.</p>
-
-<h2><a name="gl-custom">Custom Glyph Lists</a></h2>
-<p>If a custom glyph list is needed (to handle an unusual character set), first
-create the list defining the glyph list.
-The format of this file is best documented by providing an excerpt from the
-Adobe Glyph List:</p>
-<pre>B;0042
-Bcircle;24B7</pre>
-
-<p>Each line of the file is a record.
-Each record consists of two fields delimited by a semicolon.
-The first field is the glyph name.
-The second is the hexadecimal value of the Unicode code point to which that
-glyph name is pointed.
-Blank lines and line starting with an octothorp (#) are ignored.</p>
-
-<p>The custom glyph list is then made available to your application by creating
-a glyph-list element in the font-configuration file:</p>
-<pre>&lt;glyph-list
-    name="my-glyph-list"
-    file="file://C:/some/path/my-glyph-list.txt"/&gt;</pre>
-
-  <ul>
-    <li><strong>name</strong> indicates the name by which this glyph list
-      should be referred.</li>
-    <li><strong>file</strong> indicates the URL of the file which should be
-      parsed to obtain the custom glyph list.</li>
-  </ul>
-
-<!--#include virtual="/00-rsrc/include/leftmenu-end.html" -->
-</body>
-</html>

Copied: trunk/axsl/doc/web/font-r/encoding.html (from rev 510, trunk/axsl/doc/web/font/encoding.html)
===================================================================
--- trunk/axsl/doc/web/font-r/encoding.html	                        (rev 0)
+++ trunk/axsl/doc/web/font-r/encoding.html	2006-05-05 17:48:06 UTC (rev 511)
@@ -0,0 +1,229 @@
+<?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>axslFont: Font Encoding</title>
+  <meta name="content-revised"
+    content="$Date$"/>
+  <!--#include virtual="/00-rsrc/include/standard-head.html" -->
+</head>
+
+<body>
+
+<!--#include virtual="/00-rsrc/include/leftmenu.html" -->
+
+<h1>axslFont: Font Encoding</h1>
+<h2>Contents</h2>
+<ul>
+  <li><a href="#encoding-select">Encoding Selection</a></li>
+  <li><a href="#encoding-custom">Custom Encodings</a></li>
+  <li><a href="#gl-select">Glyph Lists Selection</a></li>
+  <li><a href="#gl-custom">Custom Glyph Lists</a></li>
+</ul>
+
+<h2><a name="encoding-select">Encoding Selection</a></h2>
+<p>Type 1 fonts can address a maximum of about 224 glyphs at one time (256 is
+the maximum that can be addressed with 1 byte, and the first 32 are considered
+control codes).
+However, a Type 1 font can contain many more glyphs than that.
+This is possible because a different set of glyphs can be addressed by
+selecting different <em>encoding vectors</em>.
+When using a Type 1 font, you may select which encoding vector should
+be used by specifying the "encoding" attribute on a font-description element
+in the font-configuration.</p>
+
+<p>Support of various encoding schemes is application dependent. However, the
+following named encoding vectors are hard-coded, well-documented encoding
+schemes that many applications will make available:</p>
+
+  <table>
+    <thead>
+      <tr>
+        <th>Encoding Vector Name</th>
+        <th>Predefined Encoding For</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>AdobeStandardEncoding (can also be referenced as
+          "StandardEncoding"). Closely matches ISO 8859-1.</td>
+        <td>PostScript</td>
+      </tr>
+      <tr>
+        <td>ISOLatin1Encoding</td>
+        <td>PostScript</td>
+      </tr>
+      <tr>
+        <td>WinAnsiEncoding (matches Microsoft Windows code page 1252).</td>
+        <td>PDF</td>
+      </tr>
+      <tr>
+        <td>SymbolEncoding</td>
+        <td>n/a</td>
+      </tr>
+      <tr>
+        <td>ZapfDingbatsEncoding</td>
+        <td>n/a</td>
+      </tr>
+      <tr>
+        <td>CEEncoding (matc...
 
[truncated message content]

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

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

Revision: 510
Author:   victormote
Date:     2006-05-05 10:39:01 -0700 (Fri, 05 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=510&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 17:12:10 UTC (rev 509)
+++ trunk/axsl/scripts/build.xml	2006-05-05 17:39:01 UTC (rev 510)
@@ -155,37 +155,37 @@
         <package name="org.axsl.common"/>
         <package name="org.axsl.common.*"/>
       </group>
-      <group title="The aXSL PostScript Module">
-        <package name="org.axsl.ps"/>
-        <package name="org.axsl.ps.*"/>
+      <group title="The aXSL PostScript Access Module">
+        <package name="org.axsl.psR"/>
+        <package name="org.axsl.psR.*"/>
       </group>
-      <group title="The aXSL Graphic Module">
-        <package name="org.axsl.graphic"/>
-        <package name="org.axsl.graphic.*"/>
+      <group title="The aXSL Graphic Access Module">
+        <package name="org.axsl.graphicR"/>
+        <package name="org.axsl.graphicR.*"/>
       </group>
-      <group title="The aXSL Font Module">
-        <package name="org.axsl.font"/>
-        <package name="org.axsl.font.*"/>
+      <group title="The aXSL Font Access Module">
+        <package name="org.axsl.fontR"/>
+        <package name="org.axsl.fontR.*"/>
       </group>
       <group title="The aXSL Text Module">
         <package name="org.axsl.text"/>
         <package name="org.axsl.text.*"/>
       </group>
-      <group title="The aXSL FOTree Module">
-        <package name="org.axsl.fotree"/>
-        <package name="org.axsl.fotree.*"/>
+      <group title="The aXSL FOTree Access Module">
+        <package name="org.axsl.foR"/>
+        <package name="org.axsl.foR.*"/>
       </group>
-      <group title="The aXSL AreaTree Input Module">
-        <package name="org.axsl.areaIn"/>
-        <package name="org.axsl.areaIn.*"/>
+      <group title="The aXSL AreaTree Creation Module">
+        <package name="org.axsl.areaW"/>
+        <package name="org.axsl.areaW.*"/>
       </group>
-      <group title="The aXSL AreaTree Output Module">
-        <package name="org.axsl.areaOut"/>
-        <package name="org.axsl.areaOut.*"/>
+      <group title="The aXSL AreaTree Access Module">
+        <package name="org.axsl.areaR"/>
+        <package name="org.axsl.areaR.*"/>
       </group>
-      <group title="The aXSL PDF Module">
-        <package name="org.axsl.pdf"/>
-        <package name="org.axsl.pdf.*"/>
+      <group title="The aXSL PDF Creation Module">
+        <package name="org.axsl.pdfW"/>
+        <package name="org.axsl.pdfW.*"/>
       </group>
     </javadoc>
   </target>


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

[aXSL-commit] SF.net SVN: axsl: [509] trunk/axsl/axsl-ps-r/src/java/org/axsl

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

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

Log Message:
-----------
Relocate java source paths to match new module descriptions

Modified Paths:
--------------
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/Area.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaFlexible.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaNode.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaOutException.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaTree.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/BasicLinkArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/BlockContainerArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/BookmarkArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/BookmarkTitleArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/BookmarkTreeArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/ExternalGraphicArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/ForeignObjectArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/GeneralInlineArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/InlineArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/LeaderArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/LineArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/MainReferenceArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/NormalBlockArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/NormalFlowArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/PageArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/PageCollection.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/PageNumberArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/PageNumberCitationArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/RegionArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/RegionBodyArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/SVGArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/SpanArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableBodyContainer.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableCellArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableColumnArea.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableFooterContainer.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableHeaderContainer.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableRowContainer.java
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TextArea.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaInException.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTree.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/extension/ContinuedLabel.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/AbstractFlow.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/AbstractTableBody.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/BasicLink.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/BidiOverride.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/Block.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/BlockContainer.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/Bookmark.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/BookmarkTitle.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/BookmarkTree.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/Character.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/ColorProfile.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/Declarations.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/ExternalGraphic.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/Float.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/Flow.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/Footnote.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/FootnoteBody.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/InitialPropertySet.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/Inline.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/InlineContainer.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/InstreamForeignObject.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/Leader.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/ListBlock.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/ListItem.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/ListItemBody.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/ListItemLabel.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/Marker.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/MultiCase.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/MultiProperties.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/MultiPropertySet.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/MultiSwitch.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/MultiToggle.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/PageNumber.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/PageNumberCitation.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/PageSequence.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/Region.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/RegionAfter.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/RegionBefore.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/RegionBody.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/RegionEnd.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/RegionStart.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/RetrieveMarker.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/Root.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/SimplePageMaster.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/StaticContent.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/Table.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/TableAndCaption.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/TableBody.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/TableCaption.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/TableCell.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/TableColumn.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/TableFooter.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/TableHeader.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/TableRow.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/Title.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/Wrapper.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/svg/SVGElement.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/output/FontOutput.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/output/FontOutputFactory.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/output/FontPDF.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/output/FontPS.java
    trunk/axsl/axsl-graphic-r/src/java/org/axsl/graphicR/EPSGraphic.java
    trunk/axsl/axsl-graphic-r/src/java/org/axsl/graphicR/Graphic.java
    trunk/axsl/axsl-graphic-r/src/java/org/axsl/graphicR/GraphicException.java
    trunk/axsl/axsl-graphic-r/src/java/org/axsl/graphicR/GraphicServer.java
    trunk/axsl/axsl-graphic-r/src/java/org/axsl/graphicR/SVGGraphic.java
    trunk/axsl/axsl-pdf-w/src/java/org/axsl/pdfW/PDFColor.java
    trunk/axsl/axsl-pdf-w/src/java/org/axsl/pdfW/PDFContentStream.java
    trunk/axsl/axsl-pdf-w/src/java/org/axsl/pdfW/PDFDocument.java
    trunk/axsl/axsl-pdf-w/src/java/org/axsl/pdfW/PDFEncryption.java
    trunk/axsl/axsl-pdf-w/src/java/org/axsl/pdfW/PDFException.java
    trunk/axsl/axsl-pdf-w/src/java/org/axsl/pdfW/PDFExplicitDestination.java
    trunk/axsl/axsl-pdf-w/src/java/org/axsl/pdfW/PDFFont.java
    trunk/axsl/axsl-pdf-w/src/java/org/axsl/pdfW/PDFLink.java
    trunk/axsl/axsl-pdf-w/src/java/org/axsl/pdfW/PDFNamedDestination.java
    trunk/axsl/axsl-pdf-w/src/java/org/axsl/pdfW/PDFOutlineItem.java
    trunk/axsl/axsl-pdf-w/src/java/org/axsl/pdfW/PDFOutlineParent.java
    trunk/axsl/axsl-pdf-w/src/java/org/axsl/pdfW/PDFPage.java
    trunk/axsl/axsl-pdf-w/src/java/org/axsl/pdfW/PDFPathPaint.java
    trunk/axsl/axsl-pdf-w/src/java/org/axsl/pdfW/PDFUtility.java
    trunk/axsl/axsl-ps-r/src/java/org/axsl/psR/Encoding.java
    trunk/axsl/axsl-ps-r/src/java/org/axsl/psR/EncodingVector.java
    trunk/axsl/axsl-text/src/java/org/axsl/text/TextServer.java
    trunk/axsl/axsl-text/src/java/org/axsl/text/line/LineBreakServer.java
    trunk/axsl/axsl-text/src/java/org/axsl/text/line/LineBreaker.java
    trunk/axsl/axsl-text/src/java/org/axsl/text/line/LineText.java

Added Paths:
-----------
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONode.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONodeProxy.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOText.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeBuilder.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeEvent.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeException.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeListener.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeServer.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FObj.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FObjMixed.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/ForeignXML.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/Keep.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/ShadowEffect.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/Shape.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/WritingMode.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/extension/
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/fo/
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/package.html
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/svg/
    trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/
    trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/Font.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/FontConsumer.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/FontException.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/FontServer.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/FontUse.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/FontUtility.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/ListJavaFonts.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/output/
    trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/package.html
    trunk/axsl/axsl-graphic-r/src/java/org/axsl/graphicR/
    trunk/axsl/axsl-pdf-w/src/java/org/axsl/pdfW/
    trunk/axsl/axsl-ps-r/src/java/org/axsl/psR/

Removed Paths:
-------------
    trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaIn/
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FONode.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FONodeProxy.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FOText.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FOTreeBuilder.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FOTreeEvent.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FOTreeException.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FOTreeListener.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FOTreeServer.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FObj.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FObjMixed.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/ForeignXML.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/Keep.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/ShadowEffect.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/Shape.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/WritingMode.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/extension/
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/fo/
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/package.html
    trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/svg/
    trunk/axsl/axsl-font-r/src/java/org/axsl/font/Font.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/font/FontConsumer.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/font/FontException.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/font/FontServer.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/font/FontUse.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/font/FontUtility.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/font/ListJavaFonts.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/font/output/
    trunk/axsl/axsl-font-r/src/java/org/axsl/font/package.html
    trunk/axsl/axsl-graphic-r/src/java/org/axsl/graphic/
    trunk/axsl/axsl-pdf-w/src/java/org/axsl/pdf/
    trunk/axsl/axsl-ps-r/src/java/org/axsl/ps/
Copied: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR (from rev 508, trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut)

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/Area.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/Area.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/Area.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,10 +18,10 @@
 
 /* $Id$ */
 
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
-import org.axsl.font.FontUse;
-import org.axsl.graphic.Graphic;
+import org.axsl.fontR.FontUse;
+import org.axsl.graphicR.Graphic;
 
 import java.awt.Color;
 import java.awt.geom.Rectangle2D;

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaFlexible.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/AreaFlexible.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaFlexible.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
 
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 /**
  * Subclasses are areas that need to store their own size and spacing

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaNode.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/AreaNode.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaNode.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,9 +18,9 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
-import org.axsl.font.FontConsumer;
+import org.axsl.fontR.FontConsumer;
 
 import java.awt.Color;
 import java.util.List;

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaOutException.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/AreaOutException.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaOutException.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 /**
  * Exception thrown when an axslAreaOut implementation has a problem.

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaTree.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/AreaTree.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/AreaTree.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -19,7 +19,7 @@
 /* $Id$ */
  
 
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 /**
  * An AreaTree is a document that has been laid out on pages.

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/BasicLinkArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/BasicLinkArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/BasicLinkArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface BasicLinkArea extends GeneralInlineArea {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/BlockContainerArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/BlockContainerArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/BlockContainerArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface BlockContainerArea extends AreaFlexible {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/BookmarkArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/BookmarkArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/BookmarkArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface BookmarkArea extends AreaNode {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/BookmarkTitleArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/BookmarkTitleArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/BookmarkTitleArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface BookmarkTitleArea extends AreaNode {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/BookmarkTreeArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/BookmarkTreeArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/BookmarkTreeArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface BookmarkTreeArea extends AreaNode {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/ExternalGraphicArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/ExternalGraphicArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/ExternalGraphicArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,9 +18,9 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
-import org.axsl.graphic.Graphic;
+import org.axsl.graphicR.Graphic;
 
 public interface ExternalGraphicArea extends GeneralInlineArea {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/ForeignObjectArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/ForeignObjectArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/ForeignObjectArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface ForeignObjectArea extends GeneralInlineArea {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/GeneralInlineArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/GeneralInlineArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/GeneralInlineArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface GeneralInlineArea extends AreaFlexible {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/InlineArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/InlineArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/InlineArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface InlineArea extends GeneralInlineArea {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/LeaderArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/LeaderArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/LeaderArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface LeaderArea extends GeneralInlineArea {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/LineArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/LineArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/LineArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface LineArea extends AreaFlexible {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/MainReferenceArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/MainReferenceArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/MainReferenceArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface MainReferenceArea extends Area {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/NormalBlockArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/NormalBlockArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/NormalBlockArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface NormalBlockArea extends AreaFlexible {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/NormalFlowArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/NormalFlowArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/NormalFlowArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface NormalFlowArea extends AreaFlexible {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/PageArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/PageArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/PageArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface PageArea extends Area {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/PageCollection.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/PageCollection.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/PageCollection.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 /**
  * A PageCollection is a collection of formatted pages.

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/PageNumberArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/PageNumberArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/PageNumberArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface PageNumberArea extends GeneralInlineArea {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/PageNumberCitationArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/PageNumberCitationArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/PageNumberCitationArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface PageNumberCitationArea extends GeneralInlineArea {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/RegionArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/RegionArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/RegionArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface RegionArea extends Area {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/RegionBodyArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/RegionBodyArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/RegionBodyArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface RegionBodyArea extends Area {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/SVGArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/SVGArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/SVGArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 import org.w3c.dom.svg.SVGDocument;
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/SpanArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/SpanArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/SpanArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface SpanArea extends AreaFlexible {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/TableArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface TableArea extends AreaFlexible {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableBodyContainer.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/TableBodyContainer.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableBodyContainer.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface TableBodyContainer extends AreaFlexible {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableCellArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/TableCellArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableCellArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface TableCellArea extends AreaFlexible {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableColumnArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/TableColumnArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableColumnArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface TableColumnArea extends AreaFlexible {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableFooterContainer.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/TableFooterContainer.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableFooterContainer.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface TableFooterContainer extends AreaFlexible {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableHeaderContainer.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/TableHeaderContainer.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableHeaderContainer.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface TableHeaderContainer extends AreaFlexible {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableRowContainer.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/TableRowContainer.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TableRowContainer.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface TableRowContainer extends AreaFlexible {
 

Modified: trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TextArea.java
===================================================================
--- trunk/axsl/axsl-area-r/src/java/org/axsl/areaOut/TextArea.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-r/src/java/org/axsl/areaR/TextArea.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaOut;
+package org.axsl.areaR;
 
 public interface TextArea extends GeneralInlineArea {
 

Copied: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW (from rev 508, trunk/axsl/axsl-area-w/src/java/org/axsl/areaIn)

Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaIn/Area.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -22,7 +22,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaIn;
+package org.axsl.areaW;
 
 public interface Area extends AreaNode {
 

Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaInException.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaIn/AreaInException.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaInException.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaIn;
+package org.axsl.areaW;
 
 /**
  * Exception thrown when an axslAreaIn implementation has a problem.

Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaIn/AreaNode.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -22,7 +22,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaIn;
+package org.axsl.areaW;
 
 public interface AreaNode {
 

Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTree.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaIn/AreaTree.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTree.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -19,10 +19,10 @@
 /* $Id$ */
  
 
-package org.axsl.areaIn;
+package org.axsl.areaW;
 
-import org.axsl.fotree.fo.PageSequence;
-import org.axsl.fotree.fo.Root;
+import org.axsl.foR.fo.PageSequence;
+import org.axsl.foR.fo.Root;
 
 
 /**

Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaIn/PageCollection.java	2006-05-05 16:51:49 UTC (rev 508)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -18,7 +18,7 @@
 
 /* $Id$ */
  
-package org.axsl.areaIn;
+package org.axsl.areaW;
 
 /**
  * A PageCollection is a collection of formatted pages.

Copied: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONode.java (from rev 508, trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FONode.java)
===================================================================
--- trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONode.java	                        (rev 0)
+++ trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONode.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2005 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.foR;
+
+import java.util.List;
+
+/**
+ * Interface for nodes in the formatting object tree.
+ */
+public interface FONode {
+
+    public static final byte NODE_ABSTRACT_FLOW             = 1;
+    public static final byte NODE_CONTINUED_LABEL           = 2;
+    public static final byte NODE_PAGE_SEQUENCE             = 3;
+    public static final byte NODE_DESTINATION               = 4;
+    public static final byte NODE_BOOKMARK_TITLE            = 5;
+    public static final byte NODE_BOOKMARK                  = 6;
+    public static final byte NODE_COLOR_PROFILE             = 7;
+    public static final byte NODE_DECLARATIONS              = 8;
+    public static final byte NODE_TEXT                      = 9;
+    public static final byte NODE_TITLE                     = 10;
+    public static final byte NODE_UNKNOWN                   = 11;
+    public static final byte NODE_UNKNOWN_XML               = 12;
+    public static final byte NODE_XML_ELEMENT               = 13;
+    public static final byte NODE_SVG                       = 14;
+    public static final byte NODE_BIDI_OVERRIDE             = 15;
+    public static final byte NODE_BLOCK                     = 16;
+    public static final byte NODE_BLOCK_CONTAINER           = 17;
+    public static final byte NODE_CHARACTER                 = 18;
+    public static final byte NODE_EXTERNAL_GRAPHIC          = 19;
+    public static final byte NODE_FLOW                      = 20;
+    public static final byte NODE_FOOTNOTE                  = 21;
+    public static final byte NODE_FLOAT                     = 22;
+    public static final byte NODE_FOOTNOTE_BODY             = 23;
+    public static final byte NODE_INITIAL_PROPERTY_SET      = 24;
+    public static final byte NODE_INLINE                    = 25;
+    public static final byte NODE_INLINE_CONTAINER          = 26;
+    public static final byte NODE_INSTREAM_FOREIGN_OBJECT   = 27;
+    public static final byte NODE_LEADER                    = 28;
+    public static final byte NODE_LIST_BLOCK                = 29;
+    public static final byte NODE_LIST_ITEM                 = 30;
+    public static final byte NODE_LIST_ITEM_BODY            = 31;
+    public static final byte NODE_LIST_ITEM_LABEL           = 32;
+    public static final byte NODE_MARKER                    = 33;
+    public static final byte NODE_MULTI_CASE                = 34;
+    public static final byte NODE_MULTI_PROPERTIES          = 35;
+    public static final byte NODE_MULTI_PROPERTY_SET        = 36;
+    public static final byte NODE_MULTI_SWITCH              = 37;
+    public static final byte NODE_MULTI_TOGGLE              = 38;
+    public static final byte NODE_PAGE_NUMBER               = 39;
+    public static final byte NODE_PAGE_NUMBER_CITATION      = 40;
+    public static final byte NODE_RETRIEVE_MARKER           = 41;
+    public static final byte NODE_STATIC_CONTENT            = 42;
+    public static final byte NODE_TABLE                     = 43;
+    public static final byte NODE_TABLE_AND_CAPTION         = 44;
+    public static final byte NODE_TABLE_BODY                = 45;
+    public static final byte NODE_TABLE_CAPTION             = 46;
+    public static final byte NODE_TABLE_CELL                = 47;
+    public static final byte NODE_TABLE_COLUMN              = 48;
+    public static final byte NODE_TABLE_FOOTER              = 49;
+    public static final byte NODE_TABLE_HEADER              = 50;
+    public static final byte NODE_TABLE_ROW                 = 51;
+    public static final byte NODE_WRAPPER                   = 52;
+    public static final byte NODE_COND_PAGE_MASTER_REF      = 53;
+    public static final byte NODE_LAYOUT_MASTER_SET         = 54;
+    public static final byte NODE_PAGE_SEQUENCE_MASTER      = 55;
+    public static final byte NODE_REGION_AFTER              = 56;
+    public static final byte NODE_REGION_BEFORE             = 57;
+    public static final byte NODE_REGION_BODY               = 58;
+    public static final byte NODE_REGION_END                = 59;
+    public static final byte NODE_REGION_START              = 60;
+    public static final byte NODE_REPEAT_PAGE_MASTER_ALTERN = 61;
+    public static final byte NODE_REPEAT_PAGE_MASTER_REF    = 62;
+    public static final byte NODE_ROOT                      = 63;
+    public static final byte NODE_SIMPLE_PAGE_MASTER        = 64;
+    public static final byte NODE_SIMPLE_PAGE_MASTER_REF    = 65;
+    public static final byte NODE_EXTENSION                 = 66;
+    public static final byte NODE_FOBJ                      = 67;
+    public static final byte NODE_FOBJ_MIXED                = 68;
+    public static final byte NODE_TO_BE_IMPLEMENTED         = 69;
+    public static final byte NODE_XML_OBJ                   = 70;
+    public static final byte NODE_BASIC_LINK                = 71;
+    public static final byte NODE_ABSTRACT_TABLE_BODY       = 72;
+    public static final byte NODE_REGION                    = 73;
+    public static final byte NODE_PAGE_MASTER_REFERENCE     = 74;
+    public static final byte NODE_SVG_ELEMENT               = 75;
+    public static final byte NODE_BOOKMARK_TREE             = 76;
+
+    /**
+     * Returns the parent of this node.
+     * @return This node's parent.
+     */
+    public FObj parentFO();
+
+    /**
+     * Returns the children of this node.
+     * @return The children of this node, nor null if none exist.
+     */
+    public List childrenFO();
+
+    /**
+     * Return a value indicating what subclass of FONode this is (to avoid the
+     * cost of instanceof and to allow more efficient switch statements).
+     */
+    public byte getNodeType() ;
+
+    /**
+     * Sets a proxy for this FONode.
+     * @param proxy The FONodeProxy to be set for this node.
+     */
+    public void setProxy(FONodeProxy proxy) ;
+
+    /**
+     * Returns the FONodeProxy instance, if any, associated with this object.
+     * @return The proxy for this FONode instance.
+     */
+    public FONodeProxy getProxy() ;
+
+    /**
+     * Resets this node and all child nodes so that they can be reused.
+     * Specifically, all references to FONodeProxy instances should be
+     * dereferenced by implementations.
+     * Running reset on the FORoot instance should reset the entire FOTree
+     * for reuse.
+     */
+    public void reset() ;
+
+}

Copied: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONodeProxy.java (from rev 508, trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FONodeProxy.java)
===================================================================
--- trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONodeProxy.java	                        (rev 0)
+++ trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONodeProxy.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -0,0 +1,49 @@
+/*
+ * 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.foR;
+
+/**
+ * <p>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.
+ * FONodeProxy instances serve as proxies for FONode instances, and are
+ * cross-referenced with them.
+ * They can be used by any user of the FOTree to embed references to non-FOTree
+ * data in the FOTree.
+ * For example, a typical use of the FOTree is as input to a layout system that
+ * will create an AreaTree from it.
+ * The layout system can use the FONodeProxy to store layout-related
+ * 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>
+ */
+public interface FONodeProxy {
+
+    /**
+     * Returns the FONode for which this proxy stands.
+     * @return The FONode that is attached to this proxy.
+     */
+    public FONode getFONode() ;
+
+}

Copied: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOText.java (from rev 508, trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FOText.java)
===================================================================
--- trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOText.java	                        (rev 0)
+++ trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOText.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2005 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.foR;
+
+import org.axsl.text.line.LineText;
+
+/**
+ * a text node in the formatting object tree
+ *
+ */
+public interface FOText extends FONode, LineText {
+
+    /**
+     * <p>Filters the raw text as needed to present the text that should appear
+     * in the area tree. Specifically, this effectively filters for the
+     * following property:</p>
+     * <ul>
+     * <li>white-space-collapse. See XSL-FO Standard 1.0 Section 7.15.12.</li>
+     * </ul>
+     * 
+     * @return The text that should appear in the area tree.
+     */
+    public char[] getAreaTreeText() ;
+
+}

Copied: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeBuilder.java (from rev 508, trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FOTreeBuilder.java)
===================================================================
--- trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeBuilder.java	                        (rev 0)
+++ trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeBuilder.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2005 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.foR;
+
+import org.axsl.foR.fo.Root;
+import org.axsl.fontR.FontConsumer;
+import org.axsl.graphicR.GraphicServer;
+import org.axsl.text.TextServer;
+
+import org.xml.sax.ContentHandler;
+
+import java.net.URL;
+
+/**
+ * An FOTreeBuilder is created for each document that is processed.
+ * It is conceptually directly under the FOTreeServer (which can be used for
+ * multiple documents and which generally creates FOTreeBuilder instances).
+ * Whereas FOTreeControl represents the client application to the FOTree
+ * implementation, FOTreeBuilder represents the FOTree implementation to the
+ * client application.
+ */
+public interface FOTreeBuilder extends ContentHandler {
+
+    public boolean hasData() ;
+
+    public Root getRootFObj() ;
+
+    /**
+     * Add an object to the collection of objects that should be notified about
+     * FOTreeEvent firings.
+     * @param listener the Object which should be notified
+     */
+    public void addFOTreeListener (FOTreeListener listener) ;
+
+    /**
+     * The client application can use this method to add a list of FO objects
+     * that it does not support, and that it wishes to have flagged for the
+     * user at parse time. The object will be created within the FOTree, but the
+     * user will receive a logged message warning them that the object is not
+     * supported.
+     * Note that multiple arrays can be added, and the relationship is OR, so
+     * that if a given item appears in any one or more of the arrays, it will
+     * be flagged.
+     * @param unsupportedObjectsFO An array of bytes, each element of which
+     * represents an element which should be flagged to the user.
+     * Valid element values are members of
+     * {@link org.axsl.common.Constants#objectNameList}.
+     */
+    public void setUnsupportedObjectsFO(byte[] unsupportedObjectsFO) ;
+
+    /**
+     * The client application can use this method to add a list of FO properties
+     * that it does not support, and that it wishes to have flagged for the
+     * user at parse time. The property will be created within the FOTree, but
+     * the user will receive a logged message warning them that the object is
+     * not supported.
+     * Note that multiple arrays can be added, and the relationship is OR, so
+     * that if a given item appears in any one or more of the arrays, it will
+     * be flagged.
+     * @param unsupportedPropertiesFO An array of shorts, each element of which
+     * represents an attribute which should be flagged to the user.
+     * Valid element values are members of
+     * {@link org.axsl.common.Constants#propertyNameList}.
+     */
+    public void setUnsupportedPropertiesFO(short[] unsupportedPropertiesFO) ;
+
+    public void setGraphicServer(GraphicServer graphicServer) ;
+
+    public void setTextServer(TextServer textServer) ;
+
+    public void setFontConsumer(FontConsumer consumer) ;
+
+    public void setGraphicSearchPath(URL[] graphicSearchPath);
+
+    public void setCachingGraphics(boolean cachingGraphics);
+
+}

Copied: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeEvent.java (from rev 508, trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FOTreeEvent.java)
===================================================================
--- trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeEvent.java	                        (rev 0)
+++ trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeEvent.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2004 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.foR;
+
+import org.axsl.foR.FObj;
+import org.axsl.foR.fo.PageSequence;
+
+
+import java.util.EventObject;
+
+/**
+ * An Event used for notification that various stages of the building of an
+ * FO tree have been completed. Events are fired when an FObj is complete,
+ * when a PageSequence is complete, and when the document is complete.
+ */
+public class FOTreeEvent extends EventObject {
+    static final long serialVersionUID = 788822251791515762L;
+
+    private FObj fobj;
+    private PageSequence pageSeq;
+
+    /**
+     * Constructor for an "FObj complete" event.
+     * @param source the Object that fired the event.
+     * @param fobj The FObj instance that was just created.
+     */
+    public FOTreeEvent (Object source, FObj fobj) {
+        super(source);
+        this.fobj = fobj;
+    }
+
+    /**
+     * Constructor for a "Document complete" event.
+     * @param source the Object that fired the event.
+     */
+    public FOTreeEvent (Object source) {
+        super(source);
+    }
+
+    /**
+     * Constructor for a "PageSequence complete" event.
+     * @param source the Object that fired the event.
+     * @param pageSequence The PageSequence instance that was just completed.
+     */
+    public FOTreeEvent (Object source, PageSequence pageSequence) {
+        super(source);
+        this.pageSeq = pageSequence;
+    }
+
+    /**
+     * @return The FObj object attached to this event. This will return null
+     * for non-FObj events.
+     */
+    public FObj getFObj () {
+        return fobj;
+    }
+
+    /**
+     * @return The PageSequence object attached to this event. This will return
+     * null for non-PageSequence events.
+     */
+    public PageSequence getPageSequence () {
+        return pageSeq;
+    }
+
+}

Copied: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeException.java (from rev 508, trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FOTreeException.java)
===================================================================
--- trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeException.java	                        (rev 0)
+++ trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeException.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2005 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.foR;
+
+/**
+ * Exception thrown when an axslFOTree implementation has a problem.
+ */
+public class FOTreeException extends Exception {
+
+    static final long serialVersionUID = 945271520120898096L;
+
+    private String contextMessage;
+
+    /**
+     * Create a new FOTreeException.
+     * Identical to {@link Exception#Exception(java.lang.String)}
+     * @see Exception#Exception(java.lang.String)
+     */
+    public FOTreeException(String message) {
+        super(message);
+    }
+
+    /**
+     * Create a new FOTreeException.
+     * Identical to {@link Exception#Exception(java.lang.Throwable)}
+     * @see Exception#Exception(java.lang.Throwable)
+     */
+    public FOTreeException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Create a new FOTreeException.
+     * Identical to {@link Exception#Exception(java.lang.String,
+     * java.lang.Throwable)}
+     * @see Exception#Exception(java.lang.String, java.lang.Throwable)
+     */
+    public FOTreeException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public void setContextMessage(String contextMessage) {
+        this.contextMessage = contextMessage;
+    }
+
+    public boolean isContextSet() {
+        return this.contextMessage != null;
+    }
+
+    public String getMessage() {
+        if (this.contextMessage == null) {
+            return super.getMessage();
+        }
+        return super.getMessage() + "\n" + this.contextMessage;
+    }
+
+}

Copied: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeListener.java (from rev 508, trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FOTreeListener.java)
===================================================================
--- trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeListener.java	                        (rev 0)
+++ trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeListener.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2004 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.foR;
+
+
+import org.axsl.foR.FOTreeEvent;
+
+import java.util.EventListener;
+
+/**
+ * An interface for classes that need to handle FOTreeEvent objects as they
+ * are fired.
+ * The key benefit to using this interface is that the implementation can handle
+ * PageSequence objects at a higher level, rather than dealing directly with
+ * a lower-level SAX event.
+ * @see FOTreeEvent
+ */
+
+public interface FOTreeListener extends EventListener {
+
+    /**
+     * Method for handling a completed FObj object.
+     * @param event The FOTreeEvent that has been fired.
+     */
+    void foFObjComplete (FOTreeEvent event);
+
+    /**
+     * Method for handling a completed PageSequence object.
+     * @param event The FOTreeEvent that has been fired.
+     */
+    void foPageSequenceComplete (FOTreeEvent event);
+
+    /**
+     * Method for handling the end of the document.
+     * @param event The FOTreeEvent that has been fired.
+     */
+    void foDocumentComplete (FOTreeEvent event);
+
+    /**
+     * This flag gives the FOTreeBuilder an opportunity to avoid creating
+     * unnecessary event objects unless somebody wants them.
+     * @return True if you need FObj-complete events, false otherwise.
+     */
+    boolean wantsFObjCompleteEvents() ;
+
+}

Copied: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeServer.java (from rev 508, trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FOTreeServer.java)
===================================================================
--- trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeServer.java	                        (rev 0)
+++ trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeServer.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2005 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.foR;
+
+/**
+ * The top-level object in the FOTree implementation.
+ * FOTreeServer encapsulates the FOTree at a high level of abstraction for a
+ * client application.
+ */
+public interface FOTreeServer {
+
+    /**
+     * Create a an FOTreeBuilder instance to process a document.
+     * @return An implementation of FOTreeBuilder that is in conformity with
+     * this server's processing.
+     */
+    public FOTreeBuilder makeTreeBuilder();
+
+}

Copied: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FObj.java (from rev 508, trunk/axsl/axsl-fo-r/src/java/org/axsl/fotree/FObj.java)
===================================================================
--- trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FObj.java	                        (rev 0)
+++ trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FObj.java	2006-05-05 17:12:10 UTC (rev 509)
@@ -0,0 +1,1182 @@
+/*
+ * Copyright 2005 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.foR;
+
+import org.axsl.common.Constants;
+import org.axsl.foR.fo.BasicLink;
+import org.axsl.foR.fo.Block;
+import org.axsl.foR.fo.Flow;
+import org.axsl.foR.fo.Leader;
+import org.axsl.foR.fo.ListBlock;
+import org.axsl.foR.fo.ListItem;
+import org.axsl.foR.fo.Root;
+import org.axsl.foR.fo.Table;
+import org.axsl.fontR.Font;
+import org.axsl.fontR.FontConsumer;
+import org.axsl.fontR.FontUse;
+import org.axsl.graphicR.Graphic;
+
+import java.awt.Color;
+import java.util.List;
+
+/**
+ * Base interface for formatting objects.
+ */
+public interface FObj extends FONode {
+    
+    public String getSystemId() ;
+    
+    public int getLine() ;
+    
+    public int getColumn() ;
+    
+    /**
+     * Provides a formatted version of the full name of this obj...
 
[truncated message content]

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

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

Revision: 508
Author:   victormote
Date:     2006-05-05 09:51:49 -0700 (Fri, 05 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=508&view=rev

Log Message:
-----------
Rename module directory.

Modified Paths:
--------------
    trunk/axsl/scripts/build.xml
Modified: trunk/axsl/scripts/build.xml
===================================================================
--- trunk/axsl/scripts/build.xml	2006-05-05 16:22:46 UTC (rev 507)
+++ trunk/axsl/scripts/build.xml	2006-05-05 16:51:49 UTC (rev 508)
@@ -78,12 +78,12 @@
       <classpath refid="libs-build-classpath"/>
       <src path="${project.root}/axsl-common/src/java"/>
       <src path="${project.root}/axsl-ps-r/src/java"/>
-      <src path="${project.root}/axsl-font/src/java"/>
-      <src path="${project.root}/axsl-graphic/src/java"/>
+      <src path="${project.root}/axsl-font-r/src/java"/>
+      <src path="${project.root}/axsl-graphic-r/src/java"/>
       <src path="${project.root}/axsl-text/src/java"/>
-      <src path="${project.root}/axsl-fotree/src/java"/>
-      <src path="${project.root}/axsl-area-out/src/java"/>
-      <src path="${project.root}/axsl-pdf/src/java"/>
+      <src path="${project.root}/axsl-fo-r/src/java"/>
+      <src path="${project.root}/axsl-area-r/src/java"/>
+      <src path="${project.root}/axsl-pdf-w/src/java"/>
     </javac>
   </target>
 
@@ -143,13 +143,13 @@
       <sourcepath>
         <pathelement path="${project.root}/axsl-common/src/java"/>
         <pathelement path="${project.root}/axsl-ps-r/src/java"/>
-        <pathelement path="${project.root}/axsl-font/src/java"/>
-        <pathelement path="${project.root}/axsl-graphic/src/java"/>
+        <pathelement path="${project.root}/axsl-font-r/src/java"/>
+        <pathelement path="${project.root}/axsl-graphic-r/src/java"/>
         <pathelement path="${project.root}/axsl-text/src/java"/>
-        <pathelement path="${project.root}/axsl-fotree/src/java"/>
-        <pathelement path="${project.root}/axsl-area-in/src/java"/>
-        <pathelement path="${project.root}/axsl-area-out/src/java"/>
-        <pathelement path="${project.root}/axsl-pdf/src/java"/>
+        <pathelement path="${project.root}/axsl-fo-r/src/java"/>
+        <pathelement path="${project.root}/axsl-area-w/src/java"/>
+        <pathelement path="${project.root}/axsl-area-r/src/java"/>
+        <pathelement path="${project.root}/axsl-pdf-w/src/java"/>
       </sourcepath>
       <group title="The aXSL Common Module">
         <package name="org.axsl.common"/>


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

[aXSL-commit] SF.net SVN: axsl: [507] trunk/axsl

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

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

Log Message:
-----------
Rename module directory.

Added Paths:
-----------
    trunk/axsl/axsl-area-r/
    trunk/axsl/axsl-area-w/
    trunk/axsl/axsl-fo-r/
    trunk/axsl/axsl-font-r/
    trunk/axsl/axsl-graphic-r/
    trunk/axsl/axsl-pdf-w/

Removed Paths:
-------------
    trunk/axsl/axsl-area-in/
    trunk/axsl/axsl-area-out/
    trunk/axsl/axsl-font/
    trunk/axsl/axsl-fotree/
    trunk/axsl/axsl-graphic/
    trunk/axsl/axsl-pdf/
Copied: trunk/axsl/axsl-area-r (from rev 506, trunk/axsl/axsl-area-out)

Copied: trunk/axsl/axsl-area-w (from rev 506, trunk/axsl/axsl-area-in)

Copied: trunk/axsl/axsl-fo-r (from rev 506, trunk/axsl/axsl-fotree)

Copied: trunk/axsl/axsl-font-r (from rev 506, trunk/axsl/axsl-font)

Copied: trunk/axsl/axsl-graphic-r (from rev 506, trunk/axsl/axsl-graphic)

Copied: trunk/axsl/axsl-pdf-w (from rev 506, trunk/axsl/axsl-pdf)


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

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

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

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

Log Message:
-----------
Rename module directory.

Modified Paths:
--------------
    trunk/axsl/scripts/build.xml
Modified: trunk/axsl/scripts/build.xml
===================================================================
--- trunk/axsl/scripts/build.xml	2006-05-05 15:59:28 UTC (rev 505)
+++ trunk/axsl/scripts/build.xml	2006-05-05 16:15:12 UTC (rev 506)
@@ -77,7 +77,7 @@
            >
       <classpath refid="libs-build-classpath"/>
       <src path="${project.root}/axsl-common/src/java"/>
-      <src path="${project.root}/axsl-ps/src/java"/>
+      <src path="${project.root}/axsl-ps-r/src/java"/>
       <src path="${project.root}/axsl-font/src/java"/>
       <src path="${project.root}/axsl-graphic/src/java"/>
       <src path="${project.root}/axsl-text/src/java"/>
@@ -142,7 +142,7 @@
       <classpath refid="libs-build-classpath"/>
       <sourcepath>
         <pathelement path="${project.root}/axsl-common/src/java"/>
-        <pathelement path="${project.root}/axsl-ps/src/java"/>
+        <pathelement path="${project.root}/axsl-ps-r/src/java"/>
         <pathelement path="${project.root}/axsl-font/src/java"/>
         <pathelement path="${project.root}/axsl-graphic/src/java"/>
         <pathelement path="${project.root}/axsl-text/src/java"/>


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

[aXSL-commit] SF.net SVN: axsl: [505] trunk/axsl

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

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

Log Message:
-----------
Rename module directory.

Added Paths:
-----------
    trunk/axsl/axsl-ps-r/

Removed Paths:
-------------
    trunk/axsl/axsl-ps/
Copied: trunk/axsl/axsl-ps-r (from rev 504, trunk/axsl/axsl-ps)


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

[aXSL-commit] SF.net SVN: axsl: [504] trunk/axsl/axsl-ps

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

Revision: 504
Author:   victormote
Date:     2006-05-05 07:39:57 -0700 (Fri, 05 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=504&view=rev

Log Message:
-----------
Change names of data-oriented modules, for consistency.

Modified Paths:
--------------
    trunk/axsl/axsl-area-in/.classpath
    trunk/axsl/axsl-area-in/.project
    trunk/axsl/axsl-area-out/.classpath
    trunk/axsl/axsl-area-out/.project
    trunk/axsl/axsl-font/.classpath
    trunk/axsl/axsl-font/.project
    trunk/axsl/axsl-fotree/.classpath
    trunk/axsl/axsl-fotree/.project
    trunk/axsl/axsl-graphic/.project
    trunk/axsl/axsl-pdf/.classpath
    trunk/axsl/axsl-pdf/.project
    trunk/axsl/axsl-ps/.project
    trunk/axsl/axsl-text/.classpath
Modified: trunk/axsl/axsl-area-in/.classpath
===================================================================
--- trunk/axsl/axsl-area-in/.classpath	2006-05-05 13:36:27 UTC (rev 503)
+++ trunk/axsl/axsl-area-in/.classpath	2006-05-05 14:39:57 UTC (rev 504)
@@ -2,9 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/axslFont"/>
-	<classpathentry kind="src" path="/axslGraphic"/>
+	<classpathentry kind="src" path="/axslFont-R"/>
+	<classpathentry kind="src" path="/axslGraphic-R"/>
 	<classpathentry kind="src" path="/axslCommon"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/axslFOTree"/>
+	<classpathentry kind="src" path="/axslFO-R"/>
 	<classpathentry kind="output" path="build/eclipse"/>
 </classpath>

Modified: trunk/axsl/axsl-area-in/.project
===================================================================
--- trunk/axsl/axsl-area-in/.project	2006-05-05 13:36:27 UTC (rev 503)
+++ trunk/axsl/axsl-area-in/.project	2006-05-05 14:39:57 UTC (rev 504)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>axslAreaIn</name>
+	<name>axslArea-W</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: trunk/axsl/axsl-area-out/.classpath
===================================================================
--- trunk/axsl/axsl-area-out/.classpath	2006-05-05 13:36:27 UTC (rev 503)
+++ trunk/axsl/axsl-area-out/.classpath	2006-05-05 14:39:57 UTC (rev 504)
@@ -2,8 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/axslFont"/>
-	<classpathentry kind="src" path="/axslGraphic"/>
+	<classpathentry kind="src" path="/axslFont-R"/>
+	<classpathentry kind="src" path="/axslGraphic-R"/>
 	<classpathentry kind="src" path="/axslCommon"/>
 	<classpathentry kind="var" path="AXSL_LIB_ROOT/svg-1.1.jar"/>
 	<classpathentry kind="output" path="build/eclipse"/>

Modified: trunk/axsl/axsl-area-out/.project
===================================================================
--- trunk/axsl/axsl-area-out/.project	2006-05-05 13:36:27 UTC (rev 503)
+++ trunk/axsl/axsl-area-out/.project	2006-05-05 14:39:57 UTC (rev 504)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>axslAreaOut</name>
+	<name>axslArea-R</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: trunk/axsl/axsl-font/.classpath
===================================================================
--- trunk/axsl/axsl-font/.classpath	2006-05-05 13:36:27 UTC (rev 503)
+++ trunk/axsl/axsl-font/.classpath	2006-05-05 14:39:57 UTC (rev 504)
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/axslPS"/>
+	<classpathentry kind="src" path="/axslPS-R"/>
 	<classpathentry kind="src" path="/axslCommon"/>
 	<classpathentry kind="output" path="build/eclipse"/>
 </classpath>

Modified: trunk/axsl/axsl-font/.project
===================================================================
--- trunk/axsl/axsl-font/.project	2006-05-05 13:36:27 UTC (rev 503)
+++ trunk/axsl/axsl-font/.project	2006-05-05 14:39:57 UTC (rev 504)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>axslFont</name>
+	<name>axslFont-R</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: trunk/axsl/axsl-fotree/.classpath
===================================================================
--- trunk/axsl/axsl-fotree/.classpath	2006-05-05 13:36:27 UTC (rev 503)
+++ trunk/axsl/axsl-fotree/.classpath	2006-05-05 14:39:57 UTC (rev 504)
@@ -2,8 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/axslFont"/>
-	<classpathentry kind="src" path="/axslGraphic"/>
+	<classpathentry kind="src" path="/axslFont-R"/>
+	<classpathentry kind="src" path="/axslGraphic-R"/>
 	<classpathentry kind="src" path="/axslCommon"/>
 	<classpathentry kind="src" path="/axslText"/>
 	<classpathentry kind="var" path="AXSL_LIB_ROOT/svg-1.1.jar"/>

Modified: trunk/axsl/axsl-fotree/.project
===================================================================
--- trunk/axsl/axsl-fotree/.project	2006-05-05 13:36:27 UTC (rev 503)
+++ trunk/axsl/axsl-fotree/.project	2006-05-05 14:39:57 UTC (rev 504)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>axslFOTree</name>
+	<name>axslFO-R</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: trunk/axsl/axsl-graphic/.project
===================================================================
--- trunk/axsl/axsl-graphic/.project	2006-05-05 13:36:27 UTC (rev 503)
+++ trunk/axsl/axsl-graphic/.project	2006-05-05 14:39:57 UTC (rev 504)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>axslGraphic</name>
+	<name>axslGraphic-R</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: trunk/axsl/axsl-pdf/.classpath
===================================================================
--- trunk/axsl/axsl-pdf/.classpath	2006-05-05 13:36:27 UTC (rev 503)
+++ trunk/axsl/axsl-pdf/.classpath	2006-05-05 14:39:57 UTC (rev 504)
@@ -2,8 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/axslFont"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/axslGraphic"/>
+	<classpathentry kind="src" path="/axslFont-R"/>
+	<classpathentry kind="src" path="/axslGraphic-R"/>
 	<classpathentry kind="var" path="AXSL_LIB_ROOT/svg-1.1.jar"/>
 	<classpathentry kind="output" path="build/eclipse"/>
 </classpath>

Modified: trunk/axsl/axsl-pdf/.project
===================================================================
--- trunk/axsl/axsl-pdf/.project	2006-05-05 13:36:27 UTC (rev 503)
+++ trunk/axsl/axsl-pdf/.project	2006-05-05 14:39:57 UTC (rev 504)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>axslPDF</name>
+	<name>axslPDF-W</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: trunk/axsl/axsl-ps/.project
===================================================================
--- trunk/axsl/axsl-ps/.project	2006-05-05 13:36:27 UTC (rev 503)
+++ trunk/axsl/axsl-ps/.project	2006-05-05 14:39:57 UTC (rev 504)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>axslPS</name>
+	<name>axslPS-R</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: trunk/axsl/axsl-text/.classpath
===================================================================
--- trunk/axsl/axsl-text/.classpath	2006-05-05 13:36:27 UTC (rev 503)
+++ trunk/axsl/axsl-text/.classpath	2006-05-05 14:39:57 UTC (rev 504)
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/axslFont"/>
+	<classpathentry kind="src" path="/axslFont-R"/>
 	<classpathentry kind="output" path="build/eclipse"/>
 </classpath>


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

[aXSL-commit] SF.net SVN: axsl: [503] trunk/axsl/axsl-fotree/src/java/org/axsl/fotree

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

Revision: 503
Author:   victormote
Date:     2006-05-05 06:36:27 -0700 (Fri, 05 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=503&view=rev

Log Message:
-----------
Fix copyrights.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeEvent.java
    trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeListener.java
Modified: trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeEvent.java
===================================================================
--- trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeEvent.java	2006-05-04 21:54:38 UTC (rev 502)
+++ trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeEvent.java	2006-05-05 13:36:27 UTC (rev 503)
@@ -1,22 +1,18 @@
 /*
- * Copyright 2004 The FOray Project.
- *      http://www.foray.org
- * 
+ * Copyright 2004 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.
- * 
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- *      Apache FOP, licensed by the Apache Software Foundation
  *
  */
 

Modified: trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeListener.java
===================================================================
--- trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeListener.java	2006-05-04 21:54:38 UTC (rev 502)
+++ trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeListener.java	2006-05-05 13:36:27 UTC (rev 503)
@@ -1,22 +1,18 @@
 /*
- * Copyright 2004 The FOray Project.
- *      http://www.foray.org
- * 
+ * Copyright 2004 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.
- * 
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- *      Apache FOP, licensed by the Apache Software Foundation
  *
  */
 


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

[aXSL-commit] SF.net SVN: axsl: [502] trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FONode.java

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

Revision: 502
Author:   victormote
Date:     2006-05-04 14:54:38 -0700 (Thu, 04 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=502&view=rev

Log Message:
-----------
Clean up doc a bit.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FONode.java
Modified: trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FONode.java
===================================================================
--- trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FONode.java	2006-05-04 21:36:03 UTC (rev 501)
+++ trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FONode.java	2006-05-04 21:54:38 UTC (rev 502)
@@ -23,7 +23,7 @@
 import java.util.List;
 
 /**
- * Base class for nodes in the formatting object tree.
+ * Interface for nodes in the formatting object tree.
  */
 public interface FONode {
 
@@ -104,8 +104,16 @@
     public static final byte NODE_SVG_ELEMENT               = 75;
     public static final byte NODE_BOOKMARK_TREE             = 76;
 
+    /**
+     * Returns the parent of this node.
+     * @return This node's parent.
+     */
     public FObj parentFO();
 
+    /**
+     * Returns the children of this node.
+     * @return The children of this node, nor null if none exist.
+     */
     public List childrenFO();
 
     /**


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

[aXSL-commit] SF.net SVN: axsl: [501] trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FONode.java

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

Revision: 501
Author:   victormote
Date:     2006-05-04 14:36:03 -0700 (Thu, 04 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=501&view=rev

Log Message:
-----------
Add methods for getting, setting, and resetting the sister proxy object.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FONode.java
Modified: trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FONode.java
===================================================================
--- trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FONode.java	2006-05-04 21:19:26 UTC (rev 500)
+++ trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FONode.java	2006-05-04 21:36:03 UTC (rev 501)
@@ -114,4 +114,25 @@
      */
     public byte getNodeType() ;
 
+    /**
+     * Sets a proxy for this FONode.
+     * @param proxy The FONodeProxy to be set for this node.
+     */
+    public void setProxy(FONodeProxy proxy) ;
+
+    /**
+     * Returns the FONodeProxy instance, if any, associated with this object.
+     * @return The proxy for this FONode instance.
+     */
+    public FONodeProxy getProxy() ;
+
+    /**
+     * Resets this node and all child nodes so that they can be reused.
+     * Specifically, all references to FONodeProxy instances should be
+     * dereferenced by implementations.
+     * Running reset on the FORoot instance should reset the entire FOTree
+     * for reuse.
+     */
+    public void reset() ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [500] trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FONodeProxy.java

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

Revision: 500
Author:   victormote
Date:     2006-05-04 14:19:26 -0700 (Thu, 04 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=500&view=rev

Log Message:
-----------
Add interface for a proxy that can be embedded in an FONode.

Added Paths:
-----------
    trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FONodeProxy.java
Added: trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FONodeProxy.java
===================================================================
--- trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FONodeProxy.java	                        (rev 0)
+++ trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FONodeProxy.java	2006-05-04 21:19:26 UTC (rev 500)
@@ -0,0 +1,49 @@
+/*
+ * 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.fotree;
+
+/**
+ * <p>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.
+ * FONodeProxy instances serve as proxies for FONode instances, and are
+ * cross-referenced with them.
+ * They can be used by any user of the FOTree to embed references to non-FOTree
+ * data in the FOTree.
+ * For example, a typical use of the FOTree is as input to a layout system that
+ * will create an AreaTree from it.
+ * The layout system can use the FONodeProxy to store layout-related
+ * 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>
+ */
+public interface FONodeProxy {
+
+    /**
+     * Returns the FONode for which this proxy stands.
+     * @return The FONode that is attached to this proxy.
+     */
+    public FONode getFONode() ;
+
+}


Property changes on: trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FONodeProxy.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: [499] trunk/axsl/axsl-fotree/src/java/org/axsl/fotree

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

Revision: 499
Author:   victormote
Date:     2006-05-03 12:41:49 -0700 (Wed, 03 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=499&view=rev

Log Message:
-----------
1. Move some FOTreeControl methods to FOTreeBuilder setters.
2. Remove now-empty FOTreeControl interface.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java
    trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeServer.java

Removed Paths:
-------------
    trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java
Modified: trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java
===================================================================
--- trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java	2006-05-03 19:12:45 UTC (rev 498)
+++ trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java	2006-05-03 19:41:49 UTC (rev 499)
@@ -27,6 +27,8 @@
 
 import org.xml.sax.ContentHandler;
 
+import java.net.URL;
+
 /**
  * An FOTreeBuilder is created for each document that is processed.
  * It is conceptually directly under the FOTreeServer (which can be used for
@@ -86,4 +88,8 @@
 
     public void setFontConsumer(FontConsumer consumer) ;
 
+    public void setGraphicSearchPath(URL[] graphicSearchPath);
+
+    public void setCachingGraphics(boolean cachingGraphics);
+
 }

Deleted: trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java
===================================================================
--- trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java	2006-05-03 19:12:45 UTC (rev 498)
+++ trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java	2006-05-03 19:41:49 UTC (rev 499)
@@ -1,47 +0,0 @@
-/*
- * Copyright 2005 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.fotree;
-
-import java.net.URL;
-
-/**
- * An interface for classes that are conceptually the parent class of the
- * fo.pagination.Root object. The purpose of the interface is to maintain
- * encapsulation of the FO Tree classes, but to acknowledge that a higher-level
- * object is needed to control the building of the FO Tree, to provide it
- * with information about the environment, to keep track of meta-type
- * information, and to use its results.
- */
-public interface FOTreeControl {
-
-    /**
-     * @return The ordered list of URLs that should be searched when looking
-     * for a graphical image with a relative path.
-     */
-    URL[] getGraphicSearchPath();
-
-    /**
-     * @return True if graphics should be cached in memory, false if the memory
-     * should be released.
-     */
-    boolean getCachingGraphics();
-
-}

Modified: trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeServer.java
===================================================================
--- trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeServer.java	2006-05-03 19:12:45 UTC (rev 498)
+++ trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeServer.java	2006-05-03 19:41:49 UTC (rev 499)
@@ -29,11 +29,9 @@
 
     /**
      * Create a an FOTreeBuilder instance to process a document.
-     * @param control An FOTreeControl implementation, which will act as the
-     * "parent" or controller for the FOTreeBuilder that is created.
      * @return An implementation of FOTreeBuilder that is in conformity with
      * this server's processing.
      */
-    public FOTreeBuilder makeTreeBuilder(FOTreeControl control);
+    public FOTreeBuilder makeTreeBuilder();
 
 }


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

[aXSL-commit] SF.net SVN: axsl: [498] trunk/axsl/axsl-fotree/src/java/org/axsl/fotree

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

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

Log Message:
-----------
Move some FOTreeControl methods to FOTreeBuilder setters.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java
    trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java
Modified: trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java
===================================================================
--- trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java	2006-05-03 18:50:09 UTC (rev 497)
+++ trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java	2006-05-03 19:12:45 UTC (rev 498)
@@ -20,6 +20,7 @@
  
 package org.axsl.fotree;
 
+import org.axsl.font.FontConsumer;
 import org.axsl.fotree.fo.Root;
 import org.axsl.graphic.GraphicServer;
 import org.axsl.text.TextServer;
@@ -83,4 +84,6 @@
 
     public void setTextServer(TextServer textServer) ;
 
+    public void setFontConsumer(FontConsumer consumer) ;
+
 }

Modified: trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java
===================================================================
--- trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java	2006-05-03 18:50:09 UTC (rev 497)
+++ trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java	2006-05-03 19:12:45 UTC (rev 498)
@@ -20,8 +20,6 @@
  
 package org.axsl.fotree;
 
-import org.axsl.font.FontConsumer;
-
 import java.net.URL;
 
 /**
@@ -46,10 +44,4 @@
      */
     boolean getCachingGraphics();
 
-    /**
-     * @return The FontConsumer implementation that should be used by nodes
-     * in this FOTree to obtain fonts and font services from FontServer.
-     */
-    FontConsumer getFontConsumer() ;
-
 }


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

[aXSL-commit] SF.net SVN: axsl: [497] trunk/axsl/axsl-fotree/src/java/org/axsl/fotree

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

Revision: 497
Author:   victormote
Date:     2006-05-03 11:50:09 -0700 (Wed, 03 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=497&view=rev

Log Message:
-----------
Remove unused and unneeded method.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java
    trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java
Modified: trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java
===================================================================
--- trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java	2006-05-03 18:46:40 UTC (rev 496)
+++ trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java	2006-05-03 18:50:09 UTC (rev 497)
@@ -81,6 +81,6 @@
 
     public void setGraphicServer(GraphicServer graphicServer) ;
 
-    public void setTextServer(TextServer textServer);
+    public void setTextServer(TextServer textServer) ;
 
 }

Modified: trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java
===================================================================
--- trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java	2006-05-03 18:46:40 UTC (rev 496)
+++ trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java	2006-05-03 18:50:09 UTC (rev 497)
@@ -52,9 +52,4 @@
      */
     FontConsumer getFontConsumer() ;
 
-    /**
-     * @return The name of the class that should be used as the default parser.
-     */
-    String getParserClassName();
-
 }


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

[aXSL-commit] SF.net SVN: axsl: [496] trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java

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

Revision: 496
Author:   victormote
Date:     2006-05-03 11:46:40 -0700 (Wed, 03 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=496&view=rev

Log Message:
-----------
Remove unused and unneeded method.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java
Modified: trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java
===================================================================
--- trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java	2006-05-03 18:41:28 UTC (rev 495)
+++ trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java	2006-05-03 18:46:40 UTC (rev 496)
@@ -35,12 +35,6 @@
 public interface FOTreeControl {
 
     /**
-     * @return The base URL that should be used for finding external files, like
-     * graphical images, etc.
-     */
-    URL getBaseURL();
-
-    /**
      * @return The ordered list of URLs that should be searched when looking
      * for a graphical image with a relative path.
      */


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

[aXSL-commit] SF.net SVN: axsl: [495] trunk/axsl/axsl-fotree/src/java/org/axsl/fotree

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

Revision: 495
Author:   victormote
Date:     2006-05-03 11:41:28 -0700 (Wed, 03 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=495&view=rev

Log Message:
-----------
Move some FOTreeControl methods to FOTreeBuilder setters.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java
    trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java
Modified: trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java
===================================================================
--- trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java	2006-05-03 18:13:05 UTC (rev 494)
+++ trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java	2006-05-03 18:41:28 UTC (rev 495)
@@ -21,6 +21,8 @@
 package org.axsl.fotree;
 
 import org.axsl.fotree.fo.Root;
+import org.axsl.graphic.GraphicServer;
+import org.axsl.text.TextServer;
 
 import org.xml.sax.ContentHandler;
 
@@ -77,4 +79,8 @@
      */
     public void setUnsupportedPropertiesFO(short[] unsupportedPropertiesFO) ;
 
+    public void setGraphicServer(GraphicServer graphicServer) ;
+
+    public void setTextServer(TextServer textServer);
+
 }

Modified: trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java
===================================================================
--- trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java	2006-05-03 18:13:05 UTC (rev 494)
+++ trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java	2006-05-03 18:41:28 UTC (rev 495)
@@ -21,8 +21,6 @@
 package org.axsl.fotree;
 
 import org.axsl.font.FontConsumer;
-import org.axsl.graphic.GraphicServer;
-import org.axsl.text.TextServer;
 
 import java.net.URL;
 
@@ -65,8 +63,4 @@
      */
     String getParserClassName();
 
-    GraphicServer getGraphicServer() ;
-
-    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: [494] trunk/axsl/axsl-fotree/src/java/org/axsl/fotree

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

Revision: 494
Author:   victormote
Date:     2006-05-03 11:13:05 -0700 (Wed, 03 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=494&view=rev

Log Message:
-----------
Move some FOTreeControl methods to FOTreeBuilder setters.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java
    trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java
Modified: trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java
===================================================================
--- trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java	2006-05-03 15:36:26 UTC (rev 493)
+++ trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeBuilder.java	2006-05-03 18:13:05 UTC (rev 494)
@@ -45,4 +45,36 @@
      */
     public void addFOTreeListener (FOTreeListener listener) ;
 
+    /**
+     * The client application can use this method to add a list of FO objects
+     * that it does not support, and that it wishes to have flagged for the
+     * user at parse time. The object will be created within the FOTree, but the
+     * user will receive a logged message warning them that the object is not
+     * supported.
+     * Note that multiple arrays can be added, and the relationship is OR, so
+     * that if a given item appears in any one or more of the arrays, it will
+     * be flagged.
+     * @param unsupportedObjectsFO An array of bytes, each element of which
+     * represents an element which should be flagged to the user.
+     * Valid element values are members of
+     * {@link org.axsl.common.Constants#objectNameList}.
+     */
+    public void setUnsupportedObjectsFO(byte[] unsupportedObjectsFO) ;
+
+    /**
+     * The client application can use this method to add a list of FO properties
+     * that it does not support, and that it wishes to have flagged for the
+     * user at parse time. The property will be created within the FOTree, but
+     * the user will receive a logged message warning them that the object is
+     * not supported.
+     * Note that multiple arrays can be added, and the relationship is OR, so
+     * that if a given item appears in any one or more of the arrays, it will
+     * be flagged.
+     * @param unsupportedPropertiesFO An array of shorts, each element of which
+     * represents an attribute which should be flagged to the user.
+     * Valid element values are members of
+     * {@link org.axsl.common.Constants#propertyNameList}.
+     */
+    public void setUnsupportedPropertiesFO(short[] unsupportedPropertiesFO) ;
+
 }

Modified: trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java
===================================================================
--- trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java	2006-05-03 15:36:26 UTC (rev 493)
+++ trunk/axsl/axsl-fotree/src/java/org/axsl/fotree/FOTreeControl.java	2006-05-03 18:13:05 UTC (rev 494)
@@ -69,8 +69,4 @@
 
     TextServer getTextServer();
 
-    byte[] unsupportedObjectsFO() ;
-
-    short[] unsupportedPropertiesFO() ;
-
 }


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