git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* texi2pod.pl: Correct handling of the internal R<> sequence. 

From-SVN: r55012
This commit is contained in:
Zack Weinberg 2002-06-26 16:50:04 +00:00 committed by Zack Weinberg
parent 650e8d05f4
commit dd6773cd70
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/ChangeLog
View File

@ -1,3 +1,7 @@
2002-06-26 Zack Weinberg <zack@codesourcery.com>
* texi2pod.pl: Correct handling of the internal R<> sequence.
2002-05-31 Florian Weimer <fw@deneb.enyo.de> 2002-05-31 Florian Weimer <fw@deneb.enyo.de>
* gcc_update (files_and_dependencies): Add generated Texinfo files * gcc_update (files_and_dependencies): Add generated Texinfo files

16
contrib/texi2pod.pl
View File

@ -365,14 +365,18 @@ sub postprocess
s/\@uref\{([^\},]*),([^\},]*)\}/$2 (C<$1>)/g; s/\@uref\{([^\},]*),([^\},]*)\}/$2 (C<$1>)/g;
s/\@uref\{([^\},]*),([^\},]*),([^\},]*)\}/$3/g; s/\@uref\{([^\},]*),([^\},]*),([^\},]*)\}/$3/g;
# Turn B<blah I<blah> blah> into B<blah> I<blah> B<blah> to # Un-escape <> at this point.
# match Texinfo semantics of @emph inside @samp. Also handle @r
# inside bold.
s/&LT;/</g; s/&LT;/</g;
s/&GT;/>/g; s/&GT;/>/g;
1 while s/B<((?:[^<>]|I<[^<>]*>)*)R<([^>]*)>/B<$1>${2}B</g;
1 while (s/B<([^<>]*)I<([^>]+)>/B<$1>I<$2>B</g); # Now un-nest all B<>, I<>, R<>. Theoretically we could have
1 while (s/I<([^<>]*)B<([^>]+)>/I<$1>B<$2>I</g); # indefinitely deep nesting; in practice, one level suffices.
1 while s/([BIR])<([^<>]*)([BIR])<([^<>]*)>/$1<$2>$3<$4>$1</g;
# Replace R<...> with bare ...; eliminate empty markup, B<>;
# shift white space at the ends of [BI]<...> expressions outside
# the expression.
s/R<([^<>]*)>/$1/g;
s/[BI]<>//g; s/[BI]<>//g;
s/([BI])<(\s+)([^>]+)>/$2$1<$3>/g; s/([BI])<(\s+)([^>]+)>/$2$1<$3>/g;
s/([BI])<([^>]+?)(\s+)>/$1<$2>$3/g; s/([BI])<([^>]+?)(\s+)>/$1<$2>$3/g;