r1581 - in trunk/BOOK: . materials/alpha materials/common materials/mips materials/mips64 materials/mips64-64 materials/ppc materials/ppc64 materials/sparc materials/sparc64 materials/sparc64-64 materials/x86 materials/x86_64 materials/x86_64-64 stylesheets/xhtml

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat May 13 10:05:46 PDT 2006


Author: manuel
Date: 2006-05-13 11:05:45 -0600 (Sat, 13 May 2006)
New Revision: 1581

Modified:
   trunk/BOOK/materials/alpha/packages.xml
   trunk/BOOK/materials/alpha/patches.xml
   trunk/BOOK/materials/common/packages.xml
   trunk/BOOK/materials/common/patches.xml
   trunk/BOOK/materials/mips/packages.xml
   trunk/BOOK/materials/mips/patches.xml
   trunk/BOOK/materials/mips64-64/packages.xml
   trunk/BOOK/materials/mips64-64/patches.xml
   trunk/BOOK/materials/mips64/packages.xml
   trunk/BOOK/materials/mips64/patches.xml
   trunk/BOOK/materials/ppc/packages.xml
   trunk/BOOK/materials/ppc/patches.xml
   trunk/BOOK/materials/ppc64/packages.xml
   trunk/BOOK/materials/ppc64/patches.xml
   trunk/BOOK/materials/sparc/packages.xml
   trunk/BOOK/materials/sparc/patches.xml
   trunk/BOOK/materials/sparc64-64/packages.xml
   trunk/BOOK/materials/sparc64-64/patches.xml
   trunk/BOOK/materials/sparc64/packages.xml
   trunk/BOOK/materials/sparc64/patches.xml
   trunk/BOOK/materials/x86/packages.xml
   trunk/BOOK/materials/x86/patches.xml
   trunk/BOOK/materials/x86_64-64/packages.xml
   trunk/BOOK/materials/x86_64-64/patches.xml
   trunk/BOOK/materials/x86_64/packages.xml
   trunk/BOOK/materials/x86_64/patches.xml
   trunk/BOOK/packages.ent
   trunk/BOOK/stylesheets/xhtml/lfs-mixed.xsl
Log:
Automatized "Total size of these packages" calculation.

Modified: trunk/BOOK/materials/alpha/packages.xml
===================================================================
--- trunk/BOOK/materials/alpha/packages.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/alpha/packages.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -13,7 +13,7 @@
   <variablelist role="materials">
 
     <varlistentry>
-      <term>Aboot (&aboot-version;) - &aboot-size;:</term>
+      <term>Aboot (&aboot-version;) - <token>&aboot-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&aboot-home;"/></para>
         <para>Download: <ulink url="&aboot-url;"/></para>
@@ -23,6 +23,8 @@
 
   </variablelist>
 
-  <para>Total size of these packages: about 2,6 MB</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/packages.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>

Modified: trunk/BOOK/materials/alpha/patches.xml
===================================================================
--- trunk/BOOK/materials/alpha/patches.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/alpha/patches.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -13,7 +13,7 @@
   <variablelist role="materials">
 
     <varlistentry>
-      <term>Aboot Patch - &aboot-alpha-patch-size;:</term>
+      <term>Aboot Patch - <token>&aboot-alpha-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;aboot/&aboot-alpha-patch;"/></para>
@@ -27,4 +27,8 @@
 
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>

Modified: trunk/BOOK/materials/common/packages.xml
===================================================================
--- trunk/BOOK/materials/common/packages.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/common/packages.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -15,7 +15,7 @@
   <variablelist role="materials">
 
     <varlistentry>
-      <term>Autoconf (&autoconf-version;) - &autoconf-size;:</term>
+      <term>Autoconf (&autoconf-version;) - <token>&autoconf-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&autoconf-home;"/></para>
         <para>Download: <ulink url="&autoconf-url;"/></para>
@@ -24,7 +24,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Automake (&automake-version;) - &automake-size;:</term>
+      <term>Automake (&automake-version;) - <token>&automake-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&automake-home;"/></para>
         <para>Download: <ulink url="&automake-url;"/></para>
@@ -33,7 +33,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Bash (&bash-version;) - &bash-size;:</term>
+      <term>Bash (&bash-version;) - <token>&bash-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&bash-home;"/></para>
         <para>Download: <ulink url="&bash-url;"/></para>
@@ -42,7 +42,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Bash Documentation (&bash-doc-version;) - &bash-doc-size;:</term>
+      <term>Bash Documentation (&bash-doc-version;) - <token>&bash-doc-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&bash-doc-home;"/></para>
         <para>Download: <ulink url="&bash-doc-url;"/></para>
@@ -51,7 +51,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Binutils (&binutils-version;) - &binutils-size;:</term>
+      <term>Binutils (&binutils-version;) - <token>&binutils-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&binutils-home;"/></para>
         <para>Download: <ulink url="&binutils-url;"/></para>
@@ -60,7 +60,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Bison (&bison-version;) - &bison-size;:</term>
+      <term>Bison (&bison-version;) - <token>&bison-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&bison-home;"/></para>
         <para>Download: <ulink url="&bison-url;"/></para>
@@ -69,7 +69,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Bzip2 (&bzip2-version;) - &bzip2-size;:</term>
+      <term>Bzip2 (&bzip2-version;) - <token>&bzip2-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&bzip2-home;"/></para>
         <para>Download: <ulink url="&bzip2-url;"/></para>
@@ -78,7 +78,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>CLFS-Bootscripts (&clfs-bootscripts-version;) - &clfs-bootscripts-size;:</term>
+      <term>CLFS-Bootscripts (&clfs-bootscripts-version;) - <token>&clfs-bootscripts-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&clfs-bootscripts-home;"/></para>
         <para>Download: <ulink url="&clfs-bootscripts-url;"/></para>
@@ -87,7 +87,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Coreutils (&coreutils-version;) - &coreutils-size;:</term>
+      <term>Coreutils (&coreutils-version;) - <token>&coreutils-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&coreutils-home;"/></para>
         <para>Download: <ulink url="&coreutils-url;"/></para>
@@ -96,7 +96,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>DejaGNU (&dejagnu-version;) - &dejagnu-size;:</term>
+      <term>DejaGNU (&dejagnu-version;) - <token>&dejagnu-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&dejagnu-home;"/></para>
         <para>Download: <ulink url="&dejagnu-url;"/></para>
@@ -105,7 +105,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Diffutils (&diffutils-version;) - &diffutils-size;:</term>
+      <term>Diffutils (&diffutils-version;) - <token>&diffutils-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&diffutils-home;"/></para>
         <para>Download: <ulink url="&diffutils-url;"/></para>
