Include <termios.h> in mksysinfo.sh.

[pf3gnuchains/gcc-fork.git] / contrib / texi2pod.pl

diff --git a/contrib/texi2pod.pl b/contrib/texi2pod.pl
index 3931e1c..5a4bbac 100755 (executable)
--- a/contrib/texi2pod.pl
+++ b/contrib/texi2pod.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-#   Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+#   Copyright (C) 1999, 2000, 2001, 2003, 2010 Free Software Foundation, Inc.
 
 # This file is part of GCC.
 
@@ -213,14 +213,18 @@ while(<$inf>) {
 
     # Now the ones that have to be replaced by special escapes
     # (which will be turned back into text by unmunge())
+    # Replace @@ before @{ and @} in order to parse @samp{@@} correctly.
     s/&/&amp;/g;
+    s/\@\@/&at;/g;
     s/\@\{/&lbrace;/g;
     s/\@\}/&rbrace;/g;
-    s/\@\@/&at;/g;
+    s/\@`\{(.)\}/&$1grave;/g;
 
-    # Inside a verbatim block, handle @var specially.
+    # Inside a verbatim block, handle @var, @samp and @url specially.
     if ($shift ne "") {
        s/\@var\{([^\}]*)\}/<$1>/g;
+       s/\@samp\{([^\}]*)\}/"$1"/g;
+       s/\@url\{([^\}]*)\}/<$1>/g;
     }
 
     # POD doesn't interpret E<> inside a verbatim block.
@@ -250,7 +254,7 @@ while(<$inf>) {
        next;
     };
 
-    /^\@(?:section|unnumbered|unnumberedsec|center)\s+(.+)$/
+    /^\@(?:section|unnumbered|unnumberedsec|center|heading)\s+(.+)$/
        and $_ = "\n=head2 $1\n";
     /^\@subsection\s+(.+)$/
        and $_ = "\n=head3 $1\n";
@@ -321,8 +325,14 @@ while(<$inf>) {
     /^\@itemx?\s*(.+)?$/ and do {
        if (defined $1) {
             if ($ic) {
-                # Entity escapes prevent munging by the <> processing below.
-                $_ = "\n=item $ic\&LT;$1\&GT;\n";
+               if ($endw eq "enumerate") {
+                   $_ = "\n=item $ic $1\n";
+                   $ic =~ s/(\d+)/$1 + 1/eg;
+               } else {
+                   # Entity escapes prevent munging by the <>
+                   # processing below.
+                   $_ = "\n=item $ic\&LT;$1\&GT;\n";
+               }
             } else {
                 $_ = "\n=item $1\n";
             }
@@ -383,9 +393,11 @@ sub postprocess
     s/\@(?:code|kbd)\{([^\}]*)\}/C<$1>/g;
     s/\@(?:samp|strong|key|option|env|command|b)\{([^\}]*)\}/B<$1>/g;
     s/\@sc\{([^\}]*)\}/\U$1/g;
+    s/\@acronym\{([^\}]*)\}/\U$1/g;
     s/\@file\{([^\}]*)\}/F<$1>/g;
     s/\@w\{([^\}]*)\}/S<$1>/g;
     s/\@(?:dmn|math)\{([^\}]*)\}/$1/g;
+    s/\@\///g;
 
     # keep references of the form @ref{...}, print them bold
     s/\@(?:ref)\{([^\}]*)\}/B<$1>/g;
@@ -454,6 +466,7 @@ sub unmunge
     # Replace escaped symbols with their equivalents.
     local $_ = $_[0];
 
+    s/&(.)grave;/E<$1grave>/g;
     s/&lt;/E<lt>/g;
     s/&gt;/E<gt>/g;
     s/&lbrace;/\{/g;