branch master updated: * tp/Makefile.am (dist_converters_DATA, test_files), tp/tests/formatting/Makefile.am, tp/tests/indices/Makefile.am: add new files.

[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 9cb6358  * tp/Makefile.am (dist_converters_DATA, test_files), 
tp/tests/formatting/Makefile.am, tp/tests/indices/Makefile.am: add new files.
9cb6358 is described below

commit 9cb6358fc7de439f229fe439ce637198c7b1f30d
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Sep 1 09:52:18 2021 +0200

    * tp/Makefile.am (dist_converters_DATA, test_files),
    tp/tests/formatting/Makefile.am, tp/tests/indices/Makefile.am: add
    new files.
    
    * tp/Texinfo/Convert/LaTeX.pm (_convert): use basename for image file
    and not full path.  The same as in other converters.  As a side effect
    helps to pass make distcheck.
---
 ChangeLog                                          | 10 ++++
 man/pod2texi.1                                     |  2 +-
 tp/Makefile.am                                     |  3 +
 tp/Texinfo/Convert/LaTeX.pm                        | 15 +++--
 tp/tests/formatting/Makefile.am                    |  2 +-
 tp/tests/indices/Makefile.am                       |  2 +-
 .../res_parser/formatting_latex/formatting.tex     | 70 +++++++++++-----------
 7 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0a197c8..40c7675 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2021-09-01  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Makefile.am (dist_converters_DATA, test_files),
+       tp/tests/formatting/Makefile.am, tp/tests/indices/Makefile.am: add
+       new files.
+
+       * tp/Texinfo/Convert/LaTeX.pm (_convert): use basename for image file
+       and not full path.  The same as in other converters.  As a side effect
+       helps to pass make distcheck.
+
 2021-08-31  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Makefile.am (dist_modules_DATA): add Texinfo/Translations.pm.
diff --git a/man/pod2texi.1 b/man/pod2texi.1
index 6cd5b93..06a1905 100644
--- a/man/pod2texi.1
+++ b/man/pod2texi.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "POD2TEXI 1"
-.TH POD2TEXI 1 "2021-08-30" "perl v5.32.1" "User Contributed Perl 
Documentation"
+.TH POD2TEXI 1 "2021-08-31" "perl v5.32.1" "User Contributed Perl 
Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/tp/Makefile.am b/tp/Makefile.am
index 6eb6606..74ddef2 100644
--- a/tp/Makefile.am
+++ b/tp/Makefile.am
@@ -90,6 +90,7 @@ dist_converters_DATA = \
  Texinfo/Convert/IXIN.pm \
  Texinfo/Convert/IXINSXML.pm \
  Texinfo/Convert/Info.pm \
+ Texinfo/Convert/LaTeX.pm \
  Texinfo/Convert/Line.pm \
  Texinfo/Convert/NodeNameNormalization.pm \
  Texinfo/Convert/Paragraph.pm \
@@ -162,6 +163,8 @@ test_files = \
  t/init/test_renamed_nodes.init \
  t/init/misc_file_collision.init \
  t/init/l2h.init \
+ t/init/command_translation_modified.init \
+ t/init/translate_txiinternalvalue_macro.init \
  t/test_utils.pl \
  t/input_files/all_spaces.texi \
  t/input_files/at_commands_in_refs.texi \
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index d92a72e..2d3ef7e 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -1933,11 +1933,16 @@ sub _convert($$)
           my $located_file =
             
$self->Texinfo::Common::locate_include_file("$basefile.$extension");
           if (defined($located_file)) {
-            my ($image_volume, $image_directories, $image_filename)
-                 = File::Spec->splitpath($located_file);
-            # using basefile with escaped characters
-            $image_file = File::Spec->catpath($image_volume,
-                                       $image_directories, 
$converted_basefile);
+            # use the basename and not the file found.  It is agreed that it is
+            # better, since in any case the files are moved.
+            # using basefile with escaped characters, no extension to let 
LaTeX choose the
+            # extension
+            $image_file = $converted_basefile;
+            #my ($image_volume, $image_directories, $image_filename)
+            #     = File::Spec->splitpath($located_file);
+            ## using basefile with escaped characters
+            #$image_file = File::Spec->catpath($image_volume,
+            #                           $image_directories, 
$converted_basefile);
           }
         }
         if (not defined($image_file)) {
diff --git a/tp/tests/formatting/Makefile.am b/tp/tests/formatting/Makefile.am
index b13ba71..9c23f25 100644
--- a/tp/tests/formatting/Makefile.am
+++ b/tp/tests/formatting/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST = \
- simplest.texi \
+ simplest.texi documentlanguage.texi \
  ignore_and_comments.texi   split_nocopying.texi \
  inc_file.texi              test_need.texi \
  lightweight_markups.texi   japanese_long_name.texi  \
diff --git a/tp/tests/indices/Makefile.am b/tp/tests/indices/Makefile.am
index 1f0a6c4..2056d1e 100644
--- a/tp/tests/indices/Makefile.am
+++ b/tp/tests/indices/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = index_table.texi index_split.texi \
  index_one_node.texi index_no_node_no_top.texi \
  same_doc_nr_split_index_and_element.texi \
  printindex_between_part_chapter.texi \
- index_test.init \
+ indices_in_begin_tables_lists.texi \
  list-of-tests res_parser res_parser_info
 
 DISTCLEANFILES = tests.log tests.out
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex 
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index 18e8d8d..a7595a0 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -311,12 +311,12 @@ but , ,\@
 \texttt{@footnote\{in footnote\}} \footnote{in footnote}
 \texttt{@footnote\{in footnote2\}} \footnote{in footnote2}
 
-\texttt{@image\{f{-}{-}ile\}} \includegraphics{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,l{-}{-}i\}} 
\includegraphics[width=l--i]{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,,l{-}{-}e\}} 
\includegraphics[height=l--e]{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,,,alt\}} \includegraphics{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,,,,.e-d-xt\}} \includegraphics{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,aze,az,alt,.e{-}{-}xt\}} 
\includegraphics[width=aze,height=az]{layout/f--ile}
+\texttt{@image\{f{-}{-}ile\}} \includegraphics{f--ile}
+\texttt{@image\{f{-}{-}ile,l{-}{-}i\}} \includegraphics[width=l--i]{f--ile}
+\texttt{@image\{f{-}{-}ile,,l{-}{-}e\}} \includegraphics[height=l--e]{f--ile}
+\texttt{@image\{f{-}{-}ile,,,alt\}} \includegraphics{f--ile}
+\texttt{@image\{f{-}{-}ile,,,,.e-d-xt\}} \includegraphics{f--ile}
+\texttt{@image\{f{-}{-}ile,aze,az,alt,.e{-}{-}xt\}} 
\includegraphics[width=aze,height=az]{f--ile}
 \texttt{@image\{f-ile,aze,,a{-}{-}lt\}} \includegraphics[width=aze]{f-ile}
 \texttt{@image\{@file\{f{-}{-}ile\}@@@.,aze,az,alt,@file\{.file ext\} 
e{-}{-}xt@\}} \includegraphics[width=aze,height=az]{f--ile@.}
 