@@ -114,7 +114,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>E2fsprogs (&e2fsprogs-version;) - &e2fsprogs-size;:</term>
+      <term>E2fsprogs (&e2fsprogs-version;) - <token>&e2fsprogs-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&e2fsprogs-home;"/></para>
         <para>Download: <ulink url="&e2fsprogs-url;"/></para>
@@ -123,7 +123,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Expect (&expect-version;) - &expect-size;:</term>
+      <term>Expect (&expect-version;) - <token>&expect-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&expect-home;"/></para>
         <para>Download: <ulink url="&expect-url;"/></para>
@@ -132,7 +132,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>File (&file-version;) - &file-size;:</term>
+      <term>File (&file-version;) - <token>&file-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&file-home;"/></para>
         <para>Download: <ulink url="&file-url;"/></para>
@@ -150,7 +150,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Findutils (&findutils-version;) - &findutils-size;:</term>
+      <term>Findutils (&findutils-version;) - <token>&findutils-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&findutils-home;"/></para>
         <para>Download: <ulink url="&findutils-url;"/></para>
@@ -159,7 +159,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Flex (&flex-version;) - &flex-size;:</term>
+      <term>Flex (&flex-version;) - <token>&flex-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&flex-home;"/></para>
         <para>Download: <ulink url="&flex-url;"/></para>
@@ -168,7 +168,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Gawk (&gawk-version;) - &gawk-size;:</term>
+      <term>Gawk (&gawk-version;) - <token>&gawk-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&gawk-home;"/></para>
         <para>Download: <ulink url="&gawk-url;"/></para>
@@ -177,7 +177,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>GCC (&gcc-version;) - &gcc-size;:</term>
+      <term>GCC (&gcc-version;) - <token>&gcc-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&gcc-home;"/></para>
         <para>Download: <ulink url="&gcc-url;"/></para>
@@ -186,7 +186,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Gettext (&gettext-version;) - &gettext-size;:</term>
+      <term>Gettext (&gettext-version;) - <token>&gettext-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&gettext-home;"/></para>
         <para>Download: <ulink url="&gettext-url;"/></para>
@@ -195,7 +195,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Glibc (&glibc-version;) - &glibc-size;:</term>
+      <term>Glibc (&glibc-version;) - <token>&glibc-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&glibc-home;"/></para>
         <para>Download: <ulink url="&glibc-url;"/></para>
@@ -204,7 +204,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Grep (&grep-version;) - &grep-size;:</term>
+      <term>Grep (&grep-version;) - <token>&grep-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&grep-home;"/></para>
         <para>Download: <ulink url="&grep-url;"/></para>
@@ -213,7 +213,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Groff (&groff-version;) - &groff-size;:</term>
+      <term>Groff (&groff-version;) - <token>&groff-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&groff-home;"/></para>
         <para>Download: <ulink url="&groff-url;"/></para>
@@ -222,7 +222,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Gzip (&gzip-version;) - &gzip-size;:</term>
+      <term>Gzip (&gzip-version;) - <token>&gzip-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&gzip-home;"/></para>
         <para>Download: <ulink url="&gzip-url;"/></para>
@@ -231,7 +231,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Iana-Etc (&iana-etc-version;) - &iana-etc-size;:</term>
+      <term>Iana-Etc (&iana-etc-version;) - <token>&iana-etc-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&iana-etc-home;"/></para>
         <para>Download: <ulink url="&iana-etc-url;"/></para>
@@ -240,7 +240,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Inetutils (&inetutils-version;) - &inetutils-size;:</term>
+      <term>Inetutils (&inetutils-version;) - <token>&inetutils-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&inetutils-home;"/></para>
         <para>Download: <ulink url="&inetutils-url;"/></para>
@@ -249,7 +249,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>IPRoute2 (&iproute2-version;) - &iproute2-size;:</term>
+      <term>IPRoute2 (&iproute2-version;) - <token>&iproute2-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&iproute2-home;"/></para>
         <para>Download: <ulink url="&iproute2-url;"/></para>
@@ -258,7 +258,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Kbd (&kbd-version;) - &kbd-size;:</term>
+      <term>Kbd (&kbd-version;) - <token>&kbd-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&kbd-home;"/></para>
         <para>Download: <ulink url="&kbd-url;"/></para>
@@ -267,7 +267,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Less (&less-version;) - &less-size;:</term>
+      <term>Less (&less-version;) - <token>&less-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&less-home;"/></para>
         <para>Download: <ulink url="&less-url;"/></para>
@@ -276,7 +276,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Libtool (&libtool-version;) - &libtool-size;:</term>
+      <term>Libtool (&libtool-version;) - <token>&libtool-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&libtool-home;"/></para>
         <para>Download: <ulink url="&libtool-url;"/></para>
@@ -285,7 +285,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Linux (&linux-version;) - &linux-size;:</term>
+      <term>Linux (&linux-version;) - <token>&linux-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&linux-home;"/></para>
         <para>Download: <ulink url="&linux-url;"/></para>
@@ -294,7 +294,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Linux-Headers (&linux-headers-version;) - &linux-headers-size;:</term>
+      <term>Linux-Headers (&linux-headers-version;) - <token>&linux-headers-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&linux-headers-home;"/></para>
         <para>Download: <ulink url="&linux-headers-url;"/></para>
@@ -303,7 +303,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>M4 (&m4-version;) - &m4-size;:</term>
+      <term>M4 (&m4-version;) - <token>&m4-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&m4-home;"/></para>
         <para>Download: <ulink url="&m4-url;"/></para>
@@ -312,7 +312,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Make (&make-version;) - &make-size;:</term>
+      <term>Make (&make-version;) - <token>&make-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&make-home;"/></para>
         <para>Download: <ulink url="&make-url;"/></para>
@@ -321,7 +321,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Man (&man-version;) - &man-size;:</term>
+      <term>Man (&man-version;) - <token>&man-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&man-home;"/></para>
         <para>Download: <ulink url="&man-url;"/></para>
@@ -330,7 +330,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Man-pages (&man-pages-version;) - &man-pages-size;:</term>
+      <term>Man-pages (&man-pages-version;) - <token>&man-pages-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&man-pages-home;"/></para>
         <para>Download: <ulink url="&man-pages-url;"/></para>
@@ -339,7 +339,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Mktemp (&mktemp-version;) - &mktemp-size;:</term>
+      <term>Mktemp (&mktemp-version;) - <token>&mktemp-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&mktemp-home;"/></para>
         <para>Download: <ulink url="&mktemp-url;"/></para>
@@ -348,7 +348,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Module-Init-Tools (&module-init-tools-version;) - &module-init-tools-size;:</term>
+      <term>Module-Init-Tools (&module-init-tools-version;) - <token>&module-init-tools-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&module-init-tools-home;"/></para>
         <para>Download: <ulink url="&module-init-tools-url;"/></para>
