Author: matthew
Date: 2012-09-04 12:29:02 -0600 (Tue, 04 Sep 2012)
New Revision: 9984
Modified:
trunk/BOOK/Makefile
trunk/BOOK/stylesheets/lfs-xsl/chunk-master.xsl
trunk/BOOK/stylesheets/lfs-xsl/chunk-slave.xsl
trunk/BOOK/stylesheets/lfs-xsl/nochunks.xsl
trunk/BOOK/stylesheets/lfs-xsl/pdf.xsl
trunk/BOOK/stylesheets/lfs-xsl/profile.xsl
Log:
Revert erroneous stylesheet changes, applied by mistake.
Modified: trunk/BOOK/Makefile
===================================================================
--- trunk/BOOK/Makefile 2012-09-04 18:24:59 UTC (rev 9983)
+++ trunk/BOOK/Makefile 2012-09-04 18:29:02 UTC (rev 9984)
@@ -29,6 +29,7 @@
fi;
$(Q)cp images/*.png $(BASEDIR)/images
$(Q)cd $(BASEDIR)/; sed -i -e "s@../stylesheets@stylesheets@g" *.html
+ $(Q)cd $(BASEDIR)/; sed -i -e "s@../images@images@g" *.html
@echo "Running Tidy and obfuscate.sh..."
$(Q)for filename in `find $(BASEDIR) -name "*.html"`; do \
@@ -75,10 +76,6 @@
$(BASEDIR)/$(NOCHUNKS_OUTPUT)
$(Q)$(MAKE) wget-list
-epub: validate
- @echo "Generating ePub..."
- $(Q)xsltproc --nonet stylesheets/lfs-xsl/epub.xsl
$(RENDERTMP)/lfs-full.xml
-
tmpdir:
@echo "Creating and cleaning $(RENDERTMP)"
$(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
Modified: trunk/BOOK/stylesheets/lfs-xsl/chunk-master.xsl
===================================================================
--- trunk/BOOK/stylesheets/lfs-xsl/chunk-master.xsl 2012-09-04 18:24:59 UTC
(rev 9983)
+++ trunk/BOOK/stylesheets/lfs-xsl/chunk-master.xsl 2012-09-04 18:29:02 UTC
(rev 9984)
@@ -18,10 +18,10 @@
<xsl:import href="chunk-slave.xsl"/>
<!-- Upstream chunk code named templates -->
- <xsl:import href="docbook-xsl-1.77.1/xhtml/chunk-common.xsl"/>
+ <xsl:import href="docbook-xsl-snapshot/xhtml/chunk-common.xsl"/>
<!-- Upstream chunk code match templates -->
- <xsl:include href="docbook-xsl-1.77.1/xhtml/chunk-code.xsl"/>
+ <xsl:include href="docbook-xsl-snapshot/xhtml/chunk-code.xsl"/>
<!-- Including our customized chunks templates -->
<xsl:include href="xhtml/lfs-index.xsl"/>
Modified: trunk/BOOK/stylesheets/lfs-xsl/chunk-slave.xsl
===================================================================
--- trunk/BOOK/stylesheets/lfs-xsl/chunk-slave.xsl 2012-09-04 18:24:59 UTC
(rev 9983)
+++ trunk/BOOK/stylesheets/lfs-xsl/chunk-slave.xsl 2012-09-04 18:29:02 UTC
(rev 9984)
@@ -13,7 +13,7 @@
Sets global params and include customized elements templates. -->
<!-- Upstream XHTML presentation templates -->
- <xsl:import href="docbook-xsl-1.77.1/xhtml/docbook.xsl"/>
+ <xsl:import href="docbook-xsl-snapshot/xhtml/docbook.xsl"/>
<!-- Use ISO-8859-1 for output instead of default UTF-8 -->
<xsl:param name="chunker.output.encoding" select="'ISO-8859-1'"/>
@@ -31,7 +31,7 @@
The path from top-level HTML files (index.html, partX.html, etc) MUST be
fixed via a sed in the Makefile-->
<!-- Master CSS Stylesheet -->
- <xsl:param name="html.stylesheet" select="'stylesheets/lfs.css'"/>
+ <xsl:param name="html.stylesheet" select="'../stylesheets/lfs.css'"/>
<!-- Print CSS Stylesheet -->
<!-- The original template is in {docbook-xsl}/xhtml/docbook.xsl -->
<xsl:template name='user.head.content'>
Modified: trunk/BOOK/stylesheets/lfs-xsl/nochunks.xsl
===================================================================
--- trunk/BOOK/stylesheets/lfs-xsl/nochunks.xsl 2012-09-04 18:24:59 UTC (rev
9983)
+++ trunk/BOOK/stylesheets/lfs-xsl/nochunks.xsl 2012-09-04 18:29:02 UTC (rev
9984)
@@ -13,7 +13,7 @@
Replaces {docbook-xsl}/xhtml/profile-docbook.xsl -->
<!-- Upstream XHTML templates -->
- <xsl:import href="docbook-xsl-1.77.1/xhtml/docbook.xsl"/>
+ <xsl:import href="docbook-xsl-snapshot/xhtml/docbook.xsl"/>
<!-- Fix encoding issues with default UTF-8 output of the xhtml stylesheet
-->
<xsl:output method="html" encoding="ISO-8859-1" indent="no" />
Modified: trunk/BOOK/stylesheets/lfs-xsl/pdf.xsl
===================================================================
--- trunk/BOOK/stylesheets/lfs-xsl/pdf.xsl 2012-09-04 18:24:59 UTC (rev
9983)
+++ trunk/BOOK/stylesheets/lfs-xsl/pdf.xsl 2012-09-04 18:29:02 UTC (rev
9984)
@@ -14,7 +14,7 @@
<!-- Upstream FO templates. Profiled version is not supported by
xsltproc, thus pofiling must be done in two steps (see Makefile) -->
- <xsl:import href="docbook-xsl-1.77.1/fo/docbook.xsl"/>
+ <xsl:import href="docbook-xsl-snapshot/fo/docbook.xsl"/>
<!-- Uncomment the next for debugging the raw FO code.
Note that FOP will complaints about a lot of paragraph overflows
Modified: trunk/BOOK/stylesheets/lfs-xsl/profile.xsl
===================================================================
--- trunk/BOOK/stylesheets/lfs-xsl/profile.xsl 2012-09-04 18:24:59 UTC (rev
9983)
+++ trunk/BOOK/stylesheets/lfs-xsl/profile.xsl 2012-09-04 18:29:02 UTC (rev
9984)
@@ -12,11 +12,11 @@
Replaces {docbook-xsl}/profiling/profile.xsl -->
<!-- Include common profiling stylesheet -->
- <xsl:import href="docbook-xsl-1.77.1/profiling/profile-mode.xsl"/>
+ <xsl:import href="docbook-xsl-snapshot/profiling/profile-mode.xsl"/>
<!-- This file must be included, because profile-mode is using
templates from it -->
- <xsl:import href="docbook-xsl-1.77.1/common/stripns.xsl"/>
+ <xsl:import href="docbook-xsl-snapshot/common/stripns.xsl"/>
<!-- In the two pass processing there is no need for base URI fixup -->
<xsl:param name="profile.baseuri.fixup" select="false()"/>
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page