[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/DocBook.pm (_convert), tp/Te
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/HTML.pm (_convert_balanced_braces_type), tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/Convert/NodeNameNormalization.pm (_convert), tp/Texinfo/Convert/Plaintext.pm (_convert), tp/Texinfo/Convert/Texinfo.pm (convert_to_texinfo), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), tp/Texinfo/Convert/Text.pm (_convert), tp/Texinfo/Convert/TextContent.pm (_convert), tp/Texinfo/ParserNonXS.pm (_close_current, _handle_open_brace) (_ [...] |
|
Date: |
Fri, 10 Mar 2023 16:00:16 -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 b10bf27dab * tp/Texinfo/Convert/DocBook.pm (_convert),
tp/Texinfo/Convert/HTML.pm (_convert_balanced_braces_type),
tp/Texinfo/Convert/LaTeX.pm (_convert),
tp/Texinfo/Convert/NodeNameNormalization.pm (_convert),
tp/Texinfo/Convert/Plaintext.pm (_convert), tp/Texinfo/Convert/Texinfo.pm
(convert_to_texinfo), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
tp/Texinfo/Convert/Text.pm (_convert), tp/Texinfo/Convert/TextContent.pm
(_convert), tp/Texinfo/ParserNonXS.pm (_close_current, _ [...]
b10bf27dab is described below
commit b10bf27dab7ce6ff90ac6d2e4d5fb5a50bd83acf
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Mar 10 22:00:04 2023 +0100
* tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/HTML.pm
(_convert_balanced_braces_type), tp/Texinfo/Convert/LaTeX.pm
(_convert), tp/Texinfo/Convert/NodeNameNormalization.pm (_convert),
tp/Texinfo/Convert/Plaintext.pm (_convert),
tp/Texinfo/Convert/Texinfo.pm (convert_to_texinfo),
tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
tp/Texinfo/Convert/Text.pm (_convert),
tp/Texinfo/Convert/TextContent.pm (_convert),
tp/Texinfo/ParserNonXS.pm (_close_current, _handle_open_brace)
(_handle_close_brace), tp/Texinfo/XS/parsetexi/close.c (close_current),
tp/Texinfo/XS/parsetexi/convert.c (convert_to_texinfo_internal),
tp/Texinfo/XS/parsetexi/element_types.txt,
tp/Texinfo/XS/parsetexi/separator.c (handle_open_brace)
(handle_close_brace): rename bracketed type as balanced_braces.
* tp/t/01use.t: replace bracketed by bracketed_arg on @multitable
line.
---
ChangeLog | 20 ++++++++++++++++++++
tp/Texinfo/Convert/DocBook.pm | 4 +++-
tp/Texinfo/Convert/HTML.pm | 4 ++--
tp/Texinfo/Convert/LaTeX.pm | 4 ++--
tp/Texinfo/Convert/NodeNameNormalization.pm | 2 +-
tp/Texinfo/Convert/Plaintext.pm | 4 ++--
tp/Texinfo/Convert/Texinfo.pm | 4 ++--
tp/Texinfo/Convert/TexinfoMarkup.pm | 2 +-
tp/Texinfo/Convert/Text.pm | 2 +-
tp/Texinfo/Convert/TextContent.pm | 2 +-
tp/Texinfo/ParserNonXS.pm | 21 ++++++++++++---------
tp/Texinfo/XS/parsetexi/close.c | 2 +-
tp/Texinfo/XS/parsetexi/convert.c | 4 ++--
tp/Texinfo/XS/parsetexi/element_types.c | 2 +-
tp/Texinfo/XS/parsetexi/element_types.h | 2 +-
tp/Texinfo/XS/parsetexi/element_types.txt | 2 +-
tp/Texinfo/XS/parsetexi/separator.c | 4 ++--
tp/t/01use.t | 4 ++--
tp/t/results/converters_tests/inline.pl | 12 ++++++------
tp/t/results/converters_tests/inline_expand_tex.pl | 4 ++--
tp/t/results/converters_tests/raw_block_commands.pl | 4 ++--
.../raw_block_commands_expand_tex.pl | 4 ++--
tp/t/results/coverage/displaymath.pl | 14 +++++++-------
tp/t/results/coverage/math.pl | 14 +++++++-------
.../math_bracketed_inside_not_closed.pl | 4 ++--
.../coverage_braces/math_bracketed_not_closed.pl | 4 ++--
.../math_bracketed_not_closed_next_line.pl | 2 +-
tp/t/results/html_tests/mathjax_with_texinfo.pl | 4 ++--
.../mathjax_with_texinfo_enable_encoding.pl | 4 ++--
.../html_tests/mathjax_with_texinfo_html_text.pl | 4 ++--
.../mathjax_with_texinfo_no_convert_to_latex.pl | 4 ++--
tp/t/results/invalid_nestings/section_in_math.pl | 2 +-
.../titlepage_with_commands_classical.pl | 4 ++--
.../plaintext_tests/lone_braces_in_inlineraw.pl | 2 +-
tp/t/results/raw/displaymath.pl | 8 ++++----
.../results/raw/second_level_lone_braces_in_html.pl | 4 ++--
tp/t/results/xml_tests/commands_and_spaces.pl | 2 +-
37 files changed, 107 insertions(+), 82 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e6cc61c4a5..23f43b6391 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2023-03-10 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/HTML.pm
+ (_convert_balanced_braces_type), tp/Texinfo/Convert/LaTeX.pm
+ (_convert), tp/Texinfo/Convert/NodeNameNormalization.pm (_convert),
+ tp/Texinfo/Convert/Plaintext.pm (_convert),
+ tp/Texinfo/Convert/Texinfo.pm (convert_to_texinfo),
+ tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
+ tp/Texinfo/Convert/Text.pm (_convert),
+ tp/Texinfo/Convert/TextContent.pm (_convert),
+ tp/Texinfo/ParserNonXS.pm (_close_current, _handle_open_brace)
+ (_handle_close_brace), tp/Texinfo/XS/parsetexi/close.c (close_current),
+ tp/Texinfo/XS/parsetexi/convert.c (convert_to_texinfo_internal),
+ tp/Texinfo/XS/parsetexi/element_types.txt,
+ tp/Texinfo/XS/parsetexi/separator.c (handle_open_brace)
+ (handle_close_brace): rename bracketed type as balanced_braces.
+
+ * tp/t/01use.t: replace bracketed by bracketed_arg on @multitable
+ line.
+
2023-03-10 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/DocBook.pm (_convert),
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 0eb74f8f4e..27774f00fb 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -1713,8 +1713,10 @@ sub _convert($$;$)
delete $self->{'document_context'}->[-1]->{'in_preformatted'};
}
}
+
$result = '{'.$result.'}'
- if ($element->{'type'} and $element->{'type'} eq 'bracketed');
+ if ($element->{'type'} and $element->{'type'} eq 'balanced_braces');
+
foreach my $format_element (@close_format_elements) {
$result .= "</$format_element>";
}
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 542c985a1c..7e0650d8fc 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -6227,7 +6227,7 @@ sub _convert_preformatted_type($$$$)
$default_types_conversion{'preformatted'} = \&_convert_preformatted_type;
-sub _convert_bracketed_type($$$$) {
+sub _convert_balanced_braces_type($$$$) {
my $self = shift;
my $type = shift;
my $element = shift;
@@ -6236,7 +6236,7 @@ sub _convert_bracketed_type($$$$) {
return '{'.$content.'}';
}
-$default_types_conversion{'bracketed'} = \&_convert_bracketed_type;
+$default_types_conversion{'balanced_braces'} = \&_convert_balanced_braces_type;
# use the type and not the index commands names, as they are diverse and
# can be dynamically added, so it is difficult to use as selector for output
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index c5cea6aaaf..0946e41414 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -4204,7 +4204,7 @@ sub _convert($$)
$result .= _open_preformatted($self, $element);
} elsif ($element->{'type'} eq '_dot_not_end_sentence') {
$self->{'formatting_context'}->[-1]->{'dot_not_end_sentence'} += 1;
- } elsif ($element->{'type'} eq 'bracketed') {
+ } elsif ($element->{'type'} eq 'balanced_braces') {
$result .= _protect_text($self, '{');
}
}
@@ -4240,7 +4240,7 @@ sub _convert($$)
} elsif ($type eq 'table_term') {
$result .= '}}]'."\n";
pop @{$self->{'formatting_context'}->[-1]->{'nr_table_items_context'}};
- } elsif ($type eq 'bracketed') {
+ } elsif ($type eq 'balanced_braces') {
$result .= _protect_text($self, '}');
} elsif ($type eq 'preformatted') {
$result .= _close_preformatted($self, $element);
diff --git a/tp/Texinfo/Convert/NodeNameNormalization.pm
b/tp/Texinfo/Convert/NodeNameNormalization.pm
index 557e9864e1..874567bcdc 100644
--- a/tp/Texinfo/Convert/NodeNameNormalization.pm
+++ b/tp/Texinfo/Convert/NodeNameNormalization.pm
@@ -321,7 +321,7 @@ sub _convert($)
}
}
$result = '{'.$result.'}'
- if ($element->{'type'} and $element->{'type'} eq 'bracketed');
+ if ($element->{'type'} and $element->{'type'} eq 'balanced_braces');
return $result;
}
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 14b2e5920b..00ec556055 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -3406,7 +3406,7 @@ sub _convert($$)
_open_code($formatter);
} elsif ($element->{'type'} eq '_stop_upper_case') {
push @{$formatter->{'upper_case_stack'}}, {};
- } elsif ($element->{'type'} eq 'bracketed') {
+ } elsif ($element->{'type'} eq 'balanced_braces') {
$result .= _count_added($self, $formatter->{'container'},
add_text($formatter->{'container'}, '{'));
}
@@ -3441,7 +3441,7 @@ sub _convert($$)
_close_code($formatter);
} elsif ($element->{'type'} eq '_stop_upper_case') {
pop @{$formatter->{'upper_case_stack'}};
- } elsif ($element->{'type'} eq 'bracketed') {
+ } elsif ($element->{'type'} eq 'balanced_braces') {
$result .= _count_added($self, $formatter->{'container'},
add_text($formatter->{'container'}, '}'));
} elsif ($element->{'type'} eq 'row') {
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index a310d29dbf..ba8ca47118 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -130,7 +130,7 @@ sub convert_to_texinfo($)
$result .= _expand_cmd_args_to_texi($element);
}
if ($element->{'type'}
- and ($element->{'type'} eq 'bracketed'
+ and ($element->{'type'} eq 'balanced_braces'
or $element->{'type'} eq 'bracketed_arg')) {
$result .= '{';
if ($element->{'info'}
@@ -150,7 +150,7 @@ sub convert_to_texinfo($)
$result .= convert_to_texinfo($element->{'info'}->{'comment_at_end'})
}
$result .= '}' if ($element->{'type'}
- and ($element->{'type'} eq 'bracketed'
+ and ($element->{'type'} eq 'balanced_braces'
or $element->{'type'} eq 'bracketed_arg'));
}
return $result;
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index c57e714213..bece8ffc72 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1573,7 +1573,7 @@ sub _convert($$;$)
}
}
$result = '{'.$result.'}'
- if ($element->{'type'} and $element->{'type'} eq 'bracketed');
+ if ($element->{'type'} and $element->{'type'} eq 'balanced_braces');
foreach my $format_element (@close_format_elements) {
$result .= $self->txi_markup_close_element($format_element);
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index 4b0497582b..0abb81bce7 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -665,7 +665,7 @@ sub _convert($;$)
$options->{'_raw_state'}-- if ($in_raw);
$options->{'_code_state'}-- if ($in_code);
}
- if ($element->{'type'} and $element->{'type'} eq 'bracketed') {
+ if ($element->{'type'} and $element->{'type'} eq 'balanced_braces') {
$result = '{'.$result.'}';
} elsif ($element->{'type'} and $element->{'type'} eq 'menu_entry'
and (!$element->{'parent'}->{'type'}
diff --git a/tp/Texinfo/Convert/TextContent.pm
b/tp/Texinfo/Convert/TextContent.pm
index 2136b5cb17..202354f7a9 100644
--- a/tp/Texinfo/Convert/TextContent.pm
+++ b/tp/Texinfo/Convert/TextContent.pm
@@ -172,7 +172,7 @@ sub _convert($$)
}
}
$result = '{'.$result.'}'
- if ($element->{'type'} and $element->{'type'} eq 'bracketed');
+ if ($element->{'type'} and $element->{'type'} eq 'balanced_braces');
if ($element->{'type'} and $element->{'type'} eq 'line_arg') {
$result .= "\n";
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index cf18ff752c..382ad6152d 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -2044,7 +2044,7 @@ sub _close_current($$$;$$)
}
} elsif ($current->{'type'}) {
print STDERR "CLOSING type $current->{'type'}\n" if ($self->{'DEBUG'});
- if ($current->{'type'} eq 'bracketed'
+ if ($current->{'type'} eq 'balanced_braces'
or $current->{'type'} eq 'bracketed_arg') {
# unclosed bracketed
$self->_command_error($current, $source_info, __("misplaced {"));
@@ -5699,10 +5699,10 @@ sub _handle_open_brace($$$$)
or $self->_top_context() eq 'ct_inlineraw') {
_abort_empty_line($self, $current);
push @{$current->{'contents'}},
- { 'type' => 'bracketed',
+ { 'type' => 'balanced_braces',
'parent' => $current, 'source_info' => $source_info };
$current = $current->{'contents'}->[-1];
- print STDERR "BRACKETED in math/rawpreformatted/inlineraw\n"
+ print STDERR "BALANCED BRACES in math/rawpreformatted/inlineraw\n"
if ($self->{'DEBUG'});
} else {
$self->_line_error(sprintf(__("misplaced {")), $source_info); #}
@@ -5726,7 +5726,7 @@ sub _handle_close_brace($$$)
}
if ($current->{'type'}
- and ($current->{'type'} eq 'bracketed'
+ and ($current->{'type'} eq 'balanced_braces'
or $current->{'type'} eq 'bracketed_arg')) {
_abort_empty_line($self, $current);
$current = $current->{'parent'};
@@ -8217,6 +8217,14 @@ The types of container element are the following:
=over
+=item balanced_braces
+
+Special type containing content in balanced braces in the context
+where they are valid, and where balanced braces need to be collected
+to know when a top-level brace command is closed. In C<@math>, in raw
+output format brace commands and within brace @-commands in raw output
+format block commands.
+
=item before_item
A container for content before the first C<@item> of block @-commands
@@ -8256,11 +8264,6 @@ reference, not in a I<brace_command_arg> container.
Note that only C<@value>
commands that are not expanded because there is no corresponding value set
are present as elements in the tree.
-=item bracketed
-
-This a special type containing content in brackets in the context
-where they are valid, in C<@math> and in raw output formats.
-
=item bracketed_arg
Bracketed argument. On definition command and on C<@multitable> line.
diff --git a/tp/Texinfo/XS/parsetexi/close.c b/tp/Texinfo/XS/parsetexi/close.c
index 87354af197..0db29cf7e4 100644
--- a/tp/Texinfo/XS/parsetexi/close.c
+++ b/tp/Texinfo/XS/parsetexi/close.c
@@ -424,7 +424,7 @@ close_current (ELEMENT *current,
enum context c;
switch (current->type)
{
- case ET_bracketed:
+ case ET_balanced_braces:
case ET_bracketed_arg:
command_error (current, "misplaced {");
if (current->contents.number > 0
diff --git a/tp/Texinfo/XS/parsetexi/convert.c
b/tp/Texinfo/XS/parsetexi/convert.c
index 29c2e99900..1daf2bda1c 100644
--- a/tp/Texinfo/XS/parsetexi/convert.c
+++ b/tp/Texinfo/XS/parsetexi/convert.c
@@ -175,7 +175,7 @@ convert_to_texinfo_internal (ELEMENT *e, TEXT *result)
expand_cmd_args_to_texi (e, result);
}
- if (e->type == ET_bracketed
+ if (e->type == ET_balanced_braces
|| e->type == ET_bracketed_arg)
{
KEY_PAIR *k;
@@ -199,7 +199,7 @@ convert_to_texinfo_internal (ELEMENT *e, TEXT *result)
if (k)
convert_to_texinfo_internal ((ELEMENT *)k->value, result);
- if (e->type == ET_bracketed
+ if (e->type == ET_balanced_braces
|| e->type == ET_bracketed_arg)
ADD("}");
}
diff --git a/tp/Texinfo/XS/parsetexi/element_types.c
b/tp/Texinfo/XS/parsetexi/element_types.c
index 62c790e9f9..b04de39add 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.c
+++ b/tp/Texinfo/XS/parsetexi/element_types.c
@@ -57,7 +57,7 @@ char *element_type_names[] = {
"multitable_head",
"multitable_body",
"row",
-"bracketed",
+"balanced_braces",
"bracketed_arg",
"def_aggregate",
"bracketed_inserted",
diff --git a/tp/Texinfo/XS/parsetexi/element_types.h
b/tp/Texinfo/XS/parsetexi/element_types.h
index e0eec5ce4f..adb67235ef 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.h
+++ b/tp/Texinfo/XS/parsetexi/element_types.h
@@ -60,7 +60,7 @@ ET_inter_def_item,
ET_multitable_head,
ET_multitable_body,
ET_row,
-ET_bracketed,
+ET_balanced_braces,
ET_bracketed_arg,
ET_def_aggregate,
ET_bracketed_inserted,
diff --git a/tp/Texinfo/XS/parsetexi/element_types.txt
b/tp/Texinfo/XS/parsetexi/element_types.txt
index bbcdc9a330..84a6c912ad 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.txt
+++ b/tp/Texinfo/XS/parsetexi/element_types.txt
@@ -80,7 +80,7 @@ inter_def_item
multitable_head
multitable_body
row
-bracketed
+balanced_braces
bracketed_arg
def_aggregate
bracketed_inserted
diff --git a/tp/Texinfo/XS/parsetexi/separator.c
b/tp/Texinfo/XS/parsetexi/separator.c
index aea0e7900e..11df10ef7b 100644
--- a/tp/Texinfo/XS/parsetexi/separator.c
+++ b/tp/Texinfo/XS/parsetexi/separator.c
@@ -196,7 +196,7 @@ handle_open_brace (ELEMENT *current, char **line_inout)
|| current_context() == ct_rawpreformatted
|| current_context() == ct_inlineraw)
{
- ELEMENT *b = new_element (ET_bracketed);
+ ELEMENT *b = new_element (ET_balanced_braces);
abort_empty_line (¤t, NULL);
b->source_info = current_source_info;
add_to_element_contents (current, b);
@@ -244,7 +244,7 @@ handle_close_brace (ELEMENT *current, char **line_inout)
current = end_paragraph (current, 0, 0);
}
- if (current->type == ET_bracketed
+ if (current->type == ET_balanced_braces
|| current->type == ET_bracketed_arg)
{
/* Used in @math */
diff --git a/tp/t/01use.t b/tp/t/01use.t
index a1e868e1b0..0b6adcfbad 100644
--- a/tp/t/01use.t
+++ b/tp/t/01use.t
@@ -18,13 +18,13 @@ my $manual_tree = { 'cmdname' => 'multitable',
{ 'type' => 'block_line_arg',
'contents' => [
{ 'text' => ' ' },
- { 'type' => 'bracketed',
+ { 'type' => 'bracketed_arg',
'contents' => [
{'text' => 'aaaa'},
]
},
{ 'text' => ' ' },
- { 'type' => 'bracketed',
+ { 'type' => 'bracketed_arg',
'contents' => [
{'text' => 'xx'},
{'cmdname' => 'b',
diff --git a/tp/t/results/converters_tests/inline.pl
b/tp/t/results/converters_tests/inline.pl
index 8f601f709b..146018e82d 100644
--- a/tp/t/results/converters_tests/inline.pl
+++ b/tp/t/results/converters_tests/inline.pl
@@ -248,7 +248,7 @@ $result_trees{'inline'} = {
'line_nr' => 7,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_arg'
@@ -267,7 +267,7 @@ $result_trees{'inline'} = {
'line_nr' => 7,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'contents' => [
@@ -280,7 +280,7 @@ $result_trees{'inline'} = {
'line_nr' => 7,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_context'
@@ -563,7 +563,7 @@ $result_trees{'inline'} = {
'line_nr' => 15,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_arg'
@@ -582,7 +582,7 @@ $result_trees{'inline'} = {
'line_nr' => 15,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'contents' => [
@@ -595,7 +595,7 @@ $result_trees{'inline'} = {
'line_nr' => 15,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'text' => '$ ``'
diff --git a/tp/t/results/converters_tests/inline_expand_tex.pl
b/tp/t/results/converters_tests/inline_expand_tex.pl
index 3de3be5e97..7bc001cd18 100644
--- a/tp/t/results/converters_tests/inline_expand_tex.pl
+++ b/tp/t/results/converters_tests/inline_expand_tex.pl
@@ -432,7 +432,7 @@ $result_trees{'inline_expand_tex'} = {
'line_nr' => 14,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_arg'
@@ -451,7 +451,7 @@ $result_trees{'inline_expand_tex'} = {
'line_nr' => 14,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'text' => '$ ``'
diff --git a/tp/t/results/converters_tests/raw_block_commands.pl
b/tp/t/results/converters_tests/raw_block_commands.pl
index 03ea2f05e5..90b3801dad 100644
--- a/tp/t/results/converters_tests/raw_block_commands.pl
+++ b/tp/t/results/converters_tests/raw_block_commands.pl
@@ -264,7 +264,7 @@ $result_trees{'raw_block_commands'} = {
'line_nr' => 15,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_arg'
@@ -368,7 +368,7 @@ $result_trees{'raw_block_commands'} = {
'line_nr' => 19,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_arg'
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 8301a886e9..5280e81242 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
@@ -264,7 +264,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
'line_nr' => 15,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_arg'
@@ -368,7 +368,7 @@ $result_trees{'raw_block_commands_expand_tex'} = {
'line_nr' => 19,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_arg'
diff --git a/tp/t/results/coverage/displaymath.pl
b/tp/t/results/coverage/displaymath.pl
index c343ff56f7..8e2b2e6029 100644
--- a/tp/t/results/coverage/displaymath.pl
+++ b/tp/t/results/coverage/displaymath.pl
@@ -46,7 +46,7 @@ $result_trees{'displaymath'} = {
'line_nr' => 3,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'text' => '\\over'
@@ -62,7 +62,7 @@ $result_trees{'displaymath'} = {
'line_nr' => 3,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'text' => '
@@ -295,7 +295,7 @@ $result_trees{'displaymath'} = {
'line_nr' => 13,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_arg'
@@ -314,7 +314,7 @@ $result_trees{'displaymath'} = {
'line_nr' => 13,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'text' => ' '
@@ -336,7 +336,7 @@ $result_trees{'displaymath'} = {
'line_nr' => 13,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'contents' => [
@@ -354,7 +354,7 @@ $result_trees{'displaymath'} = {
'line_nr' => 13,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'source_info' => {
@@ -362,7 +362,7 @@ $result_trees{'displaymath'} = {
'line_nr' => 13,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'text' => '
diff --git a/tp/t/results/coverage/math.pl b/tp/t/results/coverage/math.pl
index a940dfcb42..e6d96867ee 100644
--- a/tp/t/results/coverage/math.pl
+++ b/tp/t/results/coverage/math.pl
@@ -33,7 +33,7 @@ $result_trees{'math'} = {
'line_nr' => 2,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'text' => '\\over'
@@ -49,7 +49,7 @@ $result_trees{'math'} = {
'line_nr' => 2,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_context'
@@ -206,7 +206,7 @@ $result_trees{'math'} = {
'line_nr' => 8,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_arg'
@@ -225,7 +225,7 @@ $result_trees{'math'} = {
'line_nr' => 8,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'text' => ' '
@@ -247,7 +247,7 @@ $result_trees{'math'} = {
'line_nr' => 8,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'contents' => [
@@ -265,7 +265,7 @@ $result_trees{'math'} = {
'line_nr' => 8,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'source_info' => {
@@ -273,7 +273,7 @@ $result_trees{'math'} = {
'line_nr' => 8,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_context'
diff --git a/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl
b/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl
index be13196fbf..41ef477738 100644
--- a/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl
+++ b/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl
@@ -26,7 +26,7 @@ $result_trees{'math_bracketed_inside_not_closed'} = {
'line_nr' => 1,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'text' => '\\over'
@@ -42,7 +42,7 @@ $result_trees{'math_bracketed_inside_not_closed'} = {
'line_nr' => 1,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_context'
diff --git a/tp/t/results/coverage_braces/math_bracketed_not_closed.pl
b/tp/t/results/coverage_braces/math_bracketed_not_closed.pl
index 767b4053b0..62febbe4e3 100644
--- a/tp/t/results/coverage_braces/math_bracketed_not_closed.pl
+++ b/tp/t/results/coverage_braces/math_bracketed_not_closed.pl
@@ -26,7 +26,7 @@ $result_trees{'math_bracketed_not_closed'} = {
'line_nr' => 1,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'text' => '\\over'
@@ -42,7 +42,7 @@ $result_trees{'math_bracketed_not_closed'} = {
'line_nr' => 1,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_context'
diff --git
a/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl
b/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl
index 28399219be..63c55383ce 100644
--- a/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl
+++ b/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl
@@ -35,7 +35,7 @@ $result_trees{'math_bracketed_not_closed_next_line'} = {
'line_nr' => 1,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_context'
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo.pl
b/tp/t/results/html_tests/mathjax_with_texinfo.pl
index f8991c1d1d..0a0754f300 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo.pl
@@ -44,7 +44,7 @@ $result_trees{'mathjax_with_texinfo'} = {
'line_nr' => 2,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'contents' => [
@@ -70,7 +70,7 @@ $result_trees{'mathjax_with_texinfo'} = {
'line_nr' => 2,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_arg'
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl
b/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl
index 940571a412..33c000b1a7 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl
@@ -48,7 +48,7 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
'line_nr' => 2,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'contents' => [
@@ -74,7 +74,7 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
'line_nr' => 2,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_arg'
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl
b/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl
index ae2534dcc2..defd52de28 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo_html_text.pl
@@ -44,7 +44,7 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
'line_nr' => 2,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'contents' => [
@@ -70,7 +70,7 @@ $result_trees{'mathjax_with_texinfo_html_text'} = {
'line_nr' => 2,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_arg'
diff --git
a/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
b/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
index b6c8dd05ee..ef80a952da 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl
@@ -44,7 +44,7 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = {
'line_nr' => 2,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'contents' => [
@@ -70,7 +70,7 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = {
'line_nr' => 2,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_arg'
diff --git a/tp/t/results/invalid_nestings/section_in_math.pl
b/tp/t/results/invalid_nestings/section_in_math.pl
index a884996499..c6886173f6 100644
--- a/tp/t/results/invalid_nestings/section_in_math.pl
+++ b/tp/t/results/invalid_nestings/section_in_math.pl
@@ -43,7 +43,7 @@ $result_trees{'section_in_math'} = {
'line_nr' => 2,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_context'
diff --git a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
index 0f379e9e53..57d4247a17 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -307,7 +307,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
'line_nr' => 15,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'contents' => [
@@ -320,7 +320,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
'line_nr' => 15,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'text' => '
diff --git a/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl
b/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl
index 19d64223d5..e5fe75d97c 100644
--- a/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl
+++ b/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl
@@ -34,7 +34,7 @@ $result_trees{'lone_braces_in_inlineraw'} = {
'line_nr' => 1,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'info' => {
diff --git a/tp/t/results/raw/displaymath.pl b/tp/t/results/raw/displaymath.pl
index 1c75d5eb64..f0e2512971 100644
--- a/tp/t/results/raw/displaymath.pl
+++ b/tp/t/results/raw/displaymath.pl
@@ -37,7 +37,7 @@ $result_trees{'displaymath'} = {
'line_nr' => 2,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'text' => ' F)dV=\\int_'
@@ -53,7 +53,7 @@ $result_trees{'displaymath'} = {
'line_nr' => 2,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'text' => ' F\\cdot ndS
@@ -140,7 +140,7 @@ $result_trees{'displaymath'} = {
'line_nr' => 7,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'text' => ' F)dV=\\int_'
@@ -156,7 +156,7 @@ $result_trees{'displaymath'} = {
'line_nr' => 7,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'text' => ' F\\cdot ndS
diff --git a/tp/t/results/raw/second_level_lone_braces_in_html.pl
b/tp/t/results/raw/second_level_lone_braces_in_html.pl
index 0cce464fa7..b9c01f94cf 100644
--- a/tp/t/results/raw/second_level_lone_braces_in_html.pl
+++ b/tp/t/results/raw/second_level_lone_braces_in_html.pl
@@ -44,7 +44,7 @@ $result_trees{'second_level_lone_braces_in_html'} = {
'line_nr' => 2,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
}
],
'type' => 'brace_command_arg'
@@ -146,7 +146,7 @@ $result_trees{'second_level_lone_braces_in_html'} = {
'line_nr' => 8,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'text' => '
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 544b2be412..4d13e34235 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -1355,7 +1355,7 @@ $result_trees{'commands_and_spaces'} = {
'line_nr' => 60,
'macro' => ''
},
- 'type' => 'bracketed'
+ 'type' => 'balanced_braces'
},
{
'text' => ' '
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/HTML.pm (_convert_balanced_braces_type), tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/Convert/NodeNameNormalization.pm (_convert), tp/Texinfo/Convert/Plaintext.pm (_convert), tp/Texinfo/Convert/Texinfo.pm (convert_to_texinfo), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), tp/Texinfo/Convert/Text.pm (_convert), tp/Texinfo/Convert/TextContent.pm (_convert), tp/Texinfo/ParserNonXS.pm (_close_current, _handle_open_brace) (_ [...],
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/Convert/Plaintext.pm (_convert), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), tp/Texinfo/Convert/Text.pm (_convert), tp/Texinfo/Convert/TextContent.pm (_convert), tp/Texinfo/ParserNonXS.pm (_close_current, _split_def_args) (_end_line_starting_block, _handle_close_brace), tp/Texinfo/XS/parsetexi/close.c (close_current), tp/Texinfo/XS/parsetexi/def.c (split_def_args), tp/Texinfo/XS/parsetexi/end [...]
- Next by Date:
branch master updated: * tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/HTML.pm (_convert_balanced_braces_type), tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/Convert/Plaintext.pm (_convert), tp/Texinfo/Convert/Texinfo.pm (convert_to_texinfo), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), tp/Texinfo/Convert/Text.pm (_convert), tp/Texinfo/Convert/TextContent.pm (_convert), tp/Texinfo/ParserNonXS.pm (_close_current, _handle_open_brace) (_handle_close_brace), tp/Texinfo/XS/parsetexi/close.c (cl [...]
- Previous by thread:
branch master updated: * tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/Convert/Plaintext.pm (_convert), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), tp/Texinfo/Convert/Text.pm (_convert), tp/Texinfo/Convert/TextContent.pm (_convert), tp/Texinfo/ParserNonXS.pm (_close_current, _split_def_args) (_end_line_starting_block, _handle_close_brace), tp/Texinfo/XS/parsetexi/close.c (close_current), tp/Texinfo/XS/parsetexi/def.c (split_def_args), tp/Texinfo/XS/parsetexi/end [...]
- Next by thread:
branch master updated: * tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/HTML.pm (_convert_balanced_braces_type), tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/Convert/Plaintext.pm (_convert), tp/Texinfo/Convert/Texinfo.pm (convert_to_texinfo), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), tp/Texinfo/Convert/Text.pm (_convert), tp/Texinfo/Convert/TextContent.pm (_convert), tp/Texinfo/ParserNonXS.pm (_close_current, _handle_open_brace) (_handle_close_brace), tp/Texinfo/XS/parsetexi/close.c (cl [...]
- Index(es):