Index: general/graphlib/libungif.xml
===================================================================
--- general/graphlib/libungif.xml	(revision 11cf9f2de7a937661e4dedc240f5979384c9597e)
+++ general/graphlib/libungif.xml	(revision 6dc368793d24aa827550cb1d91f3465fd83e1bbf)
@@ -5,70 +5,80 @@
   %general-entities;
 
-<!ENTITY libungif-download-http "http://prdownloads.sourceforge.net/libungif/libungif-&libungif-version;.tar.bz2">
-<!ENTITY libungif-download-ftp " ">
-<!ENTITY libungif-md5sum "8c198831cc0495596c78134b8849e9ad">
-<!ENTITY libungif-size "430 KB">
-<!ENTITY libungif-buildsize "6.2 MB">
-<!ENTITY libungif-time "0.16 SBU">
+  <!ENTITY libungif-download-http "http://prdownloads.sourceforge.net/libungif/libungif-&libungif-version;.tar.bz2">
+  <!ENTITY libungif-download-ftp " ">
+  <!ENTITY libungif-md5sum "8c198831cc0495596c78134b8849e9ad">
+  <!ENTITY libungif-size "430 KB">
+  <!ENTITY libungif-buildsize "6.2 MB">
+  <!ENTITY libungif-time "0.16 SBU">
 ]>
 
 <sect1 id="libungif" xreflabel="libungif-&libungif-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="libungif.html"?>
