texinfo/tp texi2any.pl

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        13/01/27 17:12:42

Modified files:
        tp             : texi2any.pl 

Log message:
        Use set_format for expanded format, not the new format.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.166&r2=1.167

Patches:
Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- texi2any.pl 27 Jan 2013 12:19:02 -0000      1.166
+++ texi2any.pl 27 Jan 2013 17:12:41 -0000      1.167
@@ -552,10 +552,12 @@
   'texinfoxml' => {
              'nodes_tree' => 1,
              'converter' => sub{Texinfo::Convert::TexinfoXML->converter(@_)},
+             'floats' => 1,
            },
   'texinfosxml' => {
              'nodes_tree' => 1,
              'converter' => sub{Texinfo::Convert::TexinfoSXML->converter(@_)},
+             'floats' => 1,
            },
   'ixinsxml' => {
              'nodes_tree' => 1,
@@ -612,7 +614,7 @@
   } else {
     $new_format = $set_format;
   }
-  my $expanded_format = $new_format;
+  my $expanded_format = $set_format;
   if (!$formats_table{$new_format}) {
     warn sprintf(__("%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value 
`%s'.\n"), 
                  $real_command_name, $new_format);