[no subject]

[Patrice Dumas]

branch: master
commit 3ffeb4ca700890038fc96696b315705f5052841c
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Jul 31 13:03:24 2022 +0200

    No @deftypefnnewline effect on typed variable definitions in LaTeX
    
    * tp/Texinfo/Convert/LaTeX.pm (_convert): effect of
    @deftypefnnewline on for deftypefn and deftypeop only.
---
 ChangeLog                                            |  9 ++++++++-
 tp/Texinfo/Convert/LaTeX.pm                          |  3 ++-
 .../converters_tests/test_deftypefnnewline.pl        |  4 ++--
 .../res_parser/formatting_latex/formatting.tex       | 20 ++++++++++----------
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 68656ead24..f122c2c70d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 2022-07-31  Patrice Dumas  <pertusus@free.fr>
 
-       No @deftypefnnewline effect on typed variable definitions
+       No @deftypefnnewline effect on typed variable definitions in LaTeX
+
+       * tp/Texinfo/Convert/LaTeX.pm (_convert): effect of
+       @deftypefnnewline on for deftypefn and deftypeop only.
+
+2022-07-31  Patrice Dumas  <pertusus@free.fr>
+
+       No @deftypefnnewline effect on typed variable definitions in HTML
 
        * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): effect of
        @deftypefnnewline on for deftypefn and deftypeop only.
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 4602d99b57..1d7935b4e7 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -3530,7 +3530,8 @@ sub _convert($$)
         if ($element->{'extra'}->{'def_parsed_hash'}->{'type'}) {
           $result .=  _convert($self,
             $element->{'extra'}->{'def_parsed_hash'}->{'type'});
-          if ($self->get_conf('deftypefnnewline') eq 'on') {
+          if ($self->get_conf('deftypefnnewline') eq 'on'
+              and ($command eq 'deftypefn' or $command eq 'deftypeop')) {
             $result .= '\\leavevmode{}\\\\'; # should be same as @*
           } else {
             $result .= ' ';
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 5052818856..58ef3d6b7e 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -3655,14 +3655,14 @@ d--eftypeop
 \\index[fn]{d--eftypeop\\_name on c--lass@\\texttt{d{-}{-}eftypeop\\_name on 
c{-}{-}lass}}%
 d--eftypeop no arg
 
-\\noindent\\texttt{t{-}{-}ype\\leavevmode{}\\\\d{-}{-}eftypecv\\_name}\\hfill[c--ategory
 of \\texttt{c{-}{-}lass}]
+\\noindent\\texttt{t{-}{-}ype d{-}{-}eftypecv\\_name}\\hfill[c--ategory of 
\\texttt{c{-}{-}lass}]
 
 
 
 \\index[vr]{d--eftypecv\\_name of c--lass@\\texttt{d{-}{-}eftypecv\\_name of 
c{-}{-}lass}}%
 d--eftypecv
 
-\\noindent\\texttt{t{-}{-}ype\\leavevmode{}\\\\d{-}{-}eftypecv\\_name 
a{-}{-}rguments...}\\hfill[c--ategory of \\texttt{c{-}{-}lass}]
+\\noindent\\texttt{t{-}{-}ype d{-}{-}eftypecv\\_name 
a{-}{-}rguments...}\\hfill[c--ategory of \\texttt{c{-}{-}lass}]
 
 
 
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex 
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index 5c150698a1..a438c65180 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -1050,14 +1050,14 @@ d--eftypeop2
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop no arg2
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2}\hfill[c--ategory2 of 
\texttt{c{-}{-}lass2}]
 
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv2
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 of \texttt{c{-}{-}lass2}]
 
 
 
@@ -2378,14 +2378,14 @@ d--eftypeop2
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop no arg2
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2}\hfill[c--ategory2 of 
\texttt{c{-}{-}lass2}]
 
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv2
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 of \texttt{c{-}{-}lass2}]
 
 
 
@@ -3727,14 +3727,14 @@ d--eftypeop2
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop no arg2
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2}\hfill[c--ategory2 of 
\texttt{c{-}{-}lass2}]
 
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv2
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 of \texttt{c{-}{-}lass2}]
 
 
 
@@ -5054,14 +5054,14 @@ d--eftypeop2
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2 on 
c{-}{-}lass2}}%
 d--eftypeop no arg2
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2}\hfill[c--ategory2 of 
\texttt{c{-}{-}lass2}]
 
 
 
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2 of 
c{-}{-}lass2}}%
 d--eftypecv2
 
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 of \texttt{c{-}{-}lass2}]
 
 
 
@@ -6784,7 +6784,7 @@ d{-}{-}eftypeop no arg2
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2}\hfill[c--ategory2
 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2}\hfill[c--ategory2 of 
\texttt{c{-}{-}lass2}]
 
 
 
@@ -6795,7 +6795,7 @@ d{-}{-}eftypecv2
 
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
 
 \endgroup{}%
-\noindent\texttt{t{-}{-}ype2\leavevmode{}\\d{-}{-}eftypecv\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 of \texttt{c{-}{-}lass2}]
+\noindent\texttt{t{-}{-}ype2 d{-}{-}eftypecv\_name2 
a{-}{-}rguments2...}\hfill[c--ategory2 of \texttt{c{-}{-}lass2}]