-<title>libungif-&libungif-version;</title>
-
-<sect2>
-<title>Introduction to <application>libungif</application></title>
-
-<para>The <application>libungif</application> package contains libraries for 
-reading all <acronym>GIF</acronym>s and writing non-compressed ones as well as 
-programs for converting and working with <acronym>GIF</acronym> files. The 
-libraries are useful for any graphics program wishing to deal with 
-<acronym>GIF</acronym> files while the programs are useful for conversion 
-purposes as well as cleaning up images.</para>
-
-<para>The reason <application>libungif</application> only writes non-compressed 
-<acronym>GIF</acronym>s is due to a legal issue with <acronym>LZW</acronym> 
-compression (which Unisys claimed a patent on). Reading <acronym>GIF</acronym>s 
-is not a problem as the decompression routines do not seem to be limited in 
-this way.  Note that this has in the past been disputed. The best way to avoid 
-this whole mess is to simply use <application>libungif</application> for 
-looking at <acronym>GIF</acronym> images on the web, while in any pages which 
-you design, use the open source <acronym>PNG</acronym> format instead (which 
-uses, not surprisingly, the <application>libpng</application> library) which 
-has no patent issues at all.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&libungif-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&libungif-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &libungif-md5sum;</para></listitem>
-<listitem><para>Download size: &libungif-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&libungif-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&libungif-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>libungif</application> dependencies</title>
-<sect4><title>Optional</title>
-<para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>libungif</application></title>
-
-<para>Install <application>libungif</application> by running the following
-commands:</para>
-
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+  <?dbhtml filename="libungif.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Libungif-&libungif-version;</title>
+
+  <indexterm zone="libungif">
+    <primary sortas="a-Libungif">Libungif</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Libungif</title>
+
+    <para>The <application>libungif</application> package contains libraries 
+    for reading all GIFs and writing non-compressed ones as well as programs 
+    for converting and working with GIF files. The libraries are useful for any 
+    graphics program wishing to deal with GIF files while the programs are useful 
+    for conversion purposes as well as cleaning up images.</para>
+
+    <para>The reason <application>libungif</application> only writes non-compressed 
+    GIFs is due to a legal issue with LZW compression (which Unisys claimed a patent 
+    on). Reading GIFs is not a problem as the decompression routines do not seem to 
+    be limited in this way.  Note that this has in the past been disputed. The best way to 
+    avoid this whole mess is to simply use <application>libungif</application> for 
+    looking at GIF images on the web, while in any pages which you design, use the open 
+    source PNG format instead (which uses, not surprisingly, the 
+    <application>libpng</application> library) which has no patent issues at all.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libungif-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libungif-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libungif-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libungif-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libungif-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libungif-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Libungif Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para>
+
+  </sect2>
+
+  <sect2 role="kernel" id='TEMPLATE-kernel'>
+    <title>Installation of Libungif</title>
+
+    <para>Install <application>libungif</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
@@ -77,160 +87,334 @@
     /usr/share/doc/libungif-&libungif-version;/html &amp;&amp;
 install -v -m644 doc/*.txt \
-    /usr/share/doc/libungif-&libungif-version;</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>The libungif package contains
-<command>gif2epsn</command>,
-<command>gif2ps</command>,
-<command>gif2rgb</command>,
-<command>gif2x11</command>,
-<command>gifasm</command>,
-<command>gifbg</command>,
-<command>gifburst</command>,
-<command>gifclip</command>,
-<command>gifclrmp</command>,
-<command>gifcolor</command>,
-<command>gifcomb</command>,
-<command>gifcompose</command>,
-<command>giffiltr</command>,
-<command>giffix</command>,
-<command>gifflip</command>, 
-<command>gifhisto</command>,
-<command>gifinfo</command>, 
-<command>gifinter</command>,
-<command>gifinto</command>,
-<command>gifovly</command>,
-<command>gifpos</command>,
-<command>gifrotat</command>,
-<command>gifrsize</command>,
-<command>gifspnge</command>,
-<command>giftext</command>,
-<command>gifwedge</command>,
-<command>icon2gif</command>,
-<command>raw2gif</command>,
-<command>rgb2gif</command>,
-<command>text2gif</command> and
-<filename class="libraryfile">libungif</filename> libraries.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>gif2epsn</title>
-<para>Dumps images saved as <acronym>GIF</acronym> files on Epson type 
-printers.</para></sect3>
-
-<sect3><title>gif2ps</title>
-<para>Print <acronym>GIF</acronym> files on laser printers supporting 
-PostScript.</para></sect3>
-
-<sect3><title>gif2rgb</title>
-<para>Convert images saved as <acronym>GIF</acronym> to 24-bit 
-<acronym>RGB</acronym> image(s).</para></sect3>
-
-<sect3><title>gif2x11</title>
-<para>Display images saved as <acronym>GIF</acronym> files
-under X Window System.</para></sect3>
-
-<sect3><title>gifasm</title>
-<para>Assemble multiple <acronym>GIF</acronym>s into one, or burst a
-multiple-image <acronym>GIF</acronym>.</para></sect3>
-
-<sect3><title>gifbg</title>
-<para>Generate a single-color test pattern <acronym>GIF</acronym>.</para>
-</sect3>
-
-<sect3><title>gifburst</title>
-<para>Burst a <acronym>GIF</acronym> image into subrectangles.</para></sect3>
-
-<sect3><title>gifclip</title>
-<para>Clip or crop a <acronym>GIF</acronym> image.</para></sect3>
-
-<sect3><title>gifclrmp</title>
-<para>Modify <acronym>GIF</acronym> image colormaps.</para></sect3>
-
-<sect3><title>gifcolor</title>
-<para>Generate color test patterns.</para></sect3>
-
-<sect3><title>gifcomb</title>
-<para>Combine 2 <acronym>GIF</acronym> images of exactly the same size into 
-one.</para></sect3>
-
-<sect3><title>gifcompose</title>
-<para>Use (un)giflib tools to compose images.</para></sect3>
-
-<sect3><title>giffiltr</title>
-<para>Template code for filtering a <acronym>GIF</acronym> 
-sequentially.</para></sect3>
-
-<sect3><title>giffix</title>
-<para>Clumsily attempts to fix truncated <acronym>GIF</acronym> images.</para>
-</sect3>
-
-<sect3><title>gifflip</title>
-<para>Flip <acronym>GIF</acronym> image along X or Y axis or rotate by 90
-degrees.</para></sect3>
-
-<sect3><title>gifhisto</title>
-<para>Generate color-frequency histogram from a <acronym>GIF</acronym>.</para>
-</sect3>
-
-<sect3><title>gifinfo</title>
-<para>Gives information on a <acronym>GIF</acronym> file.</para></sect3>
-
-<sect3><title>gifinter</title>
-<para>Convert between interlaced and non-interlaced images.</para></sect3>
-
-<sect3><title>gifinto</title>
-<para>End-of-pipe fitting for <acronym>GIF</acronym>-processing 
-pipelines.</para></sect3>
-
-<sect3><title>gifovly</title>
-<para>Generate one composite <acronym>GIF</acronym> from a multiple-image
-<acronym>GIF</acronym>.</para></sect3>
-
-<sect3><title>gifpos</title>
-<para>Change a <acronym>GIF</acronym>'s screen size or recondition 
-it.</para></sect3>
-
-<sect3><title>gifrotat</title>
-<para>Rotate a <acronym>GIF</acronym> through any desired angle.</para></sect3>
-
-<sect3><title>gifrsize</title>
-<para>Resize a <acronym>GIF</acronym> by deletion or duplication of bits.</para>
-</sect3>
-
-<sect3><title>gifspnge</title>
-<para>Template code for filtering a <acronym>GIF</acronym> with in-core
-operations.</para></sect3>
-
-<sect3><title>giftext</title>
-<para>Print (text only) general information about a <acronym>GIF</acronym>.
-</para></sect3>
-
-<sect3><title>gifwedge</title>
-<para>Create a test <acronym>GIF</acronym> image resembling a color monitor
-test pattern.</para></sect3>
-
-<sect3><title>icon2gif</title>
-<para>Converter/deconverter to/from an editable text format.</para></sect3>
-
-<sect3><title>raw2gif</title>
-<para>Convert raw 8-bit image data into <acronym>GIF</acronym> files.</para>
-</sect3>
-
-<sect3><title>rgb2gif</title>
-<para>Convert 24 bit images to a <acronym>GIF</acronym> image using color
-quantization.</para></sect3>
-
-<sect3><title>text2gif</title>
-<para>Generate <acronym>GIF</acronym> images out of regular text in 8x8 font.
-</para></sect3>
-
-</sect2>
+    /usr/share/doc/libungif-&libungif-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>gif2epsn, gif2ps, gif2rgb, gif2x11, gifasm, gifbg, gifburst, gifclip,
+        gifclrmp, gifcolor, gifcomb, gifcompose, giffiltr, giffix, gifflip, gifhisto,
+        gifinfo, gifinter, gifinto, gifovly, gifpos, gifrotat, gifrsize, gifspnge, giftext,
+        gifwedge, icon2gif, raw2gif, rgb2gif, and text2gif</seg>
+        <seg>libungif.[so,a]</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gif2epsn-libungif">
+        <term><command>gif2epsn</command></term>
+        <listitem>
+          <para>dumps images saved as GIF files on Epson type printers.</para>
+          <indexterm zone="libungif gif2epsn-libungif">
+            <primary sortas="b-gif2epsn">gif2epsn</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gif2ps-libungif">
+        <term><command>gif2ps</command></term>
+        <listitem>
+          <para>print GIF files on laser printers supporting PostScript.</para>
+          <indexterm zone="libungif gif2ps-libungif">
+            <primary sortas="b-gif2ps">gif2ps</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gif2rgb-libungif">
+        <term><command>gif2rgb</command></term>
+        <listitem>
+          <para>convert images saved as GIF to 24-bit RGB image(s).</para>
+          <indexterm zone="libungif gif2rgb-libungif">
+            <primary sortas="b-gif2rgb">gif2rgb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gif2x11-libungif">
+        <term><command>gif2x11</command></term>
+        <listitem>
+          <para>display images saved as GIF files under X Window System.</para>
+          <indexterm zone="libungif gif2x11-libungif">
+            <primary sortas="b-gif2x11">gif2x11</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifasm-libungif">
+        <term><command>gifasm</command></term>
+        <listitem>
+          <para>assemble multiple GIFs into one, or burst a multiple-image GIF.</para>
+          <indexterm zone="libungif gifasm-libungif">
+            <primary sortas="b-gifasm">gifasm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifbg-libungif">
+        <term><command>gifbg</command></term>
+        <listitem>
+          <para>generate a single-color test pattern GIF.</para>
+          <indexterm zone="libungif gifbg-libungif">
+            <primary sortas="b-gifbg">gifbg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifburst-libungif">
+        <term><command>gifburst</command></term>
+        <listitem>
+          <para>burst a GIF image into subrectangles.</para>
+          <indexterm zone="libungif gifburst-libungif">
+            <primary sortas="b-gifburst">gifburst</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifclip-libungif">
+        <term><command>gifclip</command></term>
+        <listitem>
+          <para>clip or crop a GIF image.</para>
+          <indexterm zone="libungif gifclip-libungif">
+            <primary sortas="b-gifclip">gifclip</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifclrmp-libungif">
+        <term><command>gifclrmp</command></term>
+        <listitem>
+          <para>modify GIF image colormaps.</para>
+          <indexterm zone="libungif gifclrmp-libungif">
+            <primary sortas="b-gifclrmp">gifclrmp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifcolor-libungif">
+        <term><command>gifcolor</command></term>
+        <listitem>
+          <para>generate color test patterns.</para>
+          <indexterm zone="libungif gifcolor-libungif">
+            <primary sortas="b-gifcolor">gifcolor</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifcomb-libungif">
+        <term><command>gifcomb</command></term>
+        <listitem>
+          <para>combine 2 GIF images of exactly the same size into one.</para>
+          <indexterm zone="libungif gifcomb-libungif">
+            <primary sortas="b-gifcomb">gifcomb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifcompose-libungif">
+        <term><command>gifcompose</command></term>
+        <listitem>
+          <para>use (un)giflib tools to compose images.</para>
+          <indexterm zone="libungif gifcompose-libungif">
+            <primary sortas="b-gifcompose">gifcompose</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="giffiltr-libungif">
+        <term><command>giffiltr</command></term>
+        <listitem>
+          <para>template code for filtering a GIF sequentially.</para>
+          <indexterm zone="libungif giffiltr-libungif">
+            <primary sortas="b-giffiltr">giffiltr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="giffix-libungif">
+        <term><command>giffix</command></term>
+        <listitem>
+          <para>clumsily attempts to fix truncated GIF images.</para>
+          <indexterm zone="libungif giffix-libungif">
+            <primary sortas="b-giffix">giffix</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifflip-libungif">
+        <term><command>gifflip</command></term>
+        <listitem>
+          <para>flip GIF image along X or Y axis or rotate by 90 degrees.</para>
+          <indexterm zone="libungif gifflip-libungif">
+            <primary sortas="b-gifflip">gifflip</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifhisto-libungif">
+        <term><command>gifhisto</command></term>
+        <listitem>
+          <para>generate color-frequency histogram from a GIF.</para>
+          <indexterm zone="libungif gifhisto-libungif">
+            <primary sortas="b-gifhisto">gifhisto</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifinfo-libungif">
+        <term><command>gifinfo</command></term>
+        <listitem>
+          <para>gives information on a GIF file.</para>
+          <indexterm zone="libungif gifinfo-libungif">
+            <primary sortas="b-gifinfo">gifinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifinter-libungif">
+        <term><command>gifinter</command></term>
+        <listitem>
+          <para>convert between interlaced and non-interlaced images.</para>
+          <indexterm zone="libungif gifinter-libungif">
+            <primary sortas="b-gifinter">gifinter</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifinto-libungif">
+        <term><command>gifinto</command></term>
+        <listitem>
+          <para>end-of-pipe fitting for GIF-processing pipelines.</para>
+          <indexterm zone="libungif gifinto-libungif">
+            <primary sortas="b-gifinto">gifinto</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifovly-libungif">
+        <term><command>gifo-libungifvly</command></term>
+        <listitem>
+          <para>generate one composite GIF from a multiple-image GIF.</para>
+          <indexterm zone="libungif gifovly-libungif">
+            <primary sortas="b-gifovly">gifovly</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifpos-libungif">
+        <term><command>gifpos</command></term>
+        <listitem>
+          <para>change a GIF's screen size or recondition it.</para>
+          <indexterm zone="libungif gifpos-libungif">
+            <primary sortas="b-gifpos">gifpos</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifrotat-libungif">
+        <term><command>gifrotat</command></term>
+        <listitem>
+          <para>rotate a GIF through any desired angle.</para>
+          <indexterm zone="libungif gifrotat-libungif">
+            <primary sortas="b-gifrotat">gifrotat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifrsize-libungif">
+        <term><command>gifrsize</command></term>
+        <listitem>
+          <para>resize a GIF by deletion or duplication of bits.</para>
+          <indexterm zone="libungif gifrsize-libungif">
+            <primary sortas="b-gifrsize">gifrsize</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifspnge-libungif">
+        <term><command>gifspnge</command></term>
+        <listitem>
+          <para>template code for filtering a GIF with in-core operations.</para>
+          <indexterm zone="libungif gifspnge-libungif">
+            <primary sortas="b-gifspnge">gifspnge</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="giftext-libungif">
+        <term><command>giftext</command></term>
+        <listitem>
+          <para>print (text only) general information about a GIF.</para>
+          <indexterm zone="libungif giftext-libungif">
+            <primary sortas="b-giftext">giftext</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gifwedge-libungif">
+        <term><command>gifwedge</command></term>
+        <listitem>
+          <para>create a test GIF image resembling a color monitor test pattern.</para>
+          <indexterm zone="libungif gifwedge-libungif">
+            <primary sortas="b-gifwedge">gifwedge</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="icon2gif-libungif">
+        <term><command>icon2gif</command></term>
+        <listitem>
+          <para>converter/deconverter to/from an editable text format.</para>
+          <indexterm zone="libungif icon2gif-libungif">
+            <primary sortas="b-icon2gif">icon2gif</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="raw2gif-libungif">
+        <term><command>raw2gif</command></term>
+        <listitem>
+          <para>convert raw 8-bit image data into GIF files.</para>
+          <indexterm zone="libungif raw2gif-libungif">
+            <primary sortas="b-raw2gif">raw2gif</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rgb2gif-libungif">
+        <term><command>rgb2gif</command></term>
+        <listitem>
+          <para>convert 24 bit images to a GIF image using color quantization.</para>
+          <indexterm zone="libungif rgb2gif-libungif">
+            <primary sortas="b-rgb2gif">rgb2gif</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="text2gif-libungif">
+        <term><command>text2gif</command></term>
+        <listitem>
+          <para>generate GIF images out of regular text in 8x8 font.</para>
+          <indexterm zone="libungif text2gif-libungif">
+            <primary sortas="b-text2gif">text2gif</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
