[5299] * Texinfo/Convert/Converter.pm(_informative_command_value,

[Patrice Dumas]

Revision: 5299
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5299
Author:   pertusus
Date:     2013-08-11 10:51:17 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
        * Texinfo/Convert/Converter.pm(_informative_command_value,
        _informative_command): do not set informative command value if 
        value is not defined.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/Converter.pm
    trunk/tp/t/08misc_commands.t

Added Paths:
-----------
    trunk/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2013-08-11 09:12:34 UTC (rev 5298)
+++ trunk/ChangeLog     2013-08-11 10:51:17 UTC (rev 5299)
@@ -2,6 +2,9 @@
 
        * tp/Texinfo/Convert/HTML.pm(output): sort when processing renamed
        nodes to have a reproducible error output.  Report by Karl.
+       * Texinfo/Convert/Converter.pm(_informative_command_value,
+       _informative_command): do not set informative command value if 
+       value is not defined.
 
 2013-08-10  Patrice Dumas  <address@hidden>
 

Modified: trunk/tp/Texinfo/Convert/Converter.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Converter.pm       2013-08-11 09:12:34 UTC (rev 
5298)
+++ trunk/tp/Texinfo/Convert/Converter.pm       2013-08-11 10:51:17 UTC (rev 
5299)
@@ -144,6 +144,7 @@
            and exists($root->{'extra'}->{'misc_args'}->[0])) {
     return $root->{'extra'}->{'misc_args'}->[0];
   }
+  return undef;
 }
 
 # FIXME documentencoding handling is not reverted by resetting
@@ -161,7 +162,9 @@
   return if ($self->{'set'}->{$cmdname});
 
   my $value = $self->_informative_command_value($root);
-  $self->set_conf($cmdname, $value);
+  if (defined($value)) {
+    $self->set_conf($cmdname, $value);
+  }
 }
 
 sub register_close_file($$)

Modified: trunk/tp/t/08misc_commands.t
===================================================================
--- trunk/tp/t/08misc_commands.t        2013-08-11 09:12:34 UTC (rev 5298)
+++ trunk/tp/t/08misc_commands.t        2013-08-11 10:51:17 UTC (rev 5299)
@@ -384,6 +384,10 @@
 @testallowcodebreakspara{2}
 @testallowcodebreaksexample{}
 '],
+['incorrect_allowcodebreaks_argument',
+'@allowcodebreaks _arg
address@hidden a}
+'],
 ['codequoteundirected_codequotebacktick',
 '@macro quotes
 ``simple-double--three---four----\'\' `simple\' quotedblleft: @quotedblleft{} 
@*

Added: trunk/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
===================================================================
--- trunk/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl      
                        (rev 0)
+++ trunk/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl      
2013-08-11 10:51:17 UTC (rev 5299)
@@ -0,0 +1,126 @@
+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_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'incorrect_allowcodebreaks_argument'} = {
+  'contents' => [
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => '_arg'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'spaces_at_end'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'allowcodebreaks',
+      'extra' => {
+        'spaces_after_command' => {}
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 1,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'contents' => [
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'b a'
+                }
+              ],
+              'parent' => {},
+              'type' => 'brace_command_arg'
+            }
+          ],
+          'cmdname' => 'code',
+          'contents' => [],
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 2,
+            'macro' => ''
+          },
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => '
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[0];
+$result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[0]{'args'}[0];
+$result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[0]{'args'}[0];
+$result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[0]{'args'}[0];
+$result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[0];
+$result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'incorrect_allowcodebreaks_argument'};
+$result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[1]{'contents'}[0];
+$result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[1];
+$result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[1];
+$result_trees{'incorrect_allowcodebreaks_argument'}{'contents'}[1]{'parent'} = 
$result_trees{'incorrect_allowcodebreaks_argument'};
+
+$result_texis{'incorrect_allowcodebreaks_argument'} = '@allowcodebreaks _arg
address@hidden a}
+';
+
+
+$result_texts{'incorrect_allowcodebreaks_argument'} = 'b a
+';
+
+$result_errors{'incorrect_allowcodebreaks_argument'} = [
+  {
+    'error_line' => ':1: @allowcodebreaks arg must be `true\' or `false\', not 
`_arg\'
+',
+    'file_name' => '',
+    'line_nr' => 1,
+    'macro' => '',
+    'text' => '@allowcodebreaks arg must be `true\' or `false\', not `_arg\'',
+    'type' => 'error'
+  }
+];
+
+
+
+$result_converted{'plaintext'}->{'incorrect_allowcodebreaks_argument'} = '\'b 
a\'
+';
+
+
+$result_converted{'html_text'}->{'incorrect_allowcodebreaks_argument'} = 
'<p><code>b a</code>
+</p>';
+
+1;