@@ -991,7 +991,7 @@ $\frac{a < b \texttt{tex \hbox{ code }}}{b}$ ``
 \texttt{@math\{{-}{-}a@minus\{\} \{\textbackslash{}frac\{1\}\{2\}\}\}} $--a- 
{\frac{1}{2}}$
 
 \texttt{@image\{f-ile,,,alt@verb\{:jk \_" \%\@\}\}} \includegraphics{f-ile}
-\texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\} @b\{in b 
"\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{layout/f--ile}
+\texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\} @b\{in b 
"\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{f--ile}
 \texttt{@image\{file@verb\{:jk \_" \%@:\},,,alt@verb\{:jk \_" \%@:\}\}} 
\includegraphics{filejk \_" \%@}
 
 
@@ -1317,12 +1317,12 @@ but , ,\@
 \texttt{@footnote\{in footnote\}} \footnote{in footnote}
 \texttt{@footnote\{in footnote2\}} \footnote{in footnote2}
 
-\texttt{@image\{f{-}{-}ile\}} \includegraphics{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,l{-}{-}i\}} 
\includegraphics[width=l--i]{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,,l{-}{-}e\}} 
\includegraphics[height=l--e]{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,,,alt\}} \includegraphics{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,,,,.e-d-xt\}} \includegraphics{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,aze,az,alt,.e{-}{-}xt\}} 
\includegraphics[width=aze,height=az]{layout/f--ile}
+\texttt{@image\{f{-}{-}ile\}} \includegraphics{f--ile}
+\texttt{@image\{f{-}{-}ile,l{-}{-}i\}} \includegraphics[width=l--i]{f--ile}
+\texttt{@image\{f{-}{-}ile,,l{-}{-}e\}} \includegraphics[height=l--e]{f--ile}
+\texttt{@image\{f{-}{-}ile,,,alt\}} \includegraphics{f--ile}
+\texttt{@image\{f{-}{-}ile,,,,.e-d-xt\}} \includegraphics{f--ile}
+\texttt{@image\{f{-}{-}ile,aze,az,alt,.e{-}{-}xt\}} 
\includegraphics[width=aze,height=az]{f--ile}
 \texttt{@image\{f-ile,aze,,a{-}{-}lt\}} \includegraphics[width=aze]{f-ile}
 \texttt{@image\{@file\{f{-}{-}ile\}@@@.,aze,az,alt,@file\{.file ext\} 
e{-}{-}xt@\}} \includegraphics[width=aze,height=az]{f--ile@.}
 
@@ -1995,7 +1995,7 @@ $\frac{a < b \texttt{tex \hbox{ code }}}{b}$ ``
 \texttt{@math\{{-}{-}a@minus\{\} \{\textbackslash{}frac\{1\}\{2\}\}\}} $--a- 
{\frac{1}{2}}$
 
 \texttt{@image\{f-ile,,,alt@verb\{:jk \_" \%\@\}\}} \includegraphics{f-ile}
-\texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\} @b\{in b 
"\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{layout/f--ile}
+\texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\} @b\{in b 
"\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{f--ile}
 \texttt{@image\{file@verb\{:jk \_" \%@:\},,,alt@verb\{:jk \_" \%@:\}\}} 
\includegraphics{filejk \_" \%@}
 
 
@@ -2337,12 +2337,12 @@ but , ,\@
 \texttt{@footnote\{in footnote\}} \footnote{in footnote}
 \texttt{@footnote\{in footnote2\}} \footnote{in footnote2}
 
-\texttt{@image\{f{-}{-}ile\}} \includegraphics{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,l{-}{-}i\}} 
\includegraphics[width=l--i]{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,,l{-}{-}e\}} 
\includegraphics[height=l--e]{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,,,alt\}} \includegraphics{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,,,,.e-d-xt\}} \includegraphics{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,aze,az,alt,.e{-}{-}xt\}} 
\includegraphics[width=aze,height=az]{layout/f--ile}
+\texttt{@image\{f{-}{-}ile\}} \includegraphics{f--ile}
+\texttt{@image\{f{-}{-}ile,l{-}{-}i\}} \includegraphics[width=l--i]{f--ile}
+\texttt{@image\{f{-}{-}ile,,l{-}{-}e\}} \includegraphics[height=l--e]{f--ile}
+\texttt{@image\{f{-}{-}ile,,,alt\}} \includegraphics{f--ile}
+\texttt{@image\{f{-}{-}ile,,,,.e-d-xt\}} \includegraphics{f--ile}
+\texttt{@image\{f{-}{-}ile,aze,az,alt,.e{-}{-}xt\}} 
\includegraphics[width=aze,height=az]{f--ile}
 \texttt{@image\{f-ile,aze,,a{-}{-}lt\}} \includegraphics[width=aze]{f-ile}
 \texttt{@image\{@file\{f{-}{-}ile\}@@@.,aze,az,alt,@file\{.file ext\} 
e{-}{-}xt@\}} \includegraphics[width=aze,height=az]{f--ile@.}
 
@@ -3014,7 +3014,7 @@ $\frac{a < b \texttt{tex \hbox{ code }}}{b}$ ``
 \texttt{@math\{{-}{-}a@minus\{\} \{\textbackslash{}frac\{1\}\{2\}\}\}} $--a- 
{\frac{1}{2}}$
 
 \texttt{@image\{f-ile,,,alt@verb\{:jk \_" \%\@\}\}} \includegraphics{f-ile}
-\texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\} @b\{in b 
"\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{layout/f--ile}
+\texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\} @b\{in b 
"\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{f--ile}
 \texttt{@image\{file@verb\{:jk \_" \%@:\},,,alt@verb\{:jk \_" \%@:\}\}} 
\includegraphics{filejk \_" \%@}
 
 
@@ -3339,12 +3339,12 @@ but , ,\@
 \texttt{@footnote\{in footnote\}} \footnote{in footnote}
 \texttt{@footnote\{in footnote2\}} \footnote{in footnote2}
 
-\texttt{@image\{f{-}{-}ile\}} \includegraphics{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,l{-}{-}i\}} 
\includegraphics[width=l--i]{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,,l{-}{-}e\}} 
\includegraphics[height=l--e]{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,,,alt\}} \includegraphics{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,,,,.e-d-xt\}} \includegraphics{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,aze,az,alt,.e{-}{-}xt\}} 
\includegraphics[width=aze,height=az]{layout/f--ile}
+\texttt{@image\{f{-}{-}ile\}} \includegraphics{f--ile}
+\texttt{@image\{f{-}{-}ile,l{-}{-}i\}} \includegraphics[width=l--i]{f--ile}
+\texttt{@image\{f{-}{-}ile,,l{-}{-}e\}} \includegraphics[height=l--e]{f--ile}
+\texttt{@image\{f{-}{-}ile,,,alt\}} \includegraphics{f--ile}
+\texttt{@image\{f{-}{-}ile,,,,.e-d-xt\}} \includegraphics{f--ile}
+\texttt{@image\{f{-}{-}ile,aze,az,alt,.e{-}{-}xt\}} 
\includegraphics[width=aze,height=az]{f--ile}
 \texttt{@image\{f-ile,aze,,a{-}{-}lt\}} \includegraphics[width=aze]{f-ile}
 \texttt{@image\{@file\{f{-}{-}ile\}@@@.,aze,az,alt,@file\{.file ext\} 
e{-}{-}xt@\}} \includegraphics[width=aze,height=az]{f--ile@.}
 
@@ -4016,7 +4016,7 @@ $\frac{a < b \texttt{tex \hbox{ code }}}{b}$ ``
 \texttt{@math\{{-}{-}a@minus\{\} \{\textbackslash{}frac\{1\}\{2\}\}\}} $--a- 
{\frac{1}{2}}$
 
 \texttt{@image\{f-ile,,,alt@verb\{:jk \_" \%\@\}\}} \includegraphics{f-ile}
-\texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\} @b\{in b 
"\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{layout/f--ile}
+\texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\} @b\{in b 
"\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{f--ile}
 \texttt{@image\{file@verb\{:jk \_" \%@:\},,,alt@verb\{:jk \_" \%@:\}\}} 
\includegraphics{filejk \_" \%@}
 
 
@@ -4342,12 +4342,12 @@ but , ,\@
 \texttt{@footnote\{in footnote\}} \footnote{in footnote}
 \texttt{@footnote\{in footnote2\}} \footnote{in footnote2}
 
-\texttt{@image\{f{-}{-}ile\}} \includegraphics{layout/f{-}{-}ile}
-\texttt{@image\{f{-}{-}ile,l{-}{-}i\}} 
\includegraphics[width=l--i]{layout/f{-}{-}ile}
-\texttt{@image\{f{-}{-}ile,,l{-}{-}e\}} 
\includegraphics[height=l--e]{layout/f{-}{-}ile}
-\texttt{@image\{f{-}{-}ile,,,alt\}} \includegraphics{layout/f{-}{-}ile}
-\texttt{@image\{f{-}{-}ile,,,,.e-d-xt\}} \includegraphics{layout/f{-}{-}ile}
-\texttt{@image\{f{-}{-}ile,aze,az,alt,.e{-}{-}xt\}} 
\includegraphics[width=aze,height=az]{layout/f{-}{-}ile}
+\texttt{@image\{f{-}{-}ile\}} \includegraphics{f{-}{-}ile}
+\texttt{@image\{f{-}{-}ile,l{-}{-}i\}} \includegraphics[width=l--i]{f{-}{-}ile}
+\texttt{@image\{f{-}{-}ile,,l{-}{-}e\}} 
\includegraphics[height=l--e]{f{-}{-}ile}
+\texttt{@image\{f{-}{-}ile,,,alt\}} \includegraphics{f{-}{-}ile}
+\texttt{@image\{f{-}{-}ile,,,,.e-d-xt\}} \includegraphics{f{-}{-}ile}
+\texttt{@image\{f{-}{-}ile,aze,az,alt,.e{-}{-}xt\}} 
\includegraphics[width=aze,height=az]{f{-}{-}ile}
 \texttt{@image\{f-ile,aze,,a{-}{-}lt\}} \includegraphics[width=aze]{f-ile}
 \texttt{@image\{@file\{f{-}{-}ile\}@@@.,aze,az,alt,@file\{.file ext\} 
e{-}{-}xt@\}} \includegraphics[width=aze,height=az]{f{-}{-}ile@.}
 
@@ -5031,7 +5031,7 @@ $\frac{a < b \texttt{tex \hbox{ code }}}{b}$ ``
 \texttt{@math\{{-}{-}a@minus\{\} \{\textbackslash{}frac\{1\}\{2\}\}\}} $--a- 
{\frac{1}{2}}$
 
 \texttt{@image\{f-ile,,,alt@verb\{:jk \_" \%\@\}\}} \includegraphics{f-ile}
-\texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\} @b\{in b 
"\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{layout/f{-}{-}ile}
+\texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\} @b\{in b 
"\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{f{-}{-}ile}
 \texttt{@image\{file@verb\{:jk \_" \%@:\},,,alt@verb\{:jk \_" \%@:\}\}} 
\includegraphics{filejk \_" \%@}