[6206] texi2dvi -E avoid spurious diagnostics

[karl]

Revision: 6206
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6206
Author:   karl
Date:     2015-04-06 23:10:09 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
texi2dvi -E avoid spurious diagnostics

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/util/texi2dvi

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-04-06 14:57:05 UTC (rev 6205)
+++ trunk/ChangeLog     2015-04-06 23:10:09 UTC (rev 6206)
@@ -1,3 +1,10 @@
+2015-04-06  Sergey Poznyakoff  <address@hidden>
+
+       * util/texi2dvi (comment_iftex, uncomment_iftex): preserve @top
+       node for first run to avoid makeinfo complaint.
+       Mail to bug-texinfo, 02 Mar 2015 11:38:53 (and thread ff.,
+       continuing into April).
+       
 2015-04-06  Eli Zaretskii  <address@hidden>
 
        * info/pcterm.c (w32_info_prep): Enable mouse input.

Modified: trunk/util/texi2dvi
===================================================================
--- trunk/util/texi2dvi 2015-04-06 14:57:05 UTC (rev 6205)
+++ trunk/util/texi2dvi 2015-04-06 23:10:09 UTC (rev 6206)
@@ -1574,6 +1574,10 @@
 # (with address@hidden _texi2dvi') TeX sections so that makeinfo does not try 
to
 # parse them.  Nevertheless, while commenting TeX sections, don't
 # comment @macro/@end macro so that makeinfo does propagate them.
+# Similarly, preserve the @top node to avoid makeinfo complaining about
+# it being missed.  Comment it out after preprocessing, so that it does
+# not appear in the generated document.
+#
 # Unfortunately makeinfo --iftex --no-ifinfo doesn't work well enough
 # (yet), makeinfo can't parse the TeX commands, so work around with sed.
 #
@@ -1592,6 +1596,10 @@
 }
 /address@hidden/,/address@hidden ifnottex/{
   s/^/@c (_texi2dvi)/
+  /address@hidden (_texi2dvi)@node Top/,/address@hidden (_texi2dvi)@end 
ifnottex/ {
+    /address@hidden (_texi2dvi)@end ifnottex/b
+    s/address@hidden (_texi2dvi)//
+  }
 }
 /address@hidden/,/address@hidden ifinfo/{
   /address@hidden/p
@@ -1604,9 +1612,12 @@
 
 # Uncommenting is simpler: remove any leading address@hidden texi2dvi'; 
repeated
 # copies can sneak in via macro invocations.
-uncomment_iftex='s/address@hidden _texi2dvi\(@c _texi2dvi\)*//'
+uncomment_iftex=\
+'s/address@hidden _texi2dvi\(@c _texi2dvi\)*//
+/address@hidden (_texi2dvi)@ifnottex/,/address@hidden (_texi2dvi)@end 
ifnottex/{
+  s/^/@c (_texi2dvi)/
+}'
 
-
 #  Main program continues - command line parsing.
 #
 # Push a token among the arguments that will be used to notice when we