[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo ChangeLog configure.ac doc/texinfo.txi ...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo ChangeLog configure.ac doc/texinfo.txi ... |
|
Date: |
Mon, 10 Dec 2012 01:34:14 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/12/10 01:34:14
Modified files:
. : ChangeLog configure.ac
doc : texinfo.txi
tp : Makefile.am texi2any.pl
tp/Texinfo : Common.pm
tp/Texinfo/Convert: XML.pm
tp/maintain : catalog.xml.in
tp/t : test_utils.pl
tp/tests/formatting/res_parser/cond_xml: cond.xml
tp/tests/layout/res_parser/formatting_xml: formatting.xml
Log message:
* configure.ac, tp/Makefile.am, tp/texi2any.pl,
tp/Texinfo/Common.pm,
tp/Texinfo/Convert/XML.pm, tp/maintain/catalog.xml.in,
tp/t/test_utils.pl,
doc/texinfo.txi (Other Customization Variables):
Add a new configure variable TEXINFO_DTD_VERSION that holds the
version
of the dtd. Add the corresponding customization variable in
tp/.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1473&r2=1.1474
http://cvs.savannah.gnu.org/viewcvs/texinfo/configure.ac?cvsroot=texinfo&r1=1.127&r2=1.128
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.499&r2=1.500
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Makefile.am?cvsroot=texinfo&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.151&r2=1.152
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.162&r2=1.163
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/maintain/catalog.xml.in?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/test_utils.pl?cvsroot=texinfo&r1=1.125&r2=1.126
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/res_parser/cond_xml/cond.xml?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml?cvsroot=texinfo&r1=1.14&r2=1.15
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1473
retrieving revision 1.1474
diff -u -b -r1.1473 -r1.1474
--- ChangeLog 8 Dec 2012 11:41:51 -0000 1.1473
+++ ChangeLog 10 Dec 2012 01:34:12 -0000 1.1474
@@ -1,3 +1,11 @@
+2012-12-10 Patrice Dumas <address@hidden>
+
+ * configure.ac, tp/Makefile.am, tp/texi2any.pl, tp/Texinfo/Common.pm,
+ tp/Texinfo/Convert/XML.pm, tp/maintain/catalog.xml.in,
tp/t/test_utils.pl,
+ doc/texinfo.txi (Other Customization Variables):
+ Add a new configure variable TEXINFO_DTD_VERSION that holds the version
+ of the dtd. Add the corresponding customization variable in tp/.
+
2012-12-08 Patrice Dumas <address@hidden>
* doc/texinfo.txi (Command Contexts): @verb is not accepted in
Index: configure.ac
===================================================================
RCS file: /sources/texinfo/texinfo/configure.ac,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- configure.ac 3 Dec 2012 00:01:50 -0000 1.127
+++ configure.ac 10 Dec 2012 01:34:12 -0000 1.128
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script.
-# $Id: configure.ac,v 1.127 2012/12/03 00:01:50 karl Exp $
+# $Id: configure.ac,v 1.128 2012/12/10 01:34:12 pertusus Exp $
#
# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
# Free Software Foundation, Inc.
@@ -27,6 +27,12 @@
AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS.
AC_CONFIG_SRCDIR([info/info.c])
+# version for the dtd. In between releases, PACKAGE_VERSION is not set
+# to a value that corresponds to actual files on the internet.
+# TEXINFO_DTD_VERSION=$PACKAGE_VERSION
+TEXINFO_DTD_VERSION=5.00
+AC_SUBST([TEXINFO_DTD_VERSION])
+
# Conditional texi2html support.
AM_CONDITIONAL([TEXI2HTML],[false])
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -b -r1.499 -r1.500
--- doc/texinfo.txi 8 Dec 2012 11:41:51 -0000 1.499
+++ doc/texinfo.txi 10 Dec 2012 01:34:13 -0000 1.500
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.499 2012/12/08 11:41:51 pertusus Exp $
address@hidden $Id: texinfo.txi,v 1.500 2012/12/10 01:34:13 pertusus Exp $
@c Ordinarily, Texinfo files have the extension .texi. But texinfo.texi
@c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
@@ -17806,6 +17806,10 @@
Generate HTML and try to be as compatible as possible with
@command{texi2html}; default false.
address@hidden TEXINFO_DTD_VERSION
+For address@hidden Version of the dtd used in the XML output preamble.
Default
+is set based on a configure.ac variable.
+
@item TEXTCONTENT_COMMENT
For stripped text content output (i.e., when @code{TEXTCONTENT} is
set). If set, also output comments. Default off.
@@ -21707,7 +21711,7 @@
or other version control systems, which expand it into a string such
as:
@example
-$Id: texinfo.txi,v 1.499 2012/12/08 11:41:51 pertusus Exp $
+$Id: texinfo.txi,v 1.500 2012/12/10 01:34:13 pertusus Exp $
@end example
(This is useful in all sources that use version control, not just manuals.)
You may wish to include the @samp{$Id:} comment in the @code{@@copying}
Index: tp/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Makefile.am,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- tp/Makefile.am 21 Nov 2012 22:48:48 -0000 1.51
+++ tp/Makefile.am 10 Dec 2012 01:34:13 -0000 1.52
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.51 2012/11/21 22:48:48 pertusus Exp $
+# $Id: Makefile.am,v 1.52 2012/12/10 01:34:13 pertusus Exp $
# Makefile.am for texinfo/tp.
#
# Copyright 2011, 2012 Free Software Foundation, Inc.
@@ -42,6 +42,7 @@
-e 's,address@hidden@],$(USE_EXTERNAL_LIBINTL),g' \
-e 's,address@hidden@],$(USE_EXTERNAL_EASTASIANWIDTH),g' \
-e 's,address@hidden@],$(USE_EXTERNAL_UNIDECODE),g' \
+ -e 's,address@hidden@],$(TEXINFO_DTD_VERSION),g' \
-e '1 s,/usr/bin/env perl,$(PERL),g'
texi2any: texi2any.pl $(top_builddir)/config.status
@@ -206,6 +207,7 @@
maintain/catalog.xml: maintain/catalog.xml.in Makefile
$(mkdir_p) maintain
sed -e 's|address@hidden@]|$(abs_top_srcdir)|' \
+ -e 's|address@hidden@]|$(TEXINFO_DTD_VERSION)|' \
$(srcdir)/maintain/catalog.xml.in >$@
Index: tp/texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -b -r1.151 -r1.152
--- tp/texi2any.pl 30 Nov 2012 18:32:30 -0000 1.151
+++ tp/texi2any.pl 10 Dec 2012 01:34:13 -0000 1.152
@@ -266,6 +266,27 @@
$configured_url = 'http://www.gnu.org/software/texinfo/'
if ($configured_url eq '@' .'PACKAGE_URL@');
+my $texinfo_dtd_version = '@TEXINFO_DTD_VERSION@';
+# $hardcoded_version is undef for a standalone perl module
+if ($texinfo_dtd_version eq '@' . 'TEXINFO_DTD_VERSION@') {
+ $texinfo_dtd_version = undef;
+ if (defined($hardcoded_version)) {
+ if (open (CONFIGURE,
+ "< ".File::Spec->catfile($srcdir, $updir, 'configure.ac'))) {
+ while (<CONFIGURE>) {
+ if (/^TEXINFO_DTD_VERSION=([0-9]\S*)/) {
+ $texinfo_dtd_version = "$1";
+ last;
+ }
+ }
+ close (CONFIGURE);
+ }
+ }
+}
+# Used in case it is not hardcoded in configure and for standalone perl module
+$texinfo_dtd_version = $configured_version
+ if (!defined($texinfo_dtd_version));
+
# defaults for options relevant in the main program, not undef, and also
# defaults for all the converters.
# Other relevant options (undef) are NO_WARN FORCE OUTFILE
@@ -279,6 +300,7 @@
'PACKAGE_AND_VERSION' => $configured_name_version,
'PACKAGE_URL' => $configured_url,
'PROGRAM' => $real_command_name,
+ 'TEXINFO_DTD_VERSION' => $texinfo_dtd_version,
};
# determine configuration directories.
Index: tp/Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -b -r1.162 -r1.163
--- tp/Texinfo/Common.pm 20 Nov 2012 01:49:28 -0000 1.162
+++ tp/Texinfo/Common.pm 10 Dec 2012 01:34:13 -0000 1.163
@@ -233,7 +233,8 @@
'TEXI2HTML', 'IMAGE_LINK_PREFIX', 'FIX_TEXINFO',
'TREE_TRANSFORMATIONS', 'BASEFILENAME_LENGTH',
'TEXTCONTENT_COMMENT', 'XREF_USE_FLOAT_LABEL', 'XREF_USE_NODE_NAME_ARG',
- 'MACRO_BODY_IGNORES_LEADING_SPACE', 'CHECK_HTMLXREF'
+ 'MACRO_BODY_IGNORES_LEADING_SPACE', 'CHECK_HTMLXREF',
+ 'TEXINFO_DTD_VERSION',
);
# Not strings.
# FIXME To be documented somewhere, but where?
Index: tp/Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- tp/Texinfo/Convert/XML.pm 11 Nov 2012 16:25:01 -0000 1.87
+++ tp/Texinfo/Convert/XML.pm 10 Dec 2012 01:34:13 -0000 1.88
@@ -60,6 +60,7 @@
'EXTENSION' => 'xml',
#'output_perl_encoding' => 'utf8',
'OUTPUT_ENCODING_NAME' => 'utf-8',
+ 'TEXINFO_DTD_VERSION' => '5.00',
'OUTFILE' => undef,
'SUBDIR' => undef,
'output_format' => 'xml',
@@ -285,9 +286,13 @@
and $self->get_conf('OUTPUT_ENCODING_NAME') ne 'utf-8') {
$encoding = " encoding=\"".$self->get_conf('OUTPUT_ENCODING_NAME')."\" ";
}
+ my $texinfo_dtd_version = $self->get_conf('TEXINFO_DTD_VERSION');
+ if (!defined($texinfo_dtd_version)) {
+ $texinfo_dtd_version = '1.00';
+ }
my $header = "<?xml version=\"1.0\"${encoding}?>".'
-<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V4.12//EN"
"http://www.gnu.org/software/texinfo/dtd/4.12/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V'.$texinfo_dtd_version.'//EN"
"http://www.gnu.org/software/texinfo/dtd/'.$texinfo_dtd_version.'/texinfo.dtd">
<texinfo xml:lang="' . $self->get_conf('documentlanguage') ."\">\n";
if ($self->{'output_file'} ne '') {
my $output_filename = $self->{'output_filename'};
Index: tp/maintain/catalog.xml.in
===================================================================
RCS file: /sources/texinfo/texinfo/tp/maintain/catalog.xml.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/maintain/catalog.xml.in 14 Jan 2012 13:28:53 -0000 1.1
+++ tp/maintain/catalog.xml.in 10 Dec 2012 01:34:14 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE catalog PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN"
"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd";>
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <rewriteSystem
systemIdStartString="http://www.gnu.org/software/texinfo/dtd/4.12/";
rewritePrefix="file://@abs_top_srcdir@/util/" />
+ <rewriteSystem
systemIdStartString="http://www.gnu.org/software/texinfo/dtd/@TEXINFO_DTD_VERSION@/";
rewritePrefix="file://@abs_top_srcdir@/util/" />
</catalog>
Index: tp/t/test_utils.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/test_utils.pl,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- tp/t/test_utils.pl 9 Nov 2012 22:30:16 -0000 1.125
+++ tp/t/test_utils.pl 10 Dec 2012 01:34:14 -0000 1.126
@@ -121,7 +121,7 @@
]>
'. "<book lang=\"en\">\n", "</book>\n"],
'xml' => ['<?xml version="1.0"?>
-<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V4.12//EN"
"http://www.gnu.org/software/texinfo/dtd/4.12/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V5.00//EN"
"http://www.gnu.org/software/texinfo/dtd/5.00/texinfo.dtd";>
<texinfo xml:lang="en">
', "</texinfo>\n"],
'html_text' => ['<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01
Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>
Index: tp/tests/formatting/res_parser/cond_xml/cond.xml
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/formatting/res_parser/cond_xml/cond.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tp/tests/formatting/res_parser/cond_xml/cond.xml 9 Sep 2012 16:51:47
-0000 1.4
+++ tp/tests/formatting/res_parser/cond_xml/cond.xml 10 Dec 2012 01:34:14
-0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V4.12//EN"
"http://www.gnu.org/software/texinfo/dtd/4.12/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V5.00//EN"
"http://www.gnu.org/software/texinfo/dtd/5.00/texinfo.dtd";>
<texinfo xml:lang="en">
<filename file="cond.xml"></filename>
<preamble>\input texinfo
Index: tp/tests/layout/res_parser/formatting_xml/formatting.xml
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- tp/tests/layout/res_parser/formatting_xml/formatting.xml 8 Sep 2012
23:06:37 -0000 1.14
+++ tp/tests/layout/res_parser/formatting_xml/formatting.xml 10 Dec 2012
01:34:14 -0000 1.15
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V4.12//EN"
"http://www.gnu.org/software/texinfo/dtd/4.12/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V5.00//EN"
"http://www.gnu.org/software/texinfo/dtd/5.00/texinfo.dtd";>
<texinfo xml:lang="en">
<filename file="formatting.xml"></filename>
<preamble>\input texinfo @c -*-texinfo-*-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo ChangeLog configure.ac doc/texinfo.txi ...,
Patrice Dumas <=