Switched from fox:bookmarks to fo:bookmark-tree (of XSL 1.1 2WD). Two more

bookmark-related FO's (fox:outline and fox:label) need conversion and will
be done next.


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

2 files changed, 61 insertions, 64 deletions

diff --git a/examples/fo/advanced/cid-fonts.fo b/examples/fo/advanced/cid-fonts.fo
index d7623ae23..dc55f7ac9 100644
--- a/examples/fo/advanced/cid-fonts.fo
+++ b/examples/fo/advanced/cid-fonts.fo
@@ -16,7 +16,7 @@
    </fo:simple-page-master>
  </fo:layout-master-set>
 
-
+<fo:bookmark-tree>
   <fox:outline internal-destination="sec0">
     <fox:label>Adding Fonts to FOP</fox:label>
   </fox:outline>
@@ -74,7 +74,7 @@
  <fox:outline internal-destination="sec5">
     <fox:label>Japanese Examples</fox:label>
  </fox:outline>
-
+</fo:bookmark-tree>
 
  <fo:page-sequence master-reference="A4">
 
diff --git a/examples/fo/basic/pdfoutline.fo b/examples/fo/basic/pdfoutline.fo
index b53e1f743..276d61e99 100644
--- a/examples/fo/basic/pdfoutline.fo
+++ b/examples/fo/basic/pdfoutline.fo
@@ -58,71 +58,68 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of
   <!-- end: defines page layout -->
 
 
-<!-- beginning of the PDF outline extensions -->
-  <fox:bookmarks>
-
-  <fox:outline internal-destination="sec1">
-    <fox:label>What is FOP?</fox:label>
-  </fox:outline>
-
-  <fox:outline internal-destination="sec2">
-    <fox:label>Downloading FOP</fox:label>
-  </fox:outline>
-
-  <fox:outline internal-destination="sec3">
-    <fox:label>Running FOP</fox:label>
-
-    <fox:outline internal-destination="sec3-1">
-      <fox:label>Prerequisites</fox:label>
-
-      <fox:outline internal-destination="sec3-1-1">
-        <fox:label>Java 1.1</fox:label>
+<!-- bookmark section -->
+  <fo:bookmark-tree>
+      <fox:outline internal-destination="sec1">
+        <fox:label>What is FOP?</fox:label>
       </fox:outline>
-
-      <fox:outline internal-destination="sec3-1-2">
-        <fox:label>XML Parser</fox:label>
+    
+      <fox:outline internal-destination="sec2">
+        <fox:label>Downloading FOP</fox:label>
       </fox:outline>
-
-      <fox:outline internal-destination="sec3-1-3">
-        <fox:label>XSLT Processor</fox:label>
+    
+      <fox:outline internal-destination="sec3">
+        <fox:label>Running FOP</fox:label>
+    
+        <fox:outline internal-destination="sec3-1">
+          <fox:label>Prerequisites</fox:label>
+    
+          <fox:outline internal-destination="sec3-1-1">
+            <fox:label>Java 1.1</fox:label>
+          </fox:outline>
+    
+          <fox:outline internal-destination="sec3-1-2">
+            <fox:label>XML Parser</fox:label>
+          </fox:outline>
+    
+          <fox:outline internal-destination="sec3-1-3">
+            <fox:label>XSLT Processor</fox:label>
+          </fox:outline>
+    
+        </fox:outline>
+    
+        <fox:outline internal-destination="sec3-2">
+          <fox:label>Starting FOP</fox:label>
+        </fox:outline>
+    
       </fox:outline>
-
-    </fox:outline>
-
-    <fox:outline internal-destination="sec3-2">
-      <fox:label>Starting FOP</fox:label>
-    </fox:outline>
-
-  </fox:outline>
-
-  <fox:outline internal-destination="sec4">
-    <fox:label>Embedding FOP</fox:label>
-  </fox:outline>
-
-  <fox:outline internal-destination="sec5">
-    <fox:label>What's Implemented?</fox:label>
-  </fox:outline>
-  <fox:outline internal-destination="sec6">
-    <fox:label>Limitations</fox:label>
-  </fox:outline>
-  <fox:outline internal-destination="sec7">
-    <fox:label>Bugs</fox:label>
-  </fox:outline>
-  <fox:outline internal-destination="sec8">
-    <fox:label>Compiling FOP</fox:label>
-  </fox:outline>
-  <fox:outline internal-destination="sec9">
-    <fox:label>Getting Involved</fox:label>
-  </fox:outline>
-  <fox:outline internal-destination="sec10">
-    <fox:label>FOP Relevant Specifications</fox:label>
-  </fox:outline>
-  <fox:outline internal-destination="sec11">
-    <fox:label>License</fox:label>
-  </fox:outline>
-  </fox:bookmarks>
-
-
+    
+      <fox:outline internal-destination="sec4">
+        <fox:label>Embedding FOP</fox:label>
+      </fox:outline>
+    
+      <fox:outline internal-destination="sec5">
+        <fox:label>What's Implemented?</fox:label>
+      </fox:outline>
+      <fox:outline internal-destination="sec6">
+        <fox:label>Limitations</fox:label>
+      </fox:outline>
+      <fox:outline internal-destination="sec7">
+        <fox:label>Bugs</fox:label>
+      </fox:outline>
+      <fox:outline internal-destination="sec8">
+        <fox:label>Compiling FOP</fox:label>
+      </fox:outline>
+      <fox:outline internal-destination="sec9">
+        <fox:label>Getting Involved</fox:label>
+      </fox:outline>
+      <fox:outline internal-destination="sec10">
+        <fox:label>FOP Relevant Specifications</fox:label>
+      </fox:outline>
+      <fox:outline internal-destination="sec11">
+        <fox:label>License</fox:label>
+      </fox:outline>
+  </fo:bookmark-tree>
 
   <!-- actual layout -->
   <fo:page-sequence master-reference="basicPSM">