[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Thu, 12 Aug 2021 10:49:15 -0400 (EDT) |
branch: master
commit 304bbfa0c644caea53bc9e6f586d401efd762cf1
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Aug 12 14:51:27 2021 +0200
Add support for @latex/@end latex in other formats
* tp/Texinfo/Common.pm (%format_raw_command),
tp/Texinfo/Convert/Text.pm (%ignored_block_commands),
tp/Texinfo/XS/parsetexi/command_data.txt: add latex.
* tp/t/converters_tests.t: add latex in conditionals tests.
---
ChangeLog | 9 +
tp/Texinfo/Common.pm | 2 +-
tp/Texinfo/Convert/Text.pm | 2 +-
tp/Texinfo/XS/parsetexi/command_data.txt | 3 +
tp/Texinfo/XS/parsetexi/command_ids.h | 3 +
tp/Texinfo/XS/parsetexi/handle_commands.c | 1 +
tp/t/converters_tests.t | 13 +-
tp/t/results/converters_tests/inline.pl | 302 ++++++++++++++++++++-
tp/t/results/converters_tests/inline_expand_tex.pl | 106 +++++++-
tp/t/results/converters_tests/inlinefmtifelse.pl | 79 ++++++
.../results/converters_tests/raw_block_commands.pl | 153 +++++++++++
.../raw_block_commands_expand_tex.pl | 154 +++++++++++
12 files changed, 810 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 708fedc..e2264c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2021-08-12 Patrice Dumas <pertusus@free.fr>
+
+ Add support for @latex/@end latex in other formats
+
+ * tp/Texinfo/Common.pm (%format_raw_command),
+ tp/Texinfo/Convert/Text.pm (%ignored_block_commands),
+ tp/Texinfo/XS/parsetexi/command_data.txt: add latex.
+ * tp/t/converters_tests.t: add latex in conditionals tests.
+
2021-08-10 Gavin Smith <gavinsmith0123@gmail.com>
Fix @defun sentence spacing
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index a5c1a32..ea37708 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -885,7 +885,7 @@ foreach my $block_math_command('displaymath') {
}
our %format_raw_commands;
-foreach my $format_raw_command('html', 'tex', 'xml', 'docbook') {
+foreach my $format_raw_command('html', 'tex', 'xml', 'docbook', 'latex') {
$block_commands{$format_raw_command} = 0;
$format_raw_commands{$format_raw_command} = 1;
}
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index f003451..3837a29 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -61,7 +61,7 @@ foreach my $ignored_brace_command
(#'xref','ref','pxref','inforef',
my %ignored_block_commands;
foreach my $ignored_command ('titlepage', 'copying', 'documentdescription',
- 'html', 'tex', 'xml', 'docbook', 'ignore', 'macro', 'rmacro') {
+ 'html', 'tex', 'xml', 'docbook', 'latex', 'ignore', 'macro', 'rmacro') {
$ignored_block_commands{$ignored_command} = 1;
}
diff --git a/tp/Texinfo/XS/parsetexi/command_data.txt
b/tp/Texinfo/XS/parsetexi/command_data.txt
index e5d5643..4d79049 100644
--- a/tp/Texinfo/XS/parsetexi/command_data.txt
+++ b/tp/Texinfo/XS/parsetexi/command_data.txt
@@ -426,6 +426,7 @@ html block,format_raw
tex block,format_raw
xml block,format_raw
docbook block,format_raw
+latex block,format_raw
# raw commands
verbatim block BLOCK_raw
@@ -458,6 +459,8 @@ ifinfo block
BLOCK_conditional
ifnotinfo block BLOCK_conditional
ifplaintext block BLOCK_conditional
ifnotplaintext block BLOCK_conditional
+iflatex block BLOCK_conditional
+ifnotlatex block BLOCK_conditional
ifset block BLOCK_conditional
ifclear block BLOCK_conditional
ifcommanddefined block BLOCK_conditional
diff --git a/tp/Texinfo/XS/parsetexi/command_ids.h
b/tp/Texinfo/XS/parsetexi/command_ids.h
index 1201e40..856f6d3 100644
--- a/tp/Texinfo/XS/parsetexi/command_ids.h
+++ b/tp/Texinfo/XS/parsetexi/command_ids.h
@@ -226,9 +226,11 @@ CM_ifcommandnotdefined,
CM_ifdocbook,
CM_ifhtml,
CM_ifinfo,
+CM_iflatex,
CM_ifnotdocbook,
CM_ifnothtml,
CM_ifnotinfo,
+CM_ifnotlatex,
CM_ifnotplaintext,
CM_ifnottex,
CM_ifnotxml,
@@ -257,6 +259,7 @@ CM_kbd,
CM_kbdinputstyle,
CM_key,
CM_l,
+CM_latex,
CM_lbracechar,
CM_leq,
CM_lisp,
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index 39c73c3..7b9bfbe 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -726,6 +726,7 @@ static struct expanded_format expanded_formats[] = {
"tex", 0,
"xml", 0,
"info", 1,
+ "latex", 0,
};
void
diff --git a/tp/t/converters_tests.t b/tp/t/converters_tests.t
index 67e76c4..43912b1 100644
--- a/tp/t/converters_tests.t
+++ b/tp/t/converters_tests.t
@@ -111,6 +111,7 @@ my $inline_text = '
@inlinefmt{xml, <para>xml</para> ``},
@inlinefmt{docbook, <emphasis>docbook</emphasis> ``},
@inlinefmt{tex, $\underline{a < b @code{tex \hbox{ code }}}$ ``}
+@inlinefmt{latex, @math{\frac{a < b @code{tex \hbox{ code }}}{b}} ``}
@inlineraw{html, raw <blink>html</blink> ``},
@@ -118,6 +119,7 @@ my $inline_text = '
@inlineraw{xml, raw <para>xml</para> ``},
@inlineraw{docbook, raw <emphasis>docbook</emphasis> ``},
@inlineraw{tex, raw $\underline{a < b @code{tex \hbox{ code }}}$ ``}
+@inlineraw{latex, raw $\frac{a < b @code{tex \hbox{ code }}}{b}$ ``}
';
my $raw_commands_text = '
@@ -136,6 +138,10 @@ my $raw_commands_text = '
@tex
$\underline{a < b @code{tex \hbox{ code }}}$ ``}
@end tex
+
+@latex
+$\frac{a < b @code{tex \hbox{ code }}}{b}$ ``
+@end latex
';
my $top_in_ref_text =
@@ -624,11 +630,11 @@ fff2
'],
['raw_block_commands',
$raw_commands_text,
-{'expanded_formats' => ['tex', 'docbook', 'html', 'xml']}
+{'expanded_formats' => ['tex', 'docbook', 'html', 'xml', 'latex']}
],
['raw_block_commands_expand_tex',
$raw_commands_text,
-{'expanded_formats' => ['tex', 'docbook', 'html', 'xml']},
+{'expanded_formats' => ['tex', 'docbook', 'html', 'xml', 'latex']},
{'expanded_formats' => ['tex']},
],
['inline',
@@ -654,6 +660,8 @@ $inline_text, {'expanded_formats' => ['tex']},
@inlinefmtifelse{docbook,if docbook,else docbook}.
@inlinefmtifelse{tex,if tex,else tex}.
+
+@inlinefmtifelse{latex,if latex,else latex}.
',
{'expanded_formats' => []}
],
@@ -1043,6 +1051,7 @@ foreach my $test (@test_cases) {
}
push @{$test->[2]->{'test_formats'}}, 'xml';
push @{$test->[2]->{'test_formats'}}, 'docbook';
+ #push @{$test->[2]->{'test_formats'}}, 'latex';
push @{$test->[2]->{'test_formats'}}, 'info'
if ($info_tests{$test->[0]});
}
diff --git a/tp/t/results/converters_tests/inline.pl
b/tp/t/results/converters_tests/inline.pl
index 412c6c9..b39562c 100644
--- a/tp/t/results/converters_tests/inline.pl
+++ b/tp/t/results/converters_tests/inline.pl
@@ -225,6 +225,139 @@ $result_trees{'inline'} = {
'parent' => {},
'text' => '
'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'latex'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '\\frac'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'a < b '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'tex \\hbox'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' code '
+ }
+ ],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'bracketed'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'bracketed'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'b'
+ }
+ ],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'bracketed'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_context'
+ }
+ ],
+ 'cmdname' => 'math',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ``'
+ }
+ ],
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [],
+ 'extra' => {
+ 'expand_index' => 1,
+ 'format' => 'latex'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
}
],
'parent' => {},
@@ -278,7 +411,7 @@ $result_trees{'inline'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 10,
'macro' => ''
},
'parent' => {}
@@ -322,7 +455,7 @@ $result_trees{'inline'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 10,
+ 'line_nr' => 11,
'macro' => ''
},
'parent' => {}
@@ -366,7 +499,7 @@ $result_trees{'inline'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 12,
'macro' => ''
},
'parent' => {}
@@ -410,7 +543,7 @@ $result_trees{'inline'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 13,
'macro' => ''
},
'parent' => {}
@@ -445,7 +578,122 @@ $result_trees{'inline'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 14,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'latex'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'raw $\\frac'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'a < b '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'tex \\hbox'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' code '
+ }
+ ],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'bracketed'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'bracketed'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'b'
+ }
+ ],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'bracketed'
+ },
+ {
+ 'parent' => {},
+ 'text' => '$ ``'
+ }
+ ],
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlineraw',
+ 'contents' => [],
+ 'extra' => {
+ 'expand_index' => 1,
+ 'format' => 'latex'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
'macro' => ''
},
'parent' => {}
@@ -492,6 +740,24 @@
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $re
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'parent'} =
$result_trees{'inline'}{'contents'}[1]{'contents'}[8];
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'parent'} =
$result_trees{'inline'}{'contents'}[1];
$result_trees{'inline'}{'contents'}[1]{'contents'}[9]{'parent'} =
$result_trees{'inline'}{'contents'}[1];
+$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[0];
+$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'} =
$result_trees{'inline'}{'contents'}[1]{'contents'}[10];
+$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0];
+$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1];
+$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1];
+$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'parent'} =
$result_trees{'inline'}{'contents'}[1]{'contents'}[10];
+$result_trees{'inline'}{'contents'}[1]{'contents'}[10]{'parent'} =
$result_trees{'inline'}{'contents'}[1];
+$result_trees{'inline'}{'contents'}[1]{'contents'}[11]{'parent'} =
$result_trees{'inline'}{'contents'}[1];
$result_trees{'inline'}{'contents'}[1]{'parent'} = $result_trees{'inline'};
$result_trees{'inline'}{'contents'}[2]{'parent'} = $result_trees{'inline'};
$result_trees{'inline'}{'contents'}[3]{'parent'} = $result_trees{'inline'};
@@ -524,6 +790,22 @@
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'parent'} = $re
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'parent'} =
$result_trees{'inline'}{'contents'}[4]{'contents'}[8];
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'parent'} =
$result_trees{'inline'}{'contents'}[4];
$result_trees{'inline'}{'contents'}[4]{'contents'}[9]{'parent'} =
$result_trees{'inline'}{'contents'}[4];
+$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[0];
+$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'parent'} =
$result_trees{'inline'}{'contents'}[4]{'contents'}[10];
+$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1];
+$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'contents'}[1];
+$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'contents'}[1];
+$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1];
+$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'contents'}[2];
+$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'contents'}[2]{'parent'}
= $result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1];
+$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'contents'}[3]{'parent'}
= $result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1];
+$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'parent'} =
$result_trees{'inline'}{'contents'}[4]{'contents'}[10];
+$result_trees{'inline'}{'contents'}[4]{'contents'}[10]{'parent'} =
$result_trees{'inline'}{'contents'}[4];
+$result_trees{'inline'}{'contents'}[4]{'contents'}[11]{'parent'} =
$result_trees{'inline'}{'contents'}[4];
$result_trees{'inline'}{'contents'}[4]{'parent'} = $result_trees{'inline'};
$result_texis{'inline'} = '
@@ -532,6 +814,7 @@ $result_texis{'inline'} = '
@inlinefmt{xml, <para>xml</para> ``},
@inlinefmt{docbook, <emphasis>docbook</emphasis> ``},
@inlinefmt{tex,}
+@inlinefmt{latex, @math{\\frac{a < b @code{tex \\hbox{ code }}}{b}} ``}
@inlineraw{html, raw <blink>html</blink> ``},
@@ -539,6 +822,7 @@ $result_texis{'inline'} = '
@inlineraw{xml, raw <para>xml</para> ``},
@inlineraw{docbook, raw <emphasis>docbook</emphasis> ``},
@inlineraw{tex,}
+@inlineraw{latex, raw $\\frac{a < b @code{tex \\hbox{ code }}}{b}$ ``}
';
@@ -550,11 +834,13 @@ $result_texts{'inline'} = '
+
,
,
,
,
+
';
$result_errors{'inline'} = [];
@@ -576,6 +862,7 @@ $result_converted{'html_text'}->{'inline'} = '
,
,
+
</p>
<p>raw <blink>html</blink> ``,
@@ -583,6 +870,7 @@ $result_converted{'html_text'}->{'inline'} = '
,
,
+
</p>';
@@ -592,6 +880,7 @@ $result_converted{'xml'}->{'inline'} = '
<para>xml</para> &textldquo;,
<inlinefmt><inlinefmtformat>docbook</inlinefmtformat><inlinefmtcontent
spaces=" "><emphasis>docbook</emphasis>
&textldquo;</inlinefmtcontent></inlinefmt>,
<inlinefmt><inlinefmtformat>tex</inlinefmtformat></inlinefmt>
+<inlinefmt><inlinefmtformat>latex</inlinefmtformat><inlinefmtcontent spaces="
"><math>\\frac{a < b <code>tex \\hbox{ code }</code>}{b}</math>
&textldquo;</inlinefmtcontent></inlinefmt>
</para>
<para><inlineraw><inlinerawformat>html</inlinerawformat><inlinerawcontent
spaces=" ">raw <blink>html</blink>
&textldquo;</inlinerawcontent></inlineraw>,
@@ -599,6 +888,7 @@ $result_converted{'xml'}->{'inline'} = '
raw <para>xml</para> ``,
<inlineraw><inlinerawformat>docbook</inlinerawformat><inlinerawcontent
spaces=" ">raw <emphasis>docbook</emphasis>
&textldquo;</inlinerawcontent></inlineraw>,
<inlineraw><inlinerawformat>tex</inlinerawformat></inlineraw>
+<inlineraw><inlinerawformat>latex</inlinerawformat><inlinerawcontent spaces="
">raw $\\frac{a < b <code>tex \\hbox{ code }</code>}{b}$
&textldquo;</inlinerawcontent></inlineraw>
</para>';
@@ -608,6 +898,7 @@ $result_converted{'docbook'}->{'inline'} = '
,
<emphasis>docbook</emphasis> “,
+
</para>
<para>,
@@ -615,6 +906,7 @@ $result_converted{'docbook'}->{'inline'} = '
,
raw <emphasis>docbook</emphasis> ``,
+
</para>';
1;
diff --git a/tp/t/results/converters_tests/inline_expand_tex.pl
b/tp/t/results/converters_tests/inline_expand_tex.pl
index 1b4967a..edfedd9 100644
--- a/tp/t/results/converters_tests/inline_expand_tex.pl
+++ b/tp/t/results/converters_tests/inline_expand_tex.pl
@@ -220,6 +220,41 @@ $result_trees{'inline_expand_tex'} = {
'parent' => {},
'text' => '$ ``
'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'latex'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'elided'
+ }
+ ],
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [],
+ 'extra' => {
+ 'format' => 'latex'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
}
],
'parent' => {},
@@ -264,7 +299,7 @@ $result_trees{'inline_expand_tex'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 10,
'macro' => ''
},
'parent' => {}
@@ -299,7 +334,7 @@ $result_trees{'inline_expand_tex'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 10,
+ 'line_nr' => 11,
'macro' => ''
},
'parent' => {}
@@ -334,7 +369,7 @@ $result_trees{'inline_expand_tex'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 12,
'macro' => ''
},
'parent' => {}
@@ -369,7 +404,7 @@ $result_trees{'inline_expand_tex'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 13,
'macro' => ''
},
'parent' => {}
@@ -420,7 +455,7 @@ $result_trees{'inline_expand_tex'} = {
],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 14,
'macro' => ''
},
'parent' => {},
@@ -435,7 +470,7 @@ $result_trees{'inline_expand_tex'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 14,
'macro' => ''
},
'parent' => {}
@@ -443,7 +478,7 @@ $result_trees{'inline_expand_tex'} = {
],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 14,
'macro' => ''
},
'parent' => {},
@@ -469,7 +504,42 @@ $result_trees{'inline_expand_tex'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 14,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'latex'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'elided'
+ }
+ ],
+ 'cmdname' => 'inlineraw',
+ 'contents' => [],
+ 'extra' => {
+ 'format' => 'latex'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
'macro' => ''
},
'parent' => {}
@@ -516,6 +586,11 @@
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'con
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[9]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[1];
+$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[10]{'args'}[0];
+$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[10];
+$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[10]{'args'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[10];
+$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[10]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[1];
+$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[11]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'parent'} =
$result_trees{'inline_expand_tex'};
$result_trees{'inline_expand_tex'}{'contents'}[2]{'parent'} =
$result_trees{'inline_expand_tex'};
$result_trees{'inline_expand_tex'}{'contents'}[3]{'parent'} =
$result_trees{'inline_expand_tex'};
@@ -553,6 +628,11 @@
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'con
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[4];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[9]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[4];
+$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[10]{'args'}[0];
+$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[10];
+$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[10]{'args'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[10];
+$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[10]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[4];
+$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[11]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[4];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'parent'} =
$result_trees{'inline_expand_tex'};
$result_texis{'inline_expand_tex'} = '
@@ -561,6 +641,7 @@ $result_texis{'inline_expand_tex'} = '
@inlinefmt{xml,},
@inlinefmt{docbook,},
@inlinefmt{tex, $\\underlinea < b @code{tex \\hbox code }}$ ``
+@inlinefmt{latex,}
@inlineraw{html,},
@@ -568,6 +649,7 @@ $result_texis{'inline_expand_tex'} = '
@inlineraw{xml,},
@inlineraw{docbook,},
@inlineraw{tex, raw $\\underline{a < b @code{tex \\hbox{ code }}}$ ``}
+@inlineraw{latex,}
';
@@ -579,11 +661,13 @@ $result_texts{'inline_expand_tex'} = '
$ "
+
,
,
,
,
+
';
$result_errors{'inline_expand_tex'} = [
@@ -642,6 +726,7 @@ $result_converted{'html_text'}->{'inline_expand_tex'} = '
,
,
$\\underlinea < b <code>tex \\hbox code </code>$ “
+
</p>
<p>,
@@ -649,6 +734,7 @@ $\\underlinea < b <code>tex \\hbox code </code>$ “
,
,
raw $\\underline{a < b <code>tex \\hbox{ code }</code>}$ ``
+
</p>';
@@ -658,6 +744,7 @@ $result_converted{'xml'}->{'inline_expand_tex'} = '
<inlinefmt><inlinefmtformat>xml</inlinefmtformat></inlinefmt>,
<inlinefmt><inlinefmtformat>docbook</inlinefmtformat></inlinefmt>,
$\\underlinea < b <code>tex \\hbox code </code>$ &textldquo;
+<inlinefmt><inlinefmtformat>latex</inlinefmtformat></inlinefmt>
</para>
<para><inlineraw><inlinerawformat>html</inlinerawformat></inlineraw>,
@@ -665,6 +752,7 @@ $\\underlinea < b <code>tex \\hbox code </code>$
&textldquo;
<inlineraw><inlinerawformat>xml</inlinerawformat></inlineraw>,
<inlineraw><inlinerawformat>docbook</inlinerawformat></inlineraw>,
raw $\\underline{a < b <code>tex \\hbox{ code }</code>}$ ``
+<inlineraw><inlinerawformat>latex</inlinerawformat></inlineraw>
</para>';
@@ -674,6 +762,7 @@ $result_converted{'docbook'}->{'inline_expand_tex'} = '
,
,
$\\underlinea < b <literal>tex \\hbox code </literal>$ “
+
</para>
<para>,
@@ -681,6 +770,7 @@ $\\underlinea < b <literal>tex \\hbox code </literal>$
“
,
,
raw $\\underline{a < b <literal>tex \\hbox{ code }</literal>}$ ``
+
</para>';
1;
diff --git a/tp/t/results/converters_tests/inlinefmtifelse.pl
b/tp/t/results/converters_tests/inlinefmtifelse.pl
index 6f74e38..28c17ef 100644
--- a/tp/t/results/converters_tests/inlinefmtifelse.pl
+++ b/tp/t/results/converters_tests/inlinefmtifelse.pl
@@ -502,6 +502,64 @@ $result_trees{'inlinefmtifelse'} = {
],
'parent' => {},
'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'latex'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'elided'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'else latex'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlinefmtifelse',
+ 'contents' => [],
+ 'extra' => {
+ 'expand_index' => 2,
+ 'format' => 'latex'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
}
],
'type' => 'text_root'
@@ -580,6 +638,15 @@
$result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[2]{'pare
$result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[12];
$result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[1]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[12];
$result_trees{'inlinefmtifelse'}{'contents'}[12]{'parent'} =
$result_trees{'inlinefmtifelse'};
+$result_trees{'inlinefmtifelse'}{'contents'}[13]{'parent'} =
$result_trees{'inlinefmtifelse'};
+$result_trees{'inlinefmtifelse'}{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[14]{'contents'}[0]{'args'}[0];
+$result_trees{'inlinefmtifelse'}{'contents'}[14]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[14]{'contents'}[0];
+$result_trees{'inlinefmtifelse'}{'contents'}[14]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[14]{'contents'}[0];
+$result_trees{'inlinefmtifelse'}{'contents'}[14]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[14]{'contents'}[0]{'args'}[2];
+$result_trees{'inlinefmtifelse'}{'contents'}[14]{'contents'}[0]{'args'}[2]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[14]{'contents'}[0];
+$result_trees{'inlinefmtifelse'}{'contents'}[14]{'contents'}[0]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[14];
+$result_trees{'inlinefmtifelse'}{'contents'}[14]{'contents'}[1]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[14];
+$result_trees{'inlinefmtifelse'}{'contents'}[14]{'parent'} =
$result_trees{'inlinefmtifelse'};
$result_texis{'inlinefmtifelse'} = '@inlinefmtifelse{html,,else html no if}.
@inlinefmtifelse{html,,else html}.
@@ -596,6 +663,8 @@ $result_texis{'inlinefmtifelse'} =
'@inlinefmtifelse{html,,else html no if}.
@inlinefmtifelse{docbook,,else docbook}.
@inlinefmtifelse{tex,,else tex}.
+
+@inlinefmtifelse{latex,,else latex}.
';
@@ -614,6 +683,8 @@ else tex spaces .
else docbook.
else tex.
+
+else latex.
';
$result_errors{'inlinefmtifelse'} = [];
@@ -636,6 +707,8 @@ $result_converted{'plaintext'}->{'inlinefmtifelse'} = 'else
html no if. else ht
else docbook.
else tex.
+
+ else latex.
';
@@ -654,6 +727,8 @@ else plaintext.
<p>else docbook.
</p>
<p>else tex.
+</p>
+<p>else latex.
</p>';
@@ -672,6 +747,8 @@ $result_converted{'xml'}->{'inlinefmtifelse'} =
'<para><inlinefmtifelse><inlinef
<para><inlinefmtifelse><inlinefmtifelseformat>docbook</inlinefmtifelseformat><inlinefmtifelsecontentelse>else
docbook</inlinefmtifelsecontentelse></inlinefmtifelse>.
</para>
<para><inlinefmtifelse><inlinefmtifelseformat>tex</inlinefmtifelseformat><inlinefmtifelsecontentelse>else
tex</inlinefmtifelsecontentelse></inlinefmtifelse>.
+</para>
+<para><inlinefmtifelse><inlinefmtifelseformat>latex</inlinefmtifelseformat><inlinefmtifelsecontentelse>else
latex</inlinefmtifelsecontentelse></inlinefmtifelse>.
</para>';
@@ -690,6 +767,8 @@ else plaintext.
<para>.
</para>
<para>else tex.
+</para>
+<para>else latex.
</para>';
1;
diff --git a/tp/t/results/converters_tests/raw_block_commands.pl
b/tp/t/results/converters_tests/raw_block_commands.pl
index d637b56..9b50111 100644
--- a/tp/t/results/converters_tests/raw_block_commands.pl
+++ b/tp/t/results/converters_tests/raw_block_commands.pl
@@ -347,6 +347,129 @@ $result_trees{'raw_block_commands'} = {
'macro' => ''
},
'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'latex',
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '$\\frac'
+ },
+ {
+ 'parent' => {},
+ 'text' => '{a < b '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'tex \\hbox'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' code '
+ }
+ ],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'bracketed'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '}'
+ },
+ {
+ 'parent' => {},
+ 'text' => '{b'
+ },
+ {
+ 'parent' => {},
+ 'text' => '}$ ``
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'latex'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command_argument' => 'latex',
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'latex'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 18,
+ 'macro' => ''
+ },
+ 'parent' => {}
}
],
'type' => 'text_root'
@@ -402,6 +525,25 @@
$result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'pa
$result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[2]{'parent'} =
$result_trees{'raw_block_commands'}{'contents'}[7];
$result_trees{'raw_block_commands'}{'contents'}[7]{'extra'}{'end_command'} =
$result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[2];
$result_trees{'raw_block_commands'}{'contents'}[7]{'parent'} =
$result_trees{'raw_block_commands'};
+$result_trees{'raw_block_commands'}{'contents'}[8]{'parent'} =
$result_trees{'raw_block_commands'};
+$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_block_commands'}{'contents'}[9];
+$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[0]{'parent'} =
$result_trees{'raw_block_commands'}{'contents'}[9];
+$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1];
+$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1];
+$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1];
+$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1];
+$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1]{'contents'}[4]{'parent'}
= $result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1];
+$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1]{'contents'}[5]{'parent'}
= $result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1];
+$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[1]{'parent'} =
$result_trees{'raw_block_commands'}{'contents'}[9];
+$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[2];
+$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[2]{'parent'} =
$result_trees{'raw_block_commands'}{'contents'}[9];
+$result_trees{'raw_block_commands'}{'contents'}[9]{'extra'}{'end_command'} =
$result_trees{'raw_block_commands'}{'contents'}[9]{'contents'}[2];
+$result_trees{'raw_block_commands'}{'contents'}[9]{'parent'} =
$result_trees{'raw_block_commands'};
$result_texis{'raw_block_commands'} = '
@html
@@ -419,6 +561,10 @@ $result_texis{'raw_block_commands'} = '
@tex
$\\underline{a < b @code{tex \\hbox{ code }}}$ ``}
@end tex
+
+@latex
+$\\frac{a < b @code{tex \\hbox{ code }}}{b}$ ``
+@end latex
';
@@ -426,6 +572,7 @@ $result_texts{'raw_block_commands'} = '
+
';
$result_errors{'raw_block_commands'} = [];
@@ -443,6 +590,7 @@ $result_converted{'html_text'}->{'raw_block_commands'} = '
+
';
@@ -460,6 +608,10 @@ $result_converted{'xml'}->{'raw_block_commands'} = '
<tex endspaces=" ">
$\\underline{a < b <code>tex \\hbox{ code }</code>}$ &textldquo;}
</tex>
+
+<latex endspaces=" ">
+$\\frac{a < b <code>tex \\hbox{ code }</code>}{b}$ &textldquo;
+</latex>
';
@@ -468,6 +620,7 @@ $result_converted{'docbook'}->{'raw_block_commands'} = '
<emphasis>docbook</emphasis> ``}
+
';
1;
diff --git a/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
b/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
index f079b86..65fa747 100644
--- a/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
+++ b/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
@@ -347,6 +347,129 @@ $result_trees{'raw_block_commands_expand_tex'} = {
'macro' => ''
},
'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'latex',
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '$\\frac'
+ },
+ {
+ 'parent' => {},
+ 'text' => '{a < b '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'tex \\hbox'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' code '
+ }
+ ],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'bracketed'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '}'
+ },
+ {
+ 'parent' => {},
+ 'text' => '{b'
+ },
+ {
+ 'parent' => {},
+ 'text' => '}$ ``
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'latex'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command_argument' => 'latex',
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'latex'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 18,
+ 'macro' => ''
+ },
+ 'parent' => {}
}
],
'type' => 'text_root'
@@ -402,6 +525,25 @@
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[2]{'ar
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[2]{'parent'}
= $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7];
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'extra'}{'end_command'}
= $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[2];
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'parent'} =
$result_trees{'raw_block_commands_expand_tex'};
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[8]{'parent'} =
$result_trees{'raw_block_commands_expand_tex'};
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_block_commands_expand_tex'}{'contents'}[9];
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[0]{'parent'}
= $result_trees{'raw_block_commands_expand_tex'}{'contents'}[9];
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1];
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1];
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1];
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1];
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1]{'contents'}[4]{'parent'}
= $result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1];
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1]{'contents'}[5]{'parent'}
= $result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1];
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[1]{'parent'}
= $result_trees{'raw_block_commands_expand_tex'}{'contents'}[9];
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[2];
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[2]{'parent'}
= $result_trees{'raw_block_commands_expand_tex'}{'contents'}[9];
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'extra'}{'end_command'}
= $result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'contents'}[2];
+$result_trees{'raw_block_commands_expand_tex'}{'contents'}[9]{'parent'} =
$result_trees{'raw_block_commands_expand_tex'};
$result_texis{'raw_block_commands_expand_tex'} = '
@html
@@ -419,6 +561,10 @@ $result_texis{'raw_block_commands_expand_tex'} = '
@tex
$\\underline{a < b @code{tex \\hbox{ code }}}$ ``}
@end tex
+
+@latex
+$\\frac{a < b @code{tex \\hbox{ code }}}{b}$ ``
+@end latex
';
@@ -426,6 +572,7 @@ $result_texts{'raw_block_commands_expand_tex'} = '
+
';
$result_errors{'raw_block_commands_expand_tex'} = [];
@@ -436,6 +583,7 @@ $result_floats{'raw_block_commands_expand_tex'} = {};
$result_converted{'plaintext'}->{'raw_block_commands_expand_tex'} =
'$\\underline{a < b \'tex \\hbox{ code }\'}$ ``}
+
';
@@ -444,6 +592,7 @@
$result_converted{'html_text'}->{'raw_block_commands_expand_tex'} = '
$\\underline{a < b <code>tex \\hbox{ code }</code>}$ ``}
+
';
$result_converted_errors{'html_text'}->{'raw_block_commands_expand_tex'} = [
@@ -474,6 +623,10 @@
$result_converted{'xml'}->{'raw_block_commands_expand_tex'} = '
</docbook>
$\\underline{a < b <code>tex \\hbox{ code }</code>}$ ``}
+
+<latex endspaces=" ">
+$\\frac{a < b <code>tex \\hbox{ code }</code>}{b}$ &textldquo;
+</latex>
';
@@ -482,6 +635,7 @@
$result_converted{'docbook'}->{'raw_block_commands_expand_tex'} = '
$\\underline{a < b <literal>tex \\hbox{ code }</literal>}$ ``}
+
';
1;