DocBook

Revision: 6192
Author:   xmldoc
Date:     2006-08-23 17:05:39 -0700 (Wed, 23 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/docbook/?rev=6192&view=rev

Log Message:
-----------
Added IDs in a number of places that should have time.

Modified Paths:
--------------
    trunk/xsl/common/common.xsl
    trunk/xsl/common/refentry.xsl
    trunk/xsl/fo/param.xweb
    trunk/xsl/fo/table.xsl
    trunk/xsl/html/param.xweb
    trunk/xsl/template/titlepage.xsl
    trunk/xsl/wordml/param.xweb
Modified: trunk/xsl/common/common.xsl
===================================================================
--- trunk/xsl/common/common.xsl	2006-08-23 12:15:23 UTC (rev 6191)
+++ trunk/xsl/common/common.xsl	2006-08-24 00:05:39 UTC (rev 6192)
@@ -31,8 +31,8 @@
 </referenceinfo>
 <title>Common Template Reference</title>
 
-<partintro>
-<section><title>Introduction</title>
+<partintro id="partintro">
+<section id="intro"><title>Introduction</title>
 
 <para>This is technical reference documentation for the DocBook XSL
 Stylesheets; it documents (some of) the parameters, templates, and

Modified: trunk/xsl/common/refentry.xsl
===================================================================
--- trunk/xsl/common/refentry.xsl	2006-08-23 12:15:23 UTC (rev 6191)
+++ trunk/xsl/common/refentry.xsl	2006-08-24 00:05:39 UTC (rev 6192)
@@ -29,8 +29,8 @@
   </referenceinfo>
   <title>Refentry Metadata-Gathering Template Reference</title>
 
-  <partintro>
-    <section><title>Introduction</title>
+  <partintro id="partintro">
+    <section id="intro"><title>Introduction</title>
 
     <para>This is technical reference documentation for the "refentry
     metadata gathering" templates in the DocBook XSL Stylesheets.</para>

Modified: trunk/xsl/fo/param.xweb
===================================================================
--- trunk/xsl/fo/param.xweb	2006-08-23 12:15:23 UTC (rev 6191)
+++ trunk/xsl/fo/param.xweb	2006-08-24 00:05:39 UTC (rev 6192)
@@ -21,7 +21,7 @@
 </copyright>
 </bookinfo>
 
-<preface><title>Introduction</title>
+<preface id="intro"><title>Introduction</title>
 
 <para>This is reference documentation for all user-configurable
 parameters in the DocBook XSL FO stylesheets (for generating
@@ -297,13 +297,14 @@
 </reference>
 
 <reference id="general"><title>Pagination and General Styles</title>
-<partintro>
-<section><title>Understanding XSL FO Margins</title>
+<partintro id="margins_partintro">
+<section id="margins_intro"><title>Understanding XSL FO Margins</title>
 
 <para>In order for the parameters in this section to make sense, it is useful to
 consider <xref linkend="fig.pagemodel"/>.</para>
 
 <figure id="fig.pagemodel">
+  <title>Page Model</title>
 <mediaobject>
 <imageobject>
 <imagedata fileref="page.png"/>
@@ -484,7 +485,7 @@
 </reference>
 
 <reference id="profiling"><title>Profiling</title>
-<partintro>
+<partintro id="profiling_partintro">
 <para>Following parameters can be used for attribute value based
 profiling of your document. For more info about profiling look at
 <ulink
@@ -530,7 +531,7 @@
 </reference>
 -->
 
-<appendix><title>The Stylesheet</title>
+<appendix id="stylesheet"><title>The Stylesheet</title>
 
 <para>The <filename>param.xsl</filename> stylesheet is just a wrapper
 around all these parameters.</para>

Modified: trunk/xsl/fo/table.xsl
===================================================================
--- trunk/xsl/fo/table.xsl	2006-08-23 12:15:23 UTC (rev 6191)
+++ trunk/xsl/fo/table.xsl	2006-08-24 00:05:39 UTC (rev 6192)
@@ -35,8 +35,8 @@
 </referenceinfo>
 <title>Formatting Object Table Reference</title>
 
-<partintro>
-<section><title>Introduction</title>
+<partintro id="partintro">
+<section id="intro"><title>Introduction</title>
 
 <para>This is technical reference documentation for the DocBook XSL
 Stylesheets; it documents (some of) the parameters, templates, and

Modified: trunk/xsl/html/param.xweb
===================================================================
--- trunk/xsl/html/param.xweb	2006-08-23 12:15:23 UTC (rev 6191)
+++ trunk/xsl/html/param.xweb	2006-08-24 00:05:39 UTC (rev 6192)
@@ -21,7 +21,7 @@
 </copyright>
 </bookinfo>
 
-<preface><title>Introduction</title>
+<preface id="intro"><title>Introduction</title>
 
 <para>This is reference documentation for all user-configurable
 parameters in the DocBook XSL HTML stylesheets (for generating
@@ -349,7 +349,7 @@
 </reference>
 
 <reference id="profiling"><title>Profiling</title>
-<partintro>
+<partintro id="partintro">
 <para>Following parameters can be used for attribute value based
 profiling of your document. For more info about profiling look at
 <ulink
@@ -437,7 +437,7 @@
 &l10n.lang.value.rfc.compliant;
 </reference>
 
-<appendix><title>The Stylesheet</title>
+<appendix id="stylesheet"><title>The Stylesheet</title>
 
 <para>The <filename>param.xsl</filename> stylesheet is just a wrapper
 around all these parameters.</para>

Modified: trunk/xsl/template/titlepage.xsl
===================================================================
--- trunk/xsl/template/titlepage.xsl	2006-08-23 12:15:23 UTC (rev 6191)
+++ trunk/xsl/template/titlepage.xsl	2006-08-24 00:05:39 UTC (rev 6192)
@@ -33,8 +33,8 @@
 </referenceinfo>
 <title>Template Stylesheet Reference</title>
 
-<partintro>
-<section><title>Introduction</title>
+<partintro id="intro_partintro">
+<section id="intro"><title>Introduction</title>
 
 <para>This is technical reference documentation for the DocBook XSL
 Stylesheets; it documents (some of) the parameters, templates, and

Modified: trunk/xsl/wordml/param.xweb
===================================================================
--- trunk/xsl/wordml/param.xweb	2006-08-23 12:15:23 UTC (rev 6191)
+++ trunk/xsl/wordml/param.xweb	2006-08-24 00:05:39 UTC (rev 6192)
@@ -32,7 +32,7 @@
 &wordml.template;
 &pages.template;
 
-  <appendix>
+  <appendix id="stylesheet">
     <title>The Stylesheet</title>
 
     <para>The <filename>param.xsl</filename> stylesheet is just a wrapper around all of these parameters.</para>


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

Revision: 6198
Author:   bobstayton
Date:     2006-08-24 02:26:29 -0700 (Thu, 24 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/docbook/?rev=6198&view=rev

Log Message:
-----------
Fixed bug #1542773 section title in info not formatting correctly.

Modified Paths:
--------------
    trunk/xsl/html/sections.xsl
Modified: trunk/xsl/html/sections.xsl
===================================================================
--- trunk/xsl/html/sections.xsl	2006-08-24 09:16:14 UTC (rev 6197)
+++ trunk/xsl/html/sections.xsl	2006-08-24 09:26:29 UTC (rev 6198)
@@ -79,7 +79,7 @@
   </xsl:variable>
 
   <xsl:call-template name="section.heading">
-    <xsl:with-param name="section" select=".."/>
+    <xsl:with-param name="section" select="$section"/>
     <xsl:with-param name="level" select="$level"/>
     <xsl:with-param name="title">
       <xsl:apply-templates select="$section" mode="object.title.markup">
@@ -89,7 +89,8 @@
   </xsl:call-template>
 </xsl:template>
 
-<xsl:template match="section/title" mode="titlepage.mode" priority="2">
+<xsl:template match="section/title|section/info/title" 
+              mode="titlepage.mode" priority="2">
   <xsl:call-template name="section.title"/>
 </xsl:template>
 
@@ -138,7 +139,8 @@
   </div>
 </xsl:template>
 
-<xsl:template match="sect1/title" mode="titlepage.mode" priority="2">
+<xsl:template match="sect1/title|sect1/info/title" 
+              mode="titlepage.mode" priority="2">
   <xsl:call-template name="section.title"/>
 </xsl:template>
 
@@ -187,7 +189,8 @@
   </div>
 </xsl:template>
 
-<xsl:template match="sect2/title" mode="titlepage.mode" priority="2">
+<xsl:template match="sect2/title|sect2/info/title" 
+              mode="titlepage.mode" priority="2">
   <xsl:call-template name="section.title"/>
 </xsl:template>
 
@@ -236,7 +239,8 @@
   </div>
 </xsl:template>
 
-<xsl:template match="sect3/title" mode="titlepage.mode" priority="2">
+<xsl:template match="sect3/title|sect3/info/title" 
+              mode="titlepage.mode" priority="2">
   <xsl:call-template name="section.title"/>
 </xsl:template>
 
@@ -285,7 +289,8 @@
   </div>
 </xsl:template>
 
-<xsl:template match="sect4/title" mode="titlepage.mode" priority="2">
+<xsl:template match="sect4/title|sect4/info/title" 
+              mode="titlepage.mode" priority="2">
   <xsl:call-template name="section.title"/>
 </xsl:template>
 
@@ -334,7 +339,8 @@
   </div>
 </xsl:template>
 
-<xsl:template match="sect5/title" mode="titlepage.mode" priority="2">
+<xsl:template match="sect5/title|sect5/info/title" 
+              mode="titlepage.mode" priority="2">
   <xsl:call-template name="section.title"/>
 </xsl:template>
 
@@ -351,7 +357,8 @@
   </div>
 </xsl:template>
 
-<xsl:template match="simplesect/title" mode="titlepage.mode" priority="2">
+<xsl:template match="simplesect/title|simplesect/info/title" 
+              mode="titlepage.mode" priority="2">
   <xsl:call-template name="section.title"/>
 </xsl:template>
 
@@ -421,7 +428,7 @@
            than 5 levels down just becomes H6 -->
       <xsl:when test="$level &gt; 5">6</xsl:when>
       <xsl:otherwise>
-	<xsl:value-of select="$level + 1"/>
+        <xsl:value-of select="$level + 1"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:variable>


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

Revision: 6197
Author:   bobstayton
Date:     2006-08-24 02:16:14 -0700 (Thu, 24 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/docbook/?rev=6197&view=rev

Log Message:
-----------
Fixed bug #1542773 section title in info not formatting correctly.

Modified Paths:
--------------
    trunk/xsl/fo/sections.xsl
Modified: trunk/xsl/fo/sections.xsl
===================================================================
--- trunk/xsl/fo/sections.xsl	2006-08-24 08:20:57 UTC (rev 6196)
+++ trunk/xsl/fo/sections.xsl	2006-08-24 09:16:14 UTC (rev 6197)
@@ -206,10 +206,26 @@
                      |sect2/title
                      |sect3/title
                      |sect4/title
-                     |sect5/title"
+                     |sect5/title
+                     |section/info/title
+                     |simplesect/info/title
+                     |sect1/info/title
+                     |sect2/info/title
+                     |sect3/info/title
+                     |sect4/info/title
+                     |sect5/info/title"
               mode="titlepage.mode"
               priority="2">
-  <xsl:variable name="section" select="parent::*"/>
+
+  <xsl:variable name="section" 
+                select="(ancestor::section |
+                        ancestor::simplesect |
+                        ancestor::sect1 |
+                        ancestor::sect2 |
+                        ancestor::sect3 |
+                        ancestor::sect4 |
+                        ancestor::sect5)[position() = last()]"/>
+
   <fo:block keep-with-next.within-column="always">
     <xsl:variable name="id">
       <xsl:call-template name="object.id">


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

Revision: 6195
Author:   bobstayton
Date:     2006-08-24 00:00:59 -0700 (Thu, 24 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/docbook/?rev=6195&view=rev

Log Message:
-----------
Fixed part of bug #1484944 authorgroup needing a named anchor.

Modified Paths:
--------------
    trunk/xsl/html/titlepage.xsl
Modified: trunk/xsl/html/titlepage.xsl
===================================================================
--- trunk/xsl/html/titlepage.xsl	2006-08-24 00:53:59 UTC (rev 6194)
+++ trunk/xsl/html/titlepage.xsl	2006-08-24 07:00:59 UTC (rev 6195)
@@ -227,6 +227,7 @@
 
 <xsl:template match="authorgroup" mode="titlepage.mode">
   <div class="{name(.)}">
+    <xsl:call-template name="anchor"/>
     <xsl:apply-templates mode="titlepage.mode"/>
   </div>
 </xsl:template>


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

Revision: 6194
Author:   xmldoc
Date:     2006-08-23 17:53:59 -0700 (Wed, 23 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/docbook/?rev=6194&view=rev

Log Message:
-----------
Touch distro dir so that its timestamp gets updated.

Modified Paths:
--------------
    trunk/releasetools/docbook-build
Modified: trunk/releasetools/docbook-build
===================================================================
--- trunk/releasetools/docbook-build	2006-08-24 00:47:22 UTC (rev 6193)
+++ trunk/releasetools/docbook-build	2006-08-24 00:53:59 UTC (rev 6194)
@@ -327,7 +327,7 @@
         > $LOGDIR/docbook-$DISTRO-$RELEASEVERSION.log
       scp $LOGDIR/docbook-$DISTRO-$RELEASEVERSION.log $SITEUSER@...
     fi
-    ssh -l $SITEUSER $SITEHOST "(cd $SITEBASE; chmod 664 *.zip *.log)"
+    ssh -l $SITEUSER $SITEHOST "(cd $SITEBASE; chmod 664 *.zip *.log; touch $DISTRO)"
     fi
 
     rm -f $LOGDIR/docbook-$DISTRO-$RELEASEVERSION.log


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

Revision: 6193
Author:   xmldoc
Date:     2006-08-23 17:47:22 -0700 (Wed, 23 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/docbook/?rev=6193&view=rev

Log Message:
-----------
Added more IDs, and added support to docsrc/xsl2jref.xsl for
copying their values to output.

Modified Paths:
--------------
    trunk/xsl/docsrc/xsl2jref.xsl
    trunk/xsl/template/titlepage.xsl
Modified: trunk/xsl/docsrc/xsl2jref.xsl
===================================================================
--- trunk/xsl/docsrc/xsl2jref.xsl	2006-08-24 00:05:39 UTC (rev 6192)
+++ trunk/xsl/docsrc/xsl2jref.xsl	2006-08-24 00:47:22 UTC (rev 6193)
@@ -245,9 +245,10 @@
 <xsl:template match="doc:template[@match]">
   <xsl:variable name="match" select="@match"/>
   <xsl:variable name="mode" select="@mode"/>
+  <xsl:variable name="id" select="@id"/>
 
   <xsl:text>&#10;</xsl:text>
-  <refentry>
+  <refentry id="{$id}">
     <xsl:text>&#10;</xsl:text>
     <refnamediv>
       <xsl:text>&#10;</xsl:text>

Modified: trunk/xsl/template/titlepage.xsl
===================================================================
--- trunk/xsl/template/titlepage.xsl	2006-08-24 00:05:39 UTC (rev 6192)
+++ trunk/xsl/template/titlepage.xsl	2006-08-24 00:47:22 UTC (rev 6193)
@@ -59,7 +59,7 @@
 
 <!-- ==================================================================== -->
 
-<doc:template match="t:templates" xmlns="">
+<doc:template match="t:templates" xmlns="" id="templates">
 <refpurpose>Construct a stylesheet for the templates provided</refpurpose>
 
 <refdescription>
@@ -103,7 +103,7 @@
 
 <!-- ==================================================================== -->
 
-<doc:template match="xsl:*" xmlns="">
+<doc:template match="xsl:*" xmlns="" id="star">
 <refpurpose>Copy xsl: elements straight through</refpurpose>
 
 <refdescription>
@@ -118,7 +118,7 @@
 
 <!-- ==================================================================== -->
 
-<doc:template match="t:titlepage" xmlns="">
+<doc:template match="t:titlepage" xmlns="" id="titlepage">
 <refpurpose>Create the templates necessary to construct a title page</refpurpose>
 
 <refdescription>
@@ -446,7 +446,8 @@
   </xsl:for-each>
 </xsl:template>
 
-<doc:template match="@*" mode="copy.literal.atts" xmlns="">
+<doc:template match="@*" mode="copy.literal.atts" xmlns=""
+              id="attr_star_in_copy.literal.atts">
 <refpurpose>Copy t:titlepage attributes</refpurpose>
 
 <refdescription>
@@ -467,7 +468,7 @@
 
 <!-- ==================================================================== -->
 
-<doc:template match="t:titlepage-content">
+<doc:template match="t:titlepage-content" id="titlepage-content">
 <refpurpose>Create templates for the content of one side of a title page</refpurpose>
 
 <refdescription>
@@ -625,7 +626,7 @@
 
 <!-- ==================================================================== -->
 
-<doc:template match="t:titlepage-separator">
+<doc:template match="t:titlepage-separator" id="titlepage-separator">
 <refpurpose>Create templates for the separator</refpurpose>
 
 <refdescription>
@@ -650,7 +651,7 @@
 
 <!-- ==================================================================== -->
 
-<doc:template match="t:titlepage-before">
+<doc:template match="t:titlepage-before" id="titlepage-before">
 <refpurpose>Create templates for what precedes a title page</refpurpose>
 
 <refdescription>
@@ -676,7 +677,7 @@
 
 <!-- ==================================================================== -->
 
-<doc:template match="*" mode="copy" xmlns="">
+<doc:template match="*" mode="copy" xmlns="" id="star_in_copy">
 <refpurpose>Copy elements</refpurpose>
 
 <refdescription>
@@ -694,7 +695,7 @@
 
 <!-- ==================================================================== -->
 
-<doc:template match="@*" mode="copy" xmlns="">
+<doc:template match="@*" mode="copy" xmlns="" id="attr_star_in_copy">
 <refpurpose>Copy attributes</refpurpose>
 
 <refdescription>
@@ -711,7 +712,7 @@
 
 <!-- ==================================================================== -->
 
-<doc:template match="*" mode="document.order" xmlns="">
+<doc:template match="*" mode="document.order" xmlns="" id="attr_star_in_document.order">
 <refpurpose>Create rules to process titlepage elements in document order</refpurpose>
 
 <refdescription>
@@ -818,7 +819,7 @@
 
 <!-- ==================================================================== -->
 
-<doc:template match="*" mode="document.order" xmlns="">
+<doc:template match="*" mode="document.order" xmlns="" id="star_in_document.order">
 <refpurpose>Create rules to process titlepage elements in stylesheet order</refpurpose>
 
 <refdescription>
@@ -1095,7 +1096,8 @@
 
 <!-- ==================================================================== -->
 
-<doc:template match="*" mode="titlepage.specialrules" xmlns="">
+<doc:template match="*" mode="titlepage.specialrules" xmlns=""
+              id="star_in_titlepage.specialrules">
 <refpurpose>Create templates for special rules</refpurpose>
 
 <refdescription>
@@ -1147,7 +1149,8 @@
 
 <!-- ==================================================================== -->
 
-<doc:template match="*" mode="titlepage.subrules" xmlns="">
+<doc:template match="*" mode="titlepage.subrules" xmlns=""
+              id="star_in_titlepage.subrules">
 <refpurpose>Create template for individual special rules</refpurpose>
 
 <refdescription>
@@ -1186,7 +1189,7 @@
 
 <!-- ==================================================================== -->
 
-<doc:template match="t:or" xmlns="">
+<doc:template match="t:or" xmlns="" id="or">
 <refpurpose>Process the t:or special rule</refpurpose>
 
 <refdescription>
@@ -1224,7 +1227,8 @@
 
 <!-- ==================================================================== -->
 
-<doc:template match="t:or" mode="titlepage.subrules" xmlns="">
+<doc:template match="t:or" mode="titlepage.subrules" xmlns=""
+              id="or_in_titlepage.subrules">
 <refpurpose>Process the t:or special rule in
 titlepage.subrules mode</refpurpose>
 


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