adds to script creation of html documentation

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

diff --git a/docs/xml-docs/fop/implemented.xml b/docs/xml-docs/fop/implemented.xml
index c6aa8af7592140c1be4f1c8adf32eec92419a61d..86b0dd8aae77c9d2941975033d3ad154d1e9c77e 100644 (file)
--- a/docs/xml-docs/fop/implemented.xml
+++ b/docs/xml-docs/fop/implemented.xml
@@ -43,6 +43,7 @@
 
     <s3 title="B.3 Inline Formatting Objects">
       <ul>
+        <li>character</li>
         <li>external-graphic</li>
         <li>inline</li>
         <li>instream-foreign-object</li>
@@ -50,18 +51,20 @@
         <li>page-number </li>
         <li>page-number-citation, see <jump href="limitations.html">limitations</jump></li>
       </ul>
-      <p>Not implemented: bidi-override, character, initial-property-set, inline-container</p>
+      <p>Not implemented: bidi-override, initial-property-set, inline-container</p>
     </s3>
 
     <s3 title="B.4 Table Formatting Objects">
       <ul>
-        <li>table (minimal support)</li>
-        <li>table-column (minimal support)</li>
-        <li>table-body (minimal support)</li>
-        <li>table-row (minimal support)</li>
-        <li>table-cell (minimal support)</li>
+        <li>table </li>
+        <li>table-body</li>
+        <li>table-cell</li>
+        <li>table-column</li>
+        <li>table-footer</li>
+        <li>table-header</li>
+        <li>table-row</li>
       </ul>
-      <p>Not implemented: table-and-caption, table-caption, table-header, table-footer </p> 
+      <p>Not implemented: table-and-caption, table-caption </p> 
     </s3>
 
     <s3 title="B.5 List Formatting Objects">
@@ -130,7 +133,10 @@
       <li>bottom</li>
       <li>break-after </li>
       <li>break-before </li>
+      <li>character</li>
       <li>color </li>
+      <li>column-count</li>
+      <li>column-gap</li>
       <li>column-width </li>
       <li>country</li>
       <li>end-indent </li>
@@ -152,7 +158,7 @@
       <li>keep-with-next (broken)</li>
       <li>language</li>
       <li>leader-alignment (not value "page")</li>
-      <li>leader-length (no percentage values)</li>
+      <li>leader-length (see limitations)</li>
       <li>leader-pattern (not value "use-content")</li>
       <li>leader-pattern-width</li>
       <li>left</li>
@@ -163,6 +169,7 @@
       <li>margin-top (only on pages and regions) </li>
       <li>master-name </li>
       <li>maximum-repeats</li>
+      <li>number-columns-spanned</li>
       <li>odd-or-even</li>
       <li>padding (only one value allowed) </li>
       <li>padding-after</li>
@@ -182,11 +189,15 @@
       <li>ref-id </li>
       <li>region-name</li>
       <li>right</li>
+      <li>rule-style</li>
       <li>rule-thickness </li>
       <li>space-after.optimum </li>
       <li>space-before.optimum </li>
+      <li>span</li>
       <li>src </li>
       <li>start-indent </li>
+      <li>table-omit-footer-at-break</li>
+      <li>table-omit-header-at-break</li> 
       <li>text-align </li>
       <li>text-align-last </li>
       <li>textdecoration (only value "underline")</li>

diff --git a/docs/xml-docs/fop/limitations.xml b/docs/xml-docs/fop/limitations.xml
index d293c824d30fb0ce6aa7d4dc13273e29a18abd8d..e56c1a5e4732501efd3ecbeedfa9b1e8168422d9 100644 (file)
--- a/docs/xml-docs/fop/limitations.xml
+++ b/docs/xml-docs/fop/limitations.xml
@@ -9,6 +9,13 @@
      in <jump href="implemented.html">features</jump>, sometimes it does so only in a limited way. 
   </p>
 
+  <s2 title="fo:leader">
+    <p>Only the property leader-length.optimum is used, so for all purposes you can use 
+       "leader-length" instead. leader-length.minimum/maximum should be honored 
+       for line-justification, but this does not happen.
+    </p>
+  </s2>
+
   <s2 title="page-number-citation">
     <p>Only works for table of contents without any problems. The case where the page number doesn't 
     fit on a line isn't handled, and any text on the same line and after the page-number might not 

diff --git a/docs/xml-docs/fop/readme.xml b/docs/xml-docs/fop/readme.xml
index add186b17b1ad53f32d25140a802c63c5793043d..c95748d0b19e220452a4fcd21cfa0e66f28cc821 100644 (file)
--- a/docs/xml-docs/fop/readme.xml
+++ b/docs/xml-docs/fop/readme.xml
@@ -20,7 +20,7 @@
        like XT or Xalan) or can be passed in memory as a DOM Document or (in
        the case of XT) SAX events.
     </p>
-    <p>The latest version of Fop is 0.15 and it supports the xsl:fo candidate release.
+    <p>The latest version of Fop is 0.16 and it supports the xsl:fo candidate release.
        You can <jump href="download.html">download</jump> 
        Fop including a precompiled version, the source code and many example files to 
        get you started. Pointers to introductions into xsl:fo can be found in the
@@ -41,7 +41,7 @@
 
   <s2 title="FOP Objectives">
     <p>The goals of the Apache XML FOP Project are to deliver an XSL FO->PDF formatter that is compliant to at least the Basic
-       conformance level described in the 27 March 2000 XSL WD, and that complies with the 11 March 1999 Portable Document
+       conformance level described in the W3C Candidate Recommendation 21 November 2000, and that complies with the 11 March 1999 Portable Document
        Format Specification (Version 1.3) from Adobe Systems. 
     </p>
 

diff --git a/docs/xml-docs/makedoc.bat b/docs/xml-docs/makedoc.bat
index 5f370ddecaa3a5b182040611f2553192e3e28400..eac7a1ac3c67f046d32b7b96b71a47be3bd1cfce 100755 (executable)
--- a/docs/xml-docs/makedoc.bat
+++ b/docs/xml-docs/makedoc.bat
@@ -1,16 +1,20 @@
+REM creates pdf and html documentation
 @echo off
 
-echo Building Fop documentation (pdf)
+echo Building Fop documentation (pdf,html)
 echo ----------------
 
 if "%JAVA_HOME%" == "" goto error
 
-set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;..\..\lib\ant.jar;..\..\lib\xml.jar;..\..\lib\w3c.jar;..\..\lib;..\..\build\fop.jar
+set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;..\..\lib\ant.jar;..\..\lib\xml.jar;..\..\lib\w3c.jar;..\..\lib;..\..\build\fop.jar;..\..\lib\stylebook.jar
 set ANT_HOME=.\lib
 
 
 %JAVA_HOME%\bin\java.exe -Dant.home=%ANT_HOME% -classpath %LOCALCLASSPATH%;%CLASSPATH% org.apache.tools.ant.Main %1 %2 %3 %4 %5
 
+
+%JAVA_HOME%\bin\java.exe -classpath %LOCALCLASSPATH%;%CLASSPATH% org.apache.stylebook.StyleBook "targetDirectory=../html-docs/" fop.xml style/
+
 goto end
 
 :error
@@ -23,3 +27,5 @@ echo location of the Java Virtual Machine you want to use.
 
 rem set LOCALCLASSPATH=
 
+
+

diff --git a/docs/xml-docs/makedoc.sh b/docs/xml-docs/makedoc.sh
index 340b0eb44a3525995d637842992d374c772ebbcd..92b81317182c9f9a31850da8feaa784a027b2492 100755 (executable)
--- a/docs/xml-docs/makedoc.sh
+++ b/docs/xml-docs/makedoc.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #This file should be executable
 echo
-echo "Converting Fop's xml documentation into a pdf file"
+echo "Converting Fop's xml documentation into a pdf file, creating html docs"
 echo "----------------"
 echo
 
@@ -13,7 +13,7 @@ if [ "$JAVA_HOME" = "" ] ; then
   exit 1
 fi
 
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:../../lib/ant.jar:../../lib/xml.jar:../../lib/w3c.jar:../../lib:../../build/fop.jar
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:../../lib/ant.jar:../../lib/xml.jar:../../lib/w3c.jar:../../lib:../../build/fop.jar:../../lib\stylebook.jar
 ANT_HOME=../../lib
 
 echo Building with classpath $CLASSPATH:$LOCALCLASSPATH
@@ -23,3 +23,5 @@ echo Starting Ant...
 echo
 
 $JAVA_HOME/bin/java -Dant.home=$ANT_HOME -classpath "$LOCALCLASSPATH:$CLASSPATH" org.apache.tools.ant.Main $*
+
+$JAVA_HOME/bin/java -classpath "$LOCALCLASSPATH:$CLASSPATH" org.apache.stylebook.StyleBook "targetDirectory=../html-docs/" fop.xml style/