texinfo-commits
[Top][All Lists]
Advanced

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

texinfo/tp t/results/converters_tests/at_comman...


From: Patrice Dumas
Subject: texinfo/tp t/results/converters_tests/at_comman...
Date: Tue, 31 Jul 2012 19:04:00 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/07/31 19:04:00

Modified files:
        tp/t/results/converters_tests: at_commands_in_refs.pl 
        tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info: 
                                                                           
at_commands_in_refs_latin1.info 
        tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info: 
                                                                         
at_commands_in_refs_utf8.info 
        tp/t/results/coverage_braces: uref_url.pl 
        tp/t/results/float: complex_float.pl 
        tp/t/results/plaintext_tests: long_uref_after_item.pl 
                                      no_empty_line_after_section.pl 
                                      punctuation_at_end_command.pl 
                                      punctuation_in_command.pl 
                                      punctuation_in_command_end_line.pl 
        tp/Texinfo/Convert: Plaintext.pm 
        tp/tests/coverage/res_parser_info/formatting: formatting.info 
        tp/tests/coverage/res_parser_info/formatting_fr: formatting.info 
        tp/tests/coverage/res_parser_info/formatting_utf8_enable_encoding: 
                                                                           
formatting_utf8.info 
        tp/tests/layout/res_parser/formatting_plaintext: formatting.1 

Log message:
        Use quotes for @indicateurl and <> for @url in plaintext/Info.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/uref_url.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/complex_float.pl?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/long_uref_after_item.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/no_empty_line_after_section.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/punctuation_at_end_command.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/punctuation_in_command.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.216&r2=1.217
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser_info/formatting/formatting.info?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser_info/formatting_fr/formatting.info?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser_info/formatting_utf8_enable_encoding/formatting_utf8.info?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_plaintext/formatting.1?cvsroot=texinfo&r1=1.4&r2=1.5

Patches:
Index: t/results/converters_tests/at_commands_in_refs.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/converters_tests/at_commands_in_refs.pl   14 Jul 2012 23:20:09 
-0000      1.9
+++ t/results/converters_tests/at_commands_in_refs.pl   31 Jul 2012 19:03:58 
-0000      1.10
@@ -21731,10 +21731,10 @@
 24 sansserif slanted
 ********************
 
-25 <indicateurl>
+25 \'indicateurl\'
 ****************
 
-26 \'http://somewhere_aaa\' text (url) ls
+26 <http://somewhere_aaa> text (url) ls
 ***************************************
 
 *note { }::
@@ -21753,7 +21753,7 @@
 <address@hidden>:: *note [f--ile1] [Image description""\\.]:: *note  @ {} . :: 
*note \'cite asis\' in @w b
 in r SC *str* t VAR "dfn" i:: *note \'env\' \'code\' \'option\' \'samp\'
 \'command\' \'file\' \'C-x <ESC>\':: *note 8.27in:: *note sansserif slanted::
-*note <indicateurl>:: *note \'http://somewhere_aaa\' text (url) ls::
+*note \'indicateurl\':: *note <http://somewhere_aaa> text (url) ls::
 
 ';
 
@@ -22571,8 +22571,8 @@
 * \'env\' \'code\' \'option\' \'samp\' \'command\' \'file\' \'C-x <ESC>\'::
 * 8.27in::
 * sansserif slanted::
-* <indicateurl>::
-* \'http://somewhere_aaa\' text (url) ls::
+* \'indicateurl\'::
+* <http://somewhere_aaa> text (url) ls::
 
 
 File: ,  Node: { },  Next:     !
@@ -22718,21 +22718,21 @@
 *********
 
 
-File: ,  Node: sansserif slanted,  Next: <indicateurl>,  Prev: 8.27in,  Up: Top
+File: ,  Node: sansserif slanted,  Next: \'indicateurl\',  Prev: 8.27in,  Up: 
Top
 
 24 sansserif slanted
 ********************
 
 
-File: ,  Node: <indicateurl>,  Next: \'http://somewhere_aaa\' text (url) ls,  
Prev: sansserif slanted,  Up: Top
+File: ,  Node: \'indicateurl\',  Next: <http://somewhere_aaa> text (url) ls,  
Prev: sansserif slanted,  Up: Top
 
-25 <indicateurl>
+25 \'indicateurl\'
 ****************
 
 
-File: ,  Node: \'http://somewhere_aaa\' text (url) ls,  Prev: <indicateurl>,  
Up: Top
+File: ,  Node: <http://somewhere_aaa> text (url) ls,  Prev: \'indicateurl\',  
Up: Top
 
-26 \'http://somewhere_aaa\' text (url) ls
+26 <http://somewhere_aaa> text (url) ls
 ***************************************
 
 *note { }::
