Index: auctex/doc/preview-dtxdoc.pl
diff -u auctex/doc/preview-dtxdoc.pl:1.1 auctex/doc/preview-dtxdoc.pl:1.2
--- auctex/doc/preview-dtxdoc.pl:1.1 Wed Jun 8 07:12:40 2005
+++ auctex/doc/preview-dtxdoc.pl Wed Jun 8 17:04:40 2005
@@ -13,6 +13,11 @@
last MUNGE if /^% *.section/;
}
+# Fish out possible CR characters.
+/(\r*)$/;
+$cr = $1;
+
+
# Noindent is used sometimes after \end{quote} (see below)
$noindent="";
# Quote environments is translated into @example _without_
@@ -34,22 +39,22 @@
s/~/[EMAIL PROTECTED] }/g;
s/^ *//;
# Environments
- if (s/\\begin\{quote\}/[EMAIL PROTECTED]/) {
+ if (s/\\begin\{quote\}/[EMAIL PROTECTED]/) {
$quote="yes" }
if (/^\w/) {
print $noindent }
$noindent = "";
- if (s/\\end\{quote\}/[EMAIL PROTECTED] example\n/) {
+ if (s/\\end\{quote\}/[EMAIL PROTECTED] example$cr\n/) {
$quote="";
- $noindent="[EMAIL PROTECTED]" }
- s/\\begin\{description\}/[EMAIL PROTECTED] [EMAIL PROTECTED]/;
+ $noindent="[EMAIL PROTECTED]" }
+ s/\\begin\{description\}/[EMAIL PROTECTED] [EMAIL PROTECTED]/;
# Convoluted pattern: handle
# \item[|...|], \item[\meta{..}] and \item[{|[]|}]
- s/\\item\[\{?(.+?[\|\}])\}?\] ?/[EMAIL PROTECTED] $1\n/;
- s/\\end\{description\}/[EMAIL PROTECTED] table\n/;
- s/\\begin\{enumerate\}/[EMAIL PROTECTED]/;
+ s/\\item\[\{?(.+?[\|\}])\}?\] ?/[EMAIL PROTECTED] $1$cr\n/;
+ s/\\end\{description\}/[EMAIL PROTECTED] table$cr\n/;
+ s/\\begin\{enumerate\}/[EMAIL PROTECTED]/;
s/\\item /[EMAIL PROTECTED] /;
- s/\\end\{enumerate\}/[EMAIL PROTECTED] enumerate\n/;
+ s/\\end\{enumerate\}/[EMAIL PROTECTED] enumerate$cr\n/;
# Formatting (\cmd is special within {quote})
s/\\texttt/[EMAIL PROTECTED]/g;
@@ -60,12 +65,12 @@
s/\\cmd\{(.*?)\}/|$1|/g;
s/\\oarg\{([^}]+?)\}/[EMAIL PROTECTED]/g;
s/\\char.//g;
- s/\\raggedright\n//g;
- s/\\DescribeEnv\{(.*?)\} /[EMAIL PROTECTED] [EMAIL PROTECTED]@[EMAIL
PROTECTED]@[EMAIL PROTECTED]/;
- if (s/\\DescribeMacro\{(.*?)\}( |\n)/[EMAIL PROTECTED] $1\n/) {
+ s/\\raggedright$cr\n//g;
+ s/\\DescribeEnv\{(.*?)\} /[EMAIL PROTECTED] [EMAIL PROTECTED]@[EMAIL
PROTECTED]@[EMAIL PROTECTED]/;
+ if (s/\\DescribeMacro\{(.*?)\}( |$cr\n)/[EMAIL PROTECTED] $1$cr\n/) {
# Index entries for two important macros
- if (/(\\Preview(Macro|Environment))( |\n)/) {
- $_ .= "[EMAIL PROTECTED] $1\n";
+ if (/(\\Preview(Macro|Environment))( |$cr\n)/) {
+ $_ .= "[EMAIL PROTECTED] $1$cr\n";
}
}
@@ -99,23 +104,22 @@
# Texinfo @node-ification
if (s/\\section\{(.*)\}/[EMAIL PROTECTED] $1/) {
if (s/[Oo]ptions/options/) {
- $_="[EMAIL PROTECTED]
-* Package options::
-* Provided commands::
[EMAIL PROTECTED] menu
-
[EMAIL PROTECTED] Package options, Provided commands, The LaTeX style file, The
LaTeX style file\n" . $_;
+ $_="[EMAIL PROTECTED]" .
+"* Package options::$cr\n" .
+"* Provided commands::$cr\n" .
+"[EMAIL PROTECTED] menu$cr\n$cr\n" .
+"[EMAIL PROTECTED] Package options, Provided commands, The LaTeX style file,
The LaTeX style file$cr\n" . $_;
} elsif (s/[Cc]ommands/commands/) {
# \Describe... needs @table
- $_= "[EMAIL PROTECTED] Provided commands, ,Package options, The
LaTeX style file\n" .
- $_ . "[EMAIL PROTECTED] [EMAIL PROTECTED]";
+ $_= "[EMAIL PROTECTED] Provided commands, ,Package options, The
LaTeX style file$cr\n" .
+ $_ . "[EMAIL PROTECTED] [EMAIL PROTECTED]";
}
}
# Stop here
# \Describe.... needs @end table
if (/^.StopEventually/) {
- print "[EMAIL PROTECTED] table\n";
+ print "[EMAIL PROTECTED] table$cr\n";
last MAIN;
}
print $_;
_______________________________________________
auctex-diffs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/auctex-diffs
