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

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/10/23 20:22:25

Modified files:
        tp/Texinfo/Convert: Text.pm 
        tp/t/results/coverage: def.pl 
        tp/t/results/def: all_commands.pl all_commands_delimiters.pl 
                          def_defx_mismatch.pl defx_after_comment.pl 
                          defx_after_empty_line.pl 
                          defx_after_paragraph_end.pl defx_after_text.pl 
                          empty_def_command.pl empty_deftype.pl 
                          end_of_line_protect_at_end.pl 
                          end_of_lines_protected.pl 
        tp/t/results/invalid_nestings: block_not_matching.pl 

Log message:
        Output def line in raw text output.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/def.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands_delimiters.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/def_defx_mismatch.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_comment.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_empty_line.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_paragraph_end.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_text.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_def_command.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_deftype.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/end_of_line_protect_at_end.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/end_of_lines_protected.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/block_not_matching.pl?cvsroot=texinfo&r1=1.1&r2=1.2

Patches:
Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Texinfo/Convert/Text.pm     21 Oct 2010 22:16:40 -0000      1.7
+++ Texinfo/Convert/Text.pm     23 Oct 2010 20:22:24 -0000      1.8
@@ -222,9 +222,12 @@
     print STDERR "  Command: $root->{'cmdname'}\n" if ($root->{'cmdname'});
     print STDERR "  Type: $root->{'type'}\n" if ($root->{'type'});
     print STDERR "  Text: $root->{'text'}\n" if (defined($root->{'text'}));
+    #print STDERR "  Special def_command: 
$root->{'special'}->{'def_command'}\n"
+    #  if (defined($root->{'special'}) and 
$root->{'special'}->{'def_command'});
   }
 
-  return '' if (($root->{'type'} and $ignored_types{$root->{'type'}})
+  return '' if (!($root->{'type'} and $root->{'type'} eq 'def_line')
+     and (($root->{'type'} and $ignored_types{$root->{'type'}})
      or ($root->{'cmdname'} 
         and ($ignored_brace_commands{$root->{'cmdname'}} 
            or $ignored_block_commands{$root->{'cmdname'}}
@@ -233,7 +236,7 @@
                and $root->{'args'}->[0]->{'type'} 
                and ($root->{'args'}->[0]->{'type'} eq 'misc_line_arg'
                     or $root->{'args'}->[0]->{'type'} eq 'misc_arg') 
-               and !$kept_misc_commands{$root->{'cmdname'}}))));
+                     and !$kept_misc_commands{$root->{'cmdname'}})))));
   my $result = '';
   if (defined($root->{'text'})) {
     $result = $root->{'text'};
@@ -288,7 +291,10 @@
       }
     }
   }
-  if ($root->{'type'} and $root->{'type'} eq 'menu_entry') {
+  if ($root->{'type'} and $root->{'type'} eq 'def_line') {
+    #print STDERR "$root->{'special'}->{'def_command'}\n";
+    $result = convert($root->{'args'}->[0]) if ($root->{'args'});
+  } elsif ($root->{'type'} and $root->{'type'} eq 'menu_entry') {
     foreach my $arg (@{$root->{'args'}}) {
       $result .= convert($arg);
     }
@@ -299,7 +305,10 @@
     }
   }
   $result = '{'.$result.'}' 
-     if ($root->{'type'} and $root->{'type'} eq 'bracketed');
+     if ($root->{'type'} and $root->{'type'} eq 'bracketed'
+         and (!$root->{'parent'}->{'type'} or
+              ($root->{'parent'}->{'type'} ne 'block_line_arg'
+               and $root->{'parent'}->{'type'} ne 'misc_line_arg')));
   return $result;
 }
 

Index: t/results/coverage/def.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/def.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/coverage/def.pl   23 Oct 2010 17:33:24 -0000      1.13
+++ t/results/coverage/def.pl   23 Oct 2010 20:22:25 -0000      1.14
@@ -1521,10 +1521,26 @@
 
 
 $result_texts{'def'} = '
+c--ategory d--effn_name a--rguments...
 d--effn
 
+cate--gory de--ffn_name ar--guments    more args 
+ even more so
 def--fn
 
+fset i a g
+cmde truc 
+Command log trap 
+Command  log trap1   
+Command log trap2  
+cmde id ule truc
+cmde2 id i ule truc
+ machin
+ bidule machin
+truc machin
+truc followed by a comment
+truc after a deff item
+truc deffnx before end deffn
 Various deff lines
 ';
 

Index: t/results/def/all_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/all_commands.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/def/all_commands.pl       21 Oct 2010 22:16:41 -0000      1.2
+++ t/results/def/all_commands.pl       23 Oct 2010 20:22:25 -0000      1.3
@@ -1932,40 +1932,58 @@
 ';
 
 
-$result_texts{'all_commands'} = 'd--efvr
+$result_texts{'all_commands'} = 'c--ategory d--efvr_name
+d--efvr
 
+c--ategory t--ype d--eftypefn_name a--rguments...
 d--eftypefn
 
+c--ategory c--lass t--ype d--eftypeop_name a--rguments...
 d--eftypeop
 
+c--ategory t--ype d--eftypevr_name
 d--eftypevr
 
+c--ategory c--lass d--efcv_name
 d--efcv
 
+c--ategory c--lass d--efop_name a--rguments...
 d--efop
 
+c--ategory d--eftp_name a--ttributes...
 d--eftp
 
+d--efun_name a--rguments...
 d--efun
 
+d--efmac_name a--rguments...
 d--efmac
 
+d--efspec_name a--rguments...
 d--efspec
 
+d--efvar_name
 d--efvar
 
+d--efopt_name
 d--efopt
 
+t--ype d--eftypefun_name a--rguments...
 d--eftypefun
 
+t--ype d--eftypevar_name
 d--eftypevar
 
+c--lass d--efivar_name
 d--efivar
 
+c--lass t--ype d--eftypeivar_name
 d--eftypeivar
 
+c--lass d--efmethod_name a--rguments...
 d--efmethod
 
+c--lass t--ype d--eftypemethod_name a--rguments...
 d--eftypemethod
 ';
 

Index: t/results/def/all_commands_delimiters.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/all_commands_delimiters.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/def/all_commands_delimiters.pl    21 Oct 2010 22:16:41 -0000      
1.2
+++ t/results/def/all_commands_delimiters.pl    23 Oct 2010 20:22:25 -0000      
1.3
@@ -10425,52 +10425,101 @@
 ';
 
 
-$result_texts{'all_commands_delimiters'} = '
+$result_texts{'all_commands_delimiters'} = 'Command forward--char nchars 
argument2 argument3         (arg in brace, [something in v--ar, in, b , comma 
apref p]) last
 
+Variable fill-column argument1 argument2         (arg in brace, [something in 
v--ar, in, b , comma apref p]) last
 
+Library Function int foobar (int foo, float bar)
 
+Library Function int foobar (int foo, float bar)         (arg in brace, 
[something in v--ar, in, b , comma apref p]) ct
 
+ last
 
+Library Function int foobug [something
 
+stacks private push (s:in out stack;                  n:in integer) ; ;barg 
aarg; ; end
 
+Global Flag int enable         (arg in brace, [something in v--ar, in, b , 
comma apref p]) last
 
+Data type pair car cdr         (arg in brace, [something in v--ar, in, b , 
comma apref p]) last
 
+Class Option Window border-pattern         (arg in brace, [something in v--ar, 
in, b , comma apref p]) last
 
+Class Option2 Window int border-pattern         (arg in brace, [something in 
v--ar, in, b , comma apref p]) last
 
+Operation windows expose         (arg in brace, [something in v--ar, in, b , 
comma apref p]) last
 
+Operation2 W,indow int expose         (arg in brace, [something in v--ar, in, 
b , comma apref p]) last
 
+Operation5 Window int expose type arg
 
+Operation3 W,indow int e,xpose type arg
 
+Operation4 ,Window int ,expose type arg
 
+Operation6 W,indow int e,xpose type arg
 
+Operation7 ,Window int ,expose type arg
 
+Operation13 W)indow int e)xpose type arg
 
