r3178 - in trunk/BOOK: . introduction/welcome pst/xml

larry at linuxfromscratch.org larry at linuxfromscratch.org
Mon Jan 3 13:20:11 PST 2005


Author: larry
Date: 2005-01-03 14:20:07 -0700 (Mon, 03 Jan 2005)
New Revision: 3178

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/pst/xml/docbook-xsl.xml
Log:
update to docbook-xsl-1.67.2

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-01-03 06:04:23 UTC (rev 3177)
+++ trunk/BOOK/general.ent	2005-01-03 21:20:07 UTC (rev 3178)
@@ -492,7 +492,7 @@
 
 <!-- Chapter 44 --> 
 <!ENTITY DocBook-version              "4.3">
-<!ENTITY docbook-xsl-version          "1.66.1">  
+<!ENTITY docbook-xsl-version          "1.67.2">  
 
 <!-- Chapter 45 --> 
 <!ENTITY a2ps-version                 "4.13b">  

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-01-03 06:04:23 UTC (rev 3177)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-01-03 21:20:07 UTC (rev 3178)
@@ -22,6 +22,9 @@
 
 <itemizedlist>
 
+<listitem><para>January 3rd, 2004 [larry]: Updated to DocBook-xsl-1.67.2
+and added alternative methods of using other versions.</para></listitem>
+
 <listitem><para>January 3rd, 2004 [randy]: Updated GNOME-1.4 package 
 dependencies and build entities.</para></listitem>
 

Modified: trunk/BOOK/pst/xml/docbook-xsl.xml
===================================================================
--- trunk/BOOK/pst/xml/docbook-xsl.xml	2005-01-03 06:04:23 UTC (rev 3177)
+++ trunk/BOOK/pst/xml/docbook-xsl.xml	2005-01-03 21:20:07 UTC (rev 3178)
@@ -3,9 +3,9 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY docbook-xsl-download-http "http://prdownloads.sourceforge.net/docbook/docbook-xsl-&docbook-xsl-version;.tar.gz">
-  <!ENTITY docbook-xsl-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/docbook-xsl-&docbook-xsl-version;.tar.gz">
-  <!ENTITY docbook-xsl-size          "1.5 MB">
+  <!ENTITY docbook-xsl-download-http "http://prdownloads.sourceforge.net/docbook/docbook-xsl-&docbook-xsl-version;.tar.bz2">
+  <!ENTITY docbook-xsl-download-ftp  " ">
+  <!ENTITY docbook-xsl-size          "975 KB">
   <!ENTITY docbook-xsl-buildsize     "25 MB">
   <!ENTITY docbook-xsl-time          "0.01 SBU">
 ]>
@@ -57,11 +57,13 @@
 
 <screen><userinput><command>install -d /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version; &&
 chown -R root:root . &&
-cp -af VERSION common eclipse extensions fo html htmlhelp images javahelp lib \
-    manpages params profiling template tools xhtml \
+cp -af VERSION common eclipse extensions fo html htmlhelp images \
+    javahelp lib manpages params profiling template xhtml \
     /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version; &&
 install -d /usr/share/doc/xml &&
 cp -af doc/* /usr/share/doc/xml &&
+cd /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version; &&
+sh INSTALL &&
 if [ ! -f /etc/xml/catalog ]; then mkdir -p /etc/xml; xmlcatalog --noout \
     --create /etc/xml/catalog; fi &&
 if [ ! -e /etc/xml/docbook ]; then xmlcatalog --noout --create \
@@ -72,24 +74,15 @@
 xmlcatalog --noout --add "rewriteURI" \
     "http://docbook.sourceforge.net/release/xsl/&docbook-xsl-version;" \
     "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" /etc/xml/catalog &&
-xmlcatalog --noout --add "rewriteSystem" \
-    "http://docbook.sourceforge.net/release/xsl/current" \
-    "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" /etc/xml/catalog &&
-xmlcatalog --noout --add "rewriteURI" \
-    "http://docbook.sourceforge.net/release/xsl/current" \
-    "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" /etc/xml/catalog &&
-xmlcatalog --noout --add "rewriteSystem" \
-    "http://docbook.sourceforge.net/release/xsl/1.65.1" \
-    "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" /etc/xml/catalog &&
-xmlcatalog --noout --add "rewriteURI" \
-    "http://docbook.sourceforge.net/release/xsl/1.65.1" \
-    "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" /etc/xml/catalog &&
 xmlcatalog --noout --add "delegateSystem" \
     "http://docbook.sourceforge.net/release/xsl/" \
     "file:///etc/xml/docbook" /etc/xml/catalog &&
 xmlcatalog --noout --add "delegateURI" \
     "http://docbook.sourceforge.net/release/xsl/" \
-    "file:///etc/xml/docbook" /etc/xml/catalog</command></userinput></screen>
+    "file:///etc/xml/docbook" /etc/xml/catalog &&
+echo \
+'export XML_CATALOG_FILES="/usr/share/xml/docbook/xsl-stylesheets&docbook-xsl-version;/catalog.xml /etc/xml/catalog"' \
+ >> /etc/profile</command></userinput></screen>
 
 </sect2>
 
@@ -104,7 +97,32 @@
 <sect3><title>Configuration Information</title>
 
 <para>The above installation script creates the files and updates the
-catalog.</para>
+catalog. Some project stylesheets reference specific versions of
+<acronym>XSL</acronym> stylesheets, like <acronym>BLFS</acronym>, which
+needs the following additional commands.  These commands can also serve
+as an example for using a single <acronym>XSL</acronym> version to support 
+any hard coded versions, as needed.</para>
+<screen><userinput><command>xmlcatalog --noout --add "rewriteSystem" \
+    "http://docbook.sourceforge.net/release/xsl/1.65.1" \
+    "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;"
+/etc/xml/catalog &&
+xmlcatalog --noout --add "rewriteURI" \
+    "http://docbook.sourceforge.net/release/xsl/1.65.1" \
+    "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;"
+/etc/xml/catalog</command></userinput></screen>
+<para>Alternatively, other versions can be installed in their own
+versioned directories and catalog entries made in the following
+form:</para>
+<screen><userinput><command>xmlcatalog --noout --add "rewriteSystem" \
+    "http://docbook.sourceforge.net/release/xsl/<replaceable>[version]</replaceable>" \
+    "/usr/share/xml/docbook/xsl-stylesheets-<replaceable>[version]</replaceable>"
+/etc/xml/catalog &&
+xmlcatalog --noout --add "rewriteURI" \
+    "http://docbook.sourceforge.net/release/xsl/<replaceable>[version]</replaceable>" \
+    "/usr/share/xml/docbook/xsl-stylesheets-<replaceable>[version]</replaceable>"
+/etc/xml/catalog</command></userinput></screen>
+<para>This method guarantees output as intended by the project.</para>
+
 </sect3>
 
 </sect2>




More information about the blfs-book mailing list