docbook-utils/patches/docbook-utils-2ndspaces.patch

   1 --- Original/backends/dvi       2003-01-13 18:14:10.000000000 +0100
   2 +++ Changes/backends/dvi        2007-05-21 14:10:42.000000000 +0200
   3 @@ -6,31 +6,31 @@
   4  export TEXINPUTS
   5
   6  # Convert to TeX
   7 -$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
   8 +$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE"
   9  if [ $? -ne 0 ]
  10  then exit 1
  11  fi
  12
  13  # Convert from TeX to DVI
  14 -jadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp
  15 +jadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp"
  16  if [ $? -ne 0 ]
  17  then
  18 -  cat ${SGML_FILE_NAME}.tmp
  19 -  rm ${SGML_FILE_NAME}.tmp
  20 -  rm ${SGML_FILE_NAME}.tex
  21 +  cat "${SGML_FILE_NAME}.tmp"
  22 +  rm "${SGML_FILE_NAME}.tmp"
  23 +  rm "${SGML_FILE_NAME}.tex"
  24    exit 2
  25  fi
  26 -rm ${SGML_FILE_NAME}.tmp
  27 +rm "${SGML_FILE_NAME}.tmp"
  28
  29  # If there are unresolved references, re-run jadetex, twice
  30 -if egrep '^LaTeX Warning: There were undefined references.$' ${SGML_FILE_NAME}.log >/dev/null 2>&1
  31 +if egrep '^LaTeX Warning: There were undefined references.$' "${SGML_FILE_NAME}.log" >/dev/null 2>&1
  32  then
  33 -    jadetex ${SGML_FILE_NAME}.tex >/dev/null
  34 -    jadetex ${SGML_FILE_NAME}.tex >/dev/null
  35 +    jadetex "${SGML_FILE_NAME}.tex" >/dev/null
  36 +    jadetex "${SGML_FILE_NAME}.tex" >/dev/null
  37  fi
  38 -rm ${SGML_FILE_NAME}.log
  39 -rm ${SGML_FILE_NAME}.aux
  40 -rm ${SGML_FILE_NAME}.tex
  41 -rm ${SGML_FILE_NAME}.out
  42 +rm "${SGML_FILE_NAME}.log"
  43 +rm "${SGML_FILE_NAME}.aux"
  44 +rm "${SGML_FILE_NAME}.tex"
  45 +rm "${SGML_FILE_NAME}.out"
  46
  47  exit 0
  48 --- Original/backends/html      2000-07-21 20:15:22.000000000 +0200
  49 +++ Changes/backends/html       2007-05-21 14:11:32.000000000 +0200
  50 @@ -3,7 +3,7 @@
  51  # This program is under GPL license. See LICENSE file for details.
  52
  53  # Convert to HTML
  54 -$SGML_JADE -t sgml $SGML_ARGUMENTS
  55 +$SGML_JADE -t sgml $SGML_ARGUMENTS "$SGML_FILE"
  56  if [ $? -ne 0 ]
  57  then exit 1
  58  fi
  59 --- Original/backends/pdf       2003-03-17 18:47:11.000000000 +0100
  60 +++ Changes/backends/pdf        2007-05-21 14:13:58.000000000 +0200
  61 @@ -6,26 +6,26 @@
  62  export TEXINPUTS
  63
  64  # Convert to TeX
  65 -$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
  66 +$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE"
  67  if [ $? -ne 0 ]
  68  then exit 1
  69  fi
  70
  71  # Convert from TeX to PDF
  72 -pdfjadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp
  73 +pdfjadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp"
  74  if [ $? -ne 0 ]
  75  then
  76 -  cat ${SGML_FILE_NAME}.tmp
  77 -  rm ${SGML_FILE_NAME}.tmp
  78 -  rm ${SGML_FILE_NAME}.tex
  79 +  cat "${SGML_FILE_NAME}.tmp"
  80 +  rm "${SGML_FILE_NAME}.tmp"
  81 +  rm "${SGML_FILE_NAME}.tex"
  82    exit 2
  83  fi
  84 -rm ${SGML_FILE_NAME}.tmp
  85 +rm "${SGML_FILE_NAME}.tmp"
  86
  87  # Unconditionally re-run pdfjadetex, twice
  88 -pdfjadetex ${SGML_FILE_NAME}.tex >/dev/null
  89 -pdfjadetex ${SGML_FILE_NAME}.tex >/dev/null
  90 -rm -f ${SGML_FILE_NAME}.log ${SGML_FILE_NAME}.aux \
  91 -      ${SGML_FILE_NAME}.tex ${SGML_FILE_NAME}.out
  92 +pdfjadetex "${SGML_FILE_NAME}.tex" >/dev/null
  93 +pdfjadetex "${SGML_FILE_NAME}.tex" >/dev/null
  94 +rm -f "${SGML_FILE_NAME}.log" "${SGML_FILE_NAME}.aux" \
  95 +      "${SGML_FILE_NAME}.tex" "${SGML_FILE_NAME}.out"
  96
  97  exit 0
  98 --- Original/backends/ps        2003-03-17 18:51:48.000000000 +0100
  99 +++ Changes/backends/ps 2007-05-21 14:16:51.000000000 +0200
 100 @@ -6,30 +6,30 @@
 101  export TEXINPUTS
 102
 103  # Convert to TeX
 104 -$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
 105 +$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE"
 106  if [ $? -ne 0 ]
 107  then exit 1
 108  fi
 109
 110  # Convert from TeX to DVI
 111 -jadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp
 112 +jadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp"
 113  if [ $? -ne 0 ]
 114  then
 115 -  cat ${SGML_FILE_NAME}.tmp
 116 -  rm ${SGML_FILE_NAME}.tmp
 117 -  rm ${SGML_FILE_NAME}.tex
 118 +  cat "${SGML_FILE_NAME}.tmp"
 119 +  rm "${SGML_FILE_NAME}.tmp"
 120 +  rm "${SGML_FILE_NAME}.tex"
 121    exit 2
 122  fi
 123 -rm ${SGML_FILE_NAME}.tmp
 124 +rm "${SGML_FILE_NAME}.tmp"
 125
 126  # If there are unresolved references, re-run jadetex, twice
 127 -if egrep '^LaTeX Warning: There were undefined references.$' ${SGML_FILE_NAME}.log >/dev/null 2>&1
 128 +if egrep '^LaTeX Warning: There were undefined references.$' "${SGML_FILE_NAME}.log" >/dev/null 2>&1
 129  then
 130 -    jadetex ${SGML_FILE_NAME}.tex >/dev/null
 131 -    jadetex ${SGML_FILE_NAME}.tex >/dev/null
 132 +    jadetex "${SGML_FILE_NAME}.tex" >/dev/null
 133 +    jadetex "${SGML_FILE_NAME}.tex" >/dev/null
 134  fi
 135 -rm -f ${SGML_FILE_NAME}.log ${SGML_FILE_NAME}.aux \
 136 -       ${SGML_FILE_NAME}.tex ${SGML_FILE_NAME}.out
 137 +rm -f "${SGML_FILE_NAME}.log" "${SGML_FILE_NAME}.aux" \
 138 +       "${SGML_FILE_NAME}.tex" "${SGML_FILE_NAME}.out"
 139
 140  # Convert from DVI to PostScript
 141  PAPERSIZE="-t letter"
 142 @@ -38,12 +38,12 @@
 143    PAPERSIZE="-t a4"
 144  fi
 145
 146 -dvips -R -q $PAPERSIZE ${SGML_FILE_NAME}.dvi -o ${SGML_FILE_NAME}.ps
 147 +dvips -R -q $PAPERSIZE "${SGML_FILE_NAME}.dvi" -o "${SGML_FILE_NAME}.ps"
 148  if [ $? -ne 0 ]
 149  then
 150 -  rm ${SGML_FILE_NAME}.dvi
 151 +  rm "${SGML_FILE_NAME}.dvi"
 152    exit 3
 153  fi
 154 -rm ${SGML_FILE_NAME}.dvi
 155 +rm "${SGML_FILE_NAME}.dvi"
 156
 157  exit 0
 158 --- Original/backends/rtf       2000-07-21 20:15:22.000000000 +0200
 159 +++ Changes/backends/rtf        2007-05-21 14:18:37.000000000 +0200
 160 @@ -3,7 +3,7 @@
 161  # This program is under GPL license. See LICENSE file for details.
 162
 163  # Convert to RTF
 164 -$SGML_JADE -t rtf -o ${SGML_FILE_NAME}.rtf $SGML_ARGUMENTS
 165 +$SGML_JADE -t rtf -o "${SGML_FILE_NAME}.rtf" $SGML_ARGUMENTS "$SGML_FILE"
 166  if [ $? -ne 0 ]
 167  then exit 1
 168  fi
 169 --- Original/backends/tex       2000-07-21 20:15:22.000000000 +0200
 170 +++ Changes/backends/tex        2007-05-21 14:21:12.000000000 +0200
 171 @@ -3,7 +3,7 @@
 172  # This program is under GPL license. See LICENSE file for details.
 173
 174  # Convert to TeX
 175 -$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
 176 +$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE"
 177  if [ $? -ne 0 ]
 178  then exit 1
 179  fi
 180 --- Original/backends/txt       2004-02-11 14:58:03.000000000 +0100
 181 +++ Changes/backends/txt        2007-05-21 14:22:33.000000000 +0200
 182 @@ -23,7 +23,7 @@
 183  trap 'rm -f "$HTML"; exit' 0 1 2 3 7 13 15
 184
 185  # Convert to HTML
 186 -$SGML_JADE -V nochunks -t sgml ${SGML_ARGUMENTS} >${HTML}
 187 +$SGML_JADE -V nochunks -t sgml ${SGML_ARGUMENTS} "$SGML_FILE" >${HTML}
 188  if [ $? -ne 0 ]
 189  then exit 1
 190  fi
 191 --- Original/bin/jw.in  2003-04-30 18:21:49.000000000 +0200
 192 +++ Changes/bin/jw.in   2007-05-21 14:28:58.000000000 +0200
 193 @@ -246,7 +246,7 @@ then
 194    echo -e $SGML_HELP_MESSAGE >&2
 195    exit 1
 196  fi
 197 -if [ ! -s $SGML_FRONTEND ]
 198 +if [ ! -s "$SGML_FRONTEND" ]
 199  then
 200    echo "`basename $0`: There is no frontend called \"$SGML_FRONTEND\"." >&2
 201    exit 2
 202 @@ -270,14 +270,14 @@
 203    echo -e $SGML_HELP_MESSAGE >&2
 204    exit 1
 205  fi
 206 -if [ ! -s $SGML_FILE ]
 207 +if [ ! -s "$SGML_FILE" ]
 208  then
 209    echo "`basename $0`: Cannot open \"$SGML_FILE\"." >&2
 210    exit 3
 211  fi
 212
 213  # Separate the file name and the extension (if any)
 214 -SGML_FILE_NAME=`basename $SGML_FILE`
 215 +SGML_FILE_NAME=`basename "$SGML_FILE"`
 216  SGML_FILE_NAME=${SGML_FILE_NAME%.*}
 217
 218  # Determine if we are in an XML file
 219 @@ -416,7 +416,7 @@
 220  fi
 221
 222  # Prepare the parser's arguments
 223 -SGML_ARGUMENTS="$SGML_INCLUDE -i $SGML_TYPE -d $SGML_STYLESHEET $SGML_OPTIONS $SGML_WARNINGS $SGML_DECL $SGML_FILE"
 224 +SGML_ARGUMENTS="$SGML_INCLUDE -i $SGML_TYPE -d $SGML_STYLESHEET $SGML_OPTIONS $SGML_WARNINGS $SGML_DECL"
 225
 226  # Call the backend
 227  echo "Using catalogs: `echo $SGML_CATALOG_FILES | sed 's/:/, /g'`"
 228 @@ -430,7 +430,7 @@
 229  then
 230         sh $SGML_BACKEND
 231  else
 232 -       sh $SGML_BACKEND >$SGML_FILE_NAME.html
 233 +       sh $SGML_BACKEND >"$SGML_FILE_NAME.html"
 234  fi
 235  SGML_RETURN=$?
 236  cd "$SGML_CURRENT_DIRECTORY"
 237 diff -urNp docbook-utils-0.6.14-orig/backends/man.in docbook-utils-0.6.14/backends/man.in
 238 --- docbook-utils-0.6.14-orig/backends/man.in   2003-02-11 13:56:23.000000000 +0100
 239 +++ docbook-utils-0.6.14/backends/man.in        2009-07-24 15:07:04.000000000 +0200
 240 @@ -7,7 +7,7 @@ HELPER=$SGML_BASE_DIR/docbook/utils-@VER
 241  TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \
 242   { echo >&2 "man backend: could not create secure temporary directory"; exit 1;}
 243  trap 'rm -rf "${TMPDIR}"' EXIT
 244 -nsgmls $SGML_FILE > "${TMPDIR}/nsgmls.tmp"
 245 +nsgmls "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
 246  sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs"
 247  if [ $? -ne 0 ]
 248  then
 249 diff -urNp docbook-utils-0.6.14-orig/backends/texi.in docbook-utils-0.6.14/backends/texi.in
 250 --- docbook-utils-0.6.14-orig/backends/texi.in  2002-08-05 23:20:56.000000000 +0200
 251 +++ docbook-utils-0.6.14/backends/texi.in       2009-07-24 15:08:02.000000000 +0200
 252 @@ -3,7 +3,7 @@
 253  # This program is under GPL license. See LICENSE file for details.
 254
 255  # Convert to texinfo
 256 -nsgmls $SGML_FILE | sgmlspl $SGML_BASE_DIR/docbook/utils-@VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi
 257 +nsgmls "$SGML_FILE" | sgmlspl $SGML_BASE_DIR/docbook/utils-@VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi
 258  if [ $? -ne 0 ]
 259  then exit 1
 260  fi