[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/ParserNonXS.pm (_process_remaining_o
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): do not throw away the current line in an ignored rawpreformatted. |
|
Date: |
Sun, 05 Mar 2023 15:04:13 -0500 |
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 2186eddf2a * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): do not throw away
the current line in an ignored rawpreformatted.
2186eddf2a is described below
commit 2186eddf2a4e52f56c92e02c9d52f3e1c4dcb840
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Mar 5 21:04:02 2023 +0100
* tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): do not
throw away the current line in an ignored rawpreformatted.
* tp/Makefile.tres, tp/t/16raw.t: add second_level_lone_braces_in_html
and second_level_lone_braces_in_html_not_expanded tests with braces at
the beginning of a line within an @-command within a rawpreformatted
environment.
---
ChangeLog | 11 ++
tp/Makefile.tres | 2 +
tp/Texinfo/ParserNonXS.pm | 7 +-
tp/Texinfo/XS/parsetexi/parser.c | 2 +-
tp/t/16raw.t | 28 +++
tp/t/results/conditionals/cond.pl | 17 ++
tp/t/results/conditionals/cond_ifhtml_ifinfo.pl | 8 +
tp/t/results/conditionals/cond_info.pl | 16 ++
.../cond_info_no-ifhtml_no-ifinfo_no-iftex.pl | 16 ++
.../cond_no-ifhtml_no-ifinfo_no-iftex.pl | 17 ++
tp/t/results/conditionals/cond_xml.pl | 18 ++
.../conditionals/false_format_not_closed.pl | 8 +
tp/t/results/conditionals/many_conditionals.pl | 8 +
.../results/converters_tests/at_commands_in_raw.pl | 7 +
.../command_in_end_ignored_raw_command_after.pl | 8 +
.../command_in_end_ignored_raw_in_command.pl | 6 +
...d_in_end_ignored_raw_one_char_before_command.pl | 6 +
...d_in_end_ignored_raw_one_char_not_in_command.pl | 6 +
...d_in_end_ignored_raw_two_char_before_command.pl | 6 +
...d_in_end_ignored_raw_two_char_not_in_command.pl | 6 +
.../results/macro/macro_end_call_in_ignored_raw.pl | 6 +-
..._end.pl => second_level_lone_braces_in_html.pl} | 213 ++++++++++-----------
...cond_level_lone_braces_in_html_not_expanded.pl} | 123 ++++++------
tp/t/results/raw/space_before_end.pl | 9 +
tp/t/results/raw/spurious_arg_on_line.pl | 9 +
.../formatting_macro_expand/formatting.texi | 21 ++
.../res_parser/formatting_xml/formatting.xml | 17 ++
.../texi_nested_formats/nested_formats.texi | 81 ++++++++
28 files changed, 508 insertions(+), 174 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4f5ae11afc..0ddd35e784 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2023-03-05 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
+ tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): do not
+ throw away the current line in an ignored rawpreformatted.
+
+ * tp/Makefile.tres, tp/t/16raw.t: add second_level_lone_braces_in_html
+ and second_level_lone_braces_in_html_not_expanded tests with braces at
+ the beginning of a line within an @-command within a rawpreformatted
+ environment.
+
2023-03-05 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index 770733bf23..7101d61c12 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -1644,6 +1644,8 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/raw/raw_in_para.pl \
t/results/raw/raw_in_style.pl \
t/results/raw/raw_not_closed.pl \
+ t/results/raw/second_level_lone_braces_in_html.pl \
+ t/results/raw/second_level_lone_braces_in_html_not_expanded.pl \
t/results/raw/space_before_end.pl \
t/results/raw/spurious_arg_on_line.pl \
t/results/raw/tex_not_closed.pl \
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 4f78c89bb1..e2ad08194b 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -5735,7 +5735,6 @@ sub _process_remaining_on_line($$$$)
push @{$current->{'contents'}}, $elided_rawpreformatted;
while (1) {
# A source mark here is tested in t/*macro.t macro_end_call_in_ignored_raw
- ($line, $source_info) = _new_line($self, $elided_rawpreformatted);
print STDERR "IGNORED RAW_PREFORMATTED $current->{'cmdname'}"
.(defined($line) ? ": $line" : "\n")
if ($self->{'DEBUG'});
@@ -5750,6 +5749,7 @@ sub _process_remaining_on_line($$$$)
'parent' => $elided_rawpreformatted};
push @{$elided_rawpreformatted->{'contents'}}, $raw_text;
}
+ ($line, $source_info) = _new_line($self, $elided_rawpreformatted);
}
# start a new line for the @end line, this is normally done
# at the beginning of a line, but not here, as we directly
@@ -6334,8 +6334,11 @@ sub _process_remaining_on_line($$$$)
_abort_empty_line($self, $current);
push @{$current->{'contents'}}, {'text' => '{',
'parent' => $current };
+ print STDERR "LONE OPEN BRACE in rawpreformatted\n"
+ if ($self->{'DEBUG'});
# matching braces accepted in a rawpreformatted or math or ignored
- # code
+ # code. Note that for rawpreformatted, it can only happen
+ # within an @-command as { do not start a bracketed as seen just above.
} elsif ($self->_top_context() eq 'ct_math'
or $self->_top_context() eq 'ct_rawpreformatted'
or $self->_top_context() eq 'ct_inlineraw') {
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index b946cd11b5..cc11cac225 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1578,7 +1578,6 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
line_dummy = line;
while (1)
{
- line = new_line (e);
if (!line)
{
/* unclosed block */
@@ -1597,6 +1596,7 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
add_to_element_contents (e, raw_text);
}
}
+ line = new_line (e);
}
/* start a new line for the @end line, this is normally done
diff --git a/tp/t/16raw.t b/tp/t/16raw.t
index 84bcce6df5..7fc320a580 100644
--- a/tp/t/16raw.t
+++ b/tp/t/16raw.t
@@ -131,6 +131,34 @@ $$
',
{'EXPANDED_FORMATS' => ['html']}
],
+['second_level_lone_braces_in_html',
+'@html
+{a@code{{
+}}
+@end html
+
+@html
+{b@code{
+{c d}
+}
+@end html
+',
+{'EXPANDED_FORMATS' => ['html']}
+],
+['second_level_lone_braces_in_html_not_expanded',
+'@html
+{a@code{{
+}}
+@end html
+
+@html
+{b@code{
+{c d}
+}
+@end html
+',
+{'EXPANDED_FORMATS' => ['tex']}
+],
['verbatim_and_verbatiminclude',
'@verbatim
In verbatim @@
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbb
diff --git a/tp/t/results/conditionals/cond.pl
b/tp/t/results/conditionals/cond.pl
index 8d27ebf86d..7ec3d69367 100644
--- a/tp/t/results/conditionals/cond.pl
+++ b/tp/t/results/conditionals/cond.pl
@@ -56,6 +56,13 @@ $result_trees{'cond'} = {
'cmdname' => 'html',
'contents' => [
{
+ 'contents' => [
+ {
+ 'text' => 'This is html text.
+',
+ 'type' => 'raw'
+ }
+ ],
'type' => 'elided_rawpreformatted'
},
{
@@ -528,6 +535,13 @@ $result_trees{'cond'} = {
'cmdname' => 'tex',
'contents' => [
{
+ 'contents' => [
+ {
+ 'text' => 'This is tex text.
+',
+ 'type' => 'raw'
+ }
+ ],
'type' => 'elided_rawpreformatted'
},
{
@@ -759,6 +773,7 @@ $result_texis{'cond'} = '\\input texinfo
@c test conditions
@html
+This is html text.
@end html
@@ -775,6 +790,7 @@ This is ifnotinfo text.
@tex
+This is tex text.
@end tex
@@ -900,6 +916,7 @@ span:hover a.copiable-link {visibility: visible}
<body lang="en">
+This is html text.
<p>This is ifnothtml text.
diff --git a/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
b/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
index 96aedafcb5..071158557f 100644
--- a/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
+++ b/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
@@ -534,6 +534,13 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
'cmdname' => 'tex',
'contents' => [
{
+ 'contents' => [
+ {
+ 'text' => 'This is tex text.
+',
+ 'type' => 'raw'
+ }
+ ],
'type' => 'elided_rawpreformatted'
},
{
@@ -782,6 +789,7 @@ This is ifinfo text.
@tex
+This is tex text.
@end tex
diff --git a/tp/t/results/conditionals/cond_info.pl
b/tp/t/results/conditionals/cond_info.pl
index 47701fa363..209a6d52f1 100644
--- a/tp/t/results/conditionals/cond_info.pl
+++ b/tp/t/results/conditionals/cond_info.pl
@@ -56,6 +56,13 @@ $result_trees{'cond_info'} = {
'cmdname' => 'html',
'contents' => [
{
+ 'contents' => [
+ {
+ 'text' => 'This is html text.
+',
+ 'type' => 'raw'
+ }
+ ],
'type' => 'elided_rawpreformatted'
},
{
@@ -528,6 +535,13 @@ $result_trees{'cond_info'} = {
'cmdname' => 'tex',
'contents' => [
{
+ 'contents' => [
+ {
+ 'text' => 'This is tex text.
+',
+ 'type' => 'raw'
+ }
+ ],
'type' => 'elided_rawpreformatted'
},
{
@@ -759,6 +773,7 @@ $result_texis{'cond_info'} = '\\input texinfo
@c test conditions
@html
+This is html text.
@end html
@@ -775,6 +790,7 @@ This is ifinfo text.
@tex
+This is tex text.
@end tex
diff --git
a/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
b/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
index f50927128e..a2a02aae80 100644
--- a/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -56,6 +56,13 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
'cmdname' => 'html',
'contents' => [
{
+ 'contents' => [
+ {
+ 'text' => 'This is html text.
+',
+ 'type' => 'raw'
+ }
+ ],
'type' => 'elided_rawpreformatted'
},
{
@@ -528,6 +535,13 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
'cmdname' => 'tex',
'contents' => [
{
+ 'contents' => [
+ {
+ 'text' => 'This is tex text.
+',
+ 'type' => 'raw'
+ }
+ ],
'type' => 'elided_rawpreformatted'
},
{
@@ -759,6 +773,7 @@ $result_texis{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} =
'\\input texinfo
@c test conditions
@html
+This is html text.
@end html
@@ -775,6 +790,7 @@ This is ifnotinfo text.
@tex
+This is tex text.
@end tex
diff --git a/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
b/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
index 21ad667c4b..2213648466 100644
--- a/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -56,6 +56,13 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
'cmdname' => 'html',
'contents' => [
{
+ 'contents' => [
+ {
+ 'text' => 'This is html text.
+',
+ 'type' => 'raw'
+ }
+ ],
'type' => 'elided_rawpreformatted'
},
{
@@ -528,6 +535,13 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
'cmdname' => 'tex',
'contents' => [
{
+ 'contents' => [
+ {
+ 'text' => 'This is tex text.
+',
+ 'type' => 'raw'
+ }
+ ],
'type' => 'elided_rawpreformatted'
},
{
@@ -759,6 +773,7 @@ $result_texis{'cond_no-ifhtml_no-ifinfo_no-iftex'} =
'\\input texinfo
@c test conditions
@html
+This is html text.
@end html
@@ -775,6 +790,7 @@ This is ifnotinfo text.
@tex
+This is tex text.
@end tex
@@ -900,6 +916,7 @@ span:hover a.copiable-link {visibility: visible}
<body lang="en">
+This is html text.
<p>This is ifnothtml text.
diff --git a/tp/t/results/conditionals/cond_xml.pl
b/tp/t/results/conditionals/cond_xml.pl
index 013edd9ded..dfd8bf8424 100644
--- a/tp/t/results/conditionals/cond_xml.pl
+++ b/tp/t/results/conditionals/cond_xml.pl
@@ -56,6 +56,13 @@ $result_trees{'cond_xml'} = {
'cmdname' => 'html',
'contents' => [
{
+ 'contents' => [
+ {
+ 'text' => 'This is html text.
+',
+ 'type' => 'raw'
+ }
+ ],
'type' => 'elided_rawpreformatted'
},
{
@@ -528,6 +535,13 @@ $result_trees{'cond_xml'} = {
'cmdname' => 'tex',
'contents' => [
{
+ 'contents' => [
+ {
+ 'text' => 'This is tex text.
+',
+ 'type' => 'raw'
+ }
+ ],
'type' => 'elided_rawpreformatted'
},
{
@@ -759,6 +773,7 @@ $result_texis{'cond_xml'} = '\\input texinfo
@c test conditions
@html
+This is html text.
@end html
@@ -775,6 +790,7 @@ This is ifnotinfo text.
@tex
+This is tex text.
@end tex
@@ -879,6 +895,7 @@ $result_converted{'xml'}->{'cond_xml'} =
'<preamblebeforebeginning>\\input texin
</preamblebeforebeginning><!-- c test conditions -->
<html endspaces=" ">
+This is html text.
</html>
@@ -896,6 +913,7 @@ $result_converted{'xml'}->{'cond_xml'} =
'<preamblebeforebeginning>\\input texin
</para>
<tex endspaces=" ">
+This is tex text.
</tex>
diff --git a/tp/t/results/conditionals/false_format_not_closed.pl
b/tp/t/results/conditionals/false_format_not_closed.pl
index ab08a81a62..23bca0f03a 100644
--- a/tp/t/results/conditionals/false_format_not_closed.pl
+++ b/tp/t/results/conditionals/false_format_not_closed.pl
@@ -24,6 +24,13 @@ $result_trees{'false_format_not_closed'} = {
'cmdname' => 'html',
'contents' => [
{
+ 'contents' => [
+ {
+ 'text' => 'blah blah
+',
+ 'type' => 'raw'
+ }
+ ],
'type' => 'elided_rawpreformatted'
}
],
@@ -41,6 +48,7 @@ $result_trees{'false_format_not_closed'} = {
};
$result_texis{'false_format_not_closed'} = '@html
+blah blah
';
diff --git a/tp/t/results/conditionals/many_conditionals.pl
b/tp/t/results/conditionals/many_conditionals.pl
index 8ab9649c64..1caceac23e 100644
--- a/tp/t/results/conditionals/many_conditionals.pl
+++ b/tp/t/results/conditionals/many_conditionals.pl
@@ -403,6 +403,13 @@ $result_trees{'many_conditionals'} = {
'cmdname' => 'tex',
'contents' => [
{
+ 'contents' => [
+ {
+ 'text' => 'This is tex text.
+',
+ 'type' => 'raw'
+ }
+ ],
'type' => 'elided_rawpreformatted'
},
{
@@ -615,6 +622,7 @@ This is ifinfo text.
@tex
+This is tex text.
@end tex
diff --git a/tp/t/results/converters_tests/at_commands_in_raw.pl
b/tp/t/results/converters_tests/at_commands_in_raw.pl
index b9e8258f55..65a64d5b60 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -383,6 +383,11 @@ $result_trees{'at_commands_in_raw'} = {
'contents' => [
{
'contents' => [
+ {
+ 'text' => '@kbdinputstyle code
+',
+ 'type' => 'raw'
+ },
{
'text' => 'in tex@footnote{footnote in tex}
',
@@ -1094,6 +1099,7 @@ Other macro
@kbd{in kbd before tex}@footnote{second footnote}.
@tex
+@kbdinputstyle code
in tex@footnote{footnote in tex}
@anchor{anchor in tex}
@cindex entry
@@ -1587,6 +1593,7 @@ Other macro
<para><kbd>in kbd before tex</kbd><footnote><para>second
footnote</para></footnote>.
</para>
<tex endspaces=" ">
+@kbdinputstyle code
in tex@footnote{footnote in tex}
@anchor{anchor in tex}
@cindex entry
diff --git a/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
b/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
index 5ed78434e3..1af4ed528d 100644
--- a/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
+++ b/tp/t/results/coverage/command_in_end_ignored_raw_command_after.pl
@@ -24,6 +24,13 @@ $result_trees{'command_in_end_ignored_raw_command_after'} = {
'cmdname' => 'html',
'contents' => [
{
+ 'contents' => [
+ {
+ 'text' => 'In html
+',
+ 'type' => 'raw'
+ }
+ ],
'type' => 'elided_rawpreformatted'
},
{
@@ -91,6 +98,7 @@ $result_trees{'command_in_end_ignored_raw_command_after'} = {
};
$result_texis{'command_in_end_ignored_raw_command_after'} = '@html
+In html
@end html@asis{asis}
';
diff --git a/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
b/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
index 2fd057e102..5dd467391a 100644
--- a/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
+++ b/tp/t/results/coverage/command_in_end_ignored_raw_in_command.pl
@@ -25,6 +25,11 @@ $result_trees{'command_in_end_ignored_raw_in_command'} = {
'contents' => [
{
'contents' => [
+ {
+ 'text' => 'In html
+',
+ 'type' => 'raw'
+ },
{
'text' => '@end @code{html}
',
@@ -48,6 +53,7 @@ $result_trees{'command_in_end_ignored_raw_in_command'} = {
};
$result_texis{'command_in_end_ignored_raw_in_command'} = '@html
+In html
@end @code{html}
';
diff --git
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
index 59b9cb1a62..de468d794d 100644
---
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
+++
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_before_command.pl
@@ -25,6 +25,11 @@
$result_trees{'command_in_end_ignored_raw_one_char_before_command'} = {
'contents' => [
{
'contents' => [
+ {
+ 'text' => 'In html
+',
+ 'type' => 'raw'
+ },
{
'text' => '@end h@asis{}tml
',
@@ -48,6 +53,7 @@
$result_trees{'command_in_end_ignored_raw_one_char_before_command'} = {
};
$result_texis{'command_in_end_ignored_raw_one_char_before_command'} = '@html
+In html
@end h@asis{}tml
';
diff --git
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
index 47d1ed71d6..cac6a086cc 100644
---
a/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
+++
b/tp/t/results/coverage/command_in_end_ignored_raw_one_char_not_in_command.pl
@@ -25,6 +25,11 @@
$result_trees{'command_in_end_ignored_raw_one_char_not_in_command'} = {
'contents' => [
{
'contents' => [
+ {
+ 'text' => 'In html
+',
+ 'type' => 'raw'
+ },
{
'text' => '@end h@asis{tml}
',
@@ -48,6 +53,7 @@
$result_trees{'command_in_end_ignored_raw_one_char_not_in_command'} = {
};
$result_texis{'command_in_end_ignored_raw_one_char_not_in_command'} = '@html
+In html
@end h@asis{tml}
';
diff --git
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
index 82d8dee1fb..449a3f5fa9 100644
---
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
+++
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_before_command.pl
@@ -25,6 +25,11 @@
$result_trees{'command_in_end_ignored_raw_two_char_before_command'} = {
'contents' => [
{
'contents' => [
+ {
+ 'text' => 'In html
+',
+ 'type' => 'raw'
+ },
{
'text' => '@end ht@asis{}ml
',
@@ -48,6 +53,7 @@
$result_trees{'command_in_end_ignored_raw_two_char_before_command'} = {
};
$result_texis{'command_in_end_ignored_raw_two_char_before_command'} = '@html
+In html
@end ht@asis{}ml
';
diff --git
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
index 51ae85d013..af54534925 100644
---
a/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
+++
b/tp/t/results/coverage/command_in_end_ignored_raw_two_char_not_in_command.pl
@@ -25,6 +25,11 @@
$result_trees{'command_in_end_ignored_raw_two_char_not_in_command'} = {
'contents' => [
{
'contents' => [
+ {
+ 'text' => 'In html
+',
+ 'type' => 'raw'
+ },
{
'text' => '@end ht@asis{ml}
',
@@ -48,6 +53,7 @@
$result_trees{'command_in_end_ignored_raw_two_char_not_in_command'} = {
};
$result_texis{'command_in_end_ignored_raw_two_char_not_in_command'} = '@html
+In html
@end ht@asis{ml}
';
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
b/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
index 751b889aac..416d6c2d8a 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
@@ -115,11 +115,13 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
'source_marks' => [
{
'counter' => 1,
+ 'position' => 3,
'sourcemark_type' => 'macro_expansion',
'status' => 'end'
}
],
- 'text' => ''
+ 'text' => 'inT',
+ 'type' => 'raw'
},
{
'text' => '
@@ -181,7 +183,7 @@ inT
@end macro
@tex
-
+inT
@end tex
';
diff --git a/tp/t/results/raw/space_before_end.pl
b/tp/t/results/raw/second_level_lone_braces_in_html.pl
similarity index 52%
copy from tp/t/results/raw/space_before_end.pl
copy to tp/t/results/raw/second_level_lone_braces_in_html.pl
index 094cc4f597..0cce464fa7 100644
--- a/tp/t/results/raw/space_before_end.pl
+++ b/tp/t/results/raw/second_level_lone_braces_in_html.pl
@@ -5,7 +5,7 @@ use vars qw(%result_texis %result_texts %result_trees
%result_errors
use utf8;
-$result_trees{'space_before_end'} = {
+$result_trees{'second_level_lone_braces_in_html'} = {
'contents' => [
{
'contents' => [
@@ -21,16 +21,45 @@ $result_trees{'space_before_end'} = {
'type' => 'block_line_arg'
}
],
- 'cmdname' => 'tex',
+ 'cmdname' => 'html',
'contents' => [
{
'contents' => [
{
- 'text' => 'in tex
+ 'text' => '{a'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => '
'
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
},
{
- 'text' => ' '
+ 'text' => '
+'
}
],
'type' => 'rawpreformatted'
@@ -40,7 +69,7 @@ $result_trees{'space_before_end'} = {
{
'contents' => [
{
- 'text' => 'tex'
+ 'text' => 'html'
}
],
'info' => {
@@ -54,16 +83,16 @@ $result_trees{'space_before_end'} = {
],
'cmdname' => 'end',
'extra' => {
- 'text_arg' => 'tex'
+ 'text_arg' => 'html'
},
'info' => {
'spaces_before_argument' => {
- 'text' => ' '
+ 'text' => ' '
}
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 4,
'macro' => ''
}
}
@@ -91,80 +120,55 @@ $result_trees{'space_before_end'} = {
'type' => 'block_line_arg'
}
],
- 'cmdname' => 'verbatim',
+ 'cmdname' => 'html',
'contents' => [
{
- 'text' => 'in verbatim
-',
- 'type' => 'raw'
- },
- {
- 'text' => ' ',
- 'type' => 'raw'
- },
- {
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'text' => '{b'
+ },
+ {
+ 'args' => [
{
- 'text' => 'verbatim'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '
+'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'c d'
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed'
+ },
+ {
+ 'text' => '
'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'end',
- 'extra' => {
- 'text_arg' => 'verbatim'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => ''
- }
- }
- ],
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'info' => {
- 'spaces_after_argument' => {
+ ],
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
+ },
+ {
'text' => '
'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'html',
- 'contents' => [
- {
- 'type' => 'elided_rawpreformatted'
- },
- {
- 'text' => ' '
+ ],
+ 'type' => 'rawpreformatted'
},
{
'args' => [
@@ -194,14 +198,14 @@ $result_trees{'space_before_end'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 10,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 6,
'macro' => ''
}
}
@@ -212,58 +216,47 @@ $result_trees{'space_before_end'} = {
'type' => 'document_root'
};
-$result_texis{'space_before_end'} = '@tex
-in tex
- @end tex
-
-@verbatim
-in verbatim
- @end verbatim
+$result_texis{'second_level_lone_braces_in_html'} = '@html
+{a@code{{
+}}
+@end html
@html
- @end html
+{b@code{
+{c d}
+}
+@end html
';
-$result_texts{'space_before_end'} = 'in tex
-
-in verbatim
-
-';
+$result_texts{'second_level_lone_braces_in_html'} = '{a{
+}
-$result_errors{'space_before_end'} = [
- {
- 'error_line' => 'warning: @end verbatim should only appear at the
beginning of a line
-',
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => '',
- 'text' => '@end verbatim should only appear at the beginning of a line',
- 'type' => 'warning'
- }
-];
+{b
+{c d}
+';
-$result_floats{'space_before_end'} = {};
+$result_errors{'second_level_lone_braces_in_html'} = [];
+$result_floats{'second_level_lone_braces_in_html'} = {};
-$result_converted{'plaintext'}->{'space_before_end'} = 'in verbatim
-
-';
+$result_converted{'plaintext'}->{'second_level_lone_braces_in_html'} = '';
-$result_converted{'xml'}->{'space_before_end'} = '<tex endspaces=" ">
-in tex
- </tex>
-<verbatim xml:space="preserve" endspaces=" ">
-in verbatim
- </verbatim>
+$result_converted{'xml'}->{'second_level_lone_braces_in_html'} = '<html
endspaces=" ">
+{a<code>{
+}</code>
+</html>
<html endspaces=" ">
- </html>
+{b<code>
+{c d}
+</code>
+</html>
';
1;
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
b/tp/t/results/raw/second_level_lone_braces_in_html_not_expanded.pl
similarity index 64%
copy from tp/t/results/macro/macro_end_call_in_ignored_raw.pl
copy to tp/t/results/raw/second_level_lone_braces_in_html_not_expanded.pl
index 751b889aac..4d55011e3a 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
+++ b/tp/t/results/raw/second_level_lone_braces_in_html_not_expanded.pl
@@ -5,35 +5,45 @@ use vars qw(%result_texis %result_texts %result_trees
%result_errors
use utf8;
-$result_trees{'macro_end_call_in_ignored_raw'} = {
+$result_trees{'second_level_lone_braces_in_html_not_expanded'} = {
'contents' => [
{
'contents' => [
{
'args' => [
{
- 'text' => 'startraw',
- 'type' => 'macro_name'
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'block_line_arg'
}
],
- 'cmdname' => 'macro',
+ 'cmdname' => 'html',
'contents' => [
{
- 'text' => '@tex
+ 'contents' => [
+ {
+ 'text' => '{a@code{{
',
- 'type' => 'raw'
- },
- {
- 'text' => 'inT
+ 'type' => 'raw'
+ },
+ {
+ 'text' => '}}
',
- 'type' => 'raw'
+ 'type' => 'raw'
+ }
+ ],
+ 'type' => 'elided_rawpreformatted'
},
{
'args' => [
{
'contents' => [
{
- 'text' => 'macro'
+ 'text' => 'html'
}
],
'info' => {
@@ -47,7 +57,7 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
],
'cmdname' => 'end',
'extra' => {
- 'text_arg' => 'macro'
+ 'text_arg' => 'html'
},
'info' => {
'spaces_before_argument' => {
@@ -61,10 +71,6 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
}
}
],
- 'info' => {
- 'arg_line' => ' startraw
-'
- },
'source_info' => {
'file_name' => '',
'line_nr' => 1,
@@ -72,25 +78,6 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
}
},
{
- 'source_marks' => [
- {
- 'counter' => 1,
- 'element' => {
- 'args' => [
- {
- 'type' => 'brace_command_arg'
- }
- ],
- 'extra' => {
- 'name' => 'startraw'
- },
- 'type' => 'macro_call'
- },
- 'position' => 1,
- 'sourcemark_type' => 'macro_expansion',
- 'status' => 'start'
- }
- ],
'text' => '
',
'type' => 'empty_line'
@@ -107,22 +94,22 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
'type' => 'block_line_arg'
}
],
- 'cmdname' => 'tex',
+ 'cmdname' => 'html',
'contents' => [
{
'contents' => [
{
- 'source_marks' => [
- {
- 'counter' => 1,
- 'sourcemark_type' => 'macro_expansion',
- 'status' => 'end'
- }
- ],
- 'text' => ''
+ 'text' => '{b@code{
+',
+ 'type' => 'raw'
},
{
- 'text' => '
+ 'text' => '{c d}
+',
+ 'type' => 'raw'
+ },
+ {
+ 'text' => '}
',
'type' => 'raw'
}
@@ -134,7 +121,7 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
{
'contents' => [
{
- 'text' => 'tex'
+ 'text' => 'html'
}
],
'info' => {
@@ -148,7 +135,7 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
],
'cmdname' => 'end',
'extra' => {
- 'text_arg' => 'tex'
+ 'text_arg' => 'html'
},
'info' => {
'spaces_before_argument' => {
@@ -157,7 +144,7 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 10,
'macro' => ''
}
}
@@ -165,7 +152,7 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
'source_info' => {
'file_name' => '',
'line_nr' => 6,
- 'macro' => 'startraw'
+ 'macro' => ''
}
}
],
@@ -175,24 +162,42 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
'type' => 'document_root'
};
-$result_texis{'macro_end_call_in_ignored_raw'} = '@macro startraw
-@tex
-inT
-@end macro
+$result_texis{'second_level_lone_braces_in_html_not_expanded'} = '@html
+{a@code{{
+}}
+@end html
-@tex
-
-@end tex
+@html
+{b@code{
+{c d}
+}
+@end html
';
-$result_texts{'macro_end_call_in_ignored_raw'} = '
+$result_texts{'second_level_lone_braces_in_html_not_expanded'} = '
';
-$result_errors{'macro_end_call_in_ignored_raw'} = [];
+$result_errors{'second_level_lone_braces_in_html_not_expanded'} = [];
+
+$result_floats{'second_level_lone_braces_in_html_not_expanded'} = {};
-$result_floats{'macro_end_call_in_ignored_raw'} = {};
+$result_converted{'plaintext'}->{'second_level_lone_braces_in_html_not_expanded'}
= '';
+
+
+$result_converted{'xml'}->{'second_level_lone_braces_in_html_not_expanded'} =
'<html endspaces=" ">
+{a@code{{
+}}
+</html>
+
+<html endspaces=" ">
+{b@code{
+{c d}
+}
+</html>
+';
+
1;
diff --git a/tp/t/results/raw/space_before_end.pl
b/tp/t/results/raw/space_before_end.pl
index 094cc4f597..093a797a9d 100644
--- a/tp/t/results/raw/space_before_end.pl
+++ b/tp/t/results/raw/space_before_end.pl
@@ -161,6 +161,13 @@ $result_trees{'space_before_end'} = {
'cmdname' => 'html',
'contents' => [
{
+ 'contents' => [
+ {
+ 'text' => 'in html
+',
+ 'type' => 'raw'
+ }
+ ],
'type' => 'elided_rawpreformatted'
},
{
@@ -221,6 +228,7 @@ in verbatim
@end verbatim
@html
+in html
@end html
';
@@ -263,6 +271,7 @@ in verbatim
</verbatim>
<html endspaces=" ">
+in html
</html>
';
diff --git a/tp/t/results/raw/spurious_arg_on_line.pl
b/tp/t/results/raw/spurious_arg_on_line.pl
index 8e36929b9b..6833e3d3d0 100644
--- a/tp/t/results/raw/spurious_arg_on_line.pl
+++ b/tp/t/results/raw/spurious_arg_on_line.pl
@@ -184,6 +184,13 @@ $result_trees{'spurious_arg_on_line'} = {
'cmdname' => 'html',
'contents' => [
{
+ 'contents' => [
+ {
+ 'text' => 'in html
+',
+ 'type' => 'raw'
+ }
+ ],
'type' => 'elided_rawpreformatted'
},
{
@@ -247,6 +254,7 @@ in verbatim
@end verbatim
@html argh
+in html
@end html
';
@@ -308,6 +316,7 @@ in verbatim
</verbatim>
<html spaces=" " endspaces=" ">
+in html
</html>
';
diff --git
a/tp/tests/coverage/res_parser/formatting_macro_expand/formatting.texi
b/tp/tests/coverage/res_parser/formatting_macro_expand/formatting.texi
index 383a08bb2d..fa95e2e623 100644
--- a/tp/tests/coverage/res_parser/formatting_macro_expand/formatting.texi
+++ b/tp/tests/coverage/res_parser/formatting_macro_expand/formatting.texi
@@ -2113,18 +2113,23 @@ in verbatim ''
@end verbatim
@xml
+<para> xml para </para> ''
@end xml
@html
+html ''
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
@end tex
@docbook
+docbook ''
@end docbook
@latex
+$\frac{a < b @code{tex \hbox{ code }}}{b}$ ``
@end latex
@majorheading majorheading
@@ -3276,18 +3281,23 @@ in verbatim ''
@end verbatim
@xml
+<para> xml para </para> ''
@end xml
@html
+html ''
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
@end tex
@docbook
+docbook ''
@end docbook
@latex
+$\frac{a < b @code{tex \hbox{ code }}}{b}$ ``
@end latex
@majorheading majorheading
@@ -3527,6 +3537,7 @@ Insercopying in titlepage
@end titlepage
@latex
+\DeclareUnicodeCharacter{0227}{\.{a}}
\DeclareUnicodeCharacter{1EA1}{\d{a}}
\DeclareUnicodeCharacter{2261}{$\equiv$}
\DeclareUnicodeCharacter{21A6}{$\mapsto$}
@@ -4477,18 +4488,23 @@ in verbatim ''
@end verbatim
@xml
+<para> xml para </para> ''
@end xml
@html
+html ''
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
@end tex
@docbook
+docbook ''
@end docbook
@latex
+$\frac{a < b @code{tex \hbox{ code }}}{b}$ ``
@end latex
@majorheading majorheading
@@ -5634,18 +5650,23 @@ in verbatim ''
@end verbatim
@xml
+<para> xml para </para> ''
@end xml
@html
+html ''
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
@end tex
@docbook
+docbook ''
@end docbook
@latex
+$\frac{a < b @code{tex \hbox{ code }}}{b}$ ``
@end latex
@majorheading majorheading
diff --git a/tp/tests/coverage/res_parser/formatting_xml/formatting.xml
b/tp/tests/coverage/res_parser/formatting_xml/formatting.xml
index 7781f9dbfb..9ea7f278b7 100644
--- a/tp/tests/coverage/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/coverage/res_parser/formatting_xml/formatting.xml
@@ -2116,15 +2116,19 @@ in verbatim ''
<para> xml para </para> ''
<html endspaces=" ">
+html ''
</html>
<tex endspaces=" ">
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
</tex>
<docbook endspaces=" ">
+docbook ''
</docbook>
<latex endspaces=" ">
+$\frac{a < b @code{tex \hbox{ code }}}{b}$ ``
</latex>
<majorheading spaces=" ">majorheading</majorheading>
@@ -3271,15 +3275,19 @@ in verbatim ''
<para> xml para </para> ''
<html endspaces=" ">
+html ''
</html>
<tex endspaces=" ">
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
</tex>
<docbook endspaces=" ">
+docbook ''
</docbook>
<latex endspaces=" ">
+$\frac{a < b @code{tex \hbox{ code }}}{b}$ ``
</latex>
<majorheading spaces=" ">majorheading</majorheading>
@@ -3515,6 +3523,7 @@ in verbatim ''
</titlepage>
<latex endspaces=" ">
+\DeclareUnicodeCharacter{0227}{\.{a}}
\DeclareUnicodeCharacter{1EA1}{\d{a}}
\DeclareUnicodeCharacter{2261}{$\equiv$}
\DeclareUnicodeCharacter{21A6}{$\mapsto$}
@@ -4465,15 +4474,19 @@ in verbatim ''
<para> xml para </para> ''
<html endspaces=" ">
+html ''
</html>
<tex endspaces=" ">
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
</tex>
<docbook endspaces=" ">
+docbook ''
</docbook>
<latex endspaces=" ">
+$\frac{a < b @code{tex \hbox{ code }}}{b}$ ``
</latex>
<majorheading spaces=" ">majorheading</majorheading>
@@ -5614,15 +5627,19 @@ in verbatim ''
<para> xml para </para> ''
<html endspaces=" ">
+html ''
</html>
<tex endspaces=" ">
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
</tex>
<docbook endspaces=" ">
+docbook ''
</docbook>
<latex endspaces=" ">
+$\frac{a < b @code{tex \hbox{ code }}}{b}$ ``
</latex>
</pre><majorheading spaces=" ">majorheading</majorheading>
diff --git
a/tp/tests/nested_formats/res_parser/texi_nested_formats/nested_formats.texi
b/tp/tests/nested_formats/res_parser/texi_nested_formats/nested_formats.texi
index bcd8d19738..fabfad9b71 100644
--- a/tp/tests/nested_formats/res_parser/texi_nested_formats/nested_formats.texi
+++ b/tp/tests/nested_formats/res_parser/texi_nested_formats/nested_formats.texi
@@ -232,12 +232,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -390,12 +393,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -549,12 +555,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -706,12 +715,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -864,12 +876,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -1024,12 +1039,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -1181,12 +1199,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -1339,12 +1360,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -1501,12 +1525,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -1658,12 +1685,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -1816,12 +1846,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -1976,12 +2009,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -2134,12 +2170,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -2293,12 +2332,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -2458,12 +2500,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -2616,12 +2661,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -2776,12 +2824,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -2936,12 +2987,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -3093,12 +3147,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -3251,12 +3308,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -3411,12 +3471,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -3568,12 +3631,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -3725,12 +3791,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -3885,12 +3954,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -4043,12 +4115,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -4202,12 +4277,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
@@ -4359,12 +4437,15 @@ in verbatim
@end verbatim
@xml
+<para> xml para </xml>
@end xml
@html
+html
@end html
@tex
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
@itemize @bullet{}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): do not throw away the current line in an ignored rawpreformatted.,
Patrice Dumas <=