aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--stylesheets/lfs-nochunks.xsl26
2 files changed, 19 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index 789a5a738..f971c4a42 100644
--- a/Makefile
+++ b/Makefile
@@ -53,14 +53,6 @@ nochunks:
sed -i -e "s@text/html@application/xhtml+xml@g" \
$(BASEDIR)/$(NOCHUNKS_OUTPUT)
- if [ ! -e $(BASEDIR)/images ]; then \
- mkdir -p $(BASEDIR)/images; \
- fi;
- cp $(XSLROOTDIR)/images/*.png \
- $(BASEDIR)/images
- cd $(BASEDIR)/; sed -i -e "s@../images@images@g" \
- *.html
-
validate:
xmllint --noout --nonet --xinclude --postvalid index.xml
diff --git a/stylesheets/lfs-nochunks.xsl b/stylesheets/lfs-nochunks.xsl
index 027f42eb7..2582a9aa5 100644
--- a/stylesheets/lfs-nochunks.xsl
+++ b/stylesheets/lfs-nochunks.xsl
@@ -7,11 +7,10 @@
<!-- We use XHTML -->
<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.68.1/xhtml/profile-docbook.xsl"/>
- <!-- Fix encoding issues with default UTF-8 output of the xhtml stylesheet -->
+ <!-- Fix encoding issues with default UTF-8 output of the xhtml stylesheet -->
<xsl:output method="html" encoding="ISO-8859-1" indent="no" />
-
+
<!-- Including our others customized templates -->
- <xsl:include href="xhtml/lfs-admon.xsl"/>
<xsl:include href="xhtml/lfs-index.xsl"/>
<xsl:include href="xhtml/lfs-mixed.xsl"/>
<xsl:include href="xhtml/lfs-sections.xsl"/>
@@ -25,6 +24,23 @@
<xsl:param name="ulink.target" select="''"></xsl:param>
<xsl:param name="css.decoration" select="0"></xsl:param>
+ <!-- Don't use graphics in admonitions -->
+ <xsl:param name="admon.graphics" select="0"/>
+
+ <!-- Changing the admonitions output tagging -->
+ <xsl:template name="nongraphical.admonition">
+ <div class="{name(.)}">
+ <div class ="admonhead">
+ <h3 class="admontitle">
+ <xsl:apply-templates select="." mode="object.title.markup"/>
+ </h3>
+ </div>
+ <div class="admonbody">
+ <xsl:apply-templates/>
+ </div>
+ </div>
+ </xsl:template>
+
<!-- To drop the remainig dot when title is empty (from lfs-titles.xsl)-->
<xsl:template name="sect2.titlepage">
<xsl:choose>
@@ -150,10 +166,6 @@ div.important h3, div.warning h3, div.caution h3 {
color: #900;
}
-div.admonhead img {
- display: none;
-}
-
h3.admontitle {
padding-left: 2.5em;
padding-top: 1em;