[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, simp, updated. b0b1a3c1b3400095b69b60780022b4c9dac2bd95
git
git at cross-lfs.org
Sat Apr 23 21:41: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 b0b1a3c1b3400095b69b60780022b4c9dac2bd95 (commit)
via 7cfc35420df311b028efc0e48f5dc853914875f5 (commit)
via df3bd2594281c3e97991c7f6e4a32dd7af6f9ad1 (commit)
via babec4b60e0467e5a07f47708393f979efd471b3 (commit)
via f59c2ec8513cf394e99493496dfc1481022a55a8 (commit)
via a2b92f3bbdbc11f5c3f34a05fe8acb5d6f4b0b9d (commit)
via 73d050d28462d82390f9698311a85019915837eb (commit)
via 25844db397d18ca8da9162e2049fbb9ef5021a6e (commit)
via 01f0f378acbfc974b024bb5c56f4e4070aa1200f (commit)
via 1d86c7756b7662aa1442e4f7c1c491442f883061 (commit)
via 4fc487d1dd76d1f43a253acfbae314537959e706 (commit)
from 4f59781620924c205d0cf17e3ee78737f814a2e5 (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 b0b1a3c1b3400095b69b60780022b4c9dac2bd95
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 00:40:51 2011 -0400
Broke a broken package contents reference.
diff --git a/BOOK/testpart.xml b/BOOK/testpart.xml
index a5e83bd..816de5f 100644
--- a/BOOK/testpart.xml
+++ b/BOOK/testpart.xml
@@ -119,7 +119,7 @@
</c:install>
- <c:contents c:ref="ch-system-bash" />
+ <c:contents c:ref="ch-system-bash2" />
</c:package>
commit 7cfc35420df311b028efc0e48f5dc853914875f5
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 00:40:37 2011 -0400
Somehow I got the tags backwards for screen and userinput. After all this time, go figure. Correcting that now.
diff --git a/BOOK/stylesheets/clfs-profile.xsl b/BOOK/stylesheets/clfs-profile.xsl
index d2807e0..a92536d 100644
--- a/BOOK/stylesheets/clfs-profile.xsl
+++ b/BOOK/stylesheets/clfs-profile.xsl
@@ -637,13 +637,13 @@
<xsl:if test="(string-length(@c:arch) = 0) or contains(concat(',', at c:arch,','), concat(',', $clfs.arch, ','))">
<xsl:if test="(string-length(@c:multilib) = 0) or contains(concat(',', at c:multilib,','), concat(',', $ismultilib, ','))">
<xsl:if test="(string-length(@c:bits) = 0) or contains(concat(',', at c:bits,','), ',32,')">
- <xsl:element name="userinput">
+ <xsl:element name="screen">
<xsl:if test="@c:nodump = 'true'">
<xsl:attribute name="role">
<xsl:text>nodump</xsl:text>
</xsl:attribute>
</xsl:if>
- <xsl:element name="screen">
+ <xsl:element name="userinput">
<xsl:apply-templates select="node()" mode="filter-bits-32" />
</xsl:element>
</xsl:element>
@@ -873,13 +873,13 @@
<xsl:if test="(string-length(@c:arch) = 0) or contains(concat(',', at c:arch,','), concat(',', $clfs.arch, ','))">
<xsl:if test="(string-length(@c:multilib) = 0) or contains(concat(',', at c:multilib,','), concat(',', $ismultilib, ','))">
<xsl:if test="(string-length(@c:bits) = 0) or contains(concat(',', at c:bits,','), ',n32,')">
- <xsl:element name="userinput">
+ <xsl:element name="screen">
<xsl:if test="@c:nodump = 'true'">
<xsl:attribute name="role">
<xsl:text>nodump</xsl:text>
</xsl:attribute>
</xsl:if>
- <xsl:element name="screen">
+ <xsl:element name="userinput">
<xsl:apply-templates select="node()" mode="filter-bits-n32" />
</xsl:element>
</xsl:element>
@@ -1109,13 +1109,13 @@
<xsl:if test="(string-length(@c:arch) = 0) or contains(concat(',', at c:arch,','), concat(',', $clfs.arch, ','))">
<xsl:if test="(string-length(@c:multilib) = 0) or contains(concat(',', at c:multilib,','), concat(',', $ismultilib, ','))">
<xsl:if test="(string-length(@c:bits) = 0) or contains(concat(',', at c:bits,','), ',64,')">
- <xsl:element name="userinput">
+ <xsl:element name="screen">
<xsl:if test="@c:nodump = 'true'">
<xsl:attribute name="role">
<xsl:text>nodump</xsl:text>
</xsl:attribute>
</xsl:if>
- <xsl:element name="screen">
+ <xsl:element name="userinput">
<xsl:apply-templates select="node()" mode="filter-bits-64" />
</xsl:element>
</xsl:element>
commit df3bd2594281c3e97991c7f6e4a32dd7af6f9ad1
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 00:35:44 2011 -0400
Drop the attributes off of c:install/c:command elements.
diff --git a/BOOK/stylesheets/clfs-profile.xsl b/BOOK/stylesheets/clfs-profile.xsl
index 8e4e236..d2807e0 100644
--- a/BOOK/stylesheets/clfs-profile.xsl
+++ b/BOOK/stylesheets/clfs-profile.xsl
@@ -644,7 +644,7 @@
</xsl:attribute>
</xsl:if>
<xsl:element name="screen">
- <xsl:apply-templates select="@*|node()" mode="filter-bits-32" />
+ <xsl:apply-templates select="node()" mode="filter-bits-32" />
</xsl:element>
</xsl:element>
</xsl:if>
@@ -880,7 +880,7 @@
</xsl:attribute>
</xsl:if>
<xsl:element name="screen">
- <xsl:apply-templates select="@*|node()" mode="filter-bits-n32" />
+ <xsl:apply-templates select="node()" mode="filter-bits-n32" />
</xsl:element>
</xsl:element>
</xsl:if>
@@ -1116,7 +1116,7 @@
</xsl:attribute>
</xsl:if>
<xsl:element name="screen">
- <xsl:apply-templates select="@*|node()" mode="filter-bits-64" />
+ <xsl:apply-templates select="node()" mode="filter-bits-64" />
</xsl:element>
</xsl:element>
</xsl:if>
commit babec4b60e0467e5a07f47708393f979efd471b3
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 00:34:00 2011 -0400
Update the schema and stylesheet to have both a note and a warning box.
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rnc b/BOOK/schema/clfs/0.1/rng/clfs.rnc
index 9d5f749..e8c57b5 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rnc
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rnc
@@ -90,7 +90,15 @@ clfs.package.note =
clfs.attrib.arch,
clfs.attrib.bits,
clfs.attrib.multilib,
- clfs.package.para*
+ (clfs.package.para | clfs.package.command)*
+ }
+
+clfs.package.warning =
+ element c:note {
+ clfs.attrib.arch,
+ clfs.attrib.bits,
+ clfs.attrib.multilib,
+ (clfs.package.para | clfs.package.command)*
}
clfs.package.command =
@@ -122,7 +130,8 @@ clfs.sect.package =
element c:install {
(clfs.package.para |
clfs.package.command |
- clfs.package.note)+
+ clfs.package.note |
+ clfs.package.warning)+
}+,
element c:contents {
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rng b/BOOK/schema/clfs/0.1/rng/clfs.rng
index 95cd5ce..ee8dddf 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rng
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rng
@@ -145,7 +145,23 @@
<ref name="clfs.attrib.bits"/>
<ref name="clfs.attrib.multilib"/>
<zeroOrMore>
- <ref name="clfs.package.para"/>
+ <choice>
+ <ref name="clfs.package.para"/>
+ <ref name="clfs.package.command"/>
+ </choice>
+ </zeroOrMore>
+ </element>
+ </define>
+ <define name="clfs.package.warning">
+ <element name="c:note">
+ <ref name="clfs.attrib.arch"/>
+ <ref name="clfs.attrib.bits"/>
+ <ref name="clfs.attrib.multilib"/>
+ <zeroOrMore>
+ <choice>
+ <ref name="clfs.package.para"/>
+ <ref name="clfs.package.command"/>
+ </choice>
</zeroOrMore>
</element>
</define>
@@ -201,6 +217,7 @@
<ref name="clfs.package.para"/>
<ref name="clfs.package.command"/>
<ref name="clfs.package.note"/>
+ <ref name="clfs.package.warning"/>
</choice>
</oneOrMore>
</element>
diff --git a/BOOK/stylesheets/clfs-profile.xsl b/BOOK/stylesheets/clfs-profile.xsl
index 77b8e37..8e4e236 100644
--- a/BOOK/stylesheets/clfs-profile.xsl
+++ b/BOOK/stylesheets/clfs-profile.xsl
@@ -578,6 +578,50 @@
</xsl:if>
</xsl:if>
</xsl:template>
+
+ <xsl:template match="c:note" mode="filter-bits-32">
+ <xsl:variable name="ismultilib">
+ <xsl:choose>
+ <xsl:when test="contains($clfs.multilib, ',')">
+ <xsl:text>true</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>false</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(string-length(@c:arch) = 0) or contains(concat(',', at c:arch,','), concat(',', $clfs.arch, ','))">
+ <xsl:if test="(string-length(@c:multilib) = 0) or contains(concat(',', at c:multilib,','), concat(',', $ismultilib, ','))">
+ <xsl:if test="(string-length(@c:bits) = 0) or contains(concat(',', at c:bits,','), ',32,')">
+ <xsl:element name="note">
+ <xsl:apply-templates select="node()" mode="filter-bits-32" />
+ </xsl:element>
+ </xsl:if>
+ </xsl:if>
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template match="c:warning" mode="filter-bits-32">
+ <xsl:variable name="ismultilib">
+ <xsl:choose>
+ <xsl:when test="contains($clfs.multilib, ',')">
+ <xsl:text>true</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>false</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(string-length(@c:arch) = 0) or contains(concat(',', at c:arch,','), concat(',', $clfs.arch, ','))">
+ <xsl:if test="(string-length(@c:multilib) = 0) or contains(concat(',', at c:multilib,','), concat(',', $ismultilib, ','))">
+ <xsl:if test="(string-length(@c:bits) = 0) or contains(concat(',', at c:bits,','), ',32,')">
+ <xsl:element name="warning">
+ <xsl:apply-templates select="node()" mode="filter-bits-32" />
+ </xsl:element>
+ </xsl:if>
+ </xsl:if>
+ </xsl:if>
+ </xsl:template>
<xsl:template match="c:install/c:command" mode="filter-bits-32">
<xsl:variable name="ismultilib">
@@ -770,6 +814,50 @@
</xsl:if>
</xsl:if>
</xsl:template>
+
+ <xsl:template match="c:note" mode="filter-bits-n32">
+ <xsl:variable name="ismultilib">
+ <xsl:choose>
+ <xsl:when test="contains($clfs.multilib, ',')">
+ <xsl:text>true</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>false</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(string-length(@c:arch) = 0) or contains(concat(',', at c:arch,','), concat(',', $clfs.arch, ','))">
+ <xsl:if test="(string-length(@c:multilib) = 0) or contains(concat(',', at c:multilib,','), concat(',', $ismultilib, ','))">
+ <xsl:if test="(string-length(@c:bits) = 0) or contains(concat(',', at c:bits,','), ',n32,')">
+ <xsl:element name="note">
+ <xsl:apply-templates select="node()" mode="filter-bits-n32" />
+ </xsl:element>
+ </xsl:if>
+ </xsl:if>
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template match="c:warning" mode="filter-bits-n32">
+ <xsl:variable name="ismultilib">
+ <xsl:choose>
+ <xsl:when test="contains($clfs.multilib, ',')">
+ <xsl:text>true</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>false</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(string-length(@c:arch) = 0) or contains(concat(',', at c:arch,','), concat(',', $clfs.arch, ','))">
+ <xsl:if test="(string-length(@c:multilib) = 0) or contains(concat(',', at c:multilib,','), concat(',', $ismultilib, ','))">
+ <xsl:if test="(string-length(@c:bits) = 0) or contains(concat(',', at c:bits,','), ',n32,')">
+ <xsl:element name="warning">
+ <xsl:apply-templates select="node()" mode="filter-bits-n32" />
+ </xsl:element>
+ </xsl:if>
+ </xsl:if>
+ </xsl:if>
+ </xsl:template>
<xsl:template match="c:install/c:command" mode="filter-bits-n32">
<xsl:variable name="ismultilib">
@@ -962,6 +1050,50 @@
</xsl:if>
</xsl:if>
</xsl:template>
+
+ <xsl:template match="c:note" mode="filter-bits-64">
+ <xsl:variable name="ismultilib">
+ <xsl:choose>
+ <xsl:when test="contains($clfs.multilib, ',')">
+ <xsl:text>true</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>false</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(string-length(@c:arch) = 0) or contains(concat(',', at c:arch,','), concat(',', $clfs.arch, ','))">
+ <xsl:if test="(string-length(@c:multilib) = 0) or contains(concat(',', at c:multilib,','), concat(',', $ismultilib, ','))">
+ <xsl:if test="(string-length(@c:bits) = 0) or contains(concat(',', at c:bits,','), ',64,')">
+ <xsl:element name="note">
+ <xsl:apply-templates select="node()" mode="filter-bits-64" />
+ </xsl:element>
+ </xsl:if>
+ </xsl:if>
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template match="c:warning" mode="filter-bits-64">
+ <xsl:variable name="ismultilib">
+ <xsl:choose>
+ <xsl:when test="contains($clfs.multilib, ',')">
+ <xsl:text>true</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>false</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(string-length(@c:arch) = 0) or contains(concat(',', at c:arch,','), concat(',', $clfs.arch, ','))">
+ <xsl:if test="(string-length(@c:multilib) = 0) or contains(concat(',', at c:multilib,','), concat(',', $ismultilib, ','))">
+ <xsl:if test="(string-length(@c:bits) = 0) or contains(concat(',', at c:bits,','), ',64,')">
+ <xsl:element name="warning">
+ <xsl:apply-templates select="node()" mode="filter-bits-64" />
+ </xsl:element>
+ </xsl:if>
+ </xsl:if>
+ </xsl:if>
+ </xsl:template>
<xsl:template match="c:install/c:command" mode="filter-bits-64">
<xsl:variable name="ismultilib">
commit f59c2ec8513cf394e99493496dfc1481022a55a8
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 00:27:08 2011 -0400
Expand the filtering ability of the schema to match the stylesheet.
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rnc b/BOOK/schema/clfs/0.1/rng/clfs.rnc
index 0716002..9d5f749 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rnc
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rnc
@@ -77,17 +77,23 @@ clfs.inline.command =
# Block Elements
-clfs.block.para =
+clfs.package.para =
element c:para {
+ clfs.attrib.arch,
+ clfs.attrib.bits,
+ clfs.attrib.multilib,
clfs.inline
}
-clfs.block.note =
+clfs.package.note =
element c:note {
- clfs.block.para*
+ clfs.attrib.arch,
+ clfs.attrib.bits,
+ clfs.attrib.multilib,
+ clfs.package.para*
}
-clfs.block.command =
+clfs.package.command =
element c:command {
clfs.attrib.arch,
clfs.attrib.bits,
@@ -114,9 +120,9 @@ clfs.sect.package =
element c:description { clfs.inline },
element c:install {
- (clfs.block.para |
- clfs.block.command |
- clfs.block.note)+
+ (clfs.package.para |
+ clfs.package.command |
+ clfs.package.note)+
}+,
element c:contents {
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rng b/BOOK/schema/clfs/0.1/rng/clfs.rng
index 7f32611..95cd5ce 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rng
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rng
@@ -131,19 +131,25 @@
</element>
</define>
<!-- Block Elements -->
- <define name="clfs.block.para">
+ <define name="clfs.package.para">
<element name="c:para">
+ <ref name="clfs.attrib.arch"/>
+ <ref name="clfs.attrib.bits"/>
+ <ref name="clfs.attrib.multilib"/>
<ref name="clfs.inline"/>
</element>
</define>
- <define name="clfs.block.note">
+ <define name="clfs.package.note">
<element name="c:note">
+ <ref name="clfs.attrib.arch"/>
+ <ref name="clfs.attrib.bits"/>
+ <ref name="clfs.attrib.multilib"/>
<zeroOrMore>
- <ref name="clfs.block.para"/>
+ <ref name="clfs.package.para"/>
</zeroOrMore>
</element>
</define>
- <define name="clfs.block.command">
+ <define name="clfs.package.command">
<element name="c:command">
<ref name="clfs.attrib.arch"/>
<ref name="clfs.attrib.bits"/>
@@ -192,9 +198,9 @@
<element name="c:install">
<oneOrMore>
<choice>
- <ref name="clfs.block.para"/>
- <ref name="clfs.block.command"/>
- <ref name="clfs.block.note"/>
+ <ref name="clfs.package.para"/>
+ <ref name="clfs.package.command"/>
+ <ref name="clfs.package.note"/>
</choice>
</oneOrMore>
</element>
commit a2b92f3bbdbc11f5c3f34a05fe8acb5d6f4b0b9d
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 00:25:41 2011 -0400
Fix ID Conflicts in the test.
diff --git a/BOOK/testpart.xml b/BOOK/testpart.xml
index 8a52c51..a5e83bd 100644
--- a/BOOK/testpart.xml
+++ b/BOOK/testpart.xml
@@ -20,7 +20,7 @@
<para>Testing... 1.. 2.. 3..</para>
</sect1>
-<c:package id="ch-system-bash" c:multibuild="false">
+<c:package id="ch-system-bash2" c:multibuild="false">
<c:title>Bash</c:title>
<c:version>4.0.1</c:version>
<c:description>The Bash package contains the Bourne-Again SHell.</c:description>
@@ -62,7 +62,7 @@
<c:contents>
<c:program>
- <c:name>test</c:name>
+ <c:name>test2</c:name>
<c:description>This is the test program.</c:description>
</c:program>
commit 73d050d28462d82390f9698311a85019915837eb
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 00:20:28 2011 -0400
Apply the appropriate templates while building the content sect2.
diff --git a/BOOK/stylesheets/clfs-profile.xsl b/BOOK/stylesheets/clfs-profile.xsl
index 4f0a8ca..77b8e37 100644
--- a/BOOK/stylesheets/clfs-profile.xsl
+++ b/BOOK/stylesheets/clfs-profile.xsl
@@ -396,7 +396,7 @@
<xsl:text>
 </xsl:text>
<xsl:element name="para">
- <xsl:apply-templates select="c:description" />
+ <xsl:apply-templates select="c:description/@*|c:description/node()" />
</xsl:element>
<xsl:text>
 </xsl:text>
@@ -452,7 +452,7 @@
<xsl:text>
 </xsl:text>
<xsl:element name="para">
- <xsl:apply-templates select="c:description" />
+ <xsl:apply-templates select="c:description/@*|c:description/node()" />
</xsl:element>
<xsl:text>
 </xsl:text>
@@ -1131,6 +1131,47 @@
<xsl:template match="@c:bits" mode="filter-bits-64" />
<xsl:template match="@c:multilib" mode="filter-bits-64" />
+ <!-- Templates for the Inline Elements outside of the build filter -->
+
+ <xsl:template match="c:literal">
+ <xsl:element name="literal">
+ <xsl:apply-templates select="node()" />
+ </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="c:replaceable">
+ <xsl:element name="replaceable">
+ <xsl:apply-templates select="node()" />
+ </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="c:application">
+ <xsl:element name="application">
+ <xsl:apply-templates select="node()" />
+ </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="c:dirname">
+ <xsl:element name="filename">
+ <xsl:attribute name="class">
+ <xsl:text>directory</xsl:text>
+ </xsl:attribute>
+ <xsl:apply-templates select="node()" />
+ </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="c:filename">
+ <xsl:element name="filename">
+ <xsl:apply-templates select="node()" />
+ </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="c:command">
+ <xsl:element name="command">
+ <xsl:apply-templates select="node()" />
+ </xsl:element>
+ </xsl:template>
+
<!-- Apply the profile filter to the entire document -->
<xsl:template match="//*[@c:arch]|//*[@c:multilib]">
<xsl:variable name="ismultilib">
commit 25844db397d18ca8da9162e2049fbb9ef5021a6e
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 00:13:07 2011 -0400
Also render the short descriptions for directories.
diff --git a/BOOK/stylesheets/clfs-profile.xsl b/BOOK/stylesheets/clfs-profile.xsl
index f349a16..4f0a8ca 100644
--- a/BOOK/stylesheets/clfs-profile.xsl
+++ b/BOOK/stylesheets/clfs-profile.xsl
@@ -481,7 +481,64 @@
</xsl:element><!-- varlistentry -->
</xsl:for-each>
<!-- End the Short Desc For-Each for Libraries -->
-
+
+ <!-- Begin the Short Desc For-Each for Directories -->
+ <xsl:for-each select="c:directory">
+ <xsl:text>

 </xsl:text>
+ <xsl:element name="varlistentry">
+ <xsl:attribute name="id">
+ <xsl:text>dir</xsl:text>
+ <xsl:value-of select="translate(c:name, '/', '-')" />
+ </xsl:attribute>
+
+ <!-- Term -->
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="term">
+ <xsl:element name="filename">
+ <xsl:attribute name="class">
+ <xsl:text>directory</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of select="c:name" />
+ </xsl:element>
+ </xsl:element>
+ <!-- End Term -->
+
+ <!-- List Item -->
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="listitem">
+
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="para">
+ <xsl:apply-templates select="c:description/@*|c:description/node()" />
+ </xsl:element>
+
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="indexterm">
+ <xsl:attribute name="zone">
+ <xsl:value-of select="$id" />
+ <xsl:text> dir</xsl:text>
+ <xsl:value-of select="translate(c:name, '/', '-')" />
+ </xsl:attribute>
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="primary">
+ <xsl:attribute name="sortas">
+ <xsl:text>e-</xsl:text>
+ <xsl:value-of select="c:name" />
+ </xsl:attribute>
+ <xsl:value-of select="c:name" />
+ </xsl:element>
+ <xsl:text>
 </xsl:text>
+ </xsl:element>
+
+ <xsl:text>
 </xsl:text>
+ </xsl:element><!-- listitem -->
+ <!-- End List Item -->
+
+ <xsl:text>
 </xsl:text>
+ </xsl:element><!-- varlistentry -->
+ </xsl:for-each>
+ <!-- End the Short Desc For-Each for Directories -->
+
<xsl:text>

</xsl:text>
</xsl:element><!-- variablelist -->
<!-- End Short Desc List -->
commit 01f0f378acbfc974b024bb5c56f4e4070aa1200f
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 00:06:11 2011 -0400
Also render the short descriptions for programs.
diff --git a/BOOK/stylesheets/clfs-profile.xsl b/BOOK/stylesheets/clfs-profile.xsl
index 89cb391..f349a16 100644
--- a/BOOK/stylesheets/clfs-profile.xsl
+++ b/BOOK/stylesheets/clfs-profile.xsl
@@ -373,6 +373,59 @@
<xsl:text>list-presentation="table"</xsl:text>
</xsl:processing-instruction>
+ <!-- Begin the Short Desc For-Each for Programs -->
+ <xsl:for-each select="c:program">
+ <xsl:text>

 </xsl:text>
+ <xsl:element name="varlistentry">
+ <xsl:attribute name="id">
+ <xsl:value-of select="c:name" />
+ </xsl:attribute>
+
+ <!-- Term -->
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="term">
+ <xsl:element name="command">
+ <xsl:value-of select="c:name" />
+ </xsl:element>
+ </xsl:element>
+ <!-- End Term -->
+
+ <!-- List Item -->
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="listitem">
+
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="para">
+ <xsl:apply-templates select="c:description" />
+ </xsl:element>
+
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="indexterm">
+ <xsl:attribute name="zone">
+ <xsl:value-of select="$id" />
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="c:name" />
+ </xsl:attribute>
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="primary">
+ <xsl:attribute name="sortas">
+ <xsl:text>b-</xsl:text>
+ <xsl:value-of select="c:name" />
+ </xsl:attribute>
+ <xsl:value-of select="c:name" />
+ </xsl:element>
+ <xsl:text>
 </xsl:text>
+ </xsl:element>
+
+ <xsl:text>
 </xsl:text>
+ </xsl:element><!-- listitem -->
+ <!-- End List Item -->
+
+ <xsl:text>
 </xsl:text>
+ </xsl:element><!-- varlistentry -->
+ </xsl:for-each>
+ <!-- End the Short Desc For-Each for Programs -->
+
<!-- Begin the Short Desc For-Each for Libraries -->
<xsl:for-each select="c:library">
<xsl:text>

 </xsl:text>
@@ -388,6 +441,7 @@
<xsl:attribute name="class">
<xsl:text>libraryfile</xsl:text>
</xsl:attribute>
+ <xsl:value-of select="c:name" />
</xsl:element>
</xsl:element>
<!-- End Term -->
diff --git a/BOOK/testpart.xml b/BOOK/testpart.xml
index dbbe14d..8a52c51 100644
--- a/BOOK/testpart.xml
+++ b/BOOK/testpart.xml
@@ -61,6 +61,11 @@
<c:contents>
+ <c:program>
+ <c:name>test</c:name>
+ <c:description>This is the test program.</c:description>
+ </c:program>
+
<c:library>
<c:name>libjoe</c:name>
<c:description>This is a bullshit library for a <c:command>test</c:command>.</c:description>
commit 1d86c7756b7662aa1442e4f7c1c491442f883061
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 00:00:06 2011 -0400
Bring Programs to the top of the contents list. Render out docbook
for the short descriptions of libraries.
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rnc b/BOOK/schema/clfs/0.1/rng/clfs.rnc
index a6fda08..0716002 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rnc
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rnc
@@ -123,7 +123,7 @@ clfs.sect.package =
attribute c:ref {
text
} | (
- element c:library {
+ element c:program {
element c:name {
text
},
@@ -131,7 +131,7 @@ clfs.sect.package =
clfs.inline
}
}*,
- element c:program {
+ element c:library {
element c:name {
text
},
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rng b/BOOK/schema/clfs/0.1/rng/clfs.rng
index 87c5e3d..7f32611 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rng
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rng
@@ -205,7 +205,7 @@
<attribute name="c:ref"/>
<group>
<zeroOrMore>
- <element name="c:library">
+ <element name="c:program">
<element name="c:name">
<text/>
</element>
@@ -215,7 +215,7 @@
</element>
</zeroOrMore>
<zeroOrMore>
- <element name="c:program">
+ <element name="c:library">
<element name="c:name">
<text/>
</element>
diff --git a/BOOK/stylesheets/clfs-profile.xsl b/BOOK/stylesheets/clfs-profile.xsl
index 29981bd..89cb391 100644
--- a/BOOK/stylesheets/clfs-profile.xsl
+++ b/BOOK/stylesheets/clfs-profile.xsl
@@ -223,10 +223,7 @@
<!-- c:contents -> sect2: Build or reference the contents sect2 -->
<xsl:for-each select="c:contents">
- <!-- New Line x2 -->
- <xsl:text>
-
-</xsl:text>
+ <xsl:text>

</xsl:text>
<xsl:element name="sect2">
<xsl:attribute name="role">
@@ -235,12 +232,9 @@
<xsl:choose>
<xsl:when test="string-length(@c:ref) > 0">
<!-- Insert an xref to the actual contents list -->
- <xsl:text>
- </xsl:text>
+ <xsl:text>
 </xsl:text>
<xsl:element name="title" />
- <xsl:text>
-
- </xsl:text>
+ <xsl:text>

 </xsl:text>
<xsl:element name="para">
<xsl:text>Details on this package are located in </xsl:text>
<xsl:element name="xref">
@@ -260,50 +254,42 @@
<xsl:value-of select="$id" />
<xsl:text>-contents</xsl:text>
</xsl:attribute>
- <xsl:text>
- </xsl:text>
+ <xsl:text>
 </xsl:text>
<xsl:element name="title">
<xsl:text>Contents of </xsl:text>
<xsl:value-of select="../c:title" />
</xsl:element>
- <xsl:text>
-
-</xsl:text>
+ <xsl:text>

</xsl:text>
<!-- Begin the Summary List -->
<xsl:element name="segmentedlist">
- <xsl:if test="count(c:library) > 0">
- <xsl:text>
- </xsl:text>
+ <xsl:if test="count(c:program) > 0">
+ <xsl:text>
 </xsl:text>
<xsl:element name="segtitle">
- <xsl:text>Installed Libraries</xsl:text>
+ <xsl:text>Installed Programs</xsl:text>
</xsl:element>
</xsl:if>
- <xsl:if test="count(c:program) > 0">
- <xsl:text>
- </xsl:text>
+ <xsl:if test="count(c:library) > 0">
+ <xsl:text>
 </xsl:text>
<xsl:element name="segtitle">
- <xsl:text>Installed Programs</xsl:text>
+ <xsl:text>Installed Libraries</xsl:text>
</xsl:element>
</xsl:if>
<xsl:if test="count(c:directory) > 0">
- <xsl:text>
- </xsl:text>
+ <xsl:text>
 </xsl:text>
<xsl:element name="segtitle">
<xsl:text>Installed Directories</xsl:text>
</xsl:element>
</xsl:if>
- <xsl:text>
-
- </xsl:text>
+ <xsl:text>

 </xsl:text>
<xsl:element name="seglistitem">
- <xsl:if test="count(c:library) > 0">
- <xsl:text>
- </xsl:text>
- <!-- Begin the seg list for Libraries -->
+
+ <!-- Begin the seg list for Programs -->
+ <xsl:if test="count(c:program) > 0">
+ <xsl:text>
 </xsl:text>
<xsl:element name="seg">
- <xsl:for-each select="c:library">
+ <xsl:for-each select="c:program">
<xsl:value-of select="c:name" />
- <xsl:if test="count(../c:library) > 1">
+ <xsl:if test="count(../c:program) > 1">
<xsl:choose>
<xsl:when test="position() < (last() - 1)">
<xsl:text>, </xsl:text>
@@ -316,14 +302,15 @@
</xsl:for-each>
</xsl:element>
</xsl:if>
- <xsl:if test="count(c:program) > 0">
- <xsl:text>
- </xsl:text>
- <!-- Begin the seg list for Programs -->
+ <!-- End the seg list for Programs -->
+
+ <!-- Begin the seg list for Libraries -->
+ <xsl:if test="count(c:library) > 0">
+ <xsl:text>
 </xsl:text>
<xsl:element name="seg">
- <xsl:for-each select="c:program">
+ <xsl:for-each select="c:library">
<xsl:value-of select="c:name" />
- <xsl:if test="count(../c:program) > 1">
+ <xsl:if test="count(../c:library) > 1">
<xsl:choose>
<xsl:when test="position() < (last() - 1)">
<xsl:text>, </xsl:text>
@@ -336,10 +323,11 @@
</xsl:for-each>
</xsl:element>
</xsl:if>
+ <!-- End the seg list for Libraries -->
+
+ <!-- Begin the seg list for Directories -->
<xsl:if test="count(c:directory) > 0">
- <xsl:text>
- </xsl:text>
- <!-- Begin the seg list for Directories -->
+ <xsl:text>
 </xsl:text>
<xsl:element name="seg">
<xsl:for-each select="c:directory">
<xsl:value-of select="c:name" />
@@ -354,35 +342,108 @@
</xsl:for-each>
</xsl:element>
</xsl:if>
- <xsl:text>
- </xsl:text>
+ <!-- End the seg list for Directories -->
+
+ <xsl:text>
 </xsl:text>
</xsl:element>
- <xsl:text>
-</xsl:text>
+ <xsl:text>
</xsl:text>
</xsl:element>
- <xsl:text>
-
-</xsl:text>
- <!-- Insert Short Desc List Here -->
+ <xsl:text>

</xsl:text>
<!-- End of the Summary List -->
+
+ <!-- Begin Short Desc List -->
+ <xsl:element name="variablelist">
+
+ <!-- Render As -->
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="bridgehead">
+ <xsl:attribute name="renderas">
+ <xsl:text>sect3</xsl:text>
+ </xsl:attribute>
+ <xsl:text>Short Descriptions</xsl:text>
+ </xsl:element>
+
+ <!-- Processing Instructions -->
+ <xsl:text>
 </xsl:text>
+ <xsl:processing-instruction name="dbfo">
+ <xsl:text>list-presentation="list"</xsl:text>
+ </xsl:processing-instruction>
+ <xsl:text>
 </xsl:text>
+ <xsl:processing-instruction name="dbhtml">
+ <xsl:text>list-presentation="table"</xsl:text>
+ </xsl:processing-instruction>
+
+ <!-- Begin the Short Desc For-Each for Libraries -->
+ <xsl:for-each select="c:library">
+ <xsl:text>

 </xsl:text>
+ <xsl:element name="varlistentry">
+ <xsl:attribute name="id">
+ <xsl:value-of select="c:name" />
+ </xsl:attribute>
+
+ <!-- Term -->
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="term">
+ <xsl:element name="filename">
+ <xsl:attribute name="class">
+ <xsl:text>libraryfile</xsl:text>
+ </xsl:attribute>
+ </xsl:element>
+ </xsl:element>
+ <!-- End Term -->
+
+ <!-- List Item -->
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="listitem">
+
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="para">
+ <xsl:apply-templates select="c:description" />
+ </xsl:element>
+
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="indexterm">
+ <xsl:attribute name="zone">
+ <xsl:value-of select="$id" />
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="c:name" />
+ </xsl:attribute>
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="primary">
+ <xsl:attribute name="sortas">
+ <xsl:text>c-</xsl:text>
+ <xsl:value-of select="c:name" />
+ </xsl:attribute>
+ <xsl:value-of select="c:name" />
+ </xsl:element>
+ <xsl:text>
 </xsl:text>
+ </xsl:element>
+
+ <xsl:text>
 </xsl:text>
+ </xsl:element><!-- listitem -->
+ <!-- End List Item -->
+
+ <xsl:text>
 </xsl:text>
+ </xsl:element><!-- varlistentry -->
+ </xsl:for-each>
+ <!-- End the Short Desc For-Each for Libraries -->
+
+ <xsl:text>

</xsl:text>
+ </xsl:element><!-- variablelist -->
+ <!-- End Short Desc List -->
</xsl:otherwise>
</xsl:choose>
- <xsl:text>
-</xsl:text>
- </xsl:element>
+
+ <xsl:text>

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

</xsl:text>
</xsl:element><!-- Sect1 -->
</xsl:template><!-- package-stub -->
- <!-- -->
-
<!-- Apply the profile to the 32bit package -->
<xsl:template match="c:para" mode="filter-bits-32">
diff --git a/BOOK/testpart.xml b/BOOK/testpart.xml
index e212b4c..dbbe14d 100644
--- a/BOOK/testpart.xml
+++ b/BOOK/testpart.xml
@@ -61,22 +61,28 @@
<c:contents>
-<c:directory>
- <c:name>/usr/blah</c:name>
- <c:description>Some Crap</c:description>
-</c:directory>
-<c:directory>
- <c:name>/usr/blah2</c:name>
- <c:description>Some Crap2</c:description>
-</c:directory>
-<c:directory>
- <c:name>/usr/blah3</c:name>
- <c:description>Some Crap2</c:description>
-</c:directory>
-<c:directory>
- <c:name>/usr/blah4</c:name>
- <c:description>Some Crap2</c:description>
-</c:directory>
+ <c:library>
+ <c:name>libjoe</c:name>
+ <c:description>This is a bullshit library for a <c:command>test</c:command>.</c:description>
+ </c:library>
+
+ <c:directory>
+ <c:name>/usr/blah</c:name>
+ <c:description>Some Crap</c:description>
+ </c:directory>
+ <c:directory>
+ <c:name>/usr/blah2</c:name>
+ <c:description>Some Crap2</c:description>
+ </c:directory>
+ <c:directory>
+ <c:name>/usr/blah3</c:name>
+ <c:description>Some Crap2</c:description>
+ </c:directory>
+ <c:directory>
+ <c:name>/usr/blah4</c:name>
+ <c:description>Some Crap2</c:description>
+ </c:directory>
+
</c:contents>
</c:package>
commit 4fc487d1dd76d1f43a253acfbae314537959e706
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sat Apr 23 23:24:23 2011 -0400
Cleanup the output of the seglist header of the content list sect2.
diff --git a/BOOK/stylesheets/clfs-profile.xsl b/BOOK/stylesheets/clfs-profile.xsl
index ca0678f..29981bd 100644
--- a/BOOK/stylesheets/clfs-profile.xsl
+++ b/BOOK/stylesheets/clfs-profile.xsl
@@ -234,12 +234,13 @@
</xsl:attribute>
<xsl:choose>
<xsl:when test="string-length(@c:ref) > 0">
+ <!-- Insert an xref to the actual contents list -->
<xsl:text>
-</xsl:text>
+ </xsl:text>
<xsl:element name="title" />
<xsl:text>
-</xsl:text>
+ </xsl:text>
<xsl:element name="para">
<xsl:text>Details on this package are located in </xsl:text>
<xsl:element name="xref">
@@ -254,12 +255,13 @@
</xsl:element>
</xsl:when>
<xsl:otherwise>
+ <!-- This page gets the contents list -->
<xsl:attribute name="id">
<xsl:value-of select="$id" />
<xsl:text>-contents</xsl:text>
</xsl:attribute>
<xsl:text>
-</xsl:text>
+ </xsl:text>
<xsl:element name="title">
<xsl:text>Contents of </xsl:text>
<xsl:value-of select="../c:title" />
@@ -267,6 +269,7 @@
<xsl:text>
</xsl:text>
+ <!-- Begin the Summary List -->
<xsl:element name="segmentedlist">
<xsl:if test="count(c:library) > 0">
<xsl:text>
@@ -296,6 +299,7 @@
<xsl:if test="count(c:library) > 0">
<xsl:text>
</xsl:text>
+ <!-- Begin the seg list for Libraries -->
<xsl:element name="seg">
<xsl:for-each select="c:library">
<xsl:value-of select="c:name" />
@@ -315,6 +319,7 @@
<xsl:if test="count(c:program) > 0">
<xsl:text>
</xsl:text>
+ <!-- Begin the seg list for Programs -->
<xsl:element name="seg">
<xsl:for-each select="c:program">
<xsl:value-of select="c:name" />
@@ -334,18 +339,17 @@
<xsl:if test="count(c:directory) > 0">
<xsl:text>
</xsl:text>
+ <!-- Begin the seg list for Directories -->
<xsl:element name="seg">
<xsl:for-each select="c:directory">
<xsl:value-of select="c:name" />
<xsl:if test="count(../c:directory) > 1">
- <xsl:choose>
- <xsl:when test="position() < (last() - 1)">
- <xsl:text>, </xsl:text>
- </xsl:when>
- <xsl:when test="position() = last() - 1">
- <xsl:text> and </xsl:text>
- </xsl:when>
- </xsl:choose>
+ <xsl:if test="position() < (last() - 1)">
+ <xsl:text>, </xsl:text>
+ </xsl:if>
+ <xsl:if test="position() = last() - 1">
+ <xsl:text> and </xsl:text>
+ </xsl:if>
</xsl:if>
</xsl:for-each>
</xsl:element>
@@ -356,10 +360,14 @@
<xsl:text>
</xsl:text>
</xsl:element>
+ <xsl:text>
+
+</xsl:text>
+ <!-- Insert Short Desc List Here -->
+ <!-- End of the Summary List -->
</xsl:otherwise>
</xsl:choose>
<xsl:text>
-
</xsl:text>
</xsl:element>
</xsl:for-each><!-- c:contents -> sect2 -->
@@ -373,6 +381,8 @@
</xsl:template><!-- package-stub -->
+ <!-- -->
+
<!-- Apply the profile to the 32bit package -->
<xsl:template match="c:para" mode="filter-bits-32">
-----------------------------------------------------------------------
Summary of changes:
BOOK/schema/clfs/0.1/rng/clfs.rnc | 33 ++-
BOOK/schema/clfs/0.1/rng/clfs.rng | 41 +++-
BOOK/stylesheets/clfs-profile.xsl | 491 ++++++++++++++++++++++++++++++++-----
BOOK/testpart.xml | 47 +++--
4 files changed, 508 insertions(+), 104 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list