some minor updates, no longer need ant optional

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

diff --git a/docs/design/README b/docs/design/README
index b419caf2ade5981da5df35eac31f01f8e5863056..8d7b4e99536df49eddfa8c74280a7b009f329c41 100644 (file)
--- a/docs/design/README
+++ b/docs/design/README
@@ -2,10 +2,14 @@ These documents are written for docbook
 http://sourceforge.net/projects/docbook
 
 To convert to pdf:
-- place the docbook files in a directory name "docbook"
+- place the docbook files in a directory named "docbook"
+download and unzip the docbook distribution into the
+directory <cvs>/docs/design/dockbook/
+
 - place docbookx package in a directory name "docbookx"
 the files are avaialable here:
 http://www.oasis-open.org/docbook/xml/4.1.2/index.shtml
 
+
 - run the build script
 

diff --git a/docs/design/areas.xml b/docs/design/areas.xml
index 201fb6035a78937eecfa1251173b9c015af34d30..a58a2eaf90b1b6bef4f9e8726f326cfa43e4efce 100644 (file)
--- a/docs/design/areas.xml
+++ b/docs/design/areas.xml
@@ -7,7 +7,10 @@ defined in the specification. A number of optimisations may be possible
 for similar areas and groups of areas.
   </para>
   <para>
-
+Since the area tree will be used during the layout by the layout managers
+it will need to store information that affects the layout. The information
+such as spacing and keeps will be held in such a way that it can be
+discarded once the layout is finalised.
   </para>
 
 </section>

diff --git a/docs/design/build.sh b/docs/design/build.sh
index 3222894f1bf092f3190c527ddf3af9d5885f85e2..ff55ede596c482e37359496bb491a35dd3cbd725 100644 (file)
--- a/docs/design/build.sh
+++ b/docs/design/build.sh
@@ -1,9 +1,10 @@
 #! /bin/sh
 # $Id$
 
-LIBDIR=../../lib  
+LIBDIR=../../lib
 TARGET_CLASSPATH=$LIBDIR/ant.jar:\
 $LIBDIR/buildtools.jar:\
+$LIBDIR/xalan-2.0.0.jar:\
 $LIBDIR/xalan-1.2.2.jar:\
 $LIBDIR/xerces-1.2.3.jar:\
 $LIBDIR/bsf.jar:\
@@ -11,7 +12,6 @@ $LIBDIR/bsf.jar:\
 $LIBDIR/logkit-1.0b4.jar:\
 $LIBDIR/avalon-framework-4.0.jar:\
 $LIBDIR/batik.jar:\
-$LIBDIR/optional.jar:\
 $LIBDIR/jimi-1.0.jar:
 
 if [ "$JAVA_HOME" != "" ] ; then
@@ -19,5 +19,5 @@ if [ "$JAVA_HOME" != "" ] ; then
 else
    echo "Error: The JAVA_HOME environment variable is not set."
 fi
-            
-java -classpath $TARGET_CLASSPATH -Djboss.home=$JBOSS_HOME org.apache.tools.ant.Main $*
+
+java -classpath $TARGET_CLASSPATH org.apache.tools.ant.Main $*

diff --git a/docs/design/build.xml b/docs/design/build.xml
index 999e7bfb6770c38d920fba368bfec8abe8910656..ad17b53b9ab642255ea8ead7dfd780bbfe27e132 100644 (file)
--- a/docs/design/build.xml
+++ b/docs/design/build.xml
@@ -12,6 +12,7 @@
        
                <property name="lib.dir" value="${basedir}/lib"/>
 
+      <taskdef name="xslt" classname="org.apache.fop.tools.anttasks.Xslt"/>
       <taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop"/>
     </target>
   
@@ -42,11 +43,16 @@
   <target name="pdf" depends="prepare">
     <echo message="Building pdf documentation. Please wait ..."/>
     <delete file="fop.fo"/>
+    <xslt infile="fop.xml" xsltfile="docbook/fo/docbook.xsl"
+        dependent="fop.xml"
+        outfile="fop.fo" smart="yes"/>
+<!--
     <style basedir="./" 
            destdir="./" 
            style="docbook/fo/docbook.xsl" 
            extension=".fo" 
            includes="fop.xml"/>
+-->
     <fop fofile="fop.fo" pdffile="fop.pdf"/>
 <!--    <delete file="fop.fo"/>-->
   </target>

diff --git a/docs/design/fop.xml b/docs/design/fop.xml
index 0b6d9bfbdcb2c189067fbfd0937970f53c99e84a..1b7b48496a147b0291296590d054150039e7dd7b 100644 (file)
--- a/docs/design/fop.xml
+++ b/docs/design/fop.xml
@@ -23,7 +23,7 @@
   <title>Areas</title>
 &areas.xml;
 </chapter>
-<chapter id="areas">
+<chapter id="optimise">
   <title>Optimising</title>
 &optimise.xml;
 </chapter>

diff --git a/docs/design/optimise.xml b/docs/design/optimise.xml
index 29148143684155c75a51901f591b2233de54163e..273bf6b010ea62baf08b05ba3048a50b09fe5871 100644 (file)
--- a/docs/design/optimise.xml
+++ b/docs/design/optimise.xml
@@ -1,5 +1,5 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
-<section id="optimise">
+<section id="optimisations">
  <title>Process Optimisations</title>
        <para>
 FOP should be able to handle very large documents. A document can be
@@ -30,7 +30,7 @@ as minimal as possible.
   <para>
 Line areas can be optimised once the layout for the line has
 been finalised. Consecutive characters with the same properties
-can be combined into a "word" to hold the infomration with
+can be combined into a "word" to hold the information with
 limited overhead.
   </para>
 

diff --git a/docs/design/useragent.xml b/docs/design/useragent.xml
index 5900e97dba53e44993edf84b5b1d2bcd67c28103..ad24e6e73e4050ee948fbecbfd9bc9c7694deb2a 100644 (file)
--- a/docs/design/useragent.xml
+++ b/docs/design/useragent.xml
@@ -13,6 +13,10 @@ rendering the document.
 The user agent must be available to the layout processor and
 the renderer. Users can supply their own user agent or use
 the default one for a particular renderer.
+  </para>
+  <para>
+The user agent needs to be made available to the property
+resolution layout process and the renderer.
        </para>
 
   <para>
@@ -35,7 +39,7 @@ title, used to identify a set of pages (in a page sequence)
        </para></listitem>
        <listitem><para>
 the width (in inline-progression-dimension) of a character with
-trea-word-as-space true
+treat-word-as-space true
        </para></listitem>
        <listitem><para>
 maximum space used by conditional areas from region-reference-area