From d3c982b1bd9b57f9c14205d7eee92599cf630283 Mon Sep 17 00:00:00 2001 From: Micah Cowan Date: Thu, 27 Sep 2007 18:53:59 -0700 Subject: [PATCH] Bring texi2pod.pl up-to-date with gcc's. BUT: keep GPLv3 invocation, and "use warning" rather than -w. --- doc/texi2pod.pl | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl index 0b57d1b9..daad3f6d 100755 --- a/doc/texi2pod.pl +++ b/doc/texi2pod.pl @@ -204,9 +204,9 @@ while(<$inf>) { # Now the ones that have to be replaced by special escapes # (which will be turned back into text by unmunge()) s/&/&/g; - s/\@\@/&at;/g; s/\@\{/{/g; s/\@\}/}/g; + s/\@\@/&at;/g; # Inside a verbatim block, handle @var specially. if ($shift ne "") { @@ -227,11 +227,12 @@ while(<$inf>) { /^\@include\s+(.+)$/ and do { push @instack, $inf; $inf = gensym(); + $file = postprocess($1); # Try cwd and $ibase. - open($inf, "<" . $1) - or open($inf, "<" . $ibase . "/" . $1) - or die "cannot open $1 or $ibase/$1: $!\n"; + open($inf, "<" . $file) + or open($inf, "<" . $ibase . "/" . $file) + or die "cannot open $file or $ibase/$file: $!\n"; next; }; @@ -274,7 +275,6 @@ while(<$inf>) { $ic =~ s/\@(?:code|kbd)/C/; $ic =~ s/\@(?:dfn|var|emph|cite|i)/I/; $ic =~ s/\@(?:file)/F/; - $ic =~ s/\@(?:asis)/S/; # punt $_ = "\n=over 4\n"; }; @@ -308,7 +308,7 @@ die "No filename or title\n" unless defined $fn && defined $tl; $sects{NAME} = "$fn \- $tl\n"; $sects{FOOTNOTES} .= "=back\n" if exists $sects{FOOTNOTES}; -for $sect (qw(NAME SYNOPSIS DESCRIPTION OPTIONS ENVIRONMENT EXAMPLES FILES +for $sect (qw(NAME SYNOPSIS DESCRIPTION OPTIONS ENVIRONMENT FILES BUGS NOTES FOOTNOTES SEEALSO AUTHOR COPYRIGHT)) { if(exists $sects{$sect}) { $head = $sect; @@ -350,6 +350,13 @@ sub postprocess s/\@w\{([^\}]*)\}/S<$1>/g; s/\@(?:dmn|math)\{([^\}]*)\}/$1/g; + # keep references of the form @ref{...}, print them bold + s/\@(?:ref)\{([^\}]*)\}/B<$1>/g; + + # Change double single quotes to double quotes. + s/''/"/g; + s/``/"/g; + # Cross references are thrown away, as are @noindent and @refill. # (@noindent is impossible in .pod, and @refill is unnecessary.) # @* is also impossible in .pod; we discard it and any newline that