@@ -357,7 +357,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Ncurses (&ncurses-version;) - &ncurses-size;:</term>
+      <term>Ncurses (&ncurses-version;) - <token>&ncurses-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&ncurses-home;"/></para>
         <para>Download: <ulink url="&ncurses-url;"/></para>
@@ -366,7 +366,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Patch (&patch-version;) - &patch-size;:</term>
+      <term>Patch (&patch-version;) - <token>&patch-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&patch-home;"/></para>
         <para>Download: <ulink url="&patch-url;"/></para>
@@ -375,7 +375,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Perl (&perl-version;) - &perl-size;:</term>
+      <term>Perl (&perl-version;) - <token>&perl-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&perl-home;"/></para>
         <para>Download: <ulink url="&perl-url;"/></para>
@@ -384,7 +384,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Procps (&procps-version;) - &procps-size;:</term>
+      <term>Procps (&procps-version;) - <token>&procps-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&procps-home;"/></para>
         <para>Download: <ulink url="&procps-url;"/></para>
@@ -393,7 +393,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Psmisc (&psmisc-version;) - &psmisc-size;:</term>
+      <term>Psmisc (&psmisc-version;) - <token>&psmisc-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&psmisc-home;"/></para>
         <para>Download: <ulink url="&psmisc-url;"/></para>
@@ -402,7 +402,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Readline (&readline-version;) - &readline-size;:</term>
+      <term>Readline (&readline-version;) - <token>&readline-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&readline-home;"/></para>
         <para>Download: <ulink url="&readline-url;"/></para>
@@ -411,7 +411,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Sed (&sed-version;) - &sed-size;:</term>
+      <term>Sed (&sed-version;) - <token>&sed-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&sed-home;"/></para>
         <para>Download: <ulink url="&sed-url;"/></para>
@@ -420,7 +420,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Shadow (&shadow-version;) - &shadow-size;:</term>
+      <term>Shadow (&shadow-version;) - <token>&shadow-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&shadow-home;"/></para>
         <para>Download: <ulink url="&shadow-url;"/></para>
@@ -438,7 +438,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Sysklogd (&sysklogd-version;) - &sysklogd-size;:</term>
+      <term>Sysklogd (&sysklogd-version;) - <token>&sysklogd-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&sysklogd-home;"/></para>
         <para>Download: <ulink url="&sysklogd-url;"/></para>
@@ -447,7 +447,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Sysvinit (&sysvinit-version;) - &sysvinit-size;:</term>
+      <term>Sysvinit (&sysvinit-version;) - <token>&sysvinit-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&sysvinit-home;"/></para>
         <para>Download: <ulink url="&sysvinit-url;"/></para>
@@ -456,7 +456,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Tar (&tar-version;) - &tar-size;:</term>
+      <term>Tar (&tar-version;) - <token>&tar-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&tar-home;"/></para>
         <para>Download: <ulink url="&tar-url;"/></para>
@@ -465,7 +465,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Tcl (&tcl-version;) - &tcl-size;:</term>
+      <term>Tcl (&tcl-version;) - <token>&tcl-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&tcl-home;"/></para>
         <para>Download: <ulink url="&tcl-url;"/></para>
@@ -474,7 +474,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Texinfo (&texinfo-version;) - &texinfo-size;:</term>
+      <term>Texinfo (&texinfo-version;) - <token>&texinfo-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&texinfo-home;"/></para>
         <para>Download: <ulink url="&texinfo-url;"/></para>
@@ -483,7 +483,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Tree (&tree-version;) - &tree-size;:</term>
+      <term>Tree (&tree-version;) - <token>&tree-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&tree-home;"/></para>
         <para>Download: <ulink url="&tree-url;"/></para>
@@ -492,7 +492,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Udev (&udev-version;) - &udev-size;:</term>
+      <term>Udev (&udev-version;) - <token>&udev-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&udev-home;"/></para>
         <para>Download: <ulink url="&udev-url;"/></para>
@@ -501,7 +501,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Udev Cross-LFS Rules (&udev-cross-lfs-version;) - &udev-cross-lfs-size;:</term>
+      <term>Udev Cross-LFS Rules (&udev-cross-lfs-version;) - <token>&udev-cross-lfs-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&udev-cross-lfs-home;"/></para>
         <para>Download: <ulink url="&udev-cross-lfs-url;"/></para>
@@ -510,7 +510,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Util-linux (&util-linux-version;) - &util-linux-size;:</term>
+      <term>Util-linux (&util-linux-version;) - <token>&util-linux-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&util-linux-home;"/></para>
         <para>Download: <ulink url="&util-linux-url;"/></para>
@@ -519,7 +519,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Vim (&vim-version;) - &vim-size;:</term>
+      <term>Vim (&vim-version;) - <token>&vim-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&vim-home;"/></para>
         <para>Download: <ulink url="&vim-url;"/></para>
@@ -528,7 +528,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Vim (&vim-version;) language files (optional) - &vim-language-size;:</term>
+      <term>Vim (&vim-version;) language files (optional) - <token>&vim-language-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&vim-language-home;"/></para>
         <para>Download: <ulink url="&vim-language-url;"/></para>
@@ -537,7 +537,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Zlib (&zlib-version;) - &zlib-size;:</term>
+      <term>Zlib (&zlib-version;) - <token>&zlib-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&zlib-home;"/></para>
         <para>Download: <ulink url="&zlib-url;"/></para>
@@ -547,6 +547,6 @@
 
   </variablelist>
 
-  <para>Total size of these packages: about 154 MB</para>
+  <para os="a">Total size of these packages: about <returnvalue/></para>
 
 </sect1>

Modified: trunk/BOOK/materials/common/patches.xml
===================================================================
--- trunk/BOOK/materials/common/patches.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/common/patches.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -10,7 +10,7 @@
 
   <title>Needed Patches</title>
 
-  <para os="a">In addition to the packages, several patches are also required.
+  <para>In addition to the packages, several patches are also required.
   These patches correct any mistakes in the packages that should be
   fixed by the maintainer. The patches also make small modifications to
   make the packages easier to work with. The following patches will be
@@ -19,7 +19,7 @@
   <variablelist role="materials">
 
     <varlistentry>
