[xml/sgml-commit] [SCM] linuxdoc-tools package for Debian. branch, experimental, updated. debian/0.9.60-19-g3179a56
Agustin Martin Domingo
agmartin at debian.org
Mon May 4 20:02:08 UTC 2009
The following commit has been merged in the experimental branch:
commit 23b097ed1c61060ad1f9c4e736a5e4d2b9fb1f19
Author: Agustin Martin Domingo <agmartin at debian.org>
Date: Mon May 4 01:17:55 2009 +0200
Merge tr mapping file in main one for latex2e backend.
* latex2e/{mapping,tr-mapping}
- Include tr-mapping functionality into mapping.
- Remove no longer needed latex2e/tr-mapping.
* perl5lib/LinuxDocTools.pm:
- Do not use tr-mapping for latex2e backend.
- Set $global{'dtd'} to current DTD.
* fmt_latex2e.pl: Replace @LINUXDOC_DTD@ by actual DTD.
* Update Copyright notices.
diff --git a/lib/fmt/fmt_latex2e.pl b/lib/fmt/fmt_latex2e.pl
index bb2a21e..050cf06 100644
--- a/lib/fmt/fmt_latex2e.pl
+++ b/lib/fmt/fmt_latex2e.pl
@@ -4,7 +4,11 @@
# ------------------------------------------------------------------
# LaTeX-specific driver stuff
#
+# Copyright © 1994-1996, Matt Welsh
# Copyright © 1996, Cees de Groot
+# Copyright © 1999-2002, Taketoshi Sano
+# Copyright © 1999, Kazuyuki Okamoto (euc-jp support in sgml2txt, sgml2html, and sgml2latex)
+# Copyright © 1999, Tetsu ONO (euc-jp support in sgml2txt, sgml2html, and sgml2latex)
# Copyright © 2000, Juan Jose Amor (Support for PDF files)
# Copyright © 2006-2009, Agustin Martin
# ------------------------------------------------------------------
@@ -362,6 +366,11 @@ $latex2e->{postASP} = sub
s/\@CLASSOPTIONS\@/$classoptions/;
$_ = $_ . "\\makeindex\n" if ($latex2e->{makeindex});
}
+ # Set correct DTD name
+ elsif (/^\\usepackage{\@LINUXDOC_DTD\@-sgml}/) {
+ my $dtd = $global->{"dtd"};
+ s/\@LINUXDOC_DTD\@/$dtd/;
+ }
# Set correct babel options
elsif (/^\\usepackage\[\@BABELOPTIONS\@\]{babel}/) {
if ( $babeloptions ) {
diff --git a/lib/mappings/latex2e/mapping b/lib/mappings/latex2e/mapping
index d50e006..9000ab0 100644
--- a/lib/mappings/latex2e/mapping
+++ b/lib/mappings/latex2e/mapping
@@ -1,14 +1,38 @@
-
-% linuxdoc to latex replacement file
-
-% Support for PDF files added by Juan Jose Amor, January 2000
-
-<qwertz> +
+% linuxdoc{,tr} to latex replacement file
+%
+% This file contains the replacements for both linuxdoc and linuxdoctr DTDs
+%
+% Copyright © 1994-1996, Matt Welsh
+% Copyright © 1996-1998, Cees de Groot
+% Copyright © 1999-2002, Taketoshi Sano
+% Copyright © 2000, Juan Jose Amor (Support for PDF files)
+% Copyright © 2006-2009, Agustin Martin
+% ------------------------------------------------------------------------
+
+% ------------------------------------------------------------------------
+% linuxdoc specific things (currently nothing)
+% ------------------------------------------------------------------------
+
+% ------------------------------------------------------------------------
+% linuxdoctr specific things
+% ------------------------------------------------------------------------
+
+<trans> + "\\trans{"
+</trans> "}" +
+
+<tdate> + "\\tdate{"
+</tdate> "}" +
+
+% ------------------------------------------------------------------------
+% Everything common to linuxdoc and linuxdoctr DTDs
+% ------------------------------------------------------------------------
+
+<qwertz> +
</qwertz> +
<article> + "\\documentclass\[@CLASSOPTIONS@\]{@ARTICLE@}\n"
"\\usepackage{ifpdf}\n"
- "\\usepackage{linuxdoc-sgml}\n"
+ "\\usepackage{@LINUXDOC_DTD at -sgml}\n"
"\\usepackage{qwertz}\n"
"\\usepackage{url}\n"
"\\usepackage\[@CHARSET@\]{inputenc}\n"
@@ -26,7 +50,7 @@
<report> + "\\documentclass\[@CLASSOPTIONS@\]{@REPORT@}\n"
"\\usepackage{ifpdf}\n"
- "\\usepackage{linuxdoc-sgml}\n"
+ "\\usepackage{@LINUXDOC_DTD at -sgml}\n"
"\\usepackage{qwertz}\n"
"\\usepackage{url}\n"
"\\usepackage\[@CHARSET@\]{inputenc}\n"
@@ -45,7 +69,7 @@
<book> + "\\documentclass\[@CLASSOPTIONS@\]{@BOOK@}\n"
"\\usepackage{ifpdf}\n"
- "\\usepackage{linuxdoc-sgml}\n"
+ "\\usepackage{@LINUXDOC_DTD at -sgml}\n"
"\\usepackage{qwertz}\n"
"\\usepackage{url}\n"
"\\usepackage\[@CHARSET@\]{inputenc}\n"
@@ -65,7 +89,7 @@
<notes> + "\\documentclass\[@CLASSOPTIONS@\]{@ARTICLE@}\n"
"\\usepackage{ifpdf}\n"
- "\\usepackage{linuxdoc-sgml}\n"
+ "\\usepackage{@LINUXDOC_DTD at -sgml}\n"
"\\usepackage{qwertz}\n"
"\\usepackage{url}\n"
"\\usepackage\[@CHARSET@\]{inputenc}\n"
@@ -76,13 +100,13 @@
"\\usepackage{epsfig}\n"
"\\usepackage{[OPTS]}\n"
"\\def\\title#1{\n"
- "\\begin{center}\n"
- "\\bf\n"
+ "\\begin{center}\n"
+ "\\bf\n"
"#1\n"
"\\end{center}\n"
- "\\bigskip\n"
+ "\\bigskip\n"
"}\n"
- "\\begin{document}%end-preamble\n"
+ "\\begin{document}%end-preamble\n"
</notes> + "\\end{document}" +
@@ -91,7 +115,7 @@
</dina4>
% Manual Pages are expected to be formatted using nroff (or groff), unless
-% they are included as sections of other qwertz documents.
+% they are included as sections of other qwertz documents.
<manpage>
</manpage>
@@ -100,17 +124,17 @@
</titlepag> + "\n\n\\begin{document}\n"
"\\maketitle\n" +
-<title> + "\\title{"
+<title> + "\\title{"
</title> "}" +
<subtitle> "\\\\\n"
"{\\large "
</subtitle> "}" +
-<author> + "\\author{"
+<author> + "\\author{"
</author> "}" +
-<name>
+<name>
</name>
% <and> "\\and " +
@@ -128,14 +152,14 @@
<date> + "\\date{"
</date> "}" +
-<newline> "\\\\ "
+<newline> "\\\\ "
</newline>
<label> "\\label{[ID]}"
-</label>
+</label>
<header> + "\\markboth"
-</header>
+</header>
<lhead> "{"
</lhead> "}"
@@ -150,7 +174,7 @@
</comment> "}"
% Hacked by mdw to use linuxdoc-sgml \abstract{...}
-<abstract> + "\\abstract{"
+<abstract> + "\\abstract{"
</abstract> "}" +
<appendix> + "\n \\appendix \n" +
@@ -178,15 +202,15 @@
</sect2>
<sect3> + "\n\\paragraph"
-</sect3>
+</sect3>
<sect4> + "\n\\subparagraph"
</sect4>
<heading> "{"
-</heading> "}\n\n"
+</heading> "}\n\n"
-<p>
+<p>
</p> "\n\n"
<itemize> + "\\begin{itemize}" +
@@ -284,16 +308,16 @@
"\\fi{}\n"
</htmlurl>
-<x>
+<x>
</x>
-<mc>
+<mc>
</mc>
<biblio> + "\\bibliographystyle{[STYLE]}\n"
"\\bibliography{[FILES]}\n"
"\\addbibtoc{}" +
-</biblio>
+</biblio>
% <macro> + "\\macro{[ID]}{\\qw[ID]}"
% </macro>
@@ -343,19 +367,19 @@
<thtag> "\["
</thtag> "\]" +
-% mathematics
+% mathematics
<f> "$"
</f> "$"
-<dm> + "\\\["
+<dm> + "\\\["
</dm> "\\\]" +
<eq> + "\\begin{equation}" +
</eq> + "\\end{equation}\n" +
<fr> "\\frac"
-</fr>
+</fr>
<nu> "{"
</nu> "}"
@@ -363,7 +387,7 @@
<de> "{"
</de> "}"
-<lim>
+<lim>
</lim>
<op>
@@ -385,7 +409,7 @@
</in>
<sum> "\\sum"
-</sum>
+</sum>
<root> "\\sqrt\[[n]\]{"
</root> "}"
@@ -437,15 +461,15 @@
"\\else\n"
"\\centerline{\\epsfig{file=[FILE],height=[HEIGHT],angle=[ANGLE]}}"
"\\fi\n" +
-</eps>
+</eps>
<img> + "\\ifpdf\n"
"\\centerline{\\epsfig{file=[SRC]}}"
"\\fi\n" +
-</img>
+</img>
<ph> + "\\vspace{[VSPACE]}\n\\par" +
-</ph>
+</ph>
<caption> + "\\caption{"
</caption> "}" +
@@ -472,18 +496,18 @@
% slides
<slides> + "\\documentclass\[qwertz,dina4,xlatin1,[OPTS]\]{article}\n"
- "\\input{epsf.tex}\n"
+ "\\input{epsf.tex}\n"
"\\def\\title#1{\n"
- "\\begin{center}\n"
- "\\bf\\LARGE\n"
+ "\\begin{center}\n"
+ "\\bf\\LARGE\n"
"#1\n"
"\\end{center}\n"
- "\\bigskip\n"
+ "\\bigskip\n"
"}\n"
"\\begin{document}" +
</slides> + "\\end{document}" +
-<slide>
+<slide>
</slide> + "\\newpage" +
% letters
@@ -500,13 +524,13 @@
"\\addtolength{\\evensidemargin}{-4.0mm} \n"
"\\setlength{\\unitlength}{ 1.0mm } \n"
- % initial values for optional elements in the
+ % initial values for optional elements in the
% letter head
"\\def\\semail{} \n"
"\\def\\remail{} \n"
"\\def\\sphone{} \n"
- "\\def\\rphone{} \n"
+ "\\def\\rphone{} \n"
"\\def\\sref{} \n"
"\\def\\rref{} \n"
"\\def\\rdate{} \n"
@@ -529,7 +553,7 @@
"\\newif\\iffax\n"
"\\faxfalse\n"
-
+
"\\def\\letterhead{\n"
"\\begin{picture}(178,54) \n"
"\\put(0,50){\\agb GESELLSCHAFT F\\\"{U}R MATHEMATIK UND \n"
@@ -590,7 +614,7 @@
<telefax> + "\\documentstyle\[[OPTS],qwertz,dina4,xlatin1\]{article}\n"
"\\def\\faxlength{[LENGTH]}\n"
- % initial values for optional elements in the
+ % initial values for optional elements in the
% letter head
"\\def\\semail{} \n"
@@ -618,7 +642,7 @@
"\\newif\\iffax\n"
"\\faxtrue\n"
-
+
"\\def\\letterhead{\n"
"\\newfont{\\gmd}{gmdlogo}\n"
"\\setlength{\\parindent}{0pt}\n"
@@ -738,20 +762,20 @@
"\\parbox\[t\]{\\textwidth} "
"{"
</closing> + "}\\vspace{2cm}\n\\par\n"
- "\\sname \n"
- "\\ifcc{\\vspace{0.5cm}\n\\par\n"
+ "\\sname \n"
+ "\\ifcc{\\vspace{0.5cm}\n\\par\n"
"cc:\\ \\ \\parbox\[t\]{14cm}{\n"
"\\cc}\\fi\n" +
-
+
<cc> + "\\cctrue\n"
"\\def\\cc{"
</cc> "}" +
-<encl> + "\\vspace{0.5cm}\n\\par\n"
+<encl> + "\\vspace{0.5cm}\n\\par\n"
"encl:\\ \\ \\parbox\[t\]{14cm}{"
</encl> "}\n\n" +
-<ps> + "\\vspace{0.5cm}\n\\par" +
+<ps> + "\\vspace{0.5cm}\n\\par" +
</ps>
diff --git a/lib/mappings/latex2e/tr-mapping b/lib/mappings/latex2e/tr-mapping
deleted file mode 100644
index d793d4f..0000000
--- a/lib/mappings/latex2e/tr-mapping
+++ /dev/null
@@ -1,765 +0,0 @@
-
-% linuxdoctr to latex replacement file
-
-% Support for PDF files added by Juan Jose Amor, January 2000
-
-<qwertz> +
-</qwertz> +
-
-<article> + "\\documentclass\[@CLASSOPTIONS@\]{@ARTICLE@}\n"
- "\\usepackage{ifpdf}\n"
- "\\usepackage{linuxdoctr-sgml}\n"
- "\\usepackage{qwertz}\n"
- "\\usepackage{url}\n"
- "\\usepackage\[@CHARSET@\]{inputenc}\n"
- "\\usepackage\[T1\]{fontenc}\n"
- "\\usepackage\[colorlinks=true,urlcolor=blue,linkcolor=blue\]{hyperref}\n"
- "\\ifpdf\\pdfcompresslevel=9\\fi\n"
- "\\usepackage\[@BABELOPTIONS@\]{babel}\n"
- "\\usepackage{epsfig}\n"
- "\\usepackage{[OPTS]}\n"
- "\\def\\addbibtoc{\n"
- "\\addcontentsline{toc}{section}{\\numberline{\\mbox{}}\\relax\\bibname}\n"
- "}%end-preamble\n" +
-
-</article> + "\\end{document}" +
-
-<report> + "\\documentclass\[@CLASSOPTIONS@\]{@REPORT@}\n"
- "\\usepackage{ifpdf}\n"
- "\\usepackage{linuxdoctr-sgml}\n"
- "\\usepackage{qwertz}\n"
- "\\usepackage{url}\n"
- "\\usepackage\[@CHARSET@\]{inputenc}\n"
- "\\usepackage\[T1\]{fontenc}\n"
- "\\usepackage\[colorlinks=true,urlcolor=blue,linkcolor=blue\]{hyperref}\n"
- "\\ifpdf\\pdfcompresslevel=9\\fi\n"
- "\\usepackage\[@BABELOPTIONS@\]{babel}\n"
- "\\usepackage{epsfig}\n"
- "\\usepackage{[OPTS]}\n"
- "\\def\\addbibtoc{\n"
- "\\addcontentsline{toc}{chapter}{\\numberline{\\mbox{}}\\relax\\bibname}\n"
- "}\n"
- "\\pagestyle{headings}%end-preamble\n" +
-
-</report> + "\\end{document}" +
-
-<book> + "\\documentclass\[@CLASSOPTIONS@\]{@BOOK@}\n"
- "\\usepackage{ifpdf}\n"
- "\\usepackage{linuxdoctr-sgml}\n"
- "\\usepackage{qwertz}\n"
- "\\usepackage{url}\n"
- "\\usepackage\[@CHARSET@\]{inputenc}\n"
- "\\usepackage\[T1\]{fontenc}\n"
- "\\usepackage\[colorlinks=true,urlcolor=blue,linkcolor=blue\]{hyperref}\n"
- "\\ifpdf\\pdfcompresslevel=9\\fi\n"
- "\\usepackage\[@BABELOPTIONS@\]{babel}\n"
- "\\usepackage{epsfig}\n"
- "\\usepackage{[OPTS]}\n"
- "\\def\\addbibtoc{\n"
- "\\addcontentsline{toc}{chapter}{\\numberline{\\mbox{}}\\relax\\bibname}\n"
- "}\n"
- "\\pagestyle{headings}%end-preamble\n" +
-
-</book> + "\\end{document}" +
-
-
-<notes> + "\\documentclass\[@CLASSOPTIONS@\]{@ARTICLE@}\n"
- "\\usepackage{ifpdf}\n"
- "\\usepackage{linuxdoctr-sgml}\n"
- "\\usepackage{qwertz}\n"
- "\\usepackage{url}\n"
- "\\usepackage\[@CHARSET@\]{inputenc}\n"
- "\\usepackage\[T1\]{fontenc}\n"
- "\\usepackage\[colorlinks=true,urlcolor=blue,linkcolor=blue\]{hyperref}\n"
- "\\ifpdf\\pdfcompresslevel=9\\fi\n"
- "\\usepackage\[@BABELOPTIONS@\]{babel}\n"
- "\\usepackage{epsfig}\n"
- "\\usepackage{[OPTS]}\n"
- "\\def\\title#1{\n"
- "\\begin{center}\n"
- "\\bf\n"
- "#1\n"
- "\\end{center}\n"
- "\\bigskip\n"
- "}\n"
- "\\begin{document}%end-preamble\n"
-
-</notes> + "\\end{document}" +
-
-
-<dina4> + ""
-</dina4>
-
-% Manual Pages are expected to be formatted using nroff (or groff), unless
-% they are included as sections of other qwertz documents.
-
-<manpage>
-</manpage>
-
-<titlepag>
-</titlepag> + "\n\n\\begin{document}\n"
- "\\maketitle\n" +
-
-<title> + "\\title{"
-</title> "}" +
-
-<subtitle> "\\\\\n"
- "{\\large "
-</subtitle> "}" +
-
-<author> + "\\author{"
-</author> "}" +
-
-<name>
-</name>
-
-% <and> "\\and " +
-% </and>
-
-<and> +
-</and>
-
-<thanks> "\\thanks{"
-</thanks> "}"
-
-<inst> " \\\\\n\\\\" +
-</inst>
-
-<date> + "\\date{"
-</date> "}" +
-
-<trans> + "\\trans{"
-</trans> "}" +
-
-<tdate> + "\\tdate{"
-</tdate> "}" +
-
-<newline> "\\\\ "
-</newline>
-
-<label> "\\label{[ID]}"
-</label>
-
-<header> + "\\markboth"
-</header>
-
-<lhead> "{"
-</lhead> "}"
-
-<rhead> "{"
-</rhead> "}" +
-
-% <comment> + "\n\n\\begin{verbatim}" +
-% </comment> + "\\end{verbatim}\n\n" +
-
-<comment> "{\\tt "
-</comment> "}"
-
-% Hacked by mdw to use linuxdoc-sgml \abstract{...}
-<abstract> + "\\abstract{"
-</abstract> "}" +
-
-<appendix> + "\n \\appendix \n" +
-</appendix>
-
-<toc> + "\\tableofcontents" +
-</toc>
-
-<lof> + "\\listoffigures" +
-</lof>
-
-<lot> + "\\listoftables" +
-</lot>
-
-<chapt> + "\n\\chapter"
-</chapt>
-
-<sect> + "\n\\section"
-</sect>
-
-<sect1> + "\n\\subsection"
-</sect1>
-
-<sect2> + "\n\\subsubsection"
-</sect2>
-
-<sect3> + "\n\\paragraph"
-</sect3>
-
-<sect4> + "\n\\subparagraph"
-</sect4>
-
-<heading> "{"
-</heading> "}\n\n"
-
-<p>
-</p> "\n\n"
-
-<itemize> + "\\begin{itemize}" +
-</itemize> + "\\end{itemize}" +
-
-<enum> + "\\begin{enumerate}" +
-</enum> + "\\end{enumerate}" +
-
-<list> + "\\begin{list}{}{}\n" +
-</list> + "\\end{list}" +
-
-<descrip> + "\\begin{description}" +
-</descrip> + "\\end{description}" +
-
-<item> + "\\item "
-</item>
-
-<tag> + "\\item\["
-</tag> "\] \\mbox{}\n\n"
-
-<cite> "\\cite{[ID]"
-</cite> "}"
-
-<ncite> "\\cite\[[NOTE]\]{[ID]"
-</ncite> "}"
-
-<idx> "\\idx{"
-</idx> "}"
-
-<cdx> "\\cdx{"
-</cdx> "}"
-
-<nidx> "\\nidx{"
-</nidx> "}"
-
-<ncdx> "\\ncdx{"
-</ncdx> "}"
-
-% The idea here is to automatically insert soft hyphens after every slash in
-% the filename, so long filenames will break naturally. The url{} macro is
-% a kluge but it works,
-<file> "\\url{"
-</file> "}"
-
-<footnote> "\\footnote{"
-</footnote> "}"
-
-<sq> "``"
-</sq> "''"
-
-<lq> + "\\begin{quotation}\n" +
-</lq> + "\n\\end{quotation}\n\n" +
-
-<em> "{\\itshape "
-</em> "\\/}"
-
-<bf> "{\\bfseries "
-</bf> "}"
-
-<it> "{\\itshape "
-</it> "\\/}"
-
-<sf> "{\\sffamily "
-</sf> "}"
-
-<sl> "{\\slshape "
-</sl> "}"
-
-<rm> "{\\rmfamily "
-</rm> "}"
-
-<tt> "{\\ttfamily "
-</tt> "}"
-
-% Added by mdw
-<cparam> "\\cparam{"
-</cparam> "}"
-
-<ref> "\\ref{[ID]} {([NAME])}"
-</ref>
-
-<pageref> "\\pageref{[ID]}"
-</pageref>
-
-%url added by HG
-<url> "\n\\nameurl{[URL]}{[NAME]}\n"
-</url>
-
-% <htmlurl> "\\onlynameurl{[NAME]}"
-% <htmlurl> "\\href{[URL]}{[NAME]}"
-<htmlurl> "\\ifpdf\n"
- "\\href{[URL]}{[NAME]}%\n"
- "\\else\n"
- "\\onlynameurl{[NAME]}%\n"
- "\\fi{}\n"
-</htmlurl>
-
-<x>
-</x>
-
-<mc>
-</mc>
-
-<biblio> + "\\bibliographystyle{[STYLE]}\n"
- "\\bibliography{[FILES]}\n"
- "\\addbibtoc{}" +
-</biblio>
-
-% <macro> + "\\macro{[ID]}{\\qw[ID]}"
-% </macro>
-
-% <main> + "\\macro{qwmain}{\\qwmain}"
-% </main>
-
-<code> + "\\par\n"
- "\\addvspace{\\medskipamount}\n"
- "\\nopagebreak\\hrule\n"
- "\\begin{verbatim}" +
-
-</code> + "\\end{verbatim} \n"
- "\\nopagebreak\\hrule \n"
- "\\addvspace{\\medskipamount}" +
-
-<verb> + "\\begin{verbatim}" +
-</verb> + "\\end{verbatim}" +
-
-% tscreen added by mdw
-<tscreen> + "\\begin{tscreen}" +
-</tscreen> + "\\end{tscreen}" +
-
-<quote> + "\\begin{quotation}" +
-</quote> + "\\end{quotation}" +
-
-% theorems and such
-
-<def> + "\\begin{definition}"
-</def> + "\\end{definition}\n\n" +
-
-<prop> + "\\begin{proposition}" +
-</prop> + "\\end{proposition}" +
-
-<lemma> + "\\begin{lemma}"
-</lemma> + "\\end{lemma}\n\n" +
-
-<coroll> + "\\begin{corollary}"
-</coroll> + "\\end{corollary}\n\n" +
-
-<proof> + "\n{\\noindent{\\bf Proof.} " +
-</proof> + "}"
-
-<theorem> + "\\begin{theorem}"
-</theorem> + "\\end{theorem}\n\n" +
-
-<thtag> "\["
-</thtag> "\]" +
-
-% mathematics
-
-<f> "$"
-</f> "$"
-
-<dm> + "\\\["
-</dm> "\\\]" +
-
-<eq> + "\\begin{equation}" +
-</eq> + "\\end{equation}\n" +
-
-<fr> "\\frac"
-</fr>
-
-<nu> "{"
-</nu> "}"
-
-<de> "{"
-</de> "}"
-
-<lim>
-</lim>
-
-<op>
-</op>
-
-<ll> "_{"
-</ll> "}"
-
-<ul> "^{"
-</ul> "}"
-
-<opd>
-</opd>
-
-<pr> "\\prod"
-</pr>
-
-<in> "\\int"
-</in>
-
-<sum> "\\sum"
-</sum>
-
-<root> "\\sqrt\[[n]\]{"
-</root> "}"
-
-<ar> + "\\begin{array}{[ca]}" +
-</ar> + "\\end{array}" +
-
-<arr> " \\\\ " +
-</arr>
-
-<arc> " & "
-</arc>
-
-
-<sup> "^{"
-</sup> "}"
-
-<inf> "_{"
-</inf> "}"
-
-<unl> "\\underline{"
-</unl> "}"
-
-<ovl> "\\overline{"
-</ovl> "}"
-
-<rf> "\\mbox{\\tt "
-</rf> "}"
-
-<v> "\\vec{"
-</v> "}"
-
-<fi> "{\\cal "
-</fi> "}"
-
-<phr> "{\\rm "
-</phr> "}"
-
-<tu> "\\\\ \n"
-</tu>
-
-% figures
-
-<figure> + "\\begin{figure}\[[LOC]\]" +
-</figure> + "\\end{figure}\n" +
-
-<eps> + "\\ifpdf\n"
- "\n"
- "\\else\n"
- "\\centerline{\\epsfig{file=[FILE],height=[HEIGHT],angle=[ANGLE]}}"
- "\\fi\n" +
-</eps>
-
-<img> + "\\ifpdf\n"
- "\\centerline{\\epsfig{file=[SRC]}}"
- "\\fi\n" +
-</img>
-
-<ph> + "\\vspace{[VSPACE]}\n\\par" +
-</ph>
-
-<caption> + "\\caption{"
-</caption> "}" +
-
-% tables
-
-<table> + "\\begin{table}\[[LOC]\]" +
-</table> + "\\end{table}" +
-
-<tabular> + "\\begin{center}\n"
- "\\begin{tabular}{[ca]}" +
-</tabular> + "\\end{tabular}\n"
- "\\end{center}" +
-
-<rowsep> "\\\\ " +
-</rowsep>
-
-<colsep> "& "
-</colsep>
-
-<hline> + "\\hline" +
-</hline>
-
-% slides
-
-<slides> + "\\documentclass\[qwertz,dina4,xlatin1,[OPTS]\]{article}\n"
- "\\input{epsf.tex}\n"
- "\\def\\title#1{\n"
- "\\begin{center}\n"
- "\\bf\\LARGE\n"
- "#1\n"
- "\\end{center}\n"
- "\\bigskip\n"
- "}\n"
- "\\begin{document}" +
-</slides> + "\\end{document}" +
-
-<slide>
-</slide> + "\\newpage" +
-
-% letters
-
-
-<letter> + "\\documentstyle\[qwertz,dina4,xlatin1,[OPTS]\]{letter}\n"
- "\\input{epsf.tex} \n"
- "\\newfont{\\gmd}{gmdlogo} \n"
- "\\font\\agb=pagk at 13truept\n"
- "\\font\\helv=phvr at 7.4truept\n"
- "\\parindent 0pt \n"
- "\\parskip 5pt plus 1pt minus 2pt \n"
- "\\addtolength{\\oddsidemargin}{-4.0mm} \n"
- "\\addtolength{\\evensidemargin}{-4.0mm} \n"
- "\\setlength{\\unitlength}{ 1.0mm } \n"
-
- % initial values for optional elements in the
- % letter head
-
- "\\def\\semail{} \n"
- "\\def\\remail{} \n"
- "\\def\\sphone{} \n"
- "\\def\\rphone{} \n"
- "\\def\\sref{} \n"
- "\\def\\rref{} \n"
- "\\def\\rdate{} \n"
- "\\def\\subj{} \n"
-
- % switch for distinguishing between context of
- % sender and receiver's address
-
- "\\newif\\ifsender \n"
- "\\newif\\ifsubj \n"
- "\\subjfalse \n" % assume no subject
-
- "\\newif\\ifcc \n" % for cc field
- "\\ccfalse \n"
-
- "\\newif\\ifsaddress\n"
- "\\saddressfalse\n"
- "\\newif\\ifraddress\n"
- "\\raddressfalse\n"
-
- "\\newif\\iffax\n"
- "\\faxfalse\n"
-
-"\\def\\letterhead{\n"
-"\\begin{picture}(178,54) \n"
-"\\put(0,50){\\agb GESELLSCHAFT F\\\"{U}R MATHEMATIK UND \n"
-"DATENVERARBEITUNG MBH } \n"
-
-"\\put(147,50){\\gmd g} \n "
-
-"\\put(0,40){\\helv GMD, Postfach 1316, Schlo{\\ss} Birlinghoven, \n "
-"D-53757 Sankt Augustin 1} \n "
-
-"\\put(97,40){\\parbox\[b\]{10cm} \n"
-"{\\helv\\raggedright \n"
-"\\baselineskip=9pt plus 2pt \n"
-"Telefon (0 22 41) 14-0 \\\\ \n"
-"Telefax (0 22 41) 14 26 18, -28 89}}\n"
-
-"\\put(0,210){\\makebox(0,0)\[bl\]{\\today}} \n "
-
-% letter specific information
-
-% from
-
-% name and e-mail
-
-"\\put(0,44){\\sname\\ \\semail} \n"
-
-% phone
-
-"\\put(128,44){-\\sphone} \n"
-
-% To, name and address
-
-"\\put(0,30){\\parbox\[t\]{9.5cm} \n"
-"{\\rname \\\\\n"
-"\\ifraddress\\raddress\\fi}}\n"
-
-% subject
-
-"\\ifsubj{\\put(0,0){\\subj}}\\fi\n"
-
-% sref
-
-% "\\put(70,15){\\sref} \n"
-
-% rref
-
-% "\\put(0,15){\\rref} \n"
-
-% rdate
-
-% "\\put(32,15){\\rdate} \n"
-
-"\\end{picture} \n"
-"}\n" % end of letterhead definition
-
-</letter> + "\\end{document}" +
-
-<telefax> + "\\documentstyle\[[OPTS],qwertz,dina4,xlatin1\]{article}\n"
- "\\def\\faxlength{[LENGTH]}\n"
-
- % initial values for optional elements in the
- % letter head
-
- "\\def\\semail{} \n"
- "\\def\\remail{} \n"
- "\\def\\sphone{} \n"
- "\\def\\rphone{} \n"
- "\\def\\rfax{} \n"
- "\\def\\sfax{} \n"
- "\\def\\subj{} \n"
-
- % switch for distinguishing between context of
- % sender and receiver's address
-
- "\\newif\\ifsender \n"
- "\\newif\\ifsubj \n"
- "\\subjfalse \n" % assume no subject
-
- "\\newif\\ifcc \n" % for cc field
- "\\ccfalse \n"
-
- "\\newif\\ifsaddress\n"
- "\\saddressfalse\n"
- "\\newif\\ifraddress\n"
- "\\raddressfalse\n"
-
- "\\newif\\iffax\n"
- "\\faxtrue\n"
-
-"\\def\\letterhead{\n"
-"\\newfont{\\gmd}{gmdlogo}\n"
-"\\setlength{\\parindent}{0pt}\n"
-
-"\\parbox\[b\]{\\textwidth}{Gesellschaft f\\\"{u}r\n"
-"Mathematik und Datenverarbeitung mbH \\\\\n"
-"Schlo{\\ss} Birlinghoven \\\\\n"
-"D-53757 St.~Augustin \\\\\n"
-"Telefax: +49--2241--142618, "
-"+49--2241--142889}\\makebox\[0pt\]\[r\]{\\gmd e}\n"
-
-"\\begin{center}\n"
-"~ \\\\\n"
-"\\LARGE TELEFAX\n"
-"\\\\ ~\n"
-"\\end{center}\n"
-
-"\\framebox\[\\textwidth\]{\\parbox{0.9\\textwidth}\%\n"
-"{\n"
-"Von/From: \\sname\n"
-"\\\\\n"
-"Datum/Date: \\today\n"
-"}}\n"
-
-"\\framebox\[\\textwidth\]{\\parbox{0.9\\textwidth}\%\n"
-"{\n"
-"An/To: \\rname\n"
-"\\\\\n"
-"Telefax: \\rfax\n"
-"\\\\\n"
-"Firma/Company: \\raddress\n"
-"}}\n"
-
-"\\framebox\[\\textwidth\]{\\parbox{0.9\\textwidth}\%\n"
-"{\n"
-"Anzahl der gesendeten Seiten (inkl. dieses Deckblatts)/ \\\\\n"
-"Number of pages (including this cover sheet): \\faxlength\n"
-"}}\n"
-
-"\\framebox\[\\textwidth\]{\\parbox{0.9\\textwidth}\%\n"
-"{\\setlength{\\parskip}{0.5\\baselineskip}\n"
-"Bemerkungen/Comments: \\\\\n"
-"\\subj\n"
-"\\vspace{60pt}}}\n"
-"}\n" % end of letterhead definition for fax messages
-
-</telefax> + "\\end{document}" +
-
-<opening> + "\\begin{document}\n"
- "\\pagestyle{empty}\n"
- "\\letterhead\n"
-
-"\\iffax\\newpage\n"
-"\\else{\\ifsubj\\vspace{0.5cm}\\fi}\n"
-"\\fi\n\\par" +
-
-</opening> + "\n\n\\vspace{0.6cm}\n\\par" +
-
-
-<from> + "\\sendertrue\n"
- "\\def\\sname{"
-</from> "}" +
-
-
-<to> + "\\senderfalse\n"
- "\\def\\rname{"
-</to> "}" +
-
-% first end definition of name
-
-<address> "\\def\\address{"
-</address> "}\n"
- "\\ifsender{\\global\\saddresstrue\n"
- "\\global\\def\\saddress{\\address}}\n"
- "\\else{\\global\\raddresstrue\n"
- "\\global\\def\\raddress{\\address}}\n"
- "\\fi" +
-
-<email> + "\\def\\email{"
-</email> "}\n"
- "\\ifsender\\edef\\semail{(\\email)} \n"
- " \\else\\edef\\remail{\\email} \n"
- "\\fi" +
-
-<phone> + "\\def\\phone{"
-</phone> "}\n"
- "\\ifsender\\edef\\sphone{\\phone} \n"
- " \\else\\edef\\rphone{\\phone} \n"
- "\\fi" +
-
-
-<fax> + "\\def\\fax{"
-</fax> "}\n"
- "\\ifsender\\edef\\sfax{\\fax} \n"
- "\\else{\\global\\edef\\rfax{\\fax}\n"
- "\\newwrite\\faxnum\n"
- "\\immediate\\openout\\faxnum=.fax=num\n"
- "\\immediate\\write\\faxnum{\\rfax}\n"
- "\\immediate\\closeout\\faxnum}\n"
- "\\fi" +
-
-<subject> + "\\subjtrue\n"
- "\\def\\subj{"
-</subject> "}" +
-
-
-<sref> + "\\newcommand{\\sref}{"
-</sref> "}" +
-
-<rref> + "\\newcommand{\\rref}{"
-</rref> "}" +
-
-<rdate> + "\\def\\rdate}{"
-</rdate> "}" +
-
-<closing> + "\\vspace{1cm} \n\\par\n"
- "\\parbox\[t\]{\\textwidth} "
- "{"
-</closing> + "}\\vspace{2cm}\n\\par\n"
- "\\sname \n"
- "\\ifcc{\\vspace{0.5cm}\n\\par\n"
- "cc:\\ \\ \\parbox\[t\]{14cm}{\n"
- "\\cc}\\fi\n" +
-
-<cc> + "\\cctrue\n"
- "\\def\\cc{"
-</cc> "}" +
-
-<encl> + "\\vspace{0.5cm}\n\\par\n"
- "encl:\\ \\ \\parbox\[t\]{14cm}{"
-</encl> "}\n\n" +
-
-<ps> + "\\vspace{0.5cm}\n\\par" +
-</ps>
-
-
-% end of latex replacement file
-
diff --git a/perl5lib/LinuxDocTools.pm b/perl5lib/LinuxDocTools.pm
index 94c2e5a..c3077ff 100644
--- a/perl5lib/LinuxDocTools.pm
+++ b/perl5lib/LinuxDocTools.pm
@@ -7,7 +7,7 @@
#
# Copyright © 1996, Cees de Groot.
# Copyright © 2000, Taketoshi Sano
-# Copyright © 2006-2008, Agustin Martin
+# Copyright © 2006-2009, Agustin Martin
# --------------------------------------------------------------------------------
package LinuxDocTools;
@@ -589,6 +589,8 @@ sub process_file {
$dtd = $dtd2;
}
+ $global->{'dtd'} = $dtd;
+
# Search order:
# - datadir/site/<dtd>/<format>
# - datadir/dist/<dtd>/<format>
@@ -618,7 +620,7 @@ sub process_file {
}
}
- if ($global->{format} eq "groff" or $global->{format} eq "latex2e"){
+ if ($global->{format} eq "groff"){
if ($dtd eq "linuxdoctr") {
$mapping = "$main::DataDir/mappings/$global->{format}/tr-mapping";
}
--
linuxdoc-tools package for Debian.
More information about the debian-xml-sgml-commit
mailing list