[6236] dtd_version = 6.0 for upcoming release

[karl]

Revision: 6236
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6236
Author:   karl
Date:     2015-05-02 23:15:38 +0000 (Sat, 02 May 2015)
Log Message:
-----------
dtd_version = 6.0 for upcoming release

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/Makefile.am
    trunk/README-hacking
    trunk/configure.ac
    trunk/tp/tests/README
    trunk/tp/tests/formatting/res_parser/cond_xml/cond.xml
    trunk/tp/tests/formatting/res_parser/split_for_format_not_split/simplest.xml
    trunk/util/texinfo.dtd

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-05-02 23:04:53 UTC (rev 6235)
+++ trunk/ChangeLog     2015-05-02 23:15:38 UTC (rev 6236)
@@ -1,3 +1,13 @@
+2015-05-02  Karl Berry  <address@hidden>
+
+       * configure.ac (TEXINFO_DTD_VERSION): update to 6.0, with commentary.
+       * Makefile.am (dtd-check): new target to be run at make dist (by hand).
+       * util/texinfo.dtd: describe when to update.
+       * README-hacking: more about DTD version check and more.
+       * In tp/tests/formatting/res/parser/
+       *   cond_xml/cond.xml,
+       *   split_for_format_not_split/simplest.xml: regenerate.
+
 2015-05-01  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Plaintext.pm: Change a few more function calls not 

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am   2015-05-02 23:04:53 UTC (rev 6235)
+++ trunk/Makefile.am   2015-05-02 23:15:38 UTC (rev 6236)
@@ -83,10 +83,20 @@
 long-checks:
        cd tp/tests && $(MAKE) long-checks
 
-# From coreutils.
+# to be run before making a distribution: ensure that the texinfo.dtd on
+# the web is what we will be releasing.  See README-hacking.
+wget = wget
+dtd_url = 
http://www.gnu.org/software/texinfo/dtd/$(TEXINFO_DTD_VERSION)/texinfo.dtd
+dtd-check:
+       $(wget) -N $(dtd_url) -O address@hidden \
+       && diff address@hidden $(srcdir)/util/texinfo.dtd \
+       && rm -f address@hidden
+
+# emacs-page
+# From coreutils.  Use when making a release.
 # Verify that all source files using _() are listed in po/POTFILES.in.
 # Run this before making pretests, as well as official releases, so that
-# translators will see changed strings.
+# translators will see changed strings.  See README-hacking.
 po-check:
        @if test -f po/POTFILES.in; then                                \
          grep -E -v '^(#|$$)' po/POTFILES.in                           \

Modified: trunk/README-hacking
===================================================================
--- trunk/README-hacking        2015-05-02 23:04:53 UTC (rev 6235)
+++ trunk/README-hacking        2015-05-02 23:15:38 UTC (rev 6236)
@@ -90,10 +90,10 @@
 convenient to be able to make changes and then run it.
 
 To run it under a name that doesn't end in .pl, e.g., "makeinfo", you
-can set the environment variable TEXINFO_DEV_SOURCE to 1, or symlink to
-a trivial script along these lines:
+can use an alias, or set the environment variable TEXINFO_DEV_SOURCE to 1,
+or symlink to a trivial script along these lines:
 #!/bin/sh
-exec /YOUR/TEXINFO/DIR/tp/texi2any.pl "$@"
+exec /YOUR/TEXINFO/CHECKOUT/tp/texi2any.pl "$@"
 
 For information on creating and modifying
 
@@ -103,7 +103,7 @@
 Ensure texinfo.tex, texi2dvi, and htmlxref.cnf are updated on ftp.gnu.org.
 Ensure TXI_XLATE in doc/Makefile.am matches actual file list.
 Check that TEXINFO_DTD_VERSION has been updated to the next version in
-configure.ac if the DTD has been modified since the last release.
+  configure.ac if the DTD has been modified since the last release.
 
 - Official releases only:
 version number in texi2dvi, texi2pdf, txirefcard.tex.
@@ -112,11 +112,11 @@
 sync texi2html/test/ results with tp/.
 ensure building standalone modules for CPAN still works.
 make V=1 pdf and fix underfull/overfull boxes.
-specially plead with bug-texinfo / beebe / compile farms to try.
+special pleading with bug-texinfo / beebe / compile farms to try.
 try groff.texinfo from groff source repo.
 
 - Changes to sources:
-update version in configure.ac, ChangeLog.
+update version in configure.ac, notice in ChangeLog.
 gnulib-tool --add-import  # for pretest
 util/srclist-txi          # for pretest
 pod2man Pod-Simple-Texinfo/pod2texi.pl >man/pod2texi.1 # until we fix deps
@@ -126,7 +126,7 @@
 make -C doc wwwdoc-build  # and -install for official (and eventual commit)
 (export MALLOC_CHECK_=2; make distcheck)  # repeat until clean
 svn commit                # when clean, then distcheck to be sure
-#create diff  for official, see below 
+#create diff for official, see below 
 
 - To do the actual upload:
 pkg=texinfo
@@ -135,7 +135,8 @@
 then do one of:
 gnupload --to alpha.gnu.org:$pkg $pkg-$ver.tar.xz                #pretest
 gnupload --to ftp.gnu.org:$pkg   $pkg-$ver.tar.{gz,xz} *.diff.xz #official
-  (also gnupload texi2dvi at each official release.)
+  (also gnupload texi2dvi at each official release.
+   The standalone texinfo.tex should already be up to date, but check.)
 
 and the corresponding, to save in local archives:
 mv -v $pkg-$ver.tar.xz* $misc/archive/$pkg/alpha/                #pretest
