texinfo/tp Texinfo/Convert/Texinfo.pm t/results...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/02/19 12:34:42

Modified files:
        tp/Texinfo/Convert: Texinfo.pm 
        tp/t/results/coverage: accents_errors.pl 
        tp/t/results/value: value_after_accent.pl 

Log message:
        More consistently add spaces after accent commands in texinfo output.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Texinfo.pm?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/accents_errors.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_after_accent.pl?cvsroot=texinfo&r1=1.14&r2=1.15

Patches:
Index: Texinfo/Convert/Texinfo.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Texinfo.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Texinfo/Convert/Texinfo.pm  13 Nov 2010 19:58:28 -0000      1.2
+++ Texinfo/Convert/Texinfo.pm  19 Feb 2011 12:34:41 -0000      1.3
@@ -91,6 +91,12 @@
   my $result = '';
   $result = '@'.$cmdname if ($cmdname);
   #print STDERR "Expand $result\n";
+
+  #Â this is done here otherwise for some constructs, there are
+  #Â no 'args', and so the space is never readded.
+  if ($cmd->{'extra'} and exists ($cmd->{'extra'}->{'spaces'})) {
+    $result .= $cmd->{'extra'}->{'spaces'};
+  }
   # must be before the next condition
   if ($block_commands{$cmdname}
          and ($def_commands{$cmdname}
@@ -119,9 +125,6 @@
     if ($cmdname eq 'verb') {
       $result .= $cmd->{'type'};
     }
-    if ($cmd->{'extra'} and exists ($cmd->{'extra'}->{'spaces'})) {
-       $result .= $cmd->{'extra'}->{'spaces'};
-    }
     #print STDERR "".Data::Dumper->Dump([$cmd]);
     my $arg_nr = 0;
     foreach my $arg (@{$cmd->{'args'}}) {

Index: t/results/coverage/accents_errors.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/accents_errors.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/coverage/accents_errors.pl        7 Dec 2010 20:34:27 -0000       
1.3
+++ t/results/coverage/accents_errors.pl        19 Feb 2011 12:34:41 -0000      
1.4
@@ -239,7 +239,7 @@
 accent character followed by @@ @address@hidden
 
 With @@:
address@hidden@@. @^@@.
address@hidden @@. @^@@.
 ';
 
 

Index: t/results/value/value_after_accent.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/value/value_after_accent.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/value/value_after_accent.pl       7 Dec 2010 20:34:32 -0000       
1.14
+++ t/results/value/value_after_accent.pl       19 Feb 2011 12:34:41 -0000      
1.15
@@ -65,7 +65,7 @@
 $result_trees{'value_after_accent'}{'contents'}[1]{'parent'} = 
$result_trees{'value_after_accent'};
 
 $result_texis{'value_after_accent'} = '@set a_letter a
address@hidden
address@hidden a
 @~a';