[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp TODO Texinfo/Structuring.pm Texinfo/...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp TODO Texinfo/Structuring.pm Texinfo/... |
|
Date: |
Thu, 29 Sep 2011 11:30:26 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/09/29 11:30:26
Modified files:
tp : TODO
tp/Texinfo : Structuring.pm
tp/Texinfo/Convert: Converter.pm DocBook.pm HTML.pm Info.pm
Plaintext.pm XML.pm
tp/t/results/sectioning: chapter_before_and_after_part.pl
double_part.pl
node_part_chapter_after_chapter.pl
node_part_chapter_after_top.pl
part_before_section.pl
part_chapter_after_top.pl
part_node_chapter_after_top.pl
top_part_chapter.pl
Log message:
Don't set Up if it is the same element.
Factor out some code in Texinfo::convert::Converter.
Simplify the initialization of commands.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.178&r2=1.179
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.pm?cvsroot=texinfo&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/DocBook.pm?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.154&r2=1.155
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.163&r2=1.164
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/chapter_before_and_after_part.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_part.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_before_section.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_chapter_after_top.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/top_part_chapter.pl?cvsroot=texinfo&r1=1.6&r2=1.7
Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -b -r1.178 -r1.179
--- TODO 28 Sep 2011 21:44:21 -0000 1.178
+++ TODO 29 Sep 2011 11:30:23 -0000 1.179
@@ -150,7 +150,7 @@
could be used for the main loop. More simply, a binary tokenizer, at
least, could make for a notable speedup.
address@hidden end of lines in @def* is not kept in any way in the tree.
+@ protecting end of lines in @def* is not kept in any way in the tree.
Maybe it could be possible to have it as a 'type'?
in HTML, the argument of a quotation is ignored if the quotation is empty,
@@ -186,7 +186,7 @@
test an lone @contents without any sectioning command.
-Test @address@hidden and @sc{@'e}Â in HTML with 8bit and utf_, with and without
+Test @address@hidden and @sc{@'e} in HTML with 8bit and utf_, with and without
enable encoding and entities.
in coverage/formatting
@@ -202,22 +202,6 @@
specific list of formats could be passed to Convert::Text::convert, which
would be different (for example Info and Plaintext even if converting HTML).
-construct like
- @menu @c
-leads to a menu_comment holding a preformatted which only contains
-the comment, it would certainly be better to remove the preformatted
-and menu_comment as they a e basically empty. In HTML this results in an
-empty <tr>.
-Test in menu/comment_on_menu_line
-
-Flag the last end of line of text in a raw format, to let the converter
-remove it in case a running text is needed. For example, in
- @html
- html
- something
- @end html
-flag the end of line at the end of the 'something' line.
-
An unknwown command in a context where not all commands are accepted leads
to an error message. There is a FIXME in the code. The test case is
macro/unknown_macro_on_line_command
@@ -246,9 +230,6 @@
entry is Top, it should be the node created especially for the footnote
and the lines count should also be adjusted.
-Test empty/no empty line at a multitable beginning, between 2 rows and
-after a multitable.
-
Test end_line_count in Texinfo/Convert/ containers.
Test no empty line before and after a sectioning command. With text, but
Index: Texinfo/Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- Texinfo/Structuring.pm 28 Sep 2011 19:02:50 -0000 1.89
+++ Texinfo/Structuring.pm 29 Sep 2011 11:30:23 -0000 1.90
@@ -844,8 +844,14 @@
['Prev', 'section_prev']) {
# in most cases $section->{$direction->[1]}->{'parent'} is defined
# but it may not be the case for the up of @top.
+ # The section may be its own up in cases like
+ # @part part
+ # @chapter chapter
+ # in that cas the direction is not set up
$directions->{$direction->[0]} =
$section->{$direction->[1]}->{'parent'}
- if ($section->{$direction->[1]} and
$section->{$direction->[1]}->{'parent'});
+ if ($section->{$direction->[1]}
+ and $section->{$direction->[1]}->{'parent'}
+ and $section->{$direction->[1]}->{'parent'} ne
$section->{'parent'});
}
my $up = $section;
Index: Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- Texinfo/Convert/Converter.pm 29 Sep 2011 08:40:18 -0000 1.42
+++ Texinfo/Convert/Converter.pm 29 Sep 2011 11:30:23 -0000 1.43
@@ -75,13 +75,34 @@
sub _global_commands($)
{
- return ();
+ return ('documentlanguage', 'documentencoding');
}
sub _initialize_global_command($$$)
{
}
+sub _informative_command($$)
+{
+ my $self = shift;
+ my $root = shift;
+
+ my $cmdname = $root->{'cmdname'};
+ return if ($self->{'set'}->{$cmdname});
+
+ if (exists($root->{'extra'}->{'text_arg'})) {
+ $self->set_conf($cmdname, $root->{'extra'}->{'text_arg'});
+ if ($cmdname eq 'documentencoding'
+ and defined($root->{'extra'})
+ and defined($root->{'extra'}->{'perl_encoding'})
+ ){
+ #and !$self->{'perl_encoding'}) {
+ $self->{'encoding_name'} = $root->{'extra'}->{'encoding_name'};
+ $self->{'perl_encoding'} = $root->{'extra'}->{'perl_encoding'};
+ }
+ }
+}
+
sub converter(;$)
{
my $class = shift;
@@ -133,13 +154,10 @@
foreach my $global_command ($converter->_global_commands()) {
if (defined($converter->{'extra'}->{$global_command})) {
my $root = $converter->{'extra'}->{$global_command};
- #if (ref($root) eq 'ARRAY') {
- # $root = $converter->{'extra'}->{$global_command}->[0];
- #}
- #if (ref($root) ne 'ARRAY') {
- #$converter->_informative_command($root);
- $converter->_initialize_global_command($global_command, $root);
- #}
+ # always set unique commands
+ if (ref($root) ne 'ARRAY') {
+ $converter->_informative_command($root);
+ }
}
}
$converter->set_conf('setcontentsaftertitlepage', 1)
Index: Texinfo/Convert/DocBook.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- Texinfo/Convert/DocBook.pm 27 Sep 2011 23:44:09 -0000 1.13
+++ Texinfo/Convert/DocBook.pm 29 Sep 2011 11:30:24 -0000 1.14
@@ -240,7 +240,6 @@
'empty_spaces_before_argument', 'empty_spaces_before_paragraph',
'empty_spaces_after_close_brace',
'empty_space_at_end_def_bracketed',
- # FIXME keep those? Information is lost...
'menu_entry_separator',
'menu_entry_leading_text',
) {
@@ -290,61 +289,16 @@
$self->{'document_context'} = [{}];
}
-sub _global_commands($)
-{
- return ('documentlanguage', 'documentencoding');
-}
-
-sub _informative_command($$)
-{
- my $self = shift;
- my $root = shift;
-
- my $cmdname = $root->{'cmdname'};
- return if ($self->{'set'}->{$cmdname});
-
- if (exists($root->{'extra'}->{'text_arg'})) {
- $self->set_conf($cmdname, $root->{'extra'}->{'text_arg'});
- if ($cmdname eq 'documentencoding'
- and defined($root->{'extra'})
- and defined($root->{'extra'}->{'perl_encoding'})
- ){
- #and !$self->{'perl_encoding'}) {
- $self->{'encoding_name'} = $root->{'extra'}->{'encoding_name'};
- $self->{'perl_encoding'} = $root->{'extra'}->{'perl_encoding'};
- }
- }
-}
-
-sub _initialize_document($$)
-{
- my $self = shift;
- my $root = shift;
-
- my $elements;
-
- $self->_set_global_multiple_commands(-1);
- $elements = Texinfo::Structuring::split_by_section($root);
- $self->{'elements'} = $elements;
- return $elements;
-}
-
sub convert($$;$)
{
my $self = shift;
my $root = shift;
my $fh = shift;
- my $elements = $self->_initialize_document($root);
+ $self->_set_global_multiple_commands(-1);
return $self->_convert_document_sections($root, $fh);
}
-sub _normalize_top_node($)
-{
- my $node = shift;
- return Texinfo::Common::normalize_top_node_name($node);
-}
-
sub output($$)
{
my $self = shift;
@@ -364,7 +318,7 @@
}
}
- my $elements = $self->_initialize_document($root);
+ $self->_set_global_multiple_commands(-1);
my $id;
if ($self->get_conf('OUTFILE') ne '') {
@@ -383,7 +337,7 @@
my $result = '';
$result .= Texinfo::Convert::Converter::_output_text($header, $fh);
- $result .= $self->convert($root, $fh);
+ $result .= $self->_convert_document_sections($root, $fh);
$result .= Texinfo::Convert::Converter::_output_text("</book>\n", $fh);
return $result;
}
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- Texinfo/Convert/HTML.pm 29 Sep 2011 08:18:14 -0000 1.154
+++ Texinfo/Convert/HTML.pm 29 Sep 2011 11:30:24 -0000 1.155
@@ -1056,18 +1056,6 @@
'summarycontents' => 1,
);
-sub _initialize_global_command($$)
-{
- my $self = shift;
- my $command = shift;
- my $root = shift;
- if (ref($root) ne 'ARRAY') {
- $self->_informative_command($root);
- } elsif ($contents_commands{$command}) {
- $self->_informative_command($root->[0]);
- }
-}
-
#my %ignored_misc_commands;
foreach my $misc_command (keys(%misc_commands)) {
# $ignored_misc_commands{$misc_command} = 1
Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- Texinfo/Convert/Info.pm 27 Sep 2011 23:44:09 -0000 1.61
+++ Texinfo/Convert/Info.pm 29 Sep 2011 11:30:24 -0000 1.62
@@ -67,6 +67,7 @@
push @{$self->{'count_context'}}, {'lines' => 0, 'bytes' => 0,
'locations' => []};
my $header = $self->_info_header();
+
pop @{$self->{'count_context'}};
return undef unless $self->_create_destination_directory();
@@ -236,8 +237,8 @@
$self->{'empty_lines_count'} = 1;
if ($self->{'extra'} and $self->{'extra'}->{'copying'}) {
- print STDERR "COPYING HEADER\n" if ($self->get_conf('DEBUG'));
$self->_set_global_multiple_commands();
+ print STDERR "COPYING HEADER\n" if ($self->get_conf('DEBUG'));
$self->{'in_copying_header'} = 1;
my $copying = $self->_convert({'contents' =>
$self->{'extra'}->{'copying'}->{'contents'}});
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- Texinfo/Convert/Plaintext.pm 28 Sep 2011 23:02:57 -0000 1.163
+++ Texinfo/Convert/Plaintext.pm 29 Sep 2011 11:30:24 -0000 1.164
@@ -62,7 +62,8 @@
my @informative_global_commands = ('paragraphindent', 'firstparagraphindent',
'frenchspacing', 'documentencoding', 'footnotestyle', 'documentlanguage',
-'contents', 'shortcontents', 'summarycontents');
+'contents', 'shortcontents', 'summarycontents', 'setcontentsaftertitlepage',
+'setshortcontentsaftertitlepage');
my %informative_commands;
foreach my $informative_command (@informative_global_commands) {
@@ -319,18 +320,6 @@
'summarycontents' => 1,
);
-sub _initialize_global_command($$)
-{
- my $self = shift;
- my $command = shift;
- my $root = shift;
- if (ref($root) ne 'ARRAY') {
- $self->_informative_command($root);
- } elsif ($contents_commands{$command}) {
- $self->_informative_command($root->[0]);
- }
-}
-
sub _informative_command($$)
{
my $self = shift;
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- Texinfo/Convert/XML.pm 27 Sep 2011 23:44:10 -0000 1.41
+++ Texinfo/Convert/XML.pm 29 Sep 2011 11:30:24 -0000 1.42
@@ -248,38 +248,6 @@
$self->{'document_context'} = [{}];
}
-sub _global_commands($)
-{
- return ('documentlanguage', 'documentencoding');
-}
-
-sub _informative_command($$)
-{
- my $self = shift;
- my $root = shift;
-
- my $cmdname = $root->{'cmdname'};
- return if ($self->{'set'}->{$cmdname});
-
- if (exists($root->{'extra'}->{'text_arg'})) {
- $self->set_conf($cmdname, $root->{'extra'}->{'text_arg'});
- if ($cmdname eq 'documentencoding'
- and defined($root->{'extra'})
- and defined($root->{'extra'}->{'perl_encoding'})
- ){
- #and !$self->{'perl_encoding'}) {
- $self->{'encoding_name'} = $root->{'extra'}->{'encoding_name'};
- $self->{'perl_encoding'} = $root->{'extra'}->{'perl_encoding'};
- }
- }
-}
-
-sub _normalize_top_node($)
-{
- my $node = shift;
- return Texinfo::Common::normalize_top_node_name($node);
-}
-
sub output($$)
{
my $self = shift;
@@ -311,7 +279,7 @@
my $result = '';
$result .= Texinfo::Convert::Converter::_output_text($header, $fh);
- $result .= $self->convert($root, $fh);
+ $result .= $self->_convert_document_sections($root, $fh);
$result .= Texinfo::Convert::Converter::_output_text("</texinfo>\n", $fh);
return $result;
@@ -543,7 +511,7 @@
{'text' => ')'}]});
}
if ($node_direction->{'extra'}->{'node_content'}) {
- $node_name .= _normalize_top_node($self->_convert({
+ $node_name .=
Texinfo::Common::normalize_top_node_name($self->_convert({
'contents' =>
$node_direction->{'extra'}->{'node_content'}}));
}
$result .= "<$element${attribute}>$node_name</$element>";
Index: t/results/sectioning/chapter_before_and_after_part.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/chapter_before_and_after_part.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/sectioning/chapter_before_and_after_part.pl 10 Sep 2011
13:12:37 -0000 1.11
+++ t/results/sectioning/chapter_before_and_after_part.pl 29 Sep 2011
11:30:25 -0000 1.12
@@ -274,8 +274,7 @@
'directions' => {
'Back' => {},
'FastBack' => {},
- 'This' => {},
- 'Up' => {}
+ 'This' => {}
},
'element_command' => {
'cmdname' => 'chapter',
@@ -311,7 +310,6 @@
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}
= $result_elements{'chapter_before_and_after_part'}[0];
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
= $result_elements{'chapter_before_and_after_part'}[0];
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
=
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
=
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
=
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'Forward'}
=
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'This'}
= $result_elements{'chapter_before_and_after_part'}[0];
@@ -328,7 +326,6 @@
Back: @chapter chapter
FastBack: @chapter chapter
This: @chapter chapter 2
- Up: @chapter chapter 2
';
Index: t/results/sectioning/double_part.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/double_part.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/sectioning/double_part.pl 10 Sep 2011 13:12:38 -0000 1.14
+++ t/results/sectioning/double_part.pl 29 Sep 2011 11:30:26 -0000 1.15
@@ -852,7 +852,7 @@
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodePrev'}
= $result_elements{'double_part'}[0];
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeUp'}
= $result_elements{'double_part'}[0];
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
= $result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
= $result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'};
+$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
= $result_elements{'double_part'}[0];
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}{'menu_child'}
=
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
=
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'Forward'} =
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'};
@@ -882,7 +882,7 @@
NodePrev: @top top
NodeUp: @top top
This: @chapter chapter after 2 parts
- Up: @chapter chapter after 2 parts
+ Up: @top top
';
Index: t/results/sectioning/node_part_chapter_after_chapter.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/sectioning/node_part_chapter_after_chapter.pl 10 Sep 2011
13:12:38 -0000 1.20
+++ t/results/sectioning/node_part_chapter_after_chapter.pl 29 Sep 2011
11:30:26 -0000 1.21
@@ -1031,7 +1031,7 @@
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodePrev'}
=
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeUp'}
= $result_elements{'node_part_chapter_after_chapter'}[0];
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
=
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
-$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
=
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
+$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
= $result_elements{'node_part_chapter_after_chapter'}[0];
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_next'}
=
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'}{'menu_child'}
=
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'};
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}
=
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
@@ -1086,7 +1086,7 @@
NodePrev: @chapter chapter node
NodeUp: @top top
This: @chapter chapter with part node
- Up: @chapter chapter with part node
+ Up: @top top
';
Index: t/results/sectioning/node_part_chapter_after_top.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/sectioning/node_part_chapter_after_top.pl 10 Sep 2011 13:12:38
-0000 1.13
+++ t/results/sectioning/node_part_chapter_after_top.pl 29 Sep 2011 11:30:26
-0000 1.14
@@ -714,7 +714,7 @@
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodePrev'}
= $result_elements{'node_part_chapter_after_top'}[0];
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeUp'}
= $result_elements{'node_part_chapter_after_top'}[0];
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
=
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
=
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
+$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
= $result_elements{'node_part_chapter_after_top'}[0];
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}{'menu_child'}
=
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
=
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'Forward'}
=
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
@@ -744,7 +744,7 @@
NodePrev: @top top
NodeUp: @top top
This: @chapter chapter
- Up: @chapter chapter
+ Up: @top top
';
Index: t/results/sectioning/part_before_section.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/part_before_section.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/sectioning/part_before_section.pl 10 Sep 2011 13:12:38 -0000
1.12
+++ t/results/sectioning/part_before_section.pl 29 Sep 2011 11:30:26 -0000
1.13
@@ -193,8 +193,7 @@
{
'extra' => {
'directions' => {
- 'This' => {},
- 'Up' => {}
+ 'This' => {}
},
'element_command' => {
'cmdname' => 'section',
@@ -214,14 +213,12 @@
}
];
$result_elements{'part_before_section'}[0]{'extra'}{'directions'}{'This'} =
$result_elements{'part_before_section'}[0];
-$result_elements{'part_before_section'}[0]{'extra'}{'directions'}{'Up'} =
$result_elements{'part_before_section'}[0];
$result_elements{'part_before_section'}[0]{'extra'}{'section'} =
$result_elements{'part_before_section'}[0]{'extra'}{'element_command'};
$result_directions_text{'part_before_section'} = 'element: @section section
This: @section section
- Up: @section section
';
Index: t/results/sectioning/part_chapter_after_top.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/part_chapter_after_top.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/sectioning/part_chapter_after_top.pl 10 Sep 2011 13:12:38
-0000 1.13
+++ t/results/sectioning/part_chapter_after_top.pl 29 Sep 2011 11:30:26
-0000 1.14
@@ -714,7 +714,7 @@
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodePrev'}
= $result_elements{'part_chapter_after_top'}[0];
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeUp'}
= $result_elements{'part_chapter_after_top'}[0];
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
=
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
=
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
+$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
= $result_elements{'part_chapter_after_top'}[0];
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}{'menu_child'}
=
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
=
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'Forward'}
=
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
@@ -744,7 +744,7 @@
NodePrev: @top top
NodeUp: @top top
This: @chapter chapter
- Up: @chapter chapter
+ Up: @top top
';
Index: t/results/sectioning/part_node_chapter_after_top.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- t/results/sectioning/part_node_chapter_after_top.pl 28 Sep 2011 19:02:50
-0000 1.24
+++ t/results/sectioning/part_node_chapter_after_top.pl 29 Sep 2011 11:30:26
-0000 1.25
@@ -968,7 +968,7 @@
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodePrev'}
=
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeUp'}
= $result_elements{'part_node_chapter_after_top'}[0];
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
=
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
=
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
+$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
= $result_elements{'part_node_chapter_after_top'}[0];
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_next'}
=
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'}{'menu_child'}
=
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'};
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}
=
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
@@ -1000,7 +1000,7 @@
NodePrev: @chapter chapter
NodeUp: @top top
This: @chapter chapter
- Up: @chapter chapter
+ Up: @top top
';
Index: t/results/sectioning/top_part_chapter.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/top_part_chapter.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/sectioning/top_part_chapter.pl 10 Sep 2011 13:12:38 -0000
1.6
+++ t/results/sectioning/top_part_chapter.pl 29 Sep 2011 11:30:26 -0000
1.7
@@ -274,8 +274,7 @@
'directions' => {
'Back' => {},
'FastBack' => {},
- 'This' => {},
- 'Up' => {}
+ 'This' => {}
},
'element_command' => {
'cmdname' => 'chapter',
@@ -311,7 +310,6 @@
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}
= $result_elements{'top_part_chapter'}[0];
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
= $result_elements{'top_part_chapter'}[0];
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
=
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
=
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
=
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'Forward'} =
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'Next'} =
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'};
@@ -330,7 +328,6 @@
Back: @top top
FastBack: @top top
This: @chapter chapter
- Up: @chapter chapter
';
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp TODO Texinfo/Structuring.pm Texinfo/...,
Patrice Dumas <=