-      <term>Bash Fixes Patch - &bash-fixes-patch-size;:</term>
+      <term>Bash Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;bash/&bash-fixes-patch;"/></para>
@@ -28,7 +28,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Binutils Posix Patch - &binutils-posix-patch-size;:</term>
+      <term>Binutils Posix Patch - <token>&binutils-posix-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;binutils/&binutils-posix-patch;"/></para>
@@ -37,7 +37,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Bzip2 Documentation Patch - &bzip2-docs-patch-size;:</term>
+      <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;bzip2/&bzip2-docs-patch;"/></para>
@@ -46,7 +46,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Bzip2 Bzdiff Remove Tempfile - &bzip2-remove_tempfile-patch-size;:</term>
+      <term>Bzip2 Bzdiff Remove Tempfile - <token>&bzip2-remove_tempfile-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;bzip2/&bzip2-remove_tempfile-patch;"/></para>
@@ -55,7 +55,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Bzip2 Bzgrep Security Fixes Patch - &bzip2-bzgrep-patch-size;:</term>
+      <term>Bzip2 Bzgrep Security Fixes Patch - <token>&bzip2-bzgrep-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;bzip2/&bzip2-bzgrep-patch;"/></para>
@@ -64,7 +64,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Coreutils Suppress Uptime, Kill, Su Patch - &coreutils-suppress-patch-size;:</term>
+      <term>Coreutils Suppress Uptime, Kill, Su Patch - <token>&coreutils-suppress-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;coreutils/&coreutils-suppress-patch;"/></para>
@@ -73,7 +73,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Expect Spawn Patch - &expect-spawn-patch-size;:</term>
+      <term>Expect Spawn Patch - <token>&expect-spawn-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;expect/&expect-spawn-patch;"/></para>
@@ -82,7 +82,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Gawk Segfault Patch - &gawk-segfault-patch-size;B:</term>
+      <term>Gawk Segfault Patch - <token>&gawk-segfault-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;gawk/&gawk-segfault-patch;"/></para>
@@ -91,7 +91,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>GCC Cross Search Paths Patch - &gcc-cross_search-patch-size;:</term>
+      <term>GCC Cross Search Paths Patch - <token>&gcc-cross_search-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;gcc/&gcc-cross_search-patch;"/></para>
@@ -100,7 +100,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>GCC PR20425 Patch - &gcc-PR20425-patch-size;:</term>
+      <term>GCC PR20425 Patch - <token>&gcc-PR20425-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;gcc/&gcc-PR20425-patch;"/></para>
@@ -109,7 +109,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>GCC PR26763 Patch - &gcc-PR26763-patch-size;:</term>
+      <term>GCC PR26763 Patch - <token>&gcc-PR26763-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;gcc/&gcc-PR26763-patch;"/></para>
@@ -118,7 +118,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>GCC Posix Patch - &gcc-posix-patch-size;:</term>
+      <term>GCC Posix Patch - <token>&gcc-posix-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;gcc/&gcc-posix-patch;"/></para>
@@ -127,7 +127,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Glibc Disable linking with libgcc_eh.a - &glibc-libgcc_eh-patch-size;:</term>
+      <term>Glibc Disable linking with libgcc_eh.a - <token>&glibc-libgcc_eh-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;glibc/&glibc-libgcc_eh-patch;"/></para>
@@ -136,7 +136,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Glibc Localedef Segfault - &glibc-localedef_segfault-patch-size;:</term>
+      <term>Glibc Localedef Segfault - <token>&glibc-localedef_segfault-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;glibc/&glibc-localedef_segfault-patch;"/></para>
@@ -145,7 +145,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Gzip Security Fix Patch - &gzip-security_fix-patch-size;:</term>
+      <term>Gzip Security Fix Patch - <token>&gzip-security_fix-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;gzip/&gzip-security_fix-patch;"/></para>
@@ -154,7 +154,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Inetutils GCC 4.x Fixes Patch - &inetutils-gcc4_fixes-patch-size;:</term>
+      <term>Inetutils GCC 4.x Fixes Patch - <token>&inetutils-gcc4_fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;inetutils/&inetutils-gcc4_fixes-patch;"/></para>
@@ -163,7 +163,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Inetutils No-Server-Man-Pages Patch - &inetutils-man_pages-patch-size;:</term>
+      <term>Inetutils No-Server-Man-Pages Patch - <token>&inetutils-man_pages-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;inetutils/&inetutils-man_pages-patch;"/></para>
@@ -172,7 +172,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>KBD GCC 4.x Fixes Patch - &kbd-gcc4_fixes-patch-size;:</term>
+      <term>KBD GCC 4.x Fixes Patch - <token>&kbd-gcc4_fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;kbd/&kbd-gcc4_fixes-patch;"/></para>
@@ -181,7 +181,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Mktemp Tempfile Patch - &mktemp-tempfile-patch-size;:</term>
+      <term>Mktemp Tempfile Patch - <token>&mktemp-tempfile-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;mktemp/&mktemp-tempfile-patch;"/></para>
@@ -190,7 +190,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Perl Libc Patch - &perl-libc-patch-size;:</term>
+      <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;perl/&perl-libc-patch;"/></para>
@@ -199,7 +199,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Readline Fixes Patch - &readline-fixes-patch-size;:</term>
+      <term>Readline Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;readline/&readline-fixes-patch;"/></para>
@@ -208,7 +208,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Sysklogd Fixes Patch - &sysklogd-fixes-patch-size;:</term>
+      <term>Sysklogd Fixes Patch - <token>&sysklogd-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;sysklogd/&sysklogd-fixes-patch;"/></para>
@@ -217,7 +217,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Tar GCC-4.x Fix Patch - &tar-gcc4_fix-patch-size;:</term>
+      <term>Tar GCC-4.x Fix Patch - <token>&tar-gcc4_fix-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;tar/&tar-gcc4_fix-patch;"/></para>
@@ -226,7 +226,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Tar Security Fix Patch - &tar-security_fixes-patch-size;:</term>
+      <term>Tar Security Fix Patch - <token>&tar-security_fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;tar/&tar-security_fixes-patch;"/></para>
@@ -235,7 +235,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Tar Sparse Fix Patch - &tar-sparse_fix-patch-size;:</term>
+      <term>Tar Sparse Fix Patch - <token>&tar-sparse_fix-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;tar/&tar-sparse_fix-patch;"/></para>
@@ -244,7 +244,7 @@
     </varlistentry>
 
     <varlistentry>
-       <term>Texinfo Tempfile Fix Patch - &texinfo-tempfile_fix-patch-size;:</term>
+       <term>Texinfo Tempfile Fix Patch - <token>&texinfo-tempfile_fix-patch-size;</token>:</term>
        <listitem>
         <para>Download: <ulink
         url="&patches-root;texinfo/&texinfo-tempfile_fix-patch;"/></para>
@@ -253,7 +253,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Util-linux Cramfs Patch - &util-linux-cramfs-patch-size;:</term> <listitem>
+      <term>Util-linux Cramfs Patch - <token>&util-linux-cramfs-patch-size;</token>:</term> <listitem>
         <para>Download: <ulink
         url="&patches-root;util-linux/&util-linux-cramfs-patch;"/></para>
         <para>MD5 sum: <literal>&util-linux-cramfs-patch-md5;</literal></para>