+Operation14 )Window int )expose type arg
 
+Operation16 W)indow int e)xpose type arg
 
+Operation17 )Window int )expose type arg
 
+Operation18 W;indow int e;xpose type arg
 
+Operation19 ;Window int ;expose type arg
 
+Operation20 W;indow int e;xpose type arg
 
+Operation21 ;Window int ;expose type arg
 
+Commandcom Windowint exposeexp name
 
+apply function &rest arguments
 
+A1 A2 A3 A4
 
+A1 A2 A3 A4
 
+A1 A2 A3 A4
 
+A1 A2 A3 A4
 
+A1 A2 A3 A4 A5
 
+A1 A2 A3 A4 A5
 
+A1 A2 A3 A4 A5
 
+A1 A2 A3 A4 A5
 
+A1 A2 A3 A4
 
+A1 A2 A3 A4
 
+A1 A2 A3 A4 A5
 
+A1 A2 A3 A4 A5
 
+A1 A2 A3 A4 A5 A6
 
+A1 A2 A3 A4 A5 A6
 
+A1 A2 A3 A4 A5
 
+A1 A2 A3 A4 A5
 
+A1 A2 A3 A4 A5 A6
 
+A1 A2 A3 A4 A5 A6
+
+code then var ret_type fun_name A1 A2 A3 A4
+
+var then code ret_type1 fun_name1 A1 A2 A3 A4
 ';
 
 $result_errors{'all_commands_delimiters'} = [];

Index: t/results/def/def_defx_mismatch.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/def_defx_mismatch.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/def/def_defx_mismatch.pl  23 Oct 2010 17:33:24 -0000      1.1
+++ t/results/def/def_defx_mismatch.pl  23 Oct 2010 20:22:25 -0000      1.2
@@ -328,7 +328,9 @@
 ';
 
 
-$result_texts{'def_defx_mismatch'} = '
+$result_texts{'def_defx_mismatch'} = 'my def args arg ...
+type name and now the args
+
 In defun.
 
 ';

Index: t/results/def/defx_after_comment.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/defx_after_comment.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/def/defx_after_comment.pl 23 Oct 2010 17:33:24 -0000      1.1
+++ t/results/def/defx_after_comment.pl 23 Oct 2010 20:22:25 -0000      1.2
@@ -214,7 +214,9 @@
 @end deffn';
 
 
-$result_texts{'defx_after_comment'} = '';
+$result_texts{'defx_after_comment'} = 'fset i a g
+truc bidulr machin...
+';
 
 $result_errors{'defx_after_comment'} = [];
 

Index: t/results/def/defx_after_empty_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/defx_after_empty_line.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/def/defx_after_empty_line.pl      23 Oct 2010 17:33:24 -0000      
1.1
+++ t/results/def/defx_after_empty_line.pl      23 Oct 2010 20:22:25 -0000      
1.2
@@ -207,7 +207,9 @@
 @end deffn';
 
 
-$result_texts{'defx_after_empty_line'} = '
+$result_texts{'defx_after_empty_line'} = 'fset i a g
+
+truc bidulr machin...
 ';
 
 $result_errors{'defx_after_empty_line'} = [];

Index: t/results/def/defx_after_paragraph_end.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/defx_after_paragraph_end.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/def/defx_after_paragraph_end.pl   23 Oct 2010 17:33:24 -0000      
1.1
+++ t/results/def/defx_after_paragraph_end.pl   23 Oct 2010 20:22:25 -0000      
1.2
@@ -221,8 +221,10 @@
 @end deffn';
 
 
