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

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/08/03 21:30:21

Modified files:
        tp/Texinfo/Convert: Text.pm 
        tp/t/results/coverage_braces: abbr_acronym.pl too_much_args.pl 
                                      uref_url.pl 
        tp/t/results/plaintext_tests: at_commands_glued_in_example.pl 
                                      at_commands_glued_in_paragraph.pl 
        tp/t/results/sectioning: at_commands_in_refs.pl 

Log message:
        Handle better @uref, @url, @acronym and @abbr in Converter::Text.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/abbr_acronym.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/too_much_args.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/uref_url.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.44&r2=1.45

Patches:
Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- Texinfo/Convert/Text.pm     2 Aug 2011 21:01:34 -0000       1.43
+++ Texinfo/Convert/Text.pm     3 Aug 2011 21:30:20 -0000       1.44
@@ -984,6 +984,20 @@
          if (defined($root->{'args'}->[1]));
       return $text if (defined($text) and ($text ne ''));
       return $mail;
+    } elsif ($root->{'cmdname'} eq 'uref' or $root->{'cmdname'} eq 'url') {
+      my $replacement;
+      $replacement = _normalise_space(convert($root->{'args'}->[2], $options))
+        if (defined($root->{'args'}->[2]));
+      return $replacement if (defined($replacement) and $replacement ne '');
+      return convert($root->{'args'}->[0], $options);
+    } elsif ($Texinfo::Common::explained_commands{$root->{'cmdname'}}
+             and $root->{'args'} and $root->{'args'}->[1]) {
+      my $explanation = convert($root->{'args'}->[1], $options);
+      if ($explanation ne '') {
+        return convert($root->{'args'}->[0], $options) ." ($explanation)";
+      } else {
+        return convert($root->{'args'}->[0], $options);
+      }
     } elsif ($root->{'args'} and $root->{'args'}->[0] 
            and (($root->{'args'}->[0]->{'type'}
                 and $root->{'args'}->[0]->{'type'} eq 'brace_command_arg')

Index: t/results/coverage_braces/abbr_acronym.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage_braces/abbr_acronym.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/coverage_braces/abbr_acronym.pl   3 Jul 2011 14:50:54 -0000       
1.8
+++ t/results/coverage_braces/abbr_acronym.pl   3 Aug 2011 21:30:20 -0000       
1.9
@@ -462,10 +462,10 @@
 ';
 
 
-$result_texts{'abbr_acronym'} = '--a
+$result_texts{'abbr_acronym'} = '--a (an accronym)
 --a
---a
-E\'--a. ,A.
+--a (an accronym , ...)
+E\'--a. ,A. (E\'tude--, Autonome)
 E\'--a. ,A.
 ';
 

Index: t/results/coverage_braces/too_much_args.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage_braces/too_much_args.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/coverage_braces/too_much_args.pl  3 Jul 2011 14:50:55 -0000       
1.21
+++ t/results/coverage_braces/too_much_args.pl  3 Aug 2011 21:30:20 -0000       
1.22
@@ -75,7 +75,7 @@
 $result_texis{'too_much_args'} = '@abbr{AZE, A truc Z b, E eep}';
 
 
-$result_texts{'too_much_args'} = 'AZE';
+$result_texts{'too_much_args'} = 'AZE (A truc Z b, E eep)';
 
 $result_errors{'too_much_args'} = [];
 

Index: t/results/coverage_braces/uref_url.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/uref_url.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/coverage_braces/uref_url.pl       3 Jul 2011 14:50:55 -0000       
1.7
+++ t/results/coverage_braces/uref_url.pl       3 Aug 2011 21:30:20 -0000       
1.8
@@ -547,12 +547,12 @@
 $result_texts{'uref_url'} = '--a
 --c
 
---e
-
---j
-
+--g
+--i
+--k
+--l
 --m
---o
+--q
 ';
 
 $result_errors{'uref_url'} = [];

Index: t/results/plaintext_tests/at_commands_glued_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/plaintext_tests/at_commands_glued_in_example.pl   3 Jul 2011 
14:51:00 -0000       1.6
+++ t/results/plaintext_tests/at_commands_glued_in_example.pl   3 Aug 2011 
21:30:20 -0000       1.7
@@ -723,7 +723,7 @@
 $result_texts{'at_commands_glued_in_example'} = 'address@hidden
 TeXTeXTeX.
 codein codecode.
-acronymABCacronym.
+acronymABC (aaa bb cc)acronym.
 acronym2ABCacronym.
 emailmaliemail.
 refref.

Index: t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/plaintext_tests/at_commands_glued_in_paragraph.pl 3 Jul 2011 
14:51:00 -0000       1.6
+++ t/results/plaintext_tests/at_commands_glued_in_paragraph.pl 3 Aug 2011 
21:30:21 -0000       1.7
@@ -654,7 +654,7 @@
 $result_texts{'at_commands_glued_in_paragraph'} = 'address@hidden
 TeXTeXTeX.
 codein codecode.
-acronymABCacronym.
+acronymABC (aaa bb cc)acronym.
 acronym2ABCacronym.
 emailmaliemail.
 refref.

Index: t/results/sectioning/at_commands_in_refs.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/at_commands_in_refs.pl,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- t/results/sectioning/at_commands_in_refs.pl 2 Aug 2011 21:01:34 -0000       
1.44
+++ t/results/sectioning/at_commands_in_refs.pl 3 Aug 2011 21:30:21 -0000       
1.45
@@ -18601,8 +18601,8 @@
 * `` \'\' ` \' ,, ,::
 * << >> << >> < >::
 * `` \'\' --- --::
-* AAA AAA BBB::
-* CCC CCC DDD::
+* AAA (fff) AAA BBB::
+* CCC (rrr) CCC DDD::
 * the someone address@hidden::
 * f--ile1  f--ile::
 *  @ {} . ::
@@ -18611,7 +18611,7 @@
 * 8.27in::
 * sansserif slanted::
 * indicateurl::
-* http://somewhere_aaa url /man.cgi/1/ls::
+* http://somewhere_aaa url ls::
 
 1  { }
 ******
@@ -18653,11 +18653,11 @@
 13 `` \'\' --- --
 ***************
 
-14 AAA AAA BBB
-**************
+14 AAA (fff) AAA BBB
+********************
 
-15 CCC CCC DDD
-**************
+15 CCC (rrr) CCC DDD
+********************
 
 16 the someone address@hidden
 *******************************
@@ -18683,8 +18683,8 @@
 23 indicateurl
 **************
 
-24 http://somewhere_aaa url /man.cgi/1/ls
-*****************************************
+24 http://somewhere_aaa url ls
+******************************