@@ -261,7 +261,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Util-linux GCC 4.x Patch - &util-linux-gcc4_fixes-patch-size;:</term> <listitem>
+      <term>Util-linux GCC 4.x Patch - <token>&util-linux-gcc4_fixes-patch-size;</token>:</term> <listitem>
         <para>Download: <ulink
         url="&patches-root;util-linux/&util-linux-gcc4_fixes-patch;"/></para>
         <para>MD5 sum: <literal>&util-linux-gcc4_fixes-patch-md5;</literal></para>
@@ -269,7 +269,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Vim Fixes Patch - &vim-fixes-patch-size;:</term>
+      <term>Vim Fixes Patch - <token>&vim-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;vim/&vim-fixes-patch;"/></para>
@@ -278,7 +278,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Zlib fPIC Patch - &zlib-fpic-patch-size;:</term> <listitem>
+      <term>Zlib fPIC Patch - <token>&zlib-fpic-patch-size;</token>:</term> <listitem>
         <para>Download: <ulink
         url="&patches-root;zlib/&zlib-fpic-patch;"/></para>
         <para>MD5 sum: <literal>&zlib-fpic-patch-md5;</literal></para>
@@ -287,7 +287,9 @@
 
   </variablelist>
 
-  <para os="b">In addition to the above required patches, there exist a number of
+  <para os="a">Total size of these patches: about <returnvalue/></para>
+
+  <para>In addition to the above required patches, there exist a number of
   optional patches created by the LFS community. These optional patches
   solve minor problems or enable functionality that is not enabled by
   default. Feel free to peruse the patches database located at

Modified: trunk/BOOK/materials/mips/packages.xml
===================================================================
--- trunk/BOOK/materials/mips/packages.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/mips/packages.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -13,7 +13,7 @@
   <variablelist role="materials">
 
     <varlistentry os="arcload">
-      <term>ARCLoad (&arcload-version;) - &arcload-size;:</term>
+      <term>ARCLoad (&arcload-version;) - <token>&arcload-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&arcload-home;"/></para>
         <para>Download: <ulink url="&arcload-url;"/></para>
@@ -22,7 +22,7 @@
     </varlistentry>
 
     <varlistentry os="colo">
-      <term>Colo (&colo-version;) - &colo-size;:</term>
+      <term>Colo (&colo-version;) - <token>&colo-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&colo-home;"/></para>
         <para>Download: <ulink url="&colo-url;"/></para>
@@ -31,7 +31,7 @@
     </varlistentry>
 
     <varlistentry os="dvhtool">
-      <term>DVHtool (&dvhtool-version;) - &dvhtool-size;:</term>
+      <term>DVHtool (&dvhtool-version;) - <token>&dvhtool-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&dvhtool-home;"/></para>
         <para>Download: <ulink url="&dvhtool-url;"/></para>
@@ -40,7 +40,7 @@
     </varlistentry>
 
     <varlistentry os="glibcports">
-      <term>Glibc Ports (&glibc-ports-version;) - &glibc-ports-size;:</term>
+      <term>Glibc Ports (&glibc-ports-version;) - <token>&glibc-ports-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&glibc-ports-home;"/></para>
         <para>Download: <ulink url="&glibc-ports-url;"/></para>
@@ -50,6 +50,8 @@
 
   </variablelist>
 
-  <para os="a">Total size of these packages: about 349 KB</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/packages.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>

Modified: trunk/BOOK/materials/mips/patches.xml
===================================================================
--- trunk/BOOK/materials/mips/patches.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/mips/patches.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -13,7 +13,7 @@
   <variablelist role="materials">
 
     <varlistentry os="dvhtool-fixes-patch">
-      <term>Dvhtool Fixes - &dvhtool-fixes-patch-size;:</term>
+      <term>Dvhtool Fixes - <token>&dvhtool-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;dvhtool/&dvhtool-fixes-patch;"/></para>
@@ -22,7 +22,7 @@
     </varlistentry>
 
     <varlistentry os="expect-mips_update-patch">
-      <term>Expect Config Update Patch - &expect-mips_update-patch-size;:</term>
+      <term>Expect Config Update Patch - <token>&expect-mips_update-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;expect/&expect-mips_update-patch;"/></para>
@@ -31,7 +31,7 @@
     </varlistentry>
 
     <varlistentry os="file-mips_update-patch">
-      <term>File Config Update Patch -  file-mips_update-patch-size;:</term>
+      <term>File Config Update Patch -  <token>&file-mips_update-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;file/&file-mips_update-patch;"/></para>
@@ -44,7 +44,7 @@
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
     <varlistentry os="glibc-mips_fix-patch">
-      <term>GLIBC MIPS  Patch - &glibc-mips-patch-size;:</term>
+      <term>GLIBC MIPS  Patch - <token>&glibc-mips-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;glibc/&glibc-mips-patch;"/></para>
@@ -53,7 +53,7 @@
     </varlistentry>
 
     <varlistentry os="grep-mips_update-patch">
-      <term>Grep Config Update Patch - &grep-mips_update-patch-size;:</term>
+      <term>Grep Config Update Patch - <token>&grep-mips_update-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;grep/&grep-mips_update-patch;"/></para>
@@ -62,7 +62,7 @@
     </varlistentry>
 
     <varlistentry os="linux-mips-patch">
-      <term>Linux-MIPS Merge Patch - &linux-mips-patch-size;:</term>
+      <term>Linux-MIPS Merge Patch - <token>&linux-mips-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;linux/&linux-mips-patch;"/></para>
@@ -71,7 +71,7 @@
     </varlistentry>
 
     <varlistentry os="mktemp-mips_update-patch">
-      <term>Mktemp Config Update Patch - &mktemp-mips_update-patch-size;:</term>
+      <term>Mktemp Config Update Patch - <token>&mktemp-mips_update-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;mktemp/&mktemp-mips_update-patch;"/></para>
@@ -80,7 +80,7 @@
     </varlistentry>
 
     <varlistentry os="module-init-tools-mips_update-patch">
-      <term>Module-init-tools Config Update Patch - &module-init-tools-mips_update-patch-size;:</term>
+      <term>Module-init-tools Config Update Patch - <token>&module-init-tools-mips_update-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;module-init-tools/&module-init-tools-mips_update-patch;"/></para>
@@ -90,4 +90,8 @@
 
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>

Modified: trunk/BOOK/materials/mips64/packages.xml
===================================================================
--- trunk/BOOK/materials/mips64/packages.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/mips64/packages.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -15,7 +15,7 @@
   xpointer="xpointer(//*[@role='materials'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/packages.xml"
+  href="../common/packages.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>

Modified: trunk/BOOK/materials/mips64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64/patches.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/mips64/patches.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -17,7 +17,7 @@
     xpointer="xpointer(//*[@os='binutils-multilib-patch'])"/>
 
     <varlistentry os="colo-mips-patch">
