Index: pst/typesetting/texlive.xml
===================================================================
--- pst/typesetting/texlive.xml	(revision d40e1a458975f170496d4501f836bfdfa9abaf8d)
+++ pst/typesetting/texlive.xml	(revision 9f35d021b24c8b11d644bc25d1892fb9360e44ba)
@@ -5,4 +5,6 @@
   %general-entities;
 
+  <!ENTITY texlive-installer           "http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz">
+
   <!ENTITY texlive-source-download-http " ">
   <!ENTITY texlive-source-download-ftp  "ftp://tug.org/texlive/historic/2011/texlive-&texlive-version;-source.tar.xz">
@@ -15,6 +17,6 @@
   <!ENTITY texlive-texmf-size           "1.2 GB">
 
-  <!ENTITY texlive-buildsize            "~5 GB">
-  <!ENTITY texlive-time                 "10 SBU">
+  <!ENTITY texlive-buildsize            "5.4 GB">
+  <!ENTITY texlive-time                 "9.7 SBU">
 ]>
 
@@ -36,11 +38,10 @@
     <title>Introduction to TeX Live</title>
 
-    <para>The <application>TeX Live</application> package is the forked
-    successor of the <application>teTeX</application> TeX document production
-    system invented by Donald Knuth. Both packages have been maintained and
-    supported through the <ulink url="http://www.tug.org/">TeX Users
-    Group</ulink>, although <application>teTeX</application> has been
-    unmaintained for several years now.</para>
-
+    <para>The <application>TeX Live</application> package is a comprehensive
+    TeX document production system.  It includes TEX, LaTeX2e, ConTEXt,
+    Metafont, MetaPost, BibTeX and many other programs; an extensive collection
+    of macros, fonts and documentation; and support for typesetting in many
+    different scripts from around the world.</para>
+    
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -68,5 +69,9 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Required TeX MetaFonts and additional components:
+        <para>The TeX Live installer: <ulink url="&texlive-installer;"/></para>
+      </listitem>
+      <!--
+      <listitem>
+        <para>TeX MetaFonts and additional components:
         <ulink url="&texlive-texmf-download-ftp;"/></para>
       </listitem>
@@ -76,29 +81,25 @@
       <listitem>
         <para>Download size: &texlive-texmf-size;</para>
-      </listitem>
+      </listitem>-->
     </itemizedlist>
 
     <bridgehead renderas="sect3">TeX Live Dependencies</bridgehead>
-<!--
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="xz-utils"/></para>
--->
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="gs"/>,
-    <xref linkend="poppler"/>,
-    <xref linkend="freetype2"/>,
-    <xref linkend="fontconfig"/>,
-    <xref linkend="libpng"/>,
-    <xref linkend="x-window-system"/>,
-    <xref linkend="recode"/>,
-    <xref linkend="icu"/>,
-    <ulink url="http://www.libgd.org/Main_Page">GD</ulink>,
-    <ulink url="http://www.sfr-fresh.com/linux/misc/t1lib">t1lib</ulink>,
-    <ulink url="http://sourceforge.net/projects/zziplib/">ZZIPlib</ulink>,
-    <ulink url="http://www.gnu.org/software/clisp/">CLISP</ulink>,
-    <ulink url="http://www.lua.org/">Lua</ulink>,
-    <ulink url="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;id=TECkitDownloads">TECkit</ulink>,
-    and
-    <ulink url="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;cat_id=RenderingGraphite">
+      <xref linkend="poppler"/>,
+      <xref linkend="freetype2"/>,
+      <xref linkend="fontconfig"/>,
+      <xref linkend="libpng"/>,
+      <xref linkend="x-window-system"/>,
+      <xref linkend="recode"/>,
+      <xref linkend="icu"/>,
+      <ulink url="http://www.libgd.org/Main_Page">GD</ulink>,
+      <ulink url="http://www.sfr-fresh.com/linux/misc/t1lib">t1lib</ulink>,
+      <ulink url="http://sourceforge.net/projects/zziplib/">ZZIPlib</ulink>,
+      <ulink url="http://www.gnu.org/software/clisp/">CLISP</ulink>,
+      <ulink url="http://www.lua.org/">Lua</ulink>,
+      <ulink url="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;id=TECkitDownloads">TECkit</ulink>, and
+      <ulink url="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;cat_id=RenderingGraphite">
     Graphite</ulink></para>
 
