[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm t/results/coverage...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm t/results/coverage... |
|
Date: |
Sun, 21 Nov 2010 22:41:28 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/11/21 22:41:28
Modified files:
tp/Texinfo : Parser.pm
tp/t/results/coverage: item_container.pl
tp/t/results/invalid_nestings: formats_not_closed_in_example.pl
on_itemize_line.pl
tp/t/results/itemize: accent_argument.pl
headitem_itemx_in_enumerate.pl
headitem_itemx_in_itemize.pl
not_closed_item.pl w_argument.pl
tp/t/results/macro: macro_in_brace_command.pl
Log message:
Count items in itemize and enumerate.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.151&r2=1.152
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/item_container.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/on_itemize_line.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/accent_argument.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/headitem_itemx_in_enumerate.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/headitem_itemx_in_itemize.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/not_closed_item.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/w_argument.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_brace_command.pl?cvsroot=texinfo&r1=1.21&r2=1.22
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -b -r1.151 -r1.152
--- Texinfo/Parser.pm 21 Nov 2010 22:30:34 -0000 1.151
+++ Texinfo/Parser.pm 21 Nov 2010 22:41:27 -0000 1.152
@@ -937,8 +937,12 @@
and ($root_commands{$current->{'cmdname'}}
or ($command and $current->{'parent'}->{'cmdname'}
and
$context_brace_commands{$current->{'parent'}->{'cmdname'}})))){
- if ($current->{'cmdname'} and $current->{'cmdname'} eq 'multitable') {
+ if ($current->{'cmdname'}) {
+ if ($current->{'cmdname'} eq 'multitable') {
_close_multitable($current);
+ } elsif ($item_container_commands{$current->{'cmdname'}}) {
+ delete $current->{'items_count'};
+ }
}
$current = $self->_close_current($current, $line_nr, $command);
}
@@ -950,8 +954,12 @@
($preformatted_commands{$current->{'cmdname'}}
or $menu_commands{$current->{'cmdname'}});
$closed_command = $current;
- if ($current->{'cmdname'} and $current->{'cmdname'} eq 'multitable') {
+ if ($current->{'cmdname'}) {
+ if ($current->{'cmdname'} eq 'multitable') {
_close_multitable($current);
+ } elsif ($item_container_commands{$current->{'cmdname'}}) {
+ delete $current->{'items_count'};
+ }
}
$current = $current->{'parent'}
} elsif ($command) {
@@ -2678,9 +2686,11 @@
if ($parent = _item_container_parent($current)) {
if ($command eq 'item') {
print STDERR "ITEM_CONTAINER\n" if ($self->{'debug'});
+ $parent->{'items_count'}++;
push @{$parent->{'contents'}},
{ 'cmdname' => $command, 'parent' => $parent,
- 'contents' => [] };
+ 'contents' => [],
+ 'extra' => {'item_number' => $parent->{'items_count'}} };
$current->{'contents'}->[-1]->{'extra'}->{'invalid_nesting'}
= 1
if ($invalid);
$current = $parent->{'contents'}->[-1];
Index: t/results/coverage/item_container.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/item_container.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/coverage/item_container.pl 20 Nov 2010 23:35:41 -0000
1.21
+++ t/results/coverage/item_container.pl 21 Nov 2010 22:41:27 -0000
1.22
@@ -61,6 +61,9 @@
'type' => 'paragraph'
}
],
+ 'extra' => {
+ 'item_number' => 1
+ },
'parent' => {}
}
],
@@ -143,6 +146,9 @@
'type' => 'paragraph'
}
],
+ 'extra' => {
+ 'item_number' => 1
+ },
'parent' => {}
}
],
Index: t/results/invalid_nestings/formats_not_closed_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/invalid_nestings/formats_not_closed_in_example.pl 20 Nov 2010
16:58:06 -0000 1.10
+++ t/results/invalid_nestings/formats_not_closed_in_example.pl 21 Nov 2010
22:41:27 -0000 1.11
@@ -134,6 +134,9 @@
'
}
],
+ 'extra' => {
+ 'item_number' => 1
+ },
'parent' => {}
},
{
@@ -156,6 +159,9 @@
'type' => 'empty_line'
}
],
+ 'extra' => {
+ 'item_number' => 2
+ },
'parent' => {}
}
],
Index: t/results/invalid_nestings/on_itemize_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/on_itemize_line.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/invalid_nestings/on_itemize_line.pl 20 Nov 2010 16:58:06
-0000 1.18
+++ t/results/invalid_nestings/on_itemize_line.pl 21 Nov 2010 22:41:27
-0000 1.19
@@ -186,6 +186,9 @@
'type' => 'paragraph'
}
],
+ 'extra' => {
+ 'item_number' => 1
+ },
'parent' => {}
}
],
Index: t/results/itemize/accent_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/accent_argument.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/itemize/accent_argument.pl 20 Nov 2010 16:58:07 -0000
1.17
+++ t/results/itemize/accent_argument.pl 21 Nov 2010 22:41:27 -0000
1.18
@@ -62,6 +62,9 @@
'type' => 'paragraph'
}
],
+ 'extra' => {
+ 'item_number' => 1
+ },
'parent' => {}
}
],
@@ -138,6 +141,9 @@
'type' => 'paragraph'
}
],
+ 'extra' => {
+ 'item_number' => 1
+ },
'parent' => {}
}
],
Index: t/results/itemize/headitem_itemx_in_enumerate.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/itemize/headitem_itemx_in_enumerate.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/itemize/headitem_itemx_in_enumerate.pl 20 Nov 2010 16:58:07
-0000 1.7
+++ t/results/itemize/headitem_itemx_in_enumerate.pl 21 Nov 2010 22:41:27
-0000 1.8
@@ -70,6 +70,9 @@
'type' => 'paragraph'
}
],
+ 'extra' => {
+ 'item_number' => 1
+ },
'parent' => {}
}
],
Index: t/results/itemize/headitem_itemx_in_itemize.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/itemize/headitem_itemx_in_itemize.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/itemize/headitem_itemx_in_itemize.pl 20 Nov 2010 16:58:07
-0000 1.7
+++ t/results/itemize/headitem_itemx_in_itemize.pl 21 Nov 2010 22:41:27
-0000 1.8
@@ -70,6 +70,9 @@
'type' => 'paragraph'
}
],
+ 'extra' => {
+ 'item_number' => 1
+ },
'parent' => {}
}
],
Index: t/results/itemize/not_closed_item.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/not_closed_item.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/itemize/not_closed_item.pl 20 Nov 2010 16:58:07 -0000
1.7
+++ t/results/itemize/not_closed_item.pl 21 Nov 2010 22:41:27 -0000
1.8
@@ -38,6 +38,9 @@
'type' => 'paragraph'
}
],
+ 'extra' => {
+ 'item_number' => 1
+ },
'parent' => {}
}
],
Index: t/results/itemize/w_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/w_argument.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/itemize/w_argument.pl 20 Nov 2010 16:58:07 -0000 1.17
+++ t/results/itemize/w_argument.pl 21 Nov 2010 22:41:27 -0000 1.18
@@ -80,6 +80,9 @@
'type' => 'paragraph'
}
],
+ 'extra' => {
+ 'item_number' => 1
+ },
'parent' => {}
},
{
@@ -119,6 +122,9 @@
'type' => 'paragraph'
}
],
+ 'extra' => {
+ 'item_number' => 2
+ },
'parent' => {}
}
],
Index: t/results/macro/macro_in_brace_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_brace_command.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/macro/macro_in_brace_command.pl 20 Nov 2010 16:58:07 -0000
1.21
+++ t/results/macro/macro_in_brace_command.pl 21 Nov 2010 22:41:27 -0000
1.22
@@ -179,6 +179,9 @@
'type' => 'paragraph'
}
],
+ 'extra' => {
+ 'item_number' => 1
+ },
'parent' => {}
}
],