-      <term>Colo Make Patch - &colo-make-patch-size;:</term> <listitem>
+      <term>Colo Make Patch - <token>&colo-make-patch-size;</token>:</term> <listitem>
         <para>Download: <ulink
         url="&patches-root;colo/&colo-make-patch;"/></para>
         <para>MD5 sum: <literal>&colo-make-patch-md5;</literal></para>
@@ -69,7 +69,7 @@
     xpointer="xpointer(//*[@os='perl-lib64-patch'])"/>
 
     <varlistentry os="util-linux-mips64-patch">
-      <term>Util-linux MIPS64 Patch - &util-linux-mips64-patch-size;:</term>
+      <term>Util-linux MIPS64 Patch - <token>&util-linux-mips64-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;util-linux/&util-linux-mips64-patch;"/></para>
@@ -79,4 +79,8 @@
 
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>

Modified: trunk/BOOK/materials/mips64-64/packages.xml
===================================================================
--- trunk/BOOK/materials/mips64-64/packages.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/mips64-64/packages.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -15,7 +15,7 @@
   xpointer="xpointer(//*[@role='materials'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/packages.xml"
+  href="../common/packages.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>

Modified: trunk/BOOK/materials/mips64-64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64-64/patches.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/mips64-64/patches.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -62,4 +62,8 @@
 
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>

Modified: trunk/BOOK/materials/ppc/packages.xml
===================================================================
--- trunk/BOOK/materials/ppc/packages.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/ppc/packages.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -13,7 +13,7 @@
   <variablelist role="materials">
 
     <varlistentry>
-      <term>Hfsutils (&hfsutils-version;) - &hfsutils-size;:</term>
+      <term>Hfsutils (&hfsutils-version;) - <token>&hfsutils-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&hfsutils-home;"/></para>
         <para>Download: <ulink url="&hfsutils-url;"/></para>
@@ -22,7 +22,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Parted (&parted-version;) - &parted-size;:</term>
+      <term>Parted (&parted-version;) - <token>&parted-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&parted-home;"/></para>
         <para>Download: <ulink url="&parted-url;"/></para>
@@ -31,7 +31,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Powerpc-utils (&powerpcutils-version;) - &powerpcutils-size;:</term>
+      <term>Powerpc-utils (&powerpcutils-version;) - <token>&powerpcutils-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&powerpcutils-home;"/></para>
         <para>Download: <ulink url="&powerpcutils-url;"/></para>
@@ -40,7 +40,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Yaboot (&yaboot-version;) - &yaboot-size;:</term>
+      <term>Yaboot (&yaboot-version;) - <token>&yaboot-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&yaboot-home;"/></para>
         <para>Download: <ulink url="&yaboot-url;"/></para>
@@ -50,6 +50,8 @@
 
   </variablelist>
 
-  <para os="a">Total size of these packages: about 2.1 MB</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/packages.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>

Modified: trunk/BOOK/materials/ppc/patches.xml
===================================================================
--- trunk/BOOK/materials/ppc/patches.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/ppc/patches.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -17,7 +17,7 @@
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
     <varlistentry>
-      <term>Powerpc-utils_(&powerpcutils-version;) Fixes Patch - &powerpcutils-patch-size;:</term>
+      <term>Powerpc-utils_(&powerpcutils-version;) Fixes Patch - <token>&powerpcutils-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;powerpc-utils/&powerpcutils-patch;"/></para>
@@ -26,7 +26,7 @@
     </varlistentry>
 
     <varlistentry os="yaboot-fix-patch">
-      <term>Yaboot (&yaboot-version;) Fixes Patch - &yaboot-fix-patch-size;:</term>
+      <term>Yaboot (&yaboot-version;) Fixes Patch - <token>&yaboot-fix-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;yaboot/&yaboot-fix-patch;"/></para>
@@ -35,7 +35,7 @@
     </varlistentry>
 
     <varlistentry os="yaboot-sata-patch">
-      <term>Yaboot (&yaboot-version;) SATA Patch - &yaboot-sata-patch-size;:</term>
+      <term>Yaboot (&yaboot-version;) SATA Patch - <token>&yaboot-sata-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;yaboot/&yaboot-sata-patch;"/></para>
@@ -45,4 +45,8 @@
 
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>

Modified: trunk/BOOK/materials/ppc64/packages.xml
===================================================================
--- trunk/BOOK/materials/ppc64/packages.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/ppc64/packages.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -15,7 +15,7 @@
   xpointer="xpointer(//*[@role='materials'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../ppc/packages.xml"
+  href="../common/packages.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>

Modified: trunk/BOOK/materials/ppc64/patches.xml
===================================================================
--- trunk/BOOK/materials/ppc64/patches.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/ppc64/patches.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -21,7 +21,7 @@
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
     <varlistentry>
-      <term>Powerpc-utils_(&powerpcutils-version;) Fixes Patch - &powerpcutils64-patch-size;:</term>
+      <term>Powerpc-utils_(&powerpcutils-version;) Fixes Patch - <token>&powerpcutils64-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;powerpc-utils/&powerpcutils64-patch;"/></para>
@@ -39,4 +39,8 @@
 
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>

Modified: trunk/BOOK/materials/sparc/packages.xml
===================================================================
--- trunk/BOOK/materials/sparc/packages.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/sparc/packages.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -13,7 +13,7 @@
   <variablelist role="materials">
 
     <varlistentry os="elftoaout">
-      <term>ELFtoaout (&elftoaout-version;) - &elftoaout-size;:</term>
+      <term>ELFtoaout (&elftoaout-version;) - <token>&elftoaout-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&elftoaout-home;"/></para>
         <para>Download: <ulink url="&elftoaout-url;"/></para>
@@ -22,7 +22,7 @@
     </varlistentry>
 
     <varlistentry os="silo">
-      <term>Silo (&silo-version;) - &silo-size;:</term>
+      <term>Silo (&silo-version;) - <token>&silo-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&silo-home;"/></para>
         <para>Download: <ulink url="&silo-url;"/></para>
@@ -32,6 +32,8 @@
 
   </variablelist>
 
-  <para os="a">Total size of these packages: about 265 KB</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/packages.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>

Modified: trunk/BOOK/materials/sparc/patches.xml
===================================================================
--- trunk/BOOK/materials/sparc/patches.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/sparc/patches.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -13,7 +13,7 @@
   <variablelist role="materials">
 
     <varlistentry os="elftoaout-fixes-patch">
-      <term>Elftoaout Fixes Patch - &elftoaout-fixes-patch-size;:</term>
+      <term>Elftoaout Fixes Patch - <token>&elftoaout-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;elftoaout/&elftoaout-fixes-patch;"/></para>
@@ -22,7 +22,7 @@
     </varlistentry>
 
     <varlistentry os="gcc-sparc_tls-patch">
