[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm Texinfo/Convert/HT...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm Texinfo/Convert/HT... |
|
Date: |
Mon, 31 Oct 2011 18:04:33 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/10/31 18:04:32
Modified files:
tp/Texinfo : Parser.pm
tp/Texinfo/Convert: HTML.pm NodeNameNormalization.pm XML.pm
tp/init : book.pm mini_ker_t2h.init
tp/t/init : misc_file_collision.init t2h_singular.init
Log message:
More FIXME handled.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.328&r2=1.329
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.195&r2=1.196
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/NodeNameNormalization.pm?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/init/book.pm?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/init/mini_ker_t2h.init?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/init/misc_file_collision.init?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/init/t2h_singular.init?cvsroot=texinfo&r1=1.2&r2=1.3
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -b -r1.328 -r1.329
--- Texinfo/Parser.pm 30 Oct 2011 23:03:32 -0000 1.328
+++ Texinfo/Parser.pm 31 Oct 2011 18:04:26 -0000 1.329
@@ -429,8 +429,8 @@
my %full_text_commands;
foreach my $brace_command (keys (%brace_commands)) {
if ($brace_commands{$brace_command} == 1
- and (!$simple_text_commands{$brace_command}
- and !$context_brace_commands{$brace_command})) {
+ and !$simple_text_commands{$brace_command}
+ and !$context_brace_commands{$brace_command}) {
$full_text_commands{$brace_command} = 1;
}
}
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -b -r1.195 -r1.196
--- Texinfo/Convert/HTML.pm 31 Oct 2011 14:59:01 -0000 1.195
+++ Texinfo/Convert/HTML.pm 31 Oct 2011 18:04:28 -0000 1.196
@@ -278,16 +278,12 @@
return $target->{'filename'};
}
my ($element, $root_command) = $self->_get_element($command, 1);
- #if (defined($command->{'cmdname'}) and $command->{'cmdname'} eq
'footnote') {
- # print STDERR "footnote $command: page $page\n";
- #}
- if (defined($element)) {
- $target->{'element'} = $element;
- }
+
if (defined($root_command)) {
$target->{'root_command'} = $root_command;
}
if (defined($element)) {
+ $target->{'element'} = $element;
$target->{'filename'} = $element->{'filename'};
return $element->{'filename'};
}
@@ -578,6 +574,21 @@
return $self->{'global_target_elements'}->{$type};
}
+# it is considered 'top' only if element corresponds to @top or
+# element is a node
+sub element_is_top($$)
+{
+ my $self = shift;
+ my $element = shift;
+ return ($self->{'global_target_elements'}->{'Top'}
+ and $self->{'global_target_elements'}->{'Top'} eq $element
+ and $element->{'extra'}
+ and (($element->{'extra'}->{'section'}
+ and $element->{'extra'}->{'section'}->{'cmdname'} eq 'top')
+ or ($element->{'extra'}->{'element_command'}
+ and $element->{'extra'}->{'element_command'}->{'cmdname'} eq
'node')));
+}
+
sub default_formatting_function($$)
{
my $self = shift;
@@ -2067,21 +2078,6 @@
return $result;
}
-# it is considered 'top' only if element corresponds to @top or
-# element is a node
-sub _element_is_top($$)
-{
- my $self = shift;
- my $element = shift;
- return ($self->{'global_target_elements'}->{'Top'}
- and $self->{'global_target_elements'}->{'Top'} eq $element
- and $element->{'extra'}
- and (($element->{'extra'}->{'section'}
- and $element->{'extra'}->{'section'}->{'cmdname'} eq 'top')
- or ($element->{'extra'}->{'element_command'}
- and $element->{'extra'}->{'element_command'}->{'cmdname'} eq
'node')));
-}
-
sub _default_element_header($$$$)
{
my $self = shift;
@@ -2101,11 +2097,11 @@
and $element->{'contents'}->[1] eq $command))
# and there is more than one element
and ($element->{'element_next'} or $element->{'element_prev'})) {
- my $is_top = $self->_element_is_top($element);
+ my $is_top = $self->element_is_top($element);
my $first_in_page = (defined($element->{'filename'})
and $self->{'counter_in_file'}->{$element->{'filename'}} == 1);
my $previous_is_top = ($element->{'element_prev'}
- and $self->_element_is_top($element->{'element_prev'}));
+ and $self->element_is_top($element->{'element_prev'}));
print STDERR "Header ($previous_is_top, $is_top, $first_in_page): "
.Texinfo::Structuring::_print_root_command_texi($command)."\n"
@@ -4035,9 +4031,9 @@
my $content = shift;
my $result = '';
- my $is_top = $self->_element_is_top($element);
+ my $is_top = $self->element_is_top($element);
my $next_is_top = ($element->{'element_next'}
- and $self->_element_is_top($element->{'element_next'}));
+ and $self->element_is_top($element->{'element_next'}));
my $next_is_special = (defined($element->{'element_next'})
and $element->{'element_next'}->{'extra'}->{'special_element'});
# no 'parent' defined happens if there are no pages, and there are elements
@@ -4209,7 +4205,7 @@
= $default_types_conversion{$type};
}
}
- # FIXME API with a function call?
+ # FIXME API with a function call? Used in cvs.init.
foreach my $type (keys(%default_code_types)) {
$self->{'code_types'}->{$type} = $default_code_types{$type};
}
@@ -4538,13 +4534,12 @@
if (defined($normalized)) {
$target = _normalized_to_id($normalized);
} else {
- # FIXME Top or configuration variable?
$target = '';
}
if (!$node_info->{'manual_content'}) {
$id = $target;
}
- # FIXME something special for Top node ?
+ # to find out the Top node, one could check $node_info->{'normalized'}
if (defined($Texinfo::Config::node_target_name)) {
($target, $id) = &$Texinfo::Config::node_target_name($node_info,
$target, $id);
@@ -4608,8 +4603,8 @@
my $target_shortcontents;
my $id_shortcontents;
if ($Texinfo::Common::sectioning_commands{$command->{'cmdname'}}) {
- # FIXME choose one (in comments, use target, other use id)
- #my $target_contents = 'toc-'.$target;
+ # NOTE id is used as base for both id and target. In comment an example
+ # showing how target could have been used.
#my $target_base_contents;
#if ($command->{'extra'}->{'associated_node'}
# and $self->get_conf('USE_NODE_TARGET') {
@@ -4617,6 +4612,8 @@
#} else {
# $target_base_contents = $target_base;
#}
+ # $target_content =~ s/^g_t//;
+ #$target_contents = 'toc-'.$target_base_contents;
if ($id ne '') {
my $id_base_contents = $id;
$id_base_contents =~ s/^g_t//;
@@ -4632,15 +4629,8 @@
}
$id_contents = $target_contents;
- # FIXME choose one (in comments, use target, other use id)
- #my $target_shortcontents = 'stoc-'.$target;
- #my $target_base_shortcontents;
- #if ($command->{'extra'}->{'associated_node'}
- # and $self->get_conf('USE_NODE_TARGET') {
- # $target_base_shortcontents = $target;
- #} else {
- # $target_base_shortcontents = $target_base;
- #}
+ # NOTE id is used as a base for id and target. target could also
+ # have been used, see above for an example.
$target_shortcontents = 'stoc-'.$id_base_contents;
my $target_base_shortcontents = $target_base;
$target_base_shortcontents =~ s/^g_t//;
@@ -4673,8 +4663,6 @@
'id' => $id,
'section_filename' => $filename,
};
- # FIXME this should really be use carefully, since the mapping
- # is not what one expects
$self->{'ids'}->{$id} = $command;
if (defined($id_contents)) {
$self->{'targets'}->{$command}->{'contents_id'} = $id_contents;
@@ -4694,11 +4682,11 @@
return $self->{'targets'}->{$command};
}
-# FIXME also convert to html, to use name in cross-refs or do it on demand?
# This set 2 unrelated things.
# * The targets and id of sectioning elements
# * the target, id and normalized filename of 'labels', ie everything that
# may be the target of a ref, like @node, @float, @anchor...
+# conversion to HTML is done on-demand, upon call to command_text.
sub _set_root_commands_targets_node_files($$)
{
my $self = shift;
@@ -4731,7 +4719,7 @@
if ($elements) {
foreach my $element (@$elements) {
foreach my $root_command(@{$element->{'contents'}}) {
- # FIXME this happens for type 'text_root' which precedes the
+ # this happens for type 'text_root' which precedes the
# root commands. The target may also already be set for top node.
next if (!defined($root_command->{'cmdname'})
or $self->{'targets'}->{$root_command});
@@ -4762,7 +4750,9 @@
sub _get_element($$;$);
-# FIXME also find contents/shortcontents/summarycontents page
+# If $find_container is set, the element that holds the command is found,
+# otherwise the element that holds the command content is found. This is
+# mostly relevant for footnote only.
sub _get_element($$;$)
{
my $self = shift;
@@ -4795,7 +4785,6 @@
and $self->get_conf('USE_TITLEPAGE_FOR_TITLE')
and $self->get_conf('SHOW_TITLE')
and $self->{'elements'}->[0]) {
- # FIXME element and root_command?
return ($self->{'elements'}->[0],
$self->{'elements'}->[0]->{'extra'}->{'element_command'});
}
@@ -4805,14 +4794,9 @@
} elsif ($current->{'cmdname'} eq 'footnote'
and $self->{'special_elements_types'}->{'Footnotes'}
and $find_container) {
- # FIXME root_command?
+ # in that case there is no root_command
$element = $self->{'special_elements_types'}->{'Footnotes'};
return ($element);
- # } elsif (($current->{'cmdname'} eq 'contents'
- # or $current->{'cmdname'} eq 'shortcontents'
- # or $current->{'cmdname'} eq 'summarycontents')
- # and !$self->get_conf('INLINE_CONTENTS')) {
- # setcontentsaftertitlepage
}
}
if ($current->{'parent'}) {
@@ -4883,7 +4867,6 @@
die "BUG: No element for top node" if (!defined($node_top));
$self->_set_element_file($node_top_element, $top_node_filename);
}
- # FIXME add a number for each page?
my $file_nr = 0;
my $previous_page;
foreach my $element(@$elements) {
@@ -4898,14 +4881,8 @@
foreach my $root_command (@{$file_element->{'contents'}}) {
if ($root_command->{'cmdname'}
and $root_command->{'cmdname'} eq 'node') {
- # Happens for bogus nodes, as bogus nodes are not in
- # %{$self->{'labels'}}
- #if (!defined($self->{'targets'}->{$root_command})
- # or
!defined($self->{'targets'}->{$root_command}->{'node_filename'})) {
- # print STDERR "BUG: no target/filename($root_command):
".Texinfo::Structuring::_print_root_command_texi($root_command)."\n";
- #}
my $node_filename;
- # double node are not normalized
+ # double node are not normalized, they are handled here
if (!defined($root_command->{'extra'}->{'normalized'})
or
!defined($self->{'labels'}->{$root_command->{'extra'}->{'normalized'}})) {
$node_filename = 'unknown_node';
@@ -4915,7 +4892,7 @@
} else {
if (!defined($self->{'targets'}->{$root_command})
or
!defined($self->{'targets'}->{$root_command}->{'node_filename'})) {
- # Should normally be a double node. Use the equivalent node.
+ # Could have been a double node, thus use equivalent node.
# However since double nodes are not normalized, in fact it
# never happens.
$root_command
@@ -4930,11 +4907,7 @@
}
if (!defined($file_element->{'filename'})) {
# use section to do the file name if there is no node
- my $command =$self->element_command($file_element);;
- #foreach my $command (@{$element->{'contents'}}) {
- # $command = $self->element_command($element);
- # last if $command;
- #}
+ my $command = $self->element_command($file_element);;
if ($command) {
if ($command->{'cmdname'} eq 'top' and !$node_top
and defined($top_node_filename)) {
@@ -4969,7 +4942,8 @@
foreach my $element (@$elements) {
if (defined($Texinfo::Config::element_file_name)) {
- # FIXME pass the information that it is associated with @top or @node
Top?
+ # NOTE the information that it is associated with @top or @node Top
+ # may be determined with $self->element_is_top($element);
my $filename = &$Texinfo::Config::element_file_name($self, $element,
$element->{'filename'});
$self->_set_element_file($element, $filename) if (defined($filename));
@@ -5004,7 +4978,9 @@
my $elements;
# do that now to have it available for formatting
- # FIXME set language and documentencoding/encoding_name? If not done already.
+ # NOTE this calls Convert::Converter::_informative_command on all the
+ # @informative_global commands.
+ # Thus sets among others language and encodings.
$self->_set_global_multiple_commands(-1);
$self->_translate_names();
@@ -5045,10 +5021,9 @@
my $elements = shift;
my %do_special;
- # FIXME do that here or let it to the user?
+ # FIXME let the user decide how @*contents are treated?
if ($self->{'structuring'} and $self->{'structuring'}->{'sectioning_root'}
and scalar(@{$self->{'structuring'}->{'sections_list'}}) > 1) {
-
foreach my $cmdname ('contents', 'shortcontents') {
my $type = $contents_command_element_name{$cmdname};
if ($self->get_conf($cmdname)) {
@@ -5117,7 +5092,6 @@
$self->_set_element_file($element, $filename);
print STDERR "NEW page for $type ($filename)\n" if
($self->get_conf('DEBUG'));
}
- # FIXME add element, page... (see command_filename)?
$self->{'targets'}->{$element} = {'id' => $id,
'target' => $target,
'misc_filename' => $filename,
@@ -5448,7 +5422,6 @@
$target_split = $default_target_split;
}
- # FIXME use $external_node->{'extra'}->{'node_content'}?
if ($target eq '') {
if ($target_split) {
if (defined($self->get_conf('TOP_NODE_FILE_TARGET'))) {
@@ -5542,7 +5515,6 @@
if ($element_target->{'extra'}->{'special_element'}) {
$command = $element_target;
} else {
- # FIXME be able to chose node over sectioning or the other way around?
$command = $element_target->{'extra'}->{'element_command'};
}
if ($type eq 'href') {
@@ -5568,7 +5540,6 @@
if (exists($target->{$type})) {
return $target->{$type};
} elsif ($type eq 'id' or $type eq 'target') {
- # FIXME
return undef;
} elsif ($command) {
return $self->command_text($command, $type);
@@ -5855,10 +5826,6 @@
my $links = $self->_get_links ($filename, $element);
- # FIXME there is one empty line less than in texi2html. Seems that in
- # texi2html the following empty lines are stripped. Not exactly sure
- # how, but it seems that some blank lines are removed before first element.
- # Maybe misc commands are also stripped before.
my $result = "$doctype
<html>
$copying_comment<!-- Created by $program_and_version, $program_homepage -->
@@ -6368,9 +6335,7 @@
or $command->{'extra'}->{'missing_argument'}));
print STDERR "Using $fulltitle_command as title\n"
if ($self->get_conf('DEBUG'));
- # FIXME remove the virtual _fulltitle type?
- $fulltitle = {'contents' => $command->{'extra'}->{'misc_content'},
- 'type' => '_fulltitle'};
+ $fulltitle = {'contents' => $command->{'extra'}->{'misc_content'}};
last;
}
}
@@ -6529,6 +6494,7 @@
$self->run_stage_handlers('finish');
+ # do node redirection pages
$self->{'current_filename'} = undef;
if ($self->get_conf('NODE_FILES')
and $self->{'labels'} and $self->get_conf('OUTFILE') ne '') {
@@ -6539,7 +6505,9 @@
# @titlepage, and @titlepage is not used.
my $filename = $self->command_filename($node);
my $node_filename;
- # FIXME texi2html always use 'node_filename' even for Top.
+ # NOTE 'node_filename' is not used for Top, so the other manual
+ # must use the same convention to get it right. We avoid doing
+ # also 'node_filename' to avoid unneeded redirection files.
if ($node->{'extra'}->{'normalized'} eq 'Top'
and defined($self->get_conf('TOP_NODE_FILE_TARGET'))) {
my $extension = '';
@@ -6551,9 +6519,7 @@
} else {
$node_filename = $target->{'node_filename'};
}
- #if (!defined($filename)) {
- # print STDERR "No filename
".Texinfo::Parser::_print_command_args_texi($node);
- #}
+
if (defined($filename) and $node_filename ne $filename) {
my $redirection_page
= &{$self->{'format_node_redirection_page'}}($self, $node);
@@ -6577,9 +6543,16 @@
}
if ($self->{'renamed_nodes'}
and $self->{'labels'} and $self->get_conf('OUTFILE') ne '') {
+ # do a fresh parser, to avoid, for example adding new labels if renamed
+ # nodes incorrectly define anchors...
+ my $parser_for_renamed_nodes;
+ if ($self->{'parser'}) {
+ $parser_for_renamed_nodes = $self->{'parser'}->parser();
+ }
foreach my $old_node_name (keys(%{$self->{'renamed_nodes'}})) {
my $parsed_old_node = $self->_parse_node_and_warn_external(
- $old_node_name, $self->{'renamed_nodes_lines'}->{$old_node_name},
+ $old_node_name, $parser_for_renamed_nodes,
+ $self->{'renamed_nodes_lines'}->{$old_node_name},
$self->{'renamed_nodes_file'});
if ($parsed_old_node) {
if ($self->label_command($parsed_old_node->{'normalized'})) {
@@ -6594,7 +6567,8 @@
}
my $new_node_name = $self->{'renamed_nodes'}->{$old_node_name};
my $parsed_new_node = $self->_parse_node_and_warn_external(
- $new_node_name, $self->{'renamed_nodes_lines'}->{$new_node_name},
+ $new_node_name, $parser_for_renamed_nodes,
+ $self->{'renamed_nodes_lines'}->{$new_node_name},
$self->{'renamed_nodes_file'});
if ($parsed_new_node) {
if (!$self->label_command($parsed_new_node->{'normalized'})) {
@@ -6631,22 +6605,28 @@
}
}
-sub _parse_node_and_warn_external($$$$)
+sub _parse_node_and_warn_external($$$$$)
{
my $self = shift;
my $node_texi = shift;
+ my $parser = shift;
my $line_number = shift;
my $file = shift;
- # FIXME nothing to check that there is an invalid nesting. Having a
- # @-command, like @anchor{} inside would incorrectly lead to the name being
- # entered as a node. Maybe the best thing to do would be to consider
+ # NOTE nothing to check that there is an invalid nesting. Indeed, there
+ # is no information given to the parser stating that we are in a label
+ # command.
+ # A possibility would be to consider
# 'root_line' type as a $simple_text_command, or, to avoid spurious
# messages, $full_text_command. This would imply really using
- # the gdt 4th argument to pass 'paragraph' (rename that?) when in a
+ # the gdt 4th argument to pass 'translated_paragraph' when in a
# less constrained environment, for instance @center in @quotation for
# @author
- my $node_tree = Texinfo::Parser::parse_texi_line($self->{'parser'},
+ #
+ # it is unlikely, however that invalid nesting does much harm, since
+ # the tree is mostly used to be normalized and this converter should
+ # be rather foolproof.
+ my $node_tree = Texinfo::Parser::parse_texi_line($parser,
$node_texi, $line_number, $file);
if ($node_tree) {
my $node_normalized_result = Texinfo::Parser::_parse_node_manual(
@@ -7030,7 +7010,7 @@
return $result;
# no type, no cmdname, but contents.
} elsif ($root->{'contents'}) {
- # FIXME document situations where that happens? Use virtual types?
+ # this happens inside accents, for section/node names, for @images.
my $content_formatted = '';
my $i = 0;
foreach my $content (@{$root->{'contents'}}) {
Index: Texinfo/Convert/NodeNameNormalization.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/NodeNameNormalization.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- Texinfo/Convert/NodeNameNormalization.pm 1 Oct 2011 08:10:22 -0000
1.16
+++ Texinfo/Convert/NodeNameNormalization.pm 31 Oct 2011 18:04:29 -0000
1.17
@@ -87,7 +87,7 @@
}
-sub normalize_node ($)
+sub normalize_node($)
{
my $root = shift;
my $result = convert($root);
@@ -97,7 +97,7 @@
return $result;
}
-sub transliterate_texinfo ($;$)
+sub transliterate_texinfo($;$)
{
my $root = shift;
my $no_unidecode = shift;
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- Texinfo/Convert/XML.pm 30 Oct 2011 23:03:32 -0000 1.49
+++ Texinfo/Convert/XML.pm 31 Oct 2011 18:04:30 -0000 1.50
@@ -449,7 +449,6 @@
$result .= "<itemformat
command=\"$format_item_command\"${attribute}>";
}
$result .= $self->_index_entry($root);
- # FIXME
my $in_code;
$in_code = 1
if ($format_item_command
@@ -915,7 +914,6 @@
}
if ($root->{'cmdname'}
and exists($Texinfo::Common::block_commands{$root->{'cmdname'}})) {
- #$result .= "</$root->{'cmdname'}>\n";
# FIXME The end of line and comment is taken into account
# but 'space_at_end' is ignored.
my $end_command = $root->{'extra'}->{'end_command'};
Index: init/book.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/init/book.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- init/book.pm 16 Oct 2011 22:37:09 -0000 1.5
+++ init/book.pm 31 Oct 2011 18:04:30 -0000 1.6
@@ -263,7 +263,7 @@
my $new_file_name;
my $command = $element->{'extra'}->{'section'};
return undef unless ($command);
- if ($converter->_element_is_top($element)) {
+ if ($converter->element_is_top($element)) {
$new_file_name = "${prefix}_top.html";
} elsif (defined($command->{'number'}) and ($command->{'number'} ne '')) {
my $number = $command->{'number'};
Index: init/mini_ker_t2h.init
===================================================================
RCS file: /sources/texinfo/texinfo/tp/init/mini_ker_t2h.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- init/mini_ker_t2h.init 16 Oct 2011 22:37:10 -0000 1.1
+++ init/mini_ker_t2h.init 31 Oct 2011 18:04:31 -0000 1.2
@@ -7,7 +7,7 @@
my $command = shift;
my $content = shift;
- if ($self->_element_is_top($command)) {
+ if ($self->element_is_top($command)) {
my $result = '';
$result .= &{$self->{'format_navigation_header'}}($self,
$self->get_conf('MISC_BUTTONS'), $cmdname, $command)
Index: t/init/misc_file_collision.init
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/init/misc_file_collision.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/init/misc_file_collision.init 6 Oct 2011 22:52:00 -0000 1.1
+++ t/init/misc_file_collision.init 31 Oct 2011 18:04:31 -0000 1.2
@@ -10,7 +10,7 @@
my $element = shift;
my $filename = shift;
- if ($converter->_element_is_top($element)
+ if ($converter->element_is_top($element)
or ($converter->{'elements'}->[2]
and $converter->{'elements'}->[2] eq $element)) {
my $extension = $converter->get_conf('EXTENSION');
Index: t/init/t2h_singular.init
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/init/t2h_singular.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/init/t2h_singular.init 22 Oct 2011 13:15:32 -0000 1.2
+++ t/init/t2h_singular.init 31 Oct 2011 18:04:32 -0000 1.3
@@ -67,7 +67,7 @@
and $element->{'filename'} ne
$element->{'element_next'}->{'filename'}
and $self->{'file_counters'}->{$element->{'filename'}} == 1));
- if ($self->_element_is_top($element)) {
+ if ($self->element_is_top($element)) {
my $buttons = $self->get_conf('TOP_BUTTONS');
my $content_href = $self->_element_direction($element, 'Contents',
'href');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Parser.pm Texinfo/Convert/HT...,
Patrice Dumas <=