Author: manuel
Date: 2007-04-23 11:38:52 -0600 (Mon, 23 Apr 2007)
New Revision: 8101
Modified:
branches/new-xsl/lfs-nochunks.xsl
branches/new-xsl/lfs.css
branches/new-xsl/xhtml/lfs-mixed.xsl
Log:
Some fixes needed to can have valid XHTML 1.0 Strict output.
Modified: branches/new-xsl/lfs-nochunks.xsl
===================================================================
--- branches/new-xsl/lfs-nochunks.xsl 2007-04-22 21:20:09 UTC (rev 8100)
+++ branches/new-xsl/lfs-nochunks.xsl 2007-04-23 17:38:52 UTC (rev 8101)
@@ -95,8 +95,8 @@
</xsl:template>
<!-- The CSS Stylesheet:
- Note: there is a few diferences with lfs.css code releated
- to h* values. -->
+ Note: there is some diferences with lfs.css code releated
+ to h* values, admonitions and no navigational code. -->
<!-- The original template is in {docbook-xsl}/xhtml/docbook.xsl -->
<xsl:template name='user.head.content'>
<style type="text/css">
@@ -488,29 +488,52 @@
margin-top: -.6em;
}
-ul[compact="compact"] {
+ul.compact {
list-style: none;
}
-.blfs ul[compact="compact"] {
+.blfs ul.compact {
list-style: disc;
}
-ul[compact="compact"] li {
+ul.compact li {
margin: 0em;
padding: 0em;
}
-ul[compact="compact"] li p {
+ul.compact li p {
padding: 0.3em;
margin: 0em;
}
-.blfs ul[compact="compact"] li p {
+.blfs ul.compact li p {
background-color: #f0fff0;
}
+/* orderedlist */
+ol {
+ list-style: decimal;
+}
+ol ol {
+ list-style: lower-alpha;
+}
+
+ol ol ol {
+ list-style: lower-roman;
+}
+
+ol.compact li {
+ margin: 0em;
+ padding: 0em;
+}
+
+ol.compact li p {
+ padding: 0.3em;
+ margin: 0em;
+}
+
+
/* Indented blocks */
p, blockquote {
padding-left: 1em;
Modified: branches/new-xsl/lfs.css
===================================================================
--- branches/new-xsl/lfs.css 2007-04-22 21:20:09 UTC (rev 8100)
+++ branches/new-xsl/lfs.css 2007-04-23 17:38:52 UTC (rev 8101)
@@ -452,29 +452,52 @@
margin-top: -.6em;
}
-ul[compact="compact"] {
+ul.compact {
list-style: none;
}
-.blfs ul[compact="compact"] {
+.blfs ul.compact {
list-style: disc;
}
-ul[compact="compact"] li {
+ul.compact li {
margin: 0em;
padding: 0em;
}
-ul[compact="compact"] li p {
+ul.compact li p {
padding: 0.3em;
margin: 0em;
}
-.blfs ul[compact="compact"] li p {
+.blfs ul.compact li p {
background-color: #f0fff0;
}
+/* orderedlist */
+ol {
+ list-style: decimal;
+}
+ol ol {
+ list-style: lower-alpha;
+}
+
+ol ol ol {
+ list-style: lower-roman;
+}
+
+ol.compact li {
+ margin: 0em;
+ padding: 0em;
+}
+
+ol.compact li p {
+ padding: 0.3em;
+ margin: 0em;
+}
+
+
/* Indented blocks */
p, blockquote {
padding-left: 1em;
Modified: branches/new-xsl/xhtml/lfs-mixed.xsl
===================================================================
--- branches/new-xsl/xhtml/lfs-mixed.xsl 2007-04-22 21:20:09 UTC (rev
8100)
+++ branches/new-xsl/xhtml/lfs-mixed.xsl 2007-04-23 17:38:52 UTC (rev
8101)
@@ -80,6 +80,61 @@
</xsl:choose>
</xsl:template>
+ <!-- itemizadlist:
+ @compact is not allowed in XHTML 1.0 Strict DTD. Changing it
+ to @class. -->
+ <!-- The original template is in {docbook-xsl}/xhtml/lists.xsl -->
+ <xsl:template match="itemizedlist">
+ <div>
+ <xsl:apply-templates select="." mode="class.attribute"/>
+ <xsl:call-template name="anchor"/>
+ <xsl:if test="title">
+ <xsl:call-template name="formal.object.heading"/>
+ </xsl:if>
+ <xsl:apply-templates select="*[not(self::listitem or self::title
+ or self::titleabbrev)]
+ |comment()[not(preceding-sibling::listitem)]
+
|processing-instruction()[not(preceding-sibling::listitem)]"/>
+ <ul>
+ <xsl:if test="@spacing='compact'">
+ <xsl:attribute name="class">
+ <xsl:value-of select="@spacing"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:apply-templates select="listitem
|comment()[preceding-sibling::listitem]
+
|processing-instruction()[preceding-sibling::listitem]"/>
+ </ul>
+ </div>
+ </xsl:template>
+
+ <!-- orderedlist:
+ @start, @type, and @compact sre not allowed in XHTML 1.0 Strict DTD.
+ @start and @type can be replaced by CSS code.
+ Changing @compact to @class. -->
+ <!-- The original template is in {docbook-xsl}/xhtml/lists.xsl -->
+ <xsl:template match="orderedlist">
+ <div>
+ <xsl:apply-templates select="." mode="class.attribute"/>
+ <xsl:call-template name="anchor"/>
+ <xsl:if test="title">
+ <xsl:call-template name="formal.object.heading"/>
+ </xsl:if>
+ <xsl:apply-templates select="*[not(self::listitem or self::title
+ or self::titleabbrev)]
+ |comment()[not(preceding-sibling::listitem)]
+
|processing-instruction()[not(preceding-sibling::listitem)]"/>
+ <ol>
+ <xsl:if test="@spacing='compact'">
+ <xsl:attribute name="class">
+ <xsl:value-of select="@spacing"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:apply-templates select="listitem
|comment()[preceding-sibling::listitem]
+
|processing-instruction()[preceding-sibling::listitem]"/>
+ </ol>
+ </div>
+ </xsl:template>
+
<!-- seg in segementedlist:
Added a span around seg text to can match it with CSS code. -->
<!-- The original template is in {docbook-xsl}/xhtml/lists.xsl -->
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