-      <term>GCC Sparc TLS Fix - &gcc-sparc_tls-patch-size;:</term>
+      <term>GCC Sparc TLS Fix - <token>&gcc-sparc_tls-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;gcc/&gcc-sparc_tls-patch;"/></para>
@@ -35,7 +35,7 @@
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
    <varlistentry os="kbd-sparc_kbdrate-patch">
-      <term>KBD kbdrate Patch - &kbd-sparc_kbdrate-patch-size;:</term>
+      <term>KBD kbdrate Patch - <token>&kbd-sparc_kbdrate-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;kbd/&kbd-sparc_kbdrate-patch;"/></para>
@@ -44,7 +44,7 @@
     </varlistentry>
 
     <varlistentry os="silo-fixes-patch">
-      <term>Silo Fixes Patch - &silo-fixes-patch-size;:</term>
+      <term>Silo Fixes Patch - <token>&silo-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;silo/&silo-fixes-patch;"/></para>
@@ -54,4 +54,8 @@
 
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>

Modified: trunk/BOOK/materials/sparc64/packages.xml
===================================================================
--- trunk/BOOK/materials/sparc64/packages.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/sparc64/packages.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -15,7 +15,7 @@
   xpointer="xpointer(//*[@role='materials'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/packages.xml"
+  href="../common/packages.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>

Modified: trunk/BOOK/materials/sparc64/patches.xml
===================================================================
--- trunk/BOOK/materials/sparc64/patches.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/sparc64/patches.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -46,4 +46,8 @@
 
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>

Modified: trunk/BOOK/materials/sparc64-64/packages.xml
===================================================================
--- trunk/BOOK/materials/sparc64-64/packages.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/sparc64-64/packages.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -15,7 +15,7 @@
   xpointer="xpointer(//*[@role='materials'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/packages.xml"
+  href="../common/packages.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>

Modified: trunk/BOOK/materials/sparc64-64/patches.xml
===================================================================
--- trunk/BOOK/materials/sparc64-64/patches.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/sparc64-64/patches.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -38,4 +38,8 @@
 
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>

Modified: trunk/BOOK/materials/x86/packages.xml
===================================================================
--- trunk/BOOK/materials/x86/packages.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/x86/packages.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -13,7 +13,7 @@
   <variablelist role="materials">
 
     <varlistentry os="grub">
-      <term>GRUB (&grub-version;) - &grub-size;:</term>
+      <term>GRUB (&grub-version;) - <token>&grub-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&grub-home;"/></para>
         <para>Download: <ulink url="&grub-url;"/></para>
@@ -23,6 +23,8 @@
 
   </variablelist>
 
-  <para os="a">Total size of these packages: about 950 KB</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/packages.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>

Modified: trunk/BOOK/materials/x86/patches.xml
===================================================================
--- trunk/BOOK/materials/x86/patches.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/x86/patches.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -13,7 +13,7 @@
   <variablelist role="materials">
 
     <varlistentry os="coreutils-x86_uname-patch">
-      <term>Coreutils Uname Patch - &coreutils-x86_uname-patch-size;:</term>
+      <term>Coreutils Uname Patch - <token>&coreutils-x86_uname-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;coreutils/&coreutils-x86_uname-patch;"/></para>
@@ -22,7 +22,7 @@
     </varlistentry>
 
     <varlistentry os="gcc-specs-patch">
-      <term>GCC Specs Patch - &gcc-specs-patch-size;:</term>
+      <term>GCC Specs Patch - <token>&gcc-specs-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;gcc/&gcc-specs-patch;"/></para>
@@ -32,4 +32,8 @@
 
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>

Modified: trunk/BOOK/materials/x86_64/packages.xml
===================================================================
--- trunk/BOOK/materials/x86_64/packages.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/x86_64/packages.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -15,7 +15,7 @@
   xpointer="xpointer(//*[@role='materials'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/packages.xml"
+  href="../common/packages.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>

Modified: trunk/BOOK/materials/x86_64/patches.xml
===================================================================
--- trunk/BOOK/materials/x86_64/patches.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/x86_64/patches.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -13,7 +13,7 @@
   <variablelist role="materials">
 
     <varlistentry os="binutils-multilib-patch">
-      <term>Binutils Multilib Patch - &binutils-multilib-patch-size;:</term>
+      <term>Binutils Multilib Patch - <token>&binutils-multilib-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;binutils/&binutils-multilib-patch;"/></para>
@@ -30,7 +30,7 @@
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
     <varlistentry os="perl-multilib-patch">
-      <term>Perl Configure Multilib Patch - &perl-multilib-patch-size;:</term>
+      <term>Perl Configure Multilib Patch - <token>&perl-multilib-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;perl/&perl-multilib-patch;"/></para>
@@ -39,7 +39,7 @@
     </varlistentry>
 
     <varlistentry os="perl-lib64-patch">
-      <term>Perl Libc lib64 Patch - &perl-lib64-patch-size;:</term>
+      <term>Perl Libc lib64 Patch - <token>&perl-lib64-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;perl/&perl-lib64-patch;"/></para>
@@ -49,4 +49,8 @@
 
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>

Modified: trunk/BOOK/materials/x86_64-64/packages.xml
===================================================================
--- trunk/BOOK/materials/x86_64-64/packages.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/x86_64-64/packages.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -13,7 +13,7 @@
   <variablelist role="materials">
 
     <varlistentry>
-      <term>Bin86 (&bin86-version;) - &bin86-size;:</term>
+      <term>Bin86 (&bin86-version;) - <token>&bin86-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&bin86-home;"/></para>
         <para>Download: <ulink url="&bin86-url;"/></para>
@@ -22,7 +22,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Lilo (&lilo-version;) - &lilo-size;:</term>
+      <term>Lilo (&lilo-version;) - <token>&lilo-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&lilo-home;"/></para>
         <para>Download: <ulink url="&lilo-url;"/></para>
@@ -32,6 +32,8 @@
 
   </variablelist>
 
-  <para>Total size of these packages: about 469 KB</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/packages.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>

Modified: trunk/BOOK/materials/x86_64-64/patches.xml
===================================================================
--- trunk/BOOK/materials/x86_64-64/patches.xml	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/materials/x86_64-64/patches.xml	2006-05-13 17:05:45 UTC (rev 1581)
@@ -13,7 +13,7 @@
   <variablelist role="materials">
 
     <varlistentry os="bin86 x86_64-patch">
-      <term>Bin86 x86_64 Patch - &bin86-x86_64-patch-size;:</term>
+      <term>Bin86 x86_64 Patch - <token>&bin86-x86_64-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;bin86/&bin86-x86_64-patch;"/></para>
@@ -26,7 +26,7 @@
     xpointer="xpointer(//*[@os='coreutils-x86_uname-patch'])"/>
 
     <varlistentry os="gcc-pure64-patch">
