I have been reading updated codes from Jens and found minor issues but
then facing big problem.
"-s script" is only for *.tex (Not for html,...)
debiandoc2latexdvi not updated
debiandoc2dvi debiandoc2ps debiandoc2pdf do not pass "-s script"
These do not affect building most files but not clean.
Then I realized bin/template should accomodate "-s script" then
debiandoc2latex* are just passing argument to debiandoc2latex and
cleaner.
Anyway, my updated patch without this realization is here. Mostly minor
edit over Jens's original patch but with new understanding as above, I
think we need to work a bit more.
Should we have CVS under ddp/utils for this?
How far we fix this? Give me your point.
For the record, I will send this to BTS and let Ardo know what we have
done so far.
Osamu
====================================================
debiandoc-sgml (1.1.85) unstable; urgency=high
* Added PS/PDF support for Japanese, Chinese and Korean based on fixlatex
script from Debian Reference (closes: Bug#202315, Bug#214249) (compare
#207810)
* Added support for Slovenian (closes: Bug#291481)
* Added option -s to debiandoc2latexdvi, debiandoc2latexps and
debiandoc2latexpdf to specify script for postprocessing generated
.tex file (closes: Bug#202317)
* Added gs to Recommends: since PDFs thumbnail generation depends on it,
also cjk-latex (for Chinese and Japanese PS/PDF), hlatex and
hlatex-fonts-base (required for Korean PS/PDF)
* Use $PAPERSIZE instead of $PAPERCONF to set paper size (closes: Bug#286537)
* Added a missing space in LaTeX output after "..." (closes: Bug#244625)
* Minor translation fix for German copyright string
* Use "ngerman" language option instead of "german" for using new German
orthography in LaTeX formats
* The urgency is set to high since various documentation packages will
need to be rebuild and such now that this bug is fixed
====================================================
diff -Nru debiandoc-sgml-1.1.85.orig/Makefile debiandoc-sgml-1.1.85/Makefile
--- debiandoc-sgml-1.1.85.orig/Makefile 2004-01-02 23:02:26.000000000 +0100
+++ debiandoc-sgml-1.1.85/Makefile 2005-02-08 07:02:15.000000000 +0100
@@ -61,7 +61,7 @@
$(dtd_name)2pdf $(dtd_name)2ps
TOOLS := $(BCONVS) $(PCONVS)
MAN1S := $(pkg_name)
-HELPERS := saspconvert
+HELPERS := saspconvert fixlatex
## ----------------------------------------------------------------------
## General (un)install definitions
diff -Nru debiandoc-sgml-1.1.85.orig/debian/TODO
debiandoc-sgml-1.1.85/debian/TODO
--- debiandoc-sgml-1.1.85.orig/debian/TODO 2004-10-20 05:53:26.000000000
+0200
+++ debiandoc-sgml-1.1.85/debian/TODO 2005-02-08 19:14:50.000000000 +0100
@@ -9,11 +9,9 @@
SDBP Number Description
------------------------------------------------------------------------------
x 188117 Non-compliant HTML code
- x 202315 debiandoc-sgml: Chinese latex source needs few fixes
x 213332 Incompatibility with sgmltexi
- p 214249 No linebreaks in URL in .dvi and .ps without hyperref driver option
p 218529 debiandoc2ps silly output handling
- x 256076 <enumlist> is totally broken
+ x 256076 <hr> tag interfare with indexing <ol>
------------------------------------------------------------------------------
WISHLIST:
@@ -25,11 +23,9 @@
?xx 140684 <figure> tag
?xx 141727 <table> tag and how it can be implemented
x 202311 proper handling of „ and ”
-x x 202317 option to run script on tex source before build
x x 229849 lacks option for single-sided printing
x xx 235793 please support wml
x 238003 handling of -- in <tt> and <prgn>
- x 244625 Improve quality of output documents
------------------------------------------------------------------------------
VARIOUS
diff -Nru debiandoc-sgml-1.1.85.orig/debian/changelog
debiandoc-sgml-1.1.85/debian/changelog
--- debiandoc-sgml-1.1.85.orig/debian/changelog 2004-10-20 05:53:26.000000000
+0200
+++ debiandoc-sgml-1.1.85/debian/changelog 2005-02-08 19:25:13.000000000
+0100
@@ -1,3 +1,25 @@
+debiandoc-sgml (1.1.85) unstable; urgency=high
+
+ * Added PS/PDF support for Japanese, Chinese and Korean based on fixlatex
+ script from Debian Reference (closes: Bug#202315, Bug#214249) (compare
+ #207810)
+ * Added support for Slovenian (closes: Bug#291481)
+ * Added option -s to debiandoc2latexdvi, debiandoc2latexps and
+ debiandoc2latexpdf to specify script for postprocessing generated
+ .tex file (closes: Bug#202317)
+ * Added gs to Recommends: since PDFs thumbnail generation depends on it,
+ also cjk-latex (for Chinese and Japanese PS/PDF), hlatex and
+ hlatex-fonts-base (required for Korean PS/PDF)
+ * Use $PAPERSIZE instead of $PAPERCONF to set paper size (closes: Bug#286537)
+ * Added a missing space in LaTeX output after "..." (closes: Bug#244625)
+ * Minor translation fix for German copyright string
+ * Use "ngerman" language option instead of "german" for using new German
+ orthography in LaTeX formats
+ * The urgency is set to high since various documentation packages will
+ need to be rebuild and such now that this bug is fixed
+
+ -- Ardo van Rangelrooij <[EMAIL PROTECTED]> Sun, 30 Jan 2005 14:20:00 +0100
+
debiandoc-sgml (1.1.84) unstable; urgency=high
* Format/Driver.pm: fixed erroneous enum list item counter increase
diff -Nru debiandoc-sgml-1.1.85.orig/debian/control
debiandoc-sgml-1.1.85/debian/control
--- debiandoc-sgml-1.1.85.orig/debian/control 2003-10-19 04:50:58.000000000
+0200
+++ debiandoc-sgml-1.1.85/debian/control 2005-02-08 22:34:18.000000000
+0100
@@ -10,7 +10,7 @@
Priority: optional
Architecture: all
Depends: ${perl:Depends}, libhtml-parser-perl, libi18n-langtags-perl,
libroman-perl, libsgmls-perl, libtext-format-perl, liburi-perl, sgml-data,
sgmlspl, sp, ${misc:Depends}
-Recommends: libpaperg, tetex-bin, tetex-extra, texinfo
+Recommends: libpaperg, tetex-bin, tetex-extra, texinfo, cjk-latex, hlatex,
gs-esp | gs
Suggests: debiandoc-sgml-doc
Description: DebianDoc SGML DTD and formatting tools
This is an SGML-based documentation formatting package used for the
diff -Nru debiandoc-sgml-1.1.85.orig/tools/bin/debiandoc2dvi
debiandoc-sgml-1.1.85/tools/bin/debiandoc2dvi
--- debiandoc-sgml-1.1.85.orig/tools/bin/debiandoc2dvi 2004-01-03
02:32:16.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/bin/debiandoc2dvi 2005-02-08
22:23:23.000000000 +0100
@@ -27,6 +27,7 @@
-O send output to stdout instead of <filename>.dvi
-b <basename> basename to be used
-c use content-negotiation
+ -s <script> apply script on generated .tex file
-d <declaration> SGML declaration to be used
-e <extension> extension to be used
-k keep intermediate files
@@ -50,6 +51,7 @@
## set default values
basename=''
content=''
+postprocessing=''
declaration=''
extension=''
keep=false
@@ -68,6 +70,7 @@
options="${options}O"
options="${options}b:"
options="${options}c"
+options="${options}s:"
options="${options}d:"
options="${options}e:"
options="${options}k"
@@ -81,12 +84,14 @@
in
h ) usage_message
;;
- O ) stdout=true;
+ O ) stdout=true
;;
b ) basename="-${opt} ${OPTARG}"
;;
c ) content="-${opt}"
;;
+ s ) postprocessing="-${opt} ${OPTARG}"
+ ;;
d ) declaration="-${opt} ${OPTARG}"
;;
e ) extension="-${opt} ${OPTARG}"
@@ -158,6 +163,7 @@
## what needs to be passed on to the backend
passing_on=''
passing_on="${passing_on} ${basename}"
+passing_on="${passing_on} ${postprocessing}"
passing_on="${passing_on} ${declaration}"
passing_on="${passing_on} ${keepopt}"
passing_on="${passing_on} ${locale}"
diff -Nru debiandoc-sgml-1.1.85.orig/tools/bin/debiandoc2latexdvi
debiandoc-sgml-1.1.85/tools/bin/debiandoc2latexdvi
--- debiandoc-sgml-1.1.85.orig/tools/bin/debiandoc2latexdvi 2004-01-03
02:32:16.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/bin/debiandoc2latexdvi 2005-02-08
07:02:17.000000000 +0100
@@ -27,6 +27,7 @@
-O send output to stdout instead of <filename>.dvi
-b <basename> basename to be used
-c use content-negotiation
+ -s <script> apply script on generated .tex file
-d <declaration> SGML declaration to be used
-e <extension> extension to be used
-k keep intermediate files
@@ -80,6 +81,7 @@
## set default values
basename=''
content=''
+postprocessing=''
declaration=''
extension=''
keep=false
@@ -96,6 +98,7 @@
options="${options}O"
options="${options}b:"
options="${options}c"
+options="${options}s:"
options="${options}d:"
options="${options}e:"
options="${options}k"
@@ -115,8 +118,10 @@
;;
c ) content="-${opt}"
;;
+ s ) postprocessing="${OPTARG}"
+ ;;
d ) declaration="-${opt} ${OPTARG}"
- ;;
+ ;;
e ) extension="-${opt} ${OPTARG}"
;;
k ) keep=true
@@ -126,8 +131,8 @@
;;
n ) nsgmls="-${opt} ${OPTARG} ${nsgmls}"
;;
- p ) PAPERCONF=${OPTARG}
- export PAPERCONF
+ p ) PAPERSIZE=${OPTARG}
+ export PAPERSIZE
;;
v ) verbose=true
;;
@@ -202,6 +207,10 @@
echo >&2 "${script}: ERROR: ${bsn}.tex could not be generated properly"
exit 1
fi
+if [ -n "${postprocessing}" ]
+then
+ "${postprocessing}" ${locale} ${bsn}.tex
+fi
if [ -e ${bsn}.dvi ] && ( [ -n "${content}" ] || [ -n "${extension}" ] )
then
echo >&2 "${script}: WARNING: overwriting ${bsn}.dvi"
diff -Nru debiandoc-sgml-1.1.85.orig/tools/bin/debiandoc2latexpdf
debiandoc-sgml-1.1.85/tools/bin/debiandoc2latexpdf
--- debiandoc-sgml-1.1.85.orig/tools/bin/debiandoc2latexpdf 2004-01-03
02:32:16.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/bin/debiandoc2latexpdf 2005-02-08
07:02:17.000000000 +0100
@@ -27,6 +27,7 @@
-O send output to stdout instead of <filename>.pdf
-b <basename> basename to be used
-c use content-negotiation
+ -s <script> apply script on generated .tex file
-d <declaration> SGML declaration to be used
-e <extension> extension to be used
-k keep intermediate files
@@ -50,7 +51,7 @@
## check for presence of pdflatex
if ! which pdflatex >/dev/null 2>&1
then
- echo >&2 "${script}: LaTeX documentation system not found"
+ echo >&2 "${script}: LaTeX typesetting system not found"
echo >&2 "${script}: please install the package 'tetex-bin'"
exit 2
fi
@@ -80,6 +81,7 @@
## set default values
basename=''
content=''
+postprocessing=''
declaration=''
extension=''
keep=false
@@ -96,6 +98,7 @@
options="${options}O"
options="${options}b:"
options="${options}c"
+options="${options}s:"
options="${options}d:"
options="${options}e:"
options="${options}k"
@@ -115,6 +118,8 @@
;;
c ) content="-${opt}"
;;
+ s ) postprocessing="${OPTARG}"
+ ;;
d ) declaration="-${opt} ${OPTARG}"
;;
e ) extension="-${opt} ${OPTARG}"
@@ -126,8 +131,8 @@
;;
n ) nsgmls="-${opt} ${OPTARG} ${nsgmls}"
;;
- p ) PAPERCONF=${OPTARG}
- export PAPERCONF
+ p ) PAPERSIZE=${OPTARG}
+ export PAPERSIZE
;;
v ) verbose=true
;;
@@ -202,6 +207,10 @@
echo >&2 "${script}: ERROR: ${bsn}.tex could not be generated properly"
exit 1
fi
+if [ -n "${postprocessing}" ]
+then
+ "${postprocessing}" ${locale} ${bsn}.tex
+fi
if [ -e ${bsn}.pdf ] && ( [ -n "${content}" ] || [ -n "${extension}" ] )
then
echo >&2 "${script}: WARNING: overwriting ${bsn}.pdf"
diff -Nru debiandoc-sgml-1.1.85.orig/tools/bin/debiandoc2latexps
debiandoc-sgml-1.1.85/tools/bin/debiandoc2latexps
--- debiandoc-sgml-1.1.85.orig/tools/bin/debiandoc2latexps 2004-01-03
02:32:16.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/bin/debiandoc2latexps 2005-02-08
07:02:17.000000000 +0100
@@ -27,6 +27,7 @@
-O send output to stdout instead of <filename>.ps
-b <basename> basename to be used
-c use content-negotiation
+ -s <script> apply script on generated .tex file
-d <declaration> SGML declaration to be used
-e <extension> extension to be used
-k keep intermediate files
@@ -50,7 +51,7 @@
## check for presence of latex and dvips
if ! which latex dvips >/dev/null 2>&1
then
- echo >&2 "${script}: LaTeX documentation system not found"
+ echo >&2 "${script}: LaTeX typesetting system not found"
echo >&2 "${script}: please install the package 'tetex-bin'"
exit 2
fi
@@ -80,6 +81,7 @@
## set default values
basename=''
content=''
+postprocessing=''
declaration=''
extension=''
keep=false
@@ -97,6 +99,7 @@
options="${options}O"
options="${options}b:"
options="${options}c"
+options="${options}s:"
options="${options}d:"
options="${options}e:"
options="${options}k"
@@ -116,6 +119,8 @@
;;
c ) content="-${opt}"
;;
+ s ) postprocessing="${OPTARG}"
+ ;;
d ) declaration="-${opt} ${OPTARG}"
;;
e ) extension="-${opt} ${OPTARG}"
@@ -127,9 +132,9 @@
;;
n ) nsgmls="-${opt} ${OPTARG} ${nsgmls}"
;;
- p ) PAPERCONF=${OPTARG}
- export PAPERCONF
- paperopt="-t ${PAPERCONF}"
+ p ) PAPERSIZE=${OPTARG}
+ export PAPERSIZE
+ paperopt="-t ${PAPERSIZE}"
;;
v ) verbose=true
;;
@@ -204,6 +209,10 @@
echo >&2 "${script}: ERROR: ${bsn}.tex could not be generated properly"
exit 1
fi
+if [ -n "${postprocessing}" ]
+then
+ "${postprocessing}" ${locale} ${bsn}.tex
+fi
if [ -e ${bsn}.dvi ]
then
echo >&2 "${script}: WARNING: overwriting ${bsn}.dvi"
diff -Nru debiandoc-sgml-1.1.85.orig/tools/bin/debiandoc2pdf
debiandoc-sgml-1.1.85/tools/bin/debiandoc2pdf
--- debiandoc-sgml-1.1.85.orig/tools/bin/debiandoc2pdf 2004-01-03
02:32:16.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/bin/debiandoc2pdf 2005-02-08
20:19:45.000000000 +0100
@@ -27,6 +27,7 @@
-O send output to stdout instead of <filename>.pdf
-b <basename> basename to be used
-c use content-negotiation
+ -s <script> apply script on generated .tex file
-d <declaration> SGML declaration to be used
-e <extension> extension to be used
-k keep intermediate files
@@ -50,6 +51,7 @@
## set default values
basename=''
content=''
+postprocessing=''
declaration=''
extension=''
keep=false
@@ -68,6 +70,7 @@
options="${options}O"
options="${options}b:"
options="${options}c"
+options="${options}s:"
options="${options}d:"
options="${options}e:"
options="${options}k"
@@ -81,12 +84,14 @@
in
h ) usage_message
;;
- O ) stdout=true;
+ O ) stdout=true
;;
b ) basename="-${opt} ${OPTARG}"
;;
c ) content="-${opt}"
;;
+ s ) postprocessing="-${opt} ${OPTARG}"
+ ;;
d ) declaration="-${opt} ${OPTARG}"
;;
e ) extension="-${opt} ${OPTARG}"
@@ -158,6 +163,7 @@
## what needs to be passed on to the backend
passing_on=''
passing_on="${passing_on} ${basename}"
+passing_on="${passing_on} ${postprocessing}"
passing_on="${passing_on} ${declaration}"
passing_on="${passing_on} ${keepopt}"
passing_on="${passing_on} ${locale}"
diff -Nru debiandoc-sgml-1.1.85.orig/tools/bin/debiandoc2ps
debiandoc-sgml-1.1.85/tools/bin/debiandoc2ps
--- debiandoc-sgml-1.1.85.orig/tools/bin/debiandoc2ps 2004-01-03
02:32:16.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/bin/debiandoc2ps 2005-02-08
20:20:00.000000000 +0100
@@ -27,6 +27,7 @@
-O send output to stdout instead of <filename>.ps
-b <basename> basename to be used
-c use content-negotiation
+ -s <script> apply script on generated .tex file
-d <declaration> SGML declaration to be used
-e <extension> extension to be used
-k keep intermediate files
@@ -51,6 +52,7 @@
## set default values
basename=''
content=''
+postprocessing=''
declaration=''
extension=''
keep=false
@@ -70,6 +72,7 @@
options="${options}O"
options="${options}b:"
options="${options}c"
+options="${options}s:"
options="${options}d:"
options="${options}e:"
options="${options}k"
@@ -90,6 +93,8 @@
;;
c ) content="-${opt}"
;;
+ s ) postprocessing="-${opt} ${OPTARG}"
+ ;;
d ) declaration="-${opt} ${OPTARG}"
;;
e ) extension="-${opt} ${OPTARG}"
@@ -163,6 +168,7 @@
## what needs to be passed on to the backend
passing_on=''
passing_on="${passing_on} ${basename}"
+passing_on="${passing_on} ${postprocessing}"
passing_on="${passing_on} ${declaration}"
passing_on="${passing_on} ${keepopt}"
passing_on="${passing_on} ${locale}"
diff -Nru debiandoc-sgml-1.1.85.orig/tools/bin/fixlatex
debiandoc-sgml-1.1.85/tools/bin/fixlatex
--- debiandoc-sgml-1.1.85.orig/tools/bin/fixlatex 1970-01-01
01:00:00.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/bin/fixlatex 2005-02-08 07:02:19.000000000
+0100
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# Perform some obscure postprocessing to obtain valid LaTeX code.
+# If you know a better way (such as using babel or integration into
+# Driver.pm or LaTeX.pm) let it me know.
+# Maybe the subroutine _cdata in LaTeX.pm is a good place, but we don't
+# want to call bg5conv for each little string, right?
+# Jens Seidel
+
+locale=en
+
+while getopts ":l:" opt
+do
+ case ${opt}
+ in
+ l) locale=${OPTARG};;
+ \? ) echo "unknown option \`${OPTARG}'"; exit -1;;
+ esac
+done
+shift $((${OPTIND} - 1))
+
+case "$locale"
+in
+("zh_TW")
+ tmp=$(mktemp)
+ perl -p \
+-e 's/([\x80-\xff])\\textbackslash\{\}/$1\\/g;' \
+-e 's/([\x80-\xff])\\textasciitilde\{\}/$1\~/g;' \
+-e 's/([\x80-\xff])\\textasciicircum\{\}/$1\^/g;' \
+-e 's/([\x80-\xff])\\\}/$1\}/g;' \
+-e 's/([\x80-\xff])\\\{/$1\{/g;' \
+-e 's/([\x80-\xff])\\\_/$1_/g;' > "$tmp"
+ bg5conv < "$tmp"
+ rm "$tmp"
+ ;;
+(*)
+ cat
+esac
+
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Format/LaTeX.pm
debiandoc-sgml-1.1.85/tools/lib/Format/LaTeX.pm
--- debiandoc-sgml-1.1.85.orig/tools/lib/Format/LaTeX.pm 2004-04-27
03:09:18.000000000 +0200
+++ debiandoc-sgml-1.1.85/tools/lib/Format/LaTeX.pm 2005-02-08
07:02:19.000000000 +0100
@@ -65,19 +65,21 @@
## ----------------------------------------------------------------------
sub _output_start_book
{
- output( "\\documentclass[11pt,$locale{ 'babel' }]{book}\n" );
+ output( "\\documentclass[11pt" );
+ output( ",$locale{ 'babel' }" )
+ if (length( $locale{ 'babel' } ));
+ output( "]{book}\n" );
output( "\n" );
- output( "\\usepackage[$locale{ 'inputenc' }]{inputenc}\n" )
+ output( "\\usepackage[$locale{ 'inputenc' }]{inputenc}\n\n" )
if length( $locale{ 'inputenc' } );
- output( "\n" );
output( "\\usepackage[T1]{fontenc}\n" );
output( "\n" );
output( "\\usepackage{pifont}\n" );
output( "\\usepackage{textcomp}\n" );
output( "\\usepackage{wasysym}\n" );
output( "\n" );
- output( "\\usepackage{babel}\n" );
- output( "\n" );
+ output( "\\usepackage{babel}\n\n" )
+ if length( $locale{ 'babel' } );
output( "\\usepackage{helvet}\n" );
output( "\\usepackage{palatino}\n" );
output( "\n" );
@@ -123,7 +125,10 @@
output( "\\ifx\\pdfoutput\\undefined\n" );
output( "\\usepackage[hypertex,colorlinks=true]{hyperref}\n" );
output( "\\else\n" );
- output( "\\usepackage[pdftex,colorlinks=true]{hyperref}\n" );
+ output( "\\usepackage[pdftex,colorlinks=true" );
+ output( ",$locale{ 'pdfhyperref' }" )
+ if (length( $locale{ 'pdfhyperref' } ));
+ output( "]{hyperref}\n" );
output( "\\fi\n" );
output( "\n" );
output( "\\parindent=0pt\n" );
@@ -134,11 +139,14 @@
output( "\n" );
output( "\\sloppy\n" );
output( "\n" );
+ output( "$locale{ 'before begin document' }\n" );
output( "\\begin{document}\n" );
+ output( "$locale{ 'after begin document' }\n" );
}
sub _output_end_book
{
output( "\n" );
+ output( "$locale{ 'before end document' }\n" );
output( "\\end{document}\n");
output( "\n" );
}
@@ -632,7 +640,7 @@
}
# dots should be ellipsis "..."
- s/\.\.\./\\dots /g;
+ s/\.\.\./\\dots{}/g;
}
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Locale/Alias.pm
debiandoc-sgml-1.1.85/tools/lib/Locale/Alias.pm
--- debiandoc-sgml-1.1.85.orig/tools/lib/Locale/Alias.pm 2004-01-03
05:46:48.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Locale/Alias.pm 2005-02-08
07:02:19.000000000 +0100
@@ -134,6 +134,10 @@
'sk_SK' => 'sk_SK.ISO8859-2',
'sk_SK.ISO8859-2' => 'sk_SK.ISO8859-2',
+ 'sl' => 'sl_SI.ISO8859-2',
+ 'sl_SI' => 'sl_SI.ISO8859-2',
+ 'sl_SI.ISO8859-2' => 'sl_SI.ISO8859-2',
+
'tr' => 'tr_TR.ISO8859-9',
'tr_TR' => 'tr_TR.ISO8859-9',
'tr_TR.ISO8859-9' => 'tr_TR.ISO8859-9',
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Locale/de_DE.ISO8859-1/HTML
debiandoc-sgml-1.1.85/tools/lib/Locale/de_DE.ISO8859-1/HTML
--- debiandoc-sgml-1.1.85.orig/tools/lib/Locale/de_DE.ISO8859-1/HTML
2002-12-29 06:35:07.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Locale/de_DE.ISO8859-1/HTML 2005-02-08
07:02:19.000000000 +0100
@@ -7,7 +7,7 @@
%locale = (
'charset' => 'iso-8859-1',
'abstract' => 'Zusammenfassung',
- 'copyright notice' => 'Copyright Hinweis',
+ 'copyright notice' => 'Copyright-Hinweis',
'contents' => 'Inhalt',
'chapter' => sub { return "Kapitel $_[0]" },
'appendix' => sub { return "Anhang $_[0]" },
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Locale/de_DE.ISO8859-1/LaTeX
debiandoc-sgml-1.1.85/tools/lib/Locale/de_DE.ISO8859-1/LaTeX
--- debiandoc-sgml-1.1.85.orig/tools/lib/Locale/de_DE.ISO8859-1/LaTeX
2002-12-29 06:35:07.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Locale/de_DE.ISO8859-1/LaTeX
2005-02-08 07:02:19.000000000 +0100
@@ -5,10 +5,10 @@
## ----------------------------------------------------------------------
%locale = (
- 'babel' => 'german',
+ 'babel' => 'ngerman',
'inputenc' => 'latin1',
'abstract' => 'Zusammenfassung',
- 'copyright notice' => 'Copyright Hinweis',
+ 'copyright notice' => 'Copyright-Hinweis',
);
## ----------------------------------------------------------------------
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Locale/de_DE.ISO8859-1/Text
debiandoc-sgml-1.1.85/tools/lib/Locale/de_DE.ISO8859-1/Text
--- debiandoc-sgml-1.1.85.orig/tools/lib/Locale/de_DE.ISO8859-1/Text
2002-12-29 06:35:07.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Locale/de_DE.ISO8859-1/Text 2005-02-08
07:02:19.000000000 +0100
@@ -6,7 +6,7 @@
## ----------------------------------------------------------------------
%locale = (
'abstract' => 'Zusammenfassung',
- 'copyright notice' => 'Copyright Hinweis',
+ 'copyright notice' => 'Copyright-Hinweis',
'contents' => 'Inhalt',
'chapter' => sub { return "Kapitel $_[0]" },
'appendix' => sub { return "Anhang $_[0]" },
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Locale/de_DE.ISO8859-1/TextOV
debiandoc-sgml-1.1.85/tools/lib/Locale/de_DE.ISO8859-1/TextOV
--- debiandoc-sgml-1.1.85.orig/tools/lib/Locale/de_DE.ISO8859-1/TextOV
2002-12-29 06:35:07.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Locale/de_DE.ISO8859-1/TextOV
2005-02-08 07:02:19.000000000 +0100
@@ -6,7 +6,7 @@
## ----------------------------------------------------------------------
%locale = (
'abstract' => 'Zusammenfassung',
- 'copyright notice' => 'Copyright Hinweis',
+ 'copyright notice' => 'Copyright-Hinweis',
'contents' => 'Inhalt',
'chapter' => sub { return "Kapitel $_[0]" },
'appendix' => sub { return "Anhang $_[0]" },
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Locale/de_DE.ISO8859-15/HTML
debiandoc-sgml-1.1.85/tools/lib/Locale/de_DE.ISO8859-15/HTML
--- debiandoc-sgml-1.1.85.orig/tools/lib/Locale/de_DE.ISO8859-15/HTML
2004-01-03 02:04:21.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Locale/de_DE.ISO8859-15/HTML
2005-02-08 07:02:19.000000000 +0100
@@ -7,7 +7,7 @@
%locale = (
'charset' => 'iso-8859-15',
'abstract' => 'Zusammenfassung',
- 'copyright notice' => 'Copyright Hinweis',
+ 'copyright notice' => 'Copyright-Hinweis',
'contents' => 'Inhalt',
'chapter' => sub { return "Kapitel $_[0]" },
'appendix' => sub { return "Anhang $_[0]" },
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Locale/de_DE.ISO8859-15/LaTeX
debiandoc-sgml-1.1.85/tools/lib/Locale/de_DE.ISO8859-15/LaTeX
--- debiandoc-sgml-1.1.85.orig/tools/lib/Locale/de_DE.ISO8859-15/LaTeX
2004-01-03 02:04:21.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Locale/de_DE.ISO8859-15/LaTeX
2005-02-08 07:02:19.000000000 +0100
@@ -5,10 +5,10 @@
## ----------------------------------------------------------------------
%locale = (
- 'babel' => 'german',
+ 'babel' => 'ngerman',
'inputenc' => 'latin9',
'abstract' => 'Zusammenfassung',
- 'copyright notice' => 'Copyright Hinweis',
+ 'copyright notice' => 'Copyright-Hinweis',
);
## ----------------------------------------------------------------------
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Locale/de_DE.ISO8859-15/Text
debiandoc-sgml-1.1.85/tools/lib/Locale/de_DE.ISO8859-15/Text
--- debiandoc-sgml-1.1.85.orig/tools/lib/Locale/de_DE.ISO8859-15/Text
2004-01-03 02:04:22.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Locale/de_DE.ISO8859-15/Text
2005-02-08 07:02:19.000000000 +0100
@@ -6,7 +6,7 @@
## ----------------------------------------------------------------------
%locale = (
'abstract' => 'Zusammenfassung',
- 'copyright notice' => 'Copyright Hinweis',
+ 'copyright notice' => 'Copyright-Hinweis',
'contents' => 'Inhalt',
'chapter' => sub { return "Kapitel $_[0]" },
'appendix' => sub { return "Anhang $_[0]" },
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Locale/de_DE.ISO8859-15/TextOV
debiandoc-sgml-1.1.85/tools/lib/Locale/de_DE.ISO8859-15/TextOV
--- debiandoc-sgml-1.1.85.orig/tools/lib/Locale/de_DE.ISO8859-15/TextOV
2004-01-03 02:04:22.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Locale/de_DE.ISO8859-15/TextOV
2005-02-08 07:02:19.000000000 +0100
@@ -6,7 +6,7 @@
## ----------------------------------------------------------------------
%locale = (
'abstract' => 'Zusammenfassung',
- 'copyright notice' => 'Copyright Hinweis',
+ 'copyright notice' => 'Copyright-Hinweis',
'contents' => 'Inhalt',
'chapter' => sub { return "Kapitel $_[0]" },
'appendix' => sub { return "Anhang $_[0]" },
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Locale/ja_JP.eucJP/LaTeX
debiandoc-sgml-1.1.85/tools/lib/Locale/ja_JP.eucJP/LaTeX
--- debiandoc-sgml-1.1.85.orig/tools/lib/Locale/ja_JP.eucJP/LaTeX
2002-12-29 06:35:08.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Locale/ja_JP.eucJP/LaTeX 2005-02-08
07:02:19.000000000 +0100
@@ -5,10 +5,37 @@
## ----------------------------------------------------------------------
%locale = (
- 'babel' => 'japanese',
+ 'babel' => '',
'inputenc' => '',
'abstract' => '����',
'copyright notice' => '���ɽ��',
+ 'pdfhyperref' => 'CJKbookmarks',
+ 'before begin document' => '\\usepackage{CJK}',
+ 'after begin document' => '\\begin{CJK}{JIS}{song}
+\\renewcommand{\\vpageref}[1]{on page \\pageref{#1}}
+\\def\\prefacename{��}
+\\def\\refname{ʸ ��}
+\\def\\abstractname{�� ��}
+\\def\\bibname{����ʸ��}
+\\def\\chaptername{��}
+\\def\\appendixname{�� Ͽ}
+\\def\\contentsname{�� ��}
+\\def\\listfigurename{�� �� ��}
+\\def\\listtablename{ɽ �� ��}
+\\def\\indexname{�� ��}
+\\def\\figurename{��}
+\\def\\tablename{ɽ}
+\\def\\partname{��}
+\\def\\enclname{encl}
+\\def\\ccname{cc}
+\\def\\headtoname{��}
+\\def\\pagename{��}
+\\def\\seename{����}
+\\def\\alsoname{����}
+\\def\\proofname{����}
+\\def\\glossaryname{�Ѹ콸}',
+ 'before end document' => '\\clearpage
+\\end{CJK}'
);
## ----------------------------------------------------------------------
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Locale/ko_KR.eucKR/LaTeX
debiandoc-sgml-1.1.85/tools/lib/Locale/ko_KR.eucKR/LaTeX
--- debiandoc-sgml-1.1.85.orig/tools/lib/Locale/ko_KR.eucKR/LaTeX
2002-12-29 06:35:08.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Locale/ko_KR.eucKR/LaTeX 2005-02-08
07:02:19.000000000 +0100
@@ -5,10 +5,12 @@
## ----------------------------------------------------------------------
%locale = (
- 'babel' => 'korean',
- 'inputenc' => 'euc-kr',
+ 'babel' => '',
+ 'inputenc' => '',
'abstract' => '���',
'copyright notice' => '���۱�',
+ 'pdfhyperref' => 'CJKbookmarks',
+ 'before begin document' => '\\usepackage{hfont}'
);
## ----------------------------------------------------------------------
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Locale/sl_SI.ISO8859-2/HTML
debiandoc-sgml-1.1.85/tools/lib/Locale/sl_SI.ISO8859-2/HTML
--- debiandoc-sgml-1.1.85.orig/tools/lib/Locale/sl_SI.ISO8859-2/HTML
1970-01-01 01:00:00.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Locale/sl_SI.ISO8859-2/HTML 2005-02-08
07:02:19.000000000 +0100
@@ -0,0 +1,25 @@
+## -*- perl -*-
+## ----------------------------------------------------------------------
+## Locale/sl_SI.ISO8859-2/HTML: locale for Slovenian output in HTML format
+## ----------------------------------------------------------------------
+
+## ----------------------------------------------------------------------
+%locale = (
+ 'charset' => 'iso-8859-2',
+ 'abstract' => 'Povzetek',
+ 'copyright notice' => 'Opomba o avtorskih pravicah',
+ 'contents' => 'Vsebina',
+ 'chapter' => sub { return "Poglavje $_[0]" },
+ 'appendix' => sub { return "Dodatek $_[0]" },
+ 'section' => sub { return "Odsek $_[0]" },
+ 'subsection' => sub { return "Odsek $_[0]" },
+ 'subsubsection' => sub { return "Odsek $_[0]" },
+ 'paragraph' => sub { return "Odsek $_[0]" },
+ 'subparagraph' => sub { return "Odsek $_[0]" },
+ 'footnotes' => 'Nožne opombe',
+ 'comments' => 'Komentarji',
+ 'next' => 'naprej',
+ 'previous' => 'nazaj',
+ );
+
+## ----------------------------------------------------------------------
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Locale/sl_SI.ISO8859-2/LaTeX
debiandoc-sgml-1.1.85/tools/lib/Locale/sl_SI.ISO8859-2/LaTeX
--- debiandoc-sgml-1.1.85.orig/tools/lib/Locale/sl_SI.ISO8859-2/LaTeX
1970-01-01 01:00:00.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Locale/sl_SI.ISO8859-2/LaTeX
2005-02-08 07:02:19.000000000 +0100
@@ -0,0 +1,14 @@
+## -*- perl -*-
+## ----------------------------------------------------------------------
+## Locale/sl_SI.ISO8859-2/LaTeX2e: locale for Slovenian output in LaTeX2e
format
+## ----------------------------------------------------------------------
+
+## ----------------------------------------------------------------------
+%locale = (
+ 'babel' => 'slovene',
+ 'inputenc' => 'latin2',
+ 'abstract' => 'Povzetek',
+ 'copyright notice' => 'Opomba o avtorskih pravicah',
+ );
+
+## ----------------------------------------------------------------------
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Locale/sl_SI.ISO8859-2/Texinfo
debiandoc-sgml-1.1.85/tools/lib/Locale/sl_SI.ISO8859-2/Texinfo
--- debiandoc-sgml-1.1.85.orig/tools/lib/Locale/sl_SI.ISO8859-2/Texinfo
1970-01-01 01:00:00.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Locale/sl_SI.ISO8859-2/Texinfo
2005-02-08 07:02:19.000000000 +0100
@@ -0,0 +1,18 @@
+## -*- perl -*-
+## ----------------------------------------------------------------------
+## Locale/en_US.ISO8859-2/Texinfo: locale for Slovenian output in Texinfo
format
+## ----------------------------------------------------------------------
+
+## ----------------------------------------------------------------------
+%locale = (
+ 'detailed' => 'Podrobni izpis vozli�č',
+ 'chapter' => sub { return "Poglavje $_[0]" },
+ 'appendix' => sub { return "Dodatek $_[0]" },
+ 'section' => sub { return "Odsek $_[0]" },
+ 'subsection' => sub { return "Odsek $_[0]" },
+ 'subsubsection' => sub { return "Odsek $_[0]" },
+ 'paragraph' => sub { return "Odsek $_[0]" },
+ 'subparagraph' => sub { return "Odsek $_[0]" },
+ );
+
+## ----------------------------------------------------------------------
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Locale/sl_SI.ISO8859-2/Text
debiandoc-sgml-1.1.85/tools/lib/Locale/sl_SI.ISO8859-2/Text
--- debiandoc-sgml-1.1.85.orig/tools/lib/Locale/sl_SI.ISO8859-2/Text
1970-01-01 01:00:00.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Locale/sl_SI.ISO8859-2/Text 2005-02-08
07:02:19.000000000 +0100
@@ -0,0 +1,20 @@
+## -*- perl -*-
+## ----------------------------------------------------------------------
+## Locale/sl_SI.ISO8859-2/Text: locale for Slovenian output in plain text
format
+## ----------------------------------------------------------------------
+
+## ----------------------------------------------------------------------
+%locale = (
+ 'abstract' => 'Povzetek',
+ 'copyright notice' => 'Opomba o avtorskih pravicah',
+ 'contents' => 'Vsebina',
+ 'chapter' => sub { return "Poglavje $_[0]" },
+ 'appendix' => sub { return "Dodatek $_[0]" },
+ 'section' => sub { return "Odsek $_[0]" },
+ 'subsection' => sub { return "Odsek $_[0]" },
+ 'subsubsection' => sub { return "Odsek $_[0]" },
+ 'paragraph' => sub { return "Odsek $_[0]" },
+ 'subparagraph' => sub { return "Odsek $_[0]" },
+ );
+
+## ----------------------------------------------------------------------
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Locale/sl_SI.ISO8859-2/TextOV
debiandoc-sgml-1.1.85/tools/lib/Locale/sl_SI.ISO8859-2/TextOV
--- debiandoc-sgml-1.1.85.orig/tools/lib/Locale/sl_SI.ISO8859-2/TextOV
1970-01-01 01:00:00.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Locale/sl_SI.ISO8859-2/TextOV
2005-02-08 07:02:19.000000000 +0100
@@ -0,0 +1,20 @@
+## -*- perl -*-
+## ----------------------------------------------------------------------
+## Locale/sl_SI.ISO8859-2/TextOV: locale for Slovenian output in overstrike
text format
+## ----------------------------------------------------------------------
+
+## ----------------------------------------------------------------------
+%locale = (
+ 'abstract' => 'Povzetek',
+ 'copyright notice' => 'Opomba o avtorskih pravicah',
+ 'contents' => 'Vsebina',
+ 'chapter' => sub { return "Poglavje $_[0]" },
+ 'appendix' => sub { return "Dodatek $_[0]" },
+ 'section' => sub { return "Odsek $_[0]" },
+ 'subsection' => sub { return "Odsek $_[0]" },
+ 'subsubsection' => sub { return "Odsek $_[0]" },
+ 'paragraph' => sub { return "Odsek $_[0]" },
+ 'subparagraph' => sub { return "Odsek $_[0]" },
+ );
+
+## ----------------------------------------------------------------------
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Locale/zh_CN.GB2312/LaTeX
debiandoc-sgml-1.1.85/tools/lib/Locale/zh_CN.GB2312/LaTeX
--- debiandoc-sgml-1.1.85.orig/tools/lib/Locale/zh_CN.GB2312/LaTeX
2002-12-29 06:35:08.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Locale/zh_CN.GB2312/LaTeX 2005-02-08
07:02:19.000000000 +0100
@@ -5,10 +5,15 @@
## ----------------------------------------------------------------------
%locale = (
- 'babel' => 'chinese',
- 'inputenc' => 'gb2312',
+ 'babel' => '',
+ 'inputenc' => '',
'abstract' => 'ժҪ',
'copyright notice' => '��Ȩ����',
+ 'pdfhyperref' => 'CJKbookmarks',
+ 'before begin document' => '\\usepackage{CJK}',
+ 'after begin document' => '\\begin{CJK}{GB}{kai}',
+ 'before end document' => '\\clearpage
+\\end{CJK}'
);
## ----------------------------------------------------------------------
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Locale/zh_TW.Big5/LaTeX
debiandoc-sgml-1.1.85/tools/lib/Locale/zh_TW.Big5/LaTeX
--- debiandoc-sgml-1.1.85.orig/tools/lib/Locale/zh_TW.Big5/LaTeX
2002-12-29 06:35:08.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Locale/zh_TW.Big5/LaTeX 2005-02-08
07:02:19.000000000 +0100
@@ -5,10 +5,16 @@
## ----------------------------------------------------------------------
%locale = (
- 'babel' => 'chinese',
- 'inputenc' => 'big5',
+ 'babel' => '',
+ 'inputenc' => '',
'abstract' => '�K�n',
'copyright notice' => '���v�n��',
+ 'pdfhyperref' => 'CJKbookmarks',
+ 'before begin document' => '\\usepackage{CJK}',
+ 'after begin document' => '\\begin{CJK}{Bg5}{kai}
+\\renewcommand{\\vpageref}[1]{\(�� \\pageref{#1} ��\)}',
+ 'before end document' => '\\clearpage
+\\end{CJK}'
);
## ----------------------------------------------------------------------
diff -Nru debiandoc-sgml-1.1.85.orig/tools/lib/Map/LaTeX.pm
debiandoc-sgml-1.1.85/tools/lib/Map/LaTeX.pm
--- debiandoc-sgml-1.1.85.orig/tools/lib/Map/LaTeX.pm 2004-01-02
23:02:26.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/lib/Map/LaTeX.pm 2005-02-08
07:02:19.000000000 +0100
@@ -41,7 +41,7 @@
"[AElig ]" => "\\AE{}",
"[ccedil]" => "\\c{c}",
"[Ccedil]" => "\\c{C}",
- "[eth ]" => "[eth]",
+ "[eth ]" => "[eth]", # \\eth{} (AMS)???
"[ETH ]" => "[ETH]",
"[eacute]" => "\\'{e}",
"[Eacute]" => "\\'{E}",
diff -Nru debiandoc-sgml-1.1.85.orig/tools/man/debiandoc-sgml.1
debiandoc-sgml-1.1.85/tools/man/debiandoc-sgml.1
--- debiandoc-sgml-1.1.85.orig/tools/man/debiandoc-sgml.1 2004-01-05
03:02:18.000000000 +0100
+++ debiandoc-sgml-1.1.85/tools/man/debiandoc-sgml.1 2005-02-08
20:11:15.000000000 +0100
@@ -43,18 +43,21 @@
.br
.B debiandoc2latexdvi
.I "[-O]"
+.I "[-s\ script]"
.I "[-p\ papersize]"
.I "[-v]"
.I "[shared options]"
.br
.B debiandoc2latexpdf
.I "[-O]"
+.I "[-s\ script]"
.I "[-p\ papersize]"
.I "[-v]"
.I "[shared options]"
.br
.B debiandoc2latexps
.I "[-O]"
+.I "[-s\ script]"
.I "[-p\ papersize]"
.I "[-v]"
.I "[shared options]"
@@ -85,6 +88,10 @@
.I "[-O]"
.I "[-m]"
.I "[shared options]"
+.br
+.B fixlatex
+.I "[-l locale]"
+.IB basename .tex
.\"
.\" ----------------------------------------------------------------------
.SH "DESCRIPTION"
@@ -303,6 +310,15 @@
.BI -m
Put the comments in footnote style in the output.
.TP
+.BI -s \ script
+Apply the specified script on the generated
+.B .tex
+file. The script is called with parameters
+.I [ -l \ locale ]
+.IB basename .tex\fR
+This may be useful to support new features, to correct bogus hyphenations, ...
+If you are not sure what to use as \fIscript\fR, use \fBfixlatex\fR.
+.TP
.BI -p \ papersize
Produce output in the indicated
.IR papersize .
