diff -urNp xmlto-0.0.21-orig/format/xhtml1/dvi xmlto-0.0.21/format/xhtml1/dvi --- xmlto-0.0.21-orig/format/xhtml1/dvi 1970-01-01 01:00:00.000000000 +0100 +++ xmlto-0.0.21/format/xhtml1/dvi 2009-03-16 12:30:34.000000000 +0100 @@ -0,0 +1,13 @@ +case "$1" in +stylesheet) + if [ "$VERBOSE" -ge 1 ] + then + echo >&2 "Convert to XSL-FO" + fi + echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" + ;; +post-process) + # Get the FO format script to do the rest + sh "$(dirname "$0")/../fo/$(basename "$0")" "$1" + ;; +esac diff -urNp xmlto-0.0.21-orig/format/xhtml1/fo xmlto-0.0.21/format/xhtml1/fo --- xmlto-0.0.21-orig/format/xhtml1/fo 1970-01-01 01:00:00.000000000 +0100 +++ xmlto-0.0.21/format/xhtml1/fo 2009-03-16 12:30:34.000000000 +0100 @@ -0,0 +1,12 @@ +case "$1" in +stylesheet) + if [ "$VERBOSE" -ge 1 ] + then + echo >&2 "Convert to XSL-FO" + fi + echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" + ;; +post-process) + cp "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).fo" + ;; +esac diff -urNp xmlto-0.0.21-orig/format/xhtml1/pdf xmlto-0.0.21/format/xhtml1/pdf --- xmlto-0.0.21-orig/format/xhtml1/pdf 1970-01-01 01:00:00.000000000 +0100 +++ xmlto-0.0.21/format/xhtml1/pdf 2009-03-16 12:30:34.000000000 +0100 @@ -0,0 +1,13 @@ +case "$1" in +stylesheet) + if [ "$VERBOSE" -ge 1 ] + then + echo >&2 "Convert to XSL-FO" + fi + echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" + ;; +post-process) + # Get the FO format script to do the rest + sh "$(dirname "$0")/../fo/$(basename "$0")" "$1" + ;; +esac diff -urNp xmlto-0.0.21-orig/format/xhtml1/ps xmlto-0.0.21/format/xhtml1/ps --- xmlto-0.0.21-orig/format/xhtml1/ps 1970-01-01 01:00:00.000000000 +0100 +++ xmlto-0.0.21/format/xhtml1/ps 2009-03-16 12:30:34.000000000 +0100 @@ -0,0 +1,13 @@ +case "$1" in +stylesheet) + if [ "$VERBOSE" -ge 1 ] + then + echo >&2 "Convert to XSL-FO" + fi + echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" + ;; +post-process) + # Get the FO format script to do the rest + sh "$(dirname "$0")/../fo/$(basename "$0")" "$1" + ;; +esac diff -urNp xmlto-0.0.21-orig/format/xhtml1/txt xmlto-0.0.21/format/xhtml1/txt --- xmlto-0.0.21-orig/format/xhtml1/txt 1970-01-01 01:00:00.000000000 +0100 +++ xmlto-0.0.21/format/xhtml1/txt 2009-03-16 12:30:34.000000000 +0100 @@ -0,0 +1,27 @@ +if [ -x /usr/bin/w3m ] +then + CONVERT=/usr/bin/w3m + ARGS="-T text/html -dump" +elif [ -x /usr/bin/lynx ] +then + CONVERT=/usr/bin/lynx + ARGS="-force_html -dump -nolist -width=72" +elif [ -x /usr/bin/links ] +then + CONVERT=/usr/bin/links + ARGS="-dump" +else + echo >&2 "No way to convert HTML to text found." + exit 1 +fi + +case "$1" in +post-process) + if [ "$VERBOSE" -ge 1 ] + then + echo >&2 "Convert HTML to ASCII" + fi + ${CONVERT} ${ARGS} ${POSTARGS} ${XSLT_PROCESSED} > \ + "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).txt" + ;; +esac diff -urNp xmlto-0.0.21-orig/Makefile.am xmlto-0.0.21/Makefile.am --- xmlto-0.0.21-orig/Makefile.am 2008-01-17 12:33:44.000000000 +0100 +++ xmlto-0.0.21/Makefile.am 2009-03-16 12:49:27.000000000 +0100 @@ -28,6 +28,11 @@ nobase_pkgdata_DATA = format/docbook/dvi format/fo/pcl \ format/fo/svg \ format/fo/txt \ + format/xhtml1/dvi \ + format/xhtml1/fo \ + format/xhtml1/pdf \ + format/xhtml1/ps \ + format/xhtml1/txt \ xmlto.mak EXTRA_DIST = xmlto.spec \ @@ -56,6 +61,11 @@ EXTRA_DIST = xmlto.spec \ format/fo/pcl \ format/fo/svg \ format/fo/txt \ + format/xhtml1/dvi \ + format/xhtml1/fo \ + format/xhtml1/pdf \ + format/xhtml1/ps \ + format/xhtml1/txt \ doc/xmlto.xml \ doc/xmlif.xml \ xmlto.mak \ diff -urNp xmlto-0.0.21-orig/Makefile.in xmlto-0.0.21/Makefile.in --- xmlto-0.0.21-orig/Makefile.in 2008-05-30 15:57:32.000000000 +0200 +++ xmlto-0.0.21/Makefile.in 2009-03-16 12:50:52.000000000 +0100 @@ -208,6 +208,11 @@ nobase_pkgdata_DATA = format/docbook/dvi format/fo/pcl \ format/fo/svg \ format/fo/txt \ + format/xhtml1/dvi \ + format/xhtml1/fo \ + format/xhtml1/pdf \ + format/xhtml1/ps \ + format/xhtml1/txt \ xmlto.mak EXTRA_DIST = xmlto.spec \ @@ -236,6 +241,11 @@ EXTRA_DIST = xmlto.spec \ format/fo/pcl \ format/fo/svg \ format/fo/txt \ + format/xhtml1/dvi \ + format/xhtml1/fo \ + format/xhtml1/pdf \ + format/xhtml1/ps \ + format/xhtml1/txt \ doc/xmlto.xml \ doc/xmlif.xml \ xmlto.mak \ diff -urNp xmlto-0.0.21-orig/xmlto.in xmlto-0.0.21/xmlto.in --- xmlto-0.0.21-orig/xmlto.in 2009-03-16 14:22:58.000000000 +0100 +++ xmlto-0.0.21/xmlto.in 2009-03-16 12:27:49.000000000 +0100 @@ -351,12 +351,15 @@ esac # sed -e 's/^]*?>//g' -e 's/^]*>//g' -e 's/^<\([^ ]*\).*$/\1/') # Seems reasonable fix the file command and teach it to identify the DTD/Schema but this is faster to write: -rootel=$(echo "xpath *" | xmllint --shell $INPUT_FILE 2> /dev/null |head -n 3 |tail -n 1 | cut -f 4 -d " " ) +rootel=$(echo "xpath *" | xmllint --shell $INPUT_FILE 2> /dev/null | head -n 3 |tail -n 1 | cut -f 4 -d " " ) case $(echo $rootel) in fo:root) SOURCE_FORMAT="fo" ;; +html) + SOURCE_FORMAT="xhtml1" + ;; esac [ "$VERBOSE" -ge 1 ] && echo >&2 "Source format: ${SOURCE_FORMAT} / root element: ${rootel} "