texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/Texinfo/Convert/TexinfoXML.pm (_convert): no


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Convert/TexinfoXML.pm (_convert): no empty_line_after_command nor last_raw_newline in raw format comand/rawpreformatted anymore.
Date: Sat, 10 Sep 2022 06:05:03 -0400

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 61ba939378 * tp/Texinfo/Convert/TexinfoXML.pm (_convert): no 
empty_line_after_command nor last_raw_newline in raw format 
comand/rawpreformatted anymore.
61ba939378 is described below

commit 61ba939378b67be5b790019582a0de25049dd24d
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Sep 10 12:04:53 2022 +0200

    * tp/Texinfo/Convert/TexinfoXML.pm (_convert): no empty_line_after_command
    nor last_raw_newline in raw format comand/rawpreformatted anymore.
---
 ChangeLog                        | 5 +++++
 tp/Texinfo/Convert/TexinfoXML.pm | 8 +-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 690736a06f..3ccc930d0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-09-10  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/TexinfoXML.pm (_convert): no 
empty_line_after_command
+       nor last_raw_newline in raw format comand/rawpreformatted anymore.
+
 2022-09-10  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (_parse_texi),
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index 7d8c907498..bc18feb522 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -757,13 +757,7 @@ sub _convert($$;$)
   return '' if ($element->{'type'} and $ignored_types{$element->{'type'}});
   if (defined($element->{'text'})) {
     if ($self->{'document_context'}->[-1]->{'raw'}) {
-      # ignore the newline at the end of the @xml line, and the last in xml
-      if ($element->{'type'} and ($element->{'type'} eq 
'empty_line_after_command'
-                               or $element->{'type'} eq 'last_raw_newline')) {
-        return '';
-      } else {
-        return $element->{'text'};
-      }
+      return $element->{'text'};
     }
     return $self->format_text($element);
   }



reply via email to

[Prev in Thread] Current Thread [Next in Thread]