texinfo/tp TODO texi2any.pl Texinfo/Common.pm T...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/11/11 13:55:04

Modified files:
        tp             : TODO texi2any.pl 
        tp/Texinfo     : Common.pm 
        tp/Texinfo/Convert: HTML.pm Info.pm 

Log message:
        Only set OUTFILE for the first file.
        
        Don't close STDOUT when outputting Info.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.222&r2=1.223
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.205&r2=1.206
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.73&r2=1.74

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -b -r1.222 -r1.223
--- TODO        8 Nov 2011 00:05:50 -0000       1.222
+++ TODO        11 Nov 2011 13:55:01 -0000      1.223
@@ -7,13 +7,17 @@
 
 Internationalize 'error-->'.  FIXME in the code.
 
+In plaintext output internationalize definition lines like
+gdt(' -- {category} of {class}: {type} {name} {arguments}')
+
+
 
 Bugs
 ====
 
-sectioning/next_in_menu_is_below there should certainly be a warning for
+sectioning/next_in_menu_is_below there should be a warning for
 the subsection that is both below and next the section, because it is 
-next in menu.  This is a bug, there should be a warning.
+next in menu.
 
 
 Delayed bugs

Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- texi2any.pl 7 Nov 2011 22:19:20 -0000       1.87
+++ texi2any.pl 11 Nov 2011 13:55:01 -0000      1.88
@@ -1027,13 +1027,14 @@
     $parser->Texinfo::Structuring::set_menus_to_simple_menu();
   }
 
+  if ($file_number != 0) {
+    delete $cmdline_options->{'OUTFILE'} if 
exists($cmdline_options->{'OUTFILE'});
+    delete $cmdline_options->{'OUT'} if exists($cmdline_options->{'OUT'});
+  }
   my $converter_options = { %$converter_default_options, 
                             %$cmdline_options,
                             %$Texinfo::Config::options };
 
-  if (defined(get_conf('OUTFILE')) and $file_number == 0) {
-    $converter_options->{'OUTFILE'} = get_conf('OUTFILE');
-  }
   $converter_options->{'parser'} = $parser;
   $converter_options->{'output_format'} = $format;
   $converter_options->{'htmlxref_files'} = address@hidden;

Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- Texinfo/Common.pm   7 Nov 2011 22:19:20 -0000       1.94
+++ Texinfo/Common.pm   11 Nov 2011 13:55:03 -0000      1.95
@@ -758,7 +758,7 @@
   return $file;
 }
 
-sub open_out ($$;$)
+sub open_out($$;$)
 {
   my $self = shift;
   my $file = shift;

Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -b -r1.205 -r1.206
--- Texinfo/Convert/HTML.pm     6 Nov 2011 19:17:57 -0000       1.205
+++ Texinfo/Convert/HTML.pm     11 Nov 2011 13:55:04 -0000      1.206
@@ -1575,9 +1575,7 @@
     my $extension;
     if (defined($args->[4]) and defined($args->[4]->{'codetext'})) {
       $extension = $args->[4]->{'codetext'};
-      # FIXME(Karl) is this correct?
-      unshift @extensions, ".$extension";
-      unshift @extensions, "$extension";
+      unshift @extensions, ("$extension", ".$extension");
     }
     my $image_file;
     foreach my $extension (@extensions) {
@@ -4840,11 +4838,8 @@
     if (defined($self->get_conf('TOP_NODE_FILE'))) {
       $top_node_filename = $self->get_conf('TOP_NODE_FILE');
     } else {
-      # FIXME(Karl) this is like texi2html, but is it right?  Shouldn't it
-      # better to leave it undefined?  In that case the section name
-      # may be used, or the node name, or something along document_name-0.
-      # This is not very important since TOP_NODE_FILE is set in the
-      # default case.
+      # TOP_NODE_FILE is set in the default case.
+      # If not the manual name is used.
       $top_node_filename = $self->{'document_name'};
     }
     if (defined($top_node_filename)) {

Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- Texinfo/Convert/Info.pm     6 Nov 2011 00:55:28 -0000       1.73
+++ Texinfo/Convert/Info.pm     11 Nov 2011 13:55:04 -0000      1.74
@@ -208,7 +208,10 @@
   }
   if ($fh) {
     print $fh $tag_text;
-    close ($fh);
+    # NOTE it should be possible to close STDOUT.  However this leads to
+    # 'Filehandle STDOUT reopened as FH only for input' if there are files
+    # reopened after closing STDOUT.
+    close ($fh) unless ($self->{'output_file'} eq '-');
   } else {
     $result .= $tag_text;
   }