texinfo/tp/Texinfo/Convert Converter.pm DocBook...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/08/03 23:52:24

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

Log message:
        Minor code simplification.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/DocBook.pm?cvsroot=texinfo&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.64&r2=1.65

Patches:
Index: Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- Converter.pm        14 Jul 2012 23:20:08 -0000      1.83
+++ Converter.pm        3 Aug 2012 23:52:23 -0000       1.84
@@ -827,22 +827,22 @@
 }
 
 our %default_args_code_style = (
-  'email' => ['code'],
-  'anchor' => ['code'],
-  'uref' => ['code'],
-  'url' => ['code'],
-  'math' => ['code'],
-  'inforef' => ['code',undef,'code'],
-  'image' => ['code', 'code', 'code', undef, 'code'],
+  'email' => [1],
+  'anchor' => [1],
+  'uref' => [1],
+  'url' => [1],
+  'math' => [1],
+  'inforef' => [1,undef,1],
+  'image' => [1, 1, 1, undef, 1],
 # and type?
-  'float' => ['code'],
+  'float' => [1],
 );
 
 foreach my $code_style_command (keys(%Texinfo::Common::code_style_commands)) {
-  $default_args_code_style{$code_style_command} = ['code'];
+  $default_args_code_style{$code_style_command} = [1];
 }
 foreach my $ref_cmd ('pxref', 'xref', 'ref') {
-  $default_args_code_style{$ref_cmd} = ['code', undef, undef, 'code'];
+  $default_args_code_style{$ref_cmd} = [1, undef, undef, 1];
 }
 
 sub xml_protect_text($$)

Index: DocBook.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- DocBook.pm  21 Jul 2012 18:27:08 -0000      1.47
+++ DocBook.pm  3 Aug 2012 23:52:23 -0000       1.48
@@ -546,7 +546,7 @@
         $in_code = 1
           if ($format_item_command 
               and defined($default_args_code_style{$format_item_command})
-              and 
defined($default_args_code_style{$format_item_command}->[0]));
+              and $default_args_code_style{$format_item_command}->[0]);
         $self->{'document_context'}->[-1]->{'code'}++ if ($in_code);
         $result .= $self->_convert($arg_tree);
         $self->{'document_context'}->[-1]->{'code'}-- if ($in_code);
@@ -697,7 +697,7 @@
       my $in_code;
       $in_code = 1
         if (defined($default_args_code_style{$root->{'cmdname'}})
-            and defined($default_args_code_style{$root->{'cmdname'}}->[0]));
+            and $default_args_code_style{$root->{'cmdname'}}->[0]);
       $self->{'document_context'}->[-1]->{'code'}++ if ($in_code);
       my $arg = $self->_convert($root->{'args'}->[0]);
       $result .= $self->xml_protect_text($root->{'extra'}->{'begin'}).$arg
@@ -713,7 +713,7 @@
         my $in_code;
         $in_code = 1
           if (defined($default_args_code_style{$root->{'cmdname'}})
-              and defined($default_args_code_style{$root->{'cmdname'}}->[0]));
+              and $default_args_code_style{$root->{'cmdname'}}->[0]);
         $self->{'document_context'}->[-1]->{'code'}++ if ($in_code);
         my ($style, $attribute_text) = 
_parse_attribute($formatting->{'attribute'});
         my $result = $self->_convert($root->{'args'}->[0]);

Index: XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- XML.pm      14 Jul 2012 11:41:55 -0000      1.64
+++ XML.pm      3 Aug 2012 23:52:24 -0000       1.65
@@ -476,7 +476,7 @@
         $in_code = 1
           if ($format_item_command 
               and defined($default_args_code_style{$format_item_command})
-              and 
defined($default_args_code_style{$format_item_command}->[0]));
+              and $default_args_code_style{$format_item_command}->[0]);
         $self->{'document_context'}->[-1]->{'code'}++ if ($in_code);
         $result .= $self->_convert($root->{'args'}->[0]);
         $self->{'document_context'}->[-1]->{'code'}-- if ($in_code);
@@ -687,7 +687,7 @@
       my $in_code;
       $in_code = 1
         if (defined($default_args_code_style{$root->{'cmdname'}})
-            and defined($default_args_code_style{$root->{'cmdname'}}->[0]));
+            and $default_args_code_style{$root->{'cmdname'}}->[0]);
       $self->{'document_context'}->[-1]->{'code'}++ if ($in_code);
       my $arg = $self->_convert($root->{'args'}->[0]);
       $result .= "<infoenclose command=\"$root->{'cmdname'}\""
@@ -740,7 +740,7 @@
           my $in_code;
           $in_code = 1
             if (defined($default_args_code_style{$root->{'cmdname'}})
-              and 
defined($default_args_code_style{$root->{'cmdname'}}->[$arg_index]));
+              and $default_args_code_style{$root->{'cmdname'}}->[$arg_index]);
           $self->{'document_context'}->[-1]->{'code'}++ if ($in_code);
           my $arg = $self->_convert($root->{'args'}->[$arg_index]);
           if (!defined($command) or $arg ne '') {
@@ -825,7 +825,7 @@
                 my $in_code;
                  $in_code = 1
                   if (defined($default_args_code_style{$root->{'cmdname'}})
-                    and 
defined($default_args_code_style{$root->{'cmdname'}}->[$arg_index]));
+                    and 
$default_args_code_style{$root->{'cmdname'}}->[$arg_index]);
                 $self->{'document_context'}->[-1]->{'code'}++ if ($in_code);
                 my $arg;
                 if ($arg_index+1 eq scalar(@{$root->{'args'}})) {