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

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/12/16 02:21:40

Modified files:
        tp/Texinfo/Convert: DocBook.pm HTML.pm Plaintext.pm 
        tp/t           : converters_tests.t 
Added files:
        tp/t/results/converters_tests: 
                                       email_table_command_as_argument.pl 

Log message:
        Remove unneeded code for docbook.
        For intem in 2 column tables, use _register_command_arg 
brace_command_contents
        to have a correct formatting of commands that need it.
        
        Report for @email by Ineiev.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/DocBook.pm?cvsroot=texinfo&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.266&r2=1.267
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.229&r2=1.230
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/converters_tests.t?cvsroot=texinfo&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/email_table_command_as_argument.pl?cvsroot=texinfo&rev=1.1

Patches:
Index: Texinfo/Convert/DocBook.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- Texinfo/Convert/DocBook.pm  7 Dec 2012 20:05:50 -0000       1.55
+++ Texinfo/Convert/DocBook.pm  16 Dec 2012 02:21:39 -0000      1.56
@@ -516,52 +516,35 @@
       } elsif (($root->{'cmdname'} eq 'item' or $root->{'cmdname'} eq 'itemx')
                and $root->{'parent'}->{'type'} 
                and $root->{'parent'}->{'type'} eq 'table_term') {
+        my $converted_tree = {'parent' => $root};
+
+        # begin common with Plaintext.pm
+        my $contents = $root->{'extra'}->{'misc_content'};
         my $table_command = $root->{'parent'}->{'parent'}->{'parent'};
-        my $format_item_command;
-        my $arg_tree;
-        my $content_tree;
-        #my $content_tree = $root->{'args'}->[0];
-        if ($root->{'extra'} and $root->{'extra'}->{'misc_content'}) {
-          $content_tree = $root->{'extra'}->{'misc_content'};
-        } else {
-          $content_tree = [];
-        }
         if ($table_command->{'extra'} 
             and $table_command->{'extra'}->{'command_as_argument'}) {
           my $command_as_argument
             = $table_command->{'extra'}->{'command_as_argument'};
-          if ($command_as_argument->{'type'} ne 'definfoenclose_command') {
-            $arg_tree = {'cmdname' => $command_as_argument->{'cmdname'},
-                     'args' => [{'type' => 'brace_command_arg',
-                              'contents' => $content_tree}]
-            };
-          } else {
-            $arg_tree = {'cmdname' => $command_as_argument->{'cmdname'},
-                          'type' => $command_as_argument->{'type'},
-                          'extra' => $command_as_argument->{'extra'},
-                     'args' => [{'type' => 'brace_command_arg',
-                                'contents' => $content_tree}]
-            };
-          }
-        } else {
-          $arg_tree = $root->{'args'}->[0];
+          my $command = {'cmdname' => $command_as_argument->{'cmdname'},
+                     'line_nr' => $root->{'line_nr'},
+                     'parent' => $converted_tree };
+          if ($command_as_argument->{'type'} eq 'definfoenclose_command') {
+            $command->{'type'} = $command_as_argument->{'type'};
+            $command->{'extra'} = $command_as_argument->{'extra'};
+          }
+          my $arg = {'type' => 'brace_command_arg',
+                     'contents' => $contents,
+                     'parent' => $command,};
+          $command->{'args'} = [$arg];
+          $self->Texinfo::Parser::_register_command_arg($arg, 
'brace_command_contents');
+          $contents = [$command];
         }
+        $converted_tree->{'contents'} = $contents;
+        # end common with Plaintext.pm
+
         $result .= "<term>";
         $result .= $self->_index_entry($root);
-        my $in_monospace_not_normal;
-        if ($format_item_command) {
-          if (defined($default_args_code_style{$format_item_command})
-              and $default_args_code_style{$format_item_command}->[0]) {
-            $in_monospace_not_normal = 1;
-          } elsif ($regular_font_style_commands{$format_item_command}) {
-            $in_monospace_not_normal = 0;
-          }
-        }
-        push @{$self->{'document_context'}->[-1]->{'monospace'}}, 
$in_monospace_not_normal
-          if (defined($in_monospace_not_normal));
-        $result .= $self->_convert($arg_tree);
-        pop @{$self->{'document_context'}->[-1]->{'monospace'}}
-          if (defined($in_monospace_not_normal));
+        $result .= $self->_convert($converted_tree);
         chomp ($result);
         $result .= "\n";
         $result .= "</term>";

Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -b -r1.266 -r1.267
--- Texinfo/Convert/HTML.pm     15 Dec 2012 17:12:56 -0000      1.266
+++ Texinfo/Convert/HTML.pm     16 Dec 2012 02:21:40 -0000      1.267
@@ -2930,6 +2930,7 @@
     }
   } elsif ($command->{'parent'}->{'type'}
            and $command->{'parent'}->{'type'} eq 'table_term') {
+    # FIXME instead use the code of Plaintext or DocBook.
     my $args = $content;
     if ($args->[0]) {
       my $tree = $args->[0]->{'tree'};

Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -b -r1.229 -r1.230
--- Texinfo/Convert/Plaintext.pm        15 Dec 2012 17:12:56 -0000      1.229
+++ Texinfo/Convert/Plaintext.pm        16 Dec 2012 02:21:40 -0000      1.230
@@ -2111,28 +2111,32 @@
             and $root->{'args'}->[0]->{'type'}
             and $root->{'args'}->[0]->{'type'} eq 'misc_line_arg') {
       if ($root->{'extra'} and $root->{'extra'}->{'misc_content'}) {
+        my $converted_tree = {'type' => 'frenchspacing',
+                                 'parent' => $root};
+
         my $contents = $root->{'extra'}->{'misc_content'};
         my $table_command = $root->{'parent'}->{'parent'}->{'parent'};
-        if ($table_command->{'extra'} and 
$table_command->{'extra'}->{'command_as_argument'}) {
-          my $command_as_argument = 
$table_command->{'extra'}->{'command_as_argument'};
-          if ($command_as_argument->{'type'} ne 'definfoenclose_command') {
-            $contents = [{'cmdname' => $command_as_argument->{'cmdname'},
-                     'args' => [{'type' => 'brace_command_arg', 
-                                'contents' => $contents}],
-                     'line_nr' => $root->{'line_nr'},
-            }];
-          } else {
-            $contents = [{'cmdname' => $command_as_argument->{'cmdname'},
-                          'type' => $command_as_argument->{'type'},
-                          'extra' => $command_as_argument->{'extra'},
-                     'args' => [{'type' => 'brace_command_arg', 
-                                'contents' => $contents}],
+        if ($table_command->{'extra'} 
+            and $table_command->{'extra'}->{'command_as_argument'}) {
+          my $command_as_argument 
+            = $table_command->{'extra'}->{'command_as_argument'};
+          my $command = {'cmdname' => $command_as_argument->{'cmdname'},
                      'line_nr' => $root->{'line_nr'},
-            }];
+                     'parent' => $converted_tree };
+          if ($command_as_argument->{'type'} eq 'definfoenclose_command') {
+            $command->{'type'} = $command_as_argument->{'type'};
+            $command->{'extra'} = $command_as_argument->{'extra'};
+          }
+          my $arg = {'type' => 'brace_command_arg',
+                     'contents' => $contents,
+                     'parent' => $command,};
+          $command->{'args'} = [$arg];
+          $self->Texinfo::Parser::_register_command_arg($arg, 
'brace_command_contents');
+          $contents = [$command];
           }
-        }
-        $result = $self->convert_line({'type' => 'frenchspacing',
-                                     'contents' => $contents},
+        $converted_tree->{'contents'} = $contents;
+
+        $result = $self->convert_line($converted_tree,
                     {'indent_level'
                       => $self->{'format_context'}->[-1]->{'indent_level'} 
-1});
         if ($result ne '') {

Index: t/converters_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/converters_tests.t,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- t/converters_tests.t        15 Dec 2012 17:12:57 -0000      1.41
+++ t/converters_tests.t        16 Dec 2012 02:21:40 -0000      1.42
@@ -812,6 +812,12 @@
 
 @printindex fn
 '],
+['email_table_command_as_argument',
+'@table @email
address@hidden www-discuss@@gnu.org
+discussion
address@hidden table
+'],
 );
 
 my @html_text_cases = (

Index: t/results/converters_tests/email_table_command_as_argument.pl
===================================================================
RCS file: t/results/converters_tests/email_table_command_as_argument.pl
diff -N t/results/converters_tests/email_table_command_as_argument.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/converters_tests/email_table_command_as_argument.pl       16 Dec 
2012 02:21:40 -0000      1.1
@@ -0,0 +1,259 @@
+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{'email_table_command_as_argument'} = {
+  'contents' => [
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'cmdname' => 'email',
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 1,
+                'macro' => ''
+              },
+              'parent' => {},
+              'type' => 'command_as_argument'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'space_at_end_block_command'
+            }
+          ],
+          'parent' => {},
+          'type' => 'block_line_arg'
+        }
+      ],
+      'cmdname' => 'table',
+      'contents' => [
+        {
+          'contents' => [
+            {
+              'contents' => [
+                {
+                  'args' => [
+                    {
+                      'contents' => [
+                        {
+                          'extra' => {
+                            'command' => {}
+                          },
+                          'parent' => {},
+                          'text' => ' ',
+                          'type' => 'empty_spaces_after_command'
+                        },
+                        {
+                          'parent' => {},
+                          'text' => 'www-discuss'
+                        },
+                        {
+                          'cmdname' => '@',
+                          'parent' => {}
+                        },
+                        {
+                          'parent' => {},
+                          'text' => 'gnu.org'
+                        },
+                        {
+                          'parent' => {},
+                          'text' => '
+',
+                          'type' => 'spaces_at_end'
+                        }
+                      ],
+                      'parent' => {},
+                      'type' => 'misc_line_arg'
+                    }
+                  ],
+                  'cmdname' => 'item',
+                  'extra' => {
+                    'misc_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'spaces_after_command' => {}
+                  },
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 2,
+                    'macro' => ''
+                  },
+                  'parent' => {}
+                }
+              ],
+              'parent' => {},
+              'type' => 'table_term'
+            },
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'discussion
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'paragraph'
+                }
+              ],
+              'parent' => {},
+              'type' => 'table_item'
+            }
+          ],
+          'parent' => {},
+          'type' => 'table_entry'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'command' => {}
+                  },
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'table'
+                },
+                {
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'end',
+          'extra' => {
+            'command' => {},
+            'command_argument' => 'table',
+            'spaces_after_command' => {},
+            'text_arg' => 'table'
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 4,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'extra' => {
+        'block_command_line_contents' => [
+          [
+            {}
+          ]
+        ],
+        'command_as_argument' => {},
+        'end_command' => {},
+        'spaces_after_command' => {}
+      },
+      'line_nr' => {},
+      'parent' => {}
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'email_table_command_as_argument'}{'contents'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'email_table_command_as_argument'}{'contents'}[0]{'args'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'email_table_command_as_argument'}{'contents'}[0]{'args'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'email_table_command_as_argument'}{'contents'}[0]{'args'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'email_table_command_as_argument'}{'contents'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[1]
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[2]
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'email_table_command_as_argument'}{'contents'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[1];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[1];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'email_table_command_as_argument'}{'contents'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'email_table_command_as_argument'}{'contents'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[1];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'line_nr'} = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'email_table_command_as_argument'};
+
+$result_texis{'email_table_command_as_argument'} = '@table @email
address@hidden www-discuss@@gnu.org
+discussion
address@hidden table
+';
+
+
+$result_texts{'email_table_command_as_argument'} = 'address@hidden
+discussion
+';
+
+$result_errors{'email_table_command_as_argument'} = [];
+
+
+
+$result_converted{'plaintext'}->{'email_table_command_as_argument'} = 
'<address@hidden>
+     discussion
+';
+
+
+$result_converted{'html_text'}->{'email_table_command_as_argument'} = '<dl 
compact="compact">
+<dt><a href="mailto:address@hidden";>address@hidden</a></dt>
+<dd><p>discussion
+</p></dd>
+</dl>
+';
+
+
+$result_converted{'xml'}->{'email_table_command_as_argument'} = '<table 
commandarg="email" spaces=" " endspaces=" ">
+<tableentry><tableterm><item spaces=" "><itemformat 
command="email">www-discuss&arobase;gnu.org</itemformat></item>
+</tableterm><tableitem><para>discussion
+</para></tableitem></tableentry></table>
+';
+
+
+$result_converted{'docbook'}->{'email_table_command_as_argument'} = 
'<variablelist><varlistentry><term><email>address@hidden</email>
+</term><listitem><para>discussion
+</para></listitem></varlistentry></variablelist>';
+
+1;