From 8b8169709aacc3269c4da7d5d2625ae2fdf74a22 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 17 Feb 2024 05:38:11 +0100 Subject: [PATCH] docbook.sh: update the script from upstream --- doc/docbook.sh | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/doc/docbook.sh b/doc/docbook.sh index d3ca1cd..520e7b7 100755 --- a/doc/docbook.sh +++ b/doc/docbook.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2012-2021 Pierre Pronchery +#Copyright (c) 2012-2023 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -28,14 +28,17 @@ CONFIGSH="${0%/docbook.sh}/../config.sh" PREFIX="/usr/local" PROGNAME="docbook.sh" +XSL_HTML="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" +XSL_MAN="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" +XSL_PDF="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl" #executables DEBUG="_debug" FOP="fop" INSTALL="install -m 0644" MKDIR="mkdir -m 0755 -p" RM="rm -f" -XMLLINT="xmllint --nonet --xinclude" -XSLTPROC="xsltproc --nonet --xinclude" +XMLLINT="xmllint --nonet --xinclude --path ${PWD}" +XSLTPROC="xsltproc --nonet --xinclude --path ${PWD}" [ -f "$CONFIGSH" ] && . "$CONFIGSH" @@ -60,18 +63,20 @@ _docbook() ext="${ext##.}" case "$ext" in html) - XSL="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" + XSL="$XSL_HTML" [ -f "${source%.*}.xsl" ] && XSL="${source%.*}.xsl" [ -f "${target%.*}.xsl" ] && XSL="${target%.*}.xsl" if [ -f "${target%.*}.css.xml" ]; then - XSLTPROC="$XSLTPROC --param custom.css.source \"${target%.*}.css.xml\" --param generate.css.header 1" + XSLTPROC_PARAMS="--param custom.css.source \"${target%.*}.css.xml\" --param generate.css.header 1" elif [ -f "${source%.*}.css.xml" ]; then - XSLTPROC="$XSLTPROC --param custom.css.source \"${source%.*}.css.xml\" --param generate.css.header 1" + XSLTPROC_PARAMS="--param custom.css.source \"${source%.*}.css.xml\" --param generate.css.header 1" + else + XSLTPROC_PARAMS= fi - $DEBUG $XSLTPROC -o "$target" "$XSL" "$source" + $DEBUG $XSLTPROC $XSLTPROC_PARAMS -o "$target" "$XSL" "$source" ;; pdf) - XSL="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl" + XSL="$XSL_PDF" [ -f "${source%.*}.xsl" ] && XSL="${source%.*}.xsl" [ -f "${target%.*}.xsl" ] && XSL="${target%.*}.xsl" $DEBUG $XSLTPROC -o "${target%.*}.fo" "$XSL" "$source" && @@ -79,7 +84,7 @@ _docbook() $RM -- "${target%.*}.fo" ;; 1|2|3|4|5|6|7|8|9) - XSL="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" + XSL="$XSL_MAN" $DEBUG $XSLTPROC -o "$target" "$XSL" "$source" ;; *) @@ -170,7 +175,7 @@ while [ $# -gt 0 ]; do source="${target#$OBJDIR}" source="${source%.*}.xml" xpath="string(/refentry/refmeta/manvolnum)" - section=$($XMLLINT --xpath "$xpath" "$source") + section=$($DEBUG $XMLLINT --xpath "$xpath" "$source") if [ $? -eq 0 -a -n "$section" ]; then instdir="$MANDIR/html$section" fi