[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBoo
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/HTML.pm (in_preformatted), tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/ParserNonXS.pm, tp/Texinfo/Transformations.pm (menu_to_simple_menu): use $block_commands{$command} eq 'menu' instead of %menu_commands. Remove %menu_commands. |
|
Date: |
Sun, 25 Sep 2022 19:29:31 -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 ea646796e2 * tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm
(_convert), tp/Texinfo/Convert/HTML.pm (in_preformatted),
tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/Plaintext.pm,
tp/Texinfo/ParserNonXS.pm, tp/Texinfo/Transformations.pm (menu_to_simple_menu):
use $block_commands{$command} eq 'menu' instead of %menu_commands. Remove
%menu_commands.
ea646796e2 is described below
commit ea646796e2ce93f2774052a68135b8fd0248afde
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Sep 26 01:29:20 2022 +0200
* tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm (_convert),
tp/Texinfo/Convert/HTML.pm (in_preformatted),
tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/Plaintext.pm,
tp/Texinfo/ParserNonXS.pm, tp/Texinfo/Transformations.pm
(menu_to_simple_menu): use $block_commands{$command} eq 'menu'
instead of %menu_commands. Remove %menu_commands.
* tp/Texinfo/XS/parsetexi/close.c (close_current, close_commands),
tp/Texinfo/XS/parsetexi/command_data.txt,
tp/Texinfo/XS/parsetexi/commands.h,
tp/Texinfo/XS/parsetexi/context_stack.c
(in_preformatted_context_not_menu), tp/Texinfo/XS/parsetexi/end_line.c
(end_line_starting_block, end_line_misc_line),
tp/Texinfo/XS/parsetexi/handle_commands.c (handle_block_command):
use new BLOCK_menu command data instad of CF_menu flag.
* tp/texi2any.pl: show the name of the module failing to load if the
converter module require failed.
---
ChangeLog | 21 +++++++++++++++++++++
tp/Texinfo/Common.pm | 11 ++---------
tp/Texinfo/Convert/DocBook.pm | 5 ++---
tp/Texinfo/Convert/HTML.pm | 20 ++++++++------------
tp/Texinfo/Convert/LaTeX.pm | 6 +++---
tp/Texinfo/Convert/Plaintext.pm | 10 ++++++++--
tp/Texinfo/ParserNonXS.pm | 22 ++++++++++++----------
tp/Texinfo/Transformations.pm | 2 +-
tp/Texinfo/XS/parsetexi/close.c | 5 +++--
tp/Texinfo/XS/parsetexi/command_data.txt | 6 +++---
tp/Texinfo/XS/parsetexi/commands.h | 2 ++
tp/Texinfo/XS/parsetexi/context_stack.c | 2 +-
tp/Texinfo/XS/parsetexi/end_line.c | 6 +++---
tp/Texinfo/XS/parsetexi/handle_commands.c | 4 ++--
tp/texi2any.pl | 6 +++++-
15 files changed, 76 insertions(+), 52 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 158dd9bee3..e4756bacba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2022-09-25 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm (_convert),
+ tp/Texinfo/Convert/HTML.pm (in_preformatted),
+ tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/Plaintext.pm,
+ tp/Texinfo/ParserNonXS.pm, tp/Texinfo/Transformations.pm
+ (menu_to_simple_menu): use $block_commands{$command} eq 'menu'
+ instead of %menu_commands. Remove %menu_commands.
+
+ * tp/Texinfo/XS/parsetexi/close.c (close_current, close_commands),
+ tp/Texinfo/XS/parsetexi/command_data.txt,
+ tp/Texinfo/XS/parsetexi/commands.h,
+ tp/Texinfo/XS/parsetexi/context_stack.c
+ (in_preformatted_context_not_menu), tp/Texinfo/XS/parsetexi/end_line.c
+ (end_line_starting_block, end_line_misc_line),
+ tp/Texinfo/XS/parsetexi/handle_commands.c (handle_block_command):
+ use new BLOCK_menu command data instad of CF_menu flag.
+
+ * tp/texi2any.pl: show the name of the module failing to load if the
+ converter module require failed.
+
2022-09-25 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Common.pm (%block_commands, %block_commands_args_number),
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index a6162aec70..76e706fe72 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -922,9 +922,7 @@ $block_commands{'multitable'} = 'multitable';
$block_item_commands{'multitable'} = 1;
# block commands in which menu entry and menu comments appear
-our %menu_commands;
foreach my $menu_command ('menu', 'detailmenu', 'direntry') {
- $menu_commands{$menu_command} = 1;
$block_commands{$menu_command} = 'menu';
};
@@ -2961,8 +2959,8 @@ Commands delimiting a block with a closing C<@end>. The
value
is I<conditional> for C<@if> commands, I<def> for definition
commands like C<@deffn>, I<raw> for @-commands that have no expansion
of @-commands in their bodies (C<@macro>, C<@verbatim> and C<@ignore>),
-I<multitable> for C<@multitable> and other values for other block line
-commands.
+I<multitable> for C<@multitable>, I<menu> for C<@menu>, C<@detailmenu>
+and C<@direntry> and other values for other block line commands.
=item %block_commands_args_number
X<C<%block_commands_args_number>>
@@ -3071,11 +3069,6 @@ X<C<%math_commands>>
@-commands which contains math, like C<@math> or C<@displaymath>.
-=item %menu_commands
-X<C<%menu_commands>>
-
-@-commands with menu entries.
-
=item %misc_commands
X<C<%misc_commands>>
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 9713b58294..5914c79717 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -1552,9 +1552,8 @@ sub _convert($$;$)
# the context is here only for the command, so this is forgotten
# once all the raw internal text has been formatted
$self->{'document_context'}->[-1]->{'raw'} = 1;
- } elsif ($Texinfo::Common::block_commands{$element->{'cmdname'}} eq
'raw') {
- return '';
- } elsif ($Texinfo::Common::menu_commands{$element->{'cmdname'}}) {
+ } elsif ($Texinfo::Common::block_commands{$element->{'cmdname'}} eq 'raw'
+ or $Texinfo::Common::block_commands{$element->{'cmdname'}} eq
'menu') {
return '';
}
foreach my $format_element (@format_elements) {
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 0861a5f9b9..ef50c9f854 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -104,7 +104,6 @@ my %def_commands = %Texinfo::Common::def_commands;
my %ref_commands = %Texinfo::Common::ref_commands;
my %brace_commands = %Texinfo::Common::brace_commands;
my %block_commands = %Texinfo::Common::block_commands;
-my %menu_commands = %Texinfo::Common::menu_commands;
my %root_commands = %Texinfo::Common::root_commands;
my %preformatted_commands = %Texinfo::Common::preformatted_commands;
my %math_commands = %Texinfo::Common::math_commands;
@@ -137,8 +136,12 @@ foreach my $misc_context_command('tab', 'item', 'itemx',
'headitem') {
}
my %composition_context_commands = (%preformatted_commands, %root_commands,
- %menu_commands, %align_commands);
+ %align_commands);
$composition_context_commands{'float'} = 1;
+foreach my $block_command (keys(%block_commands)) {
+ $composition_context_commands{$block_command} = 1
+ if ($block_commands{$block_command} eq 'menu');
+}
# FIXME allow customization? (also in DocBook)
my %upper_case_commands = ( 'sc' => 1 );
@@ -473,7 +476,9 @@ sub in_preformatted($)
my $context =
$self->{'document_context'}->[-1]->{'composition_context'}->[-1];
if ($preformatted_commands{$context}
or $self->{'pre_class_types'}->{$context}
- or ($menu_commands{$context} and $self->_in_preformatted_in_menu())) {
+ or ($block_commands{$context}
+ and $block_commands{$context} eq 'menu'
+ and $self->_in_preformatted_in_menu())) {
return $context;
} else {
return undef;
@@ -2230,15 +2235,6 @@ foreach my $ignored_brace_commands ('caption',
'shortcaption',
$default_commands_conversion{$ignored_brace_commands} = undef;
}
-# commands that leads to advancing the paragraph number. This is mostly
-# used to determine the first line, in fact.
-my %advance_paragraph_count_commands;
-foreach my $command (keys(%block_commands)) {
- next if ($menu_commands{$command}
- or $block_commands{$command} eq 'raw');
- $advance_paragraph_count_commands{$command} = 1;
-}
-
foreach my $ignored_block_commands ('ignore', 'macro', 'rmacro', 'copying',
'documentdescription', 'titlepage', 'direntry') {
$default_commands_conversion{$ignored_block_commands} = undef;
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index f3a07b6aa9..3e0fb99f39 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -223,7 +223,6 @@ my %sectioning_heading_commands =
%Texinfo::Common::sectioning_heading_commands;
my %def_commands = %Texinfo::Common::def_commands;
my %ref_commands = %Texinfo::Common::ref_commands;
my %block_commands = %Texinfo::Common::block_commands;
-my %menu_commands = %Texinfo::Common::menu_commands;
my %root_commands = %Texinfo::Common::root_commands;
my %preformatted_commands = %Texinfo::Common::preformatted_commands;
my %math_commands = %Texinfo::Common::math_commands;
@@ -479,8 +478,9 @@ foreach my $ignored_block_commands ('ignore', 'macro',
'rmacro', 'copying',
$ignored_commands{$ignored_block_commands} = 1;
}
-foreach my $menu_command (keys(%menu_commands)) {
- $ignored_commands{$menu_command} = 1;
+foreach my $block_command (keys(%block_commands)) {
+ $ignored_commands{$block_command} = 1
+ if ($block_commands{$block_command} eq 'menu')
}
my @LaTeX_same_block_commands = (
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 2967fbbe13..681d7ae990 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -94,7 +94,6 @@ my %sectioning_heading_commands =
%Texinfo::Common::sectioning_heading_commands;
my %def_commands = %Texinfo::Common::def_commands;
my %ref_commands = %Texinfo::Common::ref_commands;
my %block_commands = %Texinfo::Common::block_commands;
-my %menu_commands = %Texinfo::Common::menu_commands;
my %root_commands = %Texinfo::Common::root_commands;
my %preformatted_commands = %Texinfo::Common::preformatted_commands;
my %math_commands = %Texinfo::Common::math_commands;
@@ -163,6 +162,13 @@ foreach my $def_command (keys(%def_commands)) {
# paragraph number incremented with paragraphs, center, listoffloats
# and block commands except: html and such, group, raggedright, menu*, float
+my %menu_commands;
+
+foreach my $block_command (keys(%block_commands)) {
+ $menu_commands{$block_command} = 1
+ if ($block_commands{$block_command} eq 'menu');
+}
+
my %default_preformatted_context_commands = (%preformatted_commands,
%format_raw_commands);
foreach my $preformatted_command ('verbatim', keys(%menu_commands)) {
@@ -228,7 +234,7 @@ my %flush_commands = (
# used to determine the first line, in fact.
my %advance_paragraph_count_commands;
foreach my $command (keys(%block_commands)) {
- next if ($menu_commands{$command}
+ next if ($menu_commands{$command}
or $block_commands{$command} eq 'raw');
$advance_paragraph_count_commands{$command} = 1;
}
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 9519d18b24..9a07ab65b3 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -271,7 +271,6 @@ my %close_paragraph_commands =
%Texinfo::Common::close_paragraph_commands;
my %def_map = %Texinfo::Common::def_map;
my %def_commands = %Texinfo::Common::def_commands;
my %def_aliases = %Texinfo::Common::def_aliases;
-my %menu_commands = %Texinfo::Common::menu_commands;
my %preformatted_commands = %Texinfo::Common::preformatted_commands;
my %math_commands = %Texinfo::Common::math_commands;
my %format_raw_commands = %Texinfo::Common::format_raw_commands;
@@ -1377,7 +1376,8 @@ sub _in_preformatted_context_not_menu($)
return 0;
}
my $command_name = $self->{'context_command_stack'}->[$i];
- if (defined($command_name) and not $menu_commands{$command_name}
+ if (defined($command_name)
+ and (not $block_commands{$command_name} eq 'menu')
and $context eq 'ct_preformatted') {
return 1;
}
@@ -1785,7 +1785,7 @@ sub _close_current($$$;$$)
}
}
if ($preformatted_commands{$current->{'cmdname'}}
- or $menu_commands{$current->{'cmdname'}}) {
+ or $block_commands{$current->{'cmdname'}} eq 'menu') {
$self->_pop_context(['ct_preformatted'], $source_info, $current);
} elsif ($format_raw_commands{$current->{'cmdname'}}) {
$self->_pop_context(['ct_rawpreformatted'], $source_info, $current);
@@ -1879,7 +1879,7 @@ sub _close_commands($$$;$$)
if ($closed_command and $current->{'cmdname'}
and $current->{'cmdname'} eq $closed_command) {
if ($preformatted_commands{$current->{'cmdname'}}
- or $menu_commands{$current->{'cmdname'}}) {
+ or $block_commands{$current->{'cmdname'}} eq 'menu') {
$self->_pop_context(['ct_preformatted'], $source_info, $current,
"for $closed_command");
} elsif ($format_raw_commands{$current->{'cmdname'}}) {
@@ -3189,7 +3189,8 @@ sub _end_line($$$)
'parent', $current };
$current = $current->{'contents'}->[-1];
}
- if ($current->{'cmdname'} and $menu_commands{$current->{'cmdname'}}) {
+ if ($current->{'cmdname'}
+ and $block_commands{$current->{'cmdname'}} eq 'menu') {
push @{$current->{'contents'}}, {'type' => 'menu_comment',
'parent' => $current,
'contents' => [] };
@@ -3456,9 +3457,9 @@ sub _end_line($$$)
push @{$closed_command->{'contents'}}, $end;
# closing a menu command, but still in a menu. Open a menu_comment
- if ($menu_commands{$closed_command->{'cmdname'}}
+ if ($block_commands{$closed_command->{'cmdname'}} eq 'menu'
and defined($self->_top_context_command())
- and $menu_commands{$self->_top_context_command()}) {
+ and $block_commands{$self->_top_context_command()} eq 'menu') {
print STDERR "CLOSE MENU but still in menu context\n"
if ($self->{'DEBUG'});
push @{$current->{'contents'}}, {'type' => 'menu_comment',
@@ -4350,7 +4351,8 @@ sub _process_remaining_on_line($$$$)
if ($current->{'type'} ne 'preformatted'
or $current->{'parent'}->{'type'} ne 'menu_entry_description'
or $current->{'parent'}->{'parent'}->{'type'} ne 'menu_entry'
- or
!$menu_commands{$current->{'parent'}->{'parent'}->{'parent'}->{'cmdname'}}) {
+ or (not
$block_commands{$current->{'parent'}->{'parent'}->{'parent'}
+ ->{'cmdname'}} eq 'menu')) {
$self->_bug_message("Not in menu comment nor description",
$source_info, $current);
}
@@ -4986,7 +4988,7 @@ sub _process_remaining_on_line($$$$)
# a menu command closes a menu_comment, but not the other
# block commands. This won't catch menu commands buried in
# other formats (that are incorrect anyway).
- if ($menu_commands{$command} and $current->{'type'}
+ if ($block_commands{$command} eq 'menu' and $current->{'type'}
and ($current->{'type'} eq 'menu_comment'
or $current->{'type'} eq 'menu_entry_description')) {
@@ -5048,7 +5050,7 @@ sub _process_remaining_on_line($$$$)
}
push @{$self->{'regions_stack'}}, $block;
}
- if ($menu_commands{$command}) {
+ if ($block_commands{$command} eq 'menu') {
$self->_push_context('ct_preformatted', $command);
push @{$self->{'info'}->{'dircategory_direntry'}}, $block
if ($command eq 'direntry');
diff --git a/tp/Texinfo/Transformations.pm b/tp/Texinfo/Transformations.pm
index 427868f8ee..a426c3873f 100644
--- a/tp/Texinfo/Transformations.pm
+++ b/tp/Texinfo/Transformations.pm
@@ -753,7 +753,7 @@ sub menu_to_simple_menu($)
}
}
} elsif ($content->{'cmdname'}
- and $Texinfo::Common::menu_commands{$content->{'cmdname'}}) {
+ and $Texinfo::Common::block_commands{$content->{'cmdname'}} eq 'menu') {
menu_to_simple_menu($content);
push @contents, $content;
} else {
diff --git a/tp/Texinfo/XS/parsetexi/close.c b/tp/Texinfo/XS/parsetexi/close.c
index a20d2249ba..23de8b30db 100644
--- a/tp/Texinfo/XS/parsetexi/close.c
+++ b/tp/Texinfo/XS/parsetexi/close.c
@@ -288,7 +288,8 @@ close_current (ELEMENT *current,
(parent));
}
}
- if (command_data(cmd).flags & (CF_preformatted | CF_menu))
+ if (command_data(cmd).flags & CF_preformatted
+ || command_data(cmd).data == BLOCK_menu)
{
if (pop_context () != ct_preformatted)
fatal ("preformatted context expected");
@@ -401,7 +402,7 @@ close_commands (ELEMENT *current, enum command_id
closed_command,
if (closed_command && current->cmd == closed_command)
{
if (command_data(current->cmd).flags & CF_preformatted
- || command_data(current->cmd).flags & CF_menu)
+ || command_data(current->cmd).data == BLOCK_menu)
{
if (pop_context () != ct_preformatted)
fatal ("preformatted context expected");
diff --git a/tp/Texinfo/XS/parsetexi/command_data.txt
b/tp/Texinfo/XS/parsetexi/command_data.txt
index 7f7700ec14..4719eb15ff 100644
--- a/tp/Texinfo/XS/parsetexi/command_data.txt
+++ b/tp/Texinfo/XS/parsetexi/command_data.txt
@@ -397,9 +397,9 @@ deftypemethodx line,def,def_alias
LINE_line
multitable block,blockitem BLOCK_multitable
# menu commands
-menu block,menu
-detailmenu block,menu,global
-direntry block,menu
+menu block BLOCK_menu
+detailmenu block,global BLOCK_menu
+direntry block BLOCK_menu
# align commands
raggedright block
diff --git a/tp/Texinfo/XS/parsetexi/commands.h
b/tp/Texinfo/XS/parsetexi/commands.h
index c4c343b5b5..7a74ae8bc8 100644
--- a/tp/Texinfo/XS/parsetexi/commands.h
+++ b/tp/Texinfo/XS/parsetexi/commands.h
@@ -68,6 +68,7 @@ void wipe_user_commands (void);
#define CF_global 0x00010000
#define CF_def 0x00020000
#define CF_def_alias 0x00040000
+/* CF_menu is not used */
#define CF_menu 0x00080000
#define CF_align 0x00100000
#define CF_other 0x00200000
@@ -116,6 +117,7 @@ void wipe_user_commands (void);
#define BLOCK_blockitem -6
#define BLOCK_quotation -7
#define BLOCK_float -8
+#define BLOCK_menu -9
/* Types of brace command (CF_brace). */
#define BRACE_arguments 1
diff --git a/tp/Texinfo/XS/parsetexi/context_stack.c
b/tp/Texinfo/XS/parsetexi/context_stack.c
index 1edb101037..9006d6af56 100644
--- a/tp/Texinfo/XS/parsetexi/context_stack.c
+++ b/tp/Texinfo/XS/parsetexi/context_stack.c
@@ -157,7 +157,7 @@ in_preformatted_context_not_menu()
if (ct != ct_line && ct != ct_preformatted)
return 0;
cmd = commands_stack[i];
- if (! (command_data(cmd).flags & CF_menu) && ct == ct_preformatted)
+ if (command_data(cmd).data != BLOCK_menu && ct == ct_preformatted)
return 1;
}
return 0;
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c
b/tp/Texinfo/XS/parsetexi/end_line.c
index fbf181783b..7ffb6ceb08 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1269,7 +1269,7 @@ end_line_starting_block (ELEMENT *current)
}
} /* CF_blockitem */
- if (command_flags(current) & CF_menu)
+ if (command_data(current->cmd).data == BLOCK_menu)
{
/* Start reading a menu. Processing will continue in
handle_menu in menus.c. */
@@ -1811,8 +1811,8 @@ end_line_misc_line (ELEMENT *current)
add_to_element_contents (closed_command, end_elt);
- if (command_flags(closed_command) & CF_menu
- && command_data(current_context_command()).flags & CF_menu)
+ if (command_data(closed_command->cmd).data == BLOCK_menu
+ && command_data(current_context_command()).data ==
BLOCK_menu)
{
ELEMENT *e;
debug ("CLOSE menu but still in menu context");
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index 83944e7e5e..65e9440b6f 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -842,7 +842,7 @@ handle_block_command (ELEMENT *current, char **line_inout,
{
ELEMENT *block = 0;
ELEMENT *bla; /* block line arg element */
- if (flags & CF_menu
+ if (command_data(cmd).data == BLOCK_menu
&& (current->type == ET_menu_comment
|| current->type == ET_menu_entry_description))
{
@@ -907,7 +907,7 @@ handle_block_command (ELEMENT *current, char **line_inout,
push_region (block);
}
- if (command_data(cmd).flags & CF_menu)
+ if (command_data(cmd).data == BLOCK_menu)
{
push_context (ct_preformatted, cmd);
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 117b11cbde..f70342c3f7 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -1231,7 +1231,11 @@ my %converter_defaults;
if (defined($formats_table{$converted_format}->{'module'})) {
# Speed up initialization by only loading the module we need.
my $module = $formats_table{$converted_format}->{'module'};
- eval "require $module" or die "$@";
+ eval "require $module";
+ my $error = $@;
+ if ($error ne '') {
+ die sprintf(__("error loading %s: %s"), $module, $error);
+ };
eval "$module->import;";
eval '$formats_table{$converted_format}->{\'converter\'} = sub{'.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/HTML.pm (in_preformatted), tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/ParserNonXS.pm, tp/Texinfo/Transformations.pm (menu_to_simple_menu): use $block_commands{$command} eq 'menu' instead of %menu_commands. Remove %menu_commands.,
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/Common.pm (%block_commands, %block_commands_args_number), tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/command_data.txt, tp/Texinfo/XS/parsetexi/commands.h, tp/Texinfo/XS/parsetexi/handle_commands.c (handle_block_command): separate type of block command from number of arguments for perl too. Set variadic to be a flag in the XS parser.
- Next by Date:
branch master updated: * TODO: user-defined macros as argument to @table and @itemize
- Previous by thread:
branch master updated: * tp/Texinfo/Common.pm (%block_commands, %block_commands_args_number), tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/command_data.txt, tp/Texinfo/XS/parsetexi/commands.h, tp/Texinfo/XS/parsetexi/handle_commands.c (handle_block_command): separate type of block command from number of arguments for perl too. Set variadic to be a flag in the XS parser.
- Next by thread:
branch master updated: * TODO: user-defined macros as argument to @table and @itemize
- Index(es):