@@ -22751,7 +22751,7 @@
 <address@hidden>:: *note [f--ile1] [image src="f--ile.png" alt="alt" 
text="[Image description\\"\\"\\\\.]"]:: *note  @ {} . :: *note \'cite asis\' 
in @w b
 in r SC *str* t VAR "dfn" i:: *note \'env\' \'code\' \'option\' \'samp\'
 \'command\' \'file\' \'C-x <ESC>\':: *note 8.27in:: *note sansserif slanted::
-*note <indicateurl>:: *note \'http://somewhere_aaa\' text (url) ls::
+*note \'indicateurl\':: *note <http://somewhere_aaa> text (url) ls::
 
 
 
@@ -22782,8 +22782,8 @@
 Node: \'env\' \'code\' \'option\' \'samp\' \'command\' \'file\' \'C-x 
<ESC>\'4455
 Node: 8.27in4735
 Node: sansserif slanted4883
-Node: <indicateurl>5009
-Node: \'http://somewhere_aaa\' text (url) ls5157
+Node: \'indicateurl\'5009
+Node: <http://somewhere_aaa> text (url) ls5157
 
 End Tag Table
 ';

Index: 
t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
Binary files /tmp/cvsaHZsk1 and /tmp/cvsv5saes differ

Index: 
t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
Binary files /tmp/cvsxHYf90 and /tmp/cvsa2NL3r differ

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.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/coverage_braces/uref_url.pl       24 Jan 2012 22:16:59 -0000      
1.13
+++ t/results/coverage_braces/uref_url.pl       31 Jul 2012 19:03:58 -0000      
1.14
@@ -559,7 +559,7 @@
 
 
 
-$result_converted{'plaintext'}->{'uref_url'} = '-b (--a) \'--c\' -d -g -i -k 
-l -n (--m) -q
+$result_converted{'plaintext'}->{'uref_url'} = '-b (--a) <--c> -d -g -i -k -l 
-n (--m) -q
 ';
 
 

Index: t/results/float/complex_float.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/complex_float.pl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- t/results/float/complex_float.pl    14 Jul 2012 23:20:10 -0000      1.37
+++ t/results/float/complex_float.pl    31 Jul 2012 19:03:59 -0000      1.38
@@ -5270,7 +5270,7 @@
 
 * Menu:
 
-* Text 1: text with a lot of features.   TeX and _te\'i^\'an_url\'_ AND ...
+* Text 1: text with a lot of features.   TeX and _te\'i^<an_url>_ AND ...
 * Text 1.1: float with a lot of features and no shortcaption.
                                          An example of float ...
 
@@ -5289,7 +5289,7 @@
 
 A ref.  *Note xref Text with features: Top.  A footnote.  (1).
 
-TeX and _te\'i^\'an_url\'_ AND it is @verb  a word !@ AE.
+TeX and _te\'i^<an_url>_ AND it is @verb  a word !@ AE.
 
 Text 1: An example of float caption...  An example.
      example
@@ -5308,7 +5308,7 @@
 
 A ref.  *Note xref Text with features caption: Top.  A footnote.  (2).
 
-TeX and _te\'i^\'an_url\'_ AND it is @verb  a word !@ AE.
+TeX and _te\'i^<an_url>_ AND it is @verb  a word !@ AE.
 
    ---------- Footnotes ----------
 
@@ -5341,7 +5341,7 @@
 A ref 2.  *Note xref Text with features caption: Top.  A footnote 2.
 (1).
 
-TeX and _te\'i^\'an_url\'_ AND it is @verb  a word !@ AE.
+TeX and _te\'i^<an_url>_ AND it is @verb  a word !@ AE.
 
 *Note Text 1: text with a lot of features.
 

Index: t/results/plaintext_tests/long_uref_after_item.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/long_uref_after_item.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/plaintext_tests/long_uref_after_item.pl   24 Jan 2012 22:17:01 
-0000      1.10
+++ t/results/plaintext_tests/long_uref_after_item.pl   31 Jul 2012 19:03:59 
-0000      1.11
@@ -184,7 +184,7 @@
 
 
 $result_converted{'plaintext'}->{'long_uref_after_item'} = '   * 
-     
\'http://foo.org/some/long/url/which/goes/past/eighty/columns/and/has/no/alternative/text.html\'
+     
<http://foo.org/some/long/url/which/goes/past/eighty/columns/and/has/no/alternative/text.html>
 ';
 
 1;

Index: t/results/plaintext_tests/no_empty_line_after_section.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/no_empty_line_after_section.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/plaintext_tests/no_empty_line_after_section.pl    9 Mar 2012 
00:14:11 -0000       1.1
+++ t/results/plaintext_tests/no_empty_line_after_section.pl    31 Jul 2012 
19:03:59 -0000      1.2
@@ -553,7 +553,7 @@
 1.1 sec
 =======
 
-\'url\' A.
+<url> A.
 
 
 

Index: t/results/plaintext_tests/punctuation_at_end_command.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_at_end_command.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/plaintext_tests/punctuation_at_end_command.pl     24 Jan 2012 
22:17:02 -0000      1.6
+++ t/results/plaintext_tests/punctuation_at_end_command.pl     31 Jul 2012 
19:03:59 -0000      1.7
@@ -369,7 +369,7 @@
 
 
 
-$result_converted{'plaintext'}->{'punctuation_at_end_command'} = 'Text.  Email 
.  <.> dmn 1. and text.  indicateurl <.> and then kbd \'.\'
+$result_converted{'plaintext'}->{'punctuation_at_end_command'} = 'Text.  Email 
.  <.> dmn 1. and text.  indicateurl \'.\' and then kbd \'.\'
 and math . and cite \'.\' and emph _._  text.  asis in code \'.\' text.  a
 dot before a emph open ._  and in emph._
 ';

Index: t/results/plaintext_tests/punctuation_in_command.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_in_command.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/plaintext_tests/punctuation_in_command.pl 24 Jan 2012 22:17:02 
-0000      1.5
+++ t/results/plaintext_tests/punctuation_in_command.pl 31 Jul 2012 19:03:59 
-0000      1.6
@@ -331,7 +331,7 @@
 
 
 
-$result_converted{'plaintext'}->{'punctuation_in_command'} = 'Text.  Email a.  
b <a. b> dmn 1. 2 and text.  indicateurl <i. u> and
+$result_converted{'plaintext'}->{'punctuation_in_command'} = 'Text.  Email a.  
b <a. b> dmn 1. 2 and text.  indicateurl \'i. u\' and
 then kbd \'k. d\' and math m. a and cite \'c. e\' and emph _e.  h_ text.
 asis in code \'a. c\'
 ';

Index: t/results/plaintext_tests/punctuation_in_command_end_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/plaintext_tests/punctuation_in_command_end_line.pl        24 Jan 
2012 22:17:03 -0000      1.5
+++ t/results/plaintext_tests/punctuation_in_command_end_line.pl        31 Jul 
2012 19:03:59 -0000      1.6
@@ -434,7 +434,7 @@
 
 
 
-$result_converted{'plaintext'}->{'punctuation_in_command_end_line'} = 'Text.  
Email .  <.> dmn 1. and text.  indicateurl <.> and then kbd \'.\'
+$result_converted{'plaintext'}->{'punctuation_in_command_end_line'} = 'Text.  
Email .  <.> dmn 1. and text.  indicateurl \'.\' and then kbd \'.\'
 and math . and cite \'.\' and emph _._  text.  asis in code \'.\' text.  a
 dot before a emph open ._  and in emph._
 ';

Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -b -r1.216 -r1.217
--- Texinfo/Convert/Plaintext.pm        28 Jul 2012 17:55:24 -0000      1.216
+++ Texinfo/Convert/Plaintext.pm        31 Jul 2012 19:03:59 -0000      1.217
@@ -259,7 +259,7 @@
 }
 
 my @quoted_commands = ('cite', 'code', 'command', 'env', 'file', 'kbd',
-  'option', 'samp');
+  'option', 'samp', 'indicateurl');
 
 # %quoted_code_commands have no quote when in code command contexts
 my %quoted_code_commands;
@@ -274,9 +274,9 @@
 
 delete $quoted_code_commands{'cite'};
 delete $quoted_code_commands{'samp'};
+delete $quoted_code_commands{'indicateurl'};
 
 $style_map{'key'} = ['<', '>'];
-$style_map{'indicateurl'} = ['<', '>'];
 
 # in those commands, there is no addition of double space after a dot.
 # math is special
