DocBook XSL Stylesheets-1.69.1

[Randy McMurchy]

Version increment to 1.69.0

[tushar@…]

Version Increment (hopefully a stable release): 1.69.1

[manuel@…]

The documentation is now on a separate package called "docbook-xsl-doc-1.69.1" That package contains a doc/ directory with the pre-rendered HTMLs and a docsrc/ directory with the XML and XSL files to generate it. The new install.sh script included in docbook-xsl-1.69.1 is intended to be run as normal user to install the stylesheets in the user side, and relies on a Java resolver mechanism to manage the catalogs. Then not useful for BLFS. We will need to install it and update the catalog manually, like until now. I will test it against the [B]LFS books, and try to fix the possible conflict with our stylesheets, during this weekend.

[manuel@…]

No problems found rendering the books with this new XSL version. The XHTML output is identical at code level. For PDF output only is needed to re-add a param removed when updating to 1.68.1 to have the same look. The BLFS book can be updated to DocBook XSL Stylesheets-1.69.1 with the next changes:

• To add the docbook-xsl-doc-1.69.1 package, plus their installation commands.

• To change the installation commands to:

install -v -d -m755 /usr/share/xml/docbook/xsl-stylesheets-1.68.1 && install -v -d -m755 /etc/xml && chown -R root:root . && cp -v -af VERSION common eclipse extensions fo html htmlhelp images \

javahelp lib manpages params profiling slides template website xhtml \ /usr/share/xml/docbook/xsl-stylesheets-1.68.1

• If /etc/xml/catalog is updated to resolve the new URIs, like currently is

done in the Intallation section, there is no need to create /etc/profile.d/xsl.sh in the Configuration section (in fact, I never use it). I will update our stylesheets to use 1.69.1 when it will be installed on belgarath.

[LFS-User@…]

Thanks for the update, Manual. A couple of notes:

The commands Manual show are very close to too long. Seems to me they would run out of the 'screen' box in a PDF output. No big deal to shorten them just a bit.

I suggest we offer the 'optional' download of the new docs tarball and provide instructions for installing it somewhere (usr/share/docs).

BLFS will be updated (book instructions) after Belgarath gets these new stylesheets installed, and the stylesheets in the BLFS book (directory --> stylesheets) are updated.

[manuel@…]

Of course, the docs installation is an optional steep. I emailed some minutes ago to Matthew asking it to install the package in Belgarath,

[matthew@…]

OK, I'm just now getting around to installing this stuff on belgarath. I'm slightly confused though. Obviously one can't now do an 'sh INSTALL' as it's a text file now. Manuel says that install.sh is unsuitable for BLFS. The old INSTALL file appears to be doing what current BLFS instructions carry out anyway. So, my current installation instructions are in the attached script. I get the following error trying to process a minimally altered copy of the LFS book (trunk) sources though:

runtime error: file ​file:///usr/share/xml/docbook/stylesheet/1.69.1/xhtml/profile-chunk-code.xsl line 722 element if unregistered variable annotation.support xmlXPathCompiledEval: evaluation failed make: * [lfs] Error 10

Did I miss something in the installation steps, or is xsltproc-2.6.20 unable to process these new stylesheets?

[matthew@…]

Installation script

[matthew@…]

Uggh, sorry for the noise. The book renders fine once the PEBKAC is removed! I'd forgotten to change one of the references to 1.68.1 to 1.69.1 in the LFS stylesheets!

[manuel@…]

All book's stylesheets has been updated to use version 1.69.1. Bellow is a revised installation and configuration commands set.

INSTALLATION

Stylesheets installation:

install -v -d -m755 /usr/share/xml/docbook/xsl-stylesheets-1.69.1 && cp -v -af VERSION common eclipse extensions fo html htmlhelp \

images javahelp lib manpages params profiling slides \ template website xhtml \ /usr/share/xml/docbook/xsl-stylesheets-1.69.1 &&

chown -R root:root /usr/share/xml/docbook/xsl-stylesheets-1.69.1

Update system wide catalogs (maybe this fit better in the configuration

section?): if [ ! -d /etc/xml ]; then

install -v -d -m755 /etc/xml

fi && if [ ! -f /etc/xml/catalog ]; then

xmlcatalog --noout --create /etc/xml/catalog

fi && xmlcatalog --noout --add "rewriteSystem" \

"​http://docbook.sourceforge.net/release/xsl/1.69.1" \ "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \ /etc/xml/catalog &&

xmlcatalog --noout --add "rewriteURI" \

"​http://docbook.sourceforge.net/release/xsl/1.69.1" \ "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \ /etc/xml/catalog &&

xmlcatalog --noout --add "rewriteSystem" \

"​http://docbook.sourceforge.net/release/xsl/current" \ "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \ /etc/xml/catalog &&

xmlcatalog --noout --add "rewriteURI" \

"​http://docbook.sourceforge.net/release/xsl/current" \ "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \ /etc/xml/catalog

Documentation installation:

install -v -d -m755 /usr/share/doc/docbook-xsl-1.69.1 && cd doc && cp -v -af * /usr/share/doc/docbook-xsl-1.69.1 && chown -R root:root /usr/share/doc/docbook-xsl-1.69.1

CONFIGURATION

Required only by the [H]LFS Makefiles to can find the images:

if [ ! -f usr/share/xml/docbook/xsl-stylesheets-current ]; then

rm /usr/share/xml/docbook/xsl-stylesheets-current

fi && cd /usr/share/xml/docbook && ln -sv xsl-stylesheets-1.69.1 xsl-stylesheets-current The creation of /etc/profile.d/xsl.sh must be removed. Isn't needed and the catalog.xml file included with the package is bogus (point to 1.69.0 instead of 1.69.1). The catalogs updates to resolve older versions using the newest one should be removed. Generic stylesheets should to use "current" as the DocBook-XSL version. If some stylesheet use a harcoded DocBook-XSL version, then is most likely that the document that uses it don't will be properlly rendered using a different XSL version.

[LFS-User@…]

Manuel wrote:

All book's stylesheets has been updated to use version 1.69.1. Bellow is a revised installation and configuration commands set. install -v -d -m755 /usr/share/xml/docbook/xsl-stylesheets-1.69.1 && cp -v -af VERSION common eclipse extensions fo html htmlhelp \

images javahelp lib manpages params profiling slides \ template website xhtml \ /usr/share/xml/docbook/xsl-stylesheets-1.69.1 &&

chown -R root:root /usr/share/xml/docbook/xsl-stylesheets-1.69.1

[Randy's input] I changed the cp -af to cp -R. There are only regular files, so -af is unnecessary and it removes the need for the chown command. [end Randy's input]

Update system wide catalogs (maybe this fit better in the configuration

section?): [Randy's input] Moved to the config section [end Randy's input]

install -v -d -m755 /usr/share/doc/docbook-xsl-1.69.1 && cd doc && cp -v -af * /usr/share/doc/docbook-xsl-1.69.1 && chown -R root:root /usr/share/doc/docbook-xsl-1.69.1

[Randy's input] Changed this to cp -R also. Same reasons as before [end Randy's input]

if [ ! -f usr/share/xml/docbook/xsl-stylesheets-current ]; then

rm /usr/share/xml/docbook/xsl-stylesheets-current

fi && cd /usr/share/xml/docbook && ln -sv xsl-stylesheets-1.69.1 xsl-stylesheets-current

[Randy's input] Added a note about LFS and HLFS and changed all of the above to simply:

ln -v -sf xsl-stylesheets-1.69.1 \

/usr/share/xml/docbook/xsl-stylesheets-current

[end Randy's input]

The creation of /etc/profile.d/xsl.sh must be removed. [done] The catalogs updates to resolve older versions using the newest one should be removed. [done] ==========================================

Manuel, if you would, please review the new DocBook XSL Stylesheets instruction page and ensure it passes muster. Thanks

[manuel@…]

The block about installing older XSL versions side-by-side with the current one should be re-added, and maybe reworded. Older versions are required when the version number is hardcoded into the styleshets. For example, to can render LFS-5.1, version 1.65.1 must be installed. The command ln -v -sf xsl-stylesheets-1.69.1 \

/usr/share/xml/docbook/xsl-stylesheets-current

don't work if the link already exist, at least for me. See the following test: $ mkdir dir1 $ ln -s dir1 link $ ls -l total 4 drwxr-xr-x 2 macana users 4096 2005-09-11 11:14 dir1 lrwxrwxrwx 1 macana users 4 2005-09-11 11:14 link -> dir1 $ mkdir dir2 $ ln -sf dir2 link $ ls -l total 8 drwxr-xr-x 2 macana users 4096 2005-09-11 11:15 dir1 drwxr-xr-x 2 macana users 4096 2005-09-11 11:15 dir2 lrwxrwxrwx 1 macana users 4 2005-09-11 11:14 link -> dir1 $ ls -l dir1 total 0 lrwxrwxrwx 1 macana users 4 2005-09-11 11:15 dir2 -> dir2 Look like the "-f" parameter don't work when the existing link point to a directory. If that if true, then maybe others ln commands into the book that create links to dirs must be revised also.

[LFS-User@…]

Okay, thanks for checking things Manuel. I forgot to add the -n parameter to the ln commands to make it work correctly. Commit in r5055 takes care of this:

Here's an example:

rml@rmlinux: ~/test > ls -l total 0 rml@rmlinux: ~/test > mkdir dir1 rml@rmlinux: ~/test > ln -s dir1 symlink1 rml@rmlinux: ~/test > ls -l total 4 drwxr-xr-x 2 rml install 4096 Sep 11 07:33 dir1 lrwxrwxrwx 1 rml install 4 Sep 11 07:34 symlink1 -> dir1 rml@rmlinux: ~/test > mkdir dir2 rml@rmlinux: ~/test > ln -sfn dir2 symlink1 rml@rmlinux: ~/test > ls -l total 8 drwxr-xr-x 2 rml install 4096 Sep 11 07:33 dir1 drwxr-xr-x 2 rml install 4096 Sep 11 07:34 dir2 lrwxrwxrwx 1 rml install 4 Sep 11 07:34 symlink1 -> dir2

Will look at revising the text and adding a note about the side-by-side installation

[LFS-User@…]

Reworded and readded the side-by-side additional versions information to the instructions.

Manuel, I believe this now addresses your concerns you annotated earlier. If you are satisfied with the instructions, comment in this bug and close it, or just comment and I will then close it, and you could come behind and 'verify' the bug.

Thanks for your assistance, Manuel.

[manuel@…]

Thanks, the new redaction and commands looks fine to me. As a note, maybe the others DocBook packages installation commands should be revised also to make it consistent with the new ones used in the XSL one (i.e., to use "cp -v -R" and to move catalogs edition to the configuration section).