texinfo/tp/Texinfo/Convert Converter.pm

[Patrice Dumas]

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

Modified files:
        tp/Texinfo/Convert: Converter.pm 

Log message:
        Handle right options.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.12&r2=1.13

Patches:
Index: Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- Converter.pm        12 Apr 2011 23:52:53 -0000      1.12
+++ Converter.pm        13 Apr 2011 22:43:43 -0000      1.13
@@ -45,6 +45,7 @@
   'expanded_formats'     => undef,
   'include_directories'  => undef,
   'NUMBER_SECTIONS'      => 1,
+  'output_format'        => undef,
 
   'DEBUG'                => 0,
   'TEST'                 => 0,
@@ -138,19 +139,16 @@
       delete $conf->{'parser'};
     }
     foreach my $key (keys(%$conf)) {
-      if (!exists($defaults{$key})) {
-        # many things may be passed down
-        #warn "$key not a possible configuration in $name\n";
-      } else {
         if (Texinfo::Common::valid_option($key)) {
           $converter->{'conf'}->{$key} = $conf->{$key};
+      } elsif (!exists($defaults{$key})) {
+        warn "$key not a possible configuration in $name\n";
         } else {
           $converter->{$key} = $conf->{$key};
         }
         $converter->{'set'}->{$key} = 1;
       }
     }
-  }
   if (!defined($converter->{'expanded_formats'})) {
     if ($converter->{'parser'}) {
       $converter->{'expanded_formats'} = 
$converter->{'parser'}->{'expanded_formats'};