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

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/11/01 03:26:33

Modified files:
        tp             : TODO 
        tp/Texinfo/Convert: Plaintext.pm 
        tp/t/results/converters_tests: ref_error_formatting.pl 
                                       refs_formatting.pl 
        tp/t/results/sectioning: character_and_spaces_in_refs.pl 
                                 some_at_commands_in_ref_nodes.pl 

Log message:
        In Info A ref like @ref{node,,,manual} now leads to
         *note (manual)node::.
        instead of, 
         *note chapter: (file name)chapter.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.197&r2=1.198
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.179&r2=1.180
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/ref_error_formatting.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/refs_formatting.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs.pl?cvsroot=texinfo&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/some_at_commands_in_ref_nodes.pl?cvsroot=texinfo&r1=1.46&r2=1.47

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -b -r1.197 -r1.198
--- TODO        1 Nov 2011 00:53:25 -0000       1.197
+++ TODO        1 Nov 2011 03:26:32 -0000       1.198
@@ -15,17 +15,10 @@
 For plaintext @image output if there is no basename.txt, use alt else
 the basename as [image basename].
 
-remove _*directions('This' and replace with new API. Done?
-
 There should be a warning with something like
 @example text
 ...
 
-Verify that there is a test with a node both internal and external 
-ref, like
address@hidden
address@hidden,,manual}.
-
 In tp, for node-Next sectioning commands directions are taken into 
 account even if there are no automatic directions. Thus
  @node First node,,Top,Top
@@ -115,11 +108,6 @@
 @set txicodequotebacktick
 @codequotebacktick
 
-In Info A ref like @ref{node,,,manual} should lead to
- *note (manual)node::.
-instead of, currently 
- *note chapter: (file name)chapter.
-
 Test @w{'} for the substitution of '.
 
 Before the release, verify that everything on 

Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -b -r1.179 -r1.180
--- Texinfo/Convert/Plaintext.pm        1 Nov 2011 00:53:26 -0000       1.179
+++ Texinfo/Convert/Plaintext.pm        1 Nov 2011 03:26:32 -0000       1.180
@@ -1467,14 +1467,10 @@
                     'contents' => $args[3]},
                    {'text' => ')'},];
         } elsif (defined($args[4])) {
-          # FIXME this is a bit strange.
+          # add a () such that the node is considered to be external, 
+          # even though the manual name is not known.
           $file = [{'text' => '()'}];
         }
-        # FIXME why define the name if there is a file argument?
-        if ($file and !$name) {
-          @$name = ({'type' => 'code',
-                    'contents' => $node_content});
-        }
          
         if ($name) {
           push @contents, (@$name, {'text' => ': '});
@@ -1484,13 +1480,13 @@
           # node name
           push @contents, ({'type' => 'code',
                             'contents' => $node_content});
-          #push @contents, ({'text' => '.'}, {'cmdname' => ':'}) 
-          #  if ($command eq 'pxref');
         } else {
+          if ($file) {
+            push @contents, @$file;
+          }
           push @contents, ({'type' => 'code',
                             'contents' => address@hidden, {'text' => '::'}]});
         }
-        #unshift @{$self->{'current_contents'}->[-1]}, @contents;
         $result = $self->_convert({'contents' => address@hidden);
         # we could use $formatter, but in case it was changed in _convert 
         # we play it safe.

Index: t/results/converters_tests/ref_error_formatting.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/ref_error_formatting.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/converters_tests/ref_error_formatting.pl  1 Oct 2011 10:29:26 
-0000       1.4
+++ t/results/converters_tests/ref_error_formatting.pl  1 Nov 2011 03:26:32 
-0000       1.5
@@ -4870,39 +4870,38 @@
 $result_converted{'plaintext'}->{'ref_error_formatting'} = 'address@hidden' 
*note node::
 
    address@hidden,cross ref name}\' *note cross ref name: . 
address@hidden,,title}\' *note
-title: . address@hidden,,,file name}\' *note : (file name). 
address@hidden,,,,manual}\'
-*note : (). address@hidden,cross ref name}\' *note cross ref name: node.
+title: . address@hidden,,,file name}\' *note (file name):: 
address@hidden,,,,manual}\'
+*note ():: address@hidden,cross ref name}\' *note cross ref name: node.
 address@hidden,,title}\' *note title: node. address@hidden,,,file name}\' *note
