diff options
| -rw-r--r-- | Makefile | 45 | ||||
| -rw-r--r-- | stylesheets/lfs-chunked.xsl | 2 | ||||
| -rw-r--r-- | stylesheets/lfs-nochunks.xsl | 2 |
3 files changed, 12 insertions, 37 deletions
@@ -11,11 +11,7 @@ lfs: # x86 xsltproc --xinclude --nonet -stringparam profile.condition html -stringparam profile.arch x86 \ - --output $(BASEDIR)/lfs-html.xml stylesheets/lfs-profile.xsl index.xml - - xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \ - -stringparam base.dir $(BASEDIR)/x86/ stylesheets/lfs-chunked.xsl \ - $(BASEDIR)/lfs-html.xml + -stringparam base.dir $(BASEDIR)/x86/ stylesheets/lfs-chunked.xsl index.xml if [ ! -e $(BASEDIR)/x86/stylesheets ]; then \ mkdir -p $(BASEDIR)/x86/stylesheets; \ @@ -32,15 +28,9 @@ lfs: cd $(BASEDIR)/x86/; sed -i -e "s@../images@images@g" \ *.html - rm $(BASEDIR)/lfs-html.xml - # raq2 xsltproc --xinclude --nonet -stringparam profile.condition html -stringparam profile.arch raq2 \ - --output $(BASEDIR)/lfs-html.xml stylesheets/lfs-profile.xsl index.xml - - xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \ - -stringparam base.dir $(BASEDIR)/raq2/ stylesheets/lfs-chunked.xsl \ - $(BASEDIR)/lfs-html.xml + -stringparam base.dir $(BASEDIR)/raq2/ stylesheets/lfs-chunked.xsl index.xml if [ ! -e $(BASEDIR)/raq2/stylesheets ]; then \ mkdir -p $(BASEDIR)/raq2/stylesheets; \ @@ -57,15 +47,9 @@ lfs: cd $(BASEDIR)/raq2/; sed -i -e "s@../images@images@g" \ *.html - rm $(BASEDIR)/lfs-html.xml - # ppc xsltproc --xinclude --nonet -stringparam profile.condition html -stringparam profile.arch ppc \ - --output $(BASEDIR)/lfs-html.xml stylesheets/lfs-profile.xsl index.xml - - xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \ - -stringparam base.dir $(BASEDIR)/ppc/ stylesheets/lfs-chunked.xsl \ - $(BASEDIR)/lfs-html.xml + -stringparam base.dir $(BASEDIR)/ppc/ stylesheets/lfs-chunked.xsl index.xml if [ ! -e $(BASEDIR)/ppc/stylesheets ]; then \ mkdir -p $(BASEDIR)/ppc/stylesheets; \ @@ -82,8 +66,6 @@ lfs: cd $(BASEDIR)/ppc/; sed -i -e "s@../images@images@g" \ *.html - rm $(BASEDIR)/lfs-html.xml - # common stuff for filename in `find $(BASEDIR) -name "*.html"`; do \ @@ -97,11 +79,7 @@ lfs: html: xsltproc --xinclude --nonet -stringparam profile.condition html -stringparam profile.arch $(ARCH) \ - --output $(BASEDIR)/lfs-html.xml stylesheets/lfs-profile.xsl index.xml - - xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \ - -stringparam base.dir $(BASEDIR)/ stylesheets/lfs-chunked.xsl \ - $(BASEDIR)/lfs-html.xml + -stringparam base.dir $(BASEDIR)/ stylesheets/lfs-chunked.xsl index.xml if [ ! -e $(BASEDIR)/stylesheets ]; then \ mkdir -p $(BASEDIR)/stylesheets; \ @@ -118,8 +96,6 @@ html: cd $(BASEDIR)/; sed -i -e "s@../images@images@g" \ *.html - rm $(BASEDIR)/lfs-html.xml - for filename in `find $(BASEDIR) -name "*.html"`; do \ tidy -config tidy.conf $$filename; \ true; \ @@ -144,21 +120,20 @@ html: pdf: xsltproc --xinclude --nonet --stringparam profile.condition pdf -stringparam profile.arch $(ARCH) \ - --output $(BASEDIR)/lfs-pdf.xml stylesheets/lfs-profile.xsl index.xml + --output $(BASEDIR)/lfs-pdf.xml stylesheets/lfs-profile.xsl index.xml + xsltproc --nonet --output $(BASEDIR)/lfs-pdf.fo stylesheets/lfs-pdf.xsl \ $(BASEDIR)/lfs-pdf.xml + sed -i -e "s/inherit/all/" $(BASEDIR)/lfs-pdf.fo + fop.sh $(BASEDIR)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT) + rm $(BASEDIR)/lfs-pdf.xml $(BASEDIR)/lfs-pdf.fo nochunks: xsltproc --xinclude --nonet -stringparam profile.condition html -stringparam profile.arch $(ARCH) \ - --output $(BASEDIR)/lfs-nochunk.xml stylesheets/lfs-profile.xsl index.xml - - xsltproc --nonet --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \ - stylesheets/lfs-nochunks.xsl $(BASEDIR)/lfs-nochunk.xml - - rm $(BASEDIR)/lfs-nochunk.xml + --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) stylesheets/lfs-nochunks.xsl index.xml tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true diff --git a/stylesheets/lfs-chunked.xsl b/stylesheets/lfs-chunked.xsl index c9182e632..c82ffe0fb 100644 --- a/stylesheets/lfs-chunked.xsl +++ b/stylesheets/lfs-chunked.xsl @@ -24,7 +24,7 @@ Voila! (Man I hope we can do this better in XSLT 2.0) --> - <xsl:include href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/chunk-code.xsl"/> + <xsl:include href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/profile-chunk-code.xsl"/> <!-- Including our others customized chunks templates --> <xsl:include href="xhtml/lfs-legalnotice.xsl"/> diff --git a/stylesheets/lfs-nochunks.xsl b/stylesheets/lfs-nochunks.xsl index f3b2fb30a..375f1d8cd 100644 --- a/stylesheets/lfs-nochunks.xsl +++ b/stylesheets/lfs-nochunks.xsl @@ -5,7 +5,7 @@ version="1.0"> <!-- We use XHTML --> - <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/docbook.xsl"/> + <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/profile-docbook.xsl"/> <!-- Fix encoding issues with default UTF-8 output of the xhtml stylesheet --> <xsl:output method="html" encoding="ISO-8859-1" indent="no" /> |