texinfo/tp Texinfo/Convert/Plaintext.pm Texinfo...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/08/23 16:58:20

Modified files:
        tp/Texinfo/Convert: Plaintext.pm XML.pm 
        tp/t/results/converters_tests: things_before_setfilename.pl 
                                       things_before_setfilename_no_element.pl 
        tp/t/results/coverage: flushleft_flushright_in_quotation.pl 
                               hyphenation.pl item_container.pl 
        tp/t/results/menu: menu_pointing_to_anchor.pl 
        tp/t/results/sectioning: double_node_anchor_float.pl 
        tp/tests/layout/res_parser/formatting_xml: formatting.xml 

Log message:
        Do not remove spaces before paragraphs and after  commands with braces
        such as @anchor.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.222&r2=1.223
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/things_before_setfilename.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/things_before_setfilename_no_element.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/flushleft_flushright_in_quotation.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/hyphenation.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/item_container.pl?cvsroot=texinfo&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_pointing_to_anchor.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl?cvsroot=texinfo&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml?cvsroot=texinfo&r1=1.5&r2=1.6

Patches:
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -b -r1.222 -r1.223
--- Texinfo/Convert/Plaintext.pm        5 Aug 2012 16:44:08 -0000       1.222
+++ Texinfo/Convert/Plaintext.pm        23 Aug 2012 16:58:19 -0000      1.223
@@ -1312,7 +1312,9 @@
     #print STDERR "  Special def_command: $root->{'extra'}->{'def_command'}\n"
     #  if (defined($root->{'extra'}) and $root->{'extra'}->{'def_command'});
     if ($formatter) {
-      print STDERR "  
Container:($formatter->{'font_type_stack'}->[-1]->{'monospace'},$formatter->{'upper_case'},$formatter->{'frenchspacing_stack'}->[-1])
 ";
+      my $monospace = $formatter->{'font_type_stack'}->[-1]->{'monospace'};
+      $monospace = 'UNDEF' if (!defined($monospace));
+      print STDERR "  
Container:($monospace,$formatter->{'upper_case'},$formatter->{'frenchspacing_stack'}->[-1])
 ";
       $formatter->{'container'}->dump();
     }
   }

Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- Texinfo/Convert/XML.pm      22 Aug 2012 21:45:11 -0000      1.68
+++ Texinfo/Convert/XML.pm      23 Aug 2012 16:58:19 -0000      1.69
@@ -209,13 +209,14 @@
  'deftp'     => 'datatype',
 );
 
