SF.net SVN: docbook: [7479] trunk/defguide5

[<don...@us...>]

Revision: 7479
          http://docbook.svn.sourceforge.net/docbook/?rev=7479&view=rev
Author:   dongsheng
Date:     2007-09-29 08:47:12 -0700 (Sat, 29 Sep 2007)

Log Message:
-----------
Minor update, add validate task.

Modified Paths:
--------------
    trunk/defguide5/build-common.xml
    trunk/defguide5/build.tmpl.properties
    trunk/defguide5/build.xml
    trunk/defguide5/en/build.xml
    trunk/defguide5/en/refpages/build.xml
    trunk/defguide5/en/stylesheets/fo.xsl

Modified: trunk/defguide5/build-common.xml
===================================================================
--- trunk/defguide5/build-common.xml	2007-09-29 14:13:11 UTC (rev 7478)
+++ trunk/defguide5/build-common.xml	2007-09-29 15:47:12 UTC (rev 7479)
@@ -1,20 +1,30 @@
 <project>
-    <path id="saxon.classpath">
+
+    <path id="lib.classpath">
         <fileset dir="${ant.home}/lib">
-            <include name="saxon*.jar"/>
+            <include name="*.jar"/>
         </fileset>
+        <fileset dir="${fop.home}/lib">
+            <include name="*.jar"/>
+        </fileset>
+        <fileset dir="${fop.home}/build">
+            <include name="**/*.jar"/>
+        </fileset>
     </path>
 
     <path id="check.classpath">
         <fileset dir="${ant.home}/lib">
             <include name="saxon*.jar"/>
         </fileset>
+        <fileset dir="${fop.home}/lib">
+            <include name="saxon*.jar"/>
+        </fileset>
     </path>
 
-    <target name="init-avail" description="Check Saxon 8B, BSF, BeanShell">
+    <target name="init-avail" description="Check Saxon 8, BSF, BeanShell">
         <available property="saxon.present" classname="net.sf.saxon.Transform"
             classpathref="check.classpath"/>
-        <condition property="saxon.message" value="Saxon 8B Support NOT Present !">
+        <condition property="saxon.message" value="Saxon 8 Support NOT Present !">
           <not>
             <equals arg1="${saxon.present}" arg2="true"/>
           </not>

Modified: trunk/defguide5/build.tmpl.properties
===================================================================
--- trunk/defguide5/build.tmpl.properties	2007-09-29 14:13:11 UTC (rev 7478)
+++ trunk/defguide5/build.tmpl.properties	2007-09-29 15:47:12 UTC (rev 7479)
@@ -1,7 +1,9 @@
 #
 # Please create your build.properties file from this template file.
 #
+docbook5.home=C:/wc/svn/i18n-zh/trunk/lib/docbook/docbook5
 docbook5.xsl=C:/wc/svn/i18n-zh/trunk/lib/docbook/docbook5-xsl
-fop.dir=C:/wc/svn/i18n-zh/trunk/lib/fop/1.x
+
+fop.home=C:/wc/svn/i18n-zh/trunk/lib/fop/1.x
 fonts.dir=C:/wc/svn/i18n-zh/trunk/lib/fonts
 fonts.metrics.dir=C:/wc/svn/i18n-zh/trunk/lib/fop/1.x/conf

Modified: trunk/defguide5/build.xml
===================================================================
--- trunk/defguide5/build.xml	2007-09-29 14:13:11 UTC (rev 7478)
+++ trunk/defguide5/build.xml	2007-09-29 15:47:12 UTC (rev 7479)
@@ -54,6 +54,10 @@
         <echo message="basedir: ${basedir}"/>
     </target>
 
+    <target name="usage">
+        <echo message="Use the -projecthelp option instead"/>
+    </target>
+
     <target name="clean">
         <ant dir="en" target="clean"/>
         <ant dir="zh" target="clean"/>

Modified: trunk/defguide5/en/build.xml
===================================================================
--- trunk/defguide5/en/build.xml	2007-09-29 14:13:11 UTC (rev 7478)
+++ trunk/defguide5/en/build.xml	2007-09-29 15:47:12 UTC (rev 7479)
@@ -35,15 +35,12 @@
     <property name="doc.name" value="defguide5-en"/>
 
     <import file="../build-common.xml"/>
+
+    <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask"/>
 
