[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Convert/HTML.pm maintain/all...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Convert/HTML.pm maintain/all... |
|
Date: |
Thu, 02 Aug 2012 23:49:28 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/08/02 23:49:28
Modified files:
tp/Texinfo/Convert: HTML.pm
tp/maintain : all_tests.sh
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_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:
New function convert_tree_new_formatting_context to encapsulate setting
of multiple_pass and _new_document_context.
Use a new document context for item prependended text formatting.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.241&r2=1.242
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/maintain/all_tests.sh?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/formatting/formatting.html?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/formatting_fr/formatting.html?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.html?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_exotic/index.html?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.html?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.html?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/index.html?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_nodes/index.html?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_singular/index.htm?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html?cvsroot=texinfo&r1=1.6&r2=1.7
Patches:
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -b -r1.241 -r1.242
--- Texinfo/Convert/HTML.pm 1 Aug 2012 23:56:28 -0000 1.241
+++ Texinfo/Convert/HTML.pm 2 Aug 2012 23:49:26 -0000 1.242
@@ -464,9 +464,8 @@
$tree = {'type' => '_string',
'contents' => [$tree]};
}
- $self->_new_document_context($command->{'cmdname'});
- my $result = $self->_convert($tree, 'external manual');
- pop @{$self->{'document_context'}};
+ my $result = $self->convert_tree_new_formatting_context(
+ $tree, $command->{'cmdname'});
return $result;
}
}
@@ -542,16 +541,12 @@
}
print STDERR "DO $target->{'id'}($type)\n" if ($self->get_conf('DEBUG'));
- #$self->{'ignore_notice'}++ if ($type ne 'text');
- $self->{'ignore_notice'}++;
if ($type =~ /^(.*)_nonumber$/) {
$tree = $target->{'tree_nonumber'}
if (defined($target->{'tree_nonumber'}));
- $target->{$type} = $self->_convert($tree, $explanation);
- } else {
- $target->{$type} = $self->_convert($tree, $explanation);
}
- #$self->{'ignore_notice'}-- if ($type ne 'text');
+ $self->{'ignore_notice'}++;
+ $target->{$type} = $self->_convert($tree, $explanation);
$self->{'ignore_notice'}--;
pop @{$self->{'document_context'}};
@@ -615,6 +610,26 @@
}
}
+sub convert_tree_new_formatting_context($$$;$)
+{
+ my $self = shift;
+ my $tree = shift;
+ my $context_string = shift;
+ my $multiple_pass = shift;
+ $self->_new_document_context($context_string);
+ if ($multiple_pass) {
+ $self->{'ignore_notice'}++;
+ push @{$self->{'multiple_pass'}}, $multiple_pass;
+ }
+ my $result = $self->convert_tree($tree);
+ pop @{$self->{'document_context'}};
+ if ($multiple_pass) {
+ $self->{'ignore_notice'}--;
+ pop @{$self->{'multiple_pass'}};
+ }
+ return $result;
+}
+
# see http://www.w3.org/TR/REC-html40/types.html#type-links
my %BUTTONS_REL =
(
@@ -808,9 +823,8 @@
foreach my $hash (\%BUTTONS_TEXT, \%BUTTONS_GOTO, \%BUTTONS_NAME) {
foreach my $button (keys (%$hash)) {
if (ref($hash->{$button})) {
- $self->_new_document_context("button $button");
- $hash->{$button} = $self->convert_tree($hash->{$button});
- pop @{$self->{'document_context'}};
+ $hash->{$button} = $self->convert_tree_new_formatting_context(
+ $hash->{$button}, "button $button");
}
}
}
@@ -821,14 +835,9 @@
$translated_commands{$command} = 1;
delete $self->{'commands_formatting'}->{$context}->{$command};
if (defined($self->{'commands_translation'}->{$context}->{$command})) {
- $self->_new_document_context("translated command $command");
- #my $command_tree
$self->{'commands_formatting'}->{$context}->{$command}
=
$self->gdt($self->{'commands_translation'}->{$context}->{$command},
undef, 'translated_text');
- #$self->{'commands_formatting'}->{$context}->{$command}
- # = $self->convert_tree($command_tree);
- pop @{$self->{'document_context'}};
}
}
}
@@ -1403,7 +1412,7 @@
my $command = shift;
my $args = shift;
- return $self->convert_tree ($self->gdt('@{No value for `{value}\'@}',
+ return $self->convert_tree($self->gdt('@{No value for `{value}\'@}',
{'value' => $command->{'type'}}));
}
@@ -1454,12 +1463,10 @@
$explanation_string = $args->[1]->{'string'};
}
if ($command->{'extra'}->{'explanation_contents'}) {
- $self->{'ignore_notice'}++;
- $self->_new_document_context($cmdname);
- $explanation_string = $self->convert_tree({'type' => '_string',
- 'contents' => $command->{'extra'}->{'explanation_contents'}});
- pop @{$self->{'document_context'}};
- $self->{'ignore_notice'}--;
+ $explanation_string = $self->convert_tree_new_formatting_context(
+ {'type' => '_string',
+ 'contents' => $command->{'extra'}->{'explanation_contents'}},
+ $cmdname, $cmdname);
}
my $result = $args->[0]->{'normal'};
if (!$self->in_string()) {
@@ -1471,7 +1478,7 @@
$result .= "</$cmdname>";
}
if ($with_explanation) {
- $result = $self->convert_tree ($self->gdt('{explained_string}
({explanation})',
+ $result = $self->convert_tree($self->gdt('{explained_string}
({explanation})',
{'explained_string' => {'type' => '_converted',
'text' => $result},
'explanation' => $args->[1]->{'tree'} }));
@@ -1491,7 +1498,7 @@
my $command = shift;
my $args = shift;
- my $id = $self->command_id ($command);
+ my $id = $self->command_id($command);
if (defined($id) and $id ne '' and address@hidden>{'multiple_pass'}}
and !$self->in_string()) {
return "<a name=\"$id\"></a>";
@@ -2583,13 +2590,8 @@
my $caption_text;
if ($caption) {
- $self->{'ignore_notice'}++;
- $self->_new_document_context($cmdname);
- push @{$self->{'multiple_pass'}}, 'listoffloats';
- $caption_text = $self->convert_tree($caption->{'args'}->[0]);
- pop @{$self->{'multiple_pass'}};
- pop @{$self->{'document_context'}};
- $self->{'ignore_notice'}--;
+ $caption_text = $self->convert_tree_new_formatting_context(
+ $caption->{'args'}->[0], $cmdname, 'listoffloats');
} else {
$caption_text = '';
}
@@ -2656,17 +2658,15 @@
my $prepended_text;
if ($self->in_string()) {
if ($prepended) {
- $self->_new_document_context('float prepended');
- $prepended_text = $self->convert_tree ($prepended);
- pop @{$self->{'document_context'}};
+ $prepended_text = $self->convert_tree_new_formatting_context(
+ $prepended, 'float prepended');
} else {
$prepended_text = '';
}
if ($caption) {
- $self->_new_document_context('float caption');
- $caption_text = $self->convert_tree ({'contents'
- => $caption->{'args'}->[0]->{'contents'}});
- pop @{$self->{'document_context'}};
+ $caption_text = $self->convert_tree_new_formatting_context(
+ {'contents' => $caption->{'args'}->[0]->{'contents'}},
+ 'float caption');
}
return $prepended.$content.$caption_text;
}
@@ -2700,16 +2700,14 @@
}
push @caption_contents, @caption_original_contents;
if ($new_paragraph) {
- $self->_new_document_context('float caption');
- $caption_text = $self->convert_tree ({'contents' => address@hidden);
- pop @{$self->{'document_context'}};
+ $caption_text = $self->convert_tree_new_formatting_context(
+ {'contents' => address@hidden, 'float caption');
$prepended_text = '';
}
}
if (!$caption_text) {
- $self->_new_document_context('float prepended');
- $prepended_text = $self->convert_tree ($prepended);
- pop @{$self->{'document_context'}};
+ $prepended_text = $self->convert_tree_new_formatting_context(
+ $prepended, 'float prepended');
if ($prepended_text ne '') {
$prepended_text = '<p><strong>'.$prepended_text.'</strong></p>';
}
@@ -2721,9 +2719,8 @@
# Texinfo::Parser::_print_current ($caption)."\n";
if ($caption and !$caption_text) {
- $self->_new_document_context('float caption');
- $caption_text = $self->convert_tree ($caption->{'args'}->[0]);
- pop @{$self->{'document_context'}};
+ $caption_text = $self->convert_tree_new_formatting_context(
+ $caption->{'args'}->[0], 'float caption');
}
return $self->_attribute_class('div','float'). '>' .$label."\n".$content.
'</div>' . $prepended_text.$caption_text;
@@ -2873,13 +2870,11 @@
and $itemize->{'extra'}->{'command_as_argument'}->{'cmdname'} eq
'bullet') {
$prepend = '';
} else {
- $self->{'ignore_notice'}++;
- # This should not be needed, only in case of invalid constructs
- push @{$self->{'multiple_pass'}}, 'item_prepended';
- $prepend = $self->convert_tree(
- {'contents' =>
$itemize->{'extra'}->{'block_command_line_contents'}->[0]});
- pop @{$self->{'multiple_pass'}};
- $self->{'ignore_notice'}--;
+ # Setting multiple expansion should not be needed, except in
+ # case of invalid constructs
+ $prepend = $self->convert_tree_new_formatting_context(
+ {'contents' =>
$itemize->{'extra'}->{'block_command_line_contents'}->[0]},
+ $command->{'cmdname'}, 'item_prepended');
}
if ($content =~ /\S/) {
return '<li>' . $prepend .' '. $content . '</li>';
@@ -3085,7 +3080,7 @@
= $root->{'extra'}->{'node_argument'}->{'manual_content'};
my $file_with_node_tree = {'type' => '_code',
'contents' =>
address@hidden>{'manual_content'}}]};
- $file = $self->_convert($file_with_node_tree, 'node file in ref');
+ $file = $self->convert_tree($file_with_node_tree, 'node file in ref');
}
my $href = $self->command_href($node_entry);
@@ -3099,7 +3094,7 @@
} elsif (!defined($name) and $node_entry->{'node_content'}) {
my $node_no_file_tree = {'type' => '_code',
'contents' =>
address@hidden>{'node_content'}}]};
- my $node_name = $self->_convert($node_no_file_tree, 'node in ref');
+ my $node_name = $self->convert_tree($node_no_file_tree, 'node in ref');
if (defined($node_name) and ($self->get_conf('KEEP_TOP_EXTERNAL_REF')
or $node_name ne 'Top')) {
$name = $node_name;
@@ -3212,7 +3207,7 @@
my $command = shift;
my $args = shift;
- my $index_id = $self->command_id ($command);
+ my $index_id = $self->command_id($command);
if (defined($index_id) and $index_id ne ''
and address@hidden>{'multiple_pass'}}
and !$self->in_string()) {
@@ -3302,7 +3297,7 @@
}
# format the summary
my $summary = "<table><tr><th valign=\"top\">"
- . $self->_convert($self->gdt('Jump to')) .": </th><td>" .
+ . $self->convert_tree($self->gdt('Jump to')) .": </th><td>" .
$non_alpha_text . $join . $alpha_text . "</td></tr></table>\n";
$result .= $summary;
@@ -3342,7 +3337,7 @@
next if ($entry !~ /\S/);
$entry = '<code>' .$entry .'</code>' if ($index_entry_ref->{'in_code'});
- my $entry_href = $self->command_href ($index_entry_ref->{'command'});
+ my $entry_href = $self->command_href($index_entry_ref->{'command'});
my $associated_command;
if ($self->get_conf('NODE_NAME_IN_INDEX')) {
$associated_command = $index_entry_ref->{'node'};
@@ -4229,9 +4224,8 @@
$titlepage_text = $self->convert_tree({'contents'
=> $self->{'extra'}->{'titlepage'}->{'contents'}});
} elsif ($self->{'simpletitle_tree'}) {
- $self->_new_document_context('simpletitle_string');
- my $title_text = $self->convert_tree($self->{'simpletitle_tree'});
- pop @{$self->{'document_context'}};
+ my $title_text = $self->convert_tree_new_formatting_context(
+ $self->{'simpletitle_tree'}, 'simpletitle_string');
$titlepage_text = &{$self->{'format_heading_text'}}($self, 'settitle',
$title_text,
0, {'cmdname' => 'settitle',
'contents' => $self->{'simpletitle_tree'}->{'contents'}});
@@ -4253,9 +4247,8 @@
$result .= &{$self->{'format_titlepage'}}($self);
} else {
if ($self->{'simpletitle_tree'}) {
- $self->_new_document_context('simpletitle_string');
- my $title_text = $self->convert_tree($self->{'simpletitle_tree'});
- pop @{$self->{'document_context'}};
+ my $title_text = $self->convert_tree_new_formatting_context(
+ $self->{'simpletitle_tree'}, 'simpletitle_string');
$result .= &{$self->{'format_heading_text'}}($self, 'settitle',
$title_text,
0, {'cmdname' => 'settitle',
'contents' => $self->{'simpletitle_tree'}->{'contents'}});
@@ -6096,12 +6089,9 @@
my $title_tree = $self->gdt('{title}: {element_text}',
{ 'title' => $self->{'title_tree'},
'element_text' => $self->command_text($command, 'tree')});
- $self->{'ignore_notice'}++;
- $self->_new_document_context($command->{'cmdname'});
- $title = $self->_convert({'type' => '_string',
- 'contents' => [$title_tree]});
- pop @{$self->{'document_context'}};
- $self->{'ignore_notice'}--;
+ $title = $self->convert_tree_new_formatting_context(
+ {'type' => '_string', 'contents' => [$title_tree]},
+ $command->{'cmdname'}, 'element_title');
}
}
$title = $self->{'title_string'} if (!defined($title));
@@ -6123,9 +6113,8 @@
my $date = '';
if ($self->get_conf('DATE_IN_HEADER')) {
- $self->_new_document_context('DATE_IN_HEADER');
- my $today = $self->convert_tree({'cmdname' => 'today'});
- pop @{$self->{'document_context'}};
+ my $today = $self->convert_tree_new_formatting_context(
+ {'cmdname' => 'today'}, 'DATE_IN_HEADER');
$date = "\n<meta name=\"date\" content=\"$today\">";
}
@@ -6774,18 +6763,16 @@
if ($fulltitle) {
$self->{'title_tree'} = $fulltitle;
print STDERR "DO fulltitle_string\n" if ($self->get_conf('DEBUG'));
- $self->_new_document_context('title_string');
- $html_title_string = $self->_convert({'type' => '_string',
- 'contents' =>
[$self->{'title_tree'}]});
- pop @{$self->{'document_context'}};
+ $html_title_string = $self->convert_tree_new_formatting_context(
+ {'type' => '_string', 'contents' => [$self->{'title_tree'}]},
+ 'title_string');
}
if (!defined($html_title_string) or $html_title_string !~ /\S/) {
my $default_title = $self->gdt('Untitled Document');
$self->{'title_tree'} = $default_title;
- $self->_new_document_context('title_string');
- $self->{'title_string'} = $self->_convert({'type' => '_string',
- 'contents' =>
[$self->{'title_tree'}]});
- pop @{$self->{'document_context'}};
+ $self->{'title_string'} = $self->convert_tree_new_formatting_context(
+ {'type' => '_string', 'contents' => [$self->{'title_tree'}]},
+ 'title_string');
$self->document_warn($self->__(
"Must specify a title with a title command or
address@hidden"));
} else {
@@ -6806,12 +6793,12 @@
# documentdescription
if ($self->{'extra'}->{'documentdescription'}) {
print STDERR "DO documentdescription\n" if ($self->get_conf('DEBUG'));
- $self->_new_document_context('documentdescription');
- $self->{'documentdescription_string'} = $self->_convert(
+ $self->{'documentdescription_string'}
+ = $self->convert_tree_new_formatting_context(
{'type' => '_string',
- 'contents' => $self->{'extra'}->{'documentdescription'}->{'contents'}});
+ 'contents' => $self->{'extra'}->{'documentdescription'}->{'contents'}},
+ 'documentdescription');
chomp($self->{'documentdescription_string'});
- pop @{$self->{'document_context'}};
}
my $init_status = $self->run_stage_handlers('init');
Index: maintain/all_tests.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/maintain/all_tests.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- maintain/all_tests.sh 20 May 2012 18:50:40 -0000 1.4
+++ maintain/all_tests.sh 2 Aug 2012 23:49:26 -0000 1.5
@@ -29,10 +29,18 @@
for result in t/results/*/*.pl; do
diff -U 3 $result $result.new
done
+ for result in t/results/*/*/res*/; do
+ out=`echo $result | sed 's;res\([^/]*/\)$;out\1;'`
+ diff -u --exclude=CVS -r $result $out
+ done
else
for result in t/results/$test_name/*.pl; do
diff -u $result $result.new
done
+ for result in t/results/$test_name/*/res*/; do
+ out=`echo $result | sed 's;res\([^/]*/\)$;out\1;'`
+ diff -u --exclude=CVS -r $result $out
+ done
fi
elif [ "$command" = 'texis' ]; then
for file in t/*.t; do
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tests/coverage/res_parser/formatting/formatting.html 31 Jul 2012
21:54:37 -0000 1.6
+++ tests/coverage/res_parser/formatting/formatting.html 2 Aug 2012
23:49:26 -0000 1.7
@@ -3858,8 +3858,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<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
+<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">
</pre><ol>
@@ -4234,8 +4234,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li>• a--n itemize line <pre class="example">i--tem 1
-</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
+<li>• a–n itemize line <pre class="example">i--tem 1
+</pre></li><li>• a–n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tests/coverage/res_parser/formatting_fr/formatting.html 31 Jul 2012
21:54:37 -0000 1.6
+++ tests/coverage/res_parser/formatting_fr/formatting.html 2 Aug 2012
23:49:26 -0000 1.7
@@ -3858,8 +3858,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<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
+<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">
</pre><ol>
@@ -4234,8 +4234,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li>• a--n itemize line <pre class="example">i--tem 1
-</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
+<li>• a–n itemize line <pre class="example">i--tem 1
+</pre></li><li>• a–n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
---
tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html
31 Jul 2012 21:54:37 -0000 1.6
+++
tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html
2 Aug 2012 23:49:26 -0000 1.7
@@ -3860,8 +3860,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<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
+<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">
</pre><ol>
@@ -4236,8 +4236,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li>• a--n itemize line <pre class="example">i--tem 1
-</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
+<li>• a–n itemize line <pre class="example">i--tem 1
+</pre></li><li>• a–n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tests/layout/res_parser/formatting_chm/formatting.html 31 Jul 2012
21:54:37 -0000 1.6
+++ tests/layout/res_parser/formatting_chm/formatting.html 2 Aug 2012
23:49:27 -0000 1.7
@@ -3842,8 +3842,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<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
+<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">
</pre><ol>
@@ -4218,8 +4218,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li>• a--n itemize line <pre class="example">i--tem 1
-</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
+<li>• a–n itemize line <pre class="example">i--tem 1
+</pre></li><li>• a–n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/layout/res_parser/formatting_exotic/index.html 31 Jul 2012
21:54:37 -0000 1.7
+++ tests/layout/res_parser/formatting_exotic/index.html 2 Aug 2012
23:49:27 -0000 1.8
@@ -2398,8 +2398,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<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
+<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">
</pre><ol>
@@ -2774,8 +2774,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li>• a--n itemize line <pre class="example">i--tem 1
-</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
+<li>• a–n itemize line <pre class="example">i--tem 1
+</pre></li><li>• a–n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
</pre><table width="100%">
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tests/layout/res_parser/formatting_fr_icons/formatting.html 31 Jul 2012
21:54:37 -0000 1.6
+++ tests/layout/res_parser/formatting_fr_icons/formatting.html 2 Aug 2012
23:49:27 -0000 1.7
@@ -3858,8 +3858,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<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
+<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">
</pre><ol>
@@ -4234,8 +4234,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li>• a--n itemize line <pre class="example">i--tem 1
-</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
+<li>• a–n itemize line <pre class="example">i--tem 1
+</pre></li><li>• a–n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tests/layout/res_parser/formatting_html/formatting.html 31 Jul 2012
21:54:37 -0000 1.6
+++ tests/layout/res_parser/formatting_html/formatting.html 2 Aug 2012
23:49:27 -0000 1.7
@@ -3858,8 +3858,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<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
+<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">
</pre><ol>
@@ -4234,8 +4234,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li>• a--n itemize line <pre class="example">i--tem 1
-</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
+<li>• a–n itemize line <pre class="example">i--tem 1
+</pre></li><li>• a–n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tests/layout/res_parser/formatting_html32/formatting.html 31 Jul 2012
21:54:38 -0000 1.6
+++ tests/layout/res_parser/formatting_html32/formatting.html 2 Aug 2012
23:49:27 -0000 1.7
@@ -3800,8 +3800,8 @@
</pre></li></ul>
<pre>
</pre><ul>
-<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
+<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>
</pre><ol>
@@ -4168,8 +4168,8 @@
</pre></li></ul>
<pre>
</pre><ul>
-<li>* a--n itemize line <pre>i--tem 1
-</pre></li><li>* a--n itemize line <pre>i--tem 2
+<li>* a-n itemize line <pre>i--tem 1
+</pre></li><li>* a-n itemize line <pre>i--tem 2
</pre></li></ul>
<pre>
</pre><dl>
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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/layout/res_parser/formatting_html_nodes/index.html 31 Jul 2012
21:54:38 -0000 1.7
+++ tests/layout/res_parser/formatting_html_nodes/index.html 2 Aug 2012
23:49:27 -0000 1.8
@@ -3859,8 +3859,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<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
+<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">
</pre><ol>
@@ -4235,8 +4235,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li>• a--n itemize line <pre class="example">i--tem 1
-</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
+<li>• a–n itemize line <pre class="example">i--tem 1
+</pre></li><li>• a–n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/layout/res_parser/formatting_nodes/index.html 31 Jul 2012 21:54:38
-0000 1.7
+++ tests/layout/res_parser/formatting_nodes/index.html 2 Aug 2012 23:49:27
-0000 1.8
@@ -3859,8 +3859,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<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
+<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">
</pre><ol>
@@ -4235,8 +4235,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li>• a--n itemize line <pre class="example">i--tem 1
-</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
+<li>• a–n itemize line <pre class="example">i--tem 1
+</pre></li><li>• a–n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tests/layout/res_parser/formatting_regions/formatting_regions.html 31 Jul
2012 21:54:38 -0000 1.6
+++ tests/layout/res_parser/formatting_regions/formatting_regions.html 2 Aug
2012 23:49:27 -0000 1.7
@@ -3107,8 +3107,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<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
+<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">
</pre><ol>
@@ -3474,8 +3474,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li>• a--n itemize line <pre class="example">i--tem 1
-</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
+<li>• a–n itemize line <pre class="example">i--tem 1
+</pre></li><li>• a–n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tests/layout/res_parser/formatting_singular/index.htm 31 Jul 2012
21:54:38 -0000 1.6
+++ tests/layout/res_parser/formatting_singular/index.htm 2 Aug 2012
23:49:28 -0000 1.7
@@ -2484,8 +2484,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<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
+<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">
</pre><ol>
@@ -2881,8 +2881,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li>• a--n itemize line <pre class="example">i--tem 1
-</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
+<li>• a–n itemize line <pre class="example">i--tem 1
+</pre></li><li>• a–n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tests/layout/res_parser/formatting_weird_quotes/formatting.html 31 Jul
2012 21:54:38 -0000 1.6
+++ tests/layout/res_parser/formatting_weird_quotes/formatting.html 2 Aug
2012 23:49:28 -0000 1.7
@@ -3858,8 +3858,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<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
+<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">
</pre><ol>
@@ -4234,8 +4234,8 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="no-bullet">
-<li>• a--n itemize line <pre class="example">i--tem 1
-</pre></li><li>• a--n itemize line <pre class="example">i--tem 2
+<li>• a–n itemize line <pre class="example">i--tem 1
+</pre></li><li>• a–n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Convert/HTML.pm maintain/all...,
Patrice Dumas <=