-      <term>GCC Pure 64 Patch - &gcc-pure64-patch-size;:</term>
+      <term>GCC Pure 64 Patch - <token>&gcc-pure64-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;gcc/&gcc-pure64-patch;"/></para>
@@ -35,7 +35,7 @@
     </varlistentry>
 
     <varlistentry os="gcc-specs_pure64-patch">
-      <term>GCC Specs Patch - &gcc-specs_pure64-patch-size;:</term>
+      <term>GCC Specs Patch - <token>&gcc-specs_pure64-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;gcc/&gcc-specs_pure64-patch;"/></para>
@@ -44,7 +44,7 @@
     </varlistentry>
 
     <varlistentry os="lilo-cross-x86_64-patch">
-      <term>Lilo x86_64 Cross Compile Patch - &lilo-cross-x86_64-patch-size;:</term>
+      <term>Lilo x86_64 Cross Compile Patch - <token>&lilo-cross-x86_64-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
         url="&patches-root;lilo/&lilo-cross-x86_64-patch;"/></para>
@@ -54,4 +54,8 @@
 
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>

Modified: trunk/BOOK/packages.ent
===================================================================
--- trunk/BOOK/packages.ent	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/packages.ent	2006-05-13 17:05:45 UTC (rev 1581)
@@ -46,7 +46,7 @@
 <!ENTITY bin86-home "http://freshmeat.net/projects/bin86/">
 
 <!ENTITY binutils-version "2.16.92">
-<!ENTITY binutils-size "13,734 KB">
+<!ENTITY binutils-size "13,374 KB">
 <!---
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
 -->
@@ -115,7 +115,7 @@
 <!ENTITY elftoaout-home " ">
 
 <!ENTITY expect-version "5.43.0">
-<!ENTITY expect-size "416 KB">
+<!ENTITY expect-size "514 KB">
 <!ENTITY expect-url "http://expect.nist.gov/src/expect-&expect-version;.tar.gz">
 <!ENTITY expect-md5 "43e1dc0e0bc9492cf2e1a6f59f276bc3">
 <!ENTITY expect-home "http://expect.nist.gov">
@@ -213,7 +213,7 @@
 <!ENTITY inetutils-home "&gnu-software;inetutils/">
 
 <!ENTITY iproute2-version "2.6.16-060323">
-<!ENTITY iproute2-size "377 KB">
+<!ENTITY iproute2-size "378 KB">
 <!ENTITY iproute2-url "http://developer.osdl.org/dev/iproute2/download/iproute2-&iproute2-version;.tar.gz">
 <!ENTITY iproute2-md5 "f31d4516b35bbfeaa72c762f5959e97c">
 <!ENTITY iproute2-home "http://linux-net.osdl.org/index.php/Iproute2">
@@ -245,7 +245,7 @@
 <!ENTITY linux-dl-version "2.6">
 
 <!ENTITY linux-version "2.6.16.16">
-<!ENTITY linux-size "39.880 KB">
+<!ENTITY linux-size "39,880 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
 <!ENTITY linux-md5 "dfb066db24a8a9b36358fb290cb06959">
 <!ENTITY linux-home "http://www.kernel.org/">
@@ -287,7 +287,7 @@
 <!ENTITY mktemp-home "http://www.mktemp.org/">
 
 <!ENTITY module-init-tools-version "3.2.2">
-<!ENTITY module-init-tools-size "165 KB">
+<!ENTITY module-init-tools-size "166 KB">
 <!ENTITY module-init-tools-url "&kernel;linux/utils/kernel/module-init-tools/module-init-tools-&module-init-tools-version;.tar.bz2">
 <!ENTITY module-init-tools-md5 "a1ad0a09d3231673f70d631f3f5040e9">
 <!ENTITY module-init-tools-home " ">
@@ -424,7 +424,7 @@
 <!ENTITY vim-url "ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2">
 <!ENTITY vim-md5 "4ca69757678272f718b1041c810d82d8">
 <!ENTITY vim-home "http://www.vim.org">
-<!ENTITY vim-language-size "1,152 KB">
+<!ENTITY vim-language-size "1,153 KB">
 <!ENTITY vim-language-url "ftp://ftp.vim.org/pub/vim/extra/vim-&vim-version;-lang.tar.gz">
 <!ENTITY vim-language-md5 "6d43efaff570b5c86e76b833ea0c6a04">
 <!ENTITY vim-language-home " ">

Modified: trunk/BOOK/stylesheets/xhtml/lfs-mixed.xsl
===================================================================
--- trunk/BOOK/stylesheets/xhtml/lfs-mixed.xsl	2006-05-13 11:56:29 UTC (rev 1580)
+++ trunk/BOOK/stylesheets/xhtml/lfs-mixed.xsl	2006-05-13 17:05:45 UTC (rev 1581)
@@ -266,4 +266,57 @@
     </div>
   </xsl:template>
 
+    <!-- Total packages size calculation -->
+  <xsl:template match="returnvalue">
+    <xsl:call-template name="calculation">
+     <xsl:with-param name="scope" select="../../variablelist"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="calculation">
+    <xsl:param name="scope"/>
+    <xsl:param name="total">0</xsl:param>
+    <xsl:param name="position">1</xsl:param>
+    <xsl:variable name="tokens" select="count($scope/varlistentry)"/>
+    <xsl:variable name="token" select="$scope/varlistentry[$position]/term/token"/>
+    <xsl:variable name="size" select="substring-before($token,' KB')"/>
+    <xsl:variable name="rawsize">
+      <xsl:choose>
+        <xsl:when test="contains($size,',')">
+          <xsl:value-of select="concat(substring-before($size,','),substring-after($size,','))"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="$size"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:choose>
+      <xsl:when test="$position <= $tokens">
+        <xsl:call-template name="calculation">
+          <xsl:with-param name="scope" select="$scope"/>
+          <xsl:with-param name="position" select="$position +1"/>
+          <xsl:with-param name="total" select="$total + $rawsize"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:choose>
+          <xsl:when test="$total < '1000'">
+            <xsl:value-of select="$total"/>
+            <xsl:text>  KB</xsl:text>
+          </xsl:when>
+          <xsl:when test="$total > '1000' and $total < '5000'">
+            <xsl:value-of select="substring($total,1,1)"/>
+            <xsl:text>,</xsl:text>
+            <xsl:value-of select="substring($total,2)"/>
+            <xsl:text>  KB</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="round($total div 1024)"/>
+            <xsl:text>  MB</xsl:text>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
 </xsl:stylesheet>




More information about the cross-lfs mailing list