* texi2pod.pl: Import latest version from GCC.
This commit is contained in:
		
							parent
							
								
									a591389de3
								
							
						
					
					
						commit
						a6d19f4cd4
					
				| 
						 | 
				
			
			@ -1,3 +1,7 @@
 | 
			
		|||
2005-10-21  Bob Wilson  <bob.wilson@acm.org>
 | 
			
		||||
 | 
			
		||||
	* texi2pod.pl: Import latest version from GCC.
 | 
			
		||||
 | 
			
		||||
2005-05-19  Zack Weinberg  <zack@codesourcery.com>
 | 
			
		||||
 | 
			
		||||
	* Makefile.in: Have 'all' depend on 'info'.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,23 +1,23 @@
 | 
			
		|||
#! /usr/bin/perl -w
 | 
			
		||||
 | 
			
		||||
#   Copyright (C) 1999, 2000, 2001, 200 Free Software Foundation, Inc.
 | 
			
		||||
#   Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
 | 
			
		||||
 | 
			
		||||
# This file is part of GNU CC.
 | 
			
		||||
# This file is part of GCC.
 | 
			
		||||
 | 
			
		||||
# GNU CC is free software; you can redistribute it and/or modify
 | 
			
		||||
# GCC is free software; you can redistribute it and/or modify
 | 
			
		||||
# it under the terms of the GNU General Public License as published by
 | 
			
		||||
# the Free Software Foundation; either version 2, or (at your option)
 | 
			
		||||
# any later version.
 | 
			
		||||
 | 
			
		||||
# GNU CC is distributed in the hope that it will be useful,
 | 
			
		||||
# GCC is distributed in the hope that it will be useful,
 | 
			
		||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
# GNU General Public License for more details.
 | 
			
		||||
 | 
			
		||||
# You should have received a copy of the GNU General Public License
 | 
			
		||||
# along with GNU CC; see the file COPYING.  If not, write to
 | 
			
		||||
# the Free Software Foundation, 59 Temple Place - Suite 330,
 | 
			
		||||
# Boston MA 02111-1307, USA.
 | 
			
		||||
# along with GCC; see the file COPYING.  If not, write to
 | 
			
		||||
# the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 | 
			
		||||
# Boston MA 02110-1301, USA.
 | 
			
		||||
 | 
			
		||||
# This does trivial (and I mean _trivial_) conversion of Texinfo
 | 
			
		||||
# markup to Perl POD format.  It's intended to be used to extract
 | 
			
		||||
| 
						 | 
				
			
			@ -138,7 +138,7 @@ while(<$inf>) {
 | 
			
		|||
	# Ignore @end foo, where foo is not an operation which may
 | 
			
		||||
	# cause us to skip, if we are presently skipping.
 | 
			
		||||
	my $ended = $1;
 | 
			
		||||
	next if $skipping && $ended !~ /^(?:ifset|ifclear|ignore|menu|iftex)$/;
 | 
			
		||||
	next if $skipping && $ended !~ /^(?:ifset|ifclear|ignore|menu|iftex|copying)$/;
 | 
			
		||||
 | 
			
		||||
	die "\@end $ended without \@$ended at line $.\n" unless defined $endw;
 | 
			
		||||
	die "\@$endw ended by \@end $ended at line $.\n" unless $ended eq $endw;
 | 
			
		||||
| 
						 | 
				
			
			@ -178,7 +178,7 @@ while(<$inf>) {
 | 
			
		|||
	next;
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    /^\@(ignore|menu|iftex)\b/ and do {
 | 
			
		||||
    /^\@(ignore|menu|iftex|copying)\b/ and do {
 | 
			
		||||
	push @endwstack, $endw;
 | 
			
		||||
	push @skstack, $skipping;
 | 
			
		||||
	$endw = $1;
 | 
			
		||||
| 
						 | 
				
			
			@ -241,10 +241,14 @@ while(<$inf>) {
 | 
			
		|||
	and $_ = "\n=head3 $1\n";
 | 
			
		||||
 | 
			
		||||
    # Block command handlers:
 | 
			
		||||
    /^\@itemize\s+(\@[a-z]+|\*|-)/ and do {
 | 
			
		||||
    /^\@itemize(?:\s+(\@[a-z]+|\*|-))?/ and do {
 | 
			
		||||
	push @endwstack, $endw;
 | 
			
		||||
	push @icstack, $ic;
 | 
			
		||||
	$ic = $1;
 | 
			
		||||
	if (defined $1) {
 | 
			
		||||
	    $ic = $1;
 | 
			
		||||
	} else {
 | 
			
		||||
	    $ic = '@bullet';
 | 
			
		||||
	}
 | 
			
		||||
	$_ = "\n=over 4\n";
 | 
			
		||||
	$endw = "itemize";
 | 
			
		||||
    };
 | 
			
		||||
| 
						 | 
				
			
			@ -345,6 +349,13 @@ sub postprocess
 | 
			
		|||
    s/\@w\{([^\}]*)\}/S<$1>/g;
 | 
			
		||||
    s/\@(?:dmn|math)\{([^\}]*)\}/$1/g;
 | 
			
		||||
 | 
			
		||||
    # keep references of the form @ref{...}, print them bold
 | 
			
		||||
    s/\@(?:ref)\{([^\}]*)\}/B<$1>/g;
 | 
			
		||||
 | 
			
		||||
    # Change double single quotes to double quotes.
 | 
			
		||||
    s/''/"/g;
 | 
			
		||||
    s/``/"/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
 | 
			
		||||
| 
						 | 
				
			
			@ -365,14 +376,18 @@ sub postprocess
 | 
			
		|||
    s/\@uref\{([^\},]*),([^\},]*)\}/$2 (C<$1>)/g;
 | 
			
		||||
    s/\@uref\{([^\},]*),([^\},]*),([^\},]*)\}/$3/g;
 | 
			
		||||
 | 
			
		||||
    # Turn B<blah I<blah> blah> into B<blah> I<blah> B<blah> to
 | 
			
		||||
    # match Texinfo semantics of @emph inside @samp.  Also handle @r
 | 
			
		||||
    # inside bold.
 | 
			
		||||
    # Un-escape <> at this point.
 | 
			
		||||
    s/</</g;
 | 
			
		||||
    s/>/>/g;
 | 
			
		||||
    1 while s/B<((?:[^<>]|I<[^<>]*>)*)R<([^>]*)>/B<$1>${2}B</g;
 | 
			
		||||
    1 while (s/B<([^<>]*)I<([^>]+)>/B<$1>I<$2>B</g);
 | 
			
		||||
    1 while (s/I<([^<>]*)B<([^>]+)>/I<$1>B<$2>I</g);
 | 
			
		||||
 | 
			
		||||
    # Now un-nest all B<>, I<>, R<>.  Theoretically we could have
 | 
			
		||||
    # indefinitely deep nesting; in practice, one level suffices.
 | 
			
		||||
    1 while s/([BIR])<([^<>]*)([BIR])<([^<>]*)>/$1<$2>$3<$4>$1</g;
 | 
			
		||||
 | 
			
		||||
    # Replace R<...> with bare ...; eliminate empty markup, B<>;
 | 
			
		||||
    # shift white space at the ends of [BI]<...> expressions outside
 | 
			
		||||
    # the expression.
 | 
			
		||||
    s/R<([^<>]*)>/$1/g;
 | 
			
		||||
    s/[BI]<>//g;
 | 
			
		||||
    s/([BI])<(\s+)([^>]+)>/$2$1<$3>/g;
 | 
			
		||||
    s/([BI])<([^>]+?)(\s+)>/$1<$2>$3/g;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue