examples.xml consolidation

Submitted by: Glen Mazza <glenmazza@yahoo.com> I had to adjust the sitemap to avoid an error message in the browser when showing fo/embed.fo. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196467 13f79535-47bb-0310-9956-ffa450edef68
author: Jeremias Maerki <jeremias@apache.org> 2003-05-28 07:42:42 +0000
committer: Jeremias Maerki <jeremias@apache.org> 2003-05-28 07:42:42 +0000
commit: ddc4ee97e4e1252c6fad26d2ed9cb8d389bee0ad (patch)
tree: fee26fe4ef309fb3cbb431bf26ba1ee7f4e61e84
parent: 54dfe35e84a29033dd362b07997d66954a59e7cd (diff)
download: xmlgraphics-fop-ddc4ee97e4e1252c6fad26d2ed9cb8d389bee0ad.tar.gz
xmlgraphics-fop-ddc4ee97e4e1252c6fad26d2ed9cb8d389bee0ad.zip
3 files changed, 64 insertions, 78 deletions
diff --git a/src/documentation/content/xdocs/dev/examples.xml b/src/documentation/content/xdocs/dev/examples.xml
deleted file mode 100644
index 2542dba56..000000000
--- a/src/documentation/content/xdocs/dev/examples.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
-    "http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-forrest/src/resources/schema/dtd/document-v11.dtd">
-
-<document>
-  <header>
-    <title>FO Examples</title>
-  </header>
-  <body>
-    <section>
-      <title>Example Documents Using FOP</title>
-      <p>
-        These examples have been rendered using FOP.
-      </p>
-    </section>
-          <section>
-            <title>Images Examples</title>
-            <p>
-Embedding images in FO:
-            </p>
-  <table>
-    <caption>Images in FO</caption>
-    <tr>
-      <th>description</th>
-      <th>fo file</th>
-      <th>pdf result</th>
-    </tr>
-    <tr>
-      <td>align in larger viewport</td>
-      <td><link href="../fo/align.fo">align.fo</link></td>
-      <td><link href="../fo/align.fo.pdf">align.fo.pdf</link></td>
-    </tr>
-    <tr>
-      <td>align in smaller viewport</td>
-      <td><link href="../fo/align2.fo">align2.fo</link></td>
-      <td><link href="../fo/align2.fo.pdf">align2.fo.pdf</link></td>
-    </tr>
-    <tr>
-      <td>scaling image</td>
-      <td><link href="../fo/size.fo">size.fo</link></td>
-      <td><link href="../fo/size.fo.pdf">size.fo.pdf</link></td>
-    </tr>
-  </table>
-          </section>
-          <section>
-            <title>Instream Foreign Object Examples</title>
-            <p>
-Instream Foreign Object images in FO, there are more on the
-<link href="svg.html">SVG Page</link>:
-            </p>
-  <table>
-    <caption>Embedding instream-foreign-object</caption>
-    <tr>
-      <th>description</th>
-      <th>fo file</th>
-      <th>pdf result</th>
-    </tr>
-    <tr>
-      <td>embedding svg in viewport</td>
-      <td><link href="../fo/embed.fo">embed.fo</link></td>
-      <td><link href="../fo/embed.fo.pdf">embed.fo.pdf</link></td>
-    </tr>
-  </table>
-          </section>
-  </body>
-</document>
-
diff --git a/src/documentation/content/xdocs/examples.xml b/src/documentation/content/xdocs/examples.xml
index e0e6aed0b..323702213 100644
--- a/src/documentation/content/xdocs/examples.xml
+++ b/src/documentation/content/xdocs/examples.xml
@@ -7,6 +7,11 @@
     <title>Examples</title>
   </header>
   <body>
+    <section>
+      <title>Example Documents Using FOP</title>
+      <p>
+        These examples have been rendered using FOP:
+      </p>
     <table>
       <caption>Generated examples</caption>
       <tr>
@@ -20,10 +25,7 @@
         <td><link href="fo/fonts.fo.pdf">fonts.fo.pdf</link></td>
       </tr>
     </table>
-
-    <section>
-      <title>Examples in the distribution</title>
-    <p>Examples for the use of XSL-FO can be found in the FOP distribution in
+    <p>Other basic examples on the use of XSL-FO can be found in the FOP distribution in
        the subdirectory xml-fop/examples/fo. You can start transformation of all fo files into pdf
        files by starting xml-fop/examples/fo/runtests (only source distribution). The resulting test
        files can be found in xml-fop/examples/fo/tests
@@ -57,18 +59,66 @@
       </li>
       <li>readme.fo - uses an old version of FOP documentation for a longer example
       </li>
-
-      <li>Look also into the directory examples/fo/svg. There you find some very extensive SVG examples.
-      </li>
-      <li>In the directory examples/fo/pagination you find a suite of examples showing the use
-          of XSL-FO pagination.
-      </li>
     </ul>
+      <p>Also, in the directory examples/fo/pagination you will find a suite of examples showing the use
+          of XSL-FO pagination.
+      </p>
       <p>
 Developers will find the first steps to a test suite for all implemented
 formatting objects and properties in xml-fop/test/xml/.
       </p>
-    </section>
+	</section>
+          <section>
+            <title>Images Examples</title>
+            <p>
+Embedding images in FO:
+            </p>
+  <table>
+    <caption>Images in FO</caption>
+    <tr>
+      <th>description</th>
+      <th>fo file</th>
+      <th>pdf result</th>
+    </tr>
+    <tr>
+      <td>align in larger viewport</td>
+      <td><link href="fo/align.fo">align.fo</link></td>
+      <td><link href="fo/align.fo.pdf">align.fo.pdf</link></td>
+    </tr>
+    <tr>
+      <td>align in smaller viewport</td>
+      <td><link href="fo/align2.fo">align2.fo</link></td>
+      <td><link href="fo/align2.fo.pdf">align2.fo.pdf</link></td>
+    </tr>
+    <tr>
+      <td>scaling image</td>
+      <td><link href="fo/size.fo">size.fo</link></td>
+      <td><link href="fo/size.fo.pdf">size.fo.pdf</link></td>
+    </tr>
+  </table>
+      <p>Look also into the directory examples/fo/svg. There you find some very extensive SVG examples.
+      </p>
+          </section>
+          <section>
+            <title>Instream Foreign Object Examples</title>
+            <p>
+Instream Foreign Object images in FO, there are more on the
+<link href="svg.html">SVG Page</link>:
+            </p>
+  <table>
+    <caption>Embedding instream-foreign-object</caption>
+    <tr>
+      <th>description</th>
+      <th>fo file</th>
+      <th>pdf result</th>
+    </tr>
+    <tr>
+      <td>embedding svg in viewport</td>
+      <td><link href="fo/embed.fo">embed.fo</link></td>
+      <td><link href="fo/embed.fo.pdf">embed.fo.pdf</link></td>
+    </tr>
+  </table>
+  </section>
   </body>
 </document>
 
diff --git a/src/documentation/sitemap.xmap b/src/documentation/sitemap.xmap
index 3303c65be..8bb9249f5 100644
--- a/src/documentation/sitemap.xmap
+++ b/src/documentation/sitemap.xmap
@@ -571,6 +571,9 @@
    <map:match pattern="fo/*.fo">
     <map:read src="content/xdocs/fo/{1}.fo" mime-type="text/xml"/>
    </map:match>
+   <map:match pattern="fo/*.ent">
+    <map:read src="content/xdocs/fo/{1}.ent" mime-type="text/plain"/>
+   </map:match>
    <map:match pattern="fo/*.fo.pdf">
     <map:generate src="content/xdocs/fo/{1}.fo"/>
     <map:serialize type="fo2pdf"/>
author	Jeremias Maerki <jeremias@apache.org>	2003-05-28 07:42:42 +0000
committer	Jeremias Maerki <jeremias@apache.org>	2003-05-28 07:42:42 +0000
commit	ddc4ee97e4e1252c6fad26d2ed9cb8d389bee0ad (patch)
tree	fee26fe4ef309fb3cbb431bf26ba1ee7f4e61e84
parent	54dfe35e84a29033dd362b07997d66954a59e7cd (diff)
download	xmlgraphics-fop-ddc4ee97e4e1252c6fad26d2ed9cb8d389bee0ad.tar.gz xmlgraphics-fop-ddc4ee97e4e1252c6fad26d2ed9cb8d389bee0ad.zip