problem with `texi2dvi -E' and address@hidden ... @end tex'

[Werner LEMBERG]

[texi2dvi from CVS (version 1.135)]

address@hidden ... @end tex' sometimes stays commented out if `texi2dvi -E' is
called.  For example, this input

  @iftex

  @tex
  \gdef\myfindex#1{\doind{fn}{\code{#1}}\ignorespaces}
  @end tex

  @macro myref{INDEX}
  @myfindex{\INDEX\}
  @ref{\INDEX\}
  @end macro

  @end iftex

looks like this after applying the sed regexp in $comment_iftex:

  @c address@hidden
  @c texi2dvi
  @c address@hidden address@hidden
  @c address@hidden texi2dvi\gdef\myfindex#1{\doind{fn}{\code{#1}}\ignorespaces}
  @c address@hidden address@hidden tex
  @c texi2dvi
  @macro myref{INDEX}
  @myfindex{\INDEX\}
  @ref{\INDEX\}
  @end macro
  @c texi2dvi
  @c address@hidden iftex

Below is a patch.  BTW, I suggest that it is documented somewhere that
address@hidden texi2dvi' starting a line must not be present in the document if
option `-E' is used.


    Werner


======================================================================


2008-22-11  Werner Lemberg  <address@hidden>

        * util/texi2dvi (uncomment_iftex): Make

          @iftex
          @tex
          ...
          @end tex
          @end iftex

        work with `texi2dvi -E'.


--- texi2dvi.old        2008-09-22 20:28:21.000000000 +0200
+++ texi2dvi    2008-11-22 16:21:39.000000000 +0100
@@ -1141,6 +1141,9 @@
 # Unfortunately makeinfo --iftex --no-ifinfo doesn't work well enough
 # (yet), makeinfo can't parse the TeX commands, so work around with sed.
 #
+# We assume that address@hidden texi2dvi' starting a line is not present in the
+# document.
+#
 comment_iftex=\
 '/address@hidden/,/address@hidden tex/{
   s/^/@c texi2dvi/
@@ -1164,7 +1167,7 @@
 s/address@hidden ifnotinfo/@c address@hidden ifnotinfo/'
 
 # Uncommenting is simple: Remove any leading address@hidden texi2dvi'.
-uncomment_iftex='s/address@hidden texi2dvi//'
+uncomment_iftex='s/address@hidden texi2dvi\(@c texi2dvi\)*//'
 
 
 # run_makeinfo ()