texi2pod.pl: Handle @samp and @url inside verbatim blocks.

contrib:
	* texi2pod.pl: Handle @samp and @url inside verbatim blocks.
	Handle @heading.  Handle enumerated lists with starting numbers
	and extra headings.

gcc:
	* doc/include/gpl_v3.texi: Update for manpage generation.
	* doc/gcc.texi, doc/gccint.texi: Include gpl_v3.texi instead of
	gpl.texi.
	* doc/sourcebuild.texi: Document gpl_v3.texi as well as gpl.texi.
	* Makefile.in (TEXI_GCC_FILES, TEXI_GCCINT_FILES): Include
	gpl_v3.texi instead of gpl.texi.
	(gpl.pod): New.

gcc/fortran:
	* gfortran.texi: Include gpl_v3.texi instead of gpl.texi
	* Make-lang.in (GFORTRAN_TEXI): Include gpl_v3.texi instead of
	gpl.texi.

gcc/java:
	* gcj.texi: Include gpl_v3.texi instead of gpl.texi
	* Make-lang.in (TEXI_JAVA_FILES): Include gpl_v3.texi instead of
	gpl.texi.

From-SVN: r133794
This commit is contained in:
Joseph Myers 2008-04-01 17:38:56 +01:00 committed by Joseph Myers
parent 4412a50664
commit 7f9766e49a
14 changed files with 68 additions and 12 deletions

View File

@ -1,3 +1,9 @@
2008-04-01 Joseph Myers <joseph@codesourcery.com>
* texi2pod.pl: Handle @samp and @url inside verbatim blocks.
Handle @heading. Handle enumerated lists with starting numbers
and extra headings.
2008-03-10 Janis Johnson <janis187@us.ibm.com>
* patch_tester.sh (initialization): Initialize svnpatch and stop.

View File

@ -218,9 +218,11 @@ while(<$inf>) {
s/\@\}/&rbrace;/g;
s/\@\@/&at;/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 +252,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 +323,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";
}

View File

@ -1,3 +1,13 @@
2008-04-01 Joseph Myers <joseph@codesourcery.com>
* doc/include/gpl_v3.texi: Update for manpage generation.
* doc/gcc.texi, doc/gccint.texi: Include gpl_v3.texi instead of
gpl.texi.
* doc/sourcebuild.texi: Document gpl_v3.texi as well as gpl.texi.
* Makefile.in (TEXI_GCC_FILES, TEXI_GCCINT_FILES): Include
gpl_v3.texi instead of gpl.texi.
(gpl.pod): New.
2008-04-01 Jakub Jelinek <jakub@redhat.com>
PR pch/13675

View File

@ -3638,7 +3638,7 @@ TEXI_CPP_FILES = cpp.texi fdl.texi cppenv.texi cppopts.texi \
TEXI_GCC_FILES = gcc.texi gcc-common.texi gcc-vers.texi frontends.texi \
standards.texi invoke.texi extend.texi md.texi objc.texi \
gcov.texi trouble.texi bugreport.texi service.texi \
contribute.texi compat.texi funding.texi gnu.texi gpl.texi \
contribute.texi compat.texi funding.texi gnu.texi gpl_v3.texi \
fdl.texi contrib.texi cppenv.texi cppopts.texi \
implement-c.texi arm-neon-intrinsics.texi
@ -3647,7 +3647,7 @@ TEXI_GCCINT_FILES = gccint.texi gcc-common.texi gcc-vers.texi \
portability.texi interface.texi passes.texi c-tree.texi \
rtl.texi md.texi tm.texi hostconfig.texi fragments.texi \
configfiles.texi collect2.texi headerdirs.texi funding.texi \
gnu.texi gpl.texi fdl.texi contrib.texi languages.texi \
gnu.texi gpl_v3.texi fdl.texi contrib.texi languages.texi \
sourcebuild.texi gty.texi libgcc.texi cfg.texi tree-ssa.texi \
loop.texi
@ -3798,6 +3798,9 @@ gfdl.pod: fdl.texi
fsf-funding.pod: funding.texi
$(STAMP) $@
-$(TEXI2POD) $< > $@
gpl.pod: gpl_v3.texi
$(STAMP) $@
-$(TEXI2POD) $< > $@
#
# Deletion of files made during compilation.

