branch master updated: * util/texi2dvi (--expand): add --iftex and --no-ifinfo to makeinfo call. Use -c TEXINFO_OUTPUT_FORMAT=plaintexinfo instead of --macro-expand=- to avoid the conversion to Info that could lead to irrelevant messages.

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new cbc08da86a * util/texi2dvi (--expand): add --iftex and --no-ifinfo to 
makeinfo call.  Use -c TEXINFO_OUTPUT_FORMAT=plaintexinfo instead of 
--macro-expand=- to avoid the conversion to Info that could lead to irrelevant 
messages.
cbc08da86a is described below

commit cbc08da86aec54df10aac4811150b1ba9befea46
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Nov 13 12:29:38 2022 +0100

    * util/texi2dvi (--expand): add --iftex and --no-ifinfo to
    makeinfo call.  Use -c TEXINFO_OUTPUT_FORMAT=plaintexinfo
    instead of --macro-expand=- to avoid the conversion to Info
    that could lead to irrelevant messages.
    
    * doc/texinfo.texi (Format with @command{texi2dvi} or
    @command{texi2pdf}): no more comments set by texi2dvi.
---
 ChangeLog        | 10 ++++++++++
 doc/texinfo.texi |  4 +---
 util/texi2dvi    |  7 +++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b59ad0e2a1..376cd15811 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2022-11-13  Patrice Dumas  <pertusus@free.fr>
+
+       * util/texi2dvi (--expand): add --iftex and --no-ifinfo to
+       makeinfo call.  Use -c TEXINFO_OUTPUT_FORMAT=plaintexinfo
+       instead of --macro-expand=- to avoid the conversion to Info
+       that could lead to irrelevant messages.
+
+       * doc/texinfo.texi (Format with @command{texi2dvi} or
+       @command{texi2pdf}): no more comments set by texi2dvi.
+
 2022-11-13  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * util/texi2dvi (--expand): Remove lengthy block of code
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index 1859cc0877..bfa0da13ba 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -14553,9 +14553,7 @@ The option @option{-E} (equivalently, @option{-e} and
 @option{--expand}) does Texinfo macro expansion using
 @command{texi2any} instead of the @TeX{} implementation (@pxref{Macro
 Details}).  Each implementation has its own limitations and
-advantages.  If this option is used, no line in the source file
-may begin with the string @code{@@c@tie{}_texi2dvi} or the
-string @code{@@c@tie{}(_texi2dvi)}.
+advantages.
 
 @command{texi2dvi} takes the @option{--build=@var{mode}} option to 
 specify where the @TeX{} compilation takes place, and, as a
diff --git a/util/texi2dvi b/util/texi2dvi
index 1425e7d3a7..28c53ebe44 100755
--- a/util/texi2dvi
+++ b/util/texi2dvi
@@ -1200,10 +1200,9 @@ to tex itself simply not working."
     # (running missing) and then we end up with things like '"-I"',
     # and "-I" (including the quotes) is not an option name.  This
     # happens with gettext 0.14.5, at least.
-    cat "$command_line_filename" \
-      | eval $makeinfo --footnote-style=end -I "$in_dir" $run_mi_includes \
-        -o /dev/null --macro-expand=- \
-        >"$in_src"
+    eval $makeinfo -c TEXINFO_OUTPUT_FORMAT=plaintexinfo --iftex --no-ifinfo \
+          --footnote-style=end -I "$in_dir" $run_mi_includes \
+            "$command_line_filename" >"$in_src"
     # Continue only if everything succeeded.
     if test $? -ne 0 \
        || test ! -r "$in_src"; then