[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/ParserNonXS.pm (_end_line), tp/Texin
From: |
Patrice Dumas |
Subject: |
branch master updated: * tp/Texinfo/ParserNonXS.pm (_end_line), tp/Texinfo/XS/parsetexi/Parsetexi.pm (_set_itemize_commands_arg) (_set_errors_node_lists_labels_indices, get_parser_info): remove @itemize command argument detected as command_as_argument in itemize_commands_arg in global information as it is not needed anymore. |
Date: |
Fri, 07 Jan 2022 08:22:56 -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 b77adb13e4 * tp/Texinfo/ParserNonXS.pm (_end_line),
tp/Texinfo/XS/parsetexi/Parsetexi.pm (_set_itemize_commands_arg)
(_set_errors_node_lists_labels_indices, get_parser_info): remove @itemize
command argument detected as command_as_argument in itemize_commands_arg in
global information as it is not needed anymore.
b77adb13e4 is described below
commit b77adb13e48bda8586ef0ad937ad413283a2aac6
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Jan 7 14:22:43 2022 +0100
* tp/Texinfo/ParserNonXS.pm (_end_line),
tp/Texinfo/XS/parsetexi/Parsetexi.pm (_set_itemize_commands_arg)
(_set_errors_node_lists_labels_indices, get_parser_info):
remove @itemize command argument detected as command_as_argument
in itemize_commands_arg in global information as it is not needed
anymore.
---
ChangeLog | 9 +++++++++
tp/Texinfo/ParserNonXS.pm | 9 ---------
tp/Texinfo/XS/parsetexi/Parsetexi.pm | 30 ++----------------------------
3 files changed, 11 insertions(+), 37 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 967ba43813..45610a4373 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-01-06 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/ParserNonXS.pm (_end_line),
+ tp/Texinfo/XS/parsetexi/Parsetexi.pm (_set_itemize_commands_arg)
+ (_set_errors_node_lists_labels_indices, get_parser_info):
+ remove @itemize command argument detected as command_as_argument
+ in itemize_commands_arg in global information as it is not needed
+ anymore.
+
2022-01-06 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (%css_map, converter_initialize):
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 9c2e2d1e74..067326777f 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3061,15 +3061,6 @@ sub _end_line($$$)
'parent' => $current };
unshift @{$current->{'args'}}, $inserted;
$current->{'extra'}->{'command_as_argument'} = $inserted;
- } else {
- if ($current->{'extra'} and
$current->{'extra'}->{'command_as_argument'}) {
- my $command_as_argument
- = $current->{'extra'}->{'command_as_argument'}->{'cmdname'};
- if (not
defined($self->{'info'}->{'itemize_commands_arg'}->{$command_as_argument})) {
-
$self->{'info'}->{'itemize_commands_arg'}->{$command_as_argument} = [];
- }
- push
@{$self->{'info'}->{'itemize_commands_arg'}->{$command_as_argument}}, $current;
- }
}
} elsif ($item_line_commands{$current->{'cmdname'}} and
!$current->{'extra'}->{'command_as_argument'}) {
diff --git a/tp/Texinfo/XS/parsetexi/Parsetexi.pm
b/tp/Texinfo/XS/parsetexi/Parsetexi.pm
index 3d82378530..67f074e952 100644
--- a/tp/Texinfo/XS/parsetexi/Parsetexi.pm
+++ b/tp/Texinfo/XS/parsetexi/Parsetexi.pm
@@ -162,26 +162,6 @@ sub _associate_node_menus {
}
}
-# TODO do it in the parser
-sub _set_itemize_commands_arg {
- my $root = shift;
-
- my $collected_commands = Texinfo::Common::collect_commands_list_in_tree(
- $root, ['itemize']);
- my $itemize_commands_arg;
- foreach my $current (@$collected_commands) {
- if ($current->{'extra'} and $current->{'extra'}->{'command_as_argument'}) {
- my $command_as_argument
- = $current->{'extra'}->{'command_as_argument'}->{'cmdname'};
- if (not defined($itemize_commands_arg->{$command_as_argument})) {
- $itemize_commands_arg->{$command_as_argument} = [];
- }
- push @{$itemize_commands_arg->{$command_as_argument}}, $current;
- }
- }
- return $itemize_commands_arg;
-}
-
sub _get_error_registrar($)
{
my $self = shift;
@@ -214,7 +194,6 @@ sub _set_errors_node_lists_labels_indices($)
sub get_parser_info {
my $self = shift;
- my $root = shift;
my ($INTL_XREFS, $FLOATS, $ERRORS, $GLOBAL_INFO, $GLOBAL_INFO2);
@@ -233,11 +212,6 @@ sub get_parser_info {
$self->{'info'}->{'novalidate'} = 1;
}
- my $itemize_commands_arg = _set_itemize_commands_arg ($root);
- if (defined($itemize_commands_arg)) {
- $self->{'info'}->{'itemize_commands_arg'} = $itemize_commands_arg;
- }
-
_set_errors_node_lists_labels_indices($self);
}
@@ -259,7 +233,7 @@ sub parse_texi_file ($$)
}
my $TREE = build_texinfo_tree ();
- get_parser_info ($self, $TREE);
+ get_parser_info ($self);
_associate_node_menus ($self, $TREE);
@@ -322,7 +296,7 @@ sub parse_texi_text($$;$$$$)
parse_text($text);
my $tree = build_texinfo_tree ();
- get_parser_info($self, $tree);
+ get_parser_info($self);
_associate_node_menus ($self, $tree);
return $tree;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/ParserNonXS.pm (_end_line), tp/Texinfo/XS/parsetexi/Parsetexi.pm (_set_itemize_commands_arg) (_set_errors_node_lists_labels_indices, get_parser_info): remove @itemize command argument detected as command_as_argument in itemize_commands_arg in global information as it is not needed anymore.,
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/Convert/HTML.pm (%css_map, converter_initialize): setup css_string for more @-commands in the first initialization. Preset %css_map for all the possible @itemize marks. No use for parser_info itemize_commands_arg anymore.
- Next by Date:
branch master updated: * tp/Texinfo/Common.pm (%default_main_program_customization), tp/Texinfo/Convert/HTML.pm (builtin_default_css_text), tp/texi2any.pl, doc/texinfo.texi (HTML Customization Variables), NEWS: add SHOW_BUILTIN_CSS_RULES, to output the default builtin CSS rules, and exit right after.
- Previous by thread:
branch master updated: * tp/Texinfo/Convert/HTML.pm (%css_map, converter_initialize): setup css_string for more @-commands in the first initialization. Preset %css_map for all the possible @itemize marks. No use for parser_info itemize_commands_arg anymore.
- Next by thread:
branch master updated: * tp/Texinfo/Common.pm (%default_main_program_customization), tp/Texinfo/Convert/HTML.pm (builtin_default_css_text), tp/texi2any.pl, doc/texinfo.texi (HTML Customization Variables), NEWS: add SHOW_BUILTIN_CSS_RULES, to output the default builtin CSS rules, and exit right after.
- Index(es):