Flatten menu by pulling "understanding" into "design", and making the two menus visually identical.

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

2 files changed, 46 insertions, 5 deletions

diff --git a/src/documentation/content/xdocs/design/book.xml b/src/documentation/content/xdocs/design/book.xml
index 6e9c6189b..776554674 100644
--- a/src/documentation/content/xdocs/design/book.xml
+++ b/src/documentation/content/xdocs/design/book.xml
@@ -2,6 +2,11 @@
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN"
     "http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-cocoon2/src/documentation/xdocs/dtd/book-cocoon-v10.dtd">
 
+<!--
+IF YOU MAKE CHANGES TO THIS FILE, PLEASE MAKE CORRESPONDING CHANGES TO
+understanding/book.xml, WHICH SEE FOR AN EXPLANATION.
+-->
+
 <book software="FOP"
     title="FOP Design"
     copyright="@year@ The Apache Software Foundation"
@@ -9,7 +14,6 @@
 
     <menu label="About">
       <menu-item label="Introduction" href="index.html"/>
-      <menu-item label="Understanding" href="understanding/index.html"/>
     </menu>
     <menu label="Sections">
       <menu-item label="FO Tree" href="fotree.html"/>
@@ -18,6 +22,20 @@
       <menu-item label="Area Tree" href="areas.html"/>
       <menu-item label="Renderers" href="renderers.html"/>
     </menu>
+    <menu label="Understanding">
+      <menu-item label="Instroduction" href="understanding/index.html"/>
+      <menu-item label="XML Parsing" href="understanding/xml_parsing.html"/>
+      <menu-item label="FO Tree" href="understanding/fo_tree.html"/>
+      <menu-item label="Properties" href="understanding/properties.html"/>
+      <menu-item label="Layout Managers" href="understanding/layout_managers.html"/>
+      <menu-item label="Area Tree" href="understanding/area_tree.html"/>
+      <menu-item label="Renderers" href="understanding/renderers.html"/>
+    </menu>
+    <menu label="Extras">
+      <menu-item label="Images" href="understanding/images.html"/>
+      <menu-item label="PDF Library" href="understanding/pdf_library.html"/>
+      <menu-item label="SVG" href="understanding/svg.html"/>
+    </menu>
     <menu label="Miscellaneous">
       <menu-item label="Embedding" href="embedding.html"/>
       <menu-item label="Extending" href="extending.html"/>
diff --git a/src/documentation/content/xdocs/design/understanding/book.xml b/src/documentation/content/xdocs/design/understanding/book.xml
index 1730ec446..e9b2a17f3 100644
--- a/src/documentation/content/xdocs/design/understanding/book.xml
+++ b/src/documentation/content/xdocs/design/understanding/book.xml
@@ -2,16 +2,32 @@
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN"
     "http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-cocoon2/src/documentation/xdocs/dtd/book-cocoon-v10.dtd">
 
+
+<!-- NOTE: This menu attempts to be identical to the one in its parent directory.
+From display standpoint, "Understanding" is a subset of "Design", so we wish to present
+them as one entity. However, Forrest is not flexible enough to allow this directly.
+So, we make the two menus identical, except for the differences in the paths that are
+needed because one is a parent and one is a child.
+IF YOU MAKE CHANGES TO THIS FILE, PLEASE MAKE CORRESPONDING CHANGES TO book.xml IN THE
+PARENT DIRECTORY!
+-->
 <book software="FOP"
     title="Understanding FOP Design"
     copyright="@year@ The Apache Software Foundation"
     xmlns:xlink="http://www.w3.org/1999/xlink">
 
-    <menu label="Index">
-      <menu-item label="FOP Home" href="../../index.html"/>
+    <menu label="About">
+      <menu-item label="Introduction" href="../index.html"/>
+    </menu>
+    <menu label="Sections">
+      <menu-item label="FO Tree" href="../fotree.html"/>
+      <menu-item label="Properties" href="../properties.html"/>
+      <menu-item label="Layout" href="../layout.html"/>
+      <menu-item label="Area Tree" href="../areas.html"/>
+      <menu-item label="Renderers" href="../renderers.html"/>
     </menu>
-    <menu label="Understanding the Design">
-      <menu-item label="Understanding" href="index.html"/>
+    <menu label="Understanding">
+      <menu-item label="Instroduction" href="index.html"/>
       <menu-item label="XML Parsing" href="xml_parsing.html"/>
       <menu-item label="FO Tree" href="fo_tree.html"/>
       <menu-item label="Properties" href="properties.html"/>
@@ -24,5 +40,12 @@
       <menu-item label="PDF Library" href="pdf_library.html"/>
       <menu-item label="SVG" href="svg.html"/>
     </menu>
+    <menu label="Miscellaneous">
+      <menu-item label="Embedding" href="../embedding.html"/>
+      <menu-item label="Extending" href="../extending.html"/>
+      <menu-item label="Break Possibility" href="../breakpos.html"/>
+      <menu-item label="Optimisations" href="../optimise.html"/>
+      <menu-item label="User Agent" href="../useragent.html"/>
+    </menu>
 </book>