-    <path id="lib.classpath">
-        <fileset dir="${fop.dir}/build">
-            <include name="**/*.jar"/>
-        </fileset>
-        <fileset dir="${fop.dir}/lib">
-            <include name="**/*.jar"/>
-        </fileset>
-    </path>
+    <target name="usage">
+        <echo message="Use the -projecthelp option instead"/>
+    </target>
 
     <target name="clean">
         <delete dir="build"/>
@@ -97,6 +94,12 @@
             <arg value="${basedir}${file.separator}book.xml"/>
         </exec>
     </target>
+
+    <target name="validate" depends="profile">
+        <jing rngfile="${docbook5.home}/rng/docbook.rng">
+            <fileset file="${basedir}${file.separator}build/${doc.name}.xml"/>
+        </jing>
+    </target>
 
     <!-- Total time: 9 minutes 10 seconds -->
     <target name="html" depends="profile">
@@ -122,9 +125,9 @@
             <arg value="${basedir}${file.separator}build${file.separator}${doc.name}.xml"/>
         </exec -->
 
-        <java classname="net.sf.saxon.Transform" fork="true"
+        <java classname="com.icl.saxon.StyleSheet" fork="true"
                  failonerror="true" dir="${basedir}" maxmemory="512m">
-            <classpath refid="saxon.classpath"/>
+            <classpath refid="lib.classpath"/>
             <arg value="-o"/>
             <arg value="${basedir}${file.separator}build/${file.separator}pdf${file.separator}${doc.name}.fo"/>
             <arg value="${basedir}${file.separator}build${file.separator}${doc.name}.xml"/>

Modified: trunk/defguide5/en/refpages/build.xml
===================================================================
--- trunk/defguide5/en/refpages/build.xml	2007-09-29 14:13:11 UTC (rev 7478)
+++ trunk/defguide5/en/refpages/build.xml	2007-09-29 15:47:12 UTC (rev 7479)
@@ -4,6 +4,10 @@
     <property file="../../build.properties"/>
     <import file="../../build-common.xml"/>
 
+    <target name="usage">
+        <echo message="Use the -projecthelp option instead"/>
+    </target>
+
     <target name="clean">
         <delete dir="elements/build"/>
     </target>
@@ -121,12 +125,14 @@
         </exec>
 
         <!--
+        saxon65(com.icl.saxon.StyleSheet) fail, must use saxon8 !
         java -jar saxonb89.jar -o db.acronym.xml \
             db.acronym.xml.xi ../../../stylesheets/refentry.xsl
+
         -->
         <java classname="net.sf.saxon.Transform" fork="true"
                 dir="${basedir}${file.separator}elements${file.separator}build" maxmemory="512m">
-            <classpath refid="saxon.classpath"/>
+            <classpath refid="lib.classpath"/>
             <arg value="-o"/>
             <arg value="${file.db}"/>
             <arg value="${file.db}.xi"/>

Modified: trunk/defguide5/en/stylesheets/fo.xsl
===================================================================
--- trunk/defguide5/en/stylesheets/fo.xsl	2007-09-29 14:13:11 UTC (rev 7478)
+++ trunk/defguide5/en/stylesheets/fo.xsl	2007-09-29 15:47:12 UTC (rev 7479)
@@ -8,7 +8,8 @@
 
   <!-- These extensions are required for table printing and other stuff -->
   <xsl:param name="use.extensions">1</xsl:param>
-  <xsl:param name="tablecolumns.extension">0</xsl:param>
+  <xsl:param name="tablecolumns.extension">1</xsl:param>
+  <xsl:param name="callouts.extension">1</xsl:param>
   <xsl:param name="fop.extensions">0</xsl:param>
   <xsl:param name="fop1.extensions">1</xsl:param>
 
@@ -20,11 +21,6 @@
   <xsl:param name="admon.graphics.path">images/</xsl:param>
   <xsl:param name="admon.graphics.extension">.png</xsl:param>
   <xsl:param name="section.autolabel" select="1" />
-  <xsl:attribute-set name="sidebar.properties" use-attribute-sets="formal.object.properties">
-    <xsl:attribute name="border-style">solid</xsl:attribute>
-    <xsl:attribute name="border-width">.1mm</xsl:attribute>
-    <xsl:attribute name="background-color">#EEEEEE</xsl:attribute>
-  </xsl:attribute-set>
 
   <!-- Prevent blank pages in output -->
   <xsl:template name="book.titlepage.before.verso">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.