texinfo/tp Texinfo/Common.pm Texinfo/Convert/In...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/02/26 16:09:52

Modified files:
        tp/Texinfo     : Common.pm 
        tp/Texinfo/Convert: Info.pm 
        tp/t           : info_tests.t 
Added files:
        tp/t/results/info_tests: space_in_setfilename.pl 

Log message:
        Handle better spaces in out file name.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/info_tests.t?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/space_in_setfilename.pl?cvsroot=texinfo&rev=1.1

Patches:
Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- Texinfo/Common.pm   21 Feb 2011 17:32:14 -0000      1.14
+++ Texinfo/Common.pm   26 Feb 2011 16:09:51 -0000      1.15
@@ -512,7 +512,7 @@
     return \*STDOUT;
   }
   my $filehandle = do { local *FH };
-  if (!open ($filehandle, ">$file")) {
+  if (!open ($filehandle, '>', $file)) {
     return undef; 
   }
   if (defined($encoding)) {

Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- Texinfo/Convert/Info.pm     24 Feb 2011 01:24:05 -0000      1.36
+++ Texinfo/Convert/Info.pm     26 Feb 2011 16:09:51 -0000      1.37
@@ -271,9 +271,16 @@
   my $self = shift;
 
   #Â FIXME version/program
-  my $text = "This is $self->{'output_filename'}, produced by makeinfo version 
4.13 from $self->{'input_basename'}.";
+  #my $text = "This is $self->{'output_filename'}, produced by makeinfo 
version 4.13 from $self->{'input_basename'}.";
   my $paragraph = Texinfo::Convert::Paragraph->new();
-  my $result = $paragraph->add_text($text);
+  #my $result = $paragraph->add_text($text);
+  my $result = $paragraph->add_text("This is ");
+  #Â This ensures that spaces in file are kept.
+  $result .= $paragraph->add_next($self->{'output_filename'});
+  #Â FIXME version/program
+  $result .= $paragraph->add_text(', produced by makeinfo version 4.13 from ');
+  $result .= $paragraph->add_next($self->{'input_basename'});
+  $result .= $paragraph->add_text('.');
   $result .= $paragraph->end();
   $result .= "\n";
   $self->{'empty_lines_count'} = 1;

Index: t/info_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/info_tests.t,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/info_tests.t      26 Feb 2011 10:52:59 -0000      1.19
+++ t/info_tests.t      26 Feb 2011 16:09:51 -0000      1.20
@@ -282,6 +282,11 @@
 ['no_node_but_top',
 '@top top
 '],
+['space_in_setfilename',
+'@setfilename @ @verb{: name :}@ 
+
address@hidden Top
+'],
 #['html_expanded',
 #'Before
 address@hidden

Index: t/results/info_tests/space_in_setfilename.pl
===================================================================
RCS file: t/results/info_tests/space_in_setfilename.pl
diff -N t/results/info_tests/space_in_setfilename.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/info_tests/space_in_setfilename.pl        26 Feb 2011 16:09:52 
-0000      1.1
@@ -0,0 +1,197 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors);
+
+$result_trees{'space_in_setfilename'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'cmdname' => ' ',
+                  'parent' => {}
+                },
+                {
+                  'args' => [
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => ' name ',
+                          'type' => 'raw'
+                        }
+                      ],
+                      'parent' => {},
+                      'type' => 'brace_command_arg'
+                    }
+                  ],
+                  'cmdname' => 'verb',
+                  'contents' => [],
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 1,
+                    'macro' => ''
+                  },
+                  'parent' => {},
+                  'type' => ':'
+                },
+                {
+                  'cmdname' => ' ',
+                  'parent' => {}
+                },
+                {
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'setfilename',
+          'extra' => {
+            'text_arg' => '  name  '
+          },
+          'line_nr' => {},
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'parent' => {},
+      'type' => 'text_root'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'Top'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'spaces_at_end'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'contents' => [],
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [],
+            'normalized' => 'Top'
+          }
+        ],
+        'normalized' => 'Top'
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 3,
+        'macro' => ''
+      },
+      'parent' => {}
+    }
+  ],
+  'type' => 'document_root'
+};
+$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0];
+$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0]{'line_nr'} 
= 
$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
+$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'space_in_setfilename'}{'contents'}[0];
+$result_trees{'space_in_setfilename'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'space_in_setfilename'}{'contents'}[0];
+$result_trees{'space_in_setfilename'}{'contents'}[0]{'parent'} = 
$result_trees{'space_in_setfilename'};
+$result_trees{'space_in_setfilename'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'space_in_setfilename'}{'contents'}[1]{'args'}[0];
+$result_trees{'space_in_setfilename'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'space_in_setfilename'}{'contents'}[1]{'args'}[0];
+$result_trees{'space_in_setfilename'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'space_in_setfilename'}{'contents'}[1]{'args'}[0];
+$result_trees{'space_in_setfilename'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'space_in_setfilename'}{'contents'}[1];
+$result_trees{'space_in_setfilename'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_in_setfilename'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'space_in_setfilename'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = 
$result_trees{'space_in_setfilename'}{'contents'}[1]{'extra'}{'node_content'};
+$result_trees{'space_in_setfilename'}{'contents'}[1]{'parent'} = 
$result_trees{'space_in_setfilename'};
+
+$result_texis{'space_in_setfilename'} = '@setfilename @ @verb{: name :}@ 
+
address@hidden Top
+';
+
+
+$result_texts{'space_in_setfilename'} = '
+';
+
+$result_sectioning{'space_in_setfilename'} = {};
+
+$result_nodes{'space_in_setfilename'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'normalized' => 'Top'
+  },
+  'node_up' => {
+    'extra' => {
+      'manual_content' => [
+        {
+          'text' => 'dir'
+        }
+      ]
+    }
+  }
+};
+
+$result_menus{'space_in_setfilename'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'normalized' => 'Top'
+  }
+};
+
+$result_errors{'space_in_setfilename'} = [];
+
+
+
+$result_converted{'info'}->{'space_in_setfilename'} = 'This is   name  , 
produced by makeinfo version 4.13 from .
+
+
+File:   name  ,  Node: Top,  Up: (dir)
+
+
+
+Tag Table:
+Node: Top60
+
+End Tag Table
+';
+
+1;