+# FIXME none should be ignored
 my %ignored_types;
 foreach my $type (#'empty_line_after_command',
             'empty_spaces_after_command', 
-            'empty_spaces_before_argument', 'empty_spaces_before_paragraph',
-            'empty_spaces_after_close_brace', 
+            'empty_spaces_before_argument', 
+            #'empty_spaces_before_paragraph',
+            #'empty_spaces_after_close_brace', 
             'empty_space_at_end_def_bracketed',
-            # FIXME keep those? Information is lost...
             'menu_entry_separator',
             'menu_entry_leading_text',
   ) {

Index: t/results/converters_tests/things_before_setfilename.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/converters_tests/things_before_setfilename.pl     14 Aug 2012 
07:35:39 -0000      1.6
+++ t/results/converters_tests/things_before_setfilename.pl     23 Aug 2012 
16:58:19 -0000      1.7
@@ -1782,6 +1782,7 @@
 $result_converted{'xml'}->{'things_before_setfilename'} = '<preamble>\\input 
texinfo
 
 </preamble><anchor name="An-anchor">An anchor</anchor>
+
 <para>Ref to the anchor:
 <ref><xrefnodename>An anchor</xrefnodename></ref>
 </para>
@@ -1791,6 +1792,7 @@
 <para><footnote><para>In footnote.
 </para>
 <anchor name="Anchor-in-footnote">Anchor in footnote</anchor>
+
 <para>Ref to main text anchor
 <ref><xrefnodename>An anchor</xrefnodename></ref>
 </para></footnote>

Index: t/results/converters_tests/things_before_setfilename_no_element.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename_no_element.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/converters_tests/things_before_setfilename_no_element.pl  14 Aug 
2012 07:35:39 -0000      1.6
+++ t/results/converters_tests/things_before_setfilename_no_element.pl  23 Aug 
2012 16:58:19 -0000      1.7
@@ -1605,6 +1605,7 @@
 $result_converted{'xml'}->{'things_before_setfilename_no_element'} = 
'<preamble>\\input texinfo
 
 </preamble><anchor name="An-anchor">An anchor</anchor>
+
 <para>Ref to the anchor:
 <ref><xrefnodename>An anchor</xrefnodename></ref>
 </para>
@@ -1614,6 +1615,7 @@
 <para><footnote><para>In footnote.
 </para>
 <anchor name="Anchor-in-footnote">Anchor in footnote</anchor>
+
 <para>Ref to main text anchor
 <ref><xrefnodename>An anchor</xrefnodename></ref>
 </para></footnote>

Index: t/results/coverage/flushleft_flushright_in_quotation.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/flushleft_flushright_in_quotation.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/coverage/flushleft_flushright_in_quotation.pl     1 Oct 2011 
10:29:26 -0000       1.15
+++ t/results/coverage/flushleft_flushright_in_quotation.pl     23 Aug 2012 
16:58:19 -0000      1.16
@@ -326,11 +326,11 @@
 $result_converted{'xml'}->{'flushleft_flushright_in_quotation'} = '
 <quotation>
 <flushleft>
-<para>f l
+   <para>f l
 </para></flushleft>
 
 <flushright>
-<para>f r
+  <para>f r
 </para></flushright>
 </quotation>
 ';

Index: t/results/coverage/hyphenation.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/hyphenation.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/coverage/hyphenation.pl   1 Oct 2011 10:29:26 -0000       1.12
+++ t/results/coverage/hyphenation.pl   23 Aug 2012 16:58:19 -0000      1.13
@@ -79,6 +79,7 @@
 
 $result_converted{'xml'}->{'hyphenation'} = '
 <hyphenation>some-where </hyphenation>
+
 ';
 
 

Index: t/results/coverage/item_container.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/item_container.pl,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- t/results/coverage/item_container.pl        13 Feb 2012 22:38:01 -0000      
1.47
+++ t/results/coverage/item_container.pl        23 Aug 2012 16:58:19 -0000      
1.48
@@ -500,7 +500,7 @@
 
 <itemize commandarg="bullet"><itemprepend>&bullet;</itemprepend>
 <listitem><prepend>&bullet;</prepend>
-<para>b&textndash;ullet
+ <para>b&textndash;ullet
 </para></listitem></itemize>
 
 <itemize commandarg="bullet">

Index: t/results/menu/menu_pointing_to_anchor.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_pointing_to_anchor.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/menu/menu_pointing_to_anchor.pl   14 Aug 2012 07:35:50 -0000      
1.5
+++ t/results/menu/menu_pointing_to_anchor.pl   23 Aug 2012 16:58:19 -0000      
1.6
@@ -550,6 +550,7 @@
 <para>Text
 </para>
 <anchor name="An-anchor">An anchor</anchor>
+
 <menu>
 <menuentry><menunode>An anchor</menunode><menudescription><pre 
xml:space="preserve">menu entry pointing to the anchor.
 </pre></menudescription></menuentry></menu>

Index: t/results/sectioning/double_node_anchor_float.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- t/results/sectioning/double_node_anchor_float.pl    14 Aug 2012 07:35:52 
-0000      1.33
+++ t/results/sectioning/double_node_anchor_float.pl    23 Aug 2012 16:58:20 
-0000      1.34
@@ -1133,7 +1133,9 @@
 <node name=""><nodename></nodename></node>
 
 <anchor name="">node1</anchor>
+
 <anchor name="anchor1">anchor1</anchor>
+
 <node name=""><nodename></nodename></node>
 
 <float type="Text"><floattype>Text</floattype><floatname>node1</floatname>

Index: tests/layout/res_parser/formatting_xml/formatting.xml
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tests/layout/res_parser/formatting_xml/formatting.xml       22 Aug 2012 
21:45:14 -0000      1.5
+++ tests/layout/res_parser/formatting_xml/formatting.xml       23 Aug 2012 
16:58:20 -0000      1.6
@@ -3210,6 +3210,7 @@
 </pre></menudescription></menuentry></menu>
 
 <anchor name="anchor">anchor</anchor>
+
 <node 
name="subsubsection-_0060_0060simple_002ddouble_002d_002d"><nodename>subsubsection
 ``simple-double--</nodename><nodenext automatic="on">subsubsection 
three---four----''</nodenext><nodeup automatic="on">subsection</nodeup></node>
 <subsubsection><sectiontitle>subsubsection 
&textldquo;simple-double&textndash;</sectiontitle>