PR:

Obtained from:
Submitted by:
Reviewed by:
Converted fox:outline to fo:bookmark.  fox:label/fo:bookmark-title still to
be done.


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

2 files changed, 62 insertions, 62 deletions

diff --git a/examples/fo/advanced/cid-fonts.fo b/examples/fo/advanced/cid-fonts.fo
index dc55f7ac9..556aa8a2d 100644
--- a/examples/fo/advanced/cid-fonts.fo
+++ b/examples/fo/advanced/cid-fonts.fo
@@ -17,63 +17,63 @@
  </fo:layout-master-set>
 
 <fo:bookmark-tree>
-  <fox:outline internal-destination="sec0">
+  <fo:bookmark internal-destination="sec0">
     <fox:label>Adding Fonts to FOP</fox:label>
-  </fox:outline>
+  </fo:bookmark>
 
-  <fox:outline internal-destination="sec1">
+  <fo:bookmark internal-destination="sec1">
     <fox:label>Adding additional Type 1 fonts</fox:label>
 
-    <fox:outline internal-destination="sec1-1">
+    <fo:bookmark internal-destination="sec1-1">
       <fox:label>Generating a font metrics file</fox:label>
-    </fox:outline>
-    <fox:outline internal-destination="sec1-2">
+    </fo:bookmark>
+    <fo:bookmark internal-destination="sec1-2">
       <fox:label>Register the fonts within FOP</fox:label>
-    </fox:outline>
-  </fox:outline>
+    </fo:bookmark>
+  </fo:bookmark>
 
-  <fox:outline internal-destination="sec2">
+  <fo:bookmark internal-destination="sec2">
     <fox:label>Adding additional TrueType fonts</fox:label>
 
-    <fox:outline internal-destination="sec2-1">
+    <fo:bookmark internal-destination="sec2-1">
       <fox:label>Generating a font metrics file</fox:label>
-    </fox:outline>
-    <fox:outline internal-destination="sec2-2">
+    </fo:bookmark>
+    <fo:bookmark internal-destination="sec2-2">
       <fox:label>TrueType collections</fox:label>
-    </fox:outline>
-    <fox:outline internal-destination="sec2-3">
+    </fo:bookmark>
+    <fo:bookmark internal-destination="sec2-3">
       <fox:label>Register the fonts within FOP</fox:label>
-    </fox:outline>
+    </fo:bookmark>
 
-  </fox:outline>
+  </fo:bookmark>
 
- <fox:outline internal-destination="sec3">
+ <fo:bookmark internal-destination="sec3">
     <fox:label>Embedding fonts in the PDF</fox:label>
-  </fox:outline>
+  </fo:bookmark>
 
- <fox:outline internal-destination="sec4">
+ <fo:bookmark internal-destination="sec4">
     <fox:label>Example embedding MSGothic</fox:label>
 
-   <fox:outline internal-destination="sec4-1">
+   <fo:bookmark internal-destination="sec4-1">
       <fox:label>Setup CLASSPATH</fox:label>
-   </fox:outline>
+   </fo:bookmark>
 
-   <fox:outline internal-destination="sec4-2">
+   <fo:bookmark internal-destination="sec4-2">
       <fox:label>Create the metrics file</fox:label>
-   </fox:outline>
+   </fo:bookmark>
 
-   <fox:outline internal-destination="sec4-3">
+   <fo:bookmark internal-destination="sec4-3">
       <fox:label>Edit msgothic.xml</fox:label>
-   </fox:outline>
+   </fo:bookmark>
 
-   <fox:outline internal-destination="sec4-4">
+   <fo:bookmark internal-destination="sec4-4">
       <fox:label>Register the font with FOP</fox:label>
-   </fox:outline>
- </fox:outline>
+   </fo:bookmark>
+ </fo:bookmark>
 
- <fox:outline internal-destination="sec5">
+ <fo:bookmark internal-destination="sec5">
     <fox:label>Japanese Examples</fox:label>
