From: <ko...@us...> - 2014-08-15 17:21:27
|
Revision: 9929 http://sourceforge.net/p/docbook/code/9929 Author: kosek Date: 2014-08-15 17:21:18 +0000 (Fri, 15 Aug 2014) Log Message: ----------- Extensions and other builds ported to Ant Modified Paths: -------------- trunk/xsl/build.xml trunk/xsl/tools/build-shared.xml trunk/xsl/tools/lib/xercesImpl.jar trunk/xsl/tools/lib/xml-apis.jar Added Paths: ----------- trunk/xsl/eclipse/build.xml trunk/xsl/extensions/build.xml trunk/xsl/htmlhelp/build.xml trunk/xsl/javahelp/build.xml trunk/xsl/tools/lib/xalan.jar trunk/xsl/website/build.xml Modified: trunk/xsl/build.xml =================================================================== --- trunk/xsl/build.xml 2014-08-15 15:27:47 UTC (rev 9928) +++ trunk/xsl/build.xml 2014-08-15 17:21:18 UTC (rev 9929) @@ -1,6 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="DocBook XSLT 1.0 stylesheets" default="all"> + <!-- + This is an attempt to rewrite build process in Ant. + This is still work in progress. + + If you want to build extensions, you must start Ant with property specifying path to your JDK, for example: + + ant -Dplatform.home=c:\jdk1.6 + + --> + <property name="dbroot.dir" value="${ant.file}/.."/> <import file="tools/build-shared.xml"/> @@ -8,15 +18,14 @@ <target name="build"> <ant dir="common"/> - <ant dir="lib"/> <ant dir="html"/> <ant dir="fo"/> <ant dir="manpages"/> <ant dir="htmlhelp"/> <ant dir="javahelp"/> <ant dir="eclipse"/> - <ant dir="roundtrip"/> - <ant dir="slides"/> + <!-- FIXME: <ant dir="roundtrip"/> --> + <!-- FIXME: <ant dir="slides"/> --> <ant dir="website"/> <ant dir="extensions"/> <ant dir="xhtml"/> @@ -28,7 +37,6 @@ <target name="clean"> <ant dir="common" target="clean"/> - <ant dir="lib" target="clean"/> <ant dir="html" target="clean"/> <ant dir="fo" target="clean"/> <ant dir="manpages" target="clean"/> Added: trunk/xsl/eclipse/build.xml =================================================================== --- trunk/xsl/eclipse/build.xml (rev 0) +++ trunk/xsl/eclipse/build.xml 2014-08-15 17:21:18 UTC (rev 9929) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="DocBook XSLT 1.0 stylesheets - Eclipse" default="all"> + + <property name="dbroot.dir" value="${ant.file}/../.."/> + <import file="../tools/build-shared.xml"/> + + <target name="all" depends="profile"> + </target> + + <target name="profile"> + <echo>Building profiling version of Eclipse stylesheet...</echo> + <xslt in="eclipse.xsl" out="profile-eclipse.xsl" style="../profiling/xsl2profile.xsl"> + <factory name="com.icl.saxon.TransformerFactoryImpl"/> + <classpath refid="saxon.classpath"/> + </xslt> + </target> + + <target name="clean"> + <delete> + <fileset dir="."> + <!-- FIXME --> + </fileset> + </delete> + </target> + +</project> Added: trunk/xsl/extensions/build.xml =================================================================== --- trunk/xsl/extensions/build.xml (rev 0) +++ trunk/xsl/extensions/build.xml 2014-08-15 17:21:18 UTC (rev 9929) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="DocBook XSLT 1.0 stylesheets - Extensions" default="all"> + + <property name="dbroot.dir" value="${ant.file}/../.."/> + <import file="../tools/build-shared.xml"/> + + <target name="all" depends="copy"> + </target> + + <target name="copy" depends="build"> + <echo>Copying extensions...</echo> + <copy todir="." flatten="true"> + <fileset dir="../.."> + <include name="xsl-saxon/saxon65.jar"/> + <include name="xsl-xalan/xalan27.jar"/> + <include name="xsl-webhelpindexer/webhelpindexer.jar"/> + <include name="xsl-webhelpindexer/lib/*.jar"/> + <include name="xsl-libxslt/python/xslt.py"/> + <include name="xsl-libxslt/python/python.py"/> + <include name="xsl-libxslt/python/README.LIBXSLT"/> + </fileset> + </copy> + </target> + + <target name="build"> + <ant dir="../../xsl-saxon"> + <property name="file.reference.saxon.jar" value="${saxon.jar}"/> + </ant> + <ant dir="../../xsl-xalan"> + <property name="file.reference.xalan.jar" value="${xalan.jar}"/> + </ant> + <ant dir="../../xsl-webhelpindexer"/> + </target> + + <target name="clean"> + <delete> + <fileset dir="."> + <!-- FIXME --> + </fileset> + </delete> + </target> + +</project> Added: trunk/xsl/htmlhelp/build.xml =================================================================== --- trunk/xsl/htmlhelp/build.xml (rev 0) +++ trunk/xsl/htmlhelp/build.xml 2014-08-15 17:21:18 UTC (rev 9929) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="DocBook XSLT 1.0 stylesheets - HTML Help" default="all"> + + <property name="dbroot.dir" value="${ant.file}/../.."/> + <import file="../tools/build-shared.xml"/> + + <target name="all" depends="profile"> + </target> + + <target name="profile"> + <echo>Building profiling version of HTML Help stylesheet...</echo> + <xslt in="htmlhelp-common.xsl" out="profile-htmlhelp-common.xsl" style="../profiling/xsl2profile.xsl"> + <factory name="com.icl.saxon.TransformerFactoryImpl"/> + <classpath refid="saxon.classpath"/> + </xslt> + </target> + + <target name="clean"> + <delete> + <fileset dir="."> + <!-- FIXME --> + </fileset> + </delete> + </target> + +</project> Added: trunk/xsl/javahelp/build.xml =================================================================== --- trunk/xsl/javahelp/build.xml (rev 0) +++ trunk/xsl/javahelp/build.xml 2014-08-15 17:21:18 UTC (rev 9929) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="DocBook XSLT 1.0 stylesheets - JavaHelp" default="all"> + + <property name="dbroot.dir" value="${ant.file}/../.."/> + <import file="../tools/build-shared.xml"/> + + <target name="all" depends="profile"> + </target> + + <target name="profile"> + <echo>Building profiling version of JavaHelp stylesheet...</echo> + <xslt in="javahelp.xsl" out="profile-javahelp.xsl" style="../profiling/xsl2profile.xsl"> + <factory name="com.icl.saxon.TransformerFactoryImpl"/> + <classpath refid="saxon.classpath"/> + </xslt> + </target> + + <target name="clean"> + <delete> + <fileset dir="."> + <!-- FIXME --> + </fileset> + </delete> + </target> + +</project> Modified: trunk/xsl/tools/build-shared.xml =================================================================== --- trunk/xsl/tools/build-shared.xml 2014-08-15 15:27:47 UTC (rev 9928) +++ trunk/xsl/tools/build-shared.xml 2014-08-15 17:21:18 UTC (rev 9929) @@ -5,6 +5,7 @@ <property name="libs" value="${dbroot.dir}/tools/lib"/> <property name="saxon9.jar" value="${libs}/saxon9he.jar"/> <property name="saxon.jar" value="${libs}/saxon.jar"/> + <property name="xalan.jar" value="${libs}/xalan.jar"/> <property name="xerces.jar" value="${libs}/xercesImpl.jar"/> <property name="saxon-ant.jar" value="${libs}/saxon9-ant.jar"/> <property name="jing.jar" value="${libs}/jing.jar"/> Added: trunk/xsl/tools/lib/xalan.jar =================================================================== (Binary files differ) Index: trunk/xsl/tools/lib/xalan.jar =================================================================== --- trunk/xsl/tools/lib/xalan.jar 2014-08-15 15:27:47 UTC (rev 9928) +++ trunk/xsl/tools/lib/xalan.jar 2014-08-15 17:21:18 UTC (rev 9929) Property changes on: trunk/xsl/tools/lib/xalan.jar ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/xsl/tools/lib/xercesImpl.jar =================================================================== (Binary files differ) Modified: trunk/xsl/tools/lib/xml-apis.jar =================================================================== (Binary files differ) Added: trunk/xsl/website/build.xml =================================================================== --- trunk/xsl/website/build.xml (rev 0) +++ trunk/xsl/website/build.xml 2014-08-15 17:21:18 UTC (rev 9929) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="DocBook XSLT 1.0 stylesheets - Website" default="all"> + + <property name="dbroot.dir" value="${ant.file}/../.."/> + <import file="../tools/build-shared.xml"/> + + <target name="all" depends="param"> + </target> + + <target name="param"> + <echo>Building Website parameters...</echo> + <antcall target="build-params"> + <param name="condition" value="website"/> + </antcall> + </target> + + <target name="clean"> + <delete> + <fileset dir="."> + <!-- FIXME --> + </fileset> + </delete> + </target> + +</project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2014-08-15 17:55:36
|
Revision: 9930 http://sourceforge.net/p/docbook/code/9930 Author: kosek Date: 2014-08-15 17:55:33 +0000 (Fri, 15 Aug 2014) Log Message: ----------- More build files added Modified Paths: -------------- trunk/xsl/build.xml Added Paths: ----------- trunk/xsl/epub3/build.xml trunk/xsl/xhtml/build.xml trunk/xsl/xhtml-1_1/build.xml trunk/xsl/xhtml5/build.xml Modified: trunk/xsl/build.xml =================================================================== --- trunk/xsl/build.xml 2014-08-15 17:21:18 UTC (rev 9929) +++ trunk/xsl/build.xml 2014-08-15 17:55:33 UTC (rev 9930) @@ -30,7 +30,7 @@ <ant dir="extensions"/> <ant dir="xhtml"/> <ant dir="xhtml-1_1"/> - <ant dir="webhelp"/> + <!-- <ant dir="webhelp"/> --> <!-- Webhelp is excluded as it builds only demo document not files needed for runtime --> <ant dir="xhtml5"/> <ant dir="epub3"/> </target> Added: trunk/xsl/epub3/build.xml =================================================================== --- trunk/xsl/epub3/build.xml (rev 0) +++ trunk/xsl/epub3/build.xml 2014-08-15 17:55:33 UTC (rev 9930) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="DocBook XSLT 1.0 stylesheets - EPUB3" default="all"> + + <property name="dbroot.dir" value="${ant.file}/../.."/> + <import file="../tools/build-shared.xml"/> + + <target name="all" depends="titlepage"> + </target> + + <target name="titlepage"> + <echo>Building EPUB3 titlepage...</echo> + <xslt in="titlepage.templates.xml" out="titlepage.templates.xsl" style="../template/titlepage.xsl"> + <factory name="com.icl.saxon.TransformerFactoryImpl"/> + <classpath refid="saxon.classpath"/> + </xslt> + </target> + + <target name="clean"> + <delete> + <fileset dir="."> + <!-- FIXME --> + </fileset> + </delete> + </target> + +</project> Added: trunk/xsl/xhtml/build.xml =================================================================== --- trunk/xsl/xhtml/build.xml (rev 0) +++ trunk/xsl/xhtml/build.xml 2014-08-15 17:55:33 UTC (rev 9930) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="DocBook XSLT 1.0 stylesheets - XHTML" default="all"> + + <property name="dbroot.dir" value="${ant.file}/../.."/> + <import file="../tools/build-shared.xml"/> + + <target name="all" depends="html2xhtml"> + </target> + + <target name="html2xhtml"> + <echo>Building XHTML stylesheets from HTML ones...</echo> + <xslt style="html2xhtml.xsl" destdir="." basedir="../html"> + <factory name="com.icl.saxon.TransformerFactoryImpl"/> + <classpath refid="saxon.classpath"/> + <include name="*.xsl"/> + <mapper type="flatten"/> + </xslt> + <copy file="../html/docbook.css.xml" todir="."/> + <xslt in="../html/docbook.xsl" out="docbook-no-doctype.xsl" style="html2xhtml.xsl"> + <factory name="com.icl.saxon.TransformerFactoryImpl"/> + <classpath refid="saxon.classpath"/> + <include name="*.xsl"/> + <mapper type="flatten"/> + <param name="include.output.doctype" expression="0"/> + </xslt> + + </target> + + <target name="clean"> + <delete> + <fileset dir="."> + <include name="*.xsl"/> + <include name="docbook.css.xml"/> + <exclude name="html2xhtml.xsl"/> + </fileset> + </delete> + </target> + +</project> Added: trunk/xsl/xhtml-1_1/build.xml =================================================================== --- trunk/xsl/xhtml-1_1/build.xml (rev 0) +++ trunk/xsl/xhtml-1_1/build.xml 2014-08-15 17:55:33 UTC (rev 9930) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="DocBook XSLT 1.0 stylesheets - XHTML" default="all"> + + <property name="dbroot.dir" value="${ant.file}/../.."/> + <import file="../tools/build-shared.xml"/> + + <target name="all" depends="html2xhtml"> + </target> + + <target name="html2xhtml"> + <echo>Building XHTML 1.1 stylesheets from HTML ones...</echo> + <xslt style="html2xhtml.xsl" destdir="." basedir="../html"> + <factory name="com.icl.saxon.TransformerFactoryImpl"/> + <classpath refid="saxon.classpath"/> + <include name="*.xsl"/> + <mapper type="flatten"/> + </xslt> + <copy file="../html/docbook.css.xml" todir="."/> + <xslt in="../html/docbook.xsl" out="docbook-no-doctype.xsl" style="html2xhtml.xsl"> + <factory name="com.icl.saxon.TransformerFactoryImpl"/> + <classpath refid="saxon.classpath"/> + <include name="*.xsl"/> + <mapper type="flatten"/> + <param name="include.output.doctype" expression="0"/> + </xslt> + + </target> + + <target name="clean"> + <delete> + <fileset dir="."> + <include name="*.xsl"/> + <include name="docbook.css.xml"/> + <exclude name="html2xhtml.xsl"/> + </fileset> + </delete> + </target> + +</project> Added: trunk/xsl/xhtml5/build.xml =================================================================== --- trunk/xsl/xhtml5/build.xml (rev 0) +++ trunk/xsl/xhtml5/build.xml 2014-08-15 17:55:33 UTC (rev 9930) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="DocBook XSLT 1.0 stylesheets - HTML5" default="all"> + + <property name="dbroot.dir" value="${ant.file}/../.."/> + <import file="../tools/build-shared.xml"/> + + <target name="all" depends="html5"> + </target> + + <target name="html5"> + <echo>Building HTML5 stylesheet...</echo> + <xslt in="../xhtml/docbook.xsl" out="xhtml-docbook.xsl" style="xhtml2xhtml5.xsl"> + <factory name="com.icl.saxon.TransformerFactoryImpl"/> + <classpath refid="saxon.classpath"/> + </xslt> + </target> + + <target name="clean"> + <delete> + <fileset dir="."> + <!-- FIXME --> + </fileset> + </delete> + </target> + +</project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2014-08-15 18:16:10
|
Revision: 9932 http://sourceforge.net/p/docbook/code/9932 Author: kosek Date: 2014-08-15 18:16:07 +0000 (Fri, 15 Aug 2014) Log Message: ----------- Added clean targets Modified Paths: -------------- trunk/xsl/build.xml trunk/xsl/eclipse/build.xml trunk/xsl/epub3/build.xml trunk/xsl/extensions/build.xml trunk/xsl/html/build.xml trunk/xsl/htmlhelp/build.xml trunk/xsl/javahelp/build.xml trunk/xsl/manpages/build.xml trunk/xsl/tools/build-shared.xml trunk/xsl/website/build.xml trunk/xsl/xhtml5/build.xml Modified: trunk/xsl/build.xml =================================================================== --- trunk/xsl/build.xml 2014-08-15 18:08:02 UTC (rev 9931) +++ trunk/xsl/build.xml 2014-08-15 18:16:07 UTC (rev 9932) @@ -18,6 +18,7 @@ <target name="build"> <ant dir="common"/> + <!-- FIXME: lib, should be generated using xweb --> <ant dir="html"/> <ant dir="fo"/> <ant dir="manpages"/> @@ -43,13 +44,13 @@ <ant dir="htmlhelp" target="clean"/> <ant dir="javahelp" target="clean"/> <ant dir="eclipse" target="clean"/> - <ant dir="roundtrip" target="clean"/> - <ant dir="slides" target="clean"/> + <!-- <ant dir="roundtrip" target="clean"/> --> + <!-- <ant dir="slides" target="clean"/> --> <ant dir="website" target="clean"/> <ant dir="extensions" target="clean"/> <ant dir="xhtml" target="clean"/> <ant dir="xhtml-1_1" target="clean"/> - <ant dir="webhelp" target="clean"/> + <!-- <ant dir="webhelp" target="clean"/> --> <ant dir="xhtml5" target="clean"/> <ant dir="epub3" target="clean"/> </target> Modified: trunk/xsl/eclipse/build.xml =================================================================== --- trunk/xsl/eclipse/build.xml 2014-08-15 18:08:02 UTC (rev 9931) +++ trunk/xsl/eclipse/build.xml 2014-08-15 18:16:07 UTC (rev 9932) @@ -18,7 +18,7 @@ <target name="clean"> <delete> <fileset dir="."> - <!-- FIXME --> + <include name="profile-eclipse.xsl"/> </fileset> </delete> </target> Modified: trunk/xsl/epub3/build.xml =================================================================== --- trunk/xsl/epub3/build.xml 2014-08-15 18:08:02 UTC (rev 9931) +++ trunk/xsl/epub3/build.xml 2014-08-15 18:16:07 UTC (rev 9932) @@ -18,7 +18,7 @@ <target name="clean"> <delete> <fileset dir="."> - <!-- FIXME --> + <include name="titlepage.templates.xsl"/> </fileset> </delete> </target> Modified: trunk/xsl/extensions/build.xml =================================================================== --- trunk/xsl/extensions/build.xml 2014-08-15 18:08:02 UTC (rev 9931) +++ trunk/xsl/extensions/build.xml 2014-08-15 18:16:07 UTC (rev 9932) @@ -35,7 +35,13 @@ <target name="clean"> <delete> <fileset dir="."> - <!-- FIXME --> + <include name="saxon65.jar"/> + <include name="xalan27.jar"/> + <include name="webhelpindexer.jar"/> + <include name="*.jar"/> + <include name="xslt.py"/> + <include name="python.py"/> + <include name="README.LIBXSLT"/> </fileset> </delete> </target> Modified: trunk/xsl/html/build.xml =================================================================== --- trunk/xsl/html/build.xml 2014-08-15 18:08:02 UTC (rev 9931) +++ trunk/xsl/html/build.xml 2014-08-15 18:16:07 UTC (rev 9932) @@ -33,9 +33,11 @@ <target name="clean"> <delete> <fileset dir="."> - <!-- FIXME --> + <include name="profile-docbook.xsl"/> + <include name="titlepage.templates.xsl"/> </fileset> </delete> + <antcall target="clean-params"/> </target> </project> Modified: trunk/xsl/htmlhelp/build.xml =================================================================== --- trunk/xsl/htmlhelp/build.xml 2014-08-15 18:08:02 UTC (rev 9931) +++ trunk/xsl/htmlhelp/build.xml 2014-08-15 18:16:07 UTC (rev 9932) @@ -18,7 +18,7 @@ <target name="clean"> <delete> <fileset dir="."> - <!-- FIXME --> + <include name="profile-htmlhelp-common.xsl"/> </fileset> </delete> </target> Modified: trunk/xsl/javahelp/build.xml =================================================================== --- trunk/xsl/javahelp/build.xml 2014-08-15 18:08:02 UTC (rev 9931) +++ trunk/xsl/javahelp/build.xml 2014-08-15 18:16:07 UTC (rev 9932) @@ -18,7 +18,7 @@ <target name="clean"> <delete> <fileset dir="."> - <!-- FIXME --> + <include name="profile-javahelp.xsl"/> </fileset> </delete> </target> Modified: trunk/xsl/manpages/build.xml =================================================================== --- trunk/xsl/manpages/build.xml 2014-08-15 18:08:02 UTC (rev 9931) +++ trunk/xsl/manpages/build.xml 2014-08-15 18:16:07 UTC (rev 9932) @@ -33,9 +33,11 @@ <target name="clean"> <delete> <fileset dir="."> - <!-- FIXME --> + <include name="profile-docbook.xsl"/> + <include name="html-synop.xsl"/> </fileset> </delete> + <antcall target="clean-params"/> </target> </project> Modified: trunk/xsl/tools/build-shared.xml =================================================================== --- trunk/xsl/tools/build-shared.xml 2014-08-15 18:08:02 UTC (rev 9931) +++ trunk/xsl/tools/build-shared.xml 2014-08-15 18:16:07 UTC (rev 9932) @@ -69,7 +69,18 @@ <factory name="com.icl.saxon.TransformerFactoryImpl"/> <classpath refid="saxon.classpath"/> </xslt> - <!-- FIXME: remove temporary files --> </target> + <target name="clean-params"> + <delete> + <fileset dir="."> + <include name=".param.profiled"/> + <include name=".param.stripped"/> + <include name=".param.dbkns"/> + <include name="param.xsl.tmp"/> + <include name="param.xsl"/> + </fileset> + </delete> + </target> + </project> Modified: trunk/xsl/website/build.xml =================================================================== --- trunk/xsl/website/build.xml 2014-08-15 18:08:02 UTC (rev 9931) +++ trunk/xsl/website/build.xml 2014-08-15 18:16:07 UTC (rev 9932) @@ -15,11 +15,7 @@ </target> <target name="clean"> - <delete> - <fileset dir="."> - <!-- FIXME --> - </fileset> - </delete> + <antcall target="clean-params"/> </target> </project> Modified: trunk/xsl/xhtml5/build.xml =================================================================== --- trunk/xsl/xhtml5/build.xml 2014-08-15 18:08:02 UTC (rev 9931) +++ trunk/xsl/xhtml5/build.xml 2014-08-15 18:16:07 UTC (rev 9932) @@ -18,7 +18,7 @@ <target name="clean"> <delete> <fileset dir="."> - <!-- FIXME --> + <include name="xhtml-docbook.xsl"/> </fileset> </delete> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2014-08-15 18:43:06
|
Revision: 9933 http://sourceforge.net/p/docbook/code/9933 Author: kosek Date: 2014-08-15 18:42:58 +0000 (Fri, 15 Aug 2014) Log Message: ----------- Added lib ant build support Modified Paths: -------------- trunk/xsl/build.xml trunk/xsl/tools/build-shared.xml Added Paths: ----------- trunk/xsl/lib/build.xml Modified: trunk/xsl/build.xml =================================================================== --- trunk/xsl/build.xml 2014-08-15 18:16:07 UTC (rev 9932) +++ trunk/xsl/build.xml 2014-08-15 18:42:58 UTC (rev 9933) @@ -18,7 +18,7 @@ <target name="build"> <ant dir="common"/> - <!-- FIXME: lib, should be generated using xweb --> + <ant dir="lib"/> <ant dir="html"/> <ant dir="fo"/> <ant dir="manpages"/> @@ -38,6 +38,7 @@ <target name="clean"> <ant dir="common" target="clean"/> + <ant dir="lib" target="clean"/> <ant dir="html" target="clean"/> <ant dir="fo" target="clean"/> <ant dir="manpages" target="clean"/> Added: trunk/xsl/lib/build.xml =================================================================== --- trunk/xsl/lib/build.xml (rev 0) +++ trunk/xsl/lib/build.xml 2014-08-15 18:42:58 UTC (rev 9933) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="DocBook XSLT 1.0 stylesheets - HTML" default="all"> + + <property name="dbroot.dir" value="${ant.file}/../.."/> + <import file="../tools/build-shared.xml"/> + + <target name="all" depends="lib"> + </target> + + <target name="lib"> + <echo>Building XSLT library...</echo> + <antcall target="build-params"> + <param name="condition" value="lib"/> + <param name="file" value="lib"/> + </antcall> + </target> + + <target name="clean"> + <antcall target="clean-params"> + <param name="file" value="lib"/> + </antcall> + </target> + +</project> Modified: trunk/xsl/tools/build-shared.xml =================================================================== --- trunk/xsl/tools/build-shared.xml 2014-08-15 18:16:07 UTC (rev 9932) +++ trunk/xsl/tools/build-shared.xml 2014-08-15 18:42:58 UTC (rev 9933) @@ -46,39 +46,41 @@ </taskdef> <target name="build-params"> + <property name="file" value="param"/> <!-- FIXME parameter checking --> - <xslt in="param.xweb" out=".param.profiled" style="../profiling/profile.xsl"> + <xslt in="${file}.xweb" out=".${file}.profiled" style="../profiling/profile.xsl"> <factory name="com.icl.saxon.TransformerFactoryImpl"/> <classpath refid="saxon.classpath"/> <param name="profile.condition" expression="${condition}"/> </xslt> - <xslt in=".param.profiled" out=".param.stripped" style="../profiling/strip-attributes.xsl"> + <xslt in=".${file}.profiled" out=".${file}.stripped" style="../profiling/strip-attributes.xsl"> <factory name="com.icl.saxon.TransformerFactoryImpl"/> <classpath refid="saxon.classpath"/> <param name="attributes" expression="condition"/> </xslt> - <xslt in=".param.stripped" out=".param.dbkns" style="../../releasetools/xtangle.xsl"> + <xslt in=".${file}.stripped" out=".${file}.dbkns" style="../../releasetools/xtangle.xsl"> <factory name="com.icl.saxon.TransformerFactoryImpl"/> <classpath refid="saxon.classpath"/> </xslt> - <xslt in=".param.dbkns" out="param.xsl.tmp" style="../tools/xsl/build/fix-params-ns.xsl"> + <xslt in=".${file}.dbkns" out="${file}.xsl.tmp" style="../tools/xsl/build/fix-params-ns.xsl"> <factory name="com.icl.saxon.TransformerFactoryImpl"/> <classpath refid="saxon.classpath"/> </xslt> - <xslt in="param.xsl.tmp" out="param.xsl" style="../tools/xsl/build/addnewline.xsl"> + <xslt in="${file}.xsl.tmp" out="${file}.xsl" style="../tools/xsl/build/addnewline.xsl"> <factory name="com.icl.saxon.TransformerFactoryImpl"/> <classpath refid="saxon.classpath"/> </xslt> </target> <target name="clean-params"> + <property name="file" value="param"/> <delete> <fileset dir="."> - <include name=".param.profiled"/> - <include name=".param.stripped"/> - <include name=".param.dbkns"/> - <include name="param.xsl.tmp"/> - <include name="param.xsl"/> + <include name=".${file}.profiled"/> + <include name=".${file}.stripped"/> + <include name=".${file}.dbkns"/> + <include name="${file}.xsl.tmp"/> + <include name="${file}.xsl"/> </fileset> </delete> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tom...@us...> - 2015-02-09 16:19:33
|
Revision: 9960 http://sourceforge.net/p/docbook/code/9960 Author: tom_schr Date: 2015-02-09 16:19:25 +0000 (Mon, 09 Feb 2015) Log Message: ----------- Added missing support for outputformat attribute * Added missing parameter profile.outputformat in params/profile.outputformat.xml * Added missing lines to check for outputformat attribute in profiling/profile-mode.xsl Modified Paths: -------------- trunk/xsl/profiling/profile-mode.xsl Added Paths: ----------- trunk/xsl/params/profile.outputformat.xml Copied: trunk/xsl/params/profile.outputformat.xml (from rev 9959, trunk/xsl/params/profile.os.xml) =================================================================== --- trunk/xsl/params/profile.outputformat.xml (rev 0) +++ trunk/xsl/params/profile.outputformat.xml 2015-02-09 16:19:25 UTC (rev 9960) @@ -0,0 +1,38 @@ +<refentry xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version="5.0" xml:id="profile.outputformat"> +<refmeta> +<refentrytitle>profile.outputformat</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">string</refmiscinfo> +</refmeta> +<refnamediv> + <refname>profile.outputformat</refname> + <refpurpose>Target profile for <tag class="attribute" + >outputformat</tag> attribute</refpurpose> + </refnamediv> + +<refsynopsisdiv> +<src:fragment xml:id="profile.outputformat.frag"> +<xsl:param name="profile.outputformat"></xsl:param> +</src:fragment> +</refsynopsisdiv> + +<refsection><info><title>Description</title></info> + +<para>The value of this parameter specifies profiles which should be +included in the output. You can specify multiple profiles by +separating them by semicolon. You can change separator character by +<parameter>profile.separator</parameter> +parameter.</para> + +<para>This parameter has effect only when you are using profiling +stylesheets (<filename>profile-docbook.xsl</filename>, +<filename>profile-chunk.xsl</filename>, …) instead of normal +ones (<filename>docbook.xsl</filename>, +<filename>chunk.xsl</filename>, …).</para> + +</refsection> +</refentry> Modified: trunk/xsl/profiling/profile-mode.xsl =================================================================== --- trunk/xsl/profiling/profile-mode.xsl 2015-01-08 18:10:23 UTC (rev 9959) +++ trunk/xsl/profiling/profile-mode.xsl 2015-02-09 16:19:25 UTC (rev 9960) @@ -81,6 +81,17 @@ <xsl:variable name="os.ok" select="not(@os) or not($profile.os) or $os.content != '' or @os = ''"/> + <xsl:variable name="outputformat.content"> + <xsl:if test="@outputformat"> + <xsl:call-template name="cross.compare"> + <xsl:with-param name="a" select="$profile.outputformat"/> + <xsl:with-param name="b" select="@outputformat"/> + </xsl:call-template> + </xsl:if> + </xsl:variable> + <xsl:variable name="outputformat.ok" select="not(@outputformat) or not($profile.outputformat) or + $outputformat.content != '' or @outputformat = ''"/> + <xsl:variable name="revision.content"> <xsl:if test="@revision"> <xsl:call-template name="cross.compare"> @@ -190,6 +201,7 @@ $conformance.ok and $lang.ok and $os.ok and + $outputformat.ok and $revision.ok and $revisionflag.ok and $role.ok and This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2015-05-20 18:37:45
|
Revision: 9963 http://sourceforge.net/p/docbook/code/9963 Author: bobstayton Date: 2015-05-20 18:37:42 +0000 (Wed, 20 May 2015) Log Message: ----------- Fix bug #13598 inline.monoseq and other inline.*seq handle links incorrectly. Modified Paths: -------------- trunk/xsl/fo/inline.xsl trunk/xsl/html/inline.xsl Modified: trunk/xsl/fo/inline.xsl =================================================================== --- trunk/xsl/fo/inline.xsl 2015-04-30 17:35:04 UTC (rev 9962) +++ trunk/xsl/fo/inline.xsl 2015-05-20 18:37:42 UTC (rev 9963) @@ -173,10 +173,12 @@ <xsl:template name="inline.sansseq"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> </xsl:param> @@ -190,11 +192,11 @@ <xsl:otherwise>rtl</xsl:otherwise> </xsl:choose> </xsl:attribute> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </fo:inline> </xsl:when> <xsl:otherwise> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </xsl:otherwise> </xsl:choose> </fo:inline> @@ -202,10 +204,12 @@ <xsl:template name="inline.charseq"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> </xsl:param> @@ -218,24 +222,27 @@ <xsl:otherwise>rtl</xsl:otherwise> </xsl:choose> </xsl:attribute> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </fo:inline> </xsl:when> <xsl:otherwise> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </xsl:otherwise> </xsl:choose> </xsl:template> <xsl:template name="inline.monoseq"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> </xsl:param> + <fo:inline xsl:use-attribute-sets="monospace.properties"> <xsl:call-template name="anchor"/> <xsl:if test="@dir"> @@ -246,16 +253,18 @@ </xsl:choose> </xsl:attribute> </xsl:if> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </fo:inline> </xsl:template> <xsl:template name="inline.boldseq"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> </xsl:param> @@ -268,16 +277,18 @@ </xsl:choose> </xsl:attribute> </xsl:if> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </fo:inline> </xsl:template> <xsl:template name="inline.italicseq"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> </xsl:param> @@ -291,16 +302,18 @@ </xsl:choose> </xsl:attribute> </xsl:if> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </fo:inline> </xsl:template> <xsl:template name="inline.boldmonoseq"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> </xsl:param> @@ -314,16 +327,18 @@ </xsl:choose> </xsl:attribute> </xsl:if> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </fo:inline> </xsl:template> <xsl:template name="inline.italicmonoseq"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> </xsl:param> @@ -337,16 +352,18 @@ </xsl:choose> </xsl:attribute> </xsl:if> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </fo:inline> </xsl:template> <xsl:template name="inline.superscriptseq"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> </xsl:param> @@ -368,16 +385,18 @@ <xsl:attribute name="baseline-shift">super</xsl:attribute> </xsl:otherwise> </xsl:choose> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </fo:inline> </xsl:template> <xsl:template name="inline.subscriptseq"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> </xsl:param> @@ -399,7 +418,7 @@ <xsl:attribute name="baseline-shift">sub</xsl:attribute> </xsl:otherwise> </xsl:choose> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </fo:inline> </xsl:template> Modified: trunk/xsl/html/inline.xsl =================================================================== --- trunk/xsl/html/inline.xsl 2015-04-30 17:35:04 UTC (rev 9962) +++ trunk/xsl/html/inline.xsl 2015-05-20 18:37:42 UTC (rev 9963) @@ -239,13 +239,16 @@ <xsl:template name="inline.charseq"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="anchor"/> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> </xsl:param> + <!-- * if you want output from the inline.charseq template wrapped in --> <!-- * something other than a Span, call the template with some value --> <!-- * for the 'wrapper-name' param --> @@ -254,35 +257,40 @@ <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="id.attribute"/> <xsl:call-template name="generate.html.title"/> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> <xsl:call-template name="apply-annotations"/> </xsl:element> </xsl:template> <xsl:template name="inline.monoseq"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="anchor"/> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> </xsl:param> + <code> <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:call-template name="id.attribute"/> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> <xsl:call-template name="apply-annotations"/> </code> </xsl:template> <xsl:template name="inline.boldseq"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="anchor"/> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> </xsl:param> @@ -296,11 +304,11 @@ and (local-name(../..) = 'figure' or local-name(../..) = 'example' or local-name(../..) = 'table')"> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </xsl:when> <xsl:otherwise> <strong> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </strong> </xsl:otherwise> </xsl:choose> @@ -310,30 +318,36 @@ <xsl:template name="inline.italicseq"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="anchor"/> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> </xsl:param> + <em> <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="id.attribute"/> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> <xsl:call-template name="apply-annotations"/> </em> </xsl:template> <xsl:template name="inline.boldmonoseq"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="anchor"/> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> </xsl:param> + <!-- don't put <strong> inside figure, example, or table titles --> <!-- or other titles that may already be represented with <strong>'s. --> <xsl:choose> @@ -345,7 +359,7 @@ <code> <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="id.attribute"/> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> <xsl:call-template name="apply-annotations"/> </code> </xsl:when> @@ -356,7 +370,7 @@ <code> <xsl:call-template name="generate.html.title"/> <xsl:call-template name="dir"/> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </code> <xsl:call-template name="apply-annotations"/> </strong> @@ -366,20 +380,23 @@ <xsl:template name="inline.italicmonoseq"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="anchor"/> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> </xsl:param> + <em> <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="id.attribute"/> <code> <xsl:call-template name="generate.html.title"/> <xsl:call-template name="dir"/> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> <xsl:call-template name="apply-annotations"/> </code> </em> @@ -387,36 +404,42 @@ <xsl:template name="inline.superscriptseq"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="anchor"/> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> </xsl:param> + <sup> <xsl:call-template name="generate.html.title"/> <xsl:call-template name="id.attribute"/> <xsl:call-template name="dir"/> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> <xsl:call-template name="apply-annotations"/> </sup> </xsl:template> <xsl:template name="inline.subscriptseq"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="anchor"/> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> </xsl:param> + <sub> <xsl:call-template name="generate.html.title"/> <xsl:call-template name="id.attribute"/> <xsl:call-template name="dir"/> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> <xsl:call-template name="apply-annotations"/> </sub> </xsl:template> @@ -426,11 +449,13 @@ <xsl:template match="author"> <xsl:param name="content"> + <xsl:call-template name="person.name"/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="anchor"/> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:call-template name="person.name"/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> <xsl:call-template name="apply-annotations"/> </xsl:param> @@ -438,17 +463,19 @@ <span> <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="id.attribute"/> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </span> </xsl:template> <xsl:template match="editor"> <xsl:param name="content"> + <xsl:call-template name="person.name"/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="anchor"/> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:call-template name="person.name"/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> <xsl:call-template name="apply-annotations"/> </xsl:param> @@ -456,17 +483,19 @@ <span> <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="id.attribute"/> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </span> </xsl:template> <xsl:template match="othercredit"> <xsl:param name="content"> + <xsl:call-template name="person.name"/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="anchor"/> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:call-template name="person.name"/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> <xsl:call-template name="apply-annotations"/> </xsl:param> @@ -474,7 +503,7 @@ <span> <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="id.attribute"/> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </span> </xsl:template> @@ -1435,11 +1464,13 @@ <xsl:template match="person"> <xsl:param name="content"> + <xsl:apply-templates select="personname"/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="anchor"/> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates select="personname"/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> <xsl:call-template name="apply-annotations"/> </xsl:param> @@ -1447,17 +1478,19 @@ <span> <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:call-template name="id.attribute"/> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </span> </xsl:template> <xsl:template match="personname"> <xsl:param name="content"> + <xsl:call-template name="person.name"/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="anchor"/> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:call-template name="person.name"/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> <xsl:call-template name="apply-annotations"/> </xsl:param> @@ -1465,7 +1498,7 @@ <span> <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:call-template name="id.attribute"/> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </span> </xsl:template> @@ -1473,11 +1506,13 @@ <xsl:template match="org"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="anchor"/> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> <xsl:call-template name="apply-annotations"/> </xsl:param> @@ -1485,17 +1520,19 @@ <span> <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:call-template name="id.attribute"/> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </span> </xsl:template> <xsl:template match="orgname"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="anchor"/> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> <xsl:call-template name="apply-annotations"/> </xsl:param> @@ -1503,17 +1540,19 @@ <span> <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:call-template name="id.attribute"/> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </span> </xsl:template> <xsl:template match="orgdiv"> <xsl:param name="content"> + <xsl:apply-templates/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="anchor"/> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> <xsl:call-template name="apply-annotations"/> </xsl:param> @@ -1521,17 +1560,19 @@ <span> <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:call-template name="id.attribute"/> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </span> </xsl:template> <xsl:template match="affiliation"> <xsl:param name="content"> + <xsl:call-template name="person.name"/> + </xsl:param> + + <xsl:param name="contentwithlink"> <xsl:call-template name="anchor"/> <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:call-template name="person.name"/> - </xsl:with-param> + <xsl:with-param name="content" select="$content"/> </xsl:call-template> <xsl:call-template name="apply-annotations"/> </xsl:param> @@ -1539,7 +1580,7 @@ <span> <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:call-template name="id.attribute"/> - <xsl:copy-of select="$content"/> + <xsl:copy-of select="$contentwithlink"/> </span> </xsl:template> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2015-11-20 17:21:30
|
Revision: 10006 http://sourceforge.net/p/docbook/code/10006 Author: bobstayton Date: 2015-11-20 17:21:28 +0000 (Fri, 20 Nov 2015) Log Message: ----------- UPdate to 1.79.1 Modified Paths: -------------- trunk/xsl/VERSION trunk/xsl/VERSION.xsl Modified: trunk/xsl/VERSION =================================================================== (Binary files differ) Modified: trunk/xsl/VERSION.xsl =================================================================== --- trunk/xsl/VERSION.xsl 2015-11-02 19:49:12 UTC (rev 10005) +++ trunk/xsl/VERSION.xsl 2015-11-20 17:21:28 UTC (rev 10006) @@ -26,7 +26,7 @@ <fm:Branch>XSL Stylesheets</fm:Branch> <!-- * set/keep fm:version as N.NN.N-pre except for official releases, --> <!-- * then after the release, revert it to N.NN.N-pre & check back in --> - <fm:Version>1.78.1</fm:Version> + <fm:Version>1.79.1</fm:Version> <!-- <fm:License>MIT/X Consortium License</fm:License> --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |