texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[5895] * Texinfo/Convert/DocBook.pm (upper_case_style_commands): use


From: Patrice Dumas
Subject: [5895] * Texinfo/Convert/DocBook.pm (upper_case_style_commands): use
Date: Mon, 27 Oct 2014 08:43:41 +0000

Revision: 5895
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5895
Author:   pertusus
Date:     2014-10-27 08:43:39 +0000 (Mon, 27 Oct 2014)
Log Message:
-----------
        * Texinfo/Convert/DocBook.pm (upper_case_style_commands): use
        a context of 'upper_case' to track situation where upper casing
        of text should be done instead of upper-casing already converted
        output.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/DocBook.pm
    trunk/tp/t/03coverage_braces.t
    trunk/tp/t/results/converters_tests/at_commands_in_refs.pl
    trunk/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
    trunk/tp/t/results/coverage/commands.pl
    trunk/tp/t/results/coverage_braces/nested_in_sc.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-10-26 22:49:39 UTC (rev 5894)
+++ trunk/ChangeLog     2014-10-27 08:43:39 UTC (rev 5895)
@@ -1,3 +1,10 @@
+2014-10-27  Patrice Dumas  <address@hidden>
+
+       * Texinfo/Convert/DocBook.pm (upper_case_style_commands): use
+       a context of 'upper_case' to track situation where upper casing
+       of text should be done instead of upper-casing already converted
+       output.
+
 2014-10-26  Gavin Smith  <address@hidden>
 
        * info/info-utils.c (scan_reference_marker) Return value says 

Modified: trunk/tp/Texinfo/Convert/DocBook.pm
===================================================================
--- trunk/tp/Texinfo/Convert/DocBook.pm 2014-10-26 22:49:39 UTC (rev 5894)
+++ trunk/tp/Texinfo/Convert/DocBook.pm 2014-10-27 08:43:39 UTC (rev 5895)
@@ -171,7 +171,8 @@
   }
   if ($quoted_style_commands{$command}) {
     $style_commands_formatting{$command}->{'quote'} = 1;
-  } elsif ($upper_case_style_commands{$command}) {
+  }
+  if ($upper_case_style_commands{$command}) {
     $style_commands_formatting{$command}->{'upper_case'} = 1;
   }
 }
@@ -277,7 +278,7 @@
 {
   my $self = shift;
 
-  $self->{'document_context'} = [{'monospace' => [0]}];
+  $self->{'document_context'} = [{'monospace' => [0], 'upper_case' => [0]}];
   $self->{'context_block_commands'} = {%default_context_block_commands};
   foreach my $raw (keys (%Texinfo::Common::format_raw_commands)) {
     $self->{'context_block_commands'}->{$raw} = 1
@@ -408,7 +409,7 @@
     my $index_entry = $root->{'extra'}->{'index_entry'};
     # FIXME DocBook 5 role->type
     my $result = "<indexterm role=\"$index_entry->{'index_name'}\"><primary>";
-    push @{$self->{'document_context'}}, {'monospace' => [0]};
+    push @{$self->{'document_context'}}, {'monospace' => [0], 'upper_case' => 
[0]};
     $self->{'document_context'}->[-1]->{'monospace'}->[-1] = 1
       if ($index_entry->{'in_code'});
     $result .= $self->_convert({'contents' => $index_entry->{'content'}});
@@ -489,7 +490,11 @@
     } elsif ($self->{'document_context'}->[-1]->{'raw'}) {
       return $root->{'text'};
     }
-    $result = $self->_protect_text($root->{'text'});
+    $result = $root->{'text'};
+    if ($self->{'document_context'}->[-1]->{'upper_case'}->[-1]) {
+      $result = uc($result);
+    }
+    $result = $self->_protect_text($result);
     if (! defined($root->{'type'}) or $root->{'type'} ne 'raw') {
       if (!$self->{'document_context'}->[-1]->{'monospace'}->[-1]) {
         $result =~ s/``/$ldquo/g;
@@ -726,7 +731,7 @@
              and exists($Texinfo::Common::brace_commands{$root->{'cmdname'}})) 
{
       if ($style_commands_formatting{$root->{'cmdname'}}) {
         if ($Texinfo::Common::context_brace_commands{$root->{'cmdname'}}) {
-          push @{$self->{'document_context'}}, {'monospace' => [0]};
+          push @{$self->{'document_context'}}, {'monospace' => [0], 
'upper_case' => [0]};
         }
         my $formatting = $style_commands_formatting{$root->{'cmdname'}};
 
@@ -737,6 +742,9 @@
         } elsif ($regular_font_style_commands{$root->{'cmdname'}}) {
           $in_monospace_not_normal = 0;
         }
+        if ($formatting->{'upper_case'}) {
+          push @{$self->{'document_context'}->[-1]->{'upper_case'}}, 1;
+        }
         push @{$self->{'document_context'}->[-1]->{'monospace'}}, 
           $in_monospace_not_normal
             if (defined($in_monospace_not_normal));
@@ -753,9 +761,10 @@
         if (defined($formatting->{'quote'})) {
           $result = $self->get_conf('OPEN_QUOTE_SYMBOL') . $result
                    . $self->get_conf('CLOSE_QUOTE_SYMBOL');
-        } elsif (defined($formatting->{'upper_case'})) {
-          $result = uc($result);
         }
+        if (defined($formatting->{'upper_case'})) {
+          pop @{$self->{'document_context'}->[-1]->{'upper_case'}};
+        }
         pop @{$self->{'document_context'}->[-1]->{'monospace'}}
           if (defined($in_monospace_not_normal));
         if ($Texinfo::Common::context_brace_commands{$root->{'cmdname'}}) {
@@ -1052,7 +1061,7 @@
         return '' if (! $expand);
         my $arg_index = 1;
         if ($root->{'cmdname'} eq 'inlineraw') {
-          push @{$self->{'document_context'}}, {'monospace' => [0]};
+          push @{$self->{'document_context'}}, {'monospace' => [0], 
'upper_case' => [0]};
           $self->{'document_context'}->[-1]->{'raw'} = 1;
         } elsif ($root->{'cmdname'} eq 'inlinefmtifelse' 
                  and ! 
$self->{'expanded_formats_hash'}->{$root->{'extra'}->{'format'}}) {
@@ -1076,7 +1085,7 @@
       return $w_command_mark;
     } elsif (exists($Texinfo::Common::block_commands{$root->{'cmdname'}})) {
       if ($self->{'context_block_commands'}->{$root->{'cmdname'}}) {
-        push @{$self->{'document_context'}}, {'monospace' => [0]};
+        push @{$self->{'document_context'}}, {'monospace' => [0], 'upper_case' 
=> [0]};
       }
       my @attributes;
       my $appended = '';
@@ -1207,7 +1216,7 @@
     } elsif ($root->{'type'} eq 'def_line') {
       $result .= "<synopsis>";
       $result .= $self->_index_entry($root);
-      push @{$self->{'document_context'}}, {'monospace' => [1]};
+      push @{$self->{'document_context'}}, {'monospace' => [1], 'upper_case' 
=> [0]};
       $self->{'document_context'}->[-1]->{'inline'}++;
       if ($root->{'extra'} and $root->{'extra'}->{'def_args'}) {
         my $main_command;

Modified: trunk/tp/t/03coverage_braces.t
===================================================================
--- trunk/tp/t/03coverage_braces.t      2014-10-26 22:49:39 UTC (rev 5894)
+++ trunk/tp/t/03coverage_braces.t      2014-10-27 08:43:39 UTC (rev 5895)
@@ -80,9 +80,9 @@
 ggg *}}.
 '],
 ['nested_in_sc',
-'@address@hidden @~n @aa{} @address@hidden @footnote{In footnote}, @abbr{ABr, 
expl}, 
+'@address@hidden @~n @aa{} @TeX{} @address@hidden @footnote{In footnote}, 
@abbr{ABr, expl}, 
 @verb{:in verb:}}}
-'],
+', {'test_formats' => ['docbook']}],
 ['ref_in_style_command', '@address@hidden(manula)other node}}.'],
 ['uref_in_ref',
 '@ref{(file)node, cross ref with uref 
@uref{href://http/myhost.com/index.html,uref1}, title with uref2 
@uref{href://http/myhost.com/index2.html,uref2}, info file with uref3 
@uref{href://http/myhost.com/index3.html,uref3}, printed manual with uref4 
@uref{href://http/myhost.com/index4.html,uref4}}

Modified: trunk/tp/t/results/converters_tests/at_commands_in_refs.pl
===================================================================
--- trunk/tp/t/results/converters_tests/at_commands_in_refs.pl  2014-10-26 
22:49:39 UTC (rev 5894)
+++ trunk/tp/t/results/converters_tests/at_commands_in_refs.pl  2014-10-27 
08:43:39 UTC (rev 5895)
@@ -22934,7 +22934,7 @@
 
 </chapter>
 <chapter label="21" id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i">
-<title><citetitle>cite asis</citetitle> in @w <emphasis 
role="bold">b</emphasis><!-- /@w --> in r sc <emphasis 
role="bold">str</emphasis> <literal>t</literal> <replaceable>var</replaceable> 
<firstterm>dfn</firstterm> <emphasis>i</emphasis></title>
+<title><citetitle>cite asis</citetitle> in @w <emphasis 
role="bold">b</emphasis><!-- /@w --> in r SC <emphasis 
role="bold">str</emphasis> <literal>t</literal> <replaceable>var</replaceable> 
<firstterm>dfn</firstterm> <emphasis>i</emphasis></title>
 
 </chapter>
 <chapter label="22" id="env-code-option-samp-command-file-C_002dx-ESC">
@@ -22980,7 +22980,7 @@
 <link linkend="someone_0040somewher-no_005fexplain_0040there"><ulink 
url="mailto:address@hidden";>the someone</ulink> 
<email>address@hidden</email></link>
 <link 
linkend="f_002d_002dile1-f_002d_002dile"><inlinemediaobject><imageobject><imagedata
 fileref="f--ile1.jpg" 
format="JPG"></imagedata></imageobject></inlinemediaobject>  
<inlinemediaobject><imageobject><imagedata fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>Image 
description&quot;&quot;\\.</literallayout></textobject></inlinemediaobject></link>
 <link linkend="-_0040-_007b_007d-_002e-"><literal> @ {} . </literal></link>
-<link linkend="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><citetitle>cite 
asis</citetitle> in @w <emphasis role="bold">b</emphasis><!-- /@w --> in r sc 
<emphasis role="bold">str</emphasis> <literal>t</literal> 
<replaceable>var</replaceable> <firstterm>dfn</firstterm> 
<emphasis>i</emphasis></link>
+<link linkend="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><citetitle>cite 
asis</citetitle> in @w <emphasis role="bold">b</emphasis><!-- /@w --> in r SC 
<emphasis role="bold">str</emphasis> <literal>t</literal> 
<replaceable>var</replaceable> <firstterm>dfn</firstterm> 
<emphasis>i</emphasis></link>
 <link 
linkend="env-code-option-samp-command-file-C_002dx-ESC"><envar>env</envar> 
<literal>code</literal> <option>option</option> 
&#8216;<literal>samp</literal>&#8217; <command>command</command> 
<filename>file</filename> <userinput>C-x <keycap>ESC</keycap></userinput></link>
 <link linkend="8_002e27in">8.27in</link>
 <link linkend="sansserif-slanted">sansserif slanted</link>

Modified: trunk/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
===================================================================
--- trunk/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl        
2014-10-26 22:49:39 UTC (rev 5894)
+++ trunk/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl        
2014-10-27 08:43:39 UTC (rev 5895)
@@ -1794,7 +1794,7 @@
 
 </chapter>
 <chapter label="1" 
id="A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1">
-<title>A sc node &#239; &#239; &#274;` &#322; &#262;, &#161;</title>
+<title>A SC node &#239; &#239; &#274;` &#322; &#262;, &#161;</title>
 
 <para>see .
 </para></chapter>

Modified: trunk/tp/t/results/coverage/commands.pl
===================================================================
--- trunk/tp/t/results/coverage/commands.pl     2014-10-26 22:49:39 UTC (rev 
5894)
+++ trunk/tp/t/results/coverage/commands.pl     2014-10-27 08:43:39 UTC (rev 
5895)
@@ -603,7 +603,7 @@
 $result_converted{'docbook'}->{'commands'} = '<para>@ &tex; &#160;&#235; 
&#238; &#227; &#229;
 File &#8594; Open.
 <ulink url="mailto:a";>b</ulink> <literal>code --- -- \'\' ``</literal>
-&#8212; &#8211; &#8221; &#8220;. small caps.
+&#8212; &#8211; &#8221; &#8220;. SMALL CAPS.
 </para>
 <indexterm role="cp"><primary>index entry &#8220;in text&#8221; 
&latex;</primary></indexterm>
 

Modified: trunk/tp/t/results/coverage_braces/nested_in_sc.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/nested_in_sc.pl  2014-10-26 22:49:39 UTC 
(rev 5894)
+++ trunk/tp/t/results/coverage_braces/nested_in_sc.pl  2014-10-27 08:43:39 UTC 
(rev 5895)
@@ -60,6 +60,22 @@
                         {
                           'args' => [
                             {
+                              'contents' => [],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'TeX',
+                          'contents' => [],
+                          'parent' => {}
+                        },
+                        {
+                          'parent' => {},
+                          'text' => ' '
+                        },
+                        {
+                          'args' => [
+                            {
                               'contents' => [
                                 {
                                   'args' => [
@@ -242,45 +258,48 @@
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'extra'}{'spaces_before_argument'}{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'};
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[1];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[1]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'extra'}{'brace_command_contents'}[1][0]
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[1]{'contents'}[1];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'line_nr'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'};
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'extra'}{'spaces_before_argument'}{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'line_nr'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'};
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'extra'}{'brace_command_contents'}[1][0]
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1]{'contents'}[1];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'line_nr'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'};
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[13];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'};
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'};
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'line_nr'} = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'};
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'line_nr'} = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'};
 $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'nested_in_sc'}{'contents'}[0];
 $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'nested_in_sc'}{'contents'}[0];
 $result_trees{'nested_in_sc'}{'contents'}[0]{'parent'} = 
$result_trees{'nested_in_sc'};
 
-$result_texis{'nested_in_sc'} = '@address@hidden @~n @aa{} @address@hidden 
@footnote{In footnote}, @abbr{ABr, expl}, 
+$result_texis{'nested_in_sc'} = '@address@hidden @~n @aa{} @TeX{} 
@address@hidden @footnote{In footnote}, @abbr{ABr, expl}, 
 @verb{:in verb:}}}
 ';
 
 
-$result_texts{'nested_in_sc'} = 'AAA N~ AA AA~ , ABR (EXPL), 
+$result_texts{'nested_in_sc'} = 'AAA N~ AA TeX AA~ , ABR (EXPL), 
 in verb
 ';
 
@@ -288,8 +307,13 @@
 
 
 
-$result_converted{'plaintext'}->{'nested_in_sc'} = 'AAA N~ AA AA~ (1), ABR 
(EXPL), in verb
+$result_converted{'docbook'}->{'nested_in_sc'} = '<para>AAA &#209; &#229; 
&tex; &#229;~ <footnote><para>In footnote</para></footnote>, 
<abbrev>ABR</abbrev> (EXPL), 
+<literal>IN VERB</literal>
+</para>';
 
+
+$result_converted{'plaintext'}->{'nested_in_sc'} = 'AAA N~ AA TeX AA~ (1), ABR 
(EXPL), in verb
+
    ---------- Footnotes ----------
 
    (1) In footnote
@@ -297,7 +321,7 @@
 ';
 
 
-$result_converted{'html_text'}->{'nested_in_sc'} = '<p><small><small>AAA 
&Ntilde; &Aring; &Aring;~ <a name="DOCF1" href="#FOOT1"><sup>1</sup></a>, <abbr 
title="expl">ABR</abbr> (EXPL), 
+$result_converted{'html_text'}->{'nested_in_sc'} = '<p><small><small>AAA 
&Ntilde; &Aring; TeX &Aring;~ <a name="DOCF1" href="#FOOT1"><sup>1</sup></a>, 
<abbr title="expl">ABR</abbr> (EXPL), 
 <tt>in verb</tt></small></small>
 </p><div class="footnote">
 <hr>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]