Move glossary-type stuff from properties.xml to index.xml. Minor additions to overvie...

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196387 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/documentation/content/xdocs/design/index.xml b/src/documentation/content/xdocs/design/index.xml
index 2c7ae4afe7706d2376bce5c2285e449310ff72eb..a7fd0babddd52a47f9a3511ecf0832e10ec99bcf 100644 (file)
--- a/src/documentation/content/xdocs/design/index.xml
+++ b/src/documentation/content/xdocs/design/index.xml
@@ -106,5 +106,38 @@ Each component outlines the design issues which have already been addressed.
 These resolution of these design issues is in support of the primary and secondary goals, so they are not necessarily written in stone.
 However, most of them have been discussed at length among the developers, and are reasonably well settled.</p>
     </section>
+
+
+    <section id="vocabulary">
+      <title>Vocabulary</title>
+      <p>This section will attempt to provide information about any jargon used in the design documentation.</p>
+      <p>There is a rough relationship between terms used to describe the various trees in XSL-FO processing, all of which come from the XML and XSL-FO standards. In the table below, the <em>terms</em> (but not the actual items) in each column are roughly equivalent to each other:</p>
+      <table>
+        <tr>
+          <th>Tree Concept</th>
+          <th>Thing (Noun)</th>
+          <th>Descriptive Item (Adjective)</th>
+        </tr>
+        <tr>
+          <td>XML</td>
+          <td>Element</td>
+          <td>Attribute</td>
+        </tr>
+        <tr>
+          <td>FO Tree</td>
+          <td>Object</td>
+          <td>Property</td>
+        </tr>
+        <tr>
+          <td>Area Tree</td>
+          <td>Area</td>
+          <td>Trait</td>
+        </tr>
+      </table>
+      <ul>
+        <li><strong>LM</strong>: Layout Manager.</li>
+        <li><strong>PLB</strong>: PropertyListBuilder.</li>
+      </ul>
+    </section>
   </body>
 </document>

diff --git a/src/documentation/content/xdocs/design/properties.xml b/src/documentation/content/xdocs/design/properties.xml
index 047f9d78080d5a9017a516572f68a50a7c017252..29f2c1959772f5f40eeadf9ede88e81148b51516 100644 (file)
--- a/src/documentation/content/xdocs/design/properties.xml
+++ b/src/documentation/content/xdocs/design/properties.xml
@@ -14,33 +14,6 @@
       <p>As the input XSL-FO is being parsed and the FO Tree is being built, the attributes of the FO elements are passed by the parser to the related FO object.
 The java object that represent the FO object then converts the attributes into properties that are stored in the FO Tree.</p>
     </section>
-    <section id="terms-related">
-      <title>Related Terms</title>
-      <p>It may be helpful here to show the rough relationship between terms used to describe the various trees in XSL-FO processing, all of which come from the XML and XSL-FO standards. In the table below, the <em>terms</em> (but not the actual items) in each column are roughly equivalent to each other:</p>
-      <table>
-        <tr>
-          <th>Tree Concept</th>
-          <th>Thing (Noun)</th>
-          <th>Descriptive Item (Adjective)</th>
-        </tr>
-        <tr>
-          <td>XML</td>
-          <td>Element</td>
-          <td>Attribute</td>
-        </tr>
-        <tr>
-          <td>FO Tree</td>
-          <td>Object</td>
-          <td>Property</td>
-        </tr>
-        <tr>
-          <td>Area Tree</td>
-          <td>Area</td>
-          <td>Trait</td>
-        </tr>
-      </table>
-    </section>
-
     <section id="issues">
       <title>Issues</title>
       <p>The following are some issues when dealing with properties:</p>
@@ -53,14 +26,13 @@ Markers are one example.</li>
         <li>Expressions: XSL-FO expressions can be included in properties.</li>
       </ul>
     </section>
-
     <section id="process-overview">
       <title>Overview of Processing</title>
       <p>The general flow of property processing is as follows:</p>
       <ul>
         <li>As part of <code>FOTreeBuilder.startElement()</code>, <code>FObj.handleAttrs</code> is passed a list of attributes to be processed for the new FObj.</li>
-        <li>FObj.handleAttrs gets a PropertyListBuilder and asks it to create a Property List from them. There is currently only one static PropertyListBuilder, which handles the fo: namespace.</li>
-        <li>FObj.handleAttrs then cross-references the PropertyList with the FObj.</li>
+        <li>FObj.handleAttrs gets a PropertyListBuilder and asks it to create a Property List from the list of attributes. There is currently only one static PropertyListBuilder, which handles the fo: namespace.</li>
+        <li>FObj.handleAttrs then cross-references the returned PropertyList with the FObj, creates a PropertyManager to facilitate downstream processing of the PropertyList, and handles the special case of the writing-mode property.</li>
       </ul>
     </section>
     <section id="plb">