aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Christopher <echristo@gmail.com>2007-04-05 05:55:51 +0000
committerEric Christopher <echristo@gmail.com>2007-04-05 05:55:51 +0000
commitf5fb44398774242d0431c1f58667d4b227638ca3 (patch)
treeaf005e75e82990f6da9179c59420472c50f7d649
parente713eb1619469e2f7c0f813b022c75c3645fb3ea (diff)
downloadgdb-f5fb44398774242d0431c1f58667d4b227638ca3.zip
gdb-f5fb44398774242d0431c1f58667d4b227638ca3.tar.gz
gdb-f5fb44398774242d0431c1f58667d4b227638ca3.tar.bz2
2007-04-04 Eric Christopher <echristo@apple.com>
Move from gcc: 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.
-rw-r--r--etc/ChangeLog22
-rw-r--r--etc/texi2pod.pl25
2 files changed, 42 insertions, 5 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index ecddf2a..42e16c1 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,18 @@
+2007-04-04 Eric Christopher <echristo@apple.com>
+
+ Move from gcc:
+ 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.
+
2007-03-27 Brooks Moses <brooks.moses@codesourcery.com>
* Makefile.in: Add support for "pdf" and "install-pdf" targets.
@@ -24,15 +39,15 @@
2006-02-27 Carlos O'Donell <carlos@codesourcery.com>
- * Makefile.in: TEXI2HTML uses makeinfo. Define
+ * Makefile.in: TEXI2HTML uses makeinfo. Define
HTMLFILES. Add html targets.
- * configure.texi: Use ifnottex. Add alternative
+ * configure.texi: Use ifnottex. Add alternative
image format specifier as jpg.
* standards.texi: Use ifnottex.
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>
@@ -602,4 +617,3 @@ Mon Nov 16 16:50:43 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com)
Sun Oct 11 16:05:48 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com)
* intro.texi: added INFO-DIR-ENTRY
-
diff --git a/etc/texi2pod.pl b/etc/texi2pod.pl
index ed0d102..cd0ffd9 100644
--- a/etc/texi2pod.pl
+++ b/etc/texi2pod.pl
@@ -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.