Changed paper size to letter. Fixed Makefile.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4665 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Makefile

@@ -33,27 +33,23 @@ lfs:
 	  sed -i -e "s@text/html@application/xhtml+xml@g" $$filename; \
 	done;
 
-#
-# This is the old "pdf" target. The old "print" target below has been   
-# renamed to "pdf" and will be used. This commented out previous_pdf
-# target can be removed eventually. It'll remain here for a bit for
-# historical reasons
-#
-#previous_pdf:
-#	xsltproc --xinclude --nonet --output $(BASEDIR)/lfs.fo stylesheets/lfs-pdf.xsl \
-#	  index.xml
-#	sed -i -e "s/inherit/all/" $(BASEDIR)/lfs.fo
-#	fop.sh $(BASEDIR)/lfs.fo $(BASEDIR)/$(PDF_OUTPUT)
-#	rm lfs.fo
+# Uncomment this for testing and stable versions
+#pdf:
+#	xsltproc --xinclude --nonet --stringparam profile.condition pdf \
+#		--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
 
+# Remove this for testing and stable versions
 pdf:
-	xsltproc --xinclude --nonet --stringparam profile.condition pdf \
-		--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
+	xsltproc --xinclude --nonet --output $(BASEDIR)/lfs-pdf.fo \
+		stylesheets/lfs-pdf.xsl index.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
+	rm $(BASEDIR)/lfs-pdf.fo
 
 nochunks:
 	xsltproc --xinclude --nonet -stringparam profile.condition html \

stylesheets/lfs-pdf.xsl

@@ -18,12 +18,16 @@
 
     <!-- This file contains our localization strings (for internationalization) -->
   <xsl:param name="local.l10n.xml" select="document('lfs-l10n.xml')"/>
+  
+   <!-- Standart paper size -->
+  <xsl:param name="paper.type" select="'letter'"/>
 
-    <!-- Paper size required by the publisher -->
+    <!-- Paper size required by the publisher 
   <xsl:param name="paper.type" select="'Customized'"/>
   <xsl:param name="page.width">7.25in</xsl:param>
   <xsl:param name="page.height">9.25in</xsl:param>
-
+    -->
+    
     <!-- Printing Style -->
   <xsl:param name="double.sided" select="1"/>
   <xsl:param name="hyphenate">false</xsl:param>