- </fox:outline>
+ </fo:bookmark>
 </fo:bookmark-tree>
 
  <fo:page-sequence master-reference="A4">
diff --git a/examples/fo/basic/pdfoutline.fo b/examples/fo/basic/pdfoutline.fo
index 276d61e99..ce1aa3597 100644
--- a/examples/fo/basic/pdfoutline.fo
+++ b/examples/fo/basic/pdfoutline.fo
@@ -60,65 +60,65 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of
 
 <!-- bookmark section -->
   <fo:bookmark-tree>
-      <fox:outline internal-destination="sec1">
+      <fo:bookmark internal-destination="sec1">
         <fox:label>What is FOP?</fox:label>
-      </fox:outline>
+      </fo:bookmark>
     
-      <fox:outline internal-destination="sec2">
+      <fo:bookmark internal-destination="sec2">
         <fox:label>Downloading FOP</fox:label>
-      </fox:outline>
+      </fo:bookmark>
     
-      <fox:outline internal-destination="sec3">
+      <fo:bookmark internal-destination="sec3">
         <fox:label>Running FOP</fox:label>
     
-        <fox:outline internal-destination="sec3-1">
+        <fo:bookmark internal-destination="sec3-1">
           <fox:label>Prerequisites</fox:label>
     
-          <fox:outline internal-destination="sec3-1-1">
+          <fo:bookmark internal-destination="sec3-1-1">
             <fox:label>Java 1.1</fox:label>
-          </fox:outline>
+          </fo:bookmark>
     
-          <fox:outline internal-destination="sec3-1-2">
+          <fo:bookmark internal-destination="sec3-1-2">
             <fox:label>XML Parser</fox:label>
-          </fox:outline>
+          </fo:bookmark>
     
-          <fox:outline internal-destination="sec3-1-3">
+          <fo:bookmark internal-destination="sec3-1-3">
             <fox:label>XSLT Processor</fox:label>
-          </fox:outline>
+          </fo:bookmark>
     
-        </fox:outline>
+        </fo:bookmark>
     
-        <fox:outline internal-destination="sec3-2">
+        <fo:bookmark internal-destination="sec3-2">
           <fox:label>Starting FOP</fox:label>
-        </fox:outline>
+        </fo:bookmark>
     
-      </fox:outline>
+      </fo:bookmark>
     
-      <fox:outline internal-destination="sec4">
+      <fo:bookmark internal-destination="sec4">
         <fox:label>Embedding FOP</fox:label>
-      </fox:outline>
+      </fo:bookmark>
     
-      <fox:outline internal-destination="sec5">
+      <fo:bookmark internal-destination="sec5">
         <fox:label>What's Implemented?</fox:label>
-      </fox:outline>
-      <fox:outline internal-destination="sec6">
+      </fo:bookmark>
+      <fo:bookmark internal-destination="sec6">
         <fox:label>Limitations</fox:label>
-      </fox:outline>
-      <fox:outline internal-destination="sec7">
+      </fo:bookmark>
+      <fo:bookmark internal-destination="sec7">
         <fox:label>Bugs</fox:label>
-      </fox:outline>
-      <fox:outline internal-destination="sec8">
+      </fo:bookmark>
+      <fo:bookmark internal-destination="sec8">
         <fox:label>Compiling FOP</fox:label>
-      </fox:outline>
-      <fox:outline internal-destination="sec9">
+      </fo:bookmark>
+      <fo:bookmark internal-destination="sec9">
         <fox:label>Getting Involved</fox:label>
-      </fox:outline>
-      <fox:outline internal-destination="sec10">
+      </fo:bookmark>
+      <fo:bookmark internal-destination="sec10">
         <fox:label>FOP Relevant Specifications</fox:label>
-      </fox:outline>
-      <fox:outline internal-destination="sec11">
+      </fo:bookmark>
+      <fo:bookmark internal-destination="sec11">
         <fox:label>License</fox:label>
-      </fox:outline>
+      </fo:bookmark>
   </fo:bookmark-tree>
 
   <!-- actual layout -->