[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Remove a spurious empty line in Changelog. Add mo
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: Remove a spurious empty line in Changelog. Add more nested commands tests. |
|
Date: |
Sun, 21 Aug 2022 19:31:17 -0400 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 3e31e1bd50 Remove a spurious empty line in Changelog. Add more nested
commands tests.
3e31e1bd50 is described below
commit 3e31e1bd500159ee9a5419ac2016e3c1c747901a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Aug 22 01:30:39 2022 +0200
Remove a spurious empty line in Changelog.
Add more nested commands tests.
---
ChangeLog | 1 -
tp/t/converters_tests.t | 40 +-
tp/t/results/converters_tests/combined_fonts.pl | 517 ++++++++++++++++-----
.../combined_fonts/res_docbook/combined_fonts.xml | 39 +-
.../combined_fonts/res_html/chapter.html | 39 +-
.../combined_fonts/res_info/combined_fonts.info | 20 +-
.../combined_fonts/res_latex/combined_fonts.tex | 40 +-
.../combined_fonts/res_xml/combined_fonts.xml | 39 +-
8 files changed, 514 insertions(+), 221 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d6f30c7ecb..e9b8de0cec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,7 +20,6 @@
differences between the readers. Precise that another questions
is also on the Emacs Info reader.
-
2022-08-21 Patrice Dumas <pertusus@free.fr>
No separate node for PDF output from DVI output
diff --git a/tp/t/converters_tests.t b/tp/t/converters_tests.t
index 89a6e6d07c..a3efac85dd 100644
--- a/tp/t/converters_tests.t
+++ b/tp/t/converters_tests.t
@@ -1076,29 +1076,34 @@ undef, {'test_file' => 'empty.texi'}],
@node chapter
@chapter chapter
-@code{code}, @dfn{dfn}, @var{var}, @strong{strong}, @kbd{kbd}, @samp{samp}.
+@code{c--ode}, @dfn{d--fn}, @var{v--ar}, @strong{s--trong}, @kbd{k--bd},
@samp{s--amp}.
-@code{@dfn{dfn in code}}
-@var{@code{code in var}}
-@code{@var{var in code}}
-@strong{@kbd{kbd in strong}}
-@samp{@strong{strong in samp}}
-@strong{@samp{samp in strong}}
+@code{@dfn{d--fn in code}}
+@var{@code{c--ode in var}}
+@code{@var{v--ar in code}}
+@strong{@kbd{k--bd in strong}}
+@samp{@strong{s--trong in samp}}
+@strong{@samp{s--amp in strong}}
-@cite{cite}
+@cite{c--ite}
-@code{@cite{cite in code}}
-@cite{@code{code in cite}}
+@code{@cite{c--ite in code}}
+@cite{@code{c--ode in cite}}
-@code{code} @slanted{slanted} @b{b}
-@code{@slanted{slanted in code}}
-@slanted{@code{code in slanted}}
-@b{@slanted{slanted in b}}
-@slanted{@b{b in slanted}}
+@code{c--ode} @slanted{s--lanted} @b{b--} @t{t--}
+
+@code{@slanted{s--lanted in code}}
+@slanted{@code{c--ode in slanted}}
+@b{@slanted{s--lanted in b}}
+@slanted{@b{b-- in slanted}}
+@t{@slanted{s--lanted in t}}
+@slanted{@t{t-- in slanted}}
+@t{@var{v--ar in t}}
+@var{@t{t-- in var}}
@example
-@var{var in example}
-@cite{cite in example}
+@var{v--ar in example}
+@cite{c--ite in example}
@end example
'],
);
@@ -1216,6 +1221,7 @@ foreach my $test (@file_tests) {
push @{$test->[2]->{'test_formats'}}, 'file_html';
push @{$test->[2]->{'test_formats'}}, 'file_info';
push @{$test->[2]->{'test_formats'}}, ('file_xml', 'file_docbook',
'file_latex');
+ $test->[2]->{'full_document'} = 1 unless
(exists($test->[2]->{'full_document'}));
}
run_all('converters_tests', [@test_cases, @html_text_cases, @file_tests]);
diff --git a/tp/t/results/converters_tests/combined_fonts.pl
b/tp/t/results/converters_tests/combined_fonts.pl
index 29792a3322..b5d231f3d4 100644
--- a/tp/t/results/converters_tests/combined_fonts.pl
+++ b/tp/t/results/converters_tests/combined_fonts.pl
@@ -10,39 +10,45 @@ $result_trees{'combined_fonts'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'combined_fonts.info'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
'parent' => {},
- 'text' => 'combined_fonts.info'
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'setfilename',
'extra' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'combined_fonts.info'
},
'parent' => {},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
}
],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'combined_fonts.info'
- },
- 'parent' => {},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- }
- },
- {
'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'type' => 'preamble_before_content'
}
],
'parent' => {},
@@ -199,7 +205,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'code'
+ 'text' => 'c--ode'
}
],
'parent' => {},
@@ -225,7 +231,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'dfn'
+ 'text' => 'd--fn'
}
],
'parent' => {},
@@ -251,7 +257,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'var'
+ 'text' => 'v--ar'
}
],
'parent' => {},
@@ -277,7 +283,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'strong'
+ 'text' => 's--trong'
}
],
'parent' => {},
@@ -303,7 +309,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'kbd'
+ 'text' => 'k--bd'
}
],
'parent' => {},
@@ -329,7 +335,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'samp'
+ 'text' => 's--amp'
}
],
'parent' => {},
@@ -372,7 +378,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'dfn in code'
+ 'text' => 'd--fn in code'
}
],
'parent' => {},
@@ -417,7 +423,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'code in var'
+ 'text' => 'c--ode in var'
}
],
'parent' => {},
@@ -462,7 +468,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'var in code'
+ 'text' => 'v--ar in code'
}
],
'parent' => {},
@@ -507,7 +513,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'kbd in strong'
+ 'text' => 'k--bd in strong'
}
],
'parent' => {},
@@ -552,7 +558,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'strong in samp'
+ 'text' => 's--trong in samp'
}
],
'parent' => {},
@@ -597,7 +603,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'samp in strong'
+ 'text' => 's--amp in strong'
}
],
'parent' => {},
@@ -650,7 +656,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'cite'
+ 'text' => 'c--ite'
}
],
'parent' => {},
@@ -693,7 +699,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'cite in code'
+ 'text' => 'c--ite in code'
}
],
'parent' => {},
@@ -738,7 +744,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'code in cite'
+ 'text' => 'c--ode in cite'
}
],
'parent' => {},
@@ -791,7 +797,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'code'
+ 'text' => 'c--ode'
}
],
'parent' => {},
@@ -817,7 +823,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'slanted'
+ 'text' => 's--lanted'
}
],
'parent' => {},
@@ -843,7 +849,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'b'
+ 'text' => 'b--'
}
],
'parent' => {},
@@ -859,11 +865,49 @@ $result_trees{'combined_fonts'} = {
'macro' => ''
}
},
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 't--'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 't',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ }
+ },
{
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -874,7 +918,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'slanted in code'
+ 'text' => 's--lanted in code'
}
],
'parent' => {},
@@ -886,7 +930,7 @@ $result_trees{'combined_fonts'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 24,
+ 'line_nr' => 25,
'macro' => ''
}
}
@@ -900,7 +944,7 @@ $result_trees{'combined_fonts'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 24,
+ 'line_nr' => 25,
'macro' => ''
}
},
@@ -919,7 +963,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'code in slanted'
+ 'text' => 'c--ode in slanted'
}
],
'parent' => {},
@@ -931,7 +975,7 @@ $result_trees{'combined_fonts'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 25,
+ 'line_nr' => 26,
'macro' => ''
}
}
@@ -945,7 +989,7 @@ $result_trees{'combined_fonts'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 25,
+ 'line_nr' => 26,
'macro' => ''
}
},
@@ -964,7 +1008,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'slanted in b'
+ 'text' => 's--lanted in b'
}
],
'parent' => {},
@@ -976,7 +1020,7 @@ $result_trees{'combined_fonts'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 26,
+ 'line_nr' => 27,
'macro' => ''
}
}
@@ -990,7 +1034,7 @@ $result_trees{'combined_fonts'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 26,
+ 'line_nr' => 27,
'macro' => ''
}
},
@@ -1009,7 +1053,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'b in slanted'
+ 'text' => 'b-- in slanted'
}
],
'parent' => {},
@@ -1021,7 +1065,7 @@ $result_trees{'combined_fonts'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 27,
+ 'line_nr' => 28,
'macro' => ''
}
}
@@ -1035,7 +1079,187 @@ $result_trees{'combined_fonts'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 27,
+ 'line_nr' => 28,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 's--lanted in t'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'slanted',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 29,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 't',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 29,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 't-- in slanted'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 't',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 30,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'slanted',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 30,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'v--ar in t'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'var',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 31,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 't',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 31,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 't-- in var'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 't',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 32,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'var',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 32,
'macro' => ''
}
},
@@ -1074,7 +1298,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'var in example'
+ 'text' => 'v--ar in example'
}
],
'parent' => {},
@@ -1086,7 +1310,7 @@ $result_trees{'combined_fonts'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 30,
+ 'line_nr' => 35,
'macro' => ''
}
},
@@ -1101,7 +1325,7 @@ $result_trees{'combined_fonts'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'cite in example'
+ 'text' => 'c--ite in example'
}
],
'parent' => {},
@@ -1113,7 +1337,7 @@ $result_trees{'combined_fonts'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 31,
+ 'line_nr' => 36,
'macro' => ''
}
},
@@ -1152,7 +1376,7 @@ $result_trees{'combined_fonts'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 32,
+ 'line_nr' => 37,
'macro' => ''
}
}
@@ -1163,7 +1387,7 @@ $result_trees{'combined_fonts'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 29,
+ 'line_nr' => 34,
'macro' => ''
}
}
@@ -1181,10 +1405,11 @@ $result_trees{'combined_fonts'} = {
],
'type' => 'document_root'
};
-$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0];
$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[0];
-$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[0];
$result_trees{'combined_fonts'}{'contents'}[0]{'parent'} =
$result_trees{'combined_fonts'};
$result_trees{'combined_fonts'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[1]{'args'}[0];
$result_trees{'combined_fonts'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[1];
@@ -1299,48 +1524,78 @@
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'ar
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[4];
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9];
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[0];
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'args'}[0];
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[6];
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9];
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[8];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[10];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[0];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[12];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9];
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[4];
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[10]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[4];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[0];
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[1];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[1];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[2];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[1];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[3]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[1];
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0];
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0];
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[2];
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'extra'}{'end_command'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[2];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[4];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[5]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[6]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[6]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[6];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[6]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[7]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[8]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[8]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[8];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[8]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[9]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[10]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[10]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[10];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[10]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[11]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[12]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[12]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[12];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[12]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[13]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[14]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[14]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[14];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[14]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'contents'}[15]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11];
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[11]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[4];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[12]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[4];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[2];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[3]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[2]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[2];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[2]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'extra'}{'end_command'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[2];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[4];
$result_trees{'combined_fonts'}{'contents'}[4]{'parent'} =
$result_trees{'combined_fonts'};
$result_texis{'combined_fonts'} = '@setfilename combined_fonts.info
@@ -1351,29 +1606,34 @@ $result_texis{'combined_fonts'} = '@setfilename
combined_fonts.info
@node chapter
@chapter chapter
-@code{code}, @dfn{dfn}, @var{var}, @strong{strong}, @kbd{kbd}, @samp{samp}.
+@code{c--ode}, @dfn{d--fn}, @var{v--ar}, @strong{s--trong}, @kbd{k--bd},
@samp{s--amp}.
+
+@code{@dfn{d--fn in code}}
+@var{@code{c--ode in var}}
+@code{@var{v--ar in code}}
+@strong{@kbd{k--bd in strong}}
+@samp{@strong{s--trong in samp}}
+@strong{@samp{s--amp in strong}}
-@code{@dfn{dfn in code}}
-@var{@code{code in var}}
-@code{@var{var in code}}
-@strong{@kbd{kbd in strong}}
-@samp{@strong{strong in samp}}
-@strong{@samp{samp in strong}}
+@cite{c--ite}
-@cite{cite}
+@code{@cite{c--ite in code}}
+@cite{@code{c--ode in cite}}
-@code{@cite{cite in code}}
-@cite{@code{code in cite}}
+@code{c--ode} @slanted{s--lanted} @b{b--} @t{t--}
-@code{code} @slanted{slanted} @b{b}
-@code{@slanted{slanted in code}}
-@slanted{@code{code in slanted}}
-@b{@slanted{slanted in b}}
-@slanted{@b{b in slanted}}
+@code{@slanted{s--lanted in code}}
+@slanted{@code{c--ode in slanted}}
+@b{@slanted{s--lanted in b}}
+@slanted{@b{b-- in slanted}}
+@t{@slanted{s--lanted in t}}
+@slanted{@t{t-- in slanted}}
+@t{@var{v--ar in t}}
+@var{@t{t-- in var}}
@example
-@var{var in example}
-@cite{cite in example}
+@var{v--ar in example}
+@cite{c--ite in example}
@end example
';
@@ -1385,28 +1645,33 @@ top section
1 chapter
*********
-code, dfn, var, strong, kbd, samp.
+c--ode, d-fn, v-ar, s-trong, k--bd, s--amp.
+
+d--fn in code
+c--ode in var
+v--ar in code
+k--bd in strong
+s--trong in samp
+s--amp in strong
-dfn in code
-code in var
-var in code
-kbd in strong
-strong in samp
-samp in strong
+c-ite
-cite
+c--ite in code
+c--ode in cite
-cite in code
-code in cite
+c--ode s-lanted b- t--
-code slanted b
-slanted in code
-code in slanted
-slanted in b
-b in slanted
+s--lanted in code
+c--ode in slanted
+s-lanted in b
+b- in slanted
+s--lanted in t
+t-- in slanted
+v--ar in t
+t-- in var
-var in example
-cite in example
+v--ar in example
+c--ite in example
';
$result_sectioning{'combined_fonts'} = {
diff --git
a/tp/t/results/converters_tests/combined_fonts/res_docbook/combined_fonts.xml
b/tp/t/results/converters_tests/combined_fonts/res_docbook/combined_fonts.xml
index 69a66d1f39..1feec008ca 100644
---
a/tp/t/results/converters_tests/combined_fonts/res_docbook/combined_fonts.xml
+++
b/tp/t/results/converters_tests/combined_fonts/res_docbook/combined_fonts.xml
@@ -7,27 +7,32 @@
<chapter label="1" id="chapter">
<title>chapter</title>
-<para><literal>code</literal>, <firstterm>dfn</firstterm>,
<replaceable>var</replaceable>, <emphasis role="bold">strong</emphasis>,
<userinput>kbd</userinput>, ‘<literal>samp</literal>’.
+<para><literal>c--ode</literal>, <firstterm>d–fn</firstterm>,
<replaceable>v–ar</replaceable>, <emphasis
role="bold">s–trong</emphasis>, <userinput>k--bd</userinput>,
‘<literal>s--amp</literal>’.
</para>
-<para><literal><firstterm>dfn in code</firstterm></literal>
-<replaceable><literal>code in var</literal></replaceable>
-<literal><replaceable>var in code</replaceable></literal>
-<emphasis role="bold"><userinput>kbd in strong</userinput></emphasis>
-‘<literal><emphasis role="bold">strong in
samp</emphasis></literal>’
-<emphasis role="bold">‘<literal>samp in
strong</literal>’</emphasis>
+<para><literal><firstterm>d--fn in code</firstterm></literal>
+<replaceable><literal>c--ode in var</literal></replaceable>
+<literal><replaceable>v--ar in code</replaceable></literal>
+<emphasis role="bold"><userinput>k--bd in strong</userinput></emphasis>
+‘<literal><emphasis role="bold">s--trong in
samp</emphasis></literal>’
+<emphasis role="bold">‘<literal>s--amp in
strong</literal>’</emphasis>
</para>
-<para><citetitle>cite</citetitle>
+<para><citetitle>c–ite</citetitle>
</para>
-<para><literal><citetitle>cite in code</citetitle></literal>
-<citetitle><literal>code in cite</literal></citetitle>
+<para><literal><citetitle>c--ite in code</citetitle></literal>
+<citetitle><literal>c--ode in cite</literal></citetitle>
</para>
-<para><literal>code</literal> slanted <emphasis role="bold">b</emphasis>
-<literal>slanted in code</literal>
-<literal>code in slanted</literal>
-<emphasis role="bold">slanted in b</emphasis>
-<emphasis role="bold">b in slanted</emphasis>
+<para><literal>c--ode</literal> s–lanted <emphasis
role="bold">b–</emphasis> <literal>t--</literal>
</para>
-<screen><replaceable>var in example</replaceable>
-<citetitle>cite in example</citetitle>
+<para><literal>s–lanted in code</literal>
+<literal>c--ode in slanted</literal>
+<emphasis role="bold">s–lanted in b</emphasis>
+<emphasis role="bold">b– in slanted</emphasis>
+<literal>s–lanted in t</literal>
+<literal>t-- in slanted</literal>
+<literal><replaceable>v--ar in t</replaceable></literal>
+<replaceable><literal>t-- in var</literal></replaceable>
+</para>
+<screen><replaceable>v--ar in example</replaceable>
+<citetitle>c--ite in example</citetitle>
</screen></chapter>
</book>
diff --git a/tp/t/results/converters_tests/combined_fonts/res_html/chapter.html
b/tp/t/results/converters_tests/combined_fonts/res_html/chapter.html
index d6de6b645e..ef66983415 100644
--- a/tp/t/results/converters_tests/combined_fonts/res_html/chapter.html
+++ b/tp/t/results/converters_tests/combined_fonts/res_html/chapter.html
@@ -33,29 +33,34 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top
section</a>, Up: <a
<hr>
<h2 class="chapter" id="chapter-1">1 chapter</h2>
-<p><code class="code">code</code>, <em class="dfn">dfn</em>, <var
class="var">var</var>, <strong class="strong">strong</strong>, <kbd
class="kbd">kbd</kbd>, ‘<samp class="samp">samp</samp>’.
+<p><code class="code">c--ode</code>, <em class="dfn">d–fn</em>, <var
class="var">v–ar</var>, <strong class="strong">s–trong</strong>,
<kbd class="kbd">k--bd</kbd>, ‘<samp class="samp">s--amp</samp>’.
</p>
-<p><code class="code"><em class="dfn">dfn in code</em></code>
-<var class="var"><code class="code">code in var</code></var>
-<code class="code"><var class="var">var in code</var></code>
-<strong class="strong"><kbd class="kbd">kbd in strong</kbd></strong>
-‘<samp class="samp"><strong class="strong">strong in
samp</strong></samp>’
-<strong class="strong">‘<samp class="samp">samp in
strong</samp>’</strong>
+<p><code class="code"><em class="dfn">d--fn in code</em></code>
+<var class="var"><code class="code">c--ode in var</code></var>
+<code class="code"><var class="var">v--ar in code</var></code>
+<strong class="strong"><kbd class="kbd">k--bd in strong</kbd></strong>
+‘<samp class="samp"><strong class="strong">s--trong in
samp</strong></samp>’
+<strong class="strong">‘<samp class="samp">s--amp in
strong</samp>’</strong>
</p>
-<p><cite class="cite">cite</cite>
+<p><cite class="cite">c–ite</cite>
</p>
-<p><code class="code"><cite class="cite">cite in code</cite></code>
-<cite class="cite"><code class="code">code in cite</code></cite>
+<p><code class="code"><cite class="cite">c--ite in code</cite></code>
+<cite class="cite"><code class="code">c--ode in cite</code></cite>
</p>
-<p><code class="code">code</code> <i class="slanted">slanted</i> <b
class="b">b</b>
-<code class="code"><i class="slanted">slanted in code</i></code>
-<i class="slanted"><code class="code">code in slanted</code></i>
-<b class="b"><i class="slanted">slanted in b</i></b>
-<i class="slanted"><b class="b">b in slanted</b></i>
+<p><code class="code">c--ode</code> <i class="slanted">s–lanted</i> <b
class="b">b–</b> <code class="t">t--</code>
+</p>
+<p><code class="code"><i class="slanted">s–lanted in code</i></code>
+<i class="slanted"><code class="code">c--ode in slanted</code></i>
+<b class="b"><i class="slanted">s–lanted in b</i></b>
+<i class="slanted"><b class="b">b– in slanted</b></i>
+<code class="t"><i class="slanted">s–lanted in t</i></code>
+<i class="slanted"><code class="t">t-- in slanted</code></i>
+<code class="t"><var class="var">v--ar in t</var></code>
+<var class="var"><code class="t">t-- in var</code></var>
</p>
<div class="example">
-<pre class="example-preformatted"><var class="var">var in example</var>
-<cite class="cite">cite in example</cite>
+<pre class="example-preformatted"><var class="var">v--ar in example</var>
+<cite class="cite">c--ite in example</cite>
</pre></div>
</div>
diff --git
a/tp/t/results/converters_tests/combined_fonts/res_info/combined_fonts.info
b/tp/t/results/converters_tests/combined_fonts/res_info/combined_fonts.info
index c65af0f58c..d8bfb91387 100644
--- a/tp/t/results/converters_tests/combined_fonts/res_info/combined_fonts.info
+++ b/tp/t/results/converters_tests/combined_fonts/res_info/combined_fonts.info
@@ -16,20 +16,22 @@ File: combined_fonts.info, Node: chapter, Prev: Top, Up:
Top
1 chapter
*********
-‘code’, “dfn”, VAR, *strong*, ‘kbd’, ‘samp’.
+‘c--ode’, “d–fn”, V–AR, *s–trong*, ‘k--bd’, ‘s--amp’.
- ‘“dfn in code”’ ‘CODE IN VAR’ ‘VAR IN CODE’ *‘kbd in strong’*
-‘*strong in samp*’ *‘samp in strong’*
+ ‘“d--fn in code”’ ‘C--ODE IN VAR’ ‘V--AR IN CODE’ *‘k--bd in strong’*
+‘*s--trong in samp*’ *‘s--amp in strong’*
- ‘cite’
+ ‘c–ite’
- ‘‘cite in code’’ ‘‘code in cite’’
+ ‘‘c--ite in code’’ ‘‘c--ode in cite’’
- ‘code’ slanted b ‘slanted in code’ ‘code in slanted’ slanted in b b
-in slanted
+ ‘c--ode’ s–lanted b– t--
- VAR IN EXAMPLE
- ‘cite in example’
+ ‘s–lanted in code’ ‘c--ode in slanted’ s–lanted in b b– in slanted
+s–lanted in t t-- in slanted V--AR IN T T-- IN VAR
+
+ V--AR IN EXAMPLE
+ ‘c--ite in example’
Tag Table:
diff --git
a/tp/t/results/converters_tests/combined_fonts/res_latex/combined_fonts.tex
b/tp/t/results/converters_tests/combined_fonts/res_latex/combined_fonts.tex
index 388df03c70..ab4121e15a 100644
--- a/tp/t/results/converters_tests/combined_fonts/res_latex/combined_fonts.tex
+++ b/tp/t/results/converters_tests/combined_fonts/res_latex/combined_fonts.tex
@@ -68,33 +68,39 @@
\GNUTexinfosetsingleheader{}%
+\begin{document}
\label{anchor:Top}%
\chapter{{chapter}}
\label{anchor:chapter}%
-\texttt{code}, \textsl{dfn}, \GNUTexinfocommandstyletextvar{var},
\textbf{strong}, \GNUTexinfocommandstyletextkbd{kbd}, `\texttt{samp}'.
+\texttt{c{-}{-}ode}, \textsl{d--fn}, \GNUTexinfocommandstyletextvar{v--ar},
\textbf{s--trong}, \GNUTexinfocommandstyletextkbd{k{-}{-}bd},
`\texttt{s{-}{-}amp}'.
-\texttt{\textsl{dfn in code}}
-\GNUTexinfocommandstyletextvar{\texttt{code in var}}
-\texttt{\GNUTexinfocommandstyletextvar{var in code}}
-\textbf{\GNUTexinfocommandstyletextkbd{kbd in strong}}
-`\texttt{\textbf{strong in samp}}'
-\textbf{`\texttt{samp in strong}'}
+\texttt{\textsl{d{-}{-}fn in code}}
+\GNUTexinfocommandstyletextvar{\texttt{c{-}{-}ode in var}}
+\texttt{\GNUTexinfocommandstyletextvar{v--ar in code}}
+\textbf{\GNUTexinfocommandstyletextkbd{k{-}{-}bd in strong}}
+`\texttt{\textbf{s{-}{-}trong in samp}}'
+\textbf{`\texttt{s{-}{-}amp in strong}'}
-\GNUTexinfocommandstyletextcite{cite}
+\GNUTexinfocommandstyletextcite{c--ite}
-\texttt{\GNUTexinfocommandstyletextcite{cite in code}}
-\GNUTexinfocommandstyletextcite{\texttt{code in cite}}
+\texttt{\GNUTexinfocommandstyletextcite{c--ite in code}}
+\GNUTexinfocommandstyletextcite{\texttt{c{-}{-}ode in cite}}
-\texttt{code} \textsl{slanted} \textbf{b}
-\texttt{\textsl{slanted in code}}
-\textsl{\texttt{code in slanted}}
-\textbf{\textsl{slanted in b}}
-\textsl{\textbf{b in slanted}}
+\texttt{c{-}{-}ode} \textsl{s--lanted} \textbf{b--} \texttt{t{-}{-}}
+
+\texttt{\textsl{s{-}{-}lanted in code}}
+\textsl{\texttt{c{-}{-}ode in slanted}}
+\textbf{\textsl{s--lanted in b}}
+\textsl{\textbf{b-- in slanted}}
+\texttt{\textsl{s{-}{-}lanted in t}}
+\textsl{\texttt{t{-}{-} in slanted}}
+\texttt{\GNUTexinfocommandstyletextvar{v--ar in t}}
+\GNUTexinfocommandstyletextvar{\texttt{t{-}{-} in var}}
\begin{GNUTexinfopreformatted}
\leftskip=2em\relax\ttfamily%
-\GNUTexinfocommandstyletextvar{var in example}
-\GNUTexinfocommandstyletextcite{cite in example}
+\GNUTexinfocommandstyletextvar{v--ar in example}
+\GNUTexinfocommandstyletextcite{c--ite in example}
\end{GNUTexinfopreformatted}
\end{document}
diff --git
a/tp/t/results/converters_tests/combined_fonts/res_xml/combined_fonts.xml
b/tp/t/results/converters_tests/combined_fonts/res_xml/combined_fonts.xml
index a34b5dcec9..fe4520cfa4 100644
--- a/tp/t/results/converters_tests/combined_fonts/res_xml/combined_fonts.xml
+++ b/tp/t/results/converters_tests/combined_fonts/res_xml/combined_fonts.xml
@@ -11,29 +11,34 @@
<node name="chapter" spaces=" "><nodename>chapter</nodename><nodeprev
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>
<chapter spaces=" "><sectiontitle>chapter</sectiontitle>
-<para><code>code</code>, <dfn>dfn</dfn>, <var>var</var>,
<strong>strong</strong>, <kbd>kbd</kbd>, <samp>samp</samp>.
+<para><code>c--ode</code>, <dfn>d&textndash;fn</dfn>,
<var>v&textndash;ar</var>, <strong>s&textndash;trong</strong>,
<kbd>k--bd</kbd>, <samp>s--amp</samp>.
</para>
-<para><code><dfn>dfn in code</dfn></code>
-<var><code>code in var</code></var>
-<code><var>var in code</var></code>
-<strong><kbd>kbd in strong</kbd></strong>
-<samp><strong>strong in samp</strong></samp>
-<strong><samp>samp in strong</samp></strong>
+<para><code><dfn>d--fn in code</dfn></code>
+<var><code>c--ode in var</code></var>
+<code><var>v--ar in code</var></code>
+<strong><kbd>k--bd in strong</kbd></strong>
+<samp><strong>s--trong in samp</strong></samp>
+<strong><samp>s--amp in strong</samp></strong>
</para>
-<para><cite>cite</cite>
+<para><cite>c&textndash;ite</cite>
</para>
-<para><code><cite>cite in code</cite></code>
-<cite><code>code in cite</code></cite>
+<para><code><cite>c--ite in code</cite></code>
+<cite><code>c--ode in cite</code></cite>
</para>
-<para><code>code</code> <slanted>slanted</slanted> <b>b</b>
-<code><slanted>slanted in code</slanted></code>
-<slanted><code>code in slanted</code></slanted>
-<b><slanted>slanted in b</slanted></b>
-<slanted><b>b in slanted</b></slanted>
+<para><code>c--ode</code> <slanted>s&textndash;lanted</slanted>
<b>b&textndash;</b> <t>t--</t>
+</para>
+<para><code><slanted>s&textndash;lanted in code</slanted></code>
+<slanted><code>c--ode in slanted</code></slanted>
+<b><slanted>s&textndash;lanted in b</slanted></b>
+<slanted><b>b&textndash; in slanted</b></slanted>
+<t><slanted>s&textndash;lanted in t</slanted></t>
+<slanted><t>t-- in slanted</t></slanted>
+<t><var>v--ar in t</var></t>
+<var><t>t-- in var</t></var>
</para>
<example endspaces=" ">
-<pre xml:space="preserve"><var>var in example</var>
-<cite>cite in example</cite>
+<pre xml:space="preserve"><var>v--ar in example</var>
+<cite>c--ite in example</cite>
</pre></example>
</chapter>
</texinfo>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Remove a spurious empty line in Changelog. Add more nested commands tests.,
Patrice Dumas <=