@@ -110,18 +111,61 @@
   <sect2 role="installation">
     <title>Installation of TeX Live</title>
-<!--
-    <para>Before building <application>TeX Live</application>, the macros and
-    fonts package (<filename>texmf</filename> tarball) must be installed and
-    two temporary symbolic links need to be created. Install the macros, fonts
-    and symlinks using the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>tar -xf ../texlive-&texlive-version;-texmf.tar.xz -C /usr/share - -strip-components=1 &amp;&amp;
-
-ln -v -s share/texmf      /usr &amp;&amp;
-ln -v -s share/texmf-dist /usr</userinput></screen>
--->
-    <para>Install <application>TeX Live</application> by running the following
-    commands:</para>
+
+    <para>The <application>TeX Live</application> set of programs with it's
+    supporting documents, fonts, and utilities is very large.  The upstream
+    maintainers recommend placing all files in a single directory structure.
+    BLFS recommends <filename class='directory'>/opt/texlive</filename>.</para>
+
+    <para>First, unpack the installer and change into the installer's 
+    directory, <filename class='directory'>install-tl-20111204</filename>.  
+    This directory name may change if the installer package is updated
+    by the upstream maintainers.</para>
+
+<screen><userinput>tar -xf install-tl-unx.tar.gz &amp;&amp;
+cd install-tl-20111204 </userinput></screen>
+
+    <note><para>The distribution binaries installed below use static linking
+    for internal <application>TeX Live</application> libraries.  Additional
+    libraries as specified in the dependencies section do not need to be
+    present during the install, but the programs that need them will not run
+    until their specific dependencies are installed.</para></note>
+
+    <para>Now, as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen><userinput>TEXLIVE_INSTALL_PREFIX=/opt/texlive ./install-tl</userinput></screen>
+
+    <para>This command is interactive and allows selection or modification of
+    platform, packages, directories, and other options.  The full installation
+    scheme will require about 3 gigabytes of disk space.  The time to complete
+    the download time will depend on your internet connection speed and the
+    number of packages selected.</para>
+
+    <para>After the package download is complete, the next step is to make sure
+    that the system can properly find the files.  If you set up your login
+    scripts as recommended in <xref linkend='postlfs-config-profile'/>, update
+    the needed paths by appending to the <filename>extrapaths.sh</filename> script.
+    Be sure to adjust the paths below to reflect your actual installation
+    location.  In addition, the path to the binaries will be affected by your
+    system architecture.</para>
+
+<screen><userinput>cat &gt;&gt;> /etc/profile.d/extrapaths.sh &lt;&lt; "EOF"
+pathappend /usr/share/man                   MANPATH
+pathappend /opt/texlive/2011/texmf/doc/man  MANPATH
+pathappend /usr/share/info                  INFOPATH
+pathappend /opt/texlive/2011/texmf/doc/info INFOPATH
+pathappend /opt/texlive/2011/bin/x86_64-linux 
+EOF</userinput></screen>
+
+    <note><para>The standard MANPATH and INFOPATH path are specified above to
+    ensure they are included.  If they are already set in the boot script
+    procedure, the pathappend function will ensure duplicates are
+    removed, so including them here will do no harm.</para></note>
+
+    <para>The new paths can be immediately activated by running <command>source
+    /etc/profile</command>.</para>
+
+    <para>At this point the installation is complete.  If building from
+    source is desired, extract the source package as usual and continue.</para>
 
     <note>
@@ -135,5 +179,4 @@
 <screen><userinput>./configure --prefix=/usr                  \
             --disable-native-texlive-build \
-            --enable-shared                \
             --without-luatex               \
             --enable-mktextex-default      \
@@ -143,147 +186,19 @@
     <para>To test the results, issue: <command>make check</command>.</para>
 
