Index: archive/texlive-source-full.xml
===================================================================
--- archive/texlive-source-full.xml	(revision b2d5567dd5c5ea5ce08709c9432655eb19a3b946)
+++ archive/texlive-source-full.xml	(revision b2d5567dd5c5ea5ce08709c9432655eb19a3b946)
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY texlive-source-download-http " ">
+  <!ENTITY texlive-source-download-ftp  "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&texlive-version;-source.tar.xz">
+  <!ENTITY texlive-source-md5sum        "09ee265ff51637827559affc7304078c">
+  <!ENTITY texlive-source-size          "40 MB">
+
+  <!ENTITY texlive-buildsize            "923 MB (if starting from pass 1)">
+  <!ENTITY texlive-time                 "9.0 SBU">
+]>
+
+<sect1 id="texlive" xreflabel="texlive-&texlive-version;">
+  <?dbhtml filename="texlive.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>texlive-&texlive-version;-source</title>
+
+  <indexterm zone="texlive">
+    <primary sortas="a-texlive">texlive</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to TeX Live from source</title>
+
+    <para>After installing a partial TeX build (or alternatively installing the
+    binary version), here we will build all of TeX Live from source (except
+    <application>biber</application> which is not supplied in the source tarball
+    and will be dealt with separately).</para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&texlive-source-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&texlive-source-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &texlive-source-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &texlive-source-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &texlive-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &texlive-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">TeX Live Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      Either <xref linkend="texpass1"/> or <xref linkend="tl-installer"/>
+      , and
+      <xref linkend="clisp"/> (to build <command>xindy</command> which is an
+      index processor for multi-lingual index creation)
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gs"/> (for dvisvgm - used by asymptote which provides a
+      mathematical coordinate-based framework for technical drawing),
+      <xref linkend="x-window-system"/>
+    </para>
+
+    <!-- text for recommended libraries, shared with pass 1 -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../xincludes/texrecommendlibs.xml"/>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <!-- text for optional deps, shared with pass 1 -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../xincludes/texoptional.xml"/>
+
+
+    <bridgehead renderas="sect4">Runtime dependencies</bridgehead>
+    <!-- text for runtime deps, shared with tl-installer and pass 1 -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../xincludes/texruntime.xml"/>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/texlive"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of TeX Live</title>
+
+    <para>If you started with the binary installer, these instructions will
+    overwrite the programs it installed.</para>
+
+<!-- the first part of this is the same as in texlive pass 1 -->
+<screen role="root"><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
+mkdir texlive-build &amp;&amp;
+cd texlive-build    &amp;&amp;
+
+../configure                                        \
+    --prefix=/opt/texlive/&texlive-year;                      \
+    --bindir=/opt/texlive/&texlive-year;/bin/$TEXARCH         \
+    --datarootdir=/opt/texlive/&texlive-year;                 \
+    --includedir=/usr/include                       \
+    --infodir=/opt/texlive/&texlive-year;/texmf-dist/doc/info \
+    --libdir=/usr/lib                               \
+    --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man   \
+    --disable-native-texlive-build                  \
+    --disable-static --enable-shared                \
+    --with-system-cairo                             \
+    --with-system-fontconfig                        \
+    --with-system-freetype2                         \
+    --with-system-graphite2                         \
+    --with-system-harfbuzz                          \
+    --with-system-icu                               \
+    --with-system-libgs                             \
+    --with-system-libpng                            \
+    --with-system-pixman                            \
+    --with-system-poppler                           \
+    --with-system-xpdf                              \
+    --with-system-zlib                              \
+    --with-banner-add=" - BLFS"                     \
+    --enable-xindy                                  \
+    --enable-xindy-rules                            \
+    --enable-xindy-doc                              \
+    --with-clisp-runtime=system</userinput></screen>
+
+    <para>Asymptote has to be separately configured.  It ships with its own copy
+    of the gc source tarball, and will only use the system version if that local
+    source is removed.
+    </para>
+
+<screen><userinput>pushd ../utils/asymptote &amp;&amp;
+rm -v gc-7.4.0.tar.gz &amp;&amp;
+
+echo "ac_cv_lib_m_sqrt=yes"     >config.cache &amp;&amp;
+echo "ac_cv_lib_z_deflate=yes" >>config.cache &amp;&amp;
+
+./configure LIBS="-ltirpc "                         \
+    --prefix=/opt/texlive/&texlive-year;/                     \
+    --bindir=/opt/texlive/&texlive-year;/bin/$TEXARCH     \
+    --enable-texlive-build                          \
+    --datarootdir=/opt/texlive/&texlive-year;/texmf-dist      \
+    --infodir=/opt/texlive/&texlive-year;/texmf-dist/doc/info \
+    --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man   \
+    --cache-file=config.cache &amp;&amp; &amp;&amp;
+popd &amp;&amp;
+unset TEXARCH &amp;&amp;
+
+make &amp;&amp;
+make -C ../utils/asymptote</userinput></screen>
+
+    <para>To test the results, issue: <command>make -k check &amp;&amp;
+    make -C utils/asymptote check</command>.</para>
+
+    <para>If you have used the binary installer, you will want to
+    do a full install. As the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen><userinput role="nodump">make install &amp;&amp;
+make -C ../utils/asymptote install</userinput></screen>
+
+    <para>For people who have followed the LFS way and built from source,
+    it is only necessary to install <application>xindy</application> and
+    <application>asy</application>, so, as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen><userinput role="root">make -C utils/xindy install &amp;&amp;
+make -C ../utils/asymptote install</userinput></screen>
+
+    <para>One part of the package remains to be rebuilt:
+    <xref linkend="biber"/>.</para>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../xincludes/tex-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../xincludes/tex-lib.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/tex-shared.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/tex-system.xml"/>
+
+<!--    <para>
+      <parameter>\-\-with-system-xpdf</parameter>: Uniquely, this parameter has
+      a non-standard meaning, it tells <command>configure</command> to use the
+      system-installed <application>poppler</application> headers and library.
+      Again, omit this if you have not installed
+      <application>poppler</application>.
+    </para> -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/tex-xpdf.xml"/>
+
+    <para>
+      <parameter>echo "ac_cv_lib_m_sqrt=yes" ... LIBS="-ltirpc " &gt;config.cache,
+      ... --cache-file=config.cache</parameter> : The configure scripts in
+      <application>TeX Live</application> are uncommon. Asymptote not only has to
+      be separately configured and built, the configure script fails to find the
+      shared <filename class="libraryfile">libtirpc.so</filename>.  Passing that
+      in LIBS breaks the tests for (static) libm and (shared) libz, so we have to
+      fix things up, in much the same way as when cross-compiling.
+    </para>
+
+    <para>
+      <option>--without-x</option>: use this (and omit the configure and make in
+      <filename>utils/asymptote</filename> if you do not have Xorg installed.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>Over 300 binaries and symlinks to scripts</seg>
+        <seg>libkpathsea.so, libptexenc.so</seg>
+        <seg>/opt/texlive, /usr/include/kpathsea, /usr/include/ptexenc</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="texlive-programs">
+        <term><command>TeX&nbsp;programs</command></term>
+        <listitem>
+          <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+          href="../../xincludes/texprogs.xml"/>
+          <indexterm zone="texlive texlive-programs">
+            <primary sortas="b-texlive-programs">TeX Live programs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libkpathsea">
+        <term><filename class="libraryfile">libkpathsea.so</filename></term>
+        <listitem>
+          <para>
+            (kpathsearch) exists to look up a file in a list of directories.
+          </para>
+          <indexterm zone="texlive libkpathsea">
+            <primary sortas="c-libkpathsea">libkpathsea.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libptexenc">
+        <term><filename class="libraryfile">libptexenc.so</filename></term>
+        <listitem>
+          <para>
+            is a library for Japanese pTeX (publishing TeX).
+          </para>
+          <indexterm zone="texlive libptexenc">
+            <primary sortas="c-libptexenc">libptexenc.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: t/typesetting/texlive.xml
===================================================================
--- pst/typesetting/texlive.xml	(revision 347e59c826e8b059cd3aaea7472891b6bdce3491)
+++ 	(revision )
@@ -1,289 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY texlive-source-download-http " ">
-  <!ENTITY texlive-source-download-ftp  "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&texlive-version;-source.tar.xz">
-  <!ENTITY texlive-source-md5sum        "09ee265ff51637827559affc7304078c">
-  <!ENTITY texlive-source-size          "40 MB">
-
-  <!ENTITY texlive-buildsize            "923 MB (if starting from pass 1)">
-  <!ENTITY texlive-time                 "9.0 SBU">
-]>
-
-<sect1 id="texlive" xreflabel="texlive-&texlive-version;">
-  <?dbhtml filename="texlive.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>texlive-&texlive-version;-source</title>
-
-  <indexterm zone="texlive">
-    <primary sortas="a-texlive">texlive</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to TeX Live from source</title>
-
-    <para>After installing a partial TeX build (or alternatively installing the
-    binary version), here we will build all of TeX Live from source (except
-    <application>biber</application> which is not supplied in the source tarball
-    and will be dealt with separately).</para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&texlive-source-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&texlive-source-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &texlive-source-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &texlive-source-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &texlive-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &texlive-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">TeX Live Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      Either <xref linkend="texpass1"/> or <xref linkend="tl-installer"/>
-      , and
-      <xref linkend="clisp"/> (to build <command>xindy</command> which is an
-      index processor for multi-lingual index creation)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gs"/> (for dvisvgm - used by asymptote which provides a
-      mathematical coordinate-based framework for technical drawing),
-      <xref linkend="x-window-system"/>
-    </para>
-
-    <!-- text for recommended libraries, shared with pass 1 -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/texrecommendlibs.xml"/>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <!-- text for optional deps, shared with pass 1 -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/texoptional.xml"/>
-
-
-    <bridgehead renderas="sect4">Runtime dependencies</bridgehead>
-    <!-- text for runtime deps, shared with tl-installer and pass 1 -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/texruntime.xml"/>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/texlive"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of TeX Live</title>
-
-    <para>If you started with the binary installer, these instructions will
-    overwrite the programs it installed.</para>
-
-<!-- the first part of this is the same as in texlive pass 1 -->
-<screen role="root"><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
-mkdir texlive-build &amp;&amp;
-cd texlive-build    &amp;&amp;
-
-../configure                                        \
-    --prefix=/opt/texlive/&texlive-year;                      \
-    --bindir=/opt/texlive/&texlive-year;/bin/$TEXARCH         \
-    --datarootdir=/opt/texlive/&texlive-year;                 \
-    --includedir=/usr/include                       \
-    --infodir=/opt/texlive/&texlive-year;/texmf-dist/doc/info \
-    --libdir=/usr/lib                               \
-    --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man   \
-    --disable-native-texlive-build                  \
-    --disable-static --enable-shared                \
-    --with-system-cairo                             \
-    --with-system-fontconfig                        \
-    --with-system-freetype2                         \
-    --with-system-graphite2                         \
-    --with-system-harfbuzz                          \
-    --with-system-icu                               \
-    --with-system-libgs                             \
-    --with-system-libpng                            \
-    --with-system-pixman                            \
-    --with-system-poppler                           \
-    --with-system-xpdf                              \
-    --with-system-zlib                              \
-    --with-banner-add=" - BLFS"                     \
-    --enable-xindy                                  \
-    --enable-xindy-rules                            \
-    --enable-xindy-doc                              \
-    --with-clisp-runtime=system</userinput></screen>
-
-    <para>Asymptote has to be separately configured.  It ships with its own copy
-    of the gc source tarball, and will only use the system version if that local
-    source is removed.
-    </para>
-
-<screen><userinput>pushd ../utils/asymptote &amp;&amp;
-rm -v gc-7.4.0.tar.gz &amp;&amp;
-
-echo "ac_cv_lib_m_sqrt=yes"     >config.cache &amp;&amp;
-echo "ac_cv_lib_z_deflate=yes" >>config.cache &amp;&amp;
-
-./configure LIBS="-ltirpc "                         \
-    --prefix=/opt/texlive/&texlive-year;/                     \
-    --bindir=/opt/texlive/&texlive-year;/bin/$TEXARCH     \
-    --enable-texlive-build                          \
-    --datarootdir=/opt/texlive/&texlive-year;/texmf-dist      \
-    --infodir=/opt/texlive/&texlive-year;/texmf-dist/doc/info \
-    --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man   \
-    --cache-file=config.cache &amp;&amp; &amp;&amp;
-popd &amp;&amp;
-unset TEXARCH &amp;&amp;
-
-make &amp;&amp;
-make -C ../utils/asymptote</userinput></screen>
-
-    <para>To test the results, issue: <command>make -k check &amp;&amp;
-    make -C utils/asymptote check</command>.</para>
-
-    <para>If you have used the binary installer, you will want to
-    do a full install. As the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen><userinput role="nodump">make install &amp;&amp;
-make -C ../utils/asymptote install</userinput></screen>
-
-    <para>For people who have followed the LFS way and built from source,
-    it is only necessary to install <application>xindy</application> and
-    <application>asy</application>, so, as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen><userinput role="root">make -C utils/xindy install &amp;&amp;
-make -C ../utils/asymptote install</userinput></screen>
-
-    <para>One part of the package remains to be rebuilt:
-    <xref linkend="biber"/>.</para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/tex-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/tex-lib.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/tex-shared.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/tex-system.xml"/>
-
-<!--    <para>
-      <parameter>\-\-with-system-xpdf</parameter>: Uniquely, this parameter has
-      a non-standard meaning, it tells <command>configure</command> to use the
-      system-installed <application>poppler</application> headers and library.
-      Again, omit this if you have not installed
-      <application>poppler</application>.
-    </para> -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/tex-xpdf.xml"/>
-
-    <para>
-      <parameter>echo "ac_cv_lib_m_sqrt=yes" ... LIBS="-ltirpc " &gt;config.cache,
-      ... --cache-file=config.cache</parameter> : The configure scripts in
-      <application>TeX Live</application> are uncommon. Asymptote not only has to
-      be separately configured and built, the configure script fails to find the
-      shared <filename class="libraryfile">libtirpc.so</filename>.  Passing that
-      in LIBS breaks the tests for (static) libm and (shared) libz, so we have to
-      fix things up, in much the same way as when cross-compiling.
-    </para>
-
-    <para>
-      <option>--without-x</option>: use this (and omit the configure and make in
-      <filename>utils/asymptote</filename> if you do not have Xorg installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>Over 300 binaries and symlinks to scripts</seg>
-        <seg>libkpathsea.so, libptexenc.so</seg>
-        <seg>/opt/texlive, /usr/include/kpathsea, /usr/include/ptexenc</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="texlive-programs">
-        <term><command>TeX&nbsp;programs</command></term>
-        <listitem>
-          <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-          href="../../xincludes/texprogs.xml"/>
-          <indexterm zone="texlive texlive-programs">
-            <primary sortas="b-texlive-programs">TeX Live programs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkpathsea">
-        <term><filename class="libraryfile">libkpathsea.so</filename></term>
-        <listitem>
-          <para>
-            (kpathsearch) exists to look up a file in a list of directories.
-          </para>
-          <indexterm zone="texlive libkpathsea">
-            <primary sortas="c-libkpathsea">libkpathsea.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libptexenc">
-        <term><filename class="libraryfile">libptexenc.so</filename></term>
-        <listitem>
-          <para>
-            is a library for Japanese pTeX (publishing TeX).
-          </para>
-          <indexterm zone="texlive libptexenc">
-            <primary sortas="c-libptexenc">libptexenc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
