[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, simp, updated. 6d86eb17455f109b19738660fac7f157fe788efd
git
git at cross-lfs.org
Sun Apr 24 12:14:49 PDT 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, simp has been updated
via 6d86eb17455f109b19738660fac7f157fe788efd (commit)
via b9c15a7fb7559065f4154ffbd2c932016d81a494 (commit)
from a8c30a501d3e7f4958f8b8bb41a29860ab8ae803 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6d86eb17455f109b19738660fac7f157fe788efd
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 15:14:19 2011 -0400
First only output the contents section on the last build in the series. Second apply a variant to the index of the page to show up as a secondary. As well as put the word size on the secondary index. Separating the 2 with a comma if needed.
diff --git a/BOOK/stylesheets/clfs-profile.xsl b/BOOK/stylesheets/clfs-profile.xsl
index ce0628f..a63378a 100644
--- a/BOOK/stylesheets/clfs-profile.xsl
+++ b/BOOK/stylesheets/clfs-profile.xsl
@@ -50,6 +50,16 @@
</xsl:with-param>
<xsl:with-param name="bits" select="substring-before(concat($bits, ','), ',')" />
<xsl:with-param name="multibuild" select="$multibuild" />
+ <xsl:with-param name="lastinseries">
+ <xsl:choose>
+ <xsl:when test="$remainingbits">
+ <xsl:text>false</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>true</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:with-param>
</xsl:call-template>
</xsl:if>
@@ -71,6 +81,7 @@
<xsl:param name="idsuffix" /> <!-- Suffix to attach to the end of the ID for this perticular instance -->
<xsl:param name="bits" /> <!-- Which bit sizes to create a package for -->
<xsl:param name="multibuild" /> <!-- Are there multiple instances of this package? -->
+ <xsl:param name="lastinseries" /> <!-- Is this the past package in the multilib series? -->
<!-- Translate the package into a sect1 -->
<xsl:element name="sect1">
@@ -143,17 +154,19 @@
</xsl:attribute>
<xsl:value-of select="c:title" />
</xsl:element>
- <xsl:if test="(string-length($titlesuffix) + string-length(c:variant)) > 0">
+ <xsl:if test="(string-length($titlesuffix) > 0 and $lastinseries = 'false') or c:variant">
<xsl:text>
</xsl:text>
<xsl:element name="secondary">
- <xsl:if test="string-length(c:variant) > 0">
+ <xsl:if test="c:variant">
<xsl:value-of select="c:variant" />
- <xsl:if test="string-length($titlesuffix) > 0">
+ </xsl:if>
+ <xsl:if test="string-length($titlesuffix) > 0 and $lastinseries = 'false'">
+ <xsl:if test="c:variant">
<xsl:text>, </xsl:text>
</xsl:if>
+ <xsl:value-of select="$titlesuffix" />
</xsl:if>
- <xsl:value-of select="$titlesuffix" />
</xsl:element>
</xsl:if>
<xsl:text>
@@ -275,7 +288,7 @@
<xsl:text>content</xsl:text>
</xsl:attribute>
<xsl:choose>
- <xsl:when test="string-length(@c:ref) > 0">
+ <xsl:when test="string-length(@c:ref) > 0 or $lastinseries = 'false'">
<!-- Insert an xref to the actual contents list -->
<xsl:text>
 </xsl:text>
<xsl:element name="title" />
@@ -284,7 +297,14 @@
<xsl:text>Details on this package are located in </xsl:text>
<xsl:element name="xref">
<xsl:attribute name="linkend">
- <xsl:value-of select="@c:ref" />
+ <xsl:choose>
+ <xsl:when test="string-length(@c:ref) > 0">
+ <xsl:value-of select="@c:ref" />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$id" />
+ </xsl:otherwise>
+ </xsl:choose>
<xsl:text>-contents</xsl:text>
</xsl:attribute>
<xsl:attribute name="role">
@@ -593,7 +613,7 @@
<xsl:text>

</xsl:text>
</xsl:element><!-- sect2 -->
</xsl:for-each><!-- c:contents -> sect2 -->
-
+
<xsl:text>

</xsl:text>
</xsl:element><!-- Sect1 -->
commit b9c15a7fb7559065f4154ffbd2c932016d81a494
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 14:51:46 2011 -0400
Add a c:variant element to the c:package element to determine the variant to list in the index.
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rnc b/BOOK/schema/clfs/0.1/rng/clfs.rnc
index 2055154..b911431 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rnc
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rnc
@@ -126,6 +126,7 @@ clfs.sect.package =
element c:title { text },
element c:version { text },
+ element c:variant { text }?,
element c:description { clfs.inline },
element c:install {
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rng b/BOOK/schema/clfs/0.1/rng/clfs.rng
index 933c6ef..1a08c35 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rng
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rng
@@ -210,6 +210,11 @@
<element name="c:version">
<text/>
</element>
+ <optional>
+ <element name="c:variant">
+ <text/>
+ </element>
+ </optional>
<element name="c:description">
<ref name="clfs.inline"/>
</element>
diff --git a/BOOK/stylesheets/clfs-profile.xsl b/BOOK/stylesheets/clfs-profile.xsl
index b2677f2..ce0628f 100644
--- a/BOOK/stylesheets/clfs-profile.xsl
+++ b/BOOK/stylesheets/clfs-profile.xsl
@@ -143,10 +143,16 @@
</xsl:attribute>
<xsl:value-of select="c:title" />
</xsl:element>
- <xsl:if test="string-length($titlesuffix) > 0">
+ <xsl:if test="(string-length($titlesuffix) + string-length(c:variant)) > 0">
<xsl:text>
</xsl:text>
<xsl:element name="secondary">
+ <xsl:if test="string-length(c:variant) > 0">
+ <xsl:value-of select="c:variant" />
+ <xsl:if test="string-length($titlesuffix) > 0">
+ <xsl:text>, </xsl:text>
+ </xsl:if>
+ </xsl:if>
<xsl:value-of select="$titlesuffix" />
</xsl:element>
</xsl:if>
-----------------------------------------------------------------------
Summary of changes:
BOOK/schema/clfs/0.1/rng/clfs.rnc | 1 +
BOOK/schema/clfs/0.1/rng/clfs.rng | 5 +++++
BOOK/stylesheets/clfs-profile.xsl | 36 +++++++++++++++++++++++++++++++-----
3 files changed, 37 insertions(+), 5 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list