@@ -1640,10 +1640,10 @@
         }
         my $prepended;
         if ($name and $email) {
-          $prepended = $self->gdt('{name} @indicateurl{{email}}', 
+          $prepended = $self->gdt('{name} @url{{email}}', 
                            {'name' => $name, 'email' => $email});
         } elsif ($email) {
-          $prepended = $self->gdt('@indicateurl{{email}}', 
+          $prepended = $self->gdt('@url{{email}}', 
                            {'email' => $email});
         } elsif ($name) {
           $prepended = {'contents' => $name};
@@ -1670,7 +1670,7 @@
                   'url' => $url });
             unshift @{$self->{'current_contents'}->[-1]}, $prepended;
           } else {
-            my $prepended = $self->gdt('@code{{url}}', 
+            my $prepended = $self->gdt('@t{<{url}>}', 
                                         {'url' => $url});
             unshift @{$self->{'current_contents'}->[-1]}, $prepended
           }

Index: tests/coverage/res_parser_info/formatting/formatting.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/coverage/res_parser_info/formatting/formatting.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
Binary files /tmp/cvsv8qCf9 and /tmp/cvs0zB4lA differ

Index: tests/coverage/res_parser_info/formatting_fr/formatting.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/coverage/res_parser_info/formatting_fr/formatting.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
Binary files /tmp/cvsubIfqa and /tmp/cvsbKNSxB differ

Index: 
tests/coverage/res_parser_info/formatting_utf8_enable_encoding/formatting_utf8.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/coverage/res_parser_info/formatting_utf8_enable_encoding/formatting_utf8.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
Binary files /tmp/cvs3JEtE8 and /tmp/cvs8t8hNz differ

Index: tests/layout/res_parser/formatting_plaintext/formatting.1
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_plaintext/formatting.1,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tests/layout/res_parser/formatting_plaintext/formatting.1   28 Jul 2012 
17:55:26 -0000      1.4
+++ tests/layout/res_parser/formatting_plaintext/formatting.1   31 Jul 2012 
19:04:00 -0000      1.5
@@ -48,10 +48,10 @@
 '@titlefont{--a}'
 -a
 **
-   '@indicateurl{--a}' <--a> '@uref{--a,--b}' -b (--a) '@uref{--a}'
-'--a' '@uref{,--b}' -b '@uref{--a,--b,--c}' -c '@uref{,--b,--c}' -c
+   '@indicateurl{--a}' '--a' '@uref{--a,--b}' -b (--a) '@uref{--a}'
+<--a> '@uref{,--b}' -b '@uref{--a,--b,--c}' -c '@uref{,--b,--c}' -c
 '@uref{--a,,--c}' -c '@uref{,,--c}' -c '@url{--a,--b}' -b (--a)
-'@url{--a,}' '--a' '@url{,--b}' -b '@var{--a}' -A '@verb{:--a:}' --a
+'@url{--a,}' <--a> '@url{,--b}' -b '@var{--a}' -A '@verb{:--a:}' --a
 '@verb{:a < & @ % " -- b:}' a  < & @ % " --    b '@w{a a a a a a a a a a
 a a a a a a a a a a a a a a a a a a a a a a a a a}' a a a a a a a a a a a a a 
a a a a a a a a a a a a a a a a a a a a a a
 '@H{a}' a'' '@H{--a}' -a'' '@dotaccent{a}' a. '@dotaccent{--a}' -a.
@@ -395,10 +395,10 @@
 '@titlefont{--a}'
 -a
 **
-   '@indicateurl{--a}' <--a> '@uref{--a,--b}' -b (--a) '@uref{--a}'
-'--a' '@uref{,--b}' -b '@uref{--a,--b,--c}' -c '@uref{,--b,--c}' -c
+   '@indicateurl{--a}' '--a' '@uref{--a,--b}' -b (--a) '@uref{--a}'
+<--a> '@uref{,--b}' -b '@uref{--a,--b,--c}' -c '@uref{,--b,--c}' -c
 '@uref{--a,,--c}' -c '@uref{,,--c}' -c '@url{--a,--b}' -b (--a)
-'@url{--a,}' '--a' '@url{,--b}' -b '@var{--a}' -A '@verb{:--a:}' --a
+'@url{--a,}' <--a> '@url{,--b}' -b '@var{--a}' -A '@verb{:--a:}' --a
 '@verb{:a < & @ % " -- b:}' a  < & @ % " --    b '@w{a a a a a a a a a a
 a a a a a a a a a a a a a a a a a a a a a a a a a}' a a a a a a a a a a a a a 
a a a a a a a a a a a a a a a a a a a a a a
 '@H{a}' a'' '@H{--a}' -a'' '@dotaccent{a}' a. '@dotaccent{--a}' -a.
@@ -851,16 +851,16 @@
      -a
 *******
 
-     @indicateurl{--a} <--a>
+     @indicateurl{--a} '--a'
      @uref{--a,--b} --b (--a)
-     @uref{--a} --a
+     @uref{--a} <--a>
      @uref{,--b} --b
      @uref{--a,--b,--c} --c
      @uref{,--b,--c} --c
      @uref{--a,,--c} --c
      @uref{,,--c} --c
      @url{--a,--b} --b (--a)
-     @url{--a,} --a
+     @url{--a,} <--a>
      @url{,--b} --b
      @var{--a} --A
      @verb{:--a:} --a



reply via email to

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