[xml/sgml-pkgs] Bug#413632: Support reading stylesheet from stdin and bug in manpage post-process

[Daniel Leidert]

Package: xmlto
Version: 0.0.18-5.1
Severity: normal
Tags: patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

This report is about two issues. The first is more a wishlist entry:
Please support reading from /dev/stdin, as xsltproc does too. That would
help a lot creating the makefile snippet I'm currently working on to
ease manpage creation from XML sources for Debian packagers. The
attached patch contains the simple fix. The content of /dev/stdin is put
into a temporary XSL file (that is purged after xmlto has finished).
This is probably the most easiest fix.

The second issue is a bug in /usr/share/xmlto/format/docbook/man. If
subdirs-output is enabled, the cp-command fails, because it does not
recursively copy the subdirs. Adding the `-r' switch to the cp command
solves the issue. The attached patch also contains this simple fix.

Regards, Daniel


- -- System Information:
Debian Release: 4.0
  APT prefers unstable
  APT policy: (850, 'unstable'), (700, 'testing'), (550, 'stable'), (110, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18.11
Locale: LANG=de_DE, LC_CTYPE=de_DE (charmap=ISO-8859-1)

Versions of packages xmlto depends on:
ii  debianutils              2.17.5          Miscellaneous utilities specific t
ii  docbook-xml              4.4-5           standard XML documentation system,
ii  docbook-xsl              1.72.0.dfsg.1-1 stylesheets for processing DocBook
ii  libc6                    2.3.6.ds1-13    GNU C Library: Shared libraries
ii  libpaper-utils           1.1.21          Library for handling paper charact
ii  libxml2-utils            2.6.27.dfsg-1   XML utilities
ii  sgml-base                1.26            SGML infrastructure and SGML catal
ii  xsltproc                 1.1.19-1        XSLT command line processor

xmlto recommends no packages.

- -- no debconf information

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFF7TLym0bx+wiPa4wRAoBLAJ4uTFaRdDeiIZFTEkLDQt2vllpvAACePGJk
jXpjpL+mqRT3cb1hlsHdJv4=
=0gFs
-----END PGP SIGNATURE-----
-------------- next part --------------
--- xmlto.in.old	2007-03-06 10:11:00.000000000 +0100
+++ xmlto.in	2007-03-06 10:11:08.000000000 +0100
@@ -176,6 +176,11 @@ while [ "$#" -gt "0" ]; do
 	;;
   -x)
 	case "$2" in
+	-)  TMP_STYLESHEET="$(${MKTEMP} ${TMPDIR:-/tmp}/@PACKAGE at -stdin-xsl.XXXXXX)" || exit 1
+	    CLEANFILES[$CLEANFILE_COUNT]="$TMP_STYLESHEET"
+	    CLEANFILE_COUNT=$(($CLEANFILE_COUNT + 1))
+	    cat /dev/stdin > ${TMP_STYLESHEET}
+	    STYLESHEET=${TMP_STYLESHEET} ;;
 	/*) STYLESHEET="$2" ;;
 	 *) STYLESHEET="$PWD/$2" ;;
 	esac
--- format/docbook/man.old	2007-03-06 10:12:54.000000000 +0100
+++ format/docbook/man	2007-03-06 10:13:11.000000000 +0100
@@ -8,6 +8,6 @@ stylesheet)
   ;;
 post-process)
   [ -e "$XSLT_PROCESSED" ] && rm "$XSLT_PROCESSED"
-  cp -- * "$OUTPUT_DIR" 2>/dev/null
+  cp -r -- * "$OUTPUT_DIR" 2>/dev/null
   ;;
 esac