@@ -144,18 +145,23 @@
 For pretest release, send announcement to bug-texinfo.
 
 - When official release is out there ...
-  ... update DTD and web pages:
+update home page (texinfo.html) and commit as needed.
+update manual (make wwwdoc-install, cvs commit), including:
+  pod2html $txi/Pod-Simple-Texinfo/pod2texi.pl \
+  | fgrep -v 'rev="made"' >manual/pod2texi.html
+
+#  ... dtd version check:
+TEXINFO_DTD_VERSION should already have been updated to $ver in
+configure.ac if it was needed, but check again.  See comments in
+configure.ac, and run (at the top level) make dtd-check.
+
+Set up dtd directory on web pages:
 cd $HOME/gnu/www/texinfo/dtd # or wherever webpages checkout is
-mkdir $ver; svn add $ver
+mkdir $ver && cvs add $ver
 cp $tutil/texinfo.dtd $ver
 cvs add $ver $ver/texinfo.dtd
 cvs commit -m$ver $ver
 
-update home page (texinfo.html) and commit as needed.
-update manual (make wwwdoc-install, cvs commit), including:
-  pod2html $txi/Pod-Simple-Texinfo/pod2texi.pl \
-  | fgrep -v 'rev="made"' >manual/pod2texi.html
-
 #  ... tag source tree:
 svn copy -r 5382 -m'texinfo_5_2 tag based on r5382' \
   svn+ssh://svn.savannah.gnu.org/texinfo/trunk \

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac  2015-05-02 23:04:53 UTC (rev 6235)
+++ trunk/configure.ac  2015-05-02 23:15:38 UTC (rev 6236)
@@ -25,17 +25,17 @@
 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.  It is manually set to the next version number 
-# rather than $PACKAGE_VERSION as soon as the DTD is modified.  There 
-# are 3 reasons for that:
-# 1. to avoid using a DTD from internet that wouldn't be in sync;
-# 2. to avoid unnnecessary changes in XML output file headers, in
-#    test results for instance.  Otherwise after a release the 
-#    devel version and the pretest versions would be used;
-# 3. it may be kept as is in case there were no change in the DTD
-#    between releases.  This is highly improbable, but who knows.
-# TEXINFO_DTD_VERSION=$PACKAGE_VERSION
-TEXINFO_DTD_VERSION=5.0
+# TexinfoXML DTD (./util/texinfo.dtd) version:
+# manually set this to the next version number rather than
+# $PACKAGE_VERSION, as soon as the DTD is modified, and perhaps put the
+# file on the web, too.  Several reasons:
+# 1. To avoid using a DTD from the Internet that wouldn't be in sync;
+# 2. To avoid unnnecessary changes in XML output file headers, in
+#    test results for instance.
+# 3. It may be kept as is in case there were no change in the DTD
+#    between releases.  This is rare, but has happened.
+#
+TEXINFO_DTD_VERSION=6.0
 AC_SUBST([TEXINFO_DTD_VERSION])
 
 # Conditional texi2html support.

Modified: trunk/tp/tests/README
===================================================================
--- trunk/tp/tests/README       2015-05-02 23:04:53 UTC (rev 6235)
+++ trunk/tp/tests/README       2015-05-02 23:15:38 UTC (rev 6236)
@@ -164,6 +164,8 @@
 (as explained above), as well as stdout in newtest.1 and stderr in newtest.2.
 Look carefully to be sure they are as they should be.
 
+For XML output, perhaps check validity using the commands in tp/TODO.
+
 When things look good, use the -copy option to create the
 subdir/res_parser*/newtest/ subdirs and copy the output files there.
 

Modified: trunk/tp/tests/formatting/res_parser/cond_xml/cond.xml
===================================================================
--- trunk/tp/tests/formatting/res_parser/cond_xml/cond.xml      2015-05-02 
23:04:53 UTC (rev 6235)
+++ trunk/tp/tests/formatting/res_parser/cond_xml/cond.xml      2015-05-02 
23:15:38 UTC (rev 6236)
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V5.0//EN" 
"http://www.gnu.org/software/texinfo/dtd/5.0/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V6.0//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.0/texinfo.dtd";>
 <texinfo xml:lang="en">
 <filename file="cond.xml"></filename>
 <preamble>\input texinfo

Modified: 
trunk/tp/tests/formatting/res_parser/split_for_format_not_split/simplest.xml
===================================================================
--- 
trunk/tp/tests/formatting/res_parser/split_for_format_not_split/simplest.xml    
    2015-05-02 23:04:53 UTC (rev 6235)
+++ 
trunk/tp/tests/formatting/res_parser/split_for_format_not_split/simplest.xml    
    2015-05-02 23:15:38 UTC (rev 6236)
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V5.0//EN" 
"http://www.gnu.org/software/texinfo/dtd/5.0/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V6.0//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.0/texinfo.dtd";>
 <texinfo xml:lang="en">
 <filename file="simplest.xml"></filename>
 <preamble>\input texinfo @c -*-texinfo-*-

Modified: trunk/util/texinfo.dtd
===================================================================
--- trunk/util/texinfo.dtd      2015-05-02 23:04:53 UTC (rev 6235)
+++ trunk/util/texinfo.dtd      2015-05-02 23:15:38 UTC (rev 6236)
@@ -8,6 +8,10 @@
   are permitted in any medium without royalty provided the copyright
   notice and this notice are preserved.
 
+  As soon as this file is nontrivially modified, update
+  TEXINFO_DTD_VERSION in configure.ac (if not already done).
+  See comments there for explanation.
+  
   Original author: Philippe Martin.
 -->