[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Common.pm Texinfo/Structurin...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Common.pm Texinfo/Structurin... |
|
Date: |
Wed, 27 Jul 2011 00:16:02 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/07/27 00:16:01
Modified files:
tp/Texinfo : Common.pm Structuring.pm
tp/Texinfo/Convert: HTML.pm
tp/t : test_utils.pl
tp/t/results/float: numbering_captions_listoffloats.pl
tp/t/results/sectioning: section_in_unnumbered_info.pl
section_in_unnumbered_plaintext.pl
Log message:
Don't number sectioning comands below top-level @unnumbered too.
Always print *contents at the beginning if there are a @*contents
command and a @set*contentsaftertitlepage commands.
Fix formatting of table of contents with @part.
t/test_utils.pl: optionally output the generated converted texts in
files
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.pm?cvsroot=texinfo&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/test_utils.pl?cvsroot=texinfo&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/numbering_captions_listoffloats.pl?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_in_unnumbered_info.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl?cvsroot=texinfo&r1=1.9&r2=1.10
Patches:
Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- Texinfo/Common.pm 10 Jul 2011 05:53:28 -0000 1.50
+++ Texinfo/Common.pm 27 Jul 2011 00:16:00 -0000 1.51
@@ -101,6 +101,8 @@
);
# FIXME TOP_HEADING_AT_BEGINNING seems to be a no-op
+# FIXME USE_SECTIONS is now a no-op, there are only two possibilities,
+# USE_NODES set or not.
my @variable_settables = (
'DEBUG', 'FRAMES', 'FRAMESET_DOCTYPE', 'DOCTYPE', 'TEST', 'DUMP_TEXI',
'TOP_FILE', 'TOC_FILE', 'SHOW_MENU', 'USE_NODES', 'TOC_LINKS', 'SHORTEXTN',
Index: Texinfo/Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- Texinfo/Structuring.pm 24 Jul 2011 08:52:21 -0000 1.71
+++ Texinfo/Structuring.pm 27 Jul 2011 00:16:00 -0000 1.72
@@ -287,7 +287,8 @@
}
if (!$unnumbered_commands{$content->{'cmdname'}}) {
# construct the number, if not below an unnumbered
- if ($command_numbers[$number_top_level]) {
+ #if ($command_numbers[$number_top_level]) {
+ if (!$command_unnumbered[$number_top_level]) {
$content->{'number'} = $command_numbers[$number_top_level];
for (my $i = $number_top_level+1; $i <= $content->{'level'}; $i++) {
$content->{'number'} .= ".$command_numbers[$i]";
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- Texinfo/Convert/HTML.pm 24 Jul 2011 08:52:21 -0000 1.114
+++ Texinfo/Convert/HTML.pm 27 Jul 2011 00:16:01 -0000 1.115
@@ -2660,6 +2660,8 @@
and
$self->{'labels'}->{$root->{'extra'}->{'node_argument'}->{'normalized'}}) {
my $node
=
$self->label_command($root->{'extra'}->{'node_argument'}->{'normalized'});
+ # This is the node if USE_NODES, otherwise this may be the sectioning
+ # if the sectioning command is really associated to the node
my $command = $self->command_element_command($node);
$command = $node if (!$node->{'extra'}->{'associated_section'}
or $node->{'extra'}->{'associated_section'} ne
$command);
@@ -2988,8 +2990,6 @@
my $result = '';
my $special_element
= $self->special_element($contents_command_element_name{$cmdname});
- # This may not be defined if setcontentsaftertitlepage is set and
- # @titlepage is not used.
if ($special_element) {
my $id = $self->command_id($special_element);
if ($id ne '') {
@@ -2999,10 +2999,9 @@
$result .= &{$self->{'heading_text'}}($self, $cmdname, $heading, 0)."\n";
$result .= $content . "\n";
return $result;
+ } else {
+ cluck "$cmdname special element not defined";
}
- #else {
- #cluck "$cmdname special element not defined";
- #}
}
return '';
}
@@ -3018,8 +3017,8 @@
$self->_informative_command($command);
if ($self->get_conf('INLINE_CONTENTS')
and ($cmdname eq 'contents' or $cmdname eq 'shortcontents')
- and ! ($self->get_conf('set'.$cmdname.'aftertitlepage')
- and $self->get_conf('USE_TITLEPAGE_FOR_TITLE'))) {
+ and ! $self->get_conf('set'.$cmdname.'aftertitlepage')) {
+# and $self->get_conf('USE_TITLEPAGE_FOR_TITLE'))) {
return $self->_contents_inline_element($cmdname, $command);
}
return '';
@@ -3603,6 +3602,27 @@
$default_types_conversion{'text_root'} = \&_convert_root_text_type;
+sub _contents_shortcontents_in_title($)
+{
+ my $self = shift;
+
+ my $result = '';
+
+ if ($self->{'structuring'} and $self->{'structuring'}->{'sectioning_root'}
+ and scalar(@{$self->{'structuring'}->{'sections_list'}}) > 1) {
+ foreach my $command ('contents', 'shortcontents') {
+ if ($self->get_conf($command)
+ and $self->get_conf('set'.$command.'aftertitlepage')) {
+ my $contents_text = $self->_contents_inline_element($command, undef);
+ if ($contents_text ne '') {
+ $result .= $contents_text . $self->get_conf('DEFAULT_RULE')."\n";
+ }
+ }
+ }
+ }
+ return $result;
+}
+
# Convert @titlepage. Falls back to simpletitle.
sub _default_titlepage($)
{
@@ -3621,22 +3641,7 @@
my $result = '';
$result .= $titlepage_text.$self->get_conf('DEFAULT_RULE')."\n"
if (defined($titlepage_text));
- if ($self->{'structuring'} and $self->{'structuring'}->{'sectioning_root'}
- and scalar(@{$self->{'structuring'}->{'sections_list'}}) > 1) {
- if ($self->get_conf('setcontentsaftertitlepage')) {
- my $contents_text = $self->_contents_inline_element('contents', undef);
- if ($contents_text ne '') {
- $result .= $contents_text . $self->get_conf('DEFAULT_RULE')."\n";
- }
- }
- if ($self->get_conf('setshortcontentsaftertitlepage')) {
- my $shortcontents_text
- = $self->_contents_inline_element('shortcontents', undef);
- if ($shortcontents_text ne '') {
- $result .= $shortcontents_text . $self->get_conf('DEFAULT_RULE')."\n";
- }
- }
- }
+ $result .= $self->_contents_shortcontents_in_title();
return $result;
}
@@ -3648,12 +3653,15 @@
if ($self->get_conf('SHOW_TITLE')) {
if ($self->get_conf('USE_TITLEPAGE_FOR_TITLE')) {
$result .= &{$self->{'titlepage'}}($self);
- } elsif ($self->{'simpletitle_tree'}) {
+ } else {
+ if ($self->{'simpletitle_tree'}) {
my $title_text = $self->convert_tree($self->{'simpletitle_tree'});
$result .= &{$self->{'heading_text'}}($self, 'settitle', $title_text,
0, {'cmdname' => 'settitle',
'contents' => $self->{'simpletitle_tree'}->{'contents'}});
}
+ $result .= $self->_contents_shortcontents_in_title();
+ }
}
return $result;
}
@@ -3668,6 +3676,9 @@
#print STDERR "GGGGGGGG $element $element->{'parent'}
$element->{'parent'}->{'type'}\n";
#print STDERR "$element->{'extra'}->{'special_element'}\n"
# if ($element->{'extra'}->{'special_element'});
+ #if (!defined($element->{'parent'})) {
+ # print STDERR "NO PARENT ".Texinfo::Parser::_print_current($element)."\n";
+ #}
my $result = '';
my $special_element;
@@ -3707,8 +3718,12 @@
and $self->{'global_target_elements'}->{'Top'} eq
$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 elements
+ # which should only happen when called with $self->get_conf('OUTFILE')
+ # set to ''.
my $end_page = (!$element->{'element_next'}
- or $element->{'parent'} ne $element->{'element_next'}->{'parent'});
+ or (defined($element->{'parent'})
+ and $element->{'parent'} ne
$element->{'element_next'}->{'parent'}));
my $is_special = $element->{'extra'}->{'special_element'};
if (($end_page or $next_is_top or $next_is_special)
@@ -4611,22 +4626,34 @@
# FIXME do that here or let it to the user?
if ($self->{'structuring'} and $self->{'structuring'}->{'sectioning_root'}
and scalar(@{$self->{'structuring'}->{'sections_list'}}) > 1) {
- if ($self->get_conf('contents')) {
+
+ foreach my $cmdname ('contents', 'shortcontents') {
+ my $type = $contents_command_element_name{$cmdname};
+ if ($self->get_conf($cmdname)) {
if ($self->get_conf('INLINE_CONTENTS')
- or ($self->get_conf('setcontentsaftertitlepage')
- and $self->get_conf('USE_TITLEPAGE_FOR_TITLE'))) {
+ or ($self->get_conf('set'.$cmdname.'aftertitlepage'))) {
+ # and $self->get_conf('USE_TITLEPAGE_FOR_TITLE'))) {
} else {
- $do_special{'Contents'} = 1;
- }
+ $do_special{$type} = 1;
}
- if ($self->get_conf('shortcontents')) {
- if ($self->get_conf('INLINE_CONTENTS')
- or ($self->get_conf('setshortcontentsaftertitlepage')
- and $self->get_conf('USE_TITLEPAGE_FOR_TITLE'))) {
- } else {
- $do_special{'Overview'} = 1;
}
}
+ # if ($self->get_conf('contents')) {
+ # if ($self->get_conf('INLINE_CONTENTS')
+ # or ($self->get_conf('setcontentsaftertitlepage')
+ # and $self->get_conf('USE_TITLEPAGE_FOR_TITLE'))) {
+ # } else {
+ # $do_special{'Contents'} = 1;
+ # }
+ # }
+ # if ($self->get_conf('shortcontents')) {
+ # if ($self->get_conf('INLINE_CONTENTS')
+ # or ($self->get_conf('setshortcontentsaftertitlepage')
+ # and $self->get_conf('USE_TITLEPAGE_FOR_TITLE'))) {
+ # } else {
+ # $do_special{'Overview'} = 1;
+ # }
+ # }
}
if ($self->{'extra'}->{'footnote'}
and $self->get_conf('footnotestyle') eq 'separate'
@@ -4712,9 +4739,11 @@
my $type = $contents_command_element_name{$cmdname};
if ($self->get_conf($cmdname)) {
my $default_filename;
- if ($self->get_conf('set'.$cmdname.'aftertitlepage')
- and $self->get_conf('USE_TITLEPAGE_FOR_TITLE')) {
+ if ($self->get_conf('set'.$cmdname.'aftertitlepage')) {
+ #next unless $self->get_conf('USE_TITLEPAGE_FOR_TITLE');
+ if ($self->{'pages'}) {
$default_filename = $self->{'pages'}->[0]->{'filename'};
+ }
} elsif ($self->get_conf('INLINE_CONTENTS')) {
if ($self->{'extra'} and $self->{'extra'}->{$cmdname}) {
foreach my $command(@{$self->{'extra'}->{$cmdname}}) {
@@ -4725,9 +4754,14 @@
last;
}
}
+ } else {
+ next;
}
+ } else { # in this case, there should already be a special element
+ # if needed, done together with the other special elements.
+ next;
}
- if (defined($default_filename)) {
+
my $element = {'type' => 'element',
'extra' => {'special_element' => $type}};
$self->{'special_elements_types'}->{$type} = $element;
@@ -4753,7 +4787,6 @@
}
}
}
- }
}
# Associate elements with the global targets, First, Last, Top, Index.
@@ -5117,9 +5150,11 @@
my $result = '';
$result .= $self->attribute_class('div', $cmdname).">\n";
- if (@{$section_root->{'section_childs'}} > 1
- or $section_root->{'section_childs'}->[0]->{'cmdname'} ne 'top') {
+ my $toplevel_contents;
+ if (@{$section_root->{'section_childs'}} > 1) {
+ # or $section_root->{'section_childs'}->[0]->{'cmdname'} ne 'top') {
$result .= $self->attribute_class('ul', $ul_class) .">\n";
+ $toplevel_contents = 1;
}
foreach my $top_section (@{$section_root->{'section_childs'}}) {
my $section = $top_section;
@@ -5152,7 +5187,11 @@
$result .= "<li>$text";
}
}
+ } elsif ($section->{'section_childs'} and @{$section->{'section_childs'}}
+ and $toplevel_contents) {
+ $result .= "<li>";
}
+
# for shortcontents don't do child if child is not toplevel
if ($section->{'section_childs'}
and ($contents or $section->{'level'} < $root_level+1)) {
@@ -5166,12 +5205,19 @@
last if ($section eq $top_section);
$section = $section->{'section_next'};
} else {
- last if ($section eq $top_section);
+ #last if ($section eq $top_section);
+ if ($section eq $top_section) {
+ $result .= "</li>\n" unless ($section->{'cmdname'} eq 'top');
+ last;
+ }
while ($section->{'section_up'}) {
$section = $section->{'section_up'};
$result .= "</li>\n". ' ' x (2*($section->{'level'} - $root_level))
. "</ul>";
- last SECTION if ($section eq $top_section);
+ if ($section eq $top_section) {
+ $result .= "</li>\n" if ($toplevel_contents);
+ last SECTION;
+ }
if ($section->{'section_next'}) {
$result .= "</li>\n";
$section = $section->{'section_next'};
@@ -5181,8 +5227,8 @@
}
}
}
- if (@{$section_root->{'section_childs'}} > 1
- or $section_root->{'section_childs'}->[0]->{'cmdname'} ne 'top') {
+ if (@{$section_root->{'section_childs'}} > 1) {
+ # or $section_root->{'section_childs'}->[0]->{'cmdname'} ne 'top') {
$result .= "\n</ul>";
}
$result .= "\n</div>\n";
@@ -5220,7 +5266,8 @@
";
}
-# This is in order to avoid code duplication with other file headers
+# This is used for normal output files and other files, like renamed
+# nodes file headers, or redirection file headers.
sub _file_header_informations($$)
{
my $self = shift;
@@ -5670,7 +5717,9 @@
$self->set_conf('BODYTEXT', 'lang="' . $self->get_conf('documentlanguage')
. '" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080"
alink="#FF0000"');
- # prepare title
+ # prepare title. fulltitle uses more possibility than simpletitle for
+ # title, including @-commands found in @titlepage only. Therefore
+ # simpletitle is more in line with what makeinfo in C does.
my $fulltitle;
foreach my $fulltitle_command('settitle', 'title',
'shorttitlepage', 'top') {
Index: t/test_utils.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/test_utils.pl,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- t/test_utils.pl 13 Jul 2011 20:58:55 -0000 1.86
+++ t/test_utils.pl 27 Jul 2011 00:16:01 -0000 1.87
@@ -35,6 +35,9 @@
# FIXME use texinfo instead of texi2html
Locale::Messages::bindtextdomain ('texi2html_document',
'../texi2html/locales');
+my $output_files_dir = 't/output_files/';
+mkdir $output_files_dir if (! -d $output_files_dir);
+
ok(1);
my %formats = (
@@ -44,14 +47,20 @@
'debugcount' => \&debugcount,
);
+my %extensions = (
+ 'plaintext' => 'txt',
+ 'debugcount' => 'txt',
+);
+
our $arg_generate;
our $arg_debug;
our $arg_complete;
+our $arg_output;
our $nr_comparisons = 8;
Getopt::Long::Configure("gnu_getopt");
GetOptions('g|generate' => \$arg_generate, 'd|debug=i' => \$arg_debug,
- 'c|complete' => \$arg_complete);
+ 'c|complete' => \$arg_complete, 'o|output' => \$arg_output);
our $arg_test_case = shift @ARGV;
@@ -382,6 +391,35 @@
$parser_options, $converter_options);
$converted_errors{$format} = undef if (address@hidden);
#print STDERR "$format: \n$converted{$format}";
+ if ($arg_output) {
+ mkdir ("$output_files_dir/$self->{'name'}")
+ if (! -d "$output_files_dir/$self->{'name'}");
+ my $extension;
+ if ($extensions{$format}) {
+ $extension = $extensions{$format};
+ } else {
+ $extension = $format;
+ }
+ my $outfile =
"$output_files_dir/$self->{'name'}/$test_name.$extension";
+ if (!open (OUTFILE, ">$outfile")) {
+ warn "Open $outfile: $!\n";
+ } else {
+ print OUTFILE $converted{$format};
+ close (OUTFILE) or warn "Close $outfile: $!\n";
+ }
+ if ($converted_errors{$format}) {
+ my $errors_file
+ = "$output_files_dir/$self->{'name'}/${test_name}_$extension.err";
+ if (!open (ERRFILE, ">$errors_file")) {
+ warn "Open $errors_file: $!\n";
+ } else {
+ foreach my $error_message (@{$converted_errors{$format}}) {
+ print ERRFILE $error_message->{'error_line'};
+ }
+ close (ERRFILE) or warn "Close $errors_file: $!\n";
+ }
+ }
+ }
}
}
my $directions_text;
Index: t/results/float/numbering_captions_listoffloats.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/float/numbering_captions_listoffloats.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- t/results/float/numbering_captions_listoffloats.pl 13 Jul 2011 14:49:10
-0000 1.26
+++ t/results/float/numbering_captions_listoffloats.pl 27 Jul 2011 00:16:01
-0000 1.27
@@ -4244,7 +4244,6 @@
'line_nr' => 130,
'macro' => ''
},
- 'number' => '1.2',
'parent' => {}
},
{
@@ -7642,8 +7641,8 @@
-1.2 Section within unnumbered
-=============================
+Section within unnumbered
+=========================
Text, Section within unnumbered float
@@ -7773,7 +7772,6 @@
}
},
'level' => 2,
- 'number' => '1.2',
'section_up' => {}
}
],
@@ -7932,8 +7930,7 @@
'associated_section' => {
'cmdname' => 'section',
'extra' => {},
- 'level' => 2,
- 'number' => '1.2'
+ 'level' => 2
},
'normalized' => 'Section-within-unnumbered'
},
@@ -8651,8 +8648,7 @@
'float_section' => {
'cmdname' => 'section',
'extra' => {},
- 'level' => 2,
- 'number' => '1.2'
+ 'level' => 2
},
'number' => 6
},
@@ -9050,8 +9046,8 @@
5: C No type in unnumbered
-1.2 Section within unnumbered
-=============================
+Section within unnumbered
+=========================
Section within unnumbered
Index: t/results/sectioning/section_in_unnumbered_info.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/section_in_unnumbered_info.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/sectioning/section_in_unnumbered_info.pl 9 Jul 2011 06:35:42
-0000 1.8
+++ t/results/sectioning/section_in_unnumbered_info.pl 27 Jul 2011 00:16:01
-0000 1.9
@@ -1105,7 +1105,6 @@
'line_nr' => 37,
'macro' => ''
},
- 'number' => '1.2',
'parent' => {}
},
{
@@ -6808,8 +6807,8 @@
* section in unnumbered::
-1.2 section in unnumbered
-=========================
+section in unnumbered
+=====================
2 chapter 2
***********
@@ -6997,7 +6996,6 @@
}
},
'level' => 2,
- 'number' => '1.2',
'section_up' => {}
}
],
@@ -7527,8 +7525,7 @@
'associated_section' => {
'cmdname' => 'section',
'extra' => {},
- 'level' => 2,
- 'number' => '1.2'
+ 'level' => 2
},
'normalized' => 'section-in-unnumbered'
},
@@ -8577,8 +8574,8 @@
File: , Node: section in unnumbered, Up: unnumbered
-1.2 section in unnumbered
-=========================
+section in unnumbered
+=====================
File: , Node: chapter 2, Next: chapter 3, Prev: unnumbered, Up: Top
@@ -8804,33 +8801,33 @@
Node: section in chapter367
Node: unnumbered465
Node: section in unnumbered597
-Node: chapter 2707
-Node: unnumberedsec 2859
-Node: unnumbered sub 21070
-Node: numbered sub 21199
-Node: unnumbered sub2 21350
-Node: numbered sub2 21506
-Node: unnumberedsec 2-11635
-Node: numbered sub 2-11779
-Node: chapter 31887
-Node: unnumberedsec 32095
-Node: unnumbered sub 32300
-Node: numbered sub 32429
-Node: unnumbered sub2 32580
-Node: numbered sub2 32736
-Node: section 3-12865
-Node: unnumberedsec 3-22994
-Node: numbered sub 3-23154
-Node: section 3-33262
-Node: subsection 3-33422
-Node: unnumberedsec 3-43516
-Node: numbered sub 3-43656
-Node: unnumbered 43764
-Node: unnumberedsec 43880
-Node: unnumbered sub 44068
-Node: numbered sub 44197
-Node: unnumbered sub2 44348
-Node: numbered sub2 44504
+Node: chapter 2699
+Node: unnumberedsec 2851
+Node: unnumbered sub 21062
+Node: numbered sub 21191
+Node: unnumbered sub2 21342
+Node: numbered sub2 21498
+Node: unnumberedsec 2-11627
+Node: numbered sub 2-11771
+Node: chapter 31879
+Node: unnumberedsec 32087
+Node: unnumbered sub 32292
+Node: numbered sub 32421
+Node: unnumbered sub2 32572
+Node: numbered sub2 32728
+Node: section 3-12857
+Node: unnumberedsec 3-22986
+Node: numbered sub 3-23146
+Node: section 3-33254
+Node: subsection 3-33414
+Node: unnumberedsec 3-43508
+Node: numbered sub 3-43648
+Node: unnumbered 43756
+Node: unnumberedsec 43872
+Node: unnumbered sub 44060
+Node: numbered sub 44189
+Node: unnumbered sub2 44340
+Node: numbered sub2 44496
End Tag Table
';
Index: t/results/sectioning/section_in_unnumbered_plaintext.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/sectioning/section_in_unnumbered_plaintext.pl 9 Jul 2011
06:35:42 -0000 1.9
+++ t/results/sectioning/section_in_unnumbered_plaintext.pl 27 Jul 2011
00:16:01 -0000 1.10
@@ -1105,7 +1105,6 @@
'line_nr' => 37,
'macro' => ''
},
- 'number' => '1.2',
'parent' => {}
},
{
@@ -6808,8 +6807,8 @@
* section in unnumbered::
-1.2 section in unnumbered
-=========================
+section in unnumbered
+=====================
2 chapter 2
***********
@@ -6997,7 +6996,6 @@
}
},
'level' => 2,
- 'number' => '1.2',
'section_up' => {}
}
],
@@ -7527,8 +7525,7 @@
'associated_section' => {
'cmdname' => 'section',
'extra' => {},
- 'level' => 2,
- 'number' => '1.2'
+ 'level' => 2
},
'normalized' => 'section-in-unnumbered'
},
@@ -8534,7 +8531,7 @@
1 chapter
1.1 section in chapter
unnumbered
- 1.2 section in unnumbered
+ section in unnumbered
2 chapter 2
unnumbered section 2
unnumbered subsection 2
@@ -8593,8 +8590,8 @@
* section in unnumbered::
-1.2 section in unnumbered
-=========================
+section in unnumbered
+=====================
2 chapter 2
***********
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Common.pm Texinfo/Structurin...,
Patrice Dumas <=