KJ16609/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2026-02-22 03:46:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

backport: [multiple changes]

Browse Source 
2007-04-04  Eric Christopher  <echristo@apple.com>

        Backport from mainline:
        2007-04-04  Zack Weinberg  <zack@mrtock.ucsd.edu>

        * texi2pod.pl: Correct handling of @itemize with no argument.

        2007-02-16  Matthias Klose  <doko@debian.org>

        * texi2pod.pl: Handle @subsubsection, ignore @anchor.

        2007-02-06  Richard Sandiford  <richard@codesourcery.com>

        * texi2pod.pl: Handle @multitable.

From-SVN: r123515
This commit is contained in:
Eric Christopher
2007-04-05 07:10:01 +00:00
parent 6dc4f7aae9
commit 86875983bb
2 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
contrib/ChangeLog
View File

@@ -1,3 +1,18 @@
2007-04-04 Eric Christopher <echristo@apple.com>
Backport from mainline:
2007-04-04 Zack Weinberg <zack@mrtock.ucsd.edu>
* texi2pod.pl: Correct handling of @itemize with no argument.
2007-02-16 Matthias Klose <doko@debian.org>
* texi2pod.pl: Handle @subsubsection, ignore @anchor.
2007-02-06 Richard Sandiford <richard@codesourcery.com>
* texi2pod.pl: Handle @multitable.
2006-09-27 Matthew Sachs <msachs@apple.com>
* compareSumTests3: POD syntax fix.
@@ -84,14 +99,14 @@
2005-10-28 Daniel Berlin <dberlin@dberlin.org>
Ben Elliston <bje@au1.ibm.com>
* gcc_update: Update for svn.
* newcvsroot: Ditto.
* gcc_build: Ditto.
2005-10-21 Mark Mitchell <mark@codesourcery.com>
* texi2pod.pl: Substitue for @value even when part of @include.
* texi2pod.pl: Substitue for @value even when part of @include.
2005-10-21 Bob Wilson <bob.wilson@acm.org>

25
contrib/texi2pod.pl
View File

@@ -162,6 +162,8 @@ while(<$inf>) {
} elsif ($ended =~ /^(?:itemize|enumerate|[fv]?table)$/) {
$_ = "\n=back\n";
$ic = pop @icstack;
} elsif ($ended eq "multitable") {
$_ = "\n=back\n";
} else {
die "unknown command \@end $ended at line $.\n";
}
@@ -252,6 +254,8 @@ while(<$inf>) {
and $_ = "\n=head2 $1\n";
/^\@subsection\s+(.+)$/
and $_ = "\n=head3 $1\n";
/^\@subsubsection\s+(.+)$/
and $_ = "\n=head4 $1\n";
# Block command handlers:
/^\@itemize(?:\s+(\@[a-z]+|\*|-))?/ and do {
@@ -260,7 +264,7 @@ while(<$inf>) {
if (defined $1) {
$ic = $1;
} else {
$ic = '@bullet';
$ic = '*';
}
$_ = "\n=over 4\n";
$endw = "itemize";
@@ -278,6 +282,12 @@ while(<$inf>) {
$endw = "enumerate";
};
/^\@multitable\s.*/ and do {
push @endwstack, $endw;
$endw = "multitable";
$_ = "\n=over 4\n";
};
/^\@([fv]?table)\s+(\@[a-z]+)/ and do {
push @endwstack, $endw;
push @icstack, $ic;
@@ -297,6 +307,16 @@ while(<$inf>) {
$_ = ""; # need a paragraph break
};
/^\@item\s+(.*\S)\s*$/ and $endw eq "multitable" and do {
@columns = ();
for $column (split (/\s*\@tab\s*/, $1)) {
# @strong{...} is used a @headitem work-alike
$column =~ s/^\@strong{(.*)}$/$1/;
push @columns, $column;
}
$_ = "\n=item ".join (" : ", @columns)."\n";
};
/^\@itemx?\s*(.+)?$/ and do {
if (defined $1) {
# Entity escapes prevent munging by the <> processing below.
@@ -382,6 +402,9 @@ sub postprocess
s/\@gol//g;
s/\@\*\s*\n?//g;
# Anchors are thrown away
s/\@anchor\{(?:[^\}]*)\}//g;
# @uref can take one, two, or three arguments, with different
# semantics each time. @url and @email are just like @uref with
# one argument, for our purposes.