-    <para>The <userinput>make install</userinput> instructions does not 
-    honor the traditional installation directory options of 
-    <command>configure</command>.  It also can overwrite /usr/bin/man.  To
-    overcome this problem, install the program to a temporary location and do some 
-    clean up:</para>
-
-<screen><userinput>
-make DESTDIR=$PWD/livetex-tmp install &amp;&amp;
-rm -v $PWD/livetex-tmp/usr/bin/man    &amp;&amp;
-for FN in $PWD/livetex-tmp/usr/bin `find  -type l`; do
-    if [ `readlink $FN | grep "\.\./texmf"` ]; then
-        ln -svf `readlink $FN | sed 's|\.\./texmf|../share/texmf|'` $FN
-    fi
-done &amp;&amp;
-unset FN</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user,
-    put the files in their permanent location:</para> 
-
-<screen><userinput>
-cp -dRv livetex-tmp//usr/include/* /usr/include          &amp;&amp;
-cp -dRv livetex-tmp/usr/lib/*      /usr/lib              &amp;&amp;
-cp -dRv livetex-tmp/usr/bin/*      /usr/bin              &amp;&amp;
-cp -dRv livetex-tmp/usr/doc/man/*  /usr/share/man        &amp;&amp;
-
-tar -xf ../texlive-20110705-texmf.tar.xz -C /usr/share \
-    --strip-components=1                                 &amp;&amp;
-
-cp -dRv livetex-tmp/usr/texmf      /usr/share/texmf      &amp;&amp;
-cp -dRv livetex-tmp/usr/texmf-dist /usr/share/texmf-dist &amp;&amp;
-
-for INFO in livetex-tmp/usr/texmf/doc/info/*.info; do
-  install -v -m0644 $INFO /usr/share/info
-  intall-info --info-dir=/usr/share/info $INFO
-done       &amp;&amp;
-unset INFO &amp;&amp;
-
-DOCDIR="/usr/share/doc/texlive-&texlive-version;" &amp;&amp;
-install -v -m755  -d $DOCDIR             &amp;&amp;
-
-for DOC in `find -name doc`; do
-  DIR=`echo $DOC | cut -d/ -f2-`
-  install -v -m755  -d $DOCDIR/$DIR
-  cp -dRv $DOC/* $DOCDIR/$DIR
-done          &amp;&amp;
-unset DOC DIR &amp;&amp;
-
-install -v -m1777 -d /var/lib/livetex/fonts                     &amp;&amp;
-install -v -m755  -d /usr/share/texmf-{config,var,local}        &amp;&amp;
-
-ln  -s  -v           ../../texmf/doc \
-                     /usr/share/doc/texlive-&texlive-version;/texmf      &amp;&amp;
-
-ln  -s  -v           ../../texmf-dist/doc \
-                     /usr/share/doc/texlive-&texlive-version;/texmf-dist</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i -e '...' -e '...' texk/kpathsea/texmf.cnf</command>:
-    This command is used to modify the default so that local items are
-    installed in <filename class="directory">/usr/share/texmf-local</filename>
-    instead of <filename class="directory">/usr/texmf-local</filename>. It also
-    changes the path for user-installed fonts to the run-time variable location
-    <filename class="directory">/var/lib/livetex/fonts</filename>.</para>
-
-    <para><parameter>--disable-native-texlive-build</parameter>: This parameter
-    is required if the build is not for a binary distribution.</para>
-
-    <para><parameter>--without-luatex</parameter>: This parameter is required
-    if the <application>Lua</application> programming language is not 
-    installed. Remove this parameter if <application>Lua</application> is
-    installed.</para>
-
-    <para><parameter>--enable-mktextex-default</parameter>: This parameter
-    is used so that TeX will automatically invoke mktextex if TeX source is
-    missing.</para>
-
-    <para><parameter>--with-banner-add=" - BLFS"</parameter>: This parameter
-    is used so that the build can be easily recognized as a non-TUG binary
-    build.</para>
-
-    <para><option>--with-system-...</option> &amp;
-    <option>--with-libgs-includes=/usr/include/ghostscript</option>: These
-    options are required to use any system-installed libraries. Run
-    <command>./configure --help</command> to see a full list of available
-    options.</para>
-
-    <para><command>for FN in `...`; do ...; done</command>This command is
-    used to change the installed symbolic links to point to scripts installed
-    in <filename class="directory">/usr/share/texmf</filename> instead of
-    <filename class="directory">/usr/texmf</filename>.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring TeX Live</title>
-
-    <sect3 id="texlive-config">
-      <title>Config Files</title>
-      <para>Several <filename class="extension">.cnf</filename> files are used
-      in a complete TeX system. Typically these files are not directly modified
-      (unless you know your way around a TeX system very well), but instead
-      TeX programs are used to make the modifications.</para>
-
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>Issue the following commands as the
-      <systemitem class="username">root</systemitem> user to configure and
-      finalize the TeX installation:</para>
-
-<screen role="root"><userinput>mktexlsr /usr/share/texmf        \
-         /usr/share/texmf-config \
-         /usr/share/texmf-dist   \
-         /usr/share/texmf-var    \
-         /usr/share/texmf-local  \
-         /var/lib/livetex/fonts  &amp;&amp;
-
-texconfig-sys font rw            &amp;&amp;
-texconfig-sys paper letter       &amp;&amp;
-fmtutil-sys --all                &amp;&amp;
-updmap-sys                       &amp;&amp;
-
-mktexlsr /usr/share/texmf        \
-         /usr/share/texmf-config \
-         /usr/share/texmf-dist   \
-         /usr/share/texmf-var    \
-         /usr/share/texmf-local  \
-         /var/lib/livetex/fonts  &amp;&amp;
-
-texlinks                         &amp;&amp;
-
-mktexlsr /usr/share/texmf        \
-         /usr/share/texmf-config \
-         /usr/share/texmf-dist   \
-         /usr/share/texmf-var    \
-         /usr/share/texmf-local  \
-         /var/lib/livetex/fonts</userinput></screen>
-
-    </sect3>
+    <para>In order to gather the built files in one place, use 
+    <userinput>make install</userinput> to put then in a temproary location:</para>
+
+<screen><userinput>make DESTDIR=$PWD/livetex-tmp install</userinput></screen>
+
+    <para>Now copy the executables to the <application>TeX Live</application>
+    binary directory.  Be sure to adjust the destination directory for your
+    installation.  As the  <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen><userinput>find livetex-tmp/usr/bin -type f -exec cp -v {} /opt/texlive/2011/bin/x86_64-linux \;</userinput></screen>
+
+    <note><para>If you passed the option <option>--enable-shared</option> to the
+    configure command, the two libraries, ibkpathsea.so, libptexenc.so and their
+    symbolic links will also need to be copied to /usr/lib.</para></note>
 
   </sect2>
@@ -299,14 +214,6 @@
       <seglistitem>
         <seg>Over 300 binaries and symlinks to scripts</seg>
-        <seg>libkpathsea.{so,a} and libptexenc.{so,a}</seg>
-        <seg>/usr/include/kpathsea,
-        /usr/include/ptexenc,
-        /usr/share/doc/texlive-&texlive-version;,
-        /usr/share/texmf-config,
-        /usr/share/texmf-dist,
-        /usr/share/texmf-local,
-        /usr/share/texmf-var,
-        /use/share/texmf, and
-        /var/lib/livetex</seg>
+        <seg>None</seg>
+        <seg>/opt/texlive</seg>
       </seglistitem>
     </segmentedlist>
@@ -318,12 +225,10 @@
 
       <varlistentry id="texlive-programs">
-        <term><command>TeX programs</command></term>
+        <term><command>TeX&nbsp;programs</command></term>
         <listitem>
           <para>included in the <application>TeX Live</application> package are
           too numerous to individually list. Please refer to the individual
-          program man pages and
-          <ulink url="file:///usr/share/texmf/doc/texlive/index.html"/> for
-          details, as well as a tour of the expansive
-          <application>TeX Live</application> documentation.</para>
+          program man and html pages in the installation directory's 2011/index.html
+          directory.</para>
           <indexterm zone="texlive texlive-programs">
             <primary sortas="b-texlive-programs">TeX Live programs</primary>
@@ -331,5 +236,5 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="libkpathseaTL">
         <term><filename class='libraryfile'>libkpathsea.{so,a}</filename></term>
@@ -342,5 +247,5 @@
         </listitem>
       </varlistentry>
-
+-->
     </variablelist>
 