-node: (file name)node. address@hidden,,,,manual}\' *note node: ()node.
address@hidden,cross ref name,title,}\' *note cross ref name: node.
address@hidden,cross ref name,,file name}\' *note cross ref name: (file
-name)node. address@hidden,cross ref name,,,manual}\' *note cross ref name:
-()node. address@hidden,cross ref name,title,file name}\' *note cross ref
-name: (file name)node. address@hidden,cross ref name,title,,manual}\' *note
-cross ref name: ()node. address@hidden,cross ref name,title, file name,
-manual}\' *note cross ref name: (file name)node. address@hidden,,title,file
-name}\' *note title: (file name)node. address@hidden,,title,,manual}\' *note
-title: ()node. address@hidden,,title, file name, manual}\' *note title: (file
-name)node. address@hidden,,,file name,manual}\' *note node: (file name)node.
address@hidden,cross ref name,title,}\' *note cross ref name: . 
address@hidden,cross ref
-name,,file name}\' *note cross ref name: (file name). address@hidden,cross ref
-name,,,manual}\' *note cross ref name: (). address@hidden,cross ref
-name,title,file name}\' *note cross ref name: (file name). address@hidden,cross
-ref name,title,,manual}\' *note cross ref name: (). address@hidden,cross ref
-name,title, file name, manual}\' *note cross ref name: (file name).
address@hidden,,title,file name}\' *note title: (file name).
address@hidden,,title,,manual}\' *note title: (). address@hidden,,title, file 
name,
-manual}\' *note title: (file name). address@hidden,,,file name,manual}\' *note 
:
-(file name).
+(file name)node:: address@hidden,,,,manual}\' *note ()node:: 
address@hidden,cross
+ref name,title,}\' *note cross ref name: node. address@hidden,cross ref
+name,,file name}\' *note cross ref name: (file name)node.
address@hidden,cross ref name,,,manual}\' *note cross ref name: ()node.
address@hidden,cross ref name,title,file name}\' *note cross ref name: (file
+name)node. address@hidden,cross ref name,title,,manual}\' *note cross ref
+name: ()node. address@hidden,cross ref name,title, file name, manual}\' *note
+cross ref name: (file name)node. address@hidden,,title,file name}\' *note
+title: (file name)node. address@hidden,,title,,manual}\' *note title: ()node.
address@hidden,,title, file name, manual}\' *note title: (file name)node.
address@hidden,,,file name,manual}\' *note (file name)node:: 
address@hidden,cross ref
+name,title,}\' *note cross ref name: . address@hidden,cross ref name,,file 
name}\'
+*note cross ref name: (file name). address@hidden,cross ref name,,,manual}\'
+*note cross ref name: (). address@hidden,cross ref name,title,file name}\' 
*note
+cross ref name: (file name). address@hidden,cross ref name,title,,manual}\' 
*note
+cross ref name: (). address@hidden,cross ref name,title, file name, manual}\'
+*note cross ref name: (file name). address@hidden,,title,file name}\' *note
+title: (file name). address@hidden,,title,,manual}\' *note title: ().
address@hidden,,title, file name, manual}\' *note title: (file name).
address@hidden,,,file name,manual}\' *note (file name)::
 
    address@hidden,cross ref name }\' *note cross ref name: . 
address@hidden,,file
-name}\' *note : (file name). address@hidden,cross ref name, file name}\' *note
+name}\' *note (file name):: address@hidden,cross ref name, file name}\' *note
 cross ref name: (file name). address@hidden' *note ::
 
    address@hidden, cross ref name, file name}\' *note cross ref name:
 (file name)node. address@hidden' *note node:: address@hidden, cross ref
 name}\' *note cross ref name: node. address@hidden,,file name}\' *note
-node: (file name)node.
+(file name)node::
 ';
 
 

Index: t/results/converters_tests/refs_formatting.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/refs_formatting.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/converters_tests/refs_formatting.pl       11 Oct 2011 22:41:54 
-0000      1.4
+++ t/results/converters_tests/refs_formatting.pl       1 Nov 2011 03:26:32 
-0000       1.5
@@ -4698,27 +4698,27 @@
 
 address@hidden,cross ref name}\' *note cross ref name: chapter.
 address@hidden,,title}\' *note title: chapter. address@hidden,,,file name}\'
-*note chapter: (file name)chapter. address@hidden,,,,manual}\' *note
-chapter: ()chapter. address@hidden,cross ref name,title,}\' *note cross
-ref name: chapter. address@hidden,cross ref name,,file name}\' *note cross
-ref name: (file name)chapter. address@hidden,cross ref name,,,manual}\'
-*note cross ref name: ()chapter. address@hidden,cross ref name,title,file
-name}\' *note cross ref name: (file name)chapter. address@hidden,cross ref
+*note (file name)chapter:: address@hidden,,,,manual}\' *note ()chapter::
address@hidden,cross ref name,title,}\' *note cross ref name: chapter.
address@hidden,cross ref name,,file name}\' *note cross ref name: (file
+name)chapter. address@hidden,cross ref name,,,manual}\' *note cross ref
+name: ()chapter. address@hidden,cross ref name,title,file name}\' *note
+cross ref name: (file name)chapter. address@hidden,cross ref
 name,title,,manual}\' *note cross ref name: ()chapter.
 address@hidden,cross ref name,title, file name, manual}\' *note cross ref
 name: (file name)chapter. address@hidden,,title,file name}\' *note title:
 (file name)chapter. address@hidden,,title,,manual}\' *note title:
 ()chapter. address@hidden,,title, file name, manual}\' *note title: (file