View File

@ -170,7 +170,7 @@ Introduction, gccint, GNU Compiler Collection (GCC) Internals}.
@include funding.texi
@include gnu.texi
@include gpl.texi
@include gpl_v3.texi
@c ---------------------------------------------------------------------
@c GFDL

View File

@ -156,7 +156,7 @@ Additional tutorial information is linked to from
@include funding.texi
@include gnu.texi
@include gpl.texi
@include gpl_v3.texi
@c ---------------------------------------------------------------------
@c GFDL

View File

@ -1,4 +1,19 @@
@ignore
@c Set file name and title for man page.
@setfilename gpl
@settitle GNU General Public License
@c man begin SEEALSO
gfdl(7), fsf-funding(7).
@c man end
@c man begin COPYRIGHT
Copyright @copyright{} 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
@c man end
@end ignore
@node Copying
@c man begin DESCRIPTION
@unnumbered GNU General Public License
@center Version 3, 29 June 2007
@ -715,3 +730,4 @@ library, you may consider it more useful to permit linking proprietary
applications with the library. If this is what you want to do, use
the GNU Lesser General Public License instead of this License. But
first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
@c man end

View File

@ -340,6 +340,7 @@ The section ``Funding Free Software''.
@item gcc-common.texi
Common definitions for manuals.
@item gpl.texi
@itemx gpl_v3.texi
The GNU General Public License.
@item texinfo.tex
A copy of @file{texinfo.tex} known to work with the GCC manuals.

View File

@ -1,3 +1,9 @@
2008-04-01 Joseph Myers <joseph@codesourcery.com>
* gfortran.texi: Include gpl_v3.texi instead of gpl.texi
* Make-lang.in (GFORTRAN_TEXI): Include gpl_v3.texi instead of
gpl.texi.
2008-03-30 Paul Thomas <pault@gcc.gnu.org>
PR fortran/35740

View File

@ -149,7 +149,7 @@ GFORTRAN_TEXI = \
$(srcdir)/fortran/intrinsic.texi \
$(srcdir)/fortran/invoke.texi \
$(srcdir)/doc/include/fdl.texi \
$(srcdir)/doc/include/gpl.texi \
$(srcdir)/doc/include/gpl_v3.texi \
$(srcdir)/doc/include/funding.texi \
$(srcdir)/doc/include/gcc-common.texi \
gcc-vers.texi

View File

@ -1933,7 +1933,7 @@ Environment variable forcing standard output to be line buffered (unix).
@c GNU General Public License
@c ---------------------------------------------------------------------
@include gpl.texi
@include gpl_v3.texi

View File

@ -1,3 +1,9 @@
2008-04-01 Joseph Myers <joseph@codesourcery.com>
* gcj.texi: Include gpl_v3.texi instead of gpl.texi
* Make-lang.in (TEXI_JAVA_FILES): Include gpl_v3.texi instead of
gpl.texi.
2008-03-27 Tom Tromey <tromey@redhat.com>
* Make-lang.in: Revert automatic dependency patch.

View File

@ -311,7 +311,7 @@ java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
$(srcdir)/java/jcf-path.c $(OUTPUT_OPTION)
TEXI_JAVA_FILES = java/gcj.texi $(gcc_docdir)/include/fdl.texi \
$(gcc_docdir)/include/gpl.texi $(gcc_docdir)/include/gcc-common.texi \
$(gcc_docdir)/include/gpl_v3.texi $(gcc_docdir)/include/gcc-common.texi \
gcc-vers.texi
# Documentation

View File

@ -122,7 +122,7 @@ files and object files, and it can read both Java source code and
@end menu
@include gpl.texi
@include gpl_v3.texi
@include fdl.texi