branch master updated: * tp/Texinfo/Convert/LaTeX.pm: replace form feeds in ignorable spaces by \par{}.

[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 f490f9904a * tp/Texinfo/Convert/LaTeX.pm: replace form feeds in 
ignorable spaces by \par{}.
f490f9904a is described below

commit f490f9904a6a79e36944c5726a7324cedd2fe6d9
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Aug 25 12:12:18 2022 +0200

    * tp/Texinfo/Convert/LaTeX.pm: replace form feeds in ignorable
    spaces by \par{}.
---
 ChangeLog                                            |  5 +++++
 tp/Texinfo/Convert/LaTeX.pm                          | 20 +++++---------------
 tp/t/results/latex_tests/nested_enumerate.pl         |  8 ++++----
 .../nested_enumerate/res_latex/nested_enumerate.tex  |  8 ++++----
 tp/t/results/latex_tests/nested_itemize.pl           |  8 ++++----
 .../nested_itemize/res_latex/nested_itemize.tex      |  8 ++++----
 6 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5a3272d42d..089bac216c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-08-25  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/LaTeX.pm: replace form feeds in ignorable
+       spaces by \par{}.
+
 2022-08-24  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Makefile.am (dist_init_DATA): add init/documentation_examples.pm.
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 6f01eed8c3..49bacd78a7 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -28,12 +28,11 @@
 #\tableofcontents
 #}
 #
-# There is something about form feeds to do.  There is some processing of form
-# feeds right now, which simply amounts to keeping them in ignorable spaces
-# (and with another condition that may not be relevant for LaTeX as the code
-# comes from Plaintext). In the manual it is said form feed (CTRL-l) characters
+# There is more about form feeds to do: form feed (CTRL-l) characters
 # in the input are handled as follows: in PDF/DVI In normal text, treated as
 # ending any open paragraph; essentially ignored between paragraphs.
+# We can use \par everywhere (except maybe in @example?) as multiple \par
+# are the same as one, or as an empty line.
 #
 # LaTeX seems to always break at -, and never at _.  If @allowcodebreaks
 # is true \_ should be set to be a possible break point.  Seems that it
@@ -2030,14 +2029,6 @@ sub _tree_anchor_label {
   return "anchor:$label";
 }
 
-sub _get_form_feeds($)
-{
-  my $form_feeds = shift;
-  $form_feeds =~ s/^[^\f]*//;
-  $form_feeds =~ s/[^\f]$//;
-  return $form_feeds;
-}
-
 my %LaTeX_see_index_commands_text = (
   'seeentry' => 'see',
   'seealso' => 'seealso'
@@ -2226,10 +2217,9 @@ sub _convert($$)
 
   # in ignorable spaces, keep only form feeds.
   if ($type and $self->{'ignorable_space_types'}->{$type}
-      and ($type ne 'empty_spaces_before_paragraph'
-           or $self->get_conf('paragraphindent') ne 'asis')) {
+      and ($type ne 'empty_spaces_before_paragraph')) {
     if ($element->{'text'} =~ /\f/) {
-      $result = _get_form_feeds($element->{'text'});
+      $result = '\par{}';
     }
     return $result;
   }
diff --git a/tp/t/results/latex_tests/nested_enumerate.pl 
b/tp/t/results/latex_tests/nested_enumerate.pl
index e9d5a0a24f..e78f09b3f0 100644
--- a/tp/t/results/latex_tests/nested_enumerate.pl
+++ b/tp/t/results/latex_tests/nested_enumerate.pl
@@ -663,16 +663,16 @@ $result_floats{'nested_enumerate'} = {};
 $result_converted{'latex'}->{'nested_enumerate'} = '
 \\begin{document}
 \\begin{enumerate}[start=1]
-\\item First level item
+   \\item First level item
    \\item First level item
 \\begin{enumerate}[start=1]
-\\item Second level item
+     \\item Second level item
      \\item Second level item
 \\begin{enumerate}[start=1]
-\\item Third level item
+       \\item Third level item
        \\item Third level item
 \\begin{enumerate}[start=1]
-\\item Fourth level item
+         \\item Fourth level item
          \\item Fourth level item
 \\end{enumerate}
 \\end{enumerate}
diff --git 
a/tp/t/results/latex_tests/nested_enumerate/res_latex/nested_enumerate.tex 
b/tp/t/results/latex_tests/nested_enumerate/res_latex/nested_enumerate.tex
index 1f5078fd5e..1169128ded 100644
--- a/tp/t/results/latex_tests/nested_enumerate/res_latex/nested_enumerate.tex
+++ b/tp/t/results/latex_tests/nested_enumerate/res_latex/nested_enumerate.tex
@@ -65,16 +65,16 @@
 
 \begin{document}
 \begin{enumerate}[start=1]
-\item First level item
+   \item First level item
    \item First level item
 \begin{enumerate}[start=1]
-\item Second level item
+     \item Second level item
      \item Second level item
 \begin{enumerate}[start=1]
-\item Third level item
+       \item Third level item
        \item Third level item
 \begin{enumerate}[start=1]
-\item Fourth level item
+         \item Fourth level item
          \item Fourth level item
 \end{enumerate}
 \end{enumerate}
diff --git a/tp/t/results/latex_tests/nested_itemize.pl 
b/tp/t/results/latex_tests/nested_itemize.pl
index d238c5c843..c61ee3d088 100644
--- a/tp/t/results/latex_tests/nested_itemize.pl
+++ b/tp/t/results/latex_tests/nested_itemize.pl
@@ -693,16 +693,16 @@ $result_floats{'nested_itemize'} = {};
 
 $result_converted{'latex'}->{'nested_itemize'} = '\\begin{document}
 \\begin{itemize}
-\\item First level item
+   \\item First level item
    \\item First level item
 \\begin{itemize}
-\\item Second level item
+     \\item Second level item
      \\item Second level item
 \\begin{itemize}
-\\item Third level item
+       \\item Third level item
        \\item Third level item
 \\begin{itemize}
-\\item Fourth level item
+         \\item Fourth level item
          \\item Fourth level item
 \\end{itemize}
 \\end{itemize}
diff --git 
a/tp/t/results/latex_tests/nested_itemize/res_latex/nested_itemize.tex 
b/tp/t/results/latex_tests/nested_itemize/res_latex/nested_itemize.tex
index 86f446e92c..750913a31c 100644
--- a/tp/t/results/latex_tests/nested_itemize/res_latex/nested_itemize.tex
+++ b/tp/t/results/latex_tests/nested_itemize/res_latex/nested_itemize.tex
@@ -64,16 +64,16 @@
 
 \begin{document}
 \begin{itemize}
-\item First level item
+   \item First level item
    \item First level item
 \begin{itemize}
-\item Second level item
+     \item Second level item
      \item Second level item
 \begin{itemize}
-\item Third level item
+       \item Third level item
        \item Third level item
 \begin{itemize}
-\item Fourth level item
+         \item Fourth level item
          \item Fourth level item
 \end{itemize}
 \end{itemize}