-$result_texts{'defx_after_paragraph_end'} = 'Text in paragraph.
+$result_texts{'defx_after_paragraph_end'} = 'fset i a g
+Text in paragraph.
 
+truc bidulr machin...
 ';
 
 $result_errors{'defx_after_paragraph_end'} = [

Index: t/results/def/defx_after_text.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/defx_after_text.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/def/defx_after_text.pl    23 Oct 2010 17:33:24 -0000      1.1
+++ t/results/def/defx_after_text.pl    23 Oct 2010 20:22:25 -0000      1.2
@@ -213,7 +213,9 @@
 @end deffn';
 
 
-$result_texts{'defx_after_text'} = 'Text in deffn
+$result_texts{'defx_after_text'} = 'fset i a g
+Text in deffn
+truc bidulr machin...
 ';
 
 $result_errors{'defx_after_text'} = [

Index: t/results/def/empty_def_command.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/empty_def_command.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/def/empty_def_command.pl  21 Oct 2010 22:16:41 -0000      1.2
+++ t/results/def/empty_def_command.pl  23 Oct 2010 20:22:25 -0000      1.3
@@ -227,7 +227,10 @@
 ';
 
 
-$result_texts{'empty_def_command'} = '
+$result_texts{'empty_def_command'} = 'empty deffn
+
+empty deffn with deffnx
+empty deffnx
 ';
 
 $result_errors{'empty_def_command'} = [];

Index: t/results/def/empty_deftype.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/empty_deftype.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/def/empty_deftype.pl      21 Oct 2010 22:16:41 -0000      1.2
+++ t/results/def/empty_deftype.pl      23 Oct 2010 20:22:25 -0000      1.3
@@ -639,12 +639,16 @@
 ';
 
 
-$result_texts{'empty_deftype'} = 'Deftypefun.
+$result_texts{'empty_deftype'} = ' f (const type& x)
+Deftypefun.
 
+f (const type& x)
 Defun.
 
+c  f (const type& x)
 Deftypemethod.
 
+c f (const type& x)
 Defmethod.
 ';
 

Index: t/results/def/end_of_line_protect_at_end.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/end_of_line_protect_at_end.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/def/end_of_line_protect_at_end.pl 21 Oct 2010 22:16:41 -0000      
1.2
+++ t/results/def/end_of_line_protect_at_end.pl 23 Oct 2010 20:22:25 -0000      
1.3
@@ -87,7 +87,7 @@
 
 
 $result_texts{'end_of_line_protect_at_end'} = '
-';
+category2 deffn_name2 arguments2 ';
 
 $result_errors{'end_of_line_protect_at_end'} = [
   {

Index: t/results/def/end_of_lines_protected.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/end_of_lines_protected.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/def/end_of_lines_protected.pl     21 Oct 2010 22:16:41 -0000      
1.2
+++ t/results/def/end_of_lines_protected.pl     23 Oct 2010 20:22:25 -0000      
1.3
@@ -243,7 +243,8 @@
 ';
 
 
-$result_texts{'end_of_lines_protected'} = 'deffn
+$result_texts{'end_of_lines_protected'} = 'category deffn_name arguments    
more args   with end of line within with 3 @ @ one last arg
+deffn
 ';
 
 $result_errors{'end_of_lines_protected'} = [];

Index: t/results/invalid_nestings/block_not_matching.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/block_not_matching.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/invalid_nestings/block_not_matching.pl    23 Oct 2010 14:28:40 
-0000      1.1
+++ t/results/invalid_nestings/block_not_matching.pl    23 Oct 2010 20:22:25 
-0000      1.2
@@ -544,6 +544,7 @@
 
 $result_texts{'block_not_matching'} = 'A quotation
 
+Function Reference print_navigation $filehandle
 Text
 
 item