-name)chapter. address@hidden,,,file name,manual}\' *note chapter: (file
-name)chapter.
+name)chapter. address@hidden,,,file name,manual}\' *note (file
+name)chapter::
 
    address@hidden(pman)anode,cross ref name}\' *note cross ref name: 
(pman)anode.
 address@hidden(pman)anode,,title}\' *note title: (pman)anode.
address@hidden(pman)anode,,,file name}\' *note (pman)anode: (file
-name)(pman)anode. address@hidden(pman)anode,,,,manual}\' *note (pman)anode:
-()(pman)anode. address@hidden(pman)anode,cross ref name,title,}\' *note cross 
ref
-name: (pman)anode. address@hidden(pman)anode,cross ref name,,file name}\' *note
-cross ref name: (file name)(pman)anode. address@hidden(pman)anode,cross ref
address@hidden(pman)anode,,,file name}\' *note (file name)(pman)anode::
address@hidden(pman)anode,,,,manual}\' *note ()(pman)anode::
address@hidden(pman)anode,cross ref name,title,}\' *note cross ref name:
+(pman)anode. address@hidden(pman)anode,cross ref name,,file name}\' *note cross
+ref name: (file name)(pman)anode. address@hidden(pman)anode,cross ref
 name,,,manual}\' *note cross ref name: ()(pman)anode.
 address@hidden(pman)anode,cross ref name,title,file name}\' *note cross ref 
name:
 (file name)(pman)anode. address@hidden(pman)anode,cross ref 
name,title,,manual}\'
@@ -4728,12 +4728,12 @@
 (file name)(pman)anode. address@hidden(pman)anode,,title,,manual}\' *note 
title:
 ()(pman)anode. address@hidden(pman)anode,,title, file name, manual}\' *note
 title: (file name)(pman)anode. address@hidden(pman)anode,,,file name,manual}\'
-*note (pman)anode: (file name)(pman)anode.
+*note (file name)(pman)anode::
 
    address@hidden, cross ref name, file name}\' *note cross ref name:
 (file name)chapter. address@hidden' *note chapter::
 address@hidden, cross ref name}\' *note cross ref name: chapter.
address@hidden,,file name}\' *note chapter: (file name)chapter.
address@hidden,,file name}\' *note (file name)chapter::
 ';
 
 

Index: t/results/sectioning/character_and_spaces_in_refs.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs.pl,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- t/results/sectioning/character_and_spaces_in_refs.pl        11 Oct 2011 
22:41:57 -0000      1.46
+++ t/results/sectioning/character_and_spaces_in_refs.pl        1 Nov 2011 
03:26:32 -0000       1.47
@@ -2139,9 +2139,8 @@
 Testing distant nodes
 ---------------------
 
-*note a node: (manual)a node. *note :: (manual):. *note top:
-(manual)top. *note (texinfo)Cross References:: *note node:
-(../manual/doc.texi)node.
+*note (manual)a node:: *note (manual)::: *note (manual)top:: *note
+(texinfo)Cross References:: *note (../manual/doc.texi)node::
 
 Testing local nodes
 -------------------
@@ -2174,10 +2173,10 @@
 
 Tag Table:
 Node: Top52
-Node: other nodes464
-Node: !_"#$%&\'()*+-.645
-Node: /;<=>?[\\]^_`|~739
-Node: local node832
+Node: other nodes446
+Node: !_"#$%&\'()*+-.627
+Node: /;<=>?[\\]^_`|~721
+Node: local node814
 
 End Tag Table
 ';

Index: t/results/sectioning/some_at_commands_in_ref_nodes.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/some_at_commands_in_ref_nodes.pl,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- t/results/sectioning/some_at_commands_in_ref_nodes.pl       30 Oct 2011 
00:51:21 -0000      1.46
+++ t/results/sectioning/some_at_commands_in_ref_nodes.pl       1 Nov 2011 
03:26:33 -0000       1.47
@@ -1731,9 +1731,8 @@
 1 A SC node i" i" E=` /l C\', !
 ******************************
 
-see *note a *strong* ref with SC, a i trema i", a dotless i trema i" E=`
-and exclamdown !: (manual)a *strong* ref with SC, a i trema i", a
-dotless i trema i" E=` and exclamdown !.
+see *note (manual)a *strong* ref with SC, a i trema i", a dotless i
+trema i" E=` and exclamdown !::.
 
 
 Tag Table: