[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp MANIFEST texi2any.pl Texinfo/Common....
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp MANIFEST texi2any.pl Texinfo/Common.... |
|
Date: |
Thu, 16 Feb 2012 00:33:52 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/02/16 00:33:52
Modified files:
tp : MANIFEST texi2any.pl
tp/Texinfo : Common.pm
tp/t : index_before_item.t
tp/tests/coverage/res_parser/formatting: formatting.html
tp/tests/coverage/res_parser/formatting_fr: formatting.html
tp/tests/coverage/res_parser/formatting_utf8_enable_encoding:
formatting_utf8.html
tp/tests/layout/res_parser/formatting_chm: formatting.html
tp/tests/layout/res_parser/formatting_docbook: formatting.xml
tp/tests/layout/res_parser/formatting_exotic: index.html
tp/tests/layout/res_parser/formatting_fr_icons: formatting.html
tp/tests/layout/res_parser/formatting_html: formatting.html
tp/tests/layout/res_parser/formatting_html32: formatting.html
tp/tests/layout/res_parser/formatting_html_nodes: index.html
tp/tests/layout/res_parser/formatting_nodes: index.html
tp/tests/layout/res_parser/formatting_regions:
formatting_regions.html
tp/tests/layout/res_parser/formatting_singular: index.htm
tp/tests/layout/res_parser/formatting_weird_quotes:
formatting.html
Log message:
Set move_index_entries_after_items as a trnasformation.
Use it for HTMl and DocBook unconditionally.
Fix an infinite loop in move_index_entries_after_items.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/MANIFEST?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.112&r2=1.113
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.130&r2=1.131
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/index_before_item.t?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/formatting/formatting.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/formatting_fr/formatting.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.html?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_docbook/formatting.xml?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_exotic/index.html?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/index.html?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_nodes/index.html?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_singular/index.htm?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html?cvsroot=texinfo&r1=1.2&r2=1.3
Patches:
Index: MANIFEST
===================================================================
RCS file: /sources/texinfo/texinfo/tp/MANIFEST,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- MANIFEST 11 Feb 2012 22:35:52 -0000 1.32
+++ MANIFEST 16 Feb 2012 00:33:49 -0000 1.33
@@ -107,6 +107,7 @@
t/include/verbatim_encoded_latin1.texi
t/include/verbatim_encoded.texi
t/include/words.txt
+t/index_before_item.t
t/info_tests.t
t/init/cvs.init
t/init/icons.init
Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- texi2any.pl 15 Feb 2012 20:45:30 -0000 1.112
+++ texi2any.pl 16 Feb 2012 00:33:49 -0000 1.113
@@ -807,6 +807,7 @@
'split' => 1,
'internal_links' => 1,
'simple_menu' => 1,
+ 'move_index_entries_after_items' => 1,
'converter' => sub{Texinfo::Convert::HTML->converter(@_)},
},
'xml' => {
@@ -814,6 +815,7 @@
'converter' => sub{Texinfo::Convert::XML->converter(@_)},
},
'docbook' => {
+ 'move_index_entries_after_items' => 1,
'converter' => sub{Texinfo::Convert::DocBook->converter(@_)},
},
'pdf' => {
@@ -1029,6 +1031,12 @@
handle_errors($parser, $error_count, address@hidden);
next;
}
+
+ if ($formats_table{$format}->{'move_index_entries_after_items'}
+ or $tree_transformations{'simple_menus'}) {
+ Texinfo::Common::move_index_entries_after_items_in_tree($tree);
+ }
+
Texinfo::Structuring::associate_internal_references($parser);
# every format needs the sectioning structure
# FIXME this adjusts the level of sectioning commands. Maybe should be
Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- Texinfo/Common.pm 15 Feb 2012 20:45:30 -0000 1.130
+++ Texinfo/Common.pm 16 Feb 2012 00:33:49 -0000 1.131
@@ -226,7 +226,7 @@
my %valid_tree_transformations;
foreach my $valid_transformation ('simple_menus',
- 'fill_gaps_in_sectioning', ) {
+ 'fill_gaps_in_sectioning', 'move_index_entries_after_items') {
$valid_tree_transformations{$valid_transformation} = 1;
}
@@ -1479,6 +1479,7 @@
my $self = shift;
my $tree = shift;
my $operation = shift;
+ #print STDERR "tree: $tree\n";
if ($tree->{'args'}) {
my @args = @{$tree->{'args'}};
@@ -1726,11 +1727,12 @@
sub move_index_entries_after_items($) {
# enumerate or itemize
- my $format = shift;
+ my $current = shift;
+
+ return unless ($current->{'contents'});
my $previous;
- return unless ($format->{'contents'});
- foreach my $item (@{$format->{'contents'}}) {
+ foreach my $item (@{$current->{'contents'}}) {
#print STDERR "Before proceeding: $previous $item->{'cmdname'}
(@{$previous->{'contents'}})\n" if ($previous and $previous->{'contents'});
if (defined($previous) and $item->{'cmdname'}
and $item->{'cmdname'} eq 'item'
@@ -1759,11 +1761,12 @@
#print STDERR "Gathered: @gathered_index_entries\n";
if (scalar(@gathered_index_entries)) {
# put back leading comments
- while (!$gathered_index_entries[0]->{'type'}
- or $gathered_index_entries[0]->{'type'} ne
'index_entry_command') {
+ while ($gathered_index_entries[0]
+ and (!$gathered_index_entries[0]->{'type'}
+ or $gathered_index_entries[0]->{'type'} ne
'index_entry_command')) {
#print STDERR "Putting back $gathered_index_entries[0]
$gathered_index_entries[0]->{'cmdname'}\n";
push @{$previous_ending_container->{'contents'}},
- shift (@gathered_index_entries);
+ shift @gathered_index_entries;
}
# We have the index entries of the previous @item or before item.
@@ -1800,7 +1803,7 @@
}
}
-sub _move_index_entries_after_items($)
+sub _move_index_entries_after_items($$$)
{
my $self = shift;
my $type = shift;
@@ -1810,7 +1813,7 @@
or $current->{'cmdname'} eq 'itemize')) {
move_index_entries_after_items($current);
}
- return $current;
+ return ($current);
}
sub move_index_entries_after_items_in_tree($)
@@ -2067,6 +2070,12 @@
defined it is used for error reporting in case an hash character
could not be protected because it appeared in a raw environment.
+=item move_index_entries_after_items_in_tree($tree)
+
+In C<@enumerate> and C<@itemize> from the tree, move index entries
+appearing just before C<@item> after the C<@item>. Comment lines
+between index entries are moved too.
+
=item $command = find_parent_root_command($parser, $tree_element)
Find the parent root command of a tree element (sectioning command or node).
Index: t/index_before_item.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/index_before_item.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/index_before_item.t 15 Feb 2012 20:45:31 -0000 1.1
+++ t/index_before_item.t 16 Feb 2012 00:33:49 -0000 1.2
@@ -1,7 +1,7 @@
use strict;
use Test::More;
-BEGIN { plan tests => 5 };
+BEGIN { plan tests => 6 };
use lib 'maintain/lib/Unicode-EastAsianWidth/lib/';
use lib 'maintain/lib/libintl-perl/lib/';
@@ -153,3 +153,13 @@
in item
@end itemize
', 'only comments and index entries in items');
+
+run_test('@itemize i
address@hidden comment in itemize
address@hidden e--mph item
address@hidden itemize
+', '@itemize i
address@hidden comment in itemize
address@hidden e--mph item
address@hidden itemize
+', 'only comment');
Index: tests/coverage/res_parser/formatting/formatting.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/coverage/res_parser/formatting/formatting.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/coverage/res_parser/formatting/formatting.html 21 Jan 2012
23:27:58 -0000 1.2
+++ tests/coverage/res_parser/formatting/formatting.html 16 Feb 2012
00:33:50 -0000 1.3
@@ -933,8 +933,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-titlepage-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-titlepage-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -1657,8 +1657,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -2406,8 +2406,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3130,8 +3130,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3858,7 +3858,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li>• a--n
itemize line <pre class="example">i--tem 1
+<li>• a--n itemize line <pre class="example"><a
name="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
Index: tests/coverage/res_parser/formatting_fr/formatting.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/coverage/res_parser/formatting_fr/formatting.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/coverage/res_parser/formatting_fr/formatting.html 21 Jan 2012
23:27:58 -0000 1.2
+++ tests/coverage/res_parser/formatting_fr/formatting.html 16 Feb 2012
00:33:50 -0000 1.3
@@ -933,8 +933,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-titlepage-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-titlepage-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -1657,8 +1657,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -2406,8 +2406,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3130,8 +3130,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3858,7 +3858,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li>• a--n
itemize line <pre class="example">i--tem 1
+<li>• a--n itemize line <pre class="example"><a
name="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
Index:
tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
---
tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html
21 Jan 2012 23:27:58 -0000 1.2
+++
tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html
16 Feb 2012 00:33:50 -0000 1.3
@@ -933,8 +933,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-titlepage-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-titlepage-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -1657,8 +1657,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -2408,8 +2408,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3132,8 +3132,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3860,7 +3860,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li>• a--n
itemize line <pre class="example">i--tem 1
+<li>• a--n itemize line <pre class="example"><a
name="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
Index: tests/layout/res_parser/formatting_chm/formatting.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tests/layout/res_parser/formatting_chm/formatting.html 21 Jan 2012
23:27:58 -0000 1.3
+++ tests/layout/res_parser/formatting_chm/formatting.html 16 Feb 2012
00:33:50 -0000 1.4
@@ -933,8 +933,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-titlepage-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-titlepage-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -1657,8 +1657,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -2390,8 +2390,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3114,8 +3114,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3842,7 +3842,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li>• a--n
itemize line <pre class="example">i--tem 1
+<li>• a--n itemize line <pre class="example"><a
name="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
Index: tests/layout/res_parser/formatting_docbook/formatting.xml
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_docbook/formatting.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/layout/res_parser/formatting_docbook/formatting.xml 13 Feb 2012
22:48:23 -0000 1.2
+++ tests/layout/res_parser/formatting_docbook/formatting.xml 16 Feb 2012
00:33:50 -0000 1.3
@@ -261,8 +261,8 @@
<itemizedlist><!-- comment in itemize -->
<listitem><para><emphasis>after emph</emphasis> e–mph item
</para></listitem></itemizedlist>
-<itemizedlist><indexterm role="cp"><primary>index entry within
itemize</primary></indexterm>
-<listitem><para>• a–n itemize line i–tem 1
+<itemizedlist><listitem><indexterm role="cp"><primary>index entry within
itemize</primary></indexterm>
+<para>• a–n itemize line i–tem 1
</para></listitem><listitem><para>• a–n itemize line i–tem 2
</para></listitem></itemizedlist>
<orderedlist numeration="arabic"><listitem><para>e–numerate
@@ -758,8 +758,8 @@
<itemizedlist><!-- comment in itemize -->
<listitem><para><emphasis>after emph</emphasis> e–mph item
</para></listitem></itemizedlist>
-<itemizedlist><indexterm role="cp"><primary>index entry within
itemize</primary></indexterm>
-<listitem><para>• a–n itemize line i–tem 1
+<itemizedlist><listitem><indexterm role="cp"><primary>index entry within
itemize</primary></indexterm>
+<para>• a–n itemize line i–tem 1
</para></listitem><listitem><para>• a–n itemize line i–tem 2
</para></listitem></itemizedlist>
<orderedlist numeration="arabic"><listitem><para>e–numerate
@@ -1256,8 +1256,8 @@
<itemizedlist><!-- comment in itemize -->
<listitem><para><emphasis>after emph</emphasis> e–mph item
</para></listitem></itemizedlist>
-<itemizedlist><indexterm role="cp"><primary>index entry within
itemize</primary></indexterm>
-<listitem><para>• a–n itemize line i–tem 1
+<itemizedlist><listitem><indexterm role="cp"><primary>index entry within
itemize</primary></indexterm>
+<para>• a–n itemize line i–tem 1
</para></listitem><listitem><para>• a–n itemize line i–tem 2
</para></listitem></itemizedlist>
<orderedlist numeration="arabic"><listitem><para>e–numerate
@@ -1755,8 +1755,8 @@
<itemizedlist><!-- comment in itemize -->
<listitem><para><emphasis>after emph</emphasis> e–mph item
</para></listitem></itemizedlist>
-<itemizedlist><indexterm role="cp"><primary>index entry within
itemize</primary></indexterm>
-<listitem><para>• a–n itemize line i–tem 1
+<itemizedlist><listitem><indexterm role="cp"><primary>index entry within
itemize</primary></indexterm>
+<para>• a–n itemize line i–tem 1
</para></listitem><listitem><para>• a–n itemize line i–tem 2
</para></listitem></itemizedlist>
<orderedlist numeration="arabic"><listitem><para>e–numerate
@@ -2253,8 +2253,8 @@
<itemizedlist><!-- comment in itemize -->
<listitem><para><emphasis>after emph</emphasis> e–mph item
</para></listitem></itemizedlist>
-<itemizedlist><indexterm role="cp"><primary>index entry within
itemize</primary></indexterm>
-<listitem><para>• a–n itemize line i–tem 1
+<itemizedlist><listitem><indexterm role="cp"><primary>index entry within
itemize</primary></indexterm>
+<para>• a–n itemize line i–tem 1
</para></listitem><listitem><para>• a–n itemize line i–tem 2
</para></listitem></itemizedlist>
<orderedlist numeration="arabic"><listitem><para>e–numerate
@@ -2750,8 +2750,8 @@
</screen><itemizedlist><screen><!-- comment in itemize -->
</screen><listitem><screen><emphasis>after emph</emphasis> e--mph item
</screen></listitem></itemizedlist><screen>
-</screen><itemizedlist><screen><indexterm role="cp"><primary>index entry
within itemize</primary></indexterm>
-</screen><listitem><screen>• a--n itemize line i--tem 1
+</screen><itemizedlist><screen></screen><listitem><screen>• a--n itemize
line <indexterm role="cp"><primary>index entry within
itemize</primary></indexterm>
+i--tem 1
</screen></listitem><listitem><screen>• a--n itemize line i--tem 2
</screen></listitem></itemizedlist><screen>
</screen><orderedlist numeration="arabic"><listitem><screen>e--numerate
Index: tests/layout/res_parser/formatting_exotic/index.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/index.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tests/layout/res_parser/formatting_exotic/index.html 21 Jan 2012
23:27:58 -0000 1.3
+++ tests/layout/res_parser/formatting_exotic/index.html 16 Feb 2012
00:33:50 -0000 1.4
@@ -946,8 +946,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -1670,8 +1670,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -2398,7 +2398,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li>• a--n
itemize line <pre class="example">i--tem 1
+<li>• a--n itemize line <pre class="example"><a
name="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
Index: tests/layout/res_parser/formatting_fr_icons/formatting.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/layout/res_parser/formatting_fr_icons/formatting.html 21 Jan 2012
23:27:58 -0000 1.2
+++ tests/layout/res_parser/formatting_fr_icons/formatting.html 16 Feb 2012
00:33:50 -0000 1.3
@@ -933,8 +933,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-titlepage-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-titlepage-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -1657,8 +1657,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -2406,8 +2406,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3130,8 +3130,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3858,7 +3858,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li>• a--n
itemize line <pre class="example">i--tem 1
+<li>• a--n itemize line <pre class="example"><a
name="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
Index: tests/layout/res_parser/formatting_html/formatting.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/layout/res_parser/formatting_html/formatting.html 21 Jan 2012
23:27:59 -0000 1.2
+++ tests/layout/res_parser/formatting_html/formatting.html 16 Feb 2012
00:33:51 -0000 1.3
@@ -933,8 +933,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-titlepage-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-titlepage-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -1657,8 +1657,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -2406,8 +2406,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3130,8 +3130,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3858,7 +3858,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li>• a--n
itemize line <pre class="example">i--tem 1
+<li>• a--n itemize line <pre class="example"><a
name="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
Index: tests/layout/res_parser/formatting_html32/formatting.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/layout/res_parser/formatting_html32/formatting.html 21 Jan 2012
23:27:59 -0000 1.2
+++ tests/layout/res_parser/formatting_html32/formatting.html 16 Feb 2012
00:33:51 -0000 1.3
@@ -908,8 +908,8 @@
</li></ul>
<ul>
-<li><a name="index-titlepage-index-entry-within-itemize"></a>
-</li><li>* a-n itemize line i-tem 1
+<li>* a-n itemize line <a
name="index-titlepage-index-entry-within-itemize"></a>
+i-tem 1
</li><li>* a-n itemize line i-tem 2
</li></ul>
@@ -1624,8 +1624,8 @@
</li></ul>
<ul>
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>* a-n itemize line i-tem 1
+<li>* a-n itemize line <a name="index-copying-index-entry-within-itemize"></a>
+i-tem 1
</li><li>* a-n itemize line i-tem 2
</li></ul>
@@ -2365,8 +2365,8 @@
</li></ul>
<ul>
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>* a-n itemize line i-tem 1
+<li>* a-n itemize line <a name="index-copying-index-entry-within-itemize"></a>
+i-tem 1
</li><li>* a-n itemize line i-tem 2
</li></ul>
@@ -3081,8 +3081,8 @@
</li></ul>
<ul>
-<li><a name="index-index-entry-within-itemize"></a>
-</li><li>* a-n itemize line i-tem 1
+<li>* a-n itemize line <a name="index-index-entry-within-itemize"></a>
+i-tem 1
</li><li>* a-n itemize line i-tem 2
</li></ul>
@@ -3800,7 +3800,7 @@
</pre></li></ul>
<pre>
</pre><ul>
-<li><pre><a name="index-index-entry-within-itemize-1"></a></pre></li><li>*
a--n itemize line <pre>i--tem 1
+<li>* a--n itemize line <pre><a
name="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li>* a--n itemize line <pre>i--tem 2
</pre></li></ul>
<pre>
Index: tests/layout/res_parser/formatting_html_nodes/index.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/index.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tests/layout/res_parser/formatting_html_nodes/index.html 21 Jan 2012
23:27:59 -0000 1.3
+++ tests/layout/res_parser/formatting_html_nodes/index.html 16 Feb 2012
00:33:51 -0000 1.4
@@ -933,8 +933,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-titlepage-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-titlepage-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -1657,8 +1657,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -2407,8 +2407,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3131,8 +3131,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3859,7 +3859,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li>• a--n
itemize line <pre class="example">i--tem 1
+<li>• a--n itemize line <pre class="example"><a
name="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
Index: tests/layout/res_parser/formatting_nodes/index.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/index.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tests/layout/res_parser/formatting_nodes/index.html 21 Jan 2012 23:27:59
-0000 1.3
+++ tests/layout/res_parser/formatting_nodes/index.html 16 Feb 2012 00:33:51
-0000 1.4
@@ -933,8 +933,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-titlepage-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-titlepage-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -1657,8 +1657,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -2407,8 +2407,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3131,8 +3131,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3859,7 +3859,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li>• a--n
itemize line <pre class="example">i--tem 1
+<li>• a--n itemize line <pre class="example"><a
name="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
Index: tests/layout/res_parser/formatting_regions/formatting_regions.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/layout/res_parser/formatting_regions/formatting_regions.html 21 Jan
2012 23:27:59 -0000 1.2
+++ tests/layout/res_parser/formatting_regions/formatting_regions.html 16 Feb
2012 00:33:51 -0000 1.3
@@ -924,8 +924,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-titlepage-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-titlepage-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -1638,8 +1638,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -2389,8 +2389,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3107,7 +3107,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li>• a--n
itemize line <pre class="example">i--tem 1
+<li>• a--n itemize line <pre class="example"><a
name="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
@@ -3824,8 +3824,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
Index: tests/layout/res_parser/formatting_singular/index.htm
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_singular/index.htm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tests/layout/res_parser/formatting_singular/index.htm 21 Jan 2012
23:27:59 -0000 1.3
+++ tests/layout/res_parser/formatting_singular/index.htm 16 Feb 2012
00:33:51 -0000 1.4
@@ -978,8 +978,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -1729,8 +1729,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -2484,7 +2484,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li>• a--n
itemize line <pre class="example">i--tem 1
+<li>• a--n itemize line <pre class="example"><a
name="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
Index: tests/layout/res_parser/formatting_weird_quotes/formatting.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/layout/res_parser/formatting_weird_quotes/formatting.html 21 Jan
2012 23:27:59 -0000 1.2
+++ tests/layout/res_parser/formatting_weird_quotes/formatting.html 16 Feb
2012 00:33:52 -0000 1.3
@@ -933,8 +933,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-titlepage-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-titlepage-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -1657,8 +1657,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -2406,8 +2406,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-copying-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-copying-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3130,8 +3130,8 @@
</li></ul>
<ul class="no-bullet">
-<li><a name="index-index-entry-within-itemize"></a>
-</li><li>• a–n itemize line i–tem 1
+<li>• a–n itemize line <a
name="index-index-entry-within-itemize"></a>
+i–tem 1
</li><li>• a–n itemize line i–tem 2
</li></ul>
@@ -3858,7 +3858,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li>• a--n
itemize line <pre class="example">i--tem 1
+<li>• a--n itemize line <pre class="example"><a
name="index-index-entry-within-itemize-1"></a>i--tem 1
</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp MANIFEST texi2any.pl Texinfo/Common....,
Patrice Dumas <=