diff options
| author | Joseph Myers <jsm28@cam.ac.uk> | 2001-01-13 21:17:13 +0000 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2001-01-13 21:17:13 +0000 |
| commit | 4bc1997b1afce4711f79d0f4fa692004a2b75ec2 (patch) | |
| tree | 957462d6c0eac26df6a84cc20863eecacecd7ec3 /contrib | |
| parent | 130fadbb36407e506cb43ce2b0dbada126d862d7 (diff) | |
| download | gcc-4bc1997b1afce4711f79d0f4fa692004a2b75ec2.zip gcc-4bc1997b1afce4711f79d0f4fa692004a2b75ec2.tar.gz gcc-4bc1997b1afce4711f79d0f4fa692004a2b75ec2.tar.bz2 | |
gcc_update: Add gcc/gcc.1 to generated files.
contrib:
* gcc_update: Add gcc/gcc.1 to generated files.
* texi2pod.pl: Handle @r and @gccoptlist. Handle @gol. Handle
discarding to end of sentence with @xref where the sentence has an
interior "." in markup, and handle discarding parentheses around
such a sentence.
gcc:
* Makefile.in (generated-manpages): Add gcc.1
($(srcdir)/gcc.1): New target.
(maintainer-clean): Delete $(srcdir)/gcc.1.
* gcc.texi: Add macros @gccoptlist and @gol.
* invoke.texi: Include option summary in manpage. Mark up option
summary with @gccoptlist and @gol. Use @r in one place where
appropriate.
* texinfo.tex: Update to version 2000-12-11.07 from ftp.gnu.org.
* gcc.1: Generate from invoke.texi.
gcc/cp:
* g++.1: Change to be ".so man1/gcc.1".
From-SVN: r38993
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog | 8 | ||||
| -rwxr-xr-x | contrib/gcc_update | 1 | ||||
| -rwxr-xr-x | contrib/texi2pod.pl | 12 |
3 files changed, 18 insertions, 3 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 2bbaf69..8068c10 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,11 @@ +2001-01-13 Joseph S. Myers <jsm28@cam.ac.uk> + + * gcc_update: Add gcc/gcc.1 to generated files. + * texi2pod.pl: Handle @r and @gccoptlist. Handle @gol. Handle + discarding to end of sentence with @xref where the sentence has an + interior "." in markup, and handle discarding parentheses around + such a sentence. + 2001-01-11 Bernd Schmidt <bernds@redhat.com> * gennews: Add gcc-2.95.3. diff --git a/contrib/gcc_update b/contrib/gcc_update index 81fddc7..573b0bd 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -68,6 +68,7 @@ gcc/config.in: gcc/cstamp-h.in gcc/fixinc/fixincl.x: gcc/fixinc/fixincl.tpl gcc/fixinc/inclhack.def gcc/gcov.1: gcc/gcov.texi gcc/cpp.1: gcc/cpp.texi +gcc/gcc.1: gcc/invoke.texi # And then, language-specific files # (None at present.) # And libraries, at last diff --git a/contrib/texi2pod.pl b/contrib/texi2pod.pl index 6826eea..6a2e6cd 100755 --- a/contrib/texi2pod.pl +++ b/contrib/texi2pod.pl @@ -249,24 +249,30 @@ sub postprocess s/\@value\{([a-zA-Z0-9_-]+)\}/$defs{$1}/g; # Formatting commands. + # Temporary escape for @r. + s/\@r\{([^\}]*)\}/R<$1>/g; s/\@(?:dfn|var|emph|cite|i)\{([^\}]*)\}/I<$1>/g; s/\@(?:code|kbd)\{([^\}]*)\}/C<$1>/g; - s/\@(?:samp|strong|key|option|env|command|b)\{([^\}]*)\}/B<$1>/g; + s/\@(?:gccoptlist|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; s/\@(?:dmn|math)\{([^\}]*)\}/$1/g; + # Handle @r inside bold. + 1 while s/B<((?:[^<>]*|I<[^<>*]*>)*)R<([^>]*)>/B<$1>${2}B</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 - # follows it. + # follows it. Similarly, our macro @gol must be discarded. - s/\@xref\{(?:[^\}]*)\}[^.]*.//g; + s/\(?\@xref\{(?:[^\}]*)\}(?:[^.<]|(?:<[^<>]*>))*\.\)?//g; s/\s+\(\@pxref\{(?:[^\}]*)\}\)//g; s/;\s+\@pxref\{(?:[^\}]*)\}//g; s/\@noindent\s*//g; s/\@refill//g; + s/\@gol//g; s/\@\*\s*\n?//g; # @uref can take one, two, or three arguments, with different |