[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/Texinfo.pm, tp/Texinfo/Conve
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/Texinfo.pm, tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/element_types.txt, tp/Texinfo/XS/parsetexi/extra.c (add_info_string), tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): rename spaces type used for spaces after command before argument or opening brace as spaces_after_cmd_before_arg and move it to info in element. |
|
Date: |
Fri, 18 Nov 2022 02:14:15 -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 34ebb9cfb5 * tp/Texinfo/Convert/Texinfo.pm,
tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/ParserNonXS.pm
(_process_remaining_on_line), tp/Texinfo/XS/parsetexi/element_types.txt,
tp/Texinfo/XS/parsetexi/extra.c (add_info_string),
tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): rename spaces
type used for spaces after command before argument or opening brace as
spaces_after_cmd_before_arg and move it to info in element.
34ebb9cfb5 is described below
commit 34ebb9cfb57bced2d712912c91b352842b5b6343
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Nov 18 08:13:59 2022 +0100
* tp/Texinfo/Convert/Texinfo.pm, tp/Texinfo/Convert/TexinfoMarkup.pm,
tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
tp/Texinfo/XS/parsetexi/element_types.txt,
tp/Texinfo/XS/parsetexi/extra.c (add_info_string),
tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): rename
spaces type used for spaces after command before argument or opening
brace as spaces_after_cmd_before_arg and move it to info in element.
---
ChangeLog | 10 ++++++
tp/Texinfo/Convert/Texinfo.pm | 5 +--
tp/Texinfo/Convert/TexinfoMarkup.pm | 6 ++--
tp/Texinfo/ParserNonXS.pm | 34 +++++++++++---------
tp/Texinfo/XS/parsetexi/element_types.c | 3 +-
tp/Texinfo/XS/parsetexi/element_types.h | 3 +-
tp/Texinfo/XS/parsetexi/element_types.txt | 3 +-
tp/Texinfo/XS/parsetexi/extra.c | 6 ++++
tp/Texinfo/XS/parsetexi/parser.c | 4 +--
tp/Texinfo/XS/parsetexi/parser.h | 1 +
tp/t/results/coverage/accents_errors.pl | 16 +++++-----
tp/t/results/coverage/at_after_accent_command.pl | 4 +--
tp/t/results/coverage/commands.pl | 4 +--
tp/t/results/coverage/invalid_U.pl | 4 +--
.../results/coverage/lettered_accent_and_spaces.pl | 32 +++++++++----------
tp/t/results/coverage/not_i_j_in_dotless.pl | 4 +--
.../coverage/spaces_after_braced_command.pl | 20 ++++++------
.../spaces_no_brace_after_braced_command.pl | 4 +--
.../spaces_unknown_command_after_braced_command.pl | 8 ++---
tp/t/results/coverage_braces/no_brace.pl | 12 ++++----
.../coverage_braces/no_brace_space_end_line.pl | 12 ++++----
tp/t/results/formats_encodings/accent.pl | 36 +++++++++++-----------
.../formats_encodings/accent_enable_encoding.pl | 36 +++++++++++-----------
tp/t/results/formats_encodings/accentenc.pl | 36 +++++++++++-----------
.../formats_encodings/accentenc_enable_encoding.pl | 36 +++++++++++-----------
tp/t/results/macro/macro_in_accent.pl | 8 ++---
tp/t/results/value/value_after_accent.pl | 4 +--
tp/t/results/value/value_after_brace_command.pl | 24 +++++++--------
28 files changed, 201 insertions(+), 174 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dd0d9b410e..649d2c6606 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2022-11-17 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/Texinfo.pm, tp/Texinfo/Convert/TexinfoMarkup.pm,
+ tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
+ tp/Texinfo/XS/parsetexi/element_types.txt,
+ tp/Texinfo/XS/parsetexi/extra.c (add_info_string),
+ tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): rename
+ spaces type used for spaces after command before argument or opening
+ brace as spaces_after_cmd_before_arg and move it to info in element.
+
2022-11-17 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/Texinfo.pm (_expand_cmd_args_to_texi): remove
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index 6e0d4d175a..29459b560e 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -164,8 +164,9 @@ sub _expand_cmd_args_to_texi($;$) {
# this is done here otherwise for some constructs, there are
# no 'args', and so the space is never readded.
- if ($cmd->{'extra'} and exists ($cmd->{'extra'}->{'spaces'})) {
- $result .= $cmd->{'extra'}->{'spaces'};
+ if ($cmd->{'info'}
+ and exists ($cmd->{'info'}->{'spaces_after_cmd_before_arg'})) {
+ $result .= $cmd->{'info'}->{'spaces_after_cmd_before_arg'};
}
# block line commands with arguments not separated by commas
if ($block_commands{$cmdname}
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 7a4b5eed64..7502ceeef5 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -616,8 +616,10 @@ sub _convert($$;$)
$arg = '';
} else {
$arg = $self->_convert($element->{'args'}->[0]);
- if ($element->{'extra'} and $element->{'extra'}->{'spaces'}) {
- push @$attributes, ['spaces', $element->{'extra'}->{'spaces'}];
+ if ($element->{'info'}
+ and $element->{'info'}->{'spaces_after_cmd_before_arg'}) {
+ push @$attributes, ['spaces',
+ $element->{'info'}->{'spaces_after_cmd_before_arg'}];
}
if ($element->{'args'}->[0]->{'type'} eq 'following_arg') {
push @$attributes, ['bracketed', 'off'];
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index a23aa83ad1..3fabd0bc26 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -4365,16 +4365,16 @@ sub _process_remaining_on_line($$$$)
$current->{'cmdname'}), $source_info);
$additional_newline = 1;
}
- #$current->{'extra'} = {} if (!$current->{'extra'});
- if (!defined($current->{'extra'}->{'spaces'})) {
+ #$current->{'info'} = {} if (!$current->{'info'});
+ if (!defined($current->{'info'}->{'spaces_after_cmd_before_arg'})) {
$line =~ s/^(\s+)//;
- $current->{'extra'}->{'spaces'} = $added_space;
+ $current->{'info'}->{'spaces_after_cmd_before_arg'} = $added_space;
print STDERR "BRACE CMD before brace init spaces '$added_space'\n"
if $self->{'DEBUG'};
# only ignore spaces and one newline, two newlines lead to
# an empty line before the brace or argument which is incorrect.
} elsif ($additional_newline
- and $current->{'extra'}->{'spaces'} =~ /\n/) {
+ and $current->{'info'}->{'spaces_after_cmd_before_arg'} =~
/\n/) {
print STDERR "BRACE CMD before brace second newline stops spaces\n"
if $self->{'DEBUG'};
$self->_line_error(sprintf(__("\@%s expected braces"),
@@ -4382,7 +4382,7 @@ sub _process_remaining_on_line($$$$)
$current = $current->{'parent'};
} else {
$line =~ s/^(\s+)//;
- $current->{'extra'}->{'spaces'} .= $added_space;
+ $current->{'info'}->{'spaces_after_cmd_before_arg'} .= $added_space;
print STDERR "BRACE CMD before brace add spaces '$added_space'\n"
if $self->{'DEBUG'};
}
@@ -7378,6 +7378,20 @@ as argument and comma delimited arguments. Depending on
the @-command,
the I<spaces_after_argument> is associated with the @-command element, or
with each argument element.
+=item spaces_after_cmd_before_arg
+
+For accent commands with spaces following the @-command, like:
+
+ @ringaccent A
+ @^ u
+
+there is a I<spaces_after_cmd_before_arg> key which holds the
+spaces appearing after the command.
+
+Space between a brace @-command name and its opening brace also
+ends up in I<spaces_after_cmd_before_arg>. It is not recommended
+to leave space between an @-command name and its opening brace.
+
=item spaces_before_argument
A reference to spaces following the opening brace of some @-commands with
braces
@@ -7415,16 +7429,6 @@ arguments.
Set for some @-commands with line arguments and a missing argument.
-=item spaces
-
-For accent commands with spaces following the @-command, like:
-
- @ringaccent A
- @^ u
-
-there is a I<spaces> key which holds the spaces appearing after
-the command.
-
=item text_arg
The string correspond to the line after the @-command for @-commands
diff --git a/tp/Texinfo/XS/parsetexi/element_types.c
b/tp/Texinfo/XS/parsetexi/element_types.c
index 99d8dab9c2..b44af2f192 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.c
+++ b/tp/Texinfo/XS/parsetexi/element_types.c
@@ -15,7 +15,7 @@ char *element_type_names[] = {
"text_before_beginning",
"space_at_end_menu_node",
"after_menu_description_line",
-"spaces",
+"spaces_after_cmd_before_arg",
"spaces_inserted",
"document_root",
"root_line",
@@ -63,6 +63,7 @@ char *element_type_names[] = {
"elided",
"elided_block",
"delimiter",
+"spaces",
"untranslated",
};
diff --git a/tp/Texinfo/XS/parsetexi/element_types.h
b/tp/Texinfo/XS/parsetexi/element_types.h
index c18e6c5a6e..38857aee94 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.h
+++ b/tp/Texinfo/XS/parsetexi/element_types.h
@@ -18,7 +18,7 @@ ET_spaces_before_paragraph,
ET_text_before_beginning,
ET_space_at_end_menu_node,
ET_after_menu_description_line,
-ET_spaces,
+ET_spaces_after_cmd_before_arg,
ET_spaces_inserted,
ET_document_root,
ET_root_line,
@@ -66,6 +66,7 @@ ET_row_prototype,
ET_elided,
ET_elided_block,
ET_delimiter,
+ET_spaces,
ET_untranslated,
};
diff --git a/tp/Texinfo/XS/parsetexi/element_types.txt
b/tp/Texinfo/XS/parsetexi/element_types.txt
index ee7034193a..b7e18a43a1 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.txt
+++ b/tp/Texinfo/XS/parsetexi/element_types.txt
@@ -33,7 +33,7 @@ spaces_before_paragraph
text_before_beginning
space_at_end_menu_node
after_menu_description_line
-spaces
+spaces_after_cmd_before_arg
spaces_inserted
# Other special types
@@ -90,6 +90,7 @@ elided_block
# for def commands
delimiter
+spaces
# for inserted text in def commands
untranslated
diff --git a/tp/Texinfo/XS/parsetexi/extra.c b/tp/Texinfo/XS/parsetexi/extra.c
index 457cc10bb1..5e3f8bea04 100644
--- a/tp/Texinfo/XS/parsetexi/extra.c
+++ b/tp/Texinfo/XS/parsetexi/extra.c
@@ -144,6 +144,12 @@ add_extra_string (ELEMENT *e, char *key, char *value)
add_associated_info_key (e->extra_info, key, (ELEMENT *) value,
extra_string);
}
+void
+add_info_string (ELEMENT *e, char *key, char *value)
+{
+ add_associated_info_key (e->info_info, key, (ELEMENT *) value, extra_string);
+}
+
void
add_extra_string_dup (ELEMENT *e, char *key, char *value)
{
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 8f63066e49..42da476b72 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1580,12 +1580,12 @@ superfluous_arg:
}
}
- k = lookup_extra (current, "spaces");
+ k = lookup_info (current, "spaces_after_cmd_before_arg");
if (!k)
{
p = line + whitespaces_len;
xasprintf (&s, "%.*s", (int) (p - line), line);
- add_extra_string (current, "spaces", s);
+ add_info_string (current, "spaces_after_cmd_before_arg", s);
line = p;
}
else
diff --git a/tp/Texinfo/XS/parsetexi/parser.h b/tp/Texinfo/XS/parsetexi/parser.h
index ed6409b4ea..a23915f436 100644
--- a/tp/Texinfo/XS/parsetexi/parser.h
+++ b/tp/Texinfo/XS/parsetexi/parser.h
@@ -223,6 +223,7 @@ void add_extra_float_type (ELEMENT *e, char *key,
EXTRA_FLOAT_TYPE *value);
void add_extra_string (ELEMENT *e, char *key, char *value);
void add_extra_string_dup (ELEMENT *e, char *key, char *value);
void add_extra_integer (ELEMENT *e, char *key, long value);
+void add_info_string (ELEMENT *e, char *key, char *value);
void add_info_string_dup (ELEMENT *e, char *key, char *value);
KEY_PAIR *lookup_extra (ELEMENT *e, char *key);
KEY_PAIR *lookup_info (ELEMENT *e, char *key);
diff --git a/tp/t/results/coverage/accents_errors.pl
b/tp/t/results/coverage/accents_errors.pl
index 8d8b94e328..1deebdc0bf 100644
--- a/tp/t/results/coverage/accents_errors.pl
+++ b/tp/t/results/coverage/accents_errors.pl
@@ -26,8 +26,8 @@ $result_trees{'accents_errors'} = {
}
],
'cmdname' => 'ringaccent',
- 'extra' => {
- 'spaces' => '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => '
'
},
'source_info' => {
@@ -51,8 +51,8 @@ $result_trees{'accents_errors'} = {
}
],
'cmdname' => 'ringaccent',
- 'extra' => {
- 'spaces' => '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => '
'
},
'source_info' => {
@@ -110,8 +110,8 @@ $result_trees{'accents_errors'} = {
}
],
'cmdname' => '~',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -138,8 +138,8 @@ $result_trees{'accents_errors'} = {
}
],
'cmdname' => '~',
- 'extra' => {
- 'spaces' => '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => '
'
},
'source_info' => {
diff --git a/tp/t/results/coverage/at_after_accent_command.pl
b/tp/t/results/coverage/at_after_accent_command.pl
index 305e8795c2..df1bb69429 100644
--- a/tp/t/results/coverage/at_after_accent_command.pl
+++ b/tp/t/results/coverage/at_after_accent_command.pl
@@ -13,8 +13,8 @@ $result_trees{'at_after_accent_command'} = {
'contents' => [
{
'cmdname' => 'ringaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
diff --git a/tp/t/results/coverage/commands.pl
b/tp/t/results/coverage/commands.pl
index 06dafdf643..76d999f38c 100644
--- a/tp/t/results/coverage/commands.pl
+++ b/tp/t/results/coverage/commands.pl
@@ -127,8 +127,8 @@ $result_trees{'commands'} = {
}
],
'cmdname' => 'ringaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
diff --git a/tp/t/results/coverage/invalid_U.pl
b/tp/t/results/coverage/invalid_U.pl
index f1e8815dff..cb625fc832 100644
--- a/tp/t/results/coverage/invalid_U.pl
+++ b/tp/t/results/coverage/invalid_U.pl
@@ -13,8 +13,8 @@ $result_trees{'invalid_U'} = {
'contents' => [
{
'cmdname' => 'U',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
diff --git a/tp/t/results/coverage/lettered_accent_and_spaces.pl
b/tp/t/results/coverage/lettered_accent_and_spaces.pl
index 63b3c219e4..49a34528b6 100644
--- a/tp/t/results/coverage/lettered_accent_and_spaces.pl
+++ b/tp/t/results/coverage/lettered_accent_and_spaces.pl
@@ -23,8 +23,8 @@ $result_trees{'lettered_accent_and_spaces'} = {
}
],
'cmdname' => 'ringaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -58,8 +58,8 @@ $result_trees{'lettered_accent_and_spaces'} = {
}
],
'cmdname' => 'ringaccent',
- 'extra' => {
- 'spaces' => '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => '
'
},
'source_info' => {
@@ -94,8 +94,8 @@ $result_trees{'lettered_accent_and_spaces'} = {
}
],
'cmdname' => 'ringaccent',
- 'extra' => {
- 'spaces' => '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => '
'
},
'source_info' => {
@@ -130,8 +130,8 @@ $result_trees{'lettered_accent_and_spaces'} = {
}
],
'cmdname' => 'ringaccent',
- 'extra' => {
- 'spaces' => '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => '
'
},
'source_info' => {
@@ -166,8 +166,8 @@ $result_trees{'lettered_accent_and_spaces'} = {
}
],
'cmdname' => '^',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -201,8 +201,8 @@ $result_trees{'lettered_accent_and_spaces'} = {
}
],
'cmdname' => '^',
- 'extra' => {
- 'spaces' => '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => '
'
},
'source_info' => {
@@ -237,8 +237,8 @@ $result_trees{'lettered_accent_and_spaces'} = {
}
],
'cmdname' => '^',
- 'extra' => {
- 'spaces' => '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => '
'
},
'source_info' => {
@@ -274,8 +274,8 @@ $result_trees{'lettered_accent_and_spaces'} = {
}
],
'cmdname' => '^',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
diff --git a/tp/t/results/coverage/not_i_j_in_dotless.pl
b/tp/t/results/coverage/not_i_j_in_dotless.pl
index 8859733760..36020e0766 100644
--- a/tp/t/results/coverage/not_i_j_in_dotless.pl
+++ b/tp/t/results/coverage/not_i_j_in_dotless.pl
@@ -23,8 +23,8 @@ $result_trees{'not_i_j_in_dotless'} = {
}
],
'cmdname' => 'dotless',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
diff --git a/tp/t/results/coverage/spaces_after_braced_command.pl
b/tp/t/results/coverage/spaces_after_braced_command.pl
index ffe2e790d1..1810268940 100644
--- a/tp/t/results/coverage/spaces_after_braced_command.pl
+++ b/tp/t/results/coverage/spaces_after_braced_command.pl
@@ -23,8 +23,8 @@ $result_trees{'spaces_after_braced_command'} = {
}
],
'cmdname' => 'code',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -58,8 +58,8 @@ $result_trees{'spaces_after_braced_command'} = {
}
],
'cmdname' => 'samp',
- 'extra' => {
- 'spaces' => '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => '
'
},
'source_info' => {
@@ -89,8 +89,8 @@ $result_trees{'spaces_after_braced_command'} = {
}
],
'cmdname' => 'AA',
- 'extra' => {
- 'spaces' => '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => '
'
},
'source_info' => {
@@ -138,8 +138,8 @@ $result_trees{'spaces_after_braced_command'} = {
}
],
'cmdname' => 'email',
- 'extra' => {
- 'spaces' => '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => '
'
},
'source_info' => {
@@ -164,8 +164,8 @@ $result_trees{'spaces_after_braced_command'} = {
'contents' => [
{
'cmdname' => 'TeX',
- 'extra' => {
- 'spaces' => '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => '
'
},
'source_info' => {
diff --git a/tp/t/results/coverage/spaces_no_brace_after_braced_command.pl
b/tp/t/results/coverage/spaces_no_brace_after_braced_command.pl
index d68352e6b7..5098a36222 100644
--- a/tp/t/results/coverage/spaces_no_brace_after_braced_command.pl
+++ b/tp/t/results/coverage/spaces_no_brace_after_braced_command.pl
@@ -13,8 +13,8 @@ $result_trees{'spaces_no_brace_after_braced_command'} = {
'contents' => [
{
'cmdname' => 'code',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
diff --git
a/tp/t/results/coverage/spaces_unknown_command_after_braced_command.pl
b/tp/t/results/coverage/spaces_unknown_command_after_braced_command.pl
index 7e428f5028..f9b63b794a 100644
--- a/tp/t/results/coverage/spaces_unknown_command_after_braced_command.pl
+++ b/tp/t/results/coverage/spaces_unknown_command_after_braced_command.pl
@@ -13,8 +13,8 @@ $result_trees{'spaces_unknown_command_after_braced_command'}
= {
'contents' => [
{
'cmdname' => 'code',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -38,8 +38,8 @@ $result_trees{'spaces_unknown_command_after_braced_command'}
= {
'contents' => [
{
'cmdname' => '~',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
diff --git a/tp/t/results/coverage_braces/no_brace.pl
b/tp/t/results/coverage_braces/no_brace.pl
index dfaf7f3131..9e463eee79 100644
--- a/tp/t/results/coverage_braces/no_brace.pl
+++ b/tp/t/results/coverage_braces/no_brace.pl
@@ -13,8 +13,8 @@ $result_trees{'no_brace'} = {
'contents' => [
{
'cmdname' => 'TeX',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -27,8 +27,8 @@ $result_trees{'no_brace'} = {
},
{
'cmdname' => 'code',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -41,8 +41,8 @@ $result_trees{'no_brace'} = {
},
{
'cmdname' => 'footnote',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
diff --git a/tp/t/results/coverage_braces/no_brace_space_end_line.pl
b/tp/t/results/coverage_braces/no_brace_space_end_line.pl
index a44fa7bd12..d183a06999 100644
--- a/tp/t/results/coverage_braces/no_brace_space_end_line.pl
+++ b/tp/t/results/coverage_braces/no_brace_space_end_line.pl
@@ -23,8 +23,8 @@ $result_trees{'no_brace_space_end_line'} = {
}
],
'cmdname' => 'code',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -48,8 +48,8 @@ $result_trees{'no_brace_space_end_line'} = {
'contents' => [
{
'cmdname' => 'TeX',
- 'extra' => {
- 'spaces' => '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => '
'
},
'source_info' => {
@@ -64,8 +64,8 @@ $result_trees{'no_brace_space_end_line'} = {
},
{
'cmdname' => 'code',
- 'extra' => {
- 'spaces' => '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => '
'
},
'source_info' => {
diff --git a/tp/t/results/formats_encodings/accent.pl
b/tp/t/results/formats_encodings/accent.pl
index 458943275c..dd288b44b3 100644
--- a/tp/t/results/formats_encodings/accent.pl
+++ b/tp/t/results/formats_encodings/accent.pl
@@ -752,8 +752,8 @@ $result_trees{'accent'} = {
}
],
'cmdname' => 'H',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -811,8 +811,8 @@ $result_trees{'accent'} = {
}
],
'cmdname' => 'dotaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -870,8 +870,8 @@ $result_trees{'accent'} = {
}
],
'cmdname' => 'ringaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -964,8 +964,8 @@ $result_trees{'accent'} = {
}
],
'cmdname' => 'u',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1023,8 +1023,8 @@ $result_trees{'accent'} = {
}
],
'cmdname' => 'ubaraccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1082,8 +1082,8 @@ $result_trees{'accent'} = {
}
],
'cmdname' => 'udotaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1141,8 +1141,8 @@ $result_trees{'accent'} = {
}
],
'cmdname' => 'v',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1200,8 +1200,8 @@ $result_trees{'accent'} = {
}
],
'cmdname' => 'ogonek',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1259,8 +1259,8 @@ $result_trees{'accent'} = {
}
],
'cmdname' => 'ogonek',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
diff --git a/tp/t/results/formats_encodings/accent_enable_encoding.pl
b/tp/t/results/formats_encodings/accent_enable_encoding.pl
index 9f8a570d45..580313b234 100644
--- a/tp/t/results/formats_encodings/accent_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accent_enable_encoding.pl
@@ -752,8 +752,8 @@ $result_trees{'accent_enable_encoding'} = {
}
],
'cmdname' => 'H',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -811,8 +811,8 @@ $result_trees{'accent_enable_encoding'} = {
}
],
'cmdname' => 'dotaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -870,8 +870,8 @@ $result_trees{'accent_enable_encoding'} = {
}
],
'cmdname' => 'ringaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -964,8 +964,8 @@ $result_trees{'accent_enable_encoding'} = {
}
],
'cmdname' => 'u',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1023,8 +1023,8 @@ $result_trees{'accent_enable_encoding'} = {
}
],
'cmdname' => 'ubaraccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1082,8 +1082,8 @@ $result_trees{'accent_enable_encoding'} = {
}
],
'cmdname' => 'udotaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1141,8 +1141,8 @@ $result_trees{'accent_enable_encoding'} = {
}
],
'cmdname' => 'v',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1200,8 +1200,8 @@ $result_trees{'accent_enable_encoding'} = {
}
],
'cmdname' => 'ogonek',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1259,8 +1259,8 @@ $result_trees{'accent_enable_encoding'} = {
}
],
'cmdname' => 'ogonek',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
diff --git a/tp/t/results/formats_encodings/accentenc.pl
b/tp/t/results/formats_encodings/accentenc.pl
index 3a6aaaceb2..6ffaac7904 100644
--- a/tp/t/results/formats_encodings/accentenc.pl
+++ b/tp/t/results/formats_encodings/accentenc.pl
@@ -788,8 +788,8 @@ $result_trees{'accentenc'} = {
}
],
'cmdname' => 'H',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -847,8 +847,8 @@ $result_trees{'accentenc'} = {
}
],
'cmdname' => 'dotaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -906,8 +906,8 @@ $result_trees{'accentenc'} = {
}
],
'cmdname' => 'ringaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1000,8 +1000,8 @@ $result_trees{'accentenc'} = {
}
],
'cmdname' => 'u',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1059,8 +1059,8 @@ $result_trees{'accentenc'} = {
}
],
'cmdname' => 'ubaraccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1118,8 +1118,8 @@ $result_trees{'accentenc'} = {
}
],
'cmdname' => 'udotaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1177,8 +1177,8 @@ $result_trees{'accentenc'} = {
}
],
'cmdname' => 'v',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1236,8 +1236,8 @@ $result_trees{'accentenc'} = {
}
],
'cmdname' => 'ogonek',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1295,8 +1295,8 @@ $result_trees{'accentenc'} = {
}
],
'cmdname' => 'ogonek',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
diff --git a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
index e6e810e827..2ca572f243 100644
--- a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
@@ -783,8 +783,8 @@ $result_trees{'accentenc_enable_encoding'} = {
}
],
'cmdname' => 'H',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -842,8 +842,8 @@ $result_trees{'accentenc_enable_encoding'} = {
}
],
'cmdname' => 'dotaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -901,8 +901,8 @@ $result_trees{'accentenc_enable_encoding'} = {
}
],
'cmdname' => 'ringaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -995,8 +995,8 @@ $result_trees{'accentenc_enable_encoding'} = {
}
],
'cmdname' => 'u',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1054,8 +1054,8 @@ $result_trees{'accentenc_enable_encoding'} = {
}
],
'cmdname' => 'ubaraccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1113,8 +1113,8 @@ $result_trees{'accentenc_enable_encoding'} = {
}
],
'cmdname' => 'udotaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1172,8 +1172,8 @@ $result_trees{'accentenc_enable_encoding'} = {
}
],
'cmdname' => 'v',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1231,8 +1231,8 @@ $result_trees{'accentenc_enable_encoding'} = {
}
],
'cmdname' => 'ogonek',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -1290,8 +1290,8 @@ $result_trees{'accentenc_enable_encoding'} = {
}
],
'cmdname' => 'ogonek',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
diff --git a/tp/t/results/macro/macro_in_accent.pl
b/tp/t/results/macro/macro_in_accent.pl
index d9798e0e01..f597261036 100644
--- a/tp/t/results/macro/macro_in_accent.pl
+++ b/tp/t/results/macro/macro_in_accent.pl
@@ -139,8 +139,8 @@ $result_trees{'macro_in_accent'} = {
}
],
'cmdname' => 'ringaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -240,8 +240,8 @@ $result_trees{'macro_in_accent'} = {
}
],
'cmdname' => 'ringaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
diff --git a/tp/t/results/value/value_after_accent.pl
b/tp/t/results/value/value_after_accent.pl
index 5a3612145d..0f4c8da118 100644
--- a/tp/t/results/value/value_after_accent.pl
+++ b/tp/t/results/value/value_after_accent.pl
@@ -46,8 +46,8 @@ $result_trees{'value_after_accent'} = {
}
],
'cmdname' => 'ringaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
diff --git a/tp/t/results/value/value_after_brace_command.pl
b/tp/t/results/value/value_after_brace_command.pl
index 7a45840027..ced094286e 100644
--- a/tp/t/results/value/value_after_brace_command.pl
+++ b/tp/t/results/value/value_after_brace_command.pl
@@ -74,8 +74,8 @@ $result_trees{'value_after_brace_command'} = {
}
],
'cmdname' => 'ringaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -89,8 +89,8 @@ $result_trees{'value_after_brace_command'} = {
},
{
'cmdname' => 'ringaccent',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -114,8 +114,8 @@ $result_trees{'value_after_brace_command'} = {
}
],
'cmdname' => '^',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -129,8 +129,8 @@ $result_trees{'value_after_brace_command'} = {
},
{
'cmdname' => '^',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -154,8 +154,8 @@ $result_trees{'value_after_brace_command'} = {
}
],
'cmdname' => 'code',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
@@ -169,8 +169,8 @@ $result_trees{'value_after_brace_command'} = {
},
{
'cmdname' => 'code',
- 'extra' => {
- 'spaces' => ' '
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
},
'source_info' => {
'file_name' => '',
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/Texinfo.pm, tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/element_types.txt, tp/Texinfo/XS/parsetexi/extra.c (add_info_string), tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): rename spaces type used for spaces after command before argument or opening brace as spaces_after_cmd_before_arg and move it to info in element.,
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/Convert/Texinfo.pm (_expand_cmd_args_to_texi): remove redundant conditions.
- Next by Date:
branch master updated: * tp/Texinfo/Convert/Converter.pm, tp/Texinfo/Convert/Texinfo.pm, tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/ParserNonXS.pm (_isolate_last_space), tp/Texinfo/Transformations.pm, tp/Texinfo/XS/parsetexi/extra.c (add_info_element_oot), tp/Texinfo/XS/parsetexi/parser.c (isolate_last_space): move comment_at_end from extra to info in element.
- Previous by thread:
branch master updated: * tp/Texinfo/Convert/Texinfo.pm (_expand_cmd_args_to_texi): remove redundant conditions.
- Next by thread:
branch master updated: * tp/Texinfo/Convert/Converter.pm, tp/Texinfo/Convert/Texinfo.pm, tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/ParserNonXS.pm (_isolate_last_space), tp/Texinfo/Transformations.pm, tp/Texinfo/XS/parsetexi/extra.c (add_info_element_oot), tp/Texinfo/XS/parsetexi/parser.c (isolate_last_space): move comment_at_end from extra to info in element.
- Index(es):