branch master updated: * doc/Makefile.am (TEXI2DVI, TEXI2DVI_ENVIRONMENT), doc/tp_api/Makefile.am (TEXI2DVI, TEXI2DVI_ENVIRONMENT): use in-source texindex and texi2dvi.

[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 686a68fe79 * doc/Makefile.am (TEXI2DVI, TEXI2DVI_ENVIRONMENT), 
doc/tp_api/Makefile.am (TEXI2DVI, TEXI2DVI_ENVIRONMENT): use in-source texindex 
and texi2dvi.
686a68fe79 is described below

commit 686a68fe7960c265221f134d255fdfbc8dddefc8
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Dec 5 11:31:02 2022 +0100

    * doc/Makefile.am (TEXI2DVI, TEXI2DVI_ENVIRONMENT),
    doc/tp_api/Makefile.am (TEXI2DVI, TEXI2DVI_ENVIRONMENT): use in-source
    texindex and texi2dvi.
    
    * tp/Makefile.tres: update.
---
 ChangeLog              |  8 ++++++++
 doc/Makefile.am        |  7 ++++++-
 doc/tp_api/Makefile.am | 14 +++++++++++---
 tp/Makefile.tres       | 10 ++++++++++
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c28049a790..c222ef9f7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-12-05  Patrice Dumas  <pertusus@free.fr>
+
+       * doc/Makefile.am (TEXI2DVI, TEXI2DVI_ENVIRONMENT),
+       doc/tp_api/Makefile.am (TEXI2DVI, TEXI2DVI_ENVIRONMENT): use in-source
+       texindex and texi2dvi.
+
+       * tp/Makefile.tres: update.
+
 2022-12-04  Patrice Dumas  <pertusus@free.fr>
 
        * tp/t/57invalid_nestings.t: add tests of section command interrupting
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 407a38c0fc..cae6c669c1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -23,7 +23,12 @@ MAKEINFO_ENVIRONMENT = TEXINFO_DEV_SOURCE=1 ; export 
TEXINFO_DEV_SOURCE ; \
                        top_srcdir="$(top_srcdir)" ; export top_srcdir ; \
                        top_builddir="$(top_builddir)" ; export top_builddir ;
 MAKEINFO = $(MAKEINFO_ENVIRONMENT) $(PERL) $(top_builddir)/tp/texi2any
-TEXI2DVI = $(top_srcdir)/util/texi2dvi
+
+# NOTE the four ../ are needed because texi2dvi runs texindex from the build 
dir
+# texi2any_internals.t2d/texi2any_internals.t2d/dvi/build/
+TEXI2DVI_ENVIRONMENT = TEXINDEX=$(top_builddir)/../../../../texindex/texindex 
; export TEXINDEX ; \
+                       
TEXINDEX_SCRIPT=$(top_srcdir)/../../../../texindex/texindex.awk ; export 
TEXINDEX_SCRIPT ;
+TEXI2DVI = $(TEXI2DVI_ENVIRONMENT) $(top_srcdir)/util/texi2dvi
 
 # include pod2texi in the main manual
 pod2texi_pl = $(abs_top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl
diff --git a/doc/tp_api/Makefile.am b/doc/tp_api/Makefile.am
index 12bf6f72ef..19736c4b4d 100644
--- a/doc/tp_api/Makefile.am
+++ b/doc/tp_api/Makefile.am
@@ -17,6 +17,12 @@ AM_MAKEINFOFLAGS = -c INFO_SPECIAL_CHARS_WARNING=0
 # out-of-source builds.
 MAKEINFO = $(PERL) -I $(top_builddir)/tp/ -I $(top_srcdir)/tp/ 
$(top_srcdir)/tp/texi2any.pl
 
+# NOTE the four ../ are needed because texi2dvi runs texindex from the build 
dir
+# texi2any_internals.t2d/texi2any_internals.t2d/dvi/build/
+TEXI2DVI_ENVIRONMENT = TEXINDEX=$(top_builddir)/../../../../texindex/texindex 
; export TEXINDEX ; \
+                       
TEXINDEX_SCRIPT=$(top_srcdir)/../../../../texindex/texindex.awk ; export 
TEXINDEX_SCRIPT ;
+TEXI2DVI = $(TEXI2DVI_ENVIRONMENT) $(top_srcdir)/util/texi2dvi
+
 # the pod files are formatted like man pages.  If HTML is split at node
 # or section, this results in some very short sections at the beginning
 # of each module, so split at chapters.
@@ -28,10 +34,12 @@ info_TEXINFOS = texi2any_internals.texi
 
 TEXINFO_TEX = ../texinfo.tex
 
-# dependencies are in api_includes/ directory but we do not want to list
-# them explicitly
+# Most dependencies are in api_includes/ directory but we do not want
+# to list them explicitly
 texi2any_internals_TEXINFOS = texi2any_internals_indices.texi
-#dist_texi2any_internals_TEXINFOS = 
+
+# texi2any_internals_preamble.texi is not included but passed on the
+# standard input when building texi2any_internals.texi.
 EXTRA_DIST = texi2any_internals_preamble.texi api_includes
 
 if BUILD_PERL_API_TEXI
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index 7d19f69648..3182b7e6f4 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -160,7 +160,10 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/converters_tests/inline.pl \
   t/results/converters_tests/inline_expand_tex.pl \
   t/results/converters_tests/inlinefmtifelse.pl \
+  t/results/converters_tests/inlinefmtspaces.pl \
   t/results/converters_tests/inlineifsetifclear.pl \
+  t/results/converters_tests/inlineifsetifclearspaces.pl \
+  t/results/converters_tests/inlinerawspaces.pl \
   t/results/converters_tests/line_breaks.pl \
   t/results/converters_tests/minimal_empty_empty.pl \
   
t/results/converters_tests/minimal_empty_empty/res_docbook/minimal_empty_empty.xml
 \
@@ -935,7 +938,12 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/invalid_nestings/section_in_table.pl \
   t/results/invalid_nestings/section_on_def_line.pl \
   t/results/invalid_nestings/section_on_defx_line.pl \
+  t/results/invalid_nestings/section_on_enumerate_line.pl \
+  t/results/invalid_nestings/section_on_float_line.pl \
   t/results/invalid_nestings/section_on_index_entry_line.pl \
+  t/results/invalid_nestings/section_on_itemize_line.pl \
+  t/results/invalid_nestings/section_on_multitable_line.pl \
+  t/results/invalid_nestings/section_on_xtable_line.pl \
   t/results/invalid_nestings/style_not_closed_before_first_node.pl \
   t/results/invalid_nestings/style_not_closed_in_block_command.pl \
   t/results/invalid_nestings/style_not_closed_in_table_line.pl \
@@ -1064,6 +1072,8 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   
t/results/latex_tests/two_setchapternewpage_on_odd/res_latex/two_setchapternewpage_on_odd.tex
 \
   t/results/latex_tests/vbar_in_index.pl \
   t/results/latex_tests/vbar_in_index/res_latex/vbar_in_index.tex \
+  t/results/latex_tests/verb.pl \
+  t/results/latex_tests/verb/res_latex/verb.tex \
   t/results/latex_tests/verbatim_in_smallformat.pl \
   
t/results/latex_tests/verbatim_in_smallformat/res_latex/verbatim_in_smallformat.tex
 \
   t/results/layout/navigation.pl \