Reformatted several pages so pdf is properly generated.

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

bootscripts/lfs/init.d/functions

@@ -586,7 +586,8 @@ loadproc()
 	fi
 
 	nice -n "${nicelevel}" "${@}"
-	evaluate_retval # This is "Probably" not LSB compliant, but required to be compatible with older bootscripts
+	evaluate_retval # This is "Probably" not LSB compliant,
+#                         but required to be compatible with older bootscripts
 	return 0
 }
 

bootscripts/lfs/sysconfig/network-devices/ifup

@@ -56,12 +56,13 @@ for file in ${FILES}; do
 		fi
 		# Will not process this service if started by hotplug, and 
 		# ONHOTPLUG is not set to yes
-		if [ "${IN_HOTPLUG}" = "1" -a "${ONHOTPLUG}" != "yes" -a "${HOSTNAME}" != "(none)" ]; then
+		if [ "${IN_HOTPLUG}" = "1" -a "${ONHOTPLUG}" != "yes" \
-			 continue
+                    -a "${HOSTNAME}" != "(none)" ]; then continue
 		fi
 
 		if [ -n "${SERVICE}" -a -x "${network_devices}/services/${SERVICE}" ]; then
-			if [ -z "${CHECK_LINK}" -o "${CHECK_LINK}" = "y" -o "${CHECK_LINK}" = "yes" -o "${CHECK_LINK}" = "1" ]; then
+			if [ -z "${CHECK_LINK}" -o "${CHECK_LINK}" = "y" \
+                            -o "${CHECK_LINK}" = "yes" -o "${CHECK_LINK}" = "1" ]; then
 				if ip link show ${1} > /dev/null 2>&1; then
 					link_status=`ip link show ${1}`
 					if [ -n "${link_status}" ]; then

chapter01/changelog.xml

@@ -37,6 +37,17 @@
 
 -->
 
+    <listitem>
+      <para>2009-01-03</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Reformatted several pages so pdf is properly
+          generated.  Thanks to Martin Miehe for the changes.
+          </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2008-12-29</para>
       <itemizedlist>

chapter05/e2fsprogs.xml

@@ -63,7 +63,8 @@ cd build</userinput></screen>
     <para>Make the installed static libraries writable so debugging symbols can 
     be removed later.</para>
 
-<screen><userinput remap="install">chmod -v u+w /tools/lib/{libblkid,libcom_err,libe2p,libext2fs,libss,libuuid}.a</userinput></screen>
+<screen><userinput remap="install">chmod -v u+w \
+    /tools/lib/{libblkid,libcom_err,libe2p,libext2fs,libss,libuuid}.a</userinput></screen>
 
   </sect2>
 

chapter06/bash.xml

@@ -55,7 +55,8 @@ sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \
     <para>Prepare Bash for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin \
-    --without-bash-malloc --with-installed-readline ac_cv_func_working_mktime=yes</userinput></screen>
+    --without-bash-malloc \
+    --with-installed-readline ac_cv_func_working_mktime=yes</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>

chapter06/coreutils.xml

@@ -70,7 +70,8 @@ esac</userinput></screen>
 
     <para>Now prepare Coreutils for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --enable-install-program=hostname --enable-no-install-program=kill,uptime</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --enable-install-program=hostname \
+    --enable-no-install-program=kill,uptime</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>

chapter06/linux-headers.xml

@@ -82,9 +82,10 @@ cp -rv dest/include/* /usr/include</userinput></screen>
         <term><filename class="headerfile">/usr/include/{asm{,-generic},linux,mtd,rdma,sound}/*.h</filename></term>
         <listitem>
           <para>The Linux API headers</para>
-          <indexterm zone="ch-system-linux-headers linux-headers">
+          <indexterm zone="ch-system-linux-headers">
             <!-- No /*.h here to prevent a PDF line overflow -->
-            <primary sortas="e-/usr/include/{asm{,-generic},linux,mtd,rdma,sound}">/usr/include/{asm{,-generic},linux,mtd,rdma,sound,video}</primary>
+            <primary sortas="e-/usr/include/{asm{,-generic},linux,mtd,rdma,sound}">/usr/include/{asm{,-generic},linux,mtd,
+rdma,sound,video}/*.h</primary>
           </indexterm>
         </listitem>
       </varlistentry>

chapter06/man-db.xml

@@ -151,18 +151,24 @@
 
     <!-- Origin: man-db-2.5.2/src/encodings.c -->
     <table>
-      <title>Expected character encoding of legacy 8-bit manual pages</title>
+      <?dbfo keep-together="auto" ?>
-      <?dbfo table-width="2.5in" ?>
+<title>Expected character encoding of legacy 8-bit manual pages</title>
+      <?dbfo keep-together="auto" ?>
+      <?dbfo table-width="6in" ?>
 
-      <tgroup cols="2">
+      <tgroup cols="4">
 
         <colspec colnum="1" colwidth="1.5in"/>
         <colspec colnum="2" colwidth="1in"/>
+        <colspec colnum="3" colwidth="2.5in"/>
+        <colspec colnum="4" colwidth="1in"/>
 
         <thead>
           <row>
             <entry>Language (code)</entry>
             <entry>Encoding</entry>
+            <entry>Language (code)</entry>
+            <entry>Encoding</entry>
           </row>
         </thead>
 
@@ -170,67 +176,99 @@
           <row>
             <entry>Danish (da)</entry>
             <entry>ISO-8859-1</entry>
+            <entry>Bulgarian (bg)</entry>
+            <entry>CP1251</entry>
           </row>
           <row>
             <entry>German (de)</entry>
             <entry>ISO-8859-1</entry>
+            <entry>Czech (cs)</entry>
+            <entry>ISO-8859-2</entry>
           </row>
           <row>
             <entry>English (en)</entry>
             <entry>ISO-8859-1</entry>
+            <entry>Croatian (hr)</entry>
+            <entry>ISO-8859-2</entry>
           </row>
           <row>
             <entry>Spanish (es)</entry>
             <entry>ISO-8859-1</entry>
+            <entry>Hungarian (hu)</entry>
+            <entry>ISO-8859-2</entry>
           </row>
           <row>
             <entry>Finnish (fi)</entry>
             <entry>ISO-8859-1</entry>
+            <entry>Japanese (ja)</entry>
+            <entry>EUC-JP</entry>
           </row>
           <row>
             <entry>French (fr)</entry>
             <entry>ISO-8859-1</entry>
+            <entry>Korean (ko)</entry>
+            <entry>EUC-KR</entry>
           </row>
           <row>
             <entry>Irish (ga)</entry>
             <entry>ISO-8859-1</entry>
+            <entry>Polish (pl)</entry>
+            <entry>ISO-8859-2</entry>
           </row>
           <row>
             <entry>Galician (gl)</entry>
             <entry>ISO-8859-1</entry>
+            <entry>Russian (ru)</entry>
+            <entry>KOI8-R</entry>
           </row>
           <row>
             <entry>Indonesian (id)</entry>
             <entry>ISO-8859-1</entry>
+            <entry>Slovak (sk)</entry>
+            <entry>ISO-8859-2</entry>
           </row>
           <row>
             <entry>Icelandic (is)</entry>
             <entry>ISO-8859-1</entry>
+            <entry>Serbian (sr)</entry>
+            <entry>ISO-8859-5</entry>
           </row>
           <row>
             <entry>Italian (it)</entry>
             <entry>ISO-8859-1</entry>
+            <entry>Turkish (tr)</entry>
+            <entry>ISO-8859-9</entry>
           </row>
           <row>
             <entry>Dutch (nl)</entry>
             <entry>ISO-8859-1</entry>
+            <entry>Simplified Chinese (zh_CN)</entry>
+            <entry>GBK</entry>
           </row>
           <!-- FIXME: BUG: "no" is deprecated, should use "nb" or "nn" and
           symlinks -->
           <row>
             <entry>Norwegian (no)</entry>
             <entry>ISO-8859-1</entry>
+            <entry>Simplified Chinese, Singapore (zh_SG)</entry>
+            <entry>GBK</entry>
           </row>
           <!-- END BUG -->
           <row>
             <entry>Portuguese (pt)</entry>
             <entry>ISO-8859-1</entry>
+            <entry>Traditional Chinese (zh_TW)</entry>
+            <entry>BIG5</entry>
           </row>
           <row>
             <entry>Swedish (sv)</entry>
             <entry>ISO-8859-1</entry>
+            <entry>Traditional Chinese, Hong Kong (zh_HK)</entry>
+            <entry>BIG5HKSCS</entry>
           </row>
+
           <!-- Languages below require patched groff -->
+          <!--
           <row>
             <entry>Bulgarian (bg)</entry>
             <entry>CP1251</entry>
@@ -290,7 +328,7 @@
           <row>
             <entry>Traditional Chinese, Hong Kong (zh_HK)</entry>
             <entry>BIG5HKSCS</entry>
-          </row>
+          </row>-->
         </tbody>
 
       </tgroup>

general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20081229">
+<!ENTITY version "SVN-20090103">
-<!ENTITY releasedate "December 29, 2008">
+<!ENTITY releasedate "January 3, 2009">
 <!ENTITY copyrightdate "1999-2009"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

packages.ent

@@ -293,7 +293,7 @@
 <!ENTITY less-ch6-du "2.8 MB">
 <!ENTITY less-ch6-sbu "0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20081031">                 <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20090102">                 <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->

prologue/hostreqs.xml

@@ -163,14 +163,16 @@ bash --version | head -n1 | cut -d" " -f2-4
 echo "/bin/sh -> `readlink -f /bin/sh`"
 echo -n "Binutils: "; ld --version | head -n1 | cut -d" " -f3-
 bison --version | head -n1
-if [ -e /usr/bin/yacc ]; then echo "/usr/bin/yacc -> `readlink -f /usr/bin/yacc`"; 
+if [ -e /usr/bin/yacc ];
+  then echo "/usr/bin/yacc -> `readlink -f /usr/bin/yacc`"; 
   else echo "yacc not found"; fi
 bzip2 --version 2>&1 < /dev/null | head -n1 | cut -d" " -f1,6-
 echo -n "Coreutils: "; chown --version | head -n1 | cut -d")" -f2
 diff --version | head -n1
 find --version | head -n1
 gawk --version | head -n1
-if [ -e /usr/bin/awk ]; then echo "/usr/bin/awk -> `readlink -f /usr/bin/awk`"; 
+if [ -e /usr/bin/awk ];
+  then echo "/usr/bin/awk -> `readlink -f /usr/bin/awk`"; 
   else echo "awk not found"; fi
 gcc --version | head -n1
 /lib/libc.so.6 | head -n1 | cut -d" " -f1-7
@@ -185,7 +187,8 @@ sed --version | head -n1
 tar --version | head -n1
 makeinfo --version | head -n1
 echo 'main(){}' > dummy.c && gcc -o dummy dummy.c
-if [ -x dummy ]; then echo "Compilation OK"; else echo "Compilation failed"; fi
+if [ -x dummy ]; then echo "Compilation OK";
+  else echo "Compilation failed"; fi
 rm -f dummy.c dummy
 </literal>
 EOF

stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/lists.xsl

@@ -577,7 +577,7 @@
   <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
 
   <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"  
-      keep-together.within-column="always" 
+      keep-together.within-column="auto" 
       keep-with-next.within-column="always">
     <xsl:apply-templates select="term"/>
   </fo:block>

stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/table.xsl

@@ -248,7 +248,7 @@
                  xsl:use-attribute-sets="table.cell.padding">
     <xsl:if test="$xep.extensions != 0">
       <!-- Suggested by RenderX to workaround a bug in their implementation -->
-      <xsl:attribute name="keep-together.within-column">always</xsl:attribute>
+      <xsl:attribute name="keep-together.within-column">auto</xsl:attribute>
     </xsl:if>
     <xsl:if test="$rowsep &gt; 0">
       <xsl:call-template name="border">

stylesheets/lfs-xsl/pdf/lfs-mixed.xsl

@@ -99,9 +99,32 @@ $Date$
           <xsl:when test="$keep.together != ''">
             <xsl:value-of select="$keep.together"/>
           </xsl:when>
+
+<!-- The following section has been modified by Martin Miehe. Page breaks
+     should be allowed within the long script listings in the appendices.
+
           <xsl:otherwise>always</xsl:otherwise>
+-->
+          <xsl:otherwise>
+            <xsl:choose>
+              <xsl:when test="ancestor::appendix">auto</xsl:when>
+              <xsl:otherwise>always</xsl:otherwise>
+            </xsl:choose>
+          </xsl:otherwise>
+<!-- End of modification -->
+
         </xsl:choose>
       </xsl:attribute>
+
+<!-- The following lines were inserted by Martin Miehe. Scripts and rules 
+     in the appendices should have a smaller font-size so that at least 
+     80 characters fit to one line. -->
+
+      <xsl:if test="ancestor::appendix">    <!-- name(/) != appendix" -->
+        <xsl:attribute name="font-size">10pt</xsl:attribute>
+      </xsl:if>
+<!-- End of insertion. -->
+
       <xsl:apply-imports/>
     </fo:block>
   </xsl:template>