diff --git a/Makefile b/Makefile
index 8b534c69b..cdca3b9c5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,25 @@
BASEDIR=~/lfs-book
+CHUNK_QUIET=0
+PDF_OUTPUT=LFS-BOOK.pdf
+PRINT_OUTPUT=LFS-BOOK-PRINTABLE.pdf
+NOCHUNKS_OUTPUT=LFS-BOOK.html
lfs:
- xsltproc --xinclude --nonet -stringparam base.dir $(BASEDIR)/ \
- stylesheets/lfs-chunked.xsl index.xml
+ xsltproc --xinclude --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
+ -stringparam base.dir $(BASEDIR)/ stylesheets/lfs-chunked.xsl \
+ index.xml
if [ ! -e $(BASEDIR)/stylesheets ]; then \
mkdir -p $(BASEDIR)/stylesheets; \
fi;
- cp stylesheets/lfs.css $(BASEDIR)/stylesheets
+ cp stylesheets/*.css $(BASEDIR)/stylesheets
if [ ! -e $(BASEDIR)/images ]; then \
mkdir -p $(BASEDIR)/images; \
fi;
cp /usr/share/xml/docbook/xsl-stylesheets-1.65.1/images/*.png \
$(BASEDIR)/images
- cd $(BASEDIR)/; sed -i -e "s@../stylesheets@stylesheets@" \
+ cd $(BASEDIR)/; sed -i -e "s@../stylesheets@stylesheets@g" \
index.html part1.html part2.html part3.html longindex.html
cd $(BASEDIR)/; sed -i -e "s@../images@images@g" \
index.html part1.html part2.html part3.html longindex.html
@@ -25,18 +30,18 @@ pdf:
xsltproc --xinclude --nonet --output lfs.fo stylesheets/lfs-pdf.xsl \
index.xml
sed -i -e "s/inherit/all/" lfs.fo
- fop.sh lfs.fo lfs.pdf
+ fop.sh lfs.fo $(PDF_OUTPUT)
print:
xsltproc --xinclude --nonet --output lfs-print.fo \
stylesheets/lfs-print.xsl index.xml
sed -i -e "s/inherit/all/" lfs-print.fo
- fop.sh lfs-print.fo lfs-print.pdf
+ fop.sh lfs-print.fo $(PRINT_OUTPUT)
nochunks:
- xsltproc --xinclude --nonet --output lfs.html \
+ xsltproc --xinclude --nonet --output $(NOCHUNKS_OUTPUT) \
stylesheets/lfs-nochunks.xsl index.xml
- tidy -config tidy.conf lfs.html || true
+ tidy -config tidy.conf $(NOCHUNKS_OUTPUT) || true
validate:
xmllint --noout --nonet --xinclude --postvalid index.xml
diff --git a/stylesheets/lfs-chunked2.xsl b/stylesheets/lfs-chunked2.xsl
index 7f0252f01..43d5eecec 100644
--- a/stylesheets/lfs-chunked2.xsl
+++ b/stylesheets/lfs-chunked2.xsl
@@ -16,6 +16,9 @@
+
+
+
diff --git a/stylesheets/lfs-nochunks.xsl b/stylesheets/lfs-nochunks.xsl
index 4c2516e0f..7f771f511 100644
--- a/stylesheets/lfs-nochunks.xsl
+++ b/stylesheets/lfs-nochunks.xsl
@@ -4,26 +4,273 @@
xmlns="http://www.w3.org/1999/xhtml"
version="1.0">
-
+
-
+
-
-
-
-
-
-
+
-
+
+
+
+
+
+
diff --git a/stylesheets/lfs-print.css b/stylesheets/lfs-print.css
new file mode 100644
index 000000000..88e8efabb
--- /dev/null
+++ b/stylesheets/lfs-print.css
@@ -0,0 +1,6 @@
+
+@import url(lfs.css);
+
+.navfooter, .headerlinks {
+ display: none;
+}
diff --git a/stylesheets/lfs.css b/stylesheets/lfs.css
index 28b354ed1..7f14275b0 100644
--- a/stylesheets/lfs.css
+++ b/stylesheets/lfs.css
@@ -178,11 +178,16 @@ dl {
}
dt {
+ display: list-item;
font-weight: bold;
margin: .33em 0 0 1em;
padding: 0;
}
+div.content dt {
+ list-style: none;
+}
+
dd {
margin: 0 0 1em 3em;
padding: 0;
@@ -196,10 +201,6 @@ div.variablelist dd p {
margin-top: 0px;
}
-dl.materials dt, div.installation dt, div.configuration dt, div.sect2 dt {
- display: list-item;
-}
-
dl.materials dd {
margin-left: 0px;
}