summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authormanu <manu@138bc75d-0d04-0410-961f-82ee72b054a4>2007-10-08 14:05:51 +0000
committermanu <manu@138bc75d-0d04-0410-961f-82ee72b054a4>2007-10-08 14:05:51 +0000
commite3d2159eb818033b6e7590ce894cc8f964f3bcd0 (patch)
tree526ac907123561985d2443acd65a45bf86254766 /contrib
parentd5ed60d6563744ad5822bfedf94e27c9a779ed4b (diff)
downloadgcc-e3d2159eb818033b6e7590ce894cc8f964f3bcd0.tar.gz
2007-10-08 Manuel Lopez-Ibanez <manu@gcc.gnu.org>
* doc/invoke.texi (Wall): fix formatting issues. contrib/ * texi2pod.pl: Handle @asis. (postprocess): Move @gccoptlist{} after all formatting commands. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@129125 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ChangeLog5
-rwxr-xr-xcontrib/texi2pod.pl15
2 files changed, 17 insertions, 3 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 5f99c24e0f8..8df5f828743 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-08 Manuel Lopez-Ibanez <manu@gcc.gnu.org>
+
+ * texi2pod.pl: Handle @asis.
+ (postprocess): Move @gccoptlist{} after all formatting commands.
+
2007-10-01 Alexandre Oliva <aoliva@redhat.com>
* compare-debug: Avoid spurious errors when .stripped files
diff --git a/contrib/texi2pod.pl b/contrib/texi2pod.pl
index cd0ffd9435f..e45f2724d94 100755
--- a/contrib/texi2pod.pl
+++ b/contrib/texi2pod.pl
@@ -297,6 +297,7 @@ while(<$inf>) {
$ic =~ s/\@(?:code|kbd)/C/;
$ic =~ s/\@(?:dfn|var|emph|cite|i)/I/;
$ic =~ s/\@(?:file)/F/;
+ $ic =~ s/\@(?:asis)//;
$_ = "\n=over 4\n";
};
@@ -319,8 +320,12 @@ while(<$inf>) {
/^\@itemx?\s*(.+)?$/ and do {
if (defined $1) {
- # Entity escapes prevent munging by the <> processing below.
- $_ = "\n=item $ic\&LT;$1\&GT;\n";
+ if ($ic) {
+ # Entity escapes prevent munging by the <> processing below.
+ $_ = "\n=item $ic\&LT;$1\&GT;\n";
+ } else {
+ $_ = "\n=item $1\n";
+ }
} else {
$_ = "\n=item $ic\n";
$ic =~ y/A-Ya-y/B-Zb-z/;
@@ -376,7 +381,7 @@ sub postprocess
s/\@r\{([^\}]*)\}/R<$1>/g;
s/\@(?:dfn|var|emph|cite|i)\{([^\}]*)\}/I<$1>/g;
s/\@(?:code|kbd)\{([^\}]*)\}/C<$1>/g;
- s/\@(?:gccoptlist|samp|strong|key|option|env|command|b)\{([^\}]*)\}/B<$1>/g;
+ s/\@(?:samp|strong|key|option|env|command|b)\{([^\}]*)\}/B<$1>/g;
s/\@sc\{([^\}]*)\}/\U$1/g;
s/\@file\{([^\}]*)\}/F<$1>/g;
s/\@w\{([^\}]*)\}/S<$1>/g;
@@ -412,6 +417,10 @@ sub postprocess
s/\@uref\{([^\},]*),([^\},]*)\}/$2 (C<$1>)/g;
s/\@uref\{([^\},]*),([^\},]*),([^\},]*)\}/$3/g;
+ # Handle gccoptlist here, so it can contain the above formatting
+ # commands.
+ s/\@gccoptlist\{([^\}]*)\}/B<$1>/g;
+
# Un-escape <> at this point.
s/&LT;/</g;
s/&GT;/>/g;