[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Common.pm (@variable_other_settables
From: |
Patrice Dumas |
Subject: |
branch master updated: * tp/Texinfo/Common.pm (@variable_other_settables), tp/Texinfo/Convert/IXIN.pm (output_ixin), tp/Texinfo/Convert/IXINSXML.pm (%defaults): remove completely 'GLOBAL_COMMANDS'. |
Date: |
Wed, 01 Sep 2021 10:26:38 -0400 |
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 c788150 * tp/Texinfo/Common.pm (@variable_other_settables),
tp/Texinfo/Convert/IXIN.pm (output_ixin), tp/Texinfo/Convert/IXINSXML.pm
(%defaults): remove completely 'GLOBAL_COMMANDS'.
c788150 is described below
commit c78815099abdaa19acd798678c5bbb89ba94766d
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Sep 1 16:26:29 2021 +0200
* tp/Texinfo/Common.pm (@variable_other_settables),
tp/Texinfo/Convert/IXIN.pm (output_ixin),
tp/Texinfo/Convert/IXINSXML.pm (%defaults):
remove completely 'GLOBAL_COMMANDS'.
---
ChangeLog | 7 +++++++
tp/Texinfo/Common.pm | 1 -
tp/Texinfo/Convert/IXIN.pm | 10 ++++++----
tp/Texinfo/Convert/IXINSXML.pm | 1 -
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b3998af..478406d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2021-09-01 Patrice Dumas <pertusus@free.fr>
+ * tp/Texinfo/Common.pm (@variable_other_settables),
+ tp/Texinfo/Convert/IXIN.pm (output_ixin),
+ tp/Texinfo/Convert/IXINSXML.pm (%defaults):
+ remove completely 'GLOBAL_COMMANDS'.
+
+2021-09-01 Patrice Dumas <pertusus@free.fr>
+
* tp/Texinfo/Convert/HTML.pm (converter_initialize): do not
allow customization of 'commands_args'. It is not already used
and it is better to avoid making such changes which amounts
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index e941d85..974d717 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -321,7 +321,6 @@ my @variable_other_settables = (
'MISC_BUTTONS', 'CHAPTER_BUTTONS', 'BUTTONS_NAME',
'BUTTONS_EXAMPLE', 'SPECIAL_ELEMENTS_NAME', 'SPECIAL_ELEMENTS_CLASS',
'ACTIVE_ICONS', 'PASSIVE_ICONS',
- 'GLOBAL_COMMANDS',
# set from command line
'CSS_FILES', 'CSS_REFS', 'EXPANDED_FORMATS', 'INCLUDE_DIRECTORIES',
);
diff --git a/tp/Texinfo/Convert/IXIN.pm b/tp/Texinfo/Convert/IXIN.pm
index cc5a453..2a3d654 100644
--- a/tp/Texinfo/Convert/IXIN.pm
+++ b/tp/Texinfo/Convert/IXIN.pm
@@ -823,8 +823,10 @@ sub output_ixin($$)
my $blobs = '';
my $blobs_index = '';
my $blob_nr = 0;
- if ($self->{'extra'}->{'image'}) {
- foreach my $command (@{$self->{'extra'}->{'image'}}) {
+ my $collected_image_commands =
Texinfo::Common::collect_commands_list_in_tree(
+ $root,
['image']);
+ if (scalar(@{$collected_image_commands})) {
+ foreach my $command (@{$collected_image_commands}) {
my @extension;
my $basefile;
my $extension;
@@ -851,8 +853,8 @@ sub output_ixin($$)
$blob_nr++;
if ($extension eq 'txt') {
binmode($filehandle, ":encoding("
- .$self->{'parser_info'}->{'input_perl_encoding'}
- if (defined($self->{'parser_info'}->{'input_perl_encoding'});
+ .$self->{'parser_info'}->{'input_perl_encoding'})
+ if (defined($self->{'parser_info'}->{'input_perl_encoding'}));
}
my $file_content;
if (-z $file) {
diff --git a/tp/Texinfo/Convert/IXINSXML.pm b/tp/Texinfo/Convert/IXINSXML.pm
index f6844a4..a518df0 100644
--- a/tp/Texinfo/Convert/IXINSXML.pm
+++ b/tp/Texinfo/Convert/IXINSXML.pm
@@ -62,7 +62,6 @@ my %defaults = (
'SPLIT' => 0,
'documentlanguage' => 'en',
'USE_NODES' => 1,
- 'GLOBAL_COMMANDS' => ['image'],
);
sub converter_defaults($$)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Common.pm (@variable_other_settables), tp/Texinfo/Convert/IXIN.pm (output_ixin), tp/Texinfo/Convert/IXINSXML.pm (%defaults): remove completely 'GLOBAL_COMMANDS'.,
Patrice Dumas <=