You can subscribe to this list here.
2001 |
Jan
|
Feb
|
Mar
|
Apr
(221) |
May
(84) |
Jun
(162) |
Jul
(129) |
Aug
(1371) |
Sep
(108) |
Oct
(108) |
Nov
(235) |
Dec
(368) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2002 |
Jan
(120) |
Feb
(61) |
Mar
(349) |
Apr
(45) |
May
(209) |
Jun
(572) |
Jul
(186) |
Aug
(47) |
Sep
(183) |
Oct
(98) |
Nov
(67) |
Dec
(138) |
2003 |
Jan
(275) |
Feb
(73) |
Mar
(117) |
Apr
(85) |
May
(60) |
Jun
(84) |
Jul
(66) |
Aug
(67) |
Sep
(79) |
Oct
(20) |
Nov
(35) |
Dec
(557) |
2004 |
Jan
(90) |
Feb
(33) |
Mar
(61) |
Apr
(38) |
May
(80) |
Jun
(51) |
Jul
(34) |
Aug
(80) |
Sep
(72) |
Oct
(102) |
Nov
(122) |
Dec
(841) |
2005 |
Jan
(515) |
Feb
(78) |
Mar
(75) |
Apr
(661) |
May
(248) |
Jun
(152) |
Jul
(533) |
Aug
(21) |
Sep
(51) |
Oct
(455) |
Nov
(99) |
Dec
(37) |
2006 |
Jan
(42) |
Feb
(231) |
Mar
(260) |
Apr
(233) |
May
(106) |
Jun
|
Jul
(34) |
Aug
(109) |
Sep
(109) |
Oct
(54) |
Nov
(54) |
Dec
(11) |
2007 |
Jan
(116) |
Feb
(89) |
Mar
(105) |
Apr
(34) |
May
(22) |
Jun
(96) |
Jul
(243) |
Aug
(247) |
Sep
(74) |
Oct
(63) |
Nov
(31) |
Dec
(52) |
2008 |
Jan
(23) |
Feb
(98) |
Mar
(205) |
Apr
(40) |
May
(16) |
Jun
(20) |
Jul
(24) |
Aug
(19) |
Sep
(15) |
Oct
(14) |
Nov
(26) |
Dec
(29) |
2009 |
Jan
(5) |
Feb
(42) |
Mar
(114) |
Apr
(31) |
May
(29) |
Jun
(10) |
Jul
(44) |
Aug
(7) |
Sep
(1) |
Oct
(9) |
Nov
(7) |
Dec
(25) |
2010 |
Jan
(18) |
Feb
(7) |
Mar
(17) |
Apr
(9) |
May
(20) |
Jun
(32) |
Jul
(119) |
Aug
(105) |
Sep
(11) |
Oct
(21) |
Nov
(8) |
Dec
(13) |
2011 |
Jan
(14) |
Feb
(1) |
Mar
(17) |
Apr
(17) |
May
(6) |
Jun
(6) |
Jul
(9) |
Aug
(17) |
Sep
(54) |
Oct
(40) |
Nov
(23) |
Dec
(7) |
2012 |
Jan
(50) |
Feb
(15) |
Mar
(27) |
Apr
(46) |
May
(60) |
Jun
(57) |
Jul
(63) |
Aug
(71) |
Sep
(21) |
Oct
(51) |
Nov
(11) |
Dec
(31) |
2013 |
Jan
(19) |
Feb
(5) |
Mar
(11) |
Apr
(17) |
May
(26) |
Jun
(3) |
Jul
|
Aug
(11) |
Sep
(24) |
Oct
(10) |
Nov
(4) |
Dec
(3) |
2014 |
Jan
(41) |
Feb
(36) |
Mar
(2) |
Apr
(1) |
May
(4) |
Jun
|
Jul
(4) |
Aug
(15) |
Sep
(8) |
Oct
(3) |
Nov
(2) |
Dec
(7) |
2015 |
Jan
(2) |
Feb
(1) |
Mar
|
Apr
(2) |
May
(1) |
Jun
(2) |
Jul
(13) |
Aug
(2) |
Sep
(14) |
Oct
(10) |
Nov
(2) |
Dec
(4) |
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: <ko...@us...> - 2015-01-08 18:10:26
|
Revision: 9959 http://sourceforge.net/p/docbook/code/9959 Author: kosek Date: 2015-01-08 18:10:23 +0000 (Thu, 08 Jan 2015) Log Message: ----------- Updated before publication Modified Paths: -------------- trunk/docbook/relaxng/docbook/transclusion/transclusion.xml Modified: trunk/docbook/relaxng/docbook/transclusion/transclusion.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/transclusion.xml 2015-01-08 14:04:25 UTC (rev 9958) +++ trunk/docbook/relaxng/docbook/transclusion/transclusion.xml 2015-01-08 18:10:23 UTC (rev 9959) @@ -10,7 +10,7 @@ <email>ji...@ko...</email> </author> </authorgroup> - <pubdate>2014-12-XX</pubdate> + <pubdate>2015-01-08</pubdate> <pubdate>2011-04-20</pubdate> <pubdate>2010-12-09</pubdate> </info> @@ -78,17 +78,16 @@ </variablelist> </section> -<section> +<section xml:id="processing"> <title>Transclusion processing</title> -<para>The processing model for transclusion is simple: +<para>The processing model for transclusion is simple and cosists of the following steps:</para> <orderedlist> - <listitem><para>Normal XInclude 1.1 processing on the input document</para></listitem> + <listitem><para>Normal XInclude 1.1 processing on the input document.</para></listitem> <listitem><para>DocBook transclusion processing on the result to fix problems such as - duplicate IDs and broken cross-references</para></listitem> - <listitem><para>Normal processing on the resulting document using the DocBook stylesheets or equivalent tools</para></listitem> + duplicate IDs and broken cross-references.</para></listitem> + <listitem><para>Normal processing on the resulting document using the DocBook stylesheets or equivalent tools.</para></listitem> </orderedlist> -</para> <para>Transclusion processing is controlled by attributes from the <uri>http://docbook.org/ns/transclusion</uri> @@ -105,7 +104,7 @@ defined for each node in the document as follows:</para> <variablelist> -<varlistentry> +<varlistentry xml:id="suffix"> <term>suffix</term> <listitem> <itemizedlist spacing="compact"> @@ -120,7 +119,7 @@ </listitem> </varlistentry> -<varlistentry> +<varlistentry xml:id="linkscope"> <term>linkscope</term> <listitem> <itemizedlist spacing="compact"> @@ -184,7 +183,7 @@ <para>Transclusion properties can be set on any element using the following attributes:</para> <variablelist> -<varlistentry> +<varlistentry xml:id="idfixup-attribute"> <term><tag class="attribute">trans:idfixup</tag> attribute</term> <listitem> <variablelist> @@ -212,7 +211,7 @@ </listitem> </varlistentry> -<varlistentry> +<varlistentry xml:id="suffix-attribute"> <term><tag class="attribute">trans:suffix</tag> attribute</term> <listitem> <para>This attribute defines the value of the <property>suffix</property> property used when <code>trans:idfixup="suffix"</code>.</para> @@ -220,7 +219,7 @@ </listitem> </varlistentry> -<varlistentry> +<varlistentry xml:id="linkscope-attribute"> <term><tag class="attribute">trans:linkscope</tag> attribute</term> <listitem> <para>Sets the value of the <property>linkscope</property> property. @@ -259,7 +258,7 @@ </section> -<appendix> +<appendix xml:id="using-xinclude"> <title>Using XInclude 1.1 features for your content</title> <para>The most common transclusion scenario is reuse of shared strings @@ -333,7 +332,7 @@ </appendix> -<appendix> +<appendix xml:id="tutorial"> <title>Special ID/IDREF processing</title> <para>Transcluded content can contain <tag @@ -472,7 +471,7 @@ </appendix> -<appendix> +<appendix xml:id="schema"> <title>DocBook schema with support for transclusions</title> <para>TBD</para> @@ -485,7 +484,7 @@ </appendix> -<appendix> +<appendix xml:id="transclusion-processor"> <title>Sample transclusion processor written in XSLT 2.0</title> <para>Please note that this sample transclusion processor is not yet @@ -497,7 +496,7 @@ </appendix> -<bibliography> +<bibliography xml:id="bibliography"> <!-- <bibliomixed xml:id="XI11"><title>XML Inclusions (XInclude) Version 1.1</title>. W3C Candidate Recommendation. 8 October 2013. Available at <link @@ -505,10 +504,10 @@ --> <bibliomixed xml:id="XI11"> <title>XML Inclusions (XInclude) Version 1.1</title>. - W3C Working Draft. - <pubdate>26 November 2014.</pubdate> + W3C Last Call Working Draft. + <pubdate>16 December 2014.</pubdate> <bibliosource>Available at <link -xlink:href="http://www.w3.org/XML/2012/08/xinclude-11/"/></bibliosource>.</bibliomixed> +xlink:href="http://www.w3.org/TR/2014/WD-xinclude-11-20141216/"/></bibliosource>.</bibliomixed> </bibliography> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2015-01-08 14:04:36
|
Revision: 9958 http://sourceforge.net/p/docbook/code/9958 Author: kosek Date: 2015-01-08 14:04:25 +0000 (Thu, 08 Jan 2015) Log Message: ----------- Applied copy-edit from Dick Modified Paths: -------------- trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.011.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.012.xml trunk/docbook/relaxng/docbook/transclusion/src/book.012.xml.out trunk/docbook/relaxng/docbook/transclusion/src/procedure.001.xml trunk/docbook/relaxng/docbook/transclusion/src/procedure.002.xml trunk/docbook/relaxng/docbook/transclusion/transclusion.xml Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml 2014-12-23 20:20:36 UTC (rev 9957) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml 2015-01-08 14:04:25 UTC (rev 9958) @@ -10,13 +10,13 @@ </chapter> <chapter> <title>Quick installation guide</title> - <para>Carefully follow all procedures bellow.</para> + <para>Carefully follow all procedures below.</para> <xi:include href="procedure.001.xml" trans:idfixup="auto"/> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> + <para>If the green led is blinking, please add missing paper using the following procedure.</para> <xi:include href="procedure.001.xml" trans:idfixup="auto"/> </chapter> </book> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml.out 2014-12-23 20:20:36 UTC (rev 9957) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml.out 2015-01-08 14:04:25 UTC (rev 9958) @@ -7,16 +7,16 @@ </chapter> <chapter> <title>Quick installation guide</title> - <para>Carefully follow all procedures bellow.</para> + <para>Carefully follow all procedures below.</para> <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e23"> <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. - If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <para>This procedure is for printer owners. + If you don't have a printer, consider <link linkend="buy">buying one</link>.</para> <step xml:id="s1---d1e23"> <para>Make sure that you have paper.</para> </step> <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e23"/> + <para>Insert paper into printer. If you don't have paper, consult <xref linkend="s1---d1e23"/> </para> </step> </procedure> @@ -24,16 +24,16 @@ <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> + <para>If the green led is blinking, please add missing paper using the following procedure.</para> <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e56"> <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. - If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <para>This procedure is for printer owners. + If you don't have a printer, consider <link linkend="buy">buying one</link>.</para> <step xml:id="s1---d1e56"> <para>Make sure that you have paper.</para> </step> <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e56"/> + <para>Insert paper into printer. If you don't have paper, consult <xref linkend="s1---d1e56"/> </para> </step> </procedure> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml 2014-12-23 20:20:36 UTC (rev 9957) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml 2015-01-08 14:04:25 UTC (rev 9958) @@ -10,13 +10,13 @@ </chapter> <chapter> <title>Quick installation guide</title> - <para>Carefully follow all procedures bellow.</para> + <para>Carefully follow all procedures below.</para> <xi:include href="procedure.001.xml" trans:idfixup="auto"/> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> + <para>If green led is blinking, please add paper using the following procedure.</para> <xi:include href="procedure.001.xml" trans:idfixup="auto" trans:linkscope="global"/> </chapter> </book> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml.out 2014-12-23 20:20:36 UTC (rev 9957) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml.out 2015-01-08 14:04:25 UTC (rev 9958) @@ -7,16 +7,16 @@ </chapter> <chapter> <title>Quick installation guide</title> - <para>Carefully follow all procedures bellow.</para> + <para>Carefully follow all procedures below.</para> <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e23"> <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. - If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <para>This procedure is for printer owners. + If you don't have a printer, consider <link linkend="buy">buying one</link>.</para> <step xml:id="s1---d1e23"> <para>Make sure that you have paper.</para> </step> <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e23"/> + <para>Insert paper into printer. If you don't have paper, consult <xref linkend="s1---d1e23"/> </para> </step> </procedure> @@ -24,16 +24,16 @@ <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> + <para>If green led is blinking, please add paper using the following procedure.</para> <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e56"> <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. - If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <para>This procedure is for printer owners. + If you don't have a printer, consider <link linkend="buy">buying one</link>.</para> <step xml:id="s1---d1e56"> <para>Make sure that you have paper.</para> </step> <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e23"/> + <para>Insert paper into printer. If you don't have paper, consult <xref linkend="s1---d1e23"/> </para> </step> </procedure> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml 2014-12-23 20:20:36 UTC (rev 9957) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml 2015-01-08 14:04:25 UTC (rev 9958) @@ -10,13 +10,13 @@ </chapter> <chapter> <title>Quick installation guide</title> - <para>Carefully follow all procedures bellow.</para> + <para>Carefully follow all procedures below.</para> <xi:include href="procedure.001.xml" trans:idfixup="auto" trans:linkscope="local"/> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> + <para>If the green led is blinking, please add paper using the following procedure.</para> <xi:include href="procedure.001.xml" trans:idfixup="auto"/> </chapter> </book> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml.out 2014-12-23 20:20:36 UTC (rev 9957) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml.out 2015-01-08 14:04:25 UTC (rev 9958) @@ -7,16 +7,16 @@ </chapter> <chapter> <title>Quick installation guide</title> - <para>Carefully follow all procedures bellow.</para> + <para>Carefully follow all procedures below.</para> <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e23"> <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. - If you don't have printer, consider <link linkend="buy---d1e23">buying one</link>.</para> + <para>This procedure is for printer owners. + If you don't have a printer, consider <link linkend="buy---d1e23">buying one</link>.</para> <step xml:id="s1---d1e23"> <para>Make sure that you have paper.</para> </step> <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e23"/> + <para>Insert paper into printer. If you don't have paper, consult <xref linkend="s1---d1e23"/> </para> </step> </procedure> @@ -24,16 +24,16 @@ <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> + <para>If the green led is blinking, please add paper using the following procedure.</para> <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e56"> <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. - If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <para>This procedure is for printer owners. + If you don't have a printer, consider <link linkend="buy">buying one</link>.</para> <step xml:id="s1---d1e56"> <para>Make sure that you have paper.</para> </step> <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e56"/> + <para>Insert paper into printer. If you don't have paper, consult <xref linkend="s1---d1e56"/> </para> </step> </procedure> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml 2014-12-23 20:20:36 UTC (rev 9957) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml 2015-01-08 14:04:25 UTC (rev 9958) @@ -10,13 +10,13 @@ </chapter> <chapter> <title>Quick installation guide</title> - <para>Carefully follow all procedures bellow.</para> + <para>Carefully follow all procedures below.</para> <xi:include href="procedure.001.xml" trans:idfixup="suffix" trans:suffix="_install-proc"/> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> + <para>If the green led is blinking, please add paper using the following procedure.</para> <xi:include href="procedure.001.xml" trans:idfixup="suffix" trans:suffix="_maintain-proc"/> </chapter> </book> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml.out 2014-12-23 20:20:36 UTC (rev 9957) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml.out 2015-01-08 14:04:25 UTC (rev 9958) @@ -7,16 +7,16 @@ </chapter> <chapter> <title>Quick installation guide</title> - <para>Carefully follow all procedures bellow.</para> + <para>Carefully follow all procedures below.</para> <procedure xml:base="procedure.001.xml" xml:id="paper-insert_install-proc"> <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. - If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <para>This procedure is for printer owners. + If you don't have a printer, consider <link linkend="buy">buying one</link>.</para> <step xml:id="s1_install-proc"> <para>Make sure that you have paper.</para> </step> <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1_install-proc"/> + <para>Insert paper into printer. If you don't have paper, consult <xref linkend="s1_install-proc"/> </para> </step> </procedure> @@ -24,16 +24,16 @@ <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> + <para>If the green led is blinking, please add paper using the following procedure.</para> <procedure xml:base="procedure.001.xml" xml:id="paper-insert_maintain-proc"> <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. - If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <para>This procedure is for printer owners. + If you don't have a printer, consider <link linkend="buy">buying one</link>.</para> <step xml:id="s1_maintain-proc"> <para>Make sure that you have paper.</para> </step> <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1_maintain-proc"/> + <para>Insert paper into printer. If you don't have paper, consult <xref linkend="s1_maintain-proc"/> </para> </step> </procedure> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml.out 2014-12-23 20:20:36 UTC (rev 9957) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml.out 2015-01-08 14:04:25 UTC (rev 9958) @@ -10,13 +10,13 @@ <para>Carefully follow all procedures bellow.</para> <procedure xml:base="procedure.001.xml" xml:id="paper-insert"> <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. - If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <para>This procedure is for printer owners. + If you don't have a printer, consider <link linkend="buy">buying one</link>.</para> <step xml:id="s1"> <para>Make sure that you have paper.</para> </step> <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1"/> + <para>Insert paper into printer. If you don't have paper, consult <xref linkend="s1"/> </para> </step> </procedure> @@ -27,13 +27,13 @@ <para>If green led is blinking, please add missing paper using the following procedure.</para> <procedure xml:base="procedure.001.xml" xml:id="paper-insert"> <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. - If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <para>This procedure is for printer owners. + If you don't have a printer, consider <link linkend="buy">buying one</link>.</para> <step xml:id="s1"> <para>Make sure that you have paper.</para> </step> <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1"/> + <para>Insert paper into printer. If you don't have paper, consult <xref linkend="s1"/> </para> </step> </procedure> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.011.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.011.xml.out 2014-12-23 20:20:36 UTC (rev 9957) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.011.xml.out 2015-01-08 14:04:25 UTC (rev 9958) @@ -11,13 +11,13 @@ <para>Carefully follow all procedures bellow.</para> <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e29"> <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. - If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <para>This procedure is for printer owners. + If you don't have a printer, consider <link linkend="buy">buying one</link>.</para> <step xml:id="s1---d1e29"> <para>Make sure that you have paper.</para> </step> <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e29"/> + <para>Insert paper into printer. If you don't have paper, consult <xref linkend="s1---d1e29"/> </para> </step> </procedure> @@ -28,13 +28,13 @@ <para>If green led is blinking, please add missing paper using the following procedure.</para> <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e62"> <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. - If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <para>This procedure is for printer owners. + If you don't have a printer, consider <link linkend="buy">buying one</link>.</para> <step xml:id="s1---d1e62"> <para>Make sure that you have paper.</para> </step> <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e62"/> + <para>Insert paper into printer. If you don't have paper, consult <xref linkend="s1---d1e62"/> </para> </step> </procedure> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.012.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.012.xml 2014-12-23 20:20:36 UTC (rev 9957) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.012.xml 2015-01-08 14:04:25 UTC (rev 9958) @@ -11,7 +11,7 @@ <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> + <para>If the green led is blinking, please add paper using the following procedure.</para> <xi:include href="procedure.002.xml" trans:idfixup="suffix" trans:suffix="_procedure002"/> </chapter> </book> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.012.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.012.xml.out 2014-12-23 20:20:36 UTC (rev 9957) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.012.xml.out 2015-01-08 14:04:25 UTC (rev 9958) @@ -8,16 +8,16 @@ <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> + <para>If the green led is blinking, please add paper using the following procedure.</para> <procedure xml:base="procedure.002.xml" xml:id="paper-insert_procedure002"> <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. - If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <para>This procedure is for printer owners. + If you don't have a printer, consider <link linkend="buy">buying one</link>.</para> <step xml:id="s1_procedure002"> <para>Make sure that you have paper.</para> </step> <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1_procedure002"/> + <para>Insert paper into printer. If you don't have paper, consult <xref linkend="s1_procedure002"/> </para> </step> <step> Modified: trunk/docbook/relaxng/docbook/transclusion/src/procedure.001.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/procedure.001.xml 2014-12-23 20:20:36 UTC (rev 9957) +++ trunk/docbook/relaxng/docbook/transclusion/src/procedure.001.xml 2015-01-08 14:04:25 UTC (rev 9958) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <procedure xmlns="http://docbook.org/ns/docbook" xml:id="paper-insert"> <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. - If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <para>This procedure is for printer owners. + If you don't have a printer, consider <link linkend="buy">buying one</link>.</para> <step xml:id="s1"><para>Make sure that you have paper.</para></step> - <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1"/></para></step> + <step><para>Insert paper into printer. If you don't have paper, consult <xref linkend="s1"/></para></step> </procedure> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/procedure.002.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/procedure.002.xml 2014-12-23 20:20:36 UTC (rev 9957) +++ trunk/docbook/relaxng/docbook/transclusion/src/procedure.002.xml 2015-01-08 14:04:25 UTC (rev 9958) @@ -3,10 +3,10 @@ xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:trans="http://docbook.org/ns/transclude"> <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. - If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <para>This procedure is for printer owners. + If you don't have a printer, consider <link linkend="buy">buying one</link>.</para> <step xml:id="s1"><para>Make sure that you have paper.</para></step> - <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1"/></para></step> + <step><para>Insert paper into printer. If you don't have paper, consult <xref linkend="s1"/></para></step> <step> <xi:include href="note.001.xml" trans:idfixup="suffix" trans:suffix="_note001"/> </step> Modified: trunk/docbook/relaxng/docbook/transclusion/transclusion.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/transclusion.xml 2014-12-23 20:20:36 UTC (rev 9957) +++ trunk/docbook/relaxng/docbook/transclusion/transclusion.xml 2015-01-08 14:04:25 UTC (rev 9958) @@ -24,32 +24,31 @@ <section xml:id="intro"> <title>Introduction</title> -<para>This document describes syntax, semantics and processing model -of DocBook transclusion mechanism. Please be aware that this is a +<para>This document describes the syntax, semantics, and processing model +for the DocBook transclusion mechanism. Please be aware that this is a working draft – everything described below might change or disappear -completely. This proposal tries to resolve <citetitle +completely. This proposal addresses the issues described in <citetitle xlink:href="http://docbook.org/docs/transclusion-requirements/">Requirements -for transclusion in DocBook</citetitle>. DocBook TC welcomes any +for transclusion in DocBook</citetitle>. The DocBook TC welcomes feedback on this draft, especially from users and developers of DocBook authoring and processing tools. Please direct your comments to -DocBook mailing list by sending email to +the DocBook mailing list by sending email to <email>do...@li...</email>.</para> <note> -<para>Previous version of this draft proposed new elements +<para>Previous version of this draft proposed the new elements <tag>ref</tag> and <tag>def</tag> for implementing transclusions. Meanwhile DocBook TC decided that transclusions should rely as much as possible on standard technologies. XInclude 1.1 added new features that allow to implement transclusion features on top of the XInclude. As a result transclusions were completely redesigned to be layered on top of XInclude 1.1.</para> -<para>This resulted in a loss of some features, notably it's no longer -possible to locally redefine text replacement (see <link -xlink:href="http://docbook.org/docs/transclusion/2011-04-20/transclusion.html#d6e65">example</link>).</para> +<para>This resulted in a loss of some features. For example, it's no longer +possible to locally redefine text replacement (see this <link +xlink:href="http://docbook.org/docs/transclusion/2011-04-20/transclusion.html#d6e65">example</link> from the April 20, 2014 draft of this document).</para> </note> -<para>The following namespace bindings are assumed if namespace prefix -is used in the text of this document:</para> +<para>The following namespace bindings are used as prefixes in this document:</para> <variablelist> <varlistentry> @@ -72,7 +71,7 @@ </varlistentry> <varlistentry> <term><tag class="prefix">local</tag></term> -<listitem><para>XInclude namespace for copying attributes without namespace +<listitem><para>XInclude namespace for copying attributes without a namespace (<uri>http://www.w3.org/2001/XInclude/local-attributes</uri>)</para> </listitem> </varlistentry> @@ -82,22 +81,25 @@ <section> <title>Transclusion processing</title> -<para>Processing model of transclusion is very simple. First normal -XInclude processing is done on the input document. Then document is -modified by the transclusion processor in order to fix problems like -duplicate IDs or broken cross-references. The resulting document can -be then processed using normal tools.</para> +<para>The processing model for transclusion is simple: +<orderedlist> + <listitem><para>Normal XInclude 1.1 processing on the input document</para></listitem> + <listitem><para>DocBook transclusion processing on the result to fix problems such as + duplicate IDs and broken cross-references</para></listitem> + <listitem><para>Normal processing on the resulting document using the DocBook stylesheets or equivalent tools</para></listitem> +</orderedlist> +</para> -<para>Transclusion processor is controlled by presence of special -attributes from <uri>http://docbook.org/ns/transclusion</uri> -namespace on elements. Those attributes are typically inserted into -document by using new XInclude 1.1 <xref linkend="XI11"/> feature -described in section <citetitle +<para>Transclusion processing is controlled by +attributes from the <uri>http://docbook.org/ns/transclusion</uri> +namespace. These attributes are typically inserted into a +document by using the attribute copying feature of XInclude 1.1 <xref linkend="XI11"/>, which +is described in section <citetitle xlink:href="http://www.w3.org/XML/2012/08/xinclude-11/Overview.html#attribute-copying">4.3 -Attribute Copying when processing XML</citetitle>.</para> +Attribute Copying when processing XML</citetitle> of the XInclude 1.1 specification.</para> -<para>Transclusion processor copies document node by node. For most -nodes this is an identity transformation with few exceptions +<para>The transclusion processor copies documents node by node. For most +nodes this is an identity transformation. The few exceptions are controlled by transclusion properties. Transclusion properties <property>suffix</property> and <property>linkscope</property> are defined for each node in the document as follows:</para> @@ -106,87 +108,80 @@ <varlistentry> <term>suffix</term> <listitem> -<para>Suffix defines value to append to all ID values on the element -(where are ID values is defined in <property>ID-list</property> -property).</para> -<para>Default suffix is an empty string.</para> -<para>This property is inherited.</para> -<para>It's value can be changed by <tag -class="attribute">trans:idfixup</tag> and <tag -class="attribute">trans:suffix</tag> attributes.</para> + <itemizedlist spacing="compact"> + <listitem><para>Defines a value to be appended to all ID values on the element + (elements and attributes whose values should be treated as IDs are listed in the <property>ID-list</property> property)</para></listitem> + <listitem><para>Default is an empty string</para></listitem> + <listitem><para>Inherited</para></listitem> + <listitem><para>Can be changed by the + <tag class="attribute">trans:idfixup</tag> and + <tag class="attribute">trans:suffix</tag> attributes</para></listitem> + </itemizedlist> </listitem> </varlistentry> <varlistentry> <term>linkscope</term> <listitem> -<para>Linkscope defines how to correct -references to IDs on the element (which values has to be corrected is -defined by <property>IDREF-list</property> property).</para> -<para>Allowed values are <code>user</code>, <code>local</code>, -<code>near</code> and <code>global</code>.</para> -<para>Default linkscope value is <code>near</code>.</para> -<para>This property is inherited.</para> -<para>It's value can be changed by <tag -class="attribute">trans:linkscope</tag> attribute.</para> + <itemizedlist spacing="compact"> + <listitem><para>Defines how to correct + ID references (elements and attributes whose values should be treated as ID references are + listed in the <property>IDREF-list</property> property)</para></listitem> + <listitem><para>Allowed values are <code>user</code>, <code>local</code>, + <code>near</code>, and <code>global</code></para></listitem> + <listitem><para>Default value is <code>near</code></para></listitem> + <listitem><para>Inherited</para></listitem> + <listitem><para>Can be changed by the + <tag class="attribute">trans:linkscope</tag> attribute</para></listitem> + </itemizedlist> </listitem> </varlistentry> </variablelist> -<para>For each document type there are two additional properties -<property>ID-list</property> and <property>IDREF-list</property> -controlling transclusion process. <property>ID-list</property> -property defines attributes and elements where IDs can -appear. Similarly <property>IDREF-list</property> defines attributes -and elements where references to ID can appear. For DocBook 5.0 -definition of those properties can be found in <xref -linkend="docbook-lists-defintion"/>. Transclusion processors are free -to support <property>ID-list</property> and -<property>IDREF-list</property> configurations for other document -types, for example DocBook 4.x or TEI. This allows to use transclusion -with different document types.</para> +<para>For each document type there are two properties, +<property>ID-list</property> and <property>IDREF-list</property>, which +control the transclusion process. The <property>ID-list</property> +property defines the attributes and elements whose values should be treated as IDs. +Similarly, the <property>IDREF-list</property> property defines the attributes +and elements whose values should be treated as ID references. +These properties are defined for DocBook 5.0 in <xref linkend="docbook-lists-definition"/>. +Transclusion processors are free to support the <property>ID-list</property> and +<property>IDREF-list</property> properties with other document +types, for example DocBook 4.x or TEI.</para> +<para>ID references identified in the <property>IDREF-list</property> are corrected as follows:</para> -<para>For each node ID references contained in attributes or elements -defined in <property>IDREF-list</property> are corrected as follows:</para> - <variablelist> <varlistentry> <term>When <code>linkscope=user</code></term> -<listitem><para>No adjustment is done.</para></listitem> +<listitem><para>No adjustment is made.</para></listitem> </varlistentry> <varlistentry> <term>When <code>linkscope=local</code></term> -<listitem><para>All ID references on element are suffixed -by value of the suffix property.</para> +<listitem><para>The value of the <property>suffix</property> property is added to every ID reference as a suffix.</para> </listitem> </varlistentry> <varlistentry> <term>When <code>linkscope=near</code></term> -<listitem><para>All ID references on element are adjusted to point to -the closest element which has a <link linkend="matching-id">matching -ID</link>.</para> -<para>When searching for the closest element with a matching ID ancestor elements of -the element with an ID reference are gradually inspected and matching ID -is searched between all their descendants. If there is no matching ID, then -parent is inspected and so on until match is found or document root is -reached.</para> +<listitem><para>Each ID reference is adjusted to point to +the closest element that has a <link linkend="matching-id">matching ID</link>.</para> +<para>To find the closest element, the parent element of the element that contains the ID reference is searched for a matching ID, followed by that element's descendants. +If no matching ID is found, that element's parent is inspected in the same way. This continues until a match is found or the +root element is reached.</para> </listitem> </varlistentry> <varlistentry> <term>When <code>linkscope=global</code></term> -<listitem><para>All ID references on element are adjusted to point to -the first element in document order which has a <link +<listitem><para>Each ID reference is adjusted to point to +the first element in document order that has a <link linkend="matching-id">matching ID</link>.</para> </listitem> </varlistentry> </variablelist> -<para xml:id="matching-id">A matching ID doesn't mean string equality -between ID and IDREF values – it is sufficient if first parts of ID and -IDREF values after removal of possibly added suffixes are matching.</para> +<para xml:id="matching-id">A <emphasis>matching ID</emphasis> does not mean exact string equality +between ID and IDREF values. A matching ID means that the values of an ID and IDREF match after removing any added suffixes.</para> -<para>Value of transclusion properties can be set on any element by -the following attributes:</para> +<para>Transclusion properties can be set on any element using the following attributes:</para> <variablelist> <varlistentry> @@ -195,22 +190,22 @@ <variablelist> <varlistentry> <term>value <tag class="attvalue">none</tag></term> -<listitem><para>Suffix transclusion property is set to an empty string.</para> +<listitem><para>The <property>suffix</property> property is set to an empty string.</para> </listitem> </varlistentry> <varlistentry> <term>value <tag class="attvalue">suffix</tag></term> -<listitem><para>Suffix transclusion property is set to a concatenation -of the inherited suffix value and a value specified in <tag +<listitem><para>The <property>suffix</property> property is set to the concatenation +of the inherited suffix value and the value specified in the <tag class="attribute">trans:suffix</tag> attribute.</para> </listitem> </varlistentry> <varlistentry> <term>value <tag class="attvalue">auto</tag></term> -<listitem><para>Suffix transclusion property is set to a value which -is unique for each element.<footnote><para>For example XSLT based -implementations can use <function>generate-id()</function> function to -generate such unique suffix.</para></footnote></para> +<listitem><para>The <property>suffix</property> property is set to a unique value +for each element.<footnote><para>For example, XSLT-based +implementations can use the <function>generate-id()</function> function to +generate a unique suffix.</para></footnote></para> </listitem> </varlistentry> </variablelist> @@ -220,66 +215,44 @@ <varlistentry> <term><tag class="attribute">trans:suffix</tag> attribute</term> <listitem> -<para>Value of this attribute contributes to suffix transclusion -property.</para> -<para>It's an error to specify this attribute when -<code>trans:idfixup="suffix"</code> is not specified on the element as -well.</para> +<para>This attribute defines the value of the <property>suffix</property> property used when <code>trans:idfixup="suffix"</code>.</para> +<para>It's an error to use this attribute when the attribute/value pair <code>trans:idfixup="suffix"</code> is not also on the element.</para> </listitem> </varlistentry> <varlistentry> <term><tag class="attribute">trans:linkscope</tag> attribute</term> <listitem> -<variablelist> -<varlistentry> -<term>value <tag class="attvalue">user</tag></term> -<listitem><para>Linkscope property is set to <code>user</code>.</para></listitem> -</varlistentry> -<varlistentry> -<term>value <tag class="attvalue">local</tag></term> -<listitem><para>Linkscope property is set to <code>local</code>.</para> + <para>Sets the value of the <property>linkscope</property> property. + Permitted values are: <code>user</code>, <code>local</code>, <code>near</code>, and <code>global</code>.</para> </listitem> </varlistentry> -<varlistentry> -<term>value <tag class="attvalue">near</tag></term> -<listitem><para>Linkscope property is set to <code>near</code>.</para> -</listitem> -</varlistentry> -<varlistentry> -<term>value <tag class="attvalue">global</tag></term> -<listitem><para>Linkscope property is set to <code>global</code>.</para> -</listitem> -</varlistentry> -</variablelist> -</listitem> -</varlistentry> </variablelist> -<para>During transclusion process all attributes from transclusion +<para>During the transclusion process all attributes from the transclusion namespace are removed from the resulting document.</para> -<variablelist xml:id="docbook-lists-defintion"> -<title>Definition of ID-list and IDREF-list properties for DocBook -5.0</title> +<variablelist xml:id="docbook-lists-definition"> +<title>Definition of ID-list and IDREF-list properties for DocBook 5.0</title> +<para>In DocBook 5.0, the <property>ID-list</property> and <property>IDREF-list</property> properties contain the attributes shown here:</para> <varlistentry> <term><property>ID-list</property></term> -<listitem><para>Following attribute is member: <tag class="attribute">xml:id</tag>.</para></listitem> +<listitem><para><tag class="attribute">xml:id</tag></para></listitem> </varlistentry> <varlistentry> <term><property>IDREF-list</property></term> -<listitem><para>Following attributes are members: +<listitem><para> <tag class="attribute">linkend</tag>, <tag class="attribute">linkends</tag>, <tag class="attribute">otherterm</tag>, <tag class="attribute">zone</tag>, <tag class="attribute">startref</tag>, <tag class="attribute">arearefs</tag>, -<tag class="attribute">targetptr</tag>, +<tag class="attribute">targetptr</tag>, and <tag class="attribute">endterm</tag>.</para> -<para>Also attribute <tag class="attribute">href</tag> in XLink -namespace is member of this list if its value begins with <code>#</code>.</para> +<para>The <tag class="attribute">href</tag> attribute in the XLink +namespace is considered a member of <property>IDREF-list</property> when its value begins with <code>#</code>.</para> </listitem> </varlistentry> </variablelist> @@ -287,27 +260,28 @@ </section> <appendix> -<title>Using new XInclude 1.1 features for your content</title> +<title>Using XInclude 1.1 features for your content</title> <para>The most common transclusion scenario is reuse of shared strings (see <link xlink:href="http://docbook.org/docs/transclusion-requirements/transclusion-requirements.html#uc-1"/>). With -XInclude 1.0 this was possible only using fancy XPointer schemes which -were not very interoperable. With XInclude 1.1 situation is more easier.</para> +XInclude 1.0 this could only be done using XPointer schemes that +were not very interoperable. With XInclude 1.1, doing this is much easier.</para> -<para>Let's assume we have definitions of shared strings.</para> +<para>Let's assume we have defined a set of shared strings in separate document (see <xref linkend="ex.1"/>).</para> -<example> +<example xml:id="ex.1"> <title>Definitions stored in a separate document (<filename>definitions.001.xml</filename>)</title> <programlisting><textobject> <textdata fileref='src/definitions.001.xml'/> </textobject></programlisting> </example> -<para>Now, their naive reuse leads to duplicate IDs problem.</para> +<para>If you transclude parts of this document as shown in <xref linkend="ex.2"/>, you will end up with duplicate IDs. +In this example, the same definition is included twice. Because the ID attributes are passed through unchanged, the ID value <quote>product-name</quote> occurs twice in the resulting document.</para> -<example> -<title>Usage of definitions stored in a separate document and problem of duplicated IDs</title> +<example xml:id="ex.2"> +<title>Transclusion with duplicate IDs</title> <programlisting><textobject> <textdata fileref='src/shared-texts.003.xml'/> </textobject></programlisting> @@ -315,18 +289,14 @@ <programlisting><textobject> <textdata fileref='src/shared-texts.003.xml.out'/> </textobject></programlisting> -<para>Unfortunately upon inclusion ID attributes are preserved which -leads to duplicate IDs problem when one definition is included more -then once. </para> </example> -<para>XInclude 1.1 has special <tag class="attribute">set-xml-id</tag> -attribute which can be used for changing or completely removing of -<tag class="attribute">xml:id</tag> attribute on included -content.</para> +<para>XInclude 1.1 has an attribute, <tag class="attribute">set-xml-id</tag>, +which can be used to change or remove the <tag class="attribute">xml:id</tag> +attribute on included content. <xref linkend="ex.3"/> uses this attribute to avoid duplicate IDs.</para> -<example> -<title>Removal of top-level ID during transclusion</title> +<example xml:id="ex.3"> +<title>Using <tag class="attribute">set-xml-id</tag> to remove the top-level ID during transclusion</title> <programlisting><textobject> <textdata fileref='src/shared-texts.010.xml'/> </textobject></programlisting> @@ -336,28 +306,26 @@ </textobject></programlisting> </example> -<para>Another new XInclude 1.1 feature is ability to override -attributes on included content. This can be used for example for -overriding of effectivity attributes. In order to do that you must put -your attributes on <tag>xi:include</tag> element in a special -namespace -<uri>http://www.w3.org/2001/XInclude/local-attributes</uri>.</para> - -<example> -<title>Overriding of DocBook attributes on inclusion</title> -<para>Consider section (<filename>section.001.xml</filename>) which is -labeled as for Linux (<code>os="linux"</code>).</para> +<para>Another new XInclude 1.1 feature lets you override +attributes on included content. <xref linkend="ex.4"/> shows how to use this feature to +override effectivity attributes. This feature works by placing attributes from a specially +defined namespace (<uri>http://www.w3.org/2001/XInclude/local-attributes</uri>) on +the <tag>xi:include</tag> element. These attributes define the values that should be +used to replace attributes of the same name, but no namespace, in the transcluded content.</para> +<example xml:id="ex.4"> +<title>Overriding DocBook attributes on inclusion</title> +<para>Consider section (<filename>section.001.xml</filename>), which is +labeled for the Linux operating system (<code>os="linux"</code>).</para> <programlisting><textobject> <textdata fileref='src/section.001.xml'/> </textobject></programlisting> -<para>Now we want to include it into another document and pretend that -it's actually targeted at BSD-like system.</para> +<para>Now we want to include this section in another document and pretend that +it's actually targeted at a BSD system.</para> <programlisting><textobject> <textdata fileref='src/article.002.xml'/> </textobject></programlisting> -<para>This <code>local:os</code> attribute is changed into -<code>os</code> attribute in no namespace during XInclude -processing.</para> +<para>The value of the <code>local:os</code> attribute replaces the value of the +<code>os</code> attribute during the XInclude process.</para> <programlisting><textobject> <textdata fileref='src/article.002.xml.out'/> </textobject></programlisting> @@ -368,40 +336,37 @@ <appendix> <title>Special ID/IDREF processing</title> -<para>Transcluded content can contain an <tag +<para>Transcluded content can contain <tag class="attribute">xml:id</tag> attributes. If one fragment is -transcluded more then once then the resulting document after transclusion will -contain duplicate IDs. The same problem may arise if IDs are colliding in -transcluded modules. To overcome this problem all IDs and references -to them can be adjusted during the transclusion process.</para> +transcluded more than once, then the resulting document after transclusion will +contain duplicate IDs. The same problem can occur if the same ID is used in two different +transcluded modules. To overcome this problem, IDs and ID references +can be adjusted during the transclusion process.</para> -<para>How IDs are going to be adjusted during transclusion is -controlled by the <tag class="attribute">trans:idfixup</tag> attribute on -the <tag>xi:include</tag> element.</para> +<para>The <tag class="attribute">trans:idfixup</tag> attribute on +the <tag>xi:include</tag> element determines how IDs are adjusted during transclusion.</para> -<para>Of course if IDs are adjusted then all corresponding references has -to be also corrected. This is controlled by <tag -class="attribute">trans:linkscope</tag> attribute.</para> +<para>Of course, if IDs are adjusted then all corresponding ID references also have +to be adjusted.</para> -<para>By using various combinations of <tag +<para>These adjustments are controlled by the <tag class="attribute">trans:idfixup</tag> and <tag -class="attribute">trans:linkscope</tag> attributes we can achieve different -linking behavior. The following examples show the effect of using those two -attributes. Examples are transcluding the following procedure which -contains one internal link and one external (points to target outside -of this module).</para> +class="attribute">trans:linkscope</tag> attributes. +The following examples show the effect of using those two +attributes. Each example transcludes the procedure shown in <xref linkend="ex.5"/>, which +contains one internal link and one external link.</para> -<example> +<example xml:id="ex.5"> <title>Module with sample procedure</title> <programlisting><textobject> <textdata fileref='src/procedure.001.xml'/> </textobject></programlisting> </example> -<para>Now lets assume that we want to transclude this module twice to -show how we can deal with duplicate IDs problem.</para> +<para><xref linkend="ex.6"/> transcludes this module twice to +show how we can deal with the duplicate ID problem.</para> -<example> +<example xml:id="ex.6"> <title>Automatic ID/IDREF adjustment</title> <programlisting><textobject> <textdata fileref='src/book.002.xml'/> @@ -410,16 +375,18 @@ <programlisting><textobject> <textdata fileref='src/book.002.xml.out'/> </textobject></programlisting> -<para>We have to specify <tag class="attribute">db:idfixup</tag> in -order to trigger automatic ID/IDREF fixup. All IDs in transcluded -modules are automatically suffixed to prevent ID collisions. Then +</example> +<para>Specifying <tag class="attribute">db:idfixup</tag> triggers +the automatic ID/IDREF fixup. All IDs in the transcluded +modules are automatically suffixed to prevent ID collisions. Then, IDREFs are fixed so that links point to the nearest possible -target. For example the link from step 2 to step 1 in procedure always -points to the same instance of procedure. However <quote>buy</quote> -link is pointing correctly to target in the main document.</para> -</example> - -<example> +target. In <xref linkend="ex.6"/>, the link from step 2 to step 1 in the procedure always +points to the same instance of the procedure. However, the <quote>buy</quote> +link correctly points to the target in the main document.</para> +<para><xref linkend="ex.7"/> uses <literal>trans:linkscope="global"</literal> +for the second transclusion. The result is that the link from step 2 in the second +procedure links to step 1 in the first procedure.</para> +<example xml:id="ex.7"> <title>Global linkscope</title> <programlisting><textobject> <textdata fileref='src/book.003.xml'/> @@ -428,12 +395,16 @@ <programlisting><textobject> <textdata fileref='src/book.003.xml.out'/> </textobject></programlisting> -<para>We used <literal>trans:linkscope="global"</literal> on the second -transclusion. Result is that link from step 2 in the second procedure -now links to step 1 in the first procedure.</para> </example> - -<example> +<para><xref linkend="ex.8"/> uses <literal>db:linkscope="local"</literal> on +the first transclusion. This means that every link from this transclusion must +point to an ID inside the transcluded content; no external links are allowed. +Because the transcluded content does contain a link to an external ID (<quote>buy</quote>), +this example is broken, since the transclusion process rewrites <quote>buy</quote> +to be <quote>buy---d1e23</quote>, for which there is no corresponding target.</para> +<para>This method of transclusion can be useful if you are +transcluding foreign content and want to isolate its links from the rest of your document.</para> +<example xml:id="ex.8"> <title>Local linkscope</title> <programlisting><textobject> <textdata fileref='src/book.004.xml'/> @@ -442,17 +413,16 @@ <programlisting><textobject> <textdata fileref='src/book.004.xml.out'/> </textobject></programlisting> -<para>We used <literal>db:linkscope="local"</literal> on the first -transclusion. This means that no link from this transclusion can point -outside of this transclusion. Because there was such link -(<quote>buy</quote> link), the result of transclusion is broken because -there is no corresponding target for IDREF -<literal>buy---d1e23</literal>.</para> -<para>This method of transclusion might be useful if you are -transcluding foreign content and want to isolate its links.</para> </example> -<example> +<para>You can manually assign the value of the suffix used in transcluded content. +<xref linkend="ex.9"/> shows how to do this.</para> +<remark>Although suffixes seem to be a better approach for automatically +generated IDs, prefixes may be a better approach for manually specified IDs +(for example when HTML filenames are generated based on the xml:id +value). Should we put the prefix option back in the +specification?</remark> +<example xml:id="ex.9"> <title>Manually assigned suffix</title> <programlisting><textobject> <textdata fileref='src/book.005.xml'/> @@ -461,16 +431,11 @@ <programlisting><textobject> <textdata fileref='src/book.005.xml.out'/> </textobject></programlisting> -<para>If we care about the resulting IDs after transclusion we can -manually assign some meaningful suffix before IDs in transcluded document.</para> -<remark>Although suffixes seems as better approach for automatically -generated ones, for manually specified ones prefix could be more -useful (for example when HTML filenames are generated based on xml:id -value). Should we put prefix option back to the -specification?</remark> </example> -<example> +<para>By default, XInclude does not do any postprocessing. +Thus, the resulting document in <xref linkend="ex.10"/> contains duplicate IDs and is not valid.</para> +<example xml:id="ex.10"> <title>Disabling ID fixup</title> <programlisting><textobject> <textdata fileref='src/book.006.xml'/> @@ -479,31 +444,27 @@ <programlisting><textobject> <textdata fileref='src/book.006.xml.out'/> </textobject></programlisting> -<para>Default behaviour of XInclude is not to do any postprocessing like -DocBook transclusions. The resulting document thus contain duplicated -IDs and it is not valid.</para> </example> -<example> -<title>Chaining of suffixes</title> +<example xml:id="ex.11"> +<title>Chaining suffixes</title> <para>Suppose we have note in a separate file (<filename>note.001.xml</filename>):</para> <programlisting><textobject> <textdata fileref='src/note.001.xml'/> </textobject></programlisting> <para>We transclude it into another file -(<filename>procedure.002.xml</filename>) with manual suffix -assignment:</para> +(<filename>procedure.002.xml</filename>) assigning a suffix manually:</para> <programlisting><textobject> <textdata fileref='src/procedure.002.xml'/> </textobject></programlisting> -<para>And then this procedure is transcluded into master document, -again with manually specified suffix:</para> +<para>Then we transclude this procedure into a master document, +again with a manually specified suffix:</para> <programlisting><textobject> <textdata fileref='src/book.012.xml'/> </textobject></programlisting> -<para>In transcluded content ID of note contains chained -suffix:</para> +<para>The result is that the ID in the transcluded note contains a chained +suffix <quote>note_procedure002_note001</quote>:</para> <programlisting><textobject> <textdata fileref='src/book.012.xml.out'/> </textobject></programlisting> @@ -528,7 +489,7 @@ <title>Sample transclusion processor written in XSLT 2.0</title> <para>Please note that this sample transclusion processor is not yet -feature complete. It supports only subset of proposal.</para> +feature complete. It supports only a subset of the proposal.</para> <programlisting><textobject> <textdata fileref='src/transclude.xsl'/> @@ -542,9 +503,12 @@ Candidate Recommendation. 8 October 2013. Available at <link xlink:href="http://www.w3.org/TR/2013/CR-xinclude-11-20131008/"/></bibliomixed> --> -<bibliomixed xml:id="XI11"><title>XML Inclusions (XInclude) Version 1.1</title>. W3C -Working Draft. 26 November 2014. Available at <link -xlink:href="http://www.w3.org/XML/2012/08/xinclude-11/"/></bibliomixed> +<bibliomixed xml:id="XI11"> + <title>XML Inclusions (XInclude) Version 1.1</title>. + W3C Working Draft. + <pubdate>26 November 2014.</pubdate> + <bibliosource>Available at <link +xlink:href="http://www.w3.org/XML/2012/08/xinclude-11/"/></bibliosource>.</bibliomixed> </bibliography> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2014-12-23 20:20:44
|
Revision: 9957 http://sourceforge.net/p/docbook/code/9957 Author: kosek Date: 2014-12-23 20:20:36 +0000 (Tue, 23 Dec 2014) Log Message: ----------- Make speakernotes/handoutnotes optional as many presentations do not use them Modified Paths: -------------- trunk/xsl/slides/schema/relaxng/slides.rnc Modified: trunk/xsl/slides/schema/relaxng/slides.rnc =================================================================== --- trunk/xsl/slides/schema/relaxng/slides.rnc 2014-12-13 17:13:55 UTC (rev 9956) +++ trunk/xsl/slides/schema/relaxng/slides.rnc 2014-12-23 20:20:36 UTC (rev 9957) @@ -55,8 +55,8 @@ dbs._any.attribute = attribute * { text } dbs.all.content = db.all.blocks? & - dbs.speakernotes & - dbs.handoutnotes & + dbs.speakernotes? & + dbs.handoutnotes? & db._any.svg? & db._any.mml? & dbs.block? This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2014-12-13 17:14:03
|
Revision: 9956 http://sourceforge.net/p/docbook/code/9956 Author: kosek Date: 2014-12-13 17:13:55 +0000 (Sat, 13 Dec 2014) Log Message: ----------- Added missing files Added Paths: ----------- trunk/docbook/relaxng/docbook/transclusion/src/article.002.xml trunk/docbook/relaxng/docbook/transclusion/src/article.002.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.011.xml trunk/docbook/relaxng/docbook/transclusion/src/book.011.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.012.xml trunk/docbook/relaxng/docbook/transclusion/src/book.012.xml.out trunk/docbook/relaxng/docbook/transclusion/src/note.001.xml trunk/docbook/relaxng/docbook/transclusion/src/procedure.002.xml trunk/docbook/relaxng/docbook/transclusion/src/section.001.xml Added: trunk/docbook/relaxng/docbook/transclusion/src/article.002.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/article.002.xml (rev 0) +++ trunk/docbook/relaxng/docbook/transclusion/src/article.002.xml 2014-12-13 17:13:55 UTC (rev 9956) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<article xmlns="http://docbook.org/ns/docbook" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:local="http://www.w3.org/2001/XInclude/local-attributes" + version="5.0"> + <title>Sample article</title> + <xi:include href="section.001.xml" local:os="bsd"/> +</article> \ No newline at end of file Added: trunk/docbook/relaxng/docbook/transclusion/src/article.002.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/article.002.xml.out (rev 0) +++ trunk/docbook/relaxng/docbook/transclusion/src/article.002.xml.out 2014-12-13 17:13:55 UTC (rev 9956) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<article xmlns="http://docbook.org/ns/docbook" version="5.0"> + <title>Sample article</title> + <section version="5.0" os="bsd" xml:base="section.001.xml"> + <title>Installation</title> + <para>Text</para> + </section> +</article> Added: trunk/docbook/relaxng/docbook/transclusion/src/book.011.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.011.xml (rev 0) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.011.xml 2014-12-13 17:13:55 UTC (rev 9956) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<book xmlns="http://docbook.org/ns/docbook" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:trans="http://docbook.org/ns/transclude" + version="5.0"> + <title>Definitive Printer Guide</title> + <chapter xml:id="buy"> + <title>Buying printer</title> + <para>Grab money, go to shop, ...</para> + <para>Do not forget to <link linkend="s1">insert paper</link>.</para> + </chapter> + <chapter> + <title>Quick installation guide</title> + <para>Carefully follow all procedures bellow.</para> + <xi:include href="procedure.001.xml" trans:idfixup="auto"/> + </chapter> + <chapter> + <title>Maintenance</title> + <para>Be friendly to your printer when you speak to it.</para> + <para>If green led is blinking, please add missing paper using the following procedure.</para> + <xi:include href="procedure.001.xml" trans:idfixup="auto"/> + </chapter> +</book> \ No newline at end of file Added: trunk/docbook/relaxng/docbook/transclusion/src/book.011.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.011.xml.out (rev 0) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.011.xml.out 2014-12-13 17:13:55 UTC (rev 9956) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<book xmlns="http://docbook.org/ns/docbook" version="5.0"> + <title>Definitive Printer Guide</title> + <chapter xml:id="buy"> + <title>Buying printer</title> + <para>Grab money, go to shop, ...</para> + <para>Do not forget to <link linkend="s1---d1e29">insert paper</link>.</para> + </chapter> + <chapter> + <title>Quick installation guide</title> + <para>Carefully follow all procedures bellow.</para> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e29"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. + If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <step xml:id="s1---d1e29"> + <para>Make sure that you have paper.</para> + </step> + <step> + <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e29"/> + </para> + </step> + </procedure> + </chapter> + <chapter> + <title>Maintenance</title> + <para>Be friendly to your printer when you speak to it.</para> + <para>If green led is blinking, please add missing paper using the following procedure.</para> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e62"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. + If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <step xml:id="s1---d1e62"> + <para>Make sure that you have paper.</para> + </step> + <step> + <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e62"/> + </para> + </step> + </procedure> + </chapter> +</book> Added: trunk/docbook/relaxng/docbook/transclusion/src/book.012.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.012.xml (rev 0) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.012.xml 2014-12-13 17:13:55 UTC (rev 9956) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<book xmlns="http://docbook.org/ns/docbook" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:trans="http://docbook.org/ns/transclude" + version="5.0"> + <title>Definitive Printer Guide</title> + <chapter xml:id="buy"> + <title>Buying printer</title> + <para>Grab money, go to shop, ...</para> + </chapter> + <chapter> + <title>Maintenance</title> + <para>Be friendly to your printer when you speak to it.</para> + <para>If green led is blinking, please add missing paper using the following procedure.</para> + <xi:include href="procedure.002.xml" trans:idfixup="suffix" trans:suffix="_procedure002"/> + </chapter> +</book> \ No newline at end of file Added: trunk/docbook/relaxng/docbook/transclusion/src/book.012.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.012.xml.out (rev 0) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.012.xml.out 2014-12-13 17:13:55 UTC (rev 9956) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<book xmlns="http://docbook.org/ns/docbook" version="5.0"> + <title>Definitive Printer Guide</title> + <chapter xml:id="buy"> + <title>Buying printer</title> + <para>Grab money, go to shop, ...</para> + </chapter> + <chapter> + <title>Maintenance</title> + <para>Be friendly to your printer when you speak to it.</para> + <para>If green led is blinking, please add missing paper using the following procedure.</para> + <procedure xml:base="procedure.002.xml" xml:id="paper-insert_procedure002"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. + If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <step xml:id="s1_procedure002"> + <para>Make sure that you have paper.</para> + </step> + <step> + <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1_procedure002"/> + </para> + </step> + <step> + <note xml:base="note.001.xml" xml:id="note_procedure002_note001"> + <para>Important note.</para> + </note> + </step> + </procedure> + </chapter> +</book> Added: trunk/docbook/relaxng/docbook/transclusion/src/note.001.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/note.001.xml (rev 0) +++ trunk/docbook/relaxng/docbook/transclusion/src/note.001.xml 2014-12-13 17:13:55 UTC (rev 9956) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<note xmlns="http://docbook.org/ns/docbook" xml:id="note"> + <para>Important note.</para> +</note> \ No newline at end of file Added: trunk/docbook/relaxng/docbook/transclusion/src/procedure.002.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/procedure.002.xml (rev 0) +++ trunk/docbook/relaxng/docbook/transclusion/src/procedure.002.xml 2014-12-13 17:13:55 UTC (rev 9956) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<procedure xmlns="http://docbook.org/ns/docbook" xml:id="paper-insert" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:trans="http://docbook.org/ns/transclude"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. + If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <step xml:id="s1"><para>Make sure that you have paper.</para></step> + <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1"/></para></step> + <step> + <xi:include href="note.001.xml" trans:idfixup="suffix" trans:suffix="_note001"/> + </step> +</procedure> \ No newline at end of file Added: trunk/docbook/relaxng/docbook/transclusion/src/section.001.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/section.001.xml (rev 0) +++ trunk/docbook/relaxng/docbook/transclusion/src/section.001.xml 2014-12-13 17:13:55 UTC (rev 9956) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<section xmlns="http://docbook.org/ns/docbook" + version="5.0" + os="linux"> + <title>Installation</title> + <para>Text</para> +</section> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2014-12-04 22:26:27
|
Revision: 9955 http://sourceforge.net/p/docbook/code/9955 Author: kosek Date: 2014-12-04 22:26:19 +0000 (Thu, 04 Dec 2014) Log Message: ----------- Another draft for DocBook TC Modified Paths: -------------- trunk/docbook/relaxng/docbook/transclusion/Makefile trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml trunk/docbook/relaxng/docbook/transclusion/src/definitions.001.xml trunk/docbook/relaxng/docbook/transclusion/src/module.001.xml trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.003.xml trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.010.xml trunk/docbook/relaxng/docbook/transclusion/transclusion.xml Modified: trunk/docbook/relaxng/docbook/transclusion/Makefile =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/Makefile 2014-12-04 17:09:05 UTC (rev 9954) +++ trunk/docbook/relaxng/docbook/transclusion/Makefile 2014-12-04 22:26:19 UTC (rev 9955) @@ -12,7 +12,7 @@ # output using the namespaced stylesheets #ns: howto.ns.html howto.ns.pdf -%.html : %.xml $(HTMLSTYLE) +%.html : %.xml $(HTMLSTYLE) src/*.xml src/*.out $(JING) -c ../docbook.rnc $< $(XSLT) $< $(HTMLSTYLE) $@ toc.max.depth=1 $(VARS) @@ -20,7 +20,7 @@ # jing -c ../../docbook.rnc $< # $(XSLT) $< $(HTMLNSSTYLE) $@ $(VARS) -%.fo : %.xml $(FOSTYLE) +%.fo : %.xml $(FOSTYLE) src/*.xml src/*.out $(JING) -c ../docbook.rnc $< $(XSLT) $< $(FOSTYLE) $@ xep.extensions=1 toc.max.depth=1 $(VARS) Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml 2014-12-04 17:09:05 UTC (rev 9954) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml 2014-12-04 22:26:19 UTC (rev 9955) @@ -19,4 +19,4 @@ <para>If green led is blinking, please add missing paper using the following procedure.</para> <xi:include href="procedure.001.xml" trans:idfixup="auto"/> </chapter> -</book> +</book> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml 2014-12-04 17:09:05 UTC (rev 9954) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml 2014-12-04 22:26:19 UTC (rev 9955) @@ -19,4 +19,4 @@ <para>If green led is blinking, please add missing paper using the following procedure.</para> <xi:include href="procedure.001.xml" trans:idfixup="auto" trans:linkscope="global"/> </chapter> -</book> +</book> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml 2014-12-04 17:09:05 UTC (rev 9954) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml 2014-12-04 22:26:19 UTC (rev 9955) @@ -19,4 +19,4 @@ <para>If green led is blinking, please add missing paper using the following procedure.</para> <xi:include href="procedure.001.xml" trans:idfixup="auto"/> </chapter> -</book> +</book> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml 2014-12-04 17:09:05 UTC (rev 9954) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml 2014-12-04 22:26:19 UTC (rev 9955) @@ -19,4 +19,4 @@ <para>If green led is blinking, please add missing paper using the following procedure.</para> <xi:include href="procedure.001.xml" trans:idfixup="suffix" trans:suffix="_maintain-proc"/> </chapter> -</book> +</book> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml 2014-12-04 17:09:05 UTC (rev 9954) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml 2014-12-04 22:26:19 UTC (rev 9955) @@ -18,4 +18,4 @@ <para>If green led is blinking, please add missing paper using the following procedure.</para> <xi:include href="procedure.001.xml"/> </chapter> -</book> +</book> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/definitions.001.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/definitions.001.xml 2014-12-04 17:09:05 UTC (rev 9954) +++ trunk/docbook/relaxng/docbook/transclusion/src/definitions.001.xml 2014-12-04 22:26:19 UTC (rev 9955) @@ -6,4 +6,4 @@ <phrase xml:id="product-name">FooWiz</phrase> <phrase xml:id="corp-name">ACME Inc.</phrase> </para> -</article> +</article> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/module.001.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/module.001.xml 2014-12-04 17:09:05 UTC (rev 9954) +++ trunk/docbook/relaxng/docbook/transclusion/src/module.001.xml 2014-12-04 22:26:19 UTC (rev 9955) @@ -2,5 +2,4 @@ <section xmlns="http://docbook.org/ns/docbook" xml:id="mod-1"> <title>Module which is going to be shared across several documents</title> <para>Bla bla bla</para> -</section> - +</section> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.003.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.003.xml 2014-12-04 17:09:05 UTC (rev 9954) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.003.xml 2014-12-04 22:26:19 UTC (rev 9955) @@ -9,4 +9,4 @@ <xi:include href="definitions.001.xml" xpointer="corp-name"/> is <xi:include href="definitions.001.xml" xpointer="product-version"/>.</para> <para>You can buy <xi:include href="definitions.001.xml" xpointer="product-name"/> in our on-line store.</para> -</article> +</article> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.010.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.010.xml 2014-12-04 17:09:05 UTC (rev 9954) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.010.xml 2014-12-04 22:26:19 UTC (rev 9955) @@ -9,4 +9,4 @@ <xi:include href="definitions.001.xml" xpointer="corp-name" set-xml-id=""/> is <xi:include href="definitions.001.xml" xpointer="product-version" set-xml-id=""/>.</para> <para>You can buy <xi:include href="definitions.001.xml" xpointer="product-name" set-xml-id=""/> in our on-line store.</para> -</article> +</article> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/transclusion.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/transclusion.xml 2014-12-04 17:09:05 UTC (rev 9954) +++ trunk/docbook/relaxng/docbook/transclusion/transclusion.xml 2014-12-04 22:26:19 UTC (rev 9955) @@ -17,11 +17,6 @@ <!-- TODO: - -> We need to explain somewhere that the definitions element -> is removed as a result of the transclusion (if that, in fact, -> is what we want-that's what the examples make it look like). - Add xml:id where possible --> @@ -36,7 +31,7 @@ xlink:href="http://docbook.org/docs/transclusion-requirements/">Requirements for transclusion in DocBook</citetitle>. DocBook TC welcomes any feedback on this draft, especially from users and developers of -DocBook authoring and processing tools. Plese direct your comments to +DocBook authoring and processing tools. Please direct your comments to DocBook mailing list by sending email to <email>do...@li...</email>.</para> @@ -95,7 +90,7 @@ <para>Transclusion processor is controlled by presence of special attributes from <uri>http://docbook.org/ns/transclusion</uri> -namespace on elements. Those attributes are typicially inserted into +namespace on elements. Those attributes are typically inserted into document by using new XInclude 1.1 <xref linkend="XI11"/> feature described in section <citetitle xlink:href="http://www.w3.org/XML/2012/08/xinclude-11/Overview.html#attribute-copying">4.3 @@ -111,8 +106,9 @@ <varlistentry> <term>suffix</term> <listitem> -<para>Suffix defines value to append to all ID values on the node -(values are defined in <property>ID-list</property> property).</para> +<para>Suffix defines value to append to all ID values on the element +(where are ID values is defined in <property>ID-list</property> +property).</para> <para>Default suffix is an empty string.</para> <para>This property is inherited.</para> <para>It's value can be changed by <tag @@ -125,11 +121,11 @@ <term>linkscope</term> <listitem> <para>Linkscope defines how to correct -references to IDs on the node (which values has to be corrected is +references to IDs on the element (which values has to be corrected is defined by <property>IDREF-list</property> property).</para> <para>Allowed values are <code>user</code>, <code>local</code>, -<code>near</code> and <code>global</code></para> -<para>Default linkscope mode is <code>near</code>.</para> +<code>near</code> and <code>global</code>.</para> +<para>Default linkscope value is <code>near</code>.</para> <para>This property is inherited.</para> <para>It's value can be changed by <tag class="attribute">trans:linkscope</tag> attribute.</para> @@ -137,7 +133,7 @@ </varlistentry> </variablelist> -<para>For each document type there are two additonal properties +<para>For each document type there are two additional properties <property>ID-list</property> and <property>IDREF-list</property> controlling transclusion process. <property>ID-list</property> property defines attributes and elements where IDs can @@ -189,8 +185,8 @@ between ID and IDREF values – it is sufficient if first parts of ID and IDREF values after removal of possibly added suffixes are matching.</para> -<para>On any element value of transclusion properties can be set -by the following attributes:</para> +<para>Value of transclusion properties can be set on any element by +the following attributes:</para> <variablelist> <varlistentry> @@ -204,8 +200,8 @@ </varlistentry> <varlistentry> <term>value <tag class="attvalue">suffix</tag></term> -<listitem><para>Suffix transclusion property is set to concetanation -of the inherited suffix value and and value specified in <tag +<listitem><para>Suffix transclusion property is set to a concatenation +of the inherited suffix value and a value specified in <tag class="attribute">trans:suffix</tag> attribute.</para> </listitem> </varlistentry> @@ -319,14 +315,15 @@ <programlisting><textobject> <textdata fileref='src/shared-texts.003.xml.out'/> </textobject></programlisting> -<para>Unfortunatelly upon inclusion ID attributes are preserved which +<para>Unfortunately upon inclusion ID attributes are preserved which leads to duplicate IDs problem when one definition is included more then once. </para> </example> <para>XInclude 1.1 has special <tag class="attribute">set-xml-id</tag> -which can be used for changing or completely removing of <tag -class="attribute">xml:id</tag> attribute on included content.</para> +attribute which can be used for changing or completely removing of +<tag class="attribute">xml:id</tag> attribute on included +content.</para> <example> <title>Removal of top-level ID during transclusion</title> @@ -483,7 +480,7 @@ <textdata fileref='src/book.006.xml.out'/> </textobject></programlisting> <para>Default behaviour of XInclude is not to do any postprocessing like -DocBook transclusions. The resulting document thuss contain duplicated +DocBook transclusions. The resulting document thus contain duplicated IDs and it is not valid.</para> </example> @@ -540,9 +537,15 @@ </appendix> <bibliography> +<!-- <bibliomixed xml:id="XI11"><title>XML Inclusions (XInclude) Version 1.1</title>. W3C Candidate Recommendation. 8 October 2013. Available at <link xlink:href="http://www.w3.org/TR/2013/CR-xinclude-11-20131008/"/></bibliomixed> +--> +<bibliomixed xml:id="XI11"><title>XML Inclusions (XInclude) Version 1.1</title>. W3C +Working Draft. 26 November 2014. Available at <link +xlink:href="http://www.w3.org/XML/2012/08/xinclude-11/"/></bibliomixed> + </bibliography> </article> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2014-12-04 17:09:08
|
Revision: 9954 http://sourceforge.net/p/docbook/code/9954 Author: kosek Date: 2014-12-04 17:09:05 +0000 (Thu, 04 Dec 2014) Log Message: ----------- More changes Modified Paths: -------------- trunk/docbook/relaxng/docbook/transclusion/transclusion.xml Modified: trunk/docbook/relaxng/docbook/transclusion/transclusion.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/transclusion.xml 2014-12-04 17:08:14 UTC (rev 9953) +++ trunk/docbook/relaxng/docbook/transclusion/transclusion.xml 2014-12-04 17:09:05 UTC (rev 9954) @@ -22,30 +22,16 @@ > is removed as a result of the transclusion (if that, in fact, > is what we want-that's what the examples make it look like). -> I still don't see where we explain what happens when a -> transcluded region contains an info element with definitions, -> especially in the case where we have profiling attributes -> involved. +Add xml:id where possible -> In Example 6, I don't see why os="linux" is chosen. -> Perhaps we just need to say: -> -> Result of transclusion when os="linux" -> -> or something like that to make this clearer. +--> -> Example 7 does not show the results of the transclusion. -> (And when it does, it will have to say what value of os was used.) +<section xml:id="intro"> +<title>Introduction</title> -> We need to say what happens with a ref element has both a name -> attribute and a fileref attribute. - - ---> - <para>This document describes syntax, semantics and processing model -of DocBook transclusion mechanism. Please be aware that this is early -stage draft – everything described below might change or disappear +of DocBook transclusion mechanism. Please be aware that this is a +working draft – everything described below might change or disappear completely. This proposal tries to resolve <citetitle xlink:href="http://docbook.org/docs/transclusion-requirements/">Requirements for transclusion in DocBook</citetitle>. DocBook TC welcomes any @@ -62,13 +48,9 @@ new features that allow to implement transclusion features on top of the XInclude. As a result transclusions were completely redesigned to be layered on top of XInclude 1.1.</para> -<para>This resulted in a loss of some features, notably:</para> -<itemizedlist> -<listitem><para>It's no longer possible to locally redefine text -replacement (see <link -xlink:href="http://docbook.org/docs/transclusion/2011-04-20/transclusion.html#d6e65">example</link>).</para></listitem> -<listitem><para><remark>anything else?</remark></para></listitem> -</itemizedlist> +<para>This resulted in a loss of some features, notably it's no longer +possible to locally redefine text replacement (see <link +xlink:href="http://docbook.org/docs/transclusion/2011-04-20/transclusion.html#d6e65">example</link>).</para> </note> <para>The following namespace bindings are assumed if namespace prefix @@ -100,6 +82,7 @@ </listitem> </varlistentry> </variablelist> +</section> <section> <title>Transclusion processing</title> @@ -118,87 +101,158 @@ xlink:href="http://www.w3.org/XML/2012/08/xinclude-11/Overview.html#attribute-copying">4.3 Attribute Copying when processing XML</citetitle>.</para> -<para>Transclusion processor copies document node by node. For most of nodes this is identity transformation with few exceptions controlled by the following attributes:</para> +<para>Transclusion processor copies document node by node. For most +nodes this is an identity transformation with few exceptions +controlled by transclusion properties. Transclusion properties +<property>suffix</property> and <property>linkscope</property> are +defined for each node in the document as follows:</para> <variablelist> <varlistentry> -<term><tag class="attribute">trans:idfixup</tag></term> +<term>suffix</term> <listitem> -<para>This attribute controls how IDs are going to be adjusted during -transclusion. This attribute affects node on which is present and all -its descendants.</para> +<para>Suffix defines value to append to all ID values on the node +(values are defined in <property>ID-list</property> property).</para> +<para>Default suffix is an empty string.</para> +<para>This property is inherited.</para> +<para>It's value can be changed by <tag +class="attribute">trans:idfixup</tag> and <tag +class="attribute">trans:suffix</tag> attributes.</para> +</listitem> +</varlistentry> + +<varlistentry> +<term>linkscope</term> +<listitem> +<para>Linkscope defines how to correct +references to IDs on the node (which values has to be corrected is +defined by <property>IDREF-list</property> property).</para> +<para>Allowed values are <code>user</code>, <code>local</code>, +<code>near</code> and <code>global</code></para> +<para>Default linkscope mode is <code>near</code>.</para> +<para>This property is inherited.</para> +<para>It's value can be changed by <tag +class="attribute">trans:linkscope</tag> attribute.</para> +</listitem> +</varlistentry> +</variablelist> + +<para>For each document type there are two additonal properties +<property>ID-list</property> and <property>IDREF-list</property> +controlling transclusion process. <property>ID-list</property> +property defines attributes and elements where IDs can +appear. Similarly <property>IDREF-list</property> defines attributes +and elements where references to ID can appear. For DocBook 5.0 +definition of those properties can be found in <xref +linkend="docbook-lists-defintion"/>. Transclusion processors are free +to support <property>ID-list</property> and +<property>IDREF-list</property> configurations for other document +types, for example DocBook 4.x or TEI. This allows to use transclusion +with different document types.</para> + +<para>For each node ID references contained in attributes or elements +defined in <property>IDREF-list</property> are corrected as follows:</para> + <variablelist> <varlistentry> -<term><tag class="attvalue">none</tag></term> -<listitem><para>No ID adjustment is done.</para> -<para>This is default behavior if attribute is not specified. This -must be default in order to keep compatibility with -XInclude.</para></listitem> +<term>When <code>linkscope=user</code></term> +<listitem><para>No adjustment is done.</para></listitem> </varlistentry> <varlistentry> -<term><tag class="attvalue">suffix</tag></term> -<listitem><para>All IDs on element and its descendants are suffixed with a -value specified in <tag class="attribute">trans:suffix</tag> -attribute.</para></listitem> +<term>When <code>linkscope=local</code></term> +<listitem><para>All ID references on element are suffixed +by value of the suffix property.</para> +</listitem> </varlistentry> <varlistentry> -<term><tag class="attvalue">auto</tag></term> -<listitem><para>All IDs on element and its descendants are suffixed -with a value which is unique for each element<footnote><para>For -example XSLT based implementations can use -<function>generate-id()</function> function to generate such unique -prefix.</para></footnote></para> +<term>When <code>linkscope=near</code></term> +<listitem><para>All ID references on element are adjusted to point to +the closest element which has a <link linkend="matching-id">matching +ID</link>.</para> +<para>When searching for the closest element with a matching ID ancestor elements of +the element with an ID reference are gradually inspected and matching ID +is searched between all their descendants. If there is no matching ID, then +parent is inspected and so on until match is found or document root is +reached.</para> </listitem> </varlistentry> +<varlistentry> +<term>When <code>linkscope=global</code></term> +<listitem><para>All ID references on element are adjusted to point to +the first element in document order which has a <link +linkend="matching-id">matching ID</link>.</para> +</listitem> +</varlistentry> </variablelist> + +<para xml:id="matching-id">A matching ID doesn't mean string equality +between ID and IDREF values – it is sufficient if first parts of ID and +IDREF values after removal of possibly added suffixes are matching.</para> + +<para>On any element value of transclusion properties can be set +by the following attributes:</para> + +<variablelist> +<varlistentry> +<term><tag class="attribute">trans:idfixup</tag> attribute</term> +<listitem> +<variablelist> +<varlistentry> +<term>value <tag class="attvalue">none</tag></term> +<listitem><para>Suffix transclusion property is set to an empty string.</para> </listitem> </varlistentry> +<varlistentry> +<term>value <tag class="attvalue">suffix</tag></term> +<listitem><para>Suffix transclusion property is set to concetanation +of the inherited suffix value and and value specified in <tag +class="attribute">trans:suffix</tag> attribute.</para> +</listitem> +</varlistentry> +<varlistentry> +<term>value <tag class="attvalue">auto</tag></term> +<listitem><para>Suffix transclusion property is set to a value which +is unique for each element.<footnote><para>For example XSLT based +implementations can use <function>generate-id()</function> function to +generate such unique suffix.</para></footnote></para> +</listitem> +</varlistentry> +</variablelist> +</listitem> +</varlistentry> <varlistentry> -<term><tag class="attribute">trans:suffix</tag></term> +<term><tag class="attribute">trans:suffix</tag> attribute</term> <listitem> -<para>Suffix to use when <code>trans:idfixup="suffix"</code>.</para> +<para>Value of this attribute contributes to suffix transclusion +property.</para> +<para>It's an error to specify this attribute when +<code>trans:idfixup="suffix"</code> is not specified on the element as +well.</para> </listitem> </varlistentry> <varlistentry> -<term><tag class="attribute">trans:linkscope</tag></term> +<term><tag class="attribute">trans:linkscope</tag> attribute</term> <listitem> -<para>This attribute defines how refences to IDs have -to be corrected.</para> <variablelist> <varlistentry> -<term><tag class="attvalue">user</tag></term> -<listitem><para>No IDREF adjustment is done</para></listitem> +<term>value <tag class="attvalue">user</tag></term> +<listitem><para>Linkscope property is set to <code>user</code>.</para></listitem> </varlistentry> <varlistentry> -<term><tag class="attvalue">local</tag></term> -<listitem><para>All IDREFs on element and its descendants are suffixed -by user specified suffix (when -<literal>trans:idfixup="suffix"</literal>) or auto-generated suffix -(when <literal>trans:idfixup="auto"</literal>).</para> +<term>value <tag class="attvalue">local</tag></term> +<listitem><para>Linkscope property is set to <code>local</code>.</para> </listitem> </varlistentry> <varlistentry> -<term><tag class="attvalue">near</tag></term> -<listitem><para>All IDREFs on element and its descendant are adjusted -to point to the closest element which has a matching ID. A matching ID -doesn't mean string equality between ID and IDREF values – it is -sufficient if first part of ID and IDREF after removal of possibly -added suffixes is matching.</para> -<para>When searching for the closest element ancestor elements of -an element with an IDREF attribute are gradually inspected and matching ID -is searched between all their descendants. If there is no matching ID, then -parent is inspected and so on until match is found or document root is -reached.</para></listitem> +<term>value <tag class="attvalue">near</tag></term> +<listitem><para>Linkscope property is set to <code>near</code>.</para> +</listitem> </varlistentry> <varlistentry> -<term><tag class="attvalue">global</tag></term> -<listitem><para>All IDREFs on element and its descendants are adjusted -to point to the first element in document order which has a matching -ID. A matching ID doesn't mean string equality between ID and IDREF -values – it is sufficient if the second part of ID and IDREF after -removal of possibly added prefixes are matching.</para> +<term>value <tag class="attvalue">global</tag></term> +<listitem><para>Linkscope property is set to <code>global</code>.</para> </listitem> </varlistentry> </variablelist> @@ -207,20 +261,45 @@ </variablelist> +<para>During transclusion process all attributes from transclusion +namespace are removed from the resulting document.</para> + +<variablelist xml:id="docbook-lists-defintion"> +<title>Definition of ID-list and IDREF-list properties for DocBook +5.0</title> +<varlistentry> +<term><property>ID-list</property></term> +<listitem><para>Following attribute is member: <tag class="attribute">xml:id</tag>.</para></listitem> +</varlistentry> +<varlistentry> +<term><property>IDREF-list</property></term> +<listitem><para>Following attributes are members: +<tag class="attribute">linkend</tag>, +<tag class="attribute">linkends</tag>, +<tag class="attribute">otherterm</tag>, +<tag class="attribute">zone</tag>, +<tag class="attribute">startref</tag>, +<tag class="attribute">arearefs</tag>, +<tag class="attribute">targetptr</tag>, +<tag class="attribute">endterm</tag>.</para> +<para>Also attribute <tag class="attribute">href</tag> in XLink +namespace is member of this list if its value begins with <code>#</code>.</para> +</listitem> +</varlistentry> +</variablelist> + </section> -<section> +<appendix> <title>Using new XInclude 1.1 features for your content</title> -<para>An inline reference is denoted by the <tag>ref</tag> element -with a mandatory <tag class="attribute">name</tag> attribute which -contains the name of referenced content. This name is case-sensitive -and the document must contain a definition of the referenced content -in the <tag>definitions</tag> element.</para> +<para>The most common transclusion scenario is reuse of shared strings +(see <link +xlink:href="http://docbook.org/docs/transclusion-requirements/transclusion-requirements.html#uc-1"/>). With +XInclude 1.0 this was possible only using fancy XPointer schemes which +were not very interoperable. With XInclude 1.1 situation is more easier.</para> -<para>Definitions can be placed directly inside an <tag>info</tag> -element or they can be stored in a separate file which can be -referenced by multiple documents.</para> +<para>Let's assume we have definitions of shared strings.</para> <example> <title>Definitions stored in a separate document (<filename>definitions.001.xml</filename>)</title> @@ -229,6 +308,8 @@ </textobject></programlisting> </example> +<para>Now, their naive reuse leads to duplicate IDs problem.</para> + <example> <title>Usage of definitions stored in a separate document and problem of duplicated IDs</title> <programlisting><textobject> @@ -245,7 +326,7 @@ <para>XInclude 1.1 has special <tag class="attribute">set-xml-id</tag> which can be used for changing or completely removing of <tag -class="attribute">xml:id</tag> on included content.</para> +class="attribute">xml:id</tag> attribute on included content.</para> <example> <title>Removal of top-level ID during transclusion</title> @@ -258,9 +339,36 @@ </textobject></programlisting> </example> -</section> +<para>Another new XInclude 1.1 feature is ability to override +attributes on included content. This can be used for example for +overriding of effectivity attributes. In order to do that you must put +your attributes on <tag>xi:include</tag> element in a special +namespace +<uri>http://www.w3.org/2001/XInclude/local-attributes</uri>.</para> -<section> +<example> +<title>Overriding of DocBook attributes on inclusion</title> +<para>Consider section (<filename>section.001.xml</filename>) which is +labeled as for Linux (<code>os="linux"</code>).</para> +<programlisting><textobject> +<textdata fileref='src/section.001.xml'/> +</textobject></programlisting> +<para>Now we want to include it into another document and pretend that +it's actually targeted at BSD-like system.</para> +<programlisting><textobject> +<textdata fileref='src/article.002.xml'/> +</textobject></programlisting> +<para>This <code>local:os</code> attribute is changed into +<code>os</code> attribute in no namespace during XInclude +processing.</para> +<programlisting><textobject> +<textdata fileref='src/article.002.xml.out'/> +</textobject></programlisting> +</example> + +</appendix> + +<appendix> <title>Special ID/IDREF processing</title> <para>Transcluded content can contain an <tag @@ -340,7 +448,7 @@ <para>We used <literal>db:linkscope="local"</literal> on the first transclusion. This means that no link from this transclusion can point outside of this transclusion. Because there was such link -(<quote>buy</quote> link), thus the result of transclusion is broken because +(<quote>buy</quote> link), the result of transclusion is broken because there is no corresponding target for IDREF <literal>buy---d1e23</literal>.</para> <para>This method of transclusion might be useful if you are @@ -379,18 +487,45 @@ IDs and it is not valid.</para> </example> -</section> +<example> +<title>Chaining of suffixes</title> +<para>Suppose we have note in a separate file +(<filename>note.001.xml</filename>):</para> +<programlisting><textobject> +<textdata fileref='src/note.001.xml'/> +</textobject></programlisting> +<para>We transclude it into another file +(<filename>procedure.002.xml</filename>) with manual suffix +assignment:</para> +<programlisting><textobject> +<textdata fileref='src/procedure.002.xml'/> +</textobject></programlisting> +<para>And then this procedure is transcluded into master document, +again with manually specified suffix:</para> +<programlisting><textobject> +<textdata fileref='src/book.012.xml'/> +</textobject></programlisting> +<para>In transcluded content ID of note contains chained +suffix:</para> +<programlisting><textobject> +<textdata fileref='src/book.012.xml.out'/> +</textobject></programlisting> +</example> -<!-- +</appendix> + <appendix> <title>DocBook schema with support for transclusions</title> +<para>TBD</para> + +<!-- <programlisting><textobject> <textdata fileref='src/db-transclusions.rnc'/> </textobject></programlisting> +--> </appendix> ---> <appendix> <title>Sample transclusion processor written in XSLT 2.0</title> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2014-12-04 17:08:23
|
Revision: 9953 http://sourceforge.net/p/docbook/code/9953 Author: kosek Date: 2014-12-04 17:08:14 +0000 (Thu, 04 Dec 2014) Log Message: ----------- Removed unused examples, regenerated output Modified Paths: -------------- trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml.out trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.003.xml.out trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.010.xml.out Removed Paths: ------------- trunk/docbook/relaxng/docbook/transclusion/src/article.001.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.001.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.008.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.009.xml.out trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.001.xml.out trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.002.xml.out trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.004.xml.out trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.005.xml.out trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.006.xml.out trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.007.xml.out trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.008.xml.out Deleted: trunk/docbook/relaxng/docbook/transclusion/src/article.001.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/article.001.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/article.001.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<article xmlns="http://docbook.org/ns/docbook"> - <title>Sample article</title> - <para>Leading text</para> - <section xml:base="file:/e:/texts/docbook/tc/transclusions/module.001.xml"> - <title>Module which is going to be shared across several documents</title> - <para>Bla bla bla</para> - </section> -</article> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/book.001.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.001.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.001.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> - <title>Sample book</title> - <article xmlns:ta="http://docbook.org/xslt/ns/transclusion-annotation" - xml:base="file:/e:/texts/docbook/tc/transclusions/article.001.xml"> - <title>Sample article</title> - <para>Leading text</para> - <section xml:base="file:/e:/texts/docbook/tc/transclusions/module.001.xml"> - <title>Module which is going to be shared across several documents</title> - <para>Bla bla bla</para> - </section> - </article> - <article xmlns:ta="http://docbook.org/xslt/ns/transclusion-annotation" - xml:base="file:/e:/texts/docbook/tc/transclusions/shared-texts.002.xml"> - <info> - <title>Transclusions demo</title> - <author> - <personname><firstname>Jirka</firstname><surname>Kosek</surname></personname> - </author> - </info> - <para>This article was written by - <personname><firstname>Jirka</firstname><surname>Kosek</surname></personname> when there - was 25C outside.</para> - </article> -</book> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,30 +1,41 @@ -<?xml version="1.0" encoding="UTF-8"?><book xmlns="http://docbook.org/ns/docbook" version="5.0"> +<?xml version="1.0" encoding="UTF-8"?> +<book xmlns="http://docbook.org/ns/docbook" version="5.0"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> - <title>Buying printer</title> - <para>Grab money, go to shop, ...</para> + <title>Buying printer</title> + <para>Grab money, go to shop, ...</para> </chapter> <chapter> - <title>Quick installation guide</title> - <para>Carefully follow all procedures bellow.</para> - <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e23"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. + <title>Quick installation guide</title> + <para>Carefully follow all procedures bellow.</para> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e23"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. If you don't have printer, consider <link linkend="buy">buying one</link>.</para> - <step xml:id="s1---d1e23"><para>Make sure that you have paper.</para></step> - <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e23"/></para></step> -</procedure> + <step xml:id="s1---d1e23"> + <para>Make sure that you have paper.</para> + </step> + <step> + <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e23"/> + </para> + </step> + </procedure> </chapter> <chapter> - <title>Maintenance</title> - <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> - <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e56"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. + <title>Maintenance</title> + <para>Be friendly to your printer when you speak to it.</para> + <para>If green led is blinking, please add missing paper using the following procedure.</para> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e56"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. If you don't have printer, consider <link linkend="buy">buying one</link>.</para> - <step xml:id="s1---d1e56"><para>Make sure that you have paper.</para></step> - <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e56"/></para></step> -</procedure> + <step xml:id="s1---d1e56"> + <para>Make sure that you have paper.</para> + </step> + <step> + <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e56"/> + </para> + </step> + </procedure> </chapter> -</book> \ No newline at end of file +</book> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,30 +1,41 @@ -<?xml version="1.0" encoding="UTF-8"?><book xmlns="http://docbook.org/ns/docbook" version="5.0"> +<?xml version="1.0" encoding="UTF-8"?> +<book xmlns="http://docbook.org/ns/docbook" version="5.0"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> - <title>Buying printer</title> - <para>Grab money, go to shop, ...</para> + <title>Buying printer</title> + <para>Grab money, go to shop, ...</para> </chapter> <chapter> - <title>Quick installation guide</title> - <para>Carefully follow all procedures bellow.</para> - <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e23"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. + <title>Quick installation guide</title> + <para>Carefully follow all procedures bellow.</para> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e23"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. If you don't have printer, consider <link linkend="buy">buying one</link>.</para> - <step xml:id="s1---d1e23"><para>Make sure that you have paper.</para></step> - <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e23"/></para></step> -</procedure> + <step xml:id="s1---d1e23"> + <para>Make sure that you have paper.</para> + </step> + <step> + <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e23"/> + </para> + </step> + </procedure> </chapter> <chapter> - <title>Maintenance</title> - <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> - <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e56"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. + <title>Maintenance</title> + <para>Be friendly to your printer when you speak to it.</para> + <para>If green led is blinking, please add missing paper using the following procedure.</para> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e56"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. If you don't have printer, consider <link linkend="buy">buying one</link>.</para> - <step xml:id="s1---d1e56"><para>Make sure that you have paper.</para></step> - <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e23"/></para></step> -</procedure> + <step xml:id="s1---d1e56"> + <para>Make sure that you have paper.</para> + </step> + <step> + <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e23"/> + </para> + </step> + </procedure> </chapter> -</book> \ No newline at end of file +</book> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,30 +1,41 @@ -<?xml version="1.0" encoding="UTF-8"?><book xmlns="http://docbook.org/ns/docbook" version="5.0"> +<?xml version="1.0" encoding="UTF-8"?> +<book xmlns="http://docbook.org/ns/docbook" version="5.0"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> - <title>Buying printer</title> - <para>Grab money, go to shop, ...</para> + <title>Buying printer</title> + <para>Grab money, go to shop, ...</para> </chapter> <chapter> - <title>Quick installation guide</title> - <para>Carefully follow all procedures bellow.</para> - <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e23"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. + <title>Quick installation guide</title> + <para>Carefully follow all procedures bellow.</para> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e23"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. If you don't have printer, consider <link linkend="buy---d1e23">buying one</link>.</para> - <step xml:id="s1---d1e23"><para>Make sure that you have paper.</para></step> - <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e23"/></para></step> -</procedure> + <step xml:id="s1---d1e23"> + <para>Make sure that you have paper.</para> + </step> + <step> + <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e23"/> + </para> + </step> + </procedure> </chapter> <chapter> - <title>Maintenance</title> - <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> - <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e56"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. + <title>Maintenance</title> + <para>Be friendly to your printer when you speak to it.</para> + <para>If green led is blinking, please add missing paper using the following procedure.</para> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e56"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. If you don't have printer, consider <link linkend="buy">buying one</link>.</para> - <step xml:id="s1---d1e56"><para>Make sure that you have paper.</para></step> - <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e56"/></para></step> -</procedure> + <step xml:id="s1---d1e56"> + <para>Make sure that you have paper.</para> + </step> + <step> + <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e56"/> + </para> + </step> + </procedure> </chapter> -</book> \ No newline at end of file +</book> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,30 +1,41 @@ -<?xml version="1.0" encoding="UTF-8"?><book xmlns="http://docbook.org/ns/docbook" version="5.0"> +<?xml version="1.0" encoding="UTF-8"?> +<book xmlns="http://docbook.org/ns/docbook" version="5.0"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> - <title>Buying printer</title> - <para>Grab money, go to shop, ...</para> + <title>Buying printer</title> + <para>Grab money, go to shop, ...</para> </chapter> <chapter> - <title>Quick installation guide</title> - <para>Carefully follow all procedures bellow.</para> - <procedure xml:base="procedure.001.xml" xml:id="paper-insert_install-proc"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. + <title>Quick installation guide</title> + <para>Carefully follow all procedures bellow.</para> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert_install-proc"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. If you don't have printer, consider <link linkend="buy">buying one</link>.</para> - <step xml:id="s1_install-proc"><para>Make sure that you have paper.</para></step> - <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1_install-proc"/></para></step> -</procedure> + <step xml:id="s1_install-proc"> + <para>Make sure that you have paper.</para> + </step> + <step> + <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1_install-proc"/> + </para> + </step> + </procedure> </chapter> <chapter> - <title>Maintenance</title> - <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> - <procedure xml:base="procedure.001.xml" xml:id="paper-insert_maintain-proc"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. + <title>Maintenance</title> + <para>Be friendly to your printer when you speak to it.</para> + <para>If green led is blinking, please add missing paper using the following procedure.</para> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert_maintain-proc"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. If you don't have printer, consider <link linkend="buy">buying one</link>.</para> - <step xml:id="s1_maintain-proc"><para>Make sure that you have paper.</para></step> - <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1_maintain-proc"/></para></step> -</procedure> + <step xml:id="s1_maintain-proc"> + <para>Make sure that you have paper.</para> + </step> + <step> + <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1_maintain-proc"/> + </para> + </step> + </procedure> </chapter> -</book> \ No newline at end of file +</book> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,30 +1,41 @@ -<?xml version="1.0" encoding="UTF-8"?><book xmlns="http://docbook.org/ns/docbook" version="5.0"> +<?xml version="1.0" encoding="UTF-8"?> +<book xmlns="http://docbook.org/ns/docbook" version="5.0"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> - <title>Buying printer</title> - <para>Grab money, go to shop, ...</para> + <title>Buying printer</title> + <para>Grab money, go to shop, ...</para> </chapter> <chapter> - <title>Quick installation guide</title> - <para>Carefully follow all procedures bellow.</para> - <procedure xml:base="procedure.001.xml" xml:id="paper-insert"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. + <title>Quick installation guide</title> + <para>Carefully follow all procedures bellow.</para> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. If you don't have printer, consider <link linkend="buy">buying one</link>.</para> - <step xml:id="s1"><para>Make sure that you have paper.</para></step> - <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1"/></para></step> -</procedure> + <step xml:id="s1"> + <para>Make sure that you have paper.</para> + </step> + <step> + <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1"/> + </para> + </step> + </procedure> </chapter> <chapter> - <title>Maintenance</title> - <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> - <procedure xml:base="procedure.001.xml" xml:id="paper-insert"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. + <title>Maintenance</title> + <para>Be friendly to your printer when you speak to it.</para> + <para>If green led is blinking, please add missing paper using the following procedure.</para> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. If you don't have printer, consider <link linkend="buy">buying one</link>.</para> - <step xml:id="s1"><para>Make sure that you have paper.</para></step> - <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1"/></para></step> -</procedure> + <step xml:id="s1"> + <para>Make sure that you have paper.</para> + </step> + <step> + <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1"/> + </para> + </step> + </procedure> </chapter> -</book> \ No newline at end of file +</book> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><book xmlns="http://docbook.org/ns/docbook" version="5.0"> - <title>Definitive Printer Guide</title> - <chapter xml:id="buy"> - <title>Buying printer</title> - <para>Grab money, go to shop, ...</para> - </chapter> - <chapter> - <title>Quick installation guide</title> - <para>Carefully follow all procedures bellow.</para> - <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e23"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. - If you don't have printer, consider <link linkend="buy">buying one</link>.</para> - <step xml:id="s1---d1e23"><para>Make sure that you have paper.</para></step> - <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e23"/></para></step> -</procedure> - </chapter> - <chapter> - <title>Maintenance</title> - <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> - <procedure xml:base="procedure.001.xml" xml:id="paper-insert"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. - If you don't have printer, consider <link linkend="s1">buying one</link>.</para> - <step xml:id="s1"><para>Make sure that you have paper.</para></step> - <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1"/></para></step> -</procedure> - </chapter> -</book> \ No newline at end of file Deleted: trunk/docbook/relaxng/docbook/transclusion/src/book.008.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.008.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.008.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> - <title>Definitive Printer Guide</title> - <chapter xml:id="buy"> - <title>Buying printer</title> - <para>Grab money, go to shop, ...</para> - </chapter> - <chapter> - <title>Quick installation guide</title> - <para>Carefully follow all procedures bellow.</para> - <procedure xml:id="paper-insert" - xml:base="file:/e:/texts/docbook/tc/transclusions/procedure.001.xml"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. If you don't have printer, consider <link - linkend="buy">buying one</link>.</para> - <step xml:id="s1"> - <para>Make sure that you have paper.</para> - </step> - <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1"/></para> - </step> - </procedure> - </chapter> - <chapter> - <title>Maintenance</title> - <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> - <procedure xml:base="file:/e:/texts/docbook/tc/transclusions/procedure.001.xml"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. If you don't have printer, consider <link - linkend="buy">buying one</link>.</para> - <step> - <para>Make sure that you have paper.</para> - </step> - <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1"/></para> - </step> - </procedure> - </chapter> -</book> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/book.009.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.009.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.009.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> - <title>Sample book</title> - <article xmlns:ta="http://docbook.org/xslt/ns/transclusion-annotation" - xml:base="file:/e:/texts/docbook/tc/transclusions/shared-texts.009.xml" ta:linkscope="near" - ta:prefix="d3e5---"> - <info> - <title>Transclusions demo</title> - </info> - <figure ta:linkscope="near" ta:prefix="d8e23---" xml:id="d8e23---flow-chart"> - <title>Sample figure</title> - <para>There should be nice flow chart graphics.</para> - </figure> - <para><xref linkend="d8e23---flow-chart"/></para> - <section> - <title>Sample section</title> - <figure ta:linkscope="near" ta:prefix="d8e33---" xml:id="d8e33---flow-chart"> - <title>Sample figure</title> - <para>There should be nice flow chart graphics.</para> - </figure> - <para><xref linkend="d8e23---flow-chart"/></para> - </section> - <appendix> - <title>Sample appendix</title> - <para><xref linkend="d8e23---flow-chart"/></para> - </appendix> - </article> -</book> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.001.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.001.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.001.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<article xmlns="http://docbook.org/ns/docbook"> - <info> - <title>Transclusions demo</title> - </info> - <para>The latest version of <application>FooWiz</application> from ACME Inc. is 3.14.</para> -</article> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.002.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.002.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.002.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<article xmlns="http://docbook.org/ns/docbook"> - <info> - <title>Transclusions demo</title> - <author> - <personname><firstname>Jirka</firstname><surname>Kosek</surname></personname> - </author> - </info> - <para>This article was written by - <personname><firstname>Jirka</firstname><surname>Kosek</surname></personname> - when there was 25C outside.</para> -</article> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.003.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.003.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.003.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,10 +1,13 @@ -<?xml version="1.0" encoding="UTF-8"?><article xmlns="http://docbook.org/ns/docbook" version="5.0"> +<?xml version="1.0" encoding="UTF-8"?> +<article xmlns="http://docbook.org/ns/docbook" version="5.0"> <info> - <title>Transclusions demo</title> + <title>Transclusions demo</title> </info> <para>The latest version of - <application><phrase xml:base="definitions.001.xml" xml:id="product-name">FooWiz</phrase></application> from + <application> + <phrase xml:base="definitions.001.xml" xml:id="product-name">FooWiz</phrase> + </application> from <phrase xml:base="definitions.001.xml" xml:id="corp-name">ACME Inc.</phrase> is <phrase xml:base="definitions.001.xml" xml:id="product-version">3.14</phrase>.</para> <para>You can buy <phrase xml:base="definitions.001.xml" xml:id="product-name">FooWiz</phrase> in our on-line store.</para> -</article> \ No newline at end of file +</article> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.004.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.004.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.004.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<article xmlns="http://docbook.org/ns/docbook"> - <info> - <title>Transclusions demo</title> - </info> - <para>The latest version of <application>FooWiz</application> - from ACME Inc. is 4.01.</para> -</article> \ No newline at end of file Deleted: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.005.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.005.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.005.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<article xmlns="http://docbook.org/ns/docbook"> - <info> - <title>Transclusions demo</title> - </info> - <para>The latest version of <application>Linux Protector</application> - from ACME Inc. is 3.14.</para> -</article> \ No newline at end of file Deleted: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.006.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.006.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.006.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<article xmlns="http://docbook.org/ns/docbook"> - <info> - <title>Transclusions demo</title> - </info> - <para>The latest version of - <application>Windows ProtectorLinux Protector</application> - from ACME Inc. is 3.14.</para> -</article> \ No newline at end of file Deleted: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.007.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.007.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.007.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> - <info> - <title>ACME Inc. company product guide</title> - </info> - <article> - <info> - <title>FooWiz Guide</title> - </info> - <para>The latest version of <application>FooWiz</application> - from ACME Inc. is 3.14.</para> - </article> - <article> - <info> - <title>Knit-o-Matic Guide</title> - </info> - <para>The latest version of <application>Knit-o-Matic</application> - from ACME Inc. is 4.2.</para> - </article> -</book> \ No newline at end of file Deleted: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.008.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.008.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.008.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<article xmlns="http://docbook.org/ns/docbook"> - <info> - <title>Transclusions demo</title> - </info> - <para>This is article about history of ACME Inc..</para> -</article> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.010.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.010.xml.out 2014-12-04 17:04:26 UTC (rev 9952) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.010.xml.out 2014-12-04 17:08:14 UTC (rev 9953) @@ -1,10 +1,13 @@ -<?xml version="1.0" encoding="UTF-8"?><article xmlns="http://docbook.org/ns/docbook" version="5.0"> +<?xml version="1.0" encoding="UTF-8"?> +<article xmlns="http://docbook.org/ns/docbook" version="5.0"> <info> - <title>Transclusions demo</title> + <title>Transclusions demo</title> </info> <para>The latest version of - <application><phrase xml:base="definitions.001.xml">FooWiz</phrase></application> from + <application> + <phrase xml:base="definitions.001.xml">FooWiz</phrase> + </application> from <phrase xml:base="definitions.001.xml">ACME Inc.</phrase> is <phrase xml:base="definitions.001.xml">3.14</phrase>.</para> <para>You can buy <phrase xml:base="definitions.001.xml">FooWiz</phrase> in our on-line store.</para> -</article> \ No newline at end of file +</article> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2014-12-04 17:04:35
|
Revision: 9952 http://sourceforge.net/p/docbook/code/9952 Author: kosek Date: 2014-12-04 17:04:26 +0000 (Thu, 04 Dec 2014) Log Message: ----------- Removed unused files Modified Paths: -------------- trunk/docbook/relaxng/docbook/transclusion/src/transclude.xsl Removed Paths: ------------- trunk/docbook/relaxng/docbook/transclusion/src/article.001.xml trunk/docbook/relaxng/docbook/transclusion/src/book.001.xml trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml trunk/docbook/relaxng/docbook/transclusion/src/book.008.xml trunk/docbook/relaxng/docbook/transclusion/src/book.009.xml trunk/docbook/relaxng/docbook/transclusion/src/book.010.xml trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.001.xml trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.002.xml trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.004.xml trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.005.xml trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.006.xml trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.007.xml trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.008.xml trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.009.xml Deleted: trunk/docbook/relaxng/docbook/transclusion/src/article.001.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/article.001.xml 2014-12-03 17:44:08 UTC (rev 9951) +++ trunk/docbook/relaxng/docbook/transclusion/src/article.001.xml 2014-12-04 17:04:26 UTC (rev 9952) @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<article xmlns="http://docbook.org/ns/docbook" xml:id="art-1"> - <title>Sample article</title> - <para>Leading text</para> - <ref fileref="module.001.xml"/> -</article> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/book.001.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.001.xml 2014-12-03 17:44:08 UTC (rev 9951) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.001.xml 2014-12-04 17:04:26 UTC (rev 9952) @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> - <title>Sample book</title> - <ref fileref="article.001.xml"/> - <ref fileref="shared-texts.002.xml"/> -</book> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml 2014-12-03 17:44:08 UTC (rev 9951) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml 2014-12-04 17:04:26 UTC (rev 9952) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook" - xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:trans="http://docbook.org/ns/transclude" - version="5.0"> - <title>Definitive Printer Guide</title> - <chapter xml:id="buy"> - <title>Buying printer</title> - <para>Grab money, go to shop, ...</para> - </chapter> - <chapter> - <title>Quick installation guide</title> - <para>Carefully follow all procedures bellow.</para> - <xi:include href="procedure.001.xml" trans:idfixup="auto"/> - </chapter> - <chapter> - <title>Maintenance</title> - <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> - <!-- idfixup="strip" is not supported in the latest draft --> - <xi:include href="procedure.001.xml" trans:idfixup="strip"/> - </chapter> -</book> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/book.008.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.008.xml 2014-12-03 17:44:08 UTC (rev 9951) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.008.xml 2014-12-04 17:04:26 UTC (rev 9952) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook" - xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:trans="http://docbook.org/ns/transclude" - version="5.0"> - <title>Definitive Printer Guide</title> - <chapter xml:id="buy"> - <title>Buying printer</title> - <para>Grab money, go to shop, ...</para> - </chapter> - <chapter> - <title>Quick installation guide</title> - <para>Carefully follow all procedures bellow.</para> - <xi:include href="procedure.001.xml" trans:linkscope="user"/> - </chapter> - <chapter> - <title>Maintenance</title> - <para>Be friendly to your printer when you speak to it.</para> - <para>If green led is blinking, please add missing paper using the following procedure.</para> - <!-- idfixup="strip" is not supported in the latest draft --> - <xi:include href="procedure.001.xml" trans:idfixup="strip" trans:linkscope="user"/> - </chapter> -</book> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/book.009.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.009.xml 2014-12-03 17:44:08 UTC (rev 9951) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.009.xml 2014-12-04 17:04:26 UTC (rev 9952) @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> - <title>Sample book</title> - <ref fileref="shared-texts.009.xml"/> -</book> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/book.010.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.010.xml 2014-12-03 17:44:08 UTC (rev 9951) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.010.xml 2014-12-04 17:04:26 UTC (rev 9952) @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> - <title>Sample book</title> - <ref fileref="shared-texts.009.xml"/> - <appendix> - <title>Source of module</title> - <programlisting><ref fileref="shared-texts.009.xml" parse="text"/></programlisting> - </appendix> -</book> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.001.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.001.xml 2014-12-03 17:44:08 UTC (rev 9951) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.001.xml 2014-12-04 17:04:26 UTC (rev 9952) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<article xmlns="http://docbook.org/ns/docbook" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0"> - <info> - <title>Transclusions demo</title> - <my:definitions xmlns:my="http://example.com"> - <phrase xml:id="product-version">3.14</phrase> - <phrase xml:id="product-name">FooWiz</phrase> - <phrase xml:id="corp-name">ACME Inc.</phrase> - </my:definitions> - </info> - <para>The latest version of <application> - <xi:include href="" xpointer="product-name"/> - </application> from <xi:include href="" - xpointer="corp-name"/> is <xi:include href="" xpointer="product-version" - />.</para> -</article> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.002.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.002.xml 2014-12-03 17:44:08 UTC (rev 9951) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.002.xml 2014-12-04 17:04:26 UTC (rev 9952) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<article xmlns="http://docbook.org/ns/docbook"> - <info> - <title>Transclusions demo</title> - <author><ref name="jirka"/></author> - <definitions> - <def name="jirka"> - <personname><firstname>Jirka</firstname><surname>Kosek</surname></personname> - </def> - </definitions> - </info> - <para>This article was written by <ref name="jirka"/> when there was 25C outside.</para> -</article> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.004.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.004.xml 2014-12-03 17:44:08 UTC (rev 9951) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.004.xml 2014-12-04 17:04:26 UTC (rev 9952) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<article xmlns="http://docbook.org/ns/docbook"> - <info> - <title>Transclusions demo</title> - <definitions definitionfile="definitions.001.xml"> - <!-- Local definition will override definition from external definitions file --> - <def name="product-version">4.01</def> - </definitions> - </info> - <para>The latest version of <application><ref name="product-name"/></application> - from <ref name="corp-name"/> is <ref name="product-version"/>.</para> -</article> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.005.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.005.xml 2014-12-03 17:44:08 UTC (rev 9951) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.005.xml 2014-12-04 17:04:26 UTC (rev 9952) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<article xmlns="http://docbook.org/ns/docbook"> - <info> - <title>Transclusions demo</title> - <definitions> - <def name="product-version">3.14</def> - <!-- Conditional definitions --> - <def name="product-name" os="win">Windows Protector</def> - <def name="product-name" os="linux">Linux Protector</def> - <def name="corp-name">ACME Inc.</def> - </definitions> - </info> - <para>The latest version of <application><ref name="product-name"/></application> - from <ref name="corp-name"/> is <ref name="product-version"/>.</para> -</article> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.006.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.006.xml 2014-12-03 17:44:08 UTC (rev 9951) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.006.xml 2014-12-04 17:04:26 UTC (rev 9952) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<article xmlns="http://docbook.org/ns/docbook"> - <info> - <title>Transclusions demo</title> - <definitions> - <def name="product-version">3.14</def> - <def name="product-name-win">Windows Protector</def> - <def name="product-name-lin">Linux Protector</def> - <def name="corp-name">ACME Inc.</def> - </definitions> - </info> - <para>The latest version of - <!-- Conditional references --> - <application><ref os="win" name="product-name-win"/><ref os="linux" name="product-name-lin"/></application> - from <ref name="corp-name"/> is <ref name="product-version"/>.</para> -</article> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.007.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.007.xml 2014-12-03 17:44:08 UTC (rev 9951) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.007.xml 2014-12-04 17:04:26 UTC (rev 9952) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> - <info> - <title><ref name="corp-name"/> company product guide</title> - <!-- Multiple definitions in single document --> - <definitions> - <def name="corp-name">ACME Inc.</def> - </definitions> - </info> - <article> - <info> - <title><ref name="product-name"/> Guide</title> - <definitions> - <def name="product-version">3.14</def> - <def name="product-name">FooWiz</def> - </definitions> - </info> - <para>The latest version of <application><ref name="product-name"/></application> - from <ref name="corp-name"/> is <ref name="product-version"/>.</para> - </article> - <article> - <info> - <title><ref name="product-name"/> Guide</title> - <definitions> - <def name="product-version">4.2</def> - <def name="product-name">Knit-o-Matic</def> - </definitions> - </info> - <para>The latest version of <application><ref name="product-name"/></application> - from <ref name="corp-name"/> is <ref name="product-version"/>.</para> - </article> -</book> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.008.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.008.xml 2014-12-03 17:44:08 UTC (rev 9951) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.008.xml 2014-12-04 17:04:26 UTC (rev 9952) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<article xmlns="http://docbook.org/ns/docbook"> - <info> - <title>Transclusions demo</title> - </info> - <para>This is article about history of <ref definitionfile="definitions.001.xml" name="corp-name"/>.</para> -</article> Deleted: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.009.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.009.xml 2014-12-03 17:44:08 UTC (rev 9951) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.009.xml 2014-12-04 17:04:26 UTC (rev 9952) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<article xmlns="http://docbook.org/ns/docbook"> - <info> - <title>Transclusions demo</title> - <definitions> - <def name="flow-chart-fig"> - <figure xml:id="flow-chart"> - <title>Sample figure</title> - <para>There should be nice flow chart graphics.</para> - </figure> - </def> - </definitions> - </info> - <ref name="flow-chart-fig"/> - <para><xref linkend="flow-chart"/></para> - <section> - <title>Sample section</title> - <ref name="flow-chart-fig"/> - <para><xref linkend="flow-chart"/></para> - </section> - <appendix> - <title>Sample appendix</title> - <para><xref linkend="flow-chart"/></para> - </appendix> -</article> Modified: trunk/docbook/relaxng/docbook/transclusion/src/transclude.xsl =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/transclude.xsl 2014-12-03 17:44:08 UTC (rev 9951) +++ trunk/docbook/relaxng/docbook/transclusion/src/transclude.xsl 2014-12-04 17:04:26 UTC (rev 9952) @@ -8,23 +8,27 @@ xmlns:xia="http://www.w3.org/2001/XInclude/local-attributes" exclude-result-prefixes="f mp xs ta xia"> +<!-- Remove for production files, pretty print can harm mixed content --> +<xsl:output indent="yes"/> + <xsl:template match="/"> - <xsl:variable name="resolved" select="f:resolve-references(/)"/> - <xsl:variable name="result" select="f:adjust-idrefs($resolved)"/> + <xsl:variable name="adjusted" select="f:adjust-ids(/)"/> + <xsl:variable name="result" select="f:adjust-idrefs($adjusted)"/> <xsl:sequence select="f:transclude-cleanup($result)"/> </xsl:template> <!-- Separator for auto generated suffixes --> <xsl:param name="psep" select="'---'"/> -<xsl:function name="f:resolve-references" as="node()+"> +<!-- Function and mode for changing IDs based on provided suffix --> +<xsl:function name="f:adjust-ids" as="node()+"> <xsl:param name="doc" as="node()+"/> <xsl:apply-templates select="$doc" mode="mp:transclude"/> </xsl:function> <xsl:template match="node()" mode="mp:transclude"> - <xsl:param name="idfixup" select="'auto'" tunnel="yes"/> + <xsl:param name="idfixup" select="'none'" tunnel="yes"/> <xsl:param name="suffix" tunnel="yes"/> <xsl:copy> <xsl:copy-of select="@* except @xml:id"/> @@ -43,15 +47,18 @@ </xsl:template> <xsl:template match="node()[@ta:*]" mode="mp:transclude"> - <xsl:variable name="idfixup" select="if (@ta:idfixup) then @ta:idfixup else 'auto'"/> + <xsl:param name="idfixup" select="'none'" tunnel="yes"/> + <xsl:param name="suffix" tunnel="yes"/> + + <xsl:variable name="new-idfixup" select="if (@ta:idfixup) then @ta:idfixup else $idfixup"/> <xsl:variable name="linkscope" select="if (@ta:linkscope) then @ta:linkscope else 'near'"/> - <xsl:variable name="suffix"> + <xsl:variable name="new-suffix"> <xsl:choose> - <xsl:when test="$idfixup = 'auto'"> + <xsl:when test="$new-idfixup = 'auto'"> <xsl:sequence select="concat($psep, generate-id(.))"/> </xsl:when> - <xsl:when test="$idfixup = 'suffix'"> - <xsl:sequence select="string(@ta:suffix)"/> + <xsl:when test="$new-idfixup = 'suffix'"> + <xsl:sequence select="concat($suffix, @ta:suffix)"/> </xsl:when> <xsl:otherwise></xsl:otherwise> </xsl:choose> @@ -61,22 +68,23 @@ <xsl:copy-of select="@* except @xml:id"/> <xsl:if test="@xml:id"> <xsl:choose> - <xsl:when test="($idfixup = 'none')"> + <xsl:when test="($new-idfixup = 'none')"> <xsl:copy-of select="@xml:id"/> </xsl:when> <xsl:otherwise> - <xsl:attribute name="xml:id" select="concat(@xml:id, $suffix)"/> + <xsl:attribute name="xml:id" select="concat(@xml:id, $new-suffix)"/> </xsl:otherwise> </xsl:choose> </xsl:if> - <xsl:attribute name="ta:suffix" select="$suffix"/> + <xsl:attribute name="ta:suffix" select="$new-suffix"/> <xsl:apply-templates mode="mp:transclude"> - <xsl:with-param name="idfixup" select="$idfixup" tunnel="yes"/> - <xsl:with-param name="suffix" select="$suffix" tunnel="yes"/> + <xsl:with-param name="idfixup" select="$new-idfixup" tunnel="yes"/> + <xsl:with-param name="suffix" select="$new-suffix" tunnel="yes"/> </xsl:apply-templates> </xsl:copy> </xsl:template> +<!-- Function and mode for adjusting references to IDs --> <xsl:function name="f:adjust-idrefs" as="node()+"> <xsl:param name="doc" as="node()+"/> @@ -116,6 +124,7 @@ </xsl:attribute> </xsl:template> +<!-- Function searches nearest matching ID in a given context --> <xsl:function name="f:nearest-matching-id" as="xs:string?"> <xsl:param name="idref" as="xs:string"/> <xsl:param name="context" as="node()"/> @@ -151,6 +160,13 @@ <xsl:key name="unprefixed-id" match="*[@xml:id]" use="f:unprefixed-id(@xml:id, .)"/> --> +<!-- Function and mode for removing transclusion attributes from the final output --> +<xsl:function name="f:transclude-cleanup" as="node()+"> + <xsl:param name="doc" as="node()+"/> + + <xsl:apply-templates select="$doc" mode="mp:transclude-cleanup"/> +</xsl:function> + <xsl:template match="node()" mode="mp:transclude-cleanup"> <xsl:copy> <xsl:apply-templates mode="mp:transclude-cleanup"/> @@ -164,10 +180,4 @@ </xsl:element> </xsl:template> -<xsl:function name="f:transclude-cleanup" as="node()+"> - <xsl:param name="doc" as="node()+"/> - - <xsl:apply-templates select="$doc" mode="mp:transclude-cleanup"/> -</xsl:function> - </xsl:stylesheet> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2014-12-03 17:44:20
|
Revision: 9951 http://sourceforge.net/p/docbook/code/9951 Author: kosek Date: 2014-12-03 17:44:08 +0000 (Wed, 03 Dec 2014) Log Message: ----------- Updating to new version of transclusion Modified Paths: -------------- trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml.out trunk/docbook/relaxng/docbook/transclusion/src/book.008.xml trunk/docbook/relaxng/docbook/transclusion/src/definitions.001.xml trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.001.xml trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.003.xml trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.003.xml.out trunk/docbook/relaxng/docbook/transclusion/src/transclude.xsl trunk/docbook/relaxng/docbook/transclusion/transclusion.xml Added Paths: ----------- trunk/docbook/relaxng/docbook/transclusion/src/fake-xinclude.xsl trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.010.xml trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.010.xml.out Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml 2014-12-03 17:44:08 UTC (rev 9951) @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <book xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:db="http://docbook.org/ns/docbook"> + xmlns:trans="http://docbook.org/ns/transclude" + version="5.0"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -10,12 +11,12 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <xi:include href="procedure.001.xml" db:idfixup="auto"/> + <xi:include href="procedure.001.xml" trans:idfixup="auto"/> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <xi:include href="procedure.001.xml" db:idfixup="auto"/> + <xi:include href="procedure.001.xml" trans:idfixup="auto"/> </chapter> </book> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml.out 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml.out 2014-12-03 17:44:08 UTC (rev 9951) @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> +<?xml version="1.0" encoding="UTF-8"?><book xmlns="http://docbook.org/ns/docbook" version="5.0"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -8,36 +7,24 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <procedure xml:id="d2e22---paper-insert" - xml:base="file:/e:/texts/docbook/tc/transclusions/procedure.001.xml"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. If you don't have printer, consider <link - linkend="buy">buying one</link>.</para> - <step xml:id="d2e22---s1"> - <para>Make sure that you have paper.</para> - </step> - <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="d2e22---s1" - /></para> - </step> - </procedure> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e23"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. + If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <step xml:id="s1---d1e23"><para>Make sure that you have paper.</para></step> + <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e23"/></para></step> +</procedure> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <procedure xml:id="d2e36---paper-insert" - xml:base="file:/e:/texts/docbook/tc/transclusions/procedure.001.xml"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. If you don't have printer, consider <link - linkend="buy">buying one</link>.</para> - <step xml:id="d2e36---s1"> - <para>Make sure that you have paper.</para> - </step> - <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="d2e36---s1" - /></para> - </step> - </procedure> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e56"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. + If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <step xml:id="s1---d1e56"><para>Make sure that you have paper.</para></step> + <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e56"/></para></step> +</procedure> </chapter> </book> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml 2014-12-03 17:44:08 UTC (rev 9951) @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <book xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:db="http://docbook.org/ns/docbook"> + xmlns:trans="http://docbook.org/ns/transclude" + version="5.0"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -10,12 +11,12 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <xi:include href="procedure.001.xml" db:idfixup="auto"/> + <xi:include href="procedure.001.xml" trans:idfixup="auto"/> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <xi:include href="procedure.001.xml" db:idfixup="auto" db:linkscope="global"/> + <xi:include href="procedure.001.xml" trans:idfixup="auto" trans:linkscope="global"/> </chapter> </book> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml.out 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml.out 2014-12-03 17:44:08 UTC (rev 9951) @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> +<?xml version="1.0" encoding="UTF-8"?><book xmlns="http://docbook.org/ns/docbook" version="5.0"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -8,36 +7,24 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <procedure xml:id="d2e22---paper-insert" - xml:base="file:/e:/texts/docbook/tc/transclusions/procedure.001.xml"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. If you don't have printer, consider <link - linkend="buy">buying one</link>.</para> - <step xml:id="d2e22---s1"> - <para>Make sure that you have paper.</para> - </step> - <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="d2e22---s1" - /></para> - </step> - </procedure> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e23"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. + If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <step xml:id="s1---d1e23"><para>Make sure that you have paper.</para></step> + <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e23"/></para></step> +</procedure> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <procedure xml:id="d2e36---paper-insert" - xml:base="file:/e:/texts/docbook/tc/transclusions/procedure.001.xml"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. If you don't have printer, consider <link - linkend="buy">buying one</link>.</para> - <step xml:id="d2e36---s1"> - <para>Make sure that you have paper.</para> - </step> - <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="d2e22---s1" - /></para> - </step> - </procedure> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e56"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. + If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <step xml:id="s1---d1e56"><para>Make sure that you have paper.</para></step> + <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e23"/></para></step> +</procedure> </chapter> </book> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml 2014-12-03 17:44:08 UTC (rev 9951) @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <book xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:db="http://docbook.org/ns/docbook"> + xmlns:trans="http://docbook.org/ns/transclude" + version="5.0"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -10,12 +11,12 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <xi:include href="procedure.001.xml" db:idfixup="auto" db:linkscope="local"/> + <xi:include href="procedure.001.xml" trans:idfixup="auto" trans:linkscope="local"/> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <xi:include href="procedure.001.xml" db:idfixup="auto"/> + <xi:include href="procedure.001.xml" trans:idfixup="auto"/> </chapter> </book> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml.out 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml.out 2014-12-03 17:44:08 UTC (rev 9951) @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> +<?xml version="1.0" encoding="UTF-8"?><book xmlns="http://docbook.org/ns/docbook" version="5.0"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -8,36 +7,24 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <procedure xml:id="d2e22---paper-insert" - xml:base="file:/e:/texts/docbook/tc/transclusions/procedure.001.xml"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. If you don't have printer, consider <link - linkend="d2e22---buy">buying one</link>.</para> - <step xml:id="d2e22---s1"> - <para>Make sure that you have paper.</para> - </step> - <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="d2e22---s1" - /></para> - </step> - </procedure> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e23"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. + If you don't have printer, consider <link linkend="buy---d1e23">buying one</link>.</para> + <step xml:id="s1---d1e23"><para>Make sure that you have paper.</para></step> + <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e23"/></para></step> +</procedure> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <procedure xml:id="d2e36---paper-insert" - xml:base="file:/e:/texts/docbook/tc/transclusions/procedure.001.xml"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. If you don't have printer, consider <link - linkend="buy">buying one</link>.</para> - <step xml:id="d2e36---s1"> - <para>Make sure that you have paper.</para> - </step> - <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="d2e36---s1" - /></para> - </step> - </procedure> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e56"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. + If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <step xml:id="s1---d1e56"><para>Make sure that you have paper.</para></step> + <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e56"/></para></step> +</procedure> </chapter> -</book> +</book> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml 2014-12-03 17:44:08 UTC (rev 9951) @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <book xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:db="http://docbook.org/ns/docbook"> + xmlns:trans="http://docbook.org/ns/transclude" + version="5.0"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -10,12 +11,12 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <xi:include href="procedure.001.xml" db:id="install-proc" db:idfixup="prefix" db:prefix="install-proc_"/> + <xi:include href="procedure.001.xml" trans:idfixup="suffix" trans:suffix="_install-proc"/> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <xi:include href="procedure.001.xml" db:id="maintain-proc" db:idfixup="prefix" db:prefix="maintain-proc_"/> + <xi:include href="procedure.001.xml" trans:idfixup="suffix" trans:suffix="_maintain-proc"/> </chapter> </book> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml.out 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml.out 2014-12-03 17:44:08 UTC (rev 9951) @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> +<?xml version="1.0" encoding="UTF-8"?><book xmlns="http://docbook.org/ns/docbook" version="5.0"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -8,36 +7,24 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <procedure xml:id="install-proc_paper-insert" - xml:base="file:/e:/texts/docbook/tc/transclusions/procedure.001.xml"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. If you don't have printer, consider <link - linkend="buy">buying one</link>.</para> - <step xml:id="install-proc_s1"> - <para>Make sure that you have paper.</para> - </step> - <step> - <para>Insert paper into printer. If you don't have paper consult <xref - linkend="install-proc_s1"/></para> - </step> - </procedure> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert_install-proc"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. + If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <step xml:id="s1_install-proc"><para>Make sure that you have paper.</para></step> + <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1_install-proc"/></para></step> +</procedure> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <procedure xml:id="maintain-proc_paper-insert" - xml:base="file:/e:/texts/docbook/tc/transclusions/procedure.001.xml"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. If you don't have printer, consider <link - linkend="buy">buying one</link>.</para> - <step xml:id="maintain-proc_s1"> - <para>Make sure that you have paper.</para> - </step> - <step> - <para>Insert paper into printer. If you don't have paper consult <xref - linkend="maintain-proc_s1"/></para> - </step> - </procedure> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert_maintain-proc"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. + If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <step xml:id="s1_maintain-proc"><para>Make sure that you have paper.</para></step> + <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1_maintain-proc"/></para></step> +</procedure> </chapter> </book> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml 2014-12-03 17:44:08 UTC (rev 9951) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <book xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:db="http://docbook.org/ns/docbook"> + version="5.0"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml.out 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml.out 2014-12-03 17:44:08 UTC (rev 9951) @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> +<?xml version="1.0" encoding="UTF-8"?><book xmlns="http://docbook.org/ns/docbook" version="5.0"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -8,34 +7,24 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <procedure xml:id="paper-insert" - xml:base="file:/e:/texts/docbook/tc/transclusions/procedure.001.xml"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. If you don't have printer, consider <link - linkend="buy">buying one</link>.</para> - <step xml:id="s1"> - <para>Make sure that you have paper.</para> - </step> - <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1"/></para> - </step> - </procedure> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. + If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <step xml:id="s1"><para>Make sure that you have paper.</para></step> + <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1"/></para></step> +</procedure> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <procedure xml:id="paper-insert" - xml:base="file:/e:/texts/docbook/tc/transclusions/procedure.001.xml"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. If you don't have printer, consider <link - linkend="buy">buying one</link>.</para> - <step xml:id="s1"> - <para>Make sure that you have paper.</para> - </step> - <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="s1"/></para> - </step> - </procedure> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. + If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <step xml:id="s1"><para>Make sure that you have paper.</para></step> + <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1"/></para></step> +</procedure> </chapter> -</book> +</book> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml 2014-12-03 17:44:08 UTC (rev 9951) @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <book xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:db="http://docbook.org/ns/docbook"> + xmlns:trans="http://docbook.org/ns/transclude" + version="5.0"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -10,12 +11,13 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <xi:include href="procedure.001.xml" db:idfixup="auto"/> + <xi:include href="procedure.001.xml" trans:idfixup="auto"/> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <xi:include href="procedure.001.xml" db:idfixup="strip"/> + <!-- idfixup="strip" is not supported in the latest draft --> + <xi:include href="procedure.001.xml" trans:idfixup="strip"/> </chapter> </book> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml.out 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml.out 2014-12-03 17:44:08 UTC (rev 9951) @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> +<?xml version="1.0" encoding="UTF-8"?><book xmlns="http://docbook.org/ns/docbook" version="5.0"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -8,36 +7,24 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <procedure xml:id="d2e22---paper-insert" - xml:base="file:/e:/texts/docbook/tc/transclusions/procedure.001.xml"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. If you don't have printer, consider <link - linkend="buy">buying one</link>.</para> - <step xml:id="d2e22---s1"> - <para>Make sure that you have paper.</para> - </step> - <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="d2e22---s1" - /></para> - </step> - </procedure> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert---d1e23"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. + If you don't have printer, consider <link linkend="buy">buying one</link>.</para> + <step xml:id="s1---d1e23"><para>Make sure that you have paper.</para></step> + <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1---d1e23"/></para></step> +</procedure> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <procedure - xml:base="file:/e:/texts/docbook/tc/transclusions/procedure.001.xml"> - <title>Inserting paper into printer</title> - <para>This procedure is targeted to printer owners. If you don't have printer, consider <link - linkend="buy">buying one</link>.</para> - <step> - <para>Make sure that you have paper.</para> - </step> - <step> - <para>Insert paper into printer. If you don't have paper consult <xref linkend="d2e22---s1" - /></para> - </step> - </procedure> + <procedure xml:base="procedure.001.xml" xml:id="paper-insert"> + <title>Inserting paper into printer</title> + <para>This procedure is targeted to printer owners. + If you don't have printer, consider <link linkend="s1">buying one</link>.</para> + <step xml:id="s1"><para>Make sure that you have paper.</para></step> + <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1"/></para></step> +</procedure> </chapter> -</book> +</book> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.008.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.008.xml 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.008.xml 2014-12-03 17:44:08 UTC (rev 9951) @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <book xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:db="http://docbook.org/ns/docbook"> + xmlns:trans="http://docbook.org/ns/transclude" + version="5.0"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -10,12 +11,13 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <xi:include href="procedure.001.xml" db:linkscope="user"/> + <xi:include href="procedure.001.xml" trans:linkscope="user"/> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <xi:include href="procedure.001.xml" db:idfixup="strip" db:linkscope="user"/> + <!-- idfixup="strip" is not supported in the latest draft --> + <xi:include href="procedure.001.xml" trans:idfixup="strip" trans:linkscope="user"/> </chapter> </book> Modified: trunk/docbook/relaxng/docbook/transclusion/src/definitions.001.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/definitions.001.xml 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/src/definitions.001.xml 2014-12-03 17:44:08 UTC (rev 9951) @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<definitions xmlns="http://docbook.org/ns/docbook"> - <def name="product-version">3.14</def> - <def name="product-name">FooWiz</def> - <def name="corp-name">ACME Inc.</def> -</definitions> +<article xmlns="http://docbook.org/ns/docbook" version="5.0"> + <title>Placeholder for definitions</title> + <para> + <phrase xml:id="product-version">3.14</phrase> + <phrase xml:id="product-name">FooWiz</phrase> + <phrase xml:id="corp-name">ACME Inc.</phrase> + </para> +</article> Added: trunk/docbook/relaxng/docbook/transclusion/src/fake-xinclude.xsl =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/fake-xinclude.xsl (rev 0) +++ trunk/docbook/relaxng/docbook/transclusion/src/fake-xinclude.xsl 2014-12-03 17:44:08 UTC (rev 9951) @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="utf-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0" + xmlns:f="http://docbook.org/xslt/ns/extension" + xmlns:mp="http://docbook.org/xslt/ns/mode/private" + xmlns:db="http://docbook.org/ns/docbook" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:xia="http://www.w3.org/2001/XInclude/local-attributes" + exclude-result-prefixes="f mp xs db xi xia"> + +<xsl:template match="node()"> + <xsl:copy> + <xsl:copy-of select="@*"/> + <xsl:apply-templates/> + </xsl:copy> +</xsl:template> + +<xsl:template match="xi:include[not(@parse) or (@parse = 'xml')]"> + <xsl:variable name="doc" select="doc(resolve-uri(@href, base-uri(.)))"/> + <xsl:variable name="node"> + <xsl:choose> + <xsl:when test="@xpointer"> + <xsl:sequence select="$doc//*[@xml:id = current()/@xpointer]"/> + </xsl:when> + <xsl:otherwise> + <xsl:sequence select="$doc/node()"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:apply-templates select="$node" mode="fix-outer-node"> + <xsl:with-param name="set-xml-id" select="not(empty(@set-xml-id))"/> + <xsl:with-param name="id" select="@set-xml-id"/> + <xsl:with-param name="attrs" select="@*[namespace-uri() != ''] except (@xml:* | @xia:*)"/> + <xsl:with-param name="local-attrs" select="@xia:*"/> + <xsl:with-param name="base-uri" select="(: resolve-uri( :) @href (:, base-uri(.)):)"/> + </xsl:apply-templates> +</xsl:template> + +<xsl:template match="node()[not(self::*)]" mode="fix-outer-node"> + <xsl:copy> + <xsl:apply-templates/> + </xsl:copy> +</xsl:template> + +<xsl:template match="*" mode="fix-outer-node"> + <xsl:param name="set-xml-id"/> + <xsl:param name="id"/> + <xsl:param name="attrs"/> + <xsl:param name="local-attrs"/> + <xsl:param name="base-uri"/> + <xsl:copy> + <xsl:copy-of select="@* except @xml:id[$set-xml-id]"/> + <xsl:copy-of select="$attrs"/> + <xsl:for-each select="$local-attrs"> + <xsl:attribute name="{local-name(.)}" select="."/> + </xsl:for-each> + <xsl:if test="$set-xml-id and $id ne ''"> + <xsl:attribute name="xml:id" select="$id"/> + </xsl:if> + <xsl:attribute name="xml:base" select="$base-uri"/> + <xsl:apply-templates/> + </xsl:copy> +</xsl:template> + +<xsl:template match="xi:include[@parse = 'text']"> + <xsl:copy-of select="unparsed-text(resolve-uri(@href, base-uri(.)))"/> +</xsl:template> + +</xsl:stylesheet> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.001.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.001.xml 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.001.xml 2014-12-03 17:44:08 UTC (rev 9951) @@ -1,13 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<article xmlns="http://docbook.org/ns/docbook"> +<article xmlns="http://docbook.org/ns/docbook" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0"> <info> <title>Transclusions demo</title> - <definitions> - <def name="product-version">3.14</def> - <def name="product-name">FooWiz</def> - <def name="corp-name">ACME Inc.</def> - </definitions> + <my:definitions xmlns:my="http://example.com"> + <phrase xml:id="product-version">3.14</phrase> + <phrase xml:id="product-name">FooWiz</phrase> + <phrase xml:id="corp-name">ACME Inc.</phrase> + </my:definitions> </info> - <para>The latest version of <application><ref name="product-name"/></application> - from <ref name="corp-name"/> is <ref name="product-version"/>.</para> + <para>The latest version of <application> + <xi:include href="" xpointer="product-name"/> + </application> from <xi:include href="" + xpointer="corp-name"/> is <xi:include href="" xpointer="product-version" + />.</para> </article> Modified: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.003.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.003.xml 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.003.xml 2014-12-03 17:44:08 UTC (rev 9951) @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<article xmlns="http://docbook.org/ns/docbook"> +<article xmlns="http://docbook.org/ns/docbook" version="5.0" + xmlns:xi="http://www.w3.org/2001/XInclude"> <info> <title>Transclusions demo</title> - <!-- Definitions are loaded from external file --> - <definitions definitionfile="definitions.001.xml"/> </info> - <para>The latest version of <application><ref name="product-name"/></application> - from <ref name="corp-name"/> is <ref name="product-version"/>.</para> + <para>The latest version of + <application><xi:include href="definitions.001.xml" xpointer="product-name"/></application> from + <xi:include href="definitions.001.xml" xpointer="corp-name"/> + is <xi:include href="definitions.001.xml" xpointer="product-version"/>.</para> + <para>You can buy <xi:include href="definitions.001.xml" xpointer="product-name"/> in our on-line store.</para> </article> Modified: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.003.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.003.xml.out 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.003.xml.out 2014-12-03 17:44:08 UTC (rev 9951) @@ -1,8 +1,10 @@ -<?xml version="1.0" encoding="UTF-8"?> -<article xmlns="http://docbook.org/ns/docbook"> +<?xml version="1.0" encoding="UTF-8"?><article xmlns="http://docbook.org/ns/docbook" version="5.0"> <info> <title>Transclusions demo</title> </info> - <para>The latest version of <application>FooWiz</application> - from ACME Inc. is 3.14.</para> + <para>The latest version of + <application><phrase xml:base="definitions.001.xml" xml:id="product-name">FooWiz</phrase></application> from + <phrase xml:base="definitions.001.xml" xml:id="corp-name">ACME Inc.</phrase> + is <phrase xml:base="definitions.001.xml" xml:id="product-version">3.14</phrase>.</para> + <para>You can buy <phrase xml:base="definitions.001.xml" xml:id="product-name">FooWiz</phrase> in our on-line store.</para> </article> \ No newline at end of file Added: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.010.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.010.xml (rev 0) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.010.xml 2014-12-03 17:44:08 UTC (rev 9951) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<article xmlns="http://docbook.org/ns/docbook" version="5.0" + xmlns:xi="http://www.w3.org/2001/XInclude"> + <info> + <title>Transclusions demo</title> + </info> + <para>The latest version of + <application><xi:include href="definitions.001.xml" xpointer="product-name" set-xml-id=""/></application> from + <xi:include href="definitions.001.xml" xpointer="corp-name" set-xml-id=""/> + is <xi:include href="definitions.001.xml" xpointer="product-version" set-xml-id=""/>.</para> + <para>You can buy <xi:include href="definitions.001.xml" xpointer="product-name" set-xml-id=""/> in our on-line store.</para> +</article> Added: trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.010.xml.out =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.010.xml.out (rev 0) +++ trunk/docbook/relaxng/docbook/transclusion/src/shared-texts.010.xml.out 2014-12-03 17:44:08 UTC (rev 9951) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?><article xmlns="http://docbook.org/ns/docbook" version="5.0"> + <info> + <title>Transclusions demo</title> + </info> + <para>The latest version of + <application><phrase xml:base="definitions.001.xml">FooWiz</phrase></application> from + <phrase xml:base="definitions.001.xml">ACME Inc.</phrase> + is <phrase xml:base="definitions.001.xml">3.14</phrase>.</para> + <para>You can buy <phrase xml:base="definitions.001.xml">FooWiz</phrase> in our on-line store.</para> +</article> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/src/transclude.xsl =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/transclude.xsl 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/src/transclude.xsl 2014-12-03 17:44:08 UTC (rev 9951) @@ -1,56 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0" - xmlns:f="http://docbook.org/xslt/ns/extension" - xmlns:mp="http://docbook.org/xslt/ns/mode/private" - xmlns:db="http://docbook.org/ns/docbook" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:ta="http://docbook.org/xslt/ns/transclusion-annotation" - exclude-result-prefixes="f mp xs"> + xmlns:f="http://docbook.org/xslt/ns/extension" + xmlns:mp="http://docbook.org/xslt/ns/mode/private" + xmlns:db="http://docbook.org/ns/docbook" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:ta="http://docbook.org/ns/transclude" + xmlns:xia="http://www.w3.org/2001/XInclude/local-attributes" + exclude-result-prefixes="f mp xs ta xia"> <xsl:template match="/"> - - <xsl:variable name="expanded" select="f:expand-definitions(/)"/> - - <xsl:variable name="resolved" select="f:resolve-references($expanded)"/> - + <xsl:variable name="resolved" select="f:resolve-references(/)"/> <xsl:variable name="result" select="f:adjust-idrefs($resolved)"/> - - <xsl:sequence select="$result"/> - + <xsl:sequence select="f:transclude-cleanup($result)"/> </xsl:template> -<!-- Separator for auto generated prefixes --> +<!-- Separator for auto generated suffixes --> <xsl:param name="psep" select="'---'"/> -<xsl:function name="f:transclude" as="node()+"> - <xsl:param name="doc" as="node()+"/> - - <xsl:variable name="expanded" select="f:expand-definitions($doc)"/> - <xsl:variable name="resolved" select="f:resolve-references($expanded)"/> - <xsl:sequence select="$resolved"/> -</xsl:function> - -<xsl:function name="f:expand-definitions" as="node()+"> - <xsl:param name="doc" as="node()+"/> - - <xsl:apply-templates select="$doc" mode="mp:expand-definitions"/> -</xsl:function> - -<xsl:template match="node()" mode="mp:expand-definitions"> - <xsl:copy> - <xsl:copy-of select="@*"/> - <xsl:apply-templates mode="mp:expand-definitions"/> - </xsl:copy> -</xsl:template> - -<xsl:template match="db:definitions[@definitionfile]" mode="mp:expand-definitions"> - <xsl:copy-of select="f:expand-definitions(doc(@definitionfile))"/> - <xsl:copy> - <xsl:copy-of select="@* except @definitionfile"/> - <xsl:apply-templates mode="mp:expand-definitions"/> - </xsl:copy> -</xsl:template> - <xsl:function name="f:resolve-references" as="node()+"> <xsl:param name="doc" as="node()+"/> @@ -59,197 +25,58 @@ <xsl:template match="node()" mode="mp:transclude"> <xsl:param name="idfixup" select="'auto'" tunnel="yes"/> - <xsl:param name="prefix" tunnel="yes"/> + <xsl:param name="suffix" tunnel="yes"/> <xsl:copy> <xsl:copy-of select="@* except @xml:id"/> <xsl:if test="@xml:id"> <xsl:choose> - <xsl:when test="($idfixup = 'none') or @ta:linkscope"> - <xsl:copy-of select="@xml:id"/> - </xsl:when> - <xsl:when test="$idfixup = 'strip'"> - </xsl:when> - <xsl:otherwise> - <xsl:attribute name="xml:id" select="concat($prefix, @xml:id)"/> - </xsl:otherwise> + <xsl:when test="($idfixup = 'none')"> + <xsl:copy-of select="@xml:id"/> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="xml:id" select="concat(@xml:id, $suffix)"/> + </xsl:otherwise> </xsl:choose> </xsl:if> - <xsl:apply-templates mode="mp:transclude"> - <xsl:with-param name="prefix" select="if (@ta:linkscope) then '' else $prefix"/> <!-- Prevent adding several prefixes on multi-level inclusions --> - </xsl:apply-templates> + <xsl:apply-templates mode="mp:transclude"/> </xsl:copy> </xsl:template> -<!-- FIMXE: this stripping is there just to have more compact output --> -<xsl:template match="db:definitions" mode="mp:transclude" priority="1"> -</xsl:template> - -<xsl:template match="db:ref[@name]" mode="mp:transclude"> - <xsl:variable name="name" select="@name"/> - <xsl:variable name="content"> +<xsl:template match="node()[@ta:*]" mode="mp:transclude"> + <xsl:variable name="idfixup" select="if (@ta:idfixup) then @ta:idfixup else 'auto'"/> + <xsl:variable name="linkscope" select="if (@ta:linkscope) then @ta:linkscope else 'near'"/> + <xsl:variable name="suffix"> <xsl:choose> - <xsl:when test="@definitionfile"> - <xsl:variable name="defs" select="f:expand-definitions(doc(@definitionfile))"/> - - <xsl:choose> - <xsl:when test="$defs/db:def[@name = $name]"> - <xsl:sequence select="($defs/db:def[@name = $name])[last()]/node()"/> - </xsl:when> - <xsl:otherwise> - <xsl:message>Error: definition of "<xsl:value-of select="$name"/>" was not found.</xsl:message> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:sequence select="f:definition-for-name(@name, .)"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="idfixup" select="if (@idfixup) then @idfixup else 'auto'"/> - - <xsl:variable name="linkscope" select="if (@linkscope) then @linkscope else 'near'"/> - - <xsl:variable name="prefix"> - <xsl:choose> <xsl:when test="$idfixup = 'auto'"> - <xsl:sequence select="concat(generate-id(.), $psep)"/> + <xsl:sequence select="concat($psep, generate-id(.))"/> </xsl:when> - <xsl:when test="$idfixup = 'prefix'"> - <xsl:sequence select="string(@prefix)"/> + <xsl:when test="$idfixup = 'suffix'"> + <xsl:sequence select="string(@ta:suffix)"/> </xsl:when> <xsl:otherwise></xsl:otherwise> </xsl:choose> </xsl:variable> - <xsl:variable name="ref-xmlid" select="@xml:id"/> - - <xsl:if test="count($content/(*|text()[normalize-space(.) ne ''])) > 1 and $ref-xmlid"> - <xsl:message>Error xml:id can't be added to definition without single outermost element.</xsl:message> - </xsl:if> - - <xsl:for-each select="$content/node()"> - <xsl:copy> - <xsl:variable name="xmlid" select="if ($ref-xmlid) then $ref-xmlid else @xml:id"/> - <xsl:copy-of select="@* except @xml:id"/> - <xsl:if test="self::*"> - <xsl:choose> - <xsl:when test="$idfixup = 'none' and $xmlid"> - <xsl:attribute name="xml:id" select="$xmlid"/> - </xsl:when> - <xsl:when test="($idfixup = 'strip' and not($ref-xmlid)) or not($xmlid)"> - </xsl:when> - <xsl:otherwise> - <xsl:attribute name="xml:id" select="concat($prefix, @xml:id)"/> - </xsl:otherwise> - </xsl:choose> - <!-- <xsl:attribute name="xml:base" select="$baseuri"/> --> - <xsl:attribute name="ta:linkscope" select="$linkscope"/> - <xsl:attribute name="ta:prefix" select="$prefix"/> - </xsl:if> - <xsl:apply-templates mode="mp:transclude"> - <xsl:with-param name="idfixup" select="$idfixup" tunnel="yes"/> - <xsl:with-param name="prefix" select="$prefix" tunnel="yes"/> - </xsl:apply-templates> - </xsl:copy> - </xsl:for-each> -</xsl:template> - -<xsl:function name="f:definition-for-name" as="node()*"> - <xsl:param name="name" as="xs:string"/> - <xsl:param name="context" as="node()"/> - - <xsl:variable name="closest-info-with-defs" select="$context/ancestor-or-self::*/db:info[db:definitions][1]"/> - - <xsl:choose> - <xsl:when test="$closest-info-with-defs"> + <xsl:copy> + <xsl:copy-of select="@* except @xml:id"/> + <xsl:if test="@xml:id"> <xsl:choose> - <xsl:when test="$closest-info-with-defs/db:definitions/db:def[@name = $name]"> - <xsl:sequence select="($closest-info-with-defs/db:definitions/db:def[@name = $name])[last()]/node()"/> - </xsl:when> - <xsl:otherwise> - <xsl:sequence select="f:definition-for-name($name, $closest-info-with-defs/../..)"/> - </xsl:otherwise> + <xsl:when test="($idfixup = 'none')"> + <xsl:copy-of select="@xml:id"/> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="xml:id" select="concat(@xml:id, $suffix)"/> + </xsl:otherwise> </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:message>Error: definition of "<xsl:value-of select="$name"/>" was not found.</xsl:message> - </xsl:otherwise> - </xsl:choose> -</xsl:function> - -<xsl:template match="db:ref[@parse eq 'text']" mode="mp:transclude"> - <xsl:choose> - <xsl:when test="@encoding"> - <xsl:sequence select="unparsed-text(@fileref, @encoding)"/> - </xsl:when> - <xsl:otherwise> - <xsl:sequence select="unparsed-text(@fileref)"/> - </xsl:otherwise> - </xsl:choose> + </xsl:if> + <xsl:attribute name="ta:suffix" select="$suffix"/> + <xsl:apply-templates mode="mp:transclude"> + <xsl:with-param name="idfixup" select="$idfixup" tunnel="yes"/> + <xsl:with-param name="suffix" select="$suffix" tunnel="yes"/> + </xsl:apply-templates> + </xsl:copy> </xsl:template> - -<xsl:template match="db:ref[@fileref and (@parse eq 'xml' or not(@parse))]" mode="mp:transclude"> - <xsl:variable name="doc"> - <xsl:choose> - <xsl:when test="@xpointer"> - <xsl:sequence select="f:transclude(doc(@fileref)//*[@xml:id = current()/@xpointer])"/> - </xsl:when> - <xsl:otherwise> - <xsl:sequence select="f:transclude(doc(@fileref))"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="baseuri" select="resolve-uri(@fileref, base-uri(.))"/> - - <xsl:variable name="idfixup" select="if (@idfixup) then @idfixup else 'auto'"/> - - <xsl:variable name="linkscope" select="if (@linkscope) then @linkscope else 'near'"/> - - <xsl:variable name="prefix"> - <xsl:choose> - <xsl:when test="$idfixup = 'auto'"> - <xsl:sequence select="concat(generate-id(.), $psep)"/> - </xsl:when> - <xsl:when test="$idfixup = 'prefix'"> - <xsl:sequence select="string(@prefix)"/> - </xsl:when> - <xsl:otherwise></xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="ref-xmlid" select="@xml:id"/> - - <xsl:for-each select="$doc/node()"> - <xsl:copy> - <xsl:variable name="xmlid" select="if ($ref-xmlid) then $ref-xmlid else @xml:id"/> - <xsl:copy-of select="@* except @xml:id"/> - <xsl:if test="self::*"> - <xsl:choose> - <xsl:when test="$idfixup = 'none' and $xmlid"> - <xsl:attribute name="xml:id" select="$xmlid"/> - </xsl:when> - <xsl:when test="($idfixup = 'strip' and not($ref-xmlid)) or not($xmlid)"> - </xsl:when> - <xsl:otherwise> - <xsl:attribute name="xml:id" select="concat($prefix, @xml:id)"/> - </xsl:otherwise> - </xsl:choose> - <xsl:attribute name="xml:base" select="$baseuri"/> - <xsl:attribute name="ta:linkscope" select="$linkscope"/> - <xsl:attribute name="ta:prefix" select="$prefix"/> - </xsl:if> - <xsl:apply-templates mode="mp:transclude"> - <xsl:with-param name="idfixup" select="$idfixup" tunnel="yes"/> - <xsl:with-param name="prefix" select="$prefix" tunnel="yes"/> - </xsl:apply-templates> - </xsl:copy> - <xsl:copy-of select="following-sibling::node()"/> - </xsl:for-each> -</xsl:template> - <xsl:function name="f:adjust-idrefs" as="node()+"> <xsl:param name="doc" as="node()+"/> @@ -269,21 +96,21 @@ <xsl:variable name="annotation" select="ancestor-or-self::*[@ta:linkscope][1]"/> <xsl:variable name="linkscope" select="($annotation/@ta:linkscope, 'near')[1]"/> - <xsl:variable name="prefix" select="$annotation/@ta:prefix"/> + <xsl:variable name="suffix" select="$annotation/@ta:suffix"/> <xsl:attribute name="{local-name(.)}"> <xsl:choose> <xsl:when test="$linkscope = 'user'"> - <xsl:value-of select="$idref"/> + <xsl:value-of select="$idref"/> </xsl:when> <xsl:when test="$linkscope = 'local'"> - <xsl:value-of select="concat($prefix, $idref)"/> + <xsl:value-of select="concat($idref, $suffix)"/> </xsl:when> <xsl:when test="$linkscope = 'near'"> - <xsl:value-of select="f:nearest-matching-id($idref, ..)"/> + <xsl:value-of select="f:nearest-matching-id($idref, ..)"/> </xsl:when> <xsl:when test="$linkscope = 'global'"> - <xsl:value-of select="f:nearest-matching-id($idref, root(.))"/> + <xsl:value-of select="f:nearest-matching-id($idref, root(.))"/> </xsl:when> </xsl:choose> </xsl:attribute> @@ -315,13 +142,32 @@ <xsl:param name="id" as="xs:string?"/> <xsl:param name="context" as="node()"/> - <xsl:variable name="prefix" select="$context/ancestor-or-self::*[@ta:prefix][1]/@ta:prefix"/> + <xsl:variable name="suffix" select="$context/ancestor-or-self::*[@ta:suffix][1]/@ta:suffix"/> - <xsl:sequence select="if ($prefix) then substring-after($id, $prefix) else $id"/> + <xsl:sequence select="if ($suffix) then substring-before($id, $suffix) else $id"/> </xsl:function> <!-- <xsl:key name="unprefixed-id" match="*[@xml:id]" use="f:unprefixed-id(@xml:id, .)"/> --> +<xsl:template match="node()" mode="mp:transclude-cleanup"> + <xsl:copy> + <xsl:apply-templates mode="mp:transclude-cleanup"/> + </xsl:copy> +</xsl:template> + +<xsl:template match="*" mode="mp:transclude-cleanup" priority="10"> + <xsl:element name="{name()}" namespace="{namespace-uri()}"> + <xsl:copy-of select="@* except @ta:*"/> + <xsl:apply-templates mode="mp:transclude-cleanup"/> + </xsl:element> +</xsl:template> + +<xsl:function name="f:transclude-cleanup" as="node()+"> + <xsl:param name="doc" as="node()+"/> + + <xsl:apply-templates select="$doc" mode="mp:transclude-cleanup"/> +</xsl:function> + </xsl:stylesheet> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/transclusion.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/transclusion.xml 2014-11-20 22:30:41 UTC (rev 9950) +++ trunk/docbook/relaxng/docbook/transclusion/transclusion.xml 2014-12-03 17:44:08 UTC (rev 9951) @@ -10,7 +10,7 @@ <email>ji...@ko...</email> </author> </authorgroup> - <pubdate>2014-09-XX</pubdate> + <pubdate>2014-12-XX</pubdate> <pubdate>2011-04-20</pubdate> <pubdate>2010-12-09</pubdate> </info> @@ -54,16 +54,12 @@ DocBook mailing list by sending email to <email>do...@li...</email>.</para> -<remark>Actually, for now the document is written more like -tutorial. If DocBook TC decides to incorporate this into DocBook, more -formal and precise specification will follow.</remark> - <note> <para>Previous version of this draft proposed new elements <tag>ref</tag> and <tag>def</tag> for implementing transclusions. Meanwhile DocBook TC decided that transclusions should rely as much as possible on standard technologies. XInclude 1.1 added -new features that allow to implement some transclusion features on +new features that allow to implement transclusion features on top of the XInclude. As a result transclusions were completely redesigned to be layered on top of XInclude 1.1.</para> <para>This resulted in a loss of some features, notably:</para> @@ -80,6 +76,12 @@ <variablelist> <varlistentry> +<term><tag class="prefix">trans</tag></term> +<listitem><para>DocBook transclusion namespace +(<uri>http://docbook.org/ns/transclusion</uri>)</para> +</listitem> +</varlistentry> +<varlistentry> <term><tag class="prefix">db</tag></term> <listitem><para>DocBook namespace (<uri>http://docbook.org/ns/docbook</uri>)</para> @@ -91,44 +93,40 @@ (<uri>http://www.w3.org/2001/XInclude</uri>)</para> </listitem> </varlistentry> +<varlistentry> +<term><tag class="prefix">local</tag></term> +<listitem><para>XInclude namespace for copying attributes without namespace +(<uri>http://www.w3.org/2001/XInclude/local-attributes</uri>)</para> +</listitem> +</varlistentry> </variablelist> <section> <title>Transclusion processing</title> -<para>XInclude 1.1 <xref linkend="XI11"/> in section <citetitle -xlink:href="http://www.w3.org/TR/2013/CR-xinclude-11-20131008/#attribute-copying">4.3 -Attribute Copying when processing XML</citetitle> defines new feature -which can be used for passing around attributes that control -transclusion processing.</para> +<para>Processing model of transclusion is very simple. First normal +XInclude processing is done on the input document. Then document is +modified by the transclusion processor in order to fix problems like +duplicate IDs or broken cross-references. The resulting document can +be then processed using normal tools.</para> -<para>Processing model of XInclude 1.1 based transclusion is -simple. First XInclude processing is done. Then before normal DocBook -processing additional DocBook transclusion step is applied which -can modify some attributes.</para> +<para>Transclusion processor is controlled by presence of special +attributes from <uri>http://docbook.org/ns/transclusion</uri> +namespace on elements. Those attributes are typicially inserted into +document by using new XInclude 1.1 <xref linkend="XI11"/> feature +described in section <citetitle +xlink:href="http://www.w3.org/XML/2012/08/xinclude-11/Overview.html#attribute-copying">4.3 +Attribute Copying when processing XML</citetitle>.</para> -<para>DocBook transclusion processor must support the following -attributes:</para> +<para>Transclusion processor copies document node by node. For most of nodes this is identity transformation with few exceptions controlled by the following attributes:</para> <variablelist> <varlistentry> -<term><tag class="attribute">db:id</tag></term> +<term><tag class="attribute">trans:idfixup</tag></term> <listitem> -<para>Specifies ID for transcluded content. If there is -<tag class="attribute">xml:id</tag> attribute present it's value must be replaced by the -value of <tag class="attribute">db:id</tag> attribute.</para> -<para>If <tag class="attribute">db:id</tag> is present, but empty, -then <tag class="attribute">xml:id</tag> must be removed from the element.</para> -<remark>Should we define what to do with <tag>db:id</tag> after -transclusion? Like remove/keep/don't care.</remark> -</listitem> -</varlistentry> - -<varlistentry> -<term><tag class="attribute">db:idfixup</tag></term> -<listitem> <para>This attribute controls how IDs are going to be adjusted during -transclusion.</para> +transclusion. This attribute affects node on which is present and all +its descendants.</para> <variablelist> <varlistentry> <term><tag class="attvalue">none</tag></term> @@ -138,21 +136,18 @@ XInclude.</para></listitem> </varlistentry> <varlistentry> -<term><tag class="attvalue">strip</tag></term> -<listitem><para>All IDs on element descendants are stripped.</para></listitem> -</varlistentry> -<varlistentry> -<term><tag class="attvalue">prefix</tag></term> -<listitem><para>All IDs on element descendants are prefixed with a -value specified in <tag class="attribute">db:prefix</tag> +<term><tag class="attvalue">suffix</tag></term> +<listitem><para>All IDs on element and its descendants are suffixed with a +value specified in <tag class="attribute">trans:suffix</tag> attribute.</para></listitem> </varlistentry> <varlistentry> <term><tag class="attvalue">auto</tag></term> -<listitem><para>All IDs on element descendants are prefixed with a -value which is unique for each element<footnote><para>For example XSLT -based implementations can use <function>generate-id()</function> to -generate such unique prefix.</para></footnote></para> +<listitem><para>All IDs on element and its descendants are suffixed +with a value which is unique for each element<footnote><para>For +example XSLT based implementations can use +<function>generate-id()</function> function to generate such unique +prefix.</para></footnote></para> </listitem> </varlistentry> </variablelist> @@ -160,16 +155,16 @@ </varlistentry> <varlistentry> -<term><tag class="attribute">db:prefix</tag></term> +<term><tag class="attribute">trans:suffix</tag></term> <listitem> -<para>Prefix to use when <code>db:idfixup="prefix"</code>.</para> +<para>Suffix to use when <code>trans:idfixup="suffix"</code>.</para> </listitem> </varlistentry> <varlistentry> -<term><tag class="attribute">db:linkscope</tag></term> +<term><tag class="attribute">trans:linkscope</tag></term> <listitem> -<para>This attribute defines how refences has +<para>This attribute defines how refences to IDs have to be corrected.</para> <variablelist> <varlistentry> @@ -178,19 +173,19 @... [truncated message content] |
From: <bob...@us...> - 2014-11-20 22:30:44
|
Revision: 9950 http://sourceforge.net/p/docbook/code/9950 Author: bobstayton Date: 2014-11-20 22:30:41 +0000 (Thu, 20 Nov 2014) Log Message: ----------- Remove redundant and out-of-date xsl:strip-space element. This is imported from common/common.xsl for all stylesheets. Modified Paths: -------------- trunk/xsl/manpages/other.xsl Modified: trunk/xsl/manpages/other.xsl =================================================================== --- trunk/xsl/manpages/other.xsl 2014-11-11 17:36:27 UTC (rev 9949) +++ trunk/xsl/manpages/other.xsl 2014-11-20 22:30:41 UTC (rev 9950) @@ -38,49 +38,6 @@ <!-- ==================================================================== --> -<xsl:preserve-space elements="*"/> - -<xsl:strip-space elements=" -abstract affiliation anchor answer appendix area areaset areaspec -artheader article audiodata audioobject author authorblurb authorgroup -beginpage bibliodiv biblioentry bibliography biblioset blockquote book -bookbiblio bookinfo callout calloutlist caption caution chapter -citerefentry cmdsynopsis co collab colophon colspec confgroup -copyright dedication docinfo editor entrytbl epigraph equation -example figure footnote footnoteref formalpara funcprototype -funcsynopsis glossary glossdef glossdiv glossentry glosslist graphicco -group highlights imagedata imageobject imageobjectco important index -indexdiv indexentry indexterm informalequation informalexample -informalfigure informaltable inlineequation inlinemediaobject -itemizedlist itermset keycombo keywordset legalnotice listitem lot -mediaobject mediaobjectco menuchoice msg msgentry msgexplan msginfo -msgmain msgrel msgset msgsub msgtext note objectinfo -orderedlist othercredit part partintro preface printhistory procedure -programlistingco publisher qandadiv qandaentry qandaset question -refentry reference refmeta refnamediv refsection refsect1 refsect1info refsect2 -refsect2info refsect3 refsect3info refsynopsisdiv refsynopsisdivinfo -revhistory revision row sbr screenco screenshot sect1 sect1info sect2 -sect2info sect3 sect3info sect4 sect4info sect5 sect5info section -sectioninfo seglistitem segmentedlist seriesinfo set setindex setinfo -shortcut sidebar simplelist simplesect spanspec step subject -subjectset substeps synopfragment table tbody textobject tfoot tgroup -thead tip toc tocchap toclevel1 toclevel2 toclevel3 toclevel4 -toclevel5 tocpart varargs variablelist varlistentry videodata -videoobject void warning subjectset - -classsynopsis -constructorsynopsis -destructorsynopsis -fieldsynopsis -methodparam -methodsynopsis -ooclass -ooexception -oointerface -simplemsgentry -manvolnum -"/> - <!-- ==================================================================== --> <!-- * Get character map contents --> <!-- ==================================================================== --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2014-11-11 17:36:37
|
Revision: 9949 http://sourceforge.net/p/docbook/code/9949 Author: bobstayton Date: 2014-11-11 17:36:27 +0000 (Tue, 11 Nov 2014) Log Message: ----------- Add px units to some attributes in convert.to.styles template for CSS compatibility. Modified Paths: -------------- trunk/xsl/xhtml5/html5-element-mods.xsl Modified: trunk/xsl/xhtml5/html5-element-mods.xsl =================================================================== --- trunk/xsl/xhtml5/html5-element-mods.xsl 2014-10-16 01:12:00 UTC (rev 9948) +++ trunk/xsl/xhtml5/html5-element-mods.xsl 2014-11-11 17:36:27 UTC (rev 9949) @@ -344,14 +344,24 @@ <xsl:choose> <!-- width and height attributes are ok for img element --> <xsl:when test="local-name() = 'width' and $element != 'img'"> + <xsl:variable name="attvalue" select="normalize-space(.)"/> <xsl:text>width: </xsl:text> - <xsl:value-of select="."/> + <xsl:value-of select="$attvalue"/> + <!-- if integer value, add px unit --> + <xsl:if test="floor($attvalue) = $attvalue"> + <xsl:text>px</xsl:text> + </xsl:if> <xsl:text>; </xsl:text> </xsl:when> <xsl:when test="local-name() = 'height' and $element != 'img'"> - <xsl:text>height </xsl:text> - <xsl:value-of select="."/> + <xsl:variable name="attvalue" select="normalize-space(.)"/> + <xsl:text>height: </xsl:text> + <xsl:value-of select="$attvalue"/> + <!-- if integer value, add px unit --> + <xsl:if test="floor($attvalue) = $attvalue"> + <xsl:text>px</xsl:text> + </xsl:if> <xsl:text>; </xsl:text> </xsl:when> @@ -376,12 +386,14 @@ <xsl:when test="local-name() = 'cellspacing'"> <xsl:text>border-spacing: </xsl:text> <xsl:value-of select="."/> + <xsl:text>px</xsl:text> <xsl:text>; </xsl:text> </xsl:when> <xsl:when test="local-name() = 'cellpadding'"> <xsl:text>padding: </xsl:text> <xsl:value-of select="."/> + <xsl:text>px</xsl:text> <xsl:text>; </xsl:text> </xsl:when> </xsl:choose> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2014-10-16 01:12:02
|
Revision: 9948 http://sourceforge.net/p/docbook/code/9948 Author: bobstayton Date: 2014-10-16 01:12:00 +0000 (Thu, 16 Oct 2014) Log Message: ----------- Add missing call to id.attribute template for orgdiv. Modified Paths: -------------- trunk/xsl/html/inline.xsl Modified: trunk/xsl/html/inline.xsl =================================================================== --- trunk/xsl/html/inline.xsl 2014-10-16 01:01:39 UTC (rev 9947) +++ trunk/xsl/html/inline.xsl 2014-10-16 01:12:00 UTC (rev 9948) @@ -1520,6 +1520,7 @@ <span> <xsl:apply-templates select="." mode="common.html.attributes"/> + <xsl:call-template name="id.attribute"/> <xsl:copy-of select="$content"/> </span> </xsl:template> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2014-10-16 01:01:44
|
Revision: 9947 http://sourceforge.net/p/docbook/code/9947 Author: bobstayton Date: 2014-10-16 01:01:39 +0000 (Thu, 16 Oct 2014) Log Message: ----------- If a link or xref has an @id or @xml:id, then add a span to include the id because simple.xlink no longer generates the id attribute. Modified Paths: -------------- trunk/xsl/html/xref.xsl Modified: trunk/xsl/html/xref.xsl =================================================================== --- trunk/xsl/html/xref.xsl 2014-10-15 21:54:42 UTC (rev 9946) +++ trunk/xsl/html/xref.xsl 2014-10-16 01:01:39 UTC (rev 9947) @@ -122,10 +122,23 @@ </xsl:choose> </xsl:variable> - <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content" select="$content"/> - </xsl:call-template> + <xsl:variable name="id" select="(@id | @xml:id)[1]"/> + <xsl:choose> + <xsl:when test="$id"> + <span id="{$id}"> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content" select="$content"/> + </xsl:call-template> + </span> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content" select="$content"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:template> <!-- ==================================================================== --> @@ -999,14 +1012,31 @@ </xsl:choose> </xsl:variable> - <xsl:call-template name="simple.xlink"> - <xsl:with-param name="node" select="."/> - <xsl:with-param name="linkend" select="$linkend"/> - <xsl:with-param name="content" select="$content"/> - <xsl:with-param name="a.target" select="$a.target"/> - <xsl:with-param name="xhref" select="$xhref"/> - </xsl:call-template> + <xsl:variable name="id" select="(@id | @xml:id)[1]"/> + <xsl:choose> + <xsl:when test="$id"> + <span id="{$id}"> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="node" select="."/> + <xsl:with-param name="linkend" select="$linkend"/> + <xsl:with-param name="content" select="$content"/> + <xsl:with-param name="a.target" select="$a.target"/> + <xsl:with-param name="xhref" select="$xhref"/> + </xsl:call-template> + </span> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="node" select="."/> + <xsl:with-param name="linkend" select="$linkend"/> + <xsl:with-param name="content" select="$content"/> + <xsl:with-param name="a.target" select="$a.target"/> + <xsl:with-param name="xhref" select="$xhref"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:template> <xsl:template match="ulink" name="ulink"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2014-10-15 21:54:46
|
Revision: 9946 http://sourceforge.net/p/docbook/code/9946 Author: bobstayton Date: 2014-10-15 21:54:42 +0000 (Wed, 15 Oct 2014) Log Message: ----------- Remove call to id.attribute template in simple.xlink because it produces duplicate ids in the output because the element template calling simple.xlink generates the id attribute. Modified Paths: -------------- trunk/xsl/html/inline.xsl Modified: trunk/xsl/html/inline.xsl =================================================================== --- trunk/xsl/html/inline.xsl 2014-09-28 16:18:14 UTC (rev 9945) +++ trunk/xsl/html/inline.xsl 2014-10-15 21:54:42 UTC (rev 9946) @@ -127,7 +127,11 @@ <xsl:otherwise> <a> <xsl:apply-templates select="." mode="common.html.attributes"/> + <!-- id attribute goes on the element calling + simple.xlink, not on the anchor element, so + this is commented out: <xsl:call-template name="id.attribute"/> + --> <xsl:attribute name="href"> <xsl:call-template name="href.target"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2014-09-28 16:18:17
|
Revision: 9945 http://sourceforge.net/p/docbook/code/9945 Author: bobstayton Date: 2014-09-28 16:18:14 +0000 (Sun, 28 Sep 2014) Log Message: ----------- Remove obsolete hardcoded margin-left="0pt" for the block containing header or footer. Modified Paths: -------------- trunk/xsl/fo/pagesetup.xsl Modified: trunk/xsl/fo/pagesetup.xsl =================================================================== --- trunk/xsl/fo/pagesetup.xsl 2014-09-25 18:21:34 UTC (rev 9944) +++ trunk/xsl/fo/pagesetup.xsl 2014-09-28 16:18:14 UTC (rev 9945) @@ -2597,12 +2597,6 @@ <!-- default is a single table style for all headers --> <!-- Customize it for different page classes or sequence location --> - <xsl:choose> - <xsl:when test="$pageclass = 'index'"> - <xsl:attribute name="margin-{$direction.align.start}">0pt</xsl:attribute> - </xsl:when> - </xsl:choose> - <xsl:variable name="column1"> <xsl:choose> <xsl:when test="$double.sided = 0">1</xsl:when> @@ -2943,12 +2937,6 @@ <!-- default is a single table style for all footers --> <!-- Customize it for different page classes or sequence location --> - <xsl:choose> - <xsl:when test="$pageclass = 'index'"> - <xsl:attribute name="margin-{$direction.align.start}">0pt</xsl:attribute> - </xsl:when> - </xsl:choose> - <xsl:variable name="column1"> <xsl:choose> <xsl:when test="$double.sided = 0">1</xsl:when> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2014-09-25 18:21:37
|
Revision: 9944 http://sourceforge.net/p/docbook/code/9944 Author: kosek Date: 2014-09-25 18:21:34 +0000 (Thu, 25 Sep 2014) Log Message: ----------- Changed default border thickness from 0.5pt to 1px. The reason is that Chrome rounds 0.5pt to 0px making borders invisible. Modified Paths: -------------- trunk/xsl/params/table.cell.border.thickness.xml trunk/xsl/params/table.frame.border.thickness.xml Modified: trunk/xsl/params/table.cell.border.thickness.xml =================================================================== --- trunk/xsl/params/table.cell.border.thickness.xml 2014-09-22 16:03:19 UTC (rev 9943) +++ trunk/xsl/params/table.cell.border.thickness.xml 2014-09-25 18:21:34 UTC (rev 9944) @@ -15,14 +15,14 @@ <refsynopsisdiv> <src:fragment xml:id="table.cell.border.thickness.frag"> -<xsl:param name="table.cell.border.thickness">0.5pt</xsl:param> +<xsl:param name="table.cell.border.thickness">1px</xsl:param> </src:fragment> </refsynopsisdiv> <refsection><info><title>Description</title></info> <para>If non-zero, specifies the thickness of borders on table -cells. The units are points. See <link +cells. See <link xlink:href="http://www.w3.org/TR/CSS21/box.html#border-width-properties"> CSS</link></para> Modified: trunk/xsl/params/table.frame.border.thickness.xml =================================================================== --- trunk/xsl/params/table.frame.border.thickness.xml 2014-09-22 16:03:19 UTC (rev 9943) +++ trunk/xsl/params/table.frame.border.thickness.xml 2014-09-25 18:21:34 UTC (rev 9944) @@ -15,7 +15,7 @@ <refsynopsisdiv> <src:fragment xml:id="table.frame.border.thickness.frag"> -<xsl:param name="table.frame.border.thickness">0.5pt</xsl:param> +<xsl:param name="table.frame.border.thickness">1px</xsl:param> </src:fragment> </refsynopsisdiv> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2014-09-22 16:03:29
|
Revision: 9943 http://sourceforge.net/p/docbook/code/9943 Author: kosek Date: 2014-09-22 16:03:19 +0000 (Mon, 22 Sep 2014) Log Message: ----------- Update copyright dates Modified Paths: -------------- trunk/xsl/COPYING Modified: trunk/xsl/COPYING =================================================================== --- trunk/xsl/COPYING 2014-09-07 06:19:07 UTC (rev 9942) +++ trunk/xsl/COPYING 2014-09-22 16:03:19 UTC (rev 9943) @@ -3,7 +3,7 @@ Copyright (C) 1999-2007 Norman Walsh Copyright (C) 2003 Jiří Kosek Copyright (C) 2004-2007 Steve Ball -Copyright (C) 2005-2008 The DocBook Project +Copyright (C) 2005-2014 The DocBook Project Copyright (C) 2011-2012 O'Reilly Media Permission is hereby granted, free of charge, to any person This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2014-09-07 06:19:10
|
Revision: 9942 http://sourceforge.net/p/docbook/code/9942 Author: bobstayton Date: 2014-09-07 06:19:07 +0000 (Sun, 07 Sep 2014) Log Message: ----------- Fix bug #1335 where profile-chunk.xsl was xsl:including chunk-code.xsl instead of profile-chunk-code.xsl. Modified Paths: -------------- trunk/xsl/profiling/xsl2profile.xsl Modified: trunk/xsl/profiling/xsl2profile.xsl =================================================================== --- trunk/xsl/profiling/xsl2profile.xsl 2014-09-06 16:35:04 UTC (rev 9941) +++ trunk/xsl/profiling/xsl2profile.xsl 2014-09-07 06:19:07 UTC (rev 9942) @@ -169,4 +169,9 @@ <xsl:copy/> </xsl:template> +<xsl:template match="xsl:include[@href = 'chunk-code.xsl']"> + <xsl:copy> + <xsl:attribute name="href">profile-chunk-code.xsl</xsl:attribute> + </xsl:copy> +</xsl:template> </xsl:stylesheet> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2014-09-06 16:35:09
|
Revision: 9941 http://sourceforge.net/p/docbook/code/9941 Author: bobstayton Date: 2014-09-06 16:35:04 +0000 (Sat, 06 Sep 2014) Log Message: ----------- Fix bug #1336 to add support for recognizing file:/ image URLs as absolute paths. Modified Paths: -------------- trunk/xsl/fo/graphics.xsl Modified: trunk/xsl/fo/graphics.xsl =================================================================== --- trunk/xsl/fo/graphics.xsl 2014-09-06 16:06:50 UTC (rev 9940) +++ trunk/xsl/fo/graphics.xsl 2014-09-06 16:35:04 UTC (rev 9941) @@ -174,6 +174,7 @@ <xsl:with-param name="filename"> <xsl:if test="$img.src.path != '' and not(starts-with($filename, '/')) and + not(starts-with($filename, 'file:/')) and not(contains($filename, '://'))"> <xsl:value-of select="$img.src.path"/> </xsl:if> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2014-09-06 16:06:57
|
Revision: 9940 http://sourceforge.net/p/docbook/code/9940 Author: bobstayton Date: 2014-09-06 16:06:50 +0000 (Sat, 06 Sep 2014) Log Message: ----------- Remove the d: namespace declaration because it is automatically added by the ns build process. Modified Paths: -------------- trunk/xsl/template/titlepage.xsl Modified: trunk/xsl/template/titlepage.xsl =================================================================== --- trunk/xsl/template/titlepage.xsl 2014-09-06 08:14:22 UTC (rev 9939) +++ trunk/xsl/template/titlepage.xsl 2014-09-06 16:06:50 UTC (rev 9940) @@ -5,8 +5,7 @@ xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:exsl="http://exslt.org/common" - xmlns:d="http://docbook.org/ns/docbook" - exclude-result-prefixes="doc t param exsl d" + exclude-result-prefixes="doc t param exsl" version='1.0'> <!-- ******************************************************************** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2014-09-06 08:14:27
|
Revision: 9939 http://sourceforge.net/p/docbook/code/9939 Author: bobstayton Date: 2014-09-06 08:14:22 +0000 (Sat, 06 Sep 2014) Log Message: ----------- Check in fix for bug #1336 to support absolute file URLs that start with file:/. Also consolidate code that determines whether an image file path is relative into a new template variable $is.relative. Modified Paths: -------------- trunk/xsl/html/graphics.xsl Modified: trunk/xsl/html/graphics.xsl =================================================================== --- trunk/xsl/html/graphics.xsl 2014-09-05 14:09:33 UTC (rev 9938) +++ trunk/xsl/html/graphics.xsl 2014-09-06 08:14:22 UTC (rev 9939) @@ -252,37 +252,31 @@ </xsl:choose> </xsl:variable> - <xsl:variable name="output_filename"> - <xsl:choose> - <xsl:when test="@entityref"> - <xsl:value-of select="$filename"/> - </xsl:when> - <!-- - Moved test for $keep.relative.image.uris to template below: - <xsl:template match="@fileref"> - --> - <xsl:otherwise> - <xsl:value-of select="$filename"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:variable name="img.src.path.pi"> <xsl:call-template name="pi.dbhtml_img.src.path"> <xsl:with-param name="node" select=".."/> </xsl:call-template> </xsl:variable> + <!-- is the file path relative and can be modified by img.src.path? --> + <xsl:variable name="is.relative"> + <xsl:choose> + <xsl:when test="$img.src.path != '' and + $tag = 'img' and + not(starts-with($filename, '/')) and + not(starts-with($filename, 'file:/')) and + not(contains($filename, '://'))">1</xsl:when> + <xsl:otherwise>0</xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable name="filename.for.graphicsize"> <xsl:choose> <xsl:when test="$img.src.path.pi != ''"> <xsl:value-of select="concat($img.src.path.pi, $filename)"/> </xsl:when> - <xsl:when test="$img.src.path != '' and - $graphicsize.use.img.src.path != 0 and - $tag = 'img' and - not(starts-with($filename, '/')) and - not(contains($filename, '://'))"> + <xsl:when test="$is.relative = 1 and + $graphicsize.use.img.src.path != 0"> <xsl:value-of select="concat($img.src.path, $filename)"/> </xsl:when> <xsl:otherwise> @@ -550,14 +544,11 @@ <object type="image/svg+xml"> <xsl:attribute name="data"> <xsl:choose> - <xsl:when test="$img.src.path != '' and - $tag = 'img' and - not(starts-with($output_filename, '/')) and - not(contains($output_filename, '://'))"> + <xsl:when test="$is.relative = 1"> <xsl:value-of select="$img.src.path"/> </xsl:when> </xsl:choose> - <xsl:value-of select="$output_filename"/> + <xsl:value-of select="$filename"/> </xsl:attribute> <xsl:call-template name="process.image.attributes"> <!--xsl:with-param name="alt" select="$alt"/ there's no alt here--> @@ -584,14 +575,11 @@ <embed type="image/svg+xml"> <xsl:attribute name="src"> <xsl:choose> - <xsl:when test="$img.src.path != '' and - $tag = 'img' and - not(starts-with($output_filename, '/')) and - not(contains($output_filename, '://'))"> + <xsl:when test="$is.relative = 1"> <xsl:value-of select="$img.src.path"/> </xsl:when> </xsl:choose> - <xsl:value-of select="$output_filename"/> + <xsl:value-of select="$filename"/> </xsl:attribute> <xsl:call-template name="process.image.attributes"> <!--xsl:with-param name="alt" select="$alt"/ there's no alt here --> @@ -611,14 +599,11 @@ <xsl:otherwise> <xsl:variable name="src"> <xsl:choose> - <xsl:when test="$img.src.path != '' and - $tag = 'img' and - not(starts-with($output_filename, '/')) and - not(contains($output_filename, '://'))"> + <xsl:when test="$is.relative = 1"> <xsl:value-of select="$img.src.path"/> </xsl:when> </xsl:choose> - <xsl:value-of select="$output_filename"/> + <xsl:value-of select="$filename"/> </xsl:variable> <xsl:variable name="imgcontents"> <xsl:element name="{$tag}"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2014-09-05 14:09:37
|
Revision: 9938 http://sourceforge.net/p/docbook/code/9938 Author: kosek Date: 2014-09-05 14:09:33 +0000 (Fri, 05 Sep 2014) Log Message: ----------- Transclusion document modified to be layer on top of XInclude 1.1 Modified Paths: -------------- trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml trunk/docbook/relaxng/docbook/transclusion/src/book.008.xml trunk/docbook/relaxng/docbook/transclusion/src/procedure.001.xml trunk/docbook/relaxng/docbook/transclusion/transclusion.xml Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml 2014-08-29 23:05:25 UTC (rev 9937) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.002.xml 2014-09-05 14:09:33 UTC (rev 9938) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> +<book xmlns="http://docbook.org/ns/docbook" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:db="http://docbook.org/ns/docbook"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -8,12 +10,12 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <ref fileref="procedure.001.xml"/> + <xi:include href="procedure.001.xml" db:idfixup="auto"/> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <ref fileref="procedure.001.xml"/> + <xi:include href="procedure.001.xml" db:idfixup="auto"/> </chapter> </book> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml 2014-08-29 23:05:25 UTC (rev 9937) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.003.xml 2014-09-05 14:09:33 UTC (rev 9938) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> +<book xmlns="http://docbook.org/ns/docbook" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:db="http://docbook.org/ns/docbook"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -8,12 +10,12 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <ref fileref="procedure.001.xml"/> + <xi:include href="procedure.001.xml" db:idfixup="auto"/> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <ref fileref="procedure.001.xml" linkscope="global"/> + <xi:include href="procedure.001.xml" db:idfixup="auto" db:linkscope="global"/> </chapter> </book> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml 2014-08-29 23:05:25 UTC (rev 9937) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.004.xml 2014-09-05 14:09:33 UTC (rev 9938) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> +<book xmlns="http://docbook.org/ns/docbook" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:db="http://docbook.org/ns/docbook"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -8,12 +10,12 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <ref fileref="procedure.001.xml" linkscope="local"/> + <xi:include href="procedure.001.xml" db:idfixup="auto" db:linkscope="local"/> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <ref fileref="procedure.001.xml"/> + <xi:include href="procedure.001.xml" db:idfixup="auto"/> </chapter> </book> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml 2014-08-29 23:05:25 UTC (rev 9937) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.005.xml 2014-09-05 14:09:33 UTC (rev 9938) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> +<book xmlns="http://docbook.org/ns/docbook" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:db="http://docbook.org/ns/docbook"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -8,12 +10,12 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <ref fileref="procedure.001.xml" xml:id="install-proc" idfixup="prefix" prefix="install-proc_"/> + <xi:include href="procedure.001.xml" db:id="install-proc" db:idfixup="prefix" db:prefix="install-proc_"/> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <ref fileref="procedure.001.xml" xml:id="maintain-proc" idfixup="prefix" prefix="maintain-proc_"/> + <xi:include href="procedure.001.xml" db:id="maintain-proc" db:idfixup="prefix" db:prefix="maintain-proc_"/> </chapter> </book> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml 2014-08-29 23:05:25 UTC (rev 9937) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.006.xml 2014-09-05 14:09:33 UTC (rev 9938) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> +<book xmlns="http://docbook.org/ns/docbook" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:db="http://docbook.org/ns/docbook"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -8,12 +10,12 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <ref fileref="procedure.001.xml" idfixup="none"/> + <xi:include href="procedure.001.xml"/> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <ref fileref="procedure.001.xml" idfixup="none"/> + <xi:include href="procedure.001.xml"/> </chapter> </book> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml 2014-08-29 23:05:25 UTC (rev 9937) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.007.xml 2014-09-05 14:09:33 UTC (rev 9938) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> +<book xmlns="http://docbook.org/ns/docbook" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:db="http://docbook.org/ns/docbook"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -8,12 +10,12 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <ref fileref="procedure.001.xml"/> + <xi:include href="procedure.001.xml" db:idfixup="auto"/> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <ref fileref="procedure.001.xml" idfixup="strip"/> + <xi:include href="procedure.001.xml" db:idfixup="strip"/> </chapter> </book> Modified: trunk/docbook/relaxng/docbook/transclusion/src/book.008.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/book.008.xml 2014-08-29 23:05:25 UTC (rev 9937) +++ trunk/docbook/relaxng/docbook/transclusion/src/book.008.xml 2014-09-05 14:09:33 UTC (rev 9938) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<book xmlns="http://docbook.org/ns/docbook"> +<book xmlns="http://docbook.org/ns/docbook" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:db="http://docbook.org/ns/docbook"> <title>Definitive Printer Guide</title> <chapter xml:id="buy"> <title>Buying printer</title> @@ -8,12 +10,12 @@ <chapter> <title>Quick installation guide</title> <para>Carefully follow all procedures bellow.</para> - <ref fileref="procedure.001.xml" idfixup="none" linkscope="user"/> + <xi:include href="procedure.001.xml" db:linkscope="user"/> </chapter> <chapter> <title>Maintenance</title> <para>Be friendly to your printer when you speak to it.</para> <para>If green led is blinking, please add missing paper using the following procedure.</para> - <ref fileref="procedure.001.xml" idfixup="strip" linkscope="user"/> + <xi:include href="procedure.001.xml" db:idfixup="strip" db:linkscope="user"/> </chapter> </book> Modified: trunk/docbook/relaxng/docbook/transclusion/src/procedure.001.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/src/procedure.001.xml 2014-08-29 23:05:25 UTC (rev 9937) +++ trunk/docbook/relaxng/docbook/transclusion/src/procedure.001.xml 2014-09-05 14:09:33 UTC (rev 9938) @@ -5,4 +5,4 @@ If you don't have printer, consider <link linkend="buy">buying one</link>.</para> <step xml:id="s1"><para>Make sure that you have paper.</para></step> <step><para>Insert paper into printer. If you don't have paper consult <xref linkend="s1"/></para></step> -</procedure> +</procedure> \ No newline at end of file Modified: trunk/docbook/relaxng/docbook/transclusion/transclusion.xml =================================================================== --- trunk/docbook/relaxng/docbook/transclusion/transclusion.xml 2014-08-29 23:05:25 UTC (rev 9937) +++ trunk/docbook/relaxng/docbook/transclusion/transclusion.xml 2014-09-05 14:09:33 UTC (rev 9938) @@ -10,6 +10,7 @@ <email>ji...@ko...</email> </author> </authorgroup> + <pubdate>2014-09-XX</pubdate> <pubdate>2011-04-20</pubdate> <pubdate>2010-12-09</pubdate> </info> @@ -57,14 +58,173 @@ tutorial. If DocBook TC decides to incorporate this into DocBook, more formal and precise specification will follow.</remark> -<para>Transclusion in documents is described by <tag>ref</tag> element -which references the content to transclude. There are two basic types of -reference – inline and external. Inline references reference content -which is defined in some other place using the <tag>definitions</tag> -element. An external reference references some external content which -might or might not be written using DocBook vocabulary.</para> +<note> +<para>Previous version of this draft proposed new elements +<tag>ref</tag> and <tag>def</tag> for implementing +transclusions. Meanwhile DocBook TC decided that transclusions should +rely as much as possible on standard technologies. XInclude 1.1 added +new features that allow to implement some transclusion features on +top of the XInclude. As a result transclusions were completely +redesigned to be layered on top of XInclude 1.1.</para> +<para>This resulted in a loss of some features, notably:</para> +<itemizedlist> +<listitem><para>It's no longer possible to locally redefine text +replacement (see <link +xlink:href="http://docbook.org/docs/transclusion/2011-04-20/transclusion.html#d6e65">example</link>).</para></listitem> +<listitem><para><remark>anything else?</remark></para></listitem> +</itemizedlist> +</note> +<para>The following namespace bindings are assumed if namespace prefix +is used in the text of this document:</para> + +<variablelist> +<varlistentry> +<term><tag class="prefix">db</tag></term> +<listitem><para>DocBook namespace +(<uri>http://docbook.org/ns/docbook</uri>)</para> +</listitem> +</varlistentry> +<varlistentry> +<term><tag class="prefix">xi</tag></term> +<listitem><para>XInclude namespace +(<uri>http://www.w3.org/2001/XInclude</uri>)</para> +</listitem> +</varlistentry> +</variablelist> + <section> +<title>Transclusion processing</title> + +<para>XInclude 1.1 <xref linkend="XI11"/> in section <citetitle +xlink:href="http://www.w3.org/TR/2013/CR-xinclude-11-20131008/#attribute-copying">4.3 +Attribute Copying when processing XML</citetitle> defines new feature +which can be used for passing around attributes that control +transclusion processing.</para> + +<para>Processing model of XInclude 1.1 based transclusion is +simple. First XInclude processing is done. Then before normal DocBook +processing additional DocBook transclusion step is applied which +can modify some attributes.</para> + +<para>DocBook transclusion processor must support the following +attributes:</para> + +<variablelist> +<varlistentry> +<term><tag class="attribute">db:id</tag></term> +<listitem> +<para>Specifies ID for transcluded content. If there is +<tag class="attribute">xml:id</tag> attribute present it's value must be replaced by the +value of <tag class="attribute">db:id</tag> attribute.</para> +<para>If <tag class="attribute">db:id</tag> is present, but empty, +then <tag class="attribute">xml:id</tag> must be removed from the element.</para> +<remark>Should we define what to do with <tag>db:id</tag> after +transclusion? Like remove/keep/don't care.</remark> +</listitem> +</varlistentry> + +<varlistentry> +<term><tag class="attribute">db:idfixup</tag></term> +<listitem> +<para>This attribute controls how IDs are going to be adjusted during +transclusion.</para> +<variablelist> +<varlistentry> +<term><tag class="attvalue">none</tag></term> +<listitem><para>No ID adjustment is done.</para> +<para>This is default behavior if attribute is not specified. This +must be default in order to keep compatibility with +XInclude.</para></listitem> +</varlistentry> +<varlistentry> +<term><tag class="attvalue">strip</tag></term> +<listitem><para>All IDs on element descendants are stripped.</para></listitem> +</varlistentry> +<varlistentry> +<term><tag class="attvalue">prefix</tag></term> +<listitem><para>All IDs on element descendants are prefixed with a +value specified in <tag class="attribute">db:prefix</tag> +attribute.</para></listitem> +</varlistentry> +<varlistentry> +<term><tag class="attvalue">auto</tag></term> +<listitem><para>All IDs on element descendants are prefixed with a +value which is unique for each element<footnote><para>For example XSLT +based implementations can use <function>generate-id()</function> to +generate such unique prefix.</para></footnote></para> +</listitem> +</varlistentry> +</variablelist> +</listitem> +</varlistentry> + +<varlistentry> +<term><tag class="attribute">db:prefix</tag></term> +<listitem> +<para>Prefix to use when <code>db:idfixup="prefix"</code>.</para> +</listitem> +</varlistentry> + +<varlistentry> +<term><tag class="attribute">db:linkscope</tag></term> +<listitem> +<para>This attribute defines how refences has +to be corrected.</para> +<variablelist> +<varlistentry> +<term><tag class="attvalue">user</tag></term> +<listitem><para>No IDREF adjustment is done</para></listitem> +</varlistentry> +<varlistentry> +<term><tag class="attvalue">local</tag></term> +<listitem><para>All IDREFs in element are prefixed by user +specified prefix (when <literal>db:idfixup="prefix"</literal>) or +auto-generated prefix (when <literal>db:idfixup="auto"</literal>).</para> +<para>Using this value with other <tag class="attribute">db:idfixup</tag> +values is an error.<remark>Maybe raising error is too strict approach.</remark></para></listitem> +</varlistentry> +<varlistentry> +<term><tag class="attvalue">near</tag></term> +<listitem><para>All IDREFs in element are adjusted to +point to the closest element which has a matching ID. A matching ID +doesn't mean string equality between ID and IDREF values – it is +sufficient if second part of ID and IDREF after removal of +possibly added prefixes is matching.</para> +<para>When searching for the closest element ancestor elements of +an element with an IDREF attribute are gradually inspected and matching ID +is searched between all their descendants. If there is no matching ID, then +parent is inspected and so on until match is found or document root is +reached.</para></listitem> +</varlistentry> +<varlistentry> +<term><tag class="attvalue">global</tag></term> +<listitem><para>All IDREFs in element are adjusted to +point to the first element in document order which has a matching ID. A matching ID +doesn't mean string equality between ID and IDREF values – it is +sufficient if the second part of ID and IDREF after removal of +possibly added prefixes are matching.</para> +</listitem> +</varlistentry> +</variablelist> +</listitem> +</varlistentry> + +<varlistentry> +<term><tag class="attribute">db:*</tag></term> +<listitem> +<para>All other attributes in DocBook namespace will be copied into +the corresponding attributes in no namespace. This is especially +useful for effectivity attributes.</para> +</listitem> +</varlistentry> + +</variablelist> + +</section> + +<!-- +<section> <title>Inline reference</title> <para>An inline reference is denoted by the <tag>ref</tag> element @@ -279,6 +439,7 @@ </example> </section> +--> <section> <title>Special ID/IDREF processing</title> @@ -290,89 +451,17 @@ transcluded modules. To overcome this problem all IDs and references to them can be adjusted during the transclusion process.</para> -<para>If there is <tag class="attribute">xml:id</tag> attribute present -on the <tag>ref</tag> element, then this ID will replace <tag -class="attribute">xml:id</tag> on the outermost element of any transcluded -content. It is an error to transclude content which is not enclosed in -a single element and specifying an <tag class="attribute">xml:id</tag> -attribute on <tag>ref</tag> element at the same time.</para> - <para>How IDs are going to be adjusted during transclusion is -controlled by the <tag class="attribute">idfixup</tag> attribute on -the <tag>ref</tag> element. It can have one of the following -values.</para> +controlled by the <tag class="attribute">db:idfixup</tag> attribute on +the <tag>xi:include</tag> element.</para> -<variablelist> -<varlistentry> -<term><tag class="attvalue">none</tag></term> -<listitem><para>No ID adjustment is done</para></listitem> -</varlistentry> -<varlistentry> -<term><tag class="attvalue">strip</tag></term> -<listitem><para>All IDs are stripped (except <tag -class="attribute">xml:id</tag> inherited from <tag>ref</tag> element)</para></listitem> -</varlistentry> -<varlistentry> -<term><tag class="attvalue">prefix</tag></term> -<listitem><para>All IDs are prefixed with a value specified in <tag -class="attribute">prefix</tag> attribute</para></listitem> -</varlistentry> -<varlistentry> -<term><tag class="attvalue">auto</tag></term> -<listitem><para>All IDs are prefixed with a value which is unique for -each <tag>ref</tag> element<footnote><para>For example XSLT based -implementations can use <function>generate-id()</function> on -<tag>ref</tag> element to generate such unique -prefix.</para></footnote></para> -<para>This is default behavior if attribute is not specified.</para></listitem> -</varlistentry> -</variablelist> - <para>Of course if IDs are adjusted then all corresponding references has to be also corrected. This is controlled by <tag -class="attribute">linkscope</tag> attribute. It can have one of the -following values.</para> +class="attribute">db:linkscope</tag> attribute.</para> -<variablelist> -<varlistentry> -<term><tag class="attvalue">user</tag></term> -<listitem><para>No IDREF adjustment is done</para></listitem> -</varlistentry> -<varlistentry> -<term><tag class="attvalue">local</tag></term> -<listitem><para>All IDREFs in transcluded content are prefixed by user -specified prefix (when <literal>idfixup="prefix"</literal>) or -auto-generated prefix (when <literal>idfixup="auto"</literal>).</para> -<para>Using this value with other <tag class="attribute">idfixup</tag> -values is an error.<remark>Maybe raising error is to strict approach.</remark></para></listitem> -</varlistentry> -<varlistentry> -<term><tag class="attvalue">near</tag></term> -<listitem><para>All IDREFs in transcluded content are adjusted to -point to the closest element which has a matching ID. A matching ID -doesn't mean string equality between ID and IDREF values – it is -sufficient if second part of ID and IDREF after removal of -possibly added prefixes is matching.</para> -<para>When searching for the closest element ancestor elements of -an element with an IDREF attribute are gradually inspected and matching ID -is searched between all their descendants. If there is no matching ID, then -parent is inspected and so on until match is found or document root is -reached.</para></listitem> -</varlistentry> -<varlistentry> -<term><tag class="attvalue">global</tag></term> -<listitem><para>All IDREFs in transcluded content are adjusted to -point to the first element in document order which has a matching ID. A matching ID -doesn't mean string equality between ID and IDREF values – it is -sufficient if the second part of ID and IDREF after removal of -possibly added prefixes are matching.</para> -</listitem> -</varlistentry> -</variablelist> - <para>By using various combinations of <tag -class="attribute">idfixup</tag> and <tag -class="attribute">linkscope</tag> attributes we can achieve different +class="attribute">db:idfixup</tag> and <tag +class="attribute">db:linkscope</tag> attributes we can achieve different linking behavior. The following examples show the effect of using those two attributes. Examples are transcluding the following procedure which contains one internal link and one external (points to target outside @@ -397,14 +486,13 @@ <programlisting><textobject> <textdata fileref='src/book.002.xml.out'/> </textobject></programlisting> -<para>We haven't specified <tag class="attribute">idfixup</tag> and -<tag class="attribute">linkscope</tag> attributes so the default behavior -is triggered. All IDs in transcluded modules are automatically -prefixed to prevent ID collisions. Then IDREFs are fixed so that links -point to the nearest possible target. For example the link from step 2 to -step 1 in procedure always points to the same instance of -procedure. However <quote>buy</quote> link is pointing correctly to target in -the main document.</para> +<para>We have to specify <tag class="attribute">db:idfixup</tag> in +order to trigger automatic ID/IDREF fixup. All IDs in transcluded +modules are automatically prefixed to prevent ID collisions. Then +IDREFs are fixed so that links point to the nearest possible +target. For example the link from step 2 to step 1 in procedure always +points to the same instance of procedure. However <quote>buy</quote> +link is pointing correctly to target in the main document.</para> </example> <example> @@ -416,7 +504,7 @@ <programlisting><textobject> <textdata fileref='src/book.003.xml.out'/> </textobject></programlisting> -<para>We used <literal>linkscope="global"</literal> on the second +<para>We used <literal>db:linkscope="global"</literal> on the second transclusion. Result is that link from step 2 in the second procedure now links to step 1 in the first procedure.</para> </example> @@ -430,7 +518,7 @@ <programlisting><textobject> <textdata fileref='src/book.004.xml.out'/> </textobject></programlisting> -<para>We used <literal>linkscope="local"</literal> on the first +<para>We used <literal>db:linkscope="local"</literal> on the first transclusion. This means that no link from this transclusion can point outside of this transclusion. Because there was such link (<quote>buy</quote> link), thus the result of transclusion is broken because @@ -460,9 +548,9 @@ <programlisting><textobject> <textdata fileref='src/book.006.xml.out'/> </textobject></programlisting> -<para>We have disabled ID fixup by -<literal>idfixup="none"</literal>. The resulting document thus contain -duplicated IDs.</para> +<para>Default behaviour of XInclude is not to do any postprocessing like +DocBook transclusions. The resulting document thus contain duplicated +IDs.</para> </example> <example> @@ -475,7 +563,7 @@ <textdata fileref='src/book.007.xml.out'/> </textobject></programlisting> <para>We have stripped all IDs from the second transcluded procedure by -<literal>idfixup="strip"</literal>. Thus there are no duplicate IDs in +<literal>db:idfixup="strip"</literal>. Thus there are no duplicate IDs in the resulting document and links from second procedure always target first one. However IDs in the first procedure were automatically prefixed.</para> @@ -491,10 +579,10 @@ <textdata fileref='src/book.008.xml.out'/> </textobject></programlisting> <para>We have stripped all IDs from the second transcluded procedure by -<literal>idfixup="strip"</literal>. Thus there are no duplicate IDs in +<literal>db:idfixup="strip"</literal>. Thus there are no duplicate IDs in the resulting document and links from second procedure always target first one. IDs in the first procedure were not automatically prefixed -since we have specified <literal>idfixup="none"</literal>.</para> +since we haven't specified <literal>db:idfixup</literal>.</para> </example> <remark>Should be there option to preserve original IDs (without @@ -502,41 +590,7 @@ </section> -<section> -<title>Transformations</title> - -<remark>FIXME: This should provide some very generic mechanism for -applying various transformations on referenced content before actual -transclusion. For example DITA -> DocBook, V4.x -> V5.0 conversion and -so on.</remark> - -<para>FIXME: TC decided this is not in scope of transclusions. Sources should -be prepared in advance.</para> - -</section> - -<section> -<title>Evaluation</title> - -<para>The above DocBook transclusion proposal solves all -<link -xlink:href="http://docbook.org/docs/transclusion-requirements/">use -cases</link> except <link -xlink:href="http://docbook.org/docs/transclusion-requirements/#uc-2">UC-2</link>. Transclusions -are more usable and can solve various problems introduced by multiple -inclusion of the same content. Some of those problems can be solved by -using XInclude – but syntax is cumbersome and there is no good -interoperability between various XInclude implementations.</para> - -<para>For the above reasons I think that transclusions should be -added into core DocBook. I don't think that making them separate XML -transclusion standard is viable approach. A transclusion processor has -to know which attributes are of ID/IDREF type for each document -type. History shown that generic standards relying on access to -a schema are not successful.</para> - -</section> - +<!-- <appendix> <title>DocBook schema with support for transclusions</title> @@ -544,12 +598,8 @@ <textdata fileref='src/db-transclusions.rnc'/> </textobject></programlisting> -<remark>Should we allow multiple file references in @definitionfile?</remark> - -<remark>Should we allow <phrase>ref</phrase> inside <phrase>def</phrase>? -(Probably yes).</remark> - </appendix> +--> <appendix> <title>Sample transclusion processor written in XSLT 2.0</title> @@ -557,165 +607,18 @@ <para>Please note that this sample transclusion processor is not yet feature complete. It supports only subset of proposal.</para> +<!-- <programlisting><textobject> <textdata fileref='src/transclude.xsl'/> </textobject></programlisting> +--> </appendix> -<appendix> -<title>Mapping Transclusions to XInclude</title> +<bibliography> +<bibliomixed xml:id="XI11"><title>XML Inclusions (XInclude) Version 1.1</title>. W3C +Candidate Recommendation. 8 October 2013. Available at <link +xlink:href="http://www.w3.org/TR/2013/CR-xinclude-11-20131008/"/></bibliomixed> +</bibliography> -<para>Some basic functionality of transclusions can be directly mapped -into XInclude as show in the table below. However there are still some -very important features which can't be replicated with pure XInclude, -namely:</para> - -<itemizedlist> -<listitem><para>ID/IDREF fixup – it was one of the most important -requirements to provide solution to the duplicate IDs problem;</para></listitem> -<listitem><para>profiling – it's not possible to specify profiling -attributes on <tag>xi:include</tag> element as it is subject to -special handling;</para></listitem> -<listitem><para>changing ID during transclusion – it's not possible to -specify new xml:id value for transcluded content on -<tag>xi:include</tag> element as it is subject to special -handling;</para></listitem> -<listitem><para>redefinitions are not supported. Having more -definitions in one file will lead to an invalid file as each definition -has to be identified by an unique <tag class="attribute">xml:id</tag>.</para></listitem> -</itemizedlist> - -<table> -<title>Mapping Transclusions to XInclude</title> -<tgroup cols="3"> -<thead> -<row> -<entry>Transclusion construct</entry> -<entry>XInclude equivalent</entry> -<entry>Note</entry> -</row> -</thead> -<tbody> -<row valign="top"> -<entry><code><ref name="<replaceable>foo</replaceable>"/></code></entry> -<entry><code><xi:include xpointer="xpath(id(<replaceable>foo</replaceable>)/node())"/></code></entry> -<entry>XInclude implementations are not required to support missing -<tag class="attribute">href</tag> attribute. See <link -xlink:href="http://www.w3.org/TR/xinclude/#include-location"/></entry> -</row> -<row valign="top"> -<entry><code><ref definitionfile="<replaceable>bar</replaceable>" name="<replaceable>foo</replaceable>"/></code></entry> -<entry><code><xi:include href="<replaceable>bar</replaceable>" xpointer="xpath(id(<replaceable>foo</replaceable>)/node())"/></code></entry> -<entry></entry> -</row> -<row valign="top"> -<entry><code><ref fileref="<replaceable>foo</replaceable>"/></code></entry> -<entry><code><xi:include href="<replaceable>foo</replaceable>"/></code></entry> -<entry></entry> -</row> -<row valign="top"> -<entry><code><definitions definitionfile="<replaceable>foo</replaceable>"/></code></entry> -<entry><code><xi:include href="<replaceable>foo</replaceable>"/></code></entry> -<entry>DocBook schema and stylesheets has to be modified to ignore -elements which are inserted only for further referencing.</entry> -</row> -<row valign="top"> -<entry><code><def name="<replaceable>foo</replaceable>">…</def></code></entry> -<entry><code><phrase xml:id="<replaceable>foo</replaceable>">…</phrase></code></entry> -<entry>Any generic DocBook element can be used instead of -<tag>phrase</tag>. Element itself is not transcluded.</entry> -</row> -</tbody> -</tgroup> -</table> - -<note> -<para>Please note that <literal>xpath()</literal> XPointer scheme is -not widely supported. Formerly <literal>xpointer()</literal> schema -was popular although it's standardization was never finished. Later on -<literal>xpath()</literal> schema appeared in the list of registered -schemes <link -xlink:href="http://www.w3.org/2005/04/xpointer-schemes/"/>. Today two -special schemes exists – <literal>xpath1()</literal> and -<literal>xpath2()</literal> – for respective versions of XPath -language.</para> -</note> - -</appendix> - -<appendix> -<title>Alternative proposal from Hussein Shafie</title> - -<para>This appendix summarizes points made in the following email -<link -xlink:href="http://lists.oasis-open.org/archives/docbook/201012/msg00014.html"/>.</para> - -<para>Any element may bear one of these two attributes: <tag -class="attribute">ref</tag> and <tag class="attribute">copy</tag>. The -value of these attributes is an URL, possibly ending with a -fragment.</para> - -<para>When an element has a <tag class="attribute">ref</tag> or a <tag -class="attribute">copy</tag> attribute, it must be completely -empty.</para> - -<section> -<title><quote>Compose</quote> transclusion directive</title> - -<para><tag class="attribute">ref</tag> is a <quote>compose</quote> -transclusion directive. Examples:</para> - -<programlisting><![CDATA[<chapter ref="chapter1.xml"/> - -<section ref="book.xml#api_reference"/>]]></programlisting> - -<para>When <tag class="attribute">ref</tag> attribute is used, there -is no ID/IDREF fixup in the transcluded content.</para> - -</section> - -<section> -<title><quote>Instantiate a copy</quote> transclusion directive</title> - -<para><tag class="attribute">copy</tag> is an <quote>instantiate a -copy</quote> transclusion directive. Examples:</para> - -<programlisting><![CDATA[<note xml:id="warning" copy="common.xml#legal_warning"/> - -<phrase copy="common.xml#product_name"/>]]></programlisting> - -<para>When <tag class="attribute">copy</tag> attribute is used, there -is an automatic ID/IDREF fixup in the transcluded content, the one -described above:</para> -<itemizedlist> -<listitem><para>Add a globally unique suffix to each ID defined in the copy.</para></listitem> -<listitem><para>Update the IDREF/IDREFS which point to these IDs.</para></listitem> -<listitem><para>Ignore the IDREF/IDREFS which point outside the copy.</para></listitem> -</itemizedlist> - -</section> - -<section> -<title>Evaluation</title> - -<para>Although very simple, this proposal covers many -use-cases. Although compared to the original proposal several features -are missing:</para> - -<itemizedlist> -<listitem><para>It is not possible to include just a text node, or -sequence of sibling nodes. Only one element (and its content) can -be transcluded at one time.</para></listitem> -<listitem><para>It is not possible to override definitions.</para></listitem> -<listitem><para>It is not possible to configure way in which ID fixup -is done.</para></listitem> -<listitem><para>Verbosity for including simple inline content is -similar to XInclude.</para></listitem> -</itemizedlist> - -</section> - -</appendix> - </article> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2014-08-29 23:05:33
|
Revision: 9937 http://sourceforge.net/p/docbook/code/9937 Author: bobstayton Date: 2014-08-29 23:05:25 +0000 (Fri, 29 Aug 2014) Log Message: ----------- Add support in TOC for article as child of set. Modified Paths: -------------- trunk/xsl/fo/autotoc.xsl Modified: trunk/xsl/fo/autotoc.xsl =================================================================== --- trunk/xsl/fo/autotoc.xsl 2014-08-29 21:34:58 UTC (rev 9936) +++ trunk/xsl/fo/autotoc.xsl 2014-08-29 23:05:25 UTC (rev 9937) @@ -30,7 +30,7 @@ </xsl:call-template> </xsl:variable> - <xsl:variable name="nodes" select="book|set|setindex"/> + <xsl:variable name="nodes" select="book|set|setindex|article"/> <xsl:if test="$nodes"> <fo:block id="toc...{$id}" @@ -420,7 +420,7 @@ <xsl:with-param name="toc-context" select="$toc-context"/> </xsl:call-template> - <xsl:variable name="nodes" select="set|book|setindex"/> + <xsl:variable name="nodes" select="set|book|setindex|article"/> <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2014-08-29 21:35:05
|
Revision: 9936 http://sourceforge.net/p/docbook/code/9936 Author: bobstayton Date: 2014-08-29 21:34:58 +0000 (Fri, 29 Aug 2014) Log Message: ----------- Add support for set nested inside set to recursive-chunk-filename. Modified Paths: -------------- trunk/xsl/html/chunk-code.xsl Modified: trunk/xsl/html/chunk-code.xsl =================================================================== --- trunk/xsl/html/chunk-code.xsl 2014-08-29 21:29:14 UTC (rev 9935) +++ trunk/xsl/html/chunk-code.xsl 2014-08-29 21:34:58 UTC (rev 9936) @@ -132,6 +132,15 @@ <xsl:value-of select="$filename"/> </xsl:when> + <!-- treat nested set separate from root --> + <xsl:when test="self::set and ancestor::set"> + <xsl:text>se</xsl:text> + <xsl:number level="any" format="01"/> + <xsl:if test="not($recursive)"> + <xsl:value-of select="$html.ext"/> + </xsl:if> + </xsl:when> + <xsl:when test="self::set"> <xsl:value-of select="$root.filename"/> <xsl:if test="not($recursive)"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |