[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Convert/HTML.pm t/results/co...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Convert/HTML.pm t/results/co... |
|
Date: |
Sun, 05 Aug 2012 09:09:26 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/08/05 09:09:26
Modified files:
tp/Texinfo/Convert: HTML.pm
tp/t/results/coverage: block_commands.pl
punctuation_in_line_commands.pl
tp/t/results/coverage_braces: test_image.pl
tp/t/results/float: anchor_in_caption.pl cindex_in_caption.pl
comment_space_comand_in_float.pl
complex_float.pl
empty_listoffloats_with_floats.pl
float_copying.pl float_with_at_commands.pl
footnote_in_caption.pl
footnote_in_caption_and_error.pl
numbering_captions_listoffloats.pl
ref_to_float.pl simple.pl
tp/t/results/misc_commands: comment_space_command_on_line.pl
tp/t/results/paragraph: commands_in_flushright.pl
tp/t/results/preformatted: caption_in_example.pl
tp/t/results/sectioning: double_node_anchor_float.pl
equivalent_labels.pl no_element.pl
placed_things_before_element.pl
placed_things_before_node.pl
tp/tests/sectioning/res_parser/equivalent_nodes:
equivalent_nodes.html
tp/tests/sectioning/res_parser/equivalent_nodes_no_node:
equivalent_nodes.html
tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes:
equivalent_nodes.html
tp/tests/sectioning/res_parser/placed_things_before_element:
placed_things_before_element.html
tp/tests/sectioning/res_parser_html/equivalent_nodes: node.html
tp/tests/sectioning/res_parser_html/equivalent_nodes_no_node:
node.html
tp/tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes:
node.html
tp/tests/sectioning/res_parser_html/placed_things_before_element:
index.html
Log message:
Close the float div after the caption. Report and patch from Nikos
Mavrogiannopoulos.
Also add a div float-caption for float caption.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.245&r2=1.246
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/block_commands.pl?cvsroot=texinfo&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/test_image.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/anchor_in_caption.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/cindex_in_caption.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/comment_space_comand_in_float.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/complex_float.pl?cvsroot=texinfo&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/empty_listoffloats_with_floats.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/float_copying.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/float_with_at_commands.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/footnote_in_caption.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/footnote_in_caption_and_error.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/numbering_captions_listoffloats.pl?cvsroot=texinfo&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/ref_to_float.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/simple.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/commands_in_flushright.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/caption_in_example.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/equivalent_labels.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/no_element.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/placed_things_before_element.pl?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/placed_things_before_node.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes/equivalent_nodes.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_no_node/equivalent_nodes.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser/placed_things_before_element/placed_things_before_element.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser_html/equivalent_nodes/node.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser_html/equivalent_nodes_no_node/node.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/node.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser_html/placed_things_before_element/index.html?cvsroot=texinfo&r1=1.1&r2=1.2
Patches:
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -b -r1.245 -r1.246
--- Texinfo/Convert/HTML.pm 4 Aug 2012 22:45:44 -0000 1.245
+++ Texinfo/Convert/HTML.pm 5 Aug 2012 09:09:23 -0000 1.246
@@ -2686,6 +2686,7 @@
if ($prepended) {
if ($caption) {
+ # prepend the prepended tree to the first paragraph
my @caption_original_contents = @{$caption->{'args'}->[0]->{'contents'}};
my @caption_contents;
my $new_paragraph;
@@ -2710,7 +2711,7 @@
$prepended_text = '';
}
}
- if (!$caption_text) {
+ if ($caption_text eq '') {
$prepended_text = $self->convert_tree_new_formatting_context(
$prepended, 'float prepended');
if ($prepended_text ne '') {
@@ -2723,12 +2724,17 @@
#print STDERR "Float $prepended_text: caption $caption ".
# Texinfo::Parser::_print_current ($caption)."\n";
- if ($caption and !$caption_text) {
+ if ($caption and $caption_text eq '') {
$caption_text = $self->convert_tree_new_formatting_context(
$caption->{'args'}->[0], 'float caption');
}
+ if ($prepended_text.$caption_text ne '') {
+ $prepended_text = $self->_attribute_class('div','float-caption'). '>'
+ . $prepended_text;
+ $caption_text .= '</div>';
+ }
return $self->_attribute_class('div','float'). '>' .$label."\n".$content.
- '</div>' . $prepended_text.$caption_text;
+ $prepended_text.$caption_text . '</div>';
}
$default_commands_conversion{'float'} = \&_convert_float_command;
Index: t/results/coverage/block_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/block_commands.pl,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- t/results/coverage/block_commands.pl 1 Oct 2011 10:29:26 -0000
1.45
+++ t/results/coverage/block_commands.pl 5 Aug 2012 09:09:23 -0000
1.46
@@ -554,9 +554,9 @@
</p>
-</div><p><strong>a float 1: </strong>in caption
+<div class="float-caption"><p><strong>a float 1: </strong>in caption
</p>
-<p>in caption</p>';
+<p>in caption</p></div></div>';
$result_converted{'xml'}->{'block_commands'} = '
Index: t/results/coverage/punctuation_in_line_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/results/coverage/punctuation_in_line_commands.pl 27 May 2012 10:45:13
-0000 1.29
+++ t/results/coverage/punctuation_in_line_commands.pl 5 Aug 2012 09:09:23
-0000 1.30
@@ -1473,11 +1473,11 @@
<div class="float"><a name="float-label_0021-After-punc"></a>
<p>In float
</p>
-</div><p><strong>float type! After punc 1: </strong>shortcaption! After
punc</p>
+<div class="float-caption"><p><strong>float type! After punc 1:
</strong>shortcaption! After punc</p></div></div>
<div class="float"><a name="label-with-caption"></a>
<p>In float with caption.
</p>
-</div><p><strong>float type! After punc 2: </strong>caption! After punc</p>
+<div class="float-caption"><p><strong>float type! After punc 2:
</strong>caption! After punc</p></div></div>
<dl class="listoffloats">
<dt><a href="#float-label_0021-After-punc">float type! After punc
1</a></dt><dd><p>shortcaption! After punc</p></dd>
<dt><a href="#label-with-caption">float type! After punc
2</a></dt><dd><p>caption! After punc</p></dd>
Index: t/results/coverage_braces/test_image.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/test_image.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/coverage_braces/test_image.pl 4 Aug 2012 22:45:45 -0000
1.20
+++ t/results/coverage_braces/test_image.pl 5 Aug 2012 09:09:23 -0000
1.21
@@ -4684,10 +4684,10 @@
<"%@ < & @ % " ">.
</p>
-</div><img src="address@hidden a@<"%@ < & @ % "
address@hidden a@<"%@ < & @ % " " alt="address@hidden
a@<"%@ < & @ % " ">
+<div class="float-caption"><img src="address@hidden a@<"%@ <
& @ % " address@hidden a@<"%@ < & @ % " "
alt="address@hidden a@<"%@ < & @ % " ">
<p><strong>Image 1: </strong>In text <img src="address@hidden a@<"%@
< & @ % " address@hidden a@<"%@ < & @ % " "
alt="alt î–le.. a
-<"%@ < & @ % " ">.</p>
+<"%@ < & @ % " ">.</p></div></div>
<dl class="listoffloats">
<dt><a href="#Image-with-commands">Image 1</a></dt><dd><img
src="address@hidden a@<"%@ < & @ % " address@hidden
a@<"%@ < & @ % " " alt="address@hidden a@<"%@
< & @ % " ">
@@ -4924,10 +4924,10 @@
<"%@ < & @ % " ">.
</p>
-</div><img src="address@hidden a@<"%@ < & @ % "
address@hidden a@<"%@ < & @ % " " alt="address@hidden
a@<"%@ < & @ % " ">
+<div class="float-caption"><img src="address@hidden a@<"%@ <
& @ % " address@hidden a@<"%@ < & @ % " "
alt="address@hidden a@<"%@ < & @ % " ">
<p><strong>Image 1: </strong>In text <img src="address@hidden a@<"%@
< & @ % " address@hidden a@<"%@ < & @ % " "
alt="alt î–le.. a
-<"%@ < & @ % " ">.</p>
+<"%@ < & @ % " ">.</p></div></div>
<dl class="listoffloats">
<dt><a href="#Image-with-commands">Image 1</a></dt><dd><img
src="address@hidden a@<"%@ < & @ % " address@hidden
a@<"%@ < & @ % " " alt="address@hidden a@<"%@
< & @ % " ">
Index: t/results/float/anchor_in_caption.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/anchor_in_caption.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/float/anchor_in_caption.pl 25 Feb 2012 13:15:41 -0000
1.12
+++ t/results/float/anchor_in_caption.pl 5 Aug 2012 09:09:23 -0000
1.13
@@ -536,7 +536,7 @@
<div class="float"><a name="label"></a>
<p>In float.
</p>
-</div><p><strong>fl 1: </strong>in caption<a name="in-anchor"></a></p><hr>
+<div class="float-caption"><p><strong>fl 1: </strong>in caption<a
name="in-anchor"></a></p></div></div><hr>
Index: t/results/float/cindex_in_caption.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/cindex_in_caption.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/float/cindex_in_caption.pl 27 May 2012 10:45:13 -0000
1.17
+++ t/results/float/cindex_in_caption.pl 5 Aug 2012 09:09:23 -0000
1.18
@@ -646,9 +646,9 @@
<div class="float"><a name="label"></a>
<p>In float.
</p>
-</div><p><strong>fl 1: </strong>in caption
+<div class="float-caption"><p><strong>fl 1: </strong>in caption
<a name="index-index-entry"></a>
-</p>
+</p></div></div>
<table><tr><th valign="top">Jump to: </th><td><a class="summary-letter"
href="#Top_cp_letter-I"><b>I</b></a>
</td></tr></table>
Index: t/results/float/comment_space_comand_in_float.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/float/comment_space_comand_in_float.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/float/comment_space_comand_in_float.pl 25 Feb 2012 13:15:41
-0000 1.10
+++ t/results/float/comment_space_comand_in_float.pl 5 Aug 2012 09:09:23
-0000 1.11
@@ -486,8 +486,8 @@
<div class="float"><a name="label--"></a>
<p>Float
-</p></div><p><strong>Text 1
-</strong></p>
+</p><div class="float-caption"><p><strong>Text 1
+</strong></p></div></div>
<dl class="listoffloats">
<dt><a href="#label--">Text 1</a></dt><dd></dd>
</dl>
Index: t/results/float/complex_float.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/complex_float.pl,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- t/results/float/complex_float.pl 31 Jul 2012 19:03:59 -0000 1.38
+++ t/results/float/complex_float.pl 5 Aug 2012 09:09:23 -0000 1.39
@@ -5479,7 +5479,7 @@
-</div><p><strong>Text 1: </strong>An example of float caption<small
class="enddots">...</small>
+<div class="float-caption"><p><strong>Text 1: </strong>An example of float
caption<small class="enddots">...</small>
An example.
</p><div class="example">
<pre class="example">example
@@ -5513,7 +5513,7 @@
<a name="DOCF2" href="#FOOT2">(3)</a>.
</p>
<p>TeX and <em><b>téî</b><a href="an_url">an_url</a></em>
<small>AND</small> <tt>it is @verb</tt> a word !@ Æ.
-</p>
+</p></div></div>
<hr>
<a name="chapter"></a>
<div class="header">
@@ -5529,7 +5529,7 @@
</p>
-</div><p><strong>Text 1.1: </strong>An example of float caption<small
class="enddots">...</small> 2
+<div class="float-caption"><p><strong>Text 1.1: </strong>An example of float
caption<small class="enddots">...</small> 2
An example 2.
</p><div class="example">
<pre class="example">example 2
@@ -5563,7 +5563,7 @@
<a name="DOCF3" href="#FOOT3">(4)</a>.
</p>
<p>TeX and <em><b>téî</b><a href="an_url">an_url</a></em>
<small>AND</small> <tt>it is @verb</tt> a word !@ Æ.
-</p>
+</p></div></div>
<p>See <a href="#text-with-a-lot-of-features">text with a lot of features</a>.
</p>
<div class="footnote">
Index: t/results/float/empty_listoffloats_with_floats.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/float/empty_listoffloats_with_floats.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/float/empty_listoffloats_with_floats.pl 25 Feb 2012 13:15:41
-0000 1.10
+++ t/results/float/empty_listoffloats_with_floats.pl 5 Aug 2012 09:09:23
-0000 1.11
@@ -820,19 +820,19 @@
<div class="float"><a name="label1"></a>
<p>Label no caption.
-</p></div><p><strong>1
-</strong></p>
+</p><div class="float-caption"><p><strong>1
+</strong></p></div></div>
<div class="float"><a name="label2"></a>
<p>Label and caption.
</p>
-</div><p><strong>2: </strong>caption with label</p>
+<div class="float-caption"><p><strong>2: </strong>caption with
label</p></div></div>
<div class="float">
<p>no label no caption
</p></div>
<div class="float">
<p>no label caption
</p>
-</div><p>caption no label</p>
+<div class="float-caption"><p>caption no label</p></div></div>
<dl class="listoffloats">
<dt><a href="#label1">1</a></dt><dd></dd>
<dt><a href="#label2">2</a></dt><dd><p>caption with label</p></dd>
Index: t/results/float/float_copying.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/float_copying.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/float/float_copying.pl 14 Jul 2012 23:20:10 -0000 1.20
+++ t/results/float/float_copying.pl 5 Aug 2012 09:09:24 -0000 1.21
@@ -1877,11 +1877,11 @@
<p>Public domain is not really a licence, as it means than
the author abandon his copyright.
</p>
-</div><p><strong>Copyright notice 1: </strong>The Public Domain notice<a
name="DOCF1" href="#FOOT1">(1)</a>
+<div class="float-caption"><p><strong>Copyright notice 1: </strong>The Public
Domain notice<a name="DOCF1" href="#FOOT1">(1)</a>
</p>
<a name="public-domain-anchor"></a><a name="index-copying-indexed-caption"></a>
<a name="index-copying-indexed-caption-function"></a>
-
+</div></div>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top">• <a href="#Copying-and-floats"
accesskey="1">Copying and floats</a>:</td><td> </td><td align="left"
valign="top">
@@ -1903,22 +1903,22 @@
<p>Public domain is not really a licence, as it means than
the author abandon his copyright.
</p>
-</div><p><strong>Copyright notice 1: </strong>The Public Domain notice<a
name="DOCF1_2" href="#FOOT1_2">(2)</a>
+<div class="float-caption"><p><strong>Copyright notice 1: </strong>The Public
Domain notice<a name="DOCF1_2" href="#FOOT1_2">(2)</a>
</p>
<a name="public-domain-anchor"></a><a name="index-copying-indexed-caption"></a>
<a name="index-copying-indexed-caption-function"></a>
-
+</div></div>
<div class="float"><a name="public-domain"></a>
<p>Public domain is not really a licence, as it means than
the author abandon his copyright.
</p>
-</div><p><strong>Copyright notice 1: </strong>The Public Domain notice<a
name="DOCF1_3" href="#FOOT1_3">(3)</a>
+<div class="float-caption"><p><strong>Copyright notice 1: </strong>The Public
Domain notice<a name="DOCF1_3" href="#FOOT1_3">(3)</a>
</p>
<a name="public-domain-anchor"></a><a name="index-copying-indexed-caption"></a>
<a name="index-copying-indexed-caption-function"></a>
-
+</div></div>
<dl class="listoffloats">
<dt><a href="#public-domain">Copyright notice 1</a></dt><dd><p>The Public
Domain notice<a name="t_hlistoffloats_DOCF1_4"
href="#t_hlistoffloats_FOOT1_4">(4)</a>
Index: t/results/float/float_with_at_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/float/float_with_at_commands.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/float/float_with_at_commands.pl 25 Feb 2012 13:15:42 -0000
1.9
+++ t/results/float/float_with_at_commands.pl 5 Aug 2012 09:09:24 -0000
1.10
@@ -625,7 +625,7 @@
<p>Ceci est notre première entrée.
</p>
-</div><p><strong>entrée 1: </strong>La première entrée
est importante</p>
+<div class="float-caption"><p><strong>entrée 1: </strong>La
première entrée est importante</p></div></div>
<dl class="listoffloats">
<dt><a href="#premi_00e8re-entr_00e9e">entrée 1</a></dt><dd><p>La
première entrée est importante</p></dd>
Index: t/results/float/footnote_in_caption.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/footnote_in_caption.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/float/footnote_in_caption.pl 25 Feb 2012 13:15:42 -0000
1.15
+++ t/results/float/footnote_in_caption.pl 5 Aug 2012 09:09:24 -0000
1.16
@@ -540,7 +540,7 @@
<div class="float"><a name="label"></a>
<p>In float.
</p>
-</div><p><strong>fl 1: </strong>in caption<a name="DOCF1"
href="#FOOT1">(2)</a></p><div class="footnote">
+<div class="float-caption"><p><strong>fl 1: </strong>in caption<a name="DOCF1"
href="#FOOT1">(2)</a></p></div></div><div class="footnote">
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
Index: t/results/float/footnote_in_caption_and_error.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/float/footnote_in_caption_and_error.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/float/footnote_in_caption_and_error.pl 25 Feb 2012 13:15:42
-0000 1.2
+++ t/results/float/footnote_in_caption_and_error.pl 5 Aug 2012 09:09:24
-0000 1.3
@@ -528,7 +528,7 @@
<div class="float"><a name="label"></a>
<p>In float.
</p>
-</div><p><strong>fl 1: </strong>in caption<a name="DOCF1"
href="#FOOT1">(2)</a></p><div class="footnote">
+<div class="float-caption"><p><strong>fl 1: </strong>in caption<a name="DOCF1"
href="#FOOT1">(2)</a></p></div></div><div class="footnote">
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
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.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- t/results/float/numbering_captions_listoffloats.pl 14 Jul 2012 23:20:10
-0000 1.34
+++ t/results/float/numbering_captions_listoffloats.pl 5 Aug 2012 09:09:24
-0000 1.35
@@ -9280,25 +9280,25 @@
-</div><p><strong>Text 1: </strong>An example of float caption<small
class="enddots">...</small></p>
+<div class="float-caption"><p><strong>Text 1: </strong>An example of float
caption<small class="enddots">...</small></p></div></div>
<div class="float">
<p>No label but caption and shortcaption.
</p>
-</div><p><strong>Text: </strong>C No label</p>
+<div class="float-caption"><p><strong>Text: </strong>C No label</p></div></div>
<div class="float"><a name="label-but-no-type"></a>
<p>No type but caption and shortcaption.
</p>
-</div><p><strong>1: </strong>C No type</p>
+<div class="float-caption"><p><strong>1: </strong>C No type</p></div></div>
<div class="float"><a name="label-but-no-type-and-no-caption"></a>
<p>No type but label and no caption nor shortcaption.
</p>
-</div><p><strong>2
-</strong></p>
+<div class="float-caption"><p><strong>2
+</strong></p></div></div>
<div class="float">
<p>No label, no type, no caption no shortcaption.
@@ -9308,19 +9308,19 @@
<p>No label, no type, but caption and shortcaption.
</p>
-</div><p>C No label, no type, but caption and shortcaption.</p>
+<div class="float-caption"><p>C No label, no type, but caption and
shortcaption.</p></div></div>
<div class="float"><a name="label-but-no-type-2"></a>
<p>Second float with no type.
</p>
-</div><p><strong>3: </strong>C No type 2</p>
+<div class="float-caption"><p><strong>3: </strong>C No type 2</p></div></div>
<div class="float"><a name="warning-in-top"></a>
<p>A warning
</p>
-</div><p><strong>Warning 1: </strong>C A warning</p>
+<div class="float-caption"><p><strong>Warning 1: </strong>C A
warning</p></div></div>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top">• <a href="#chapter"
accesskey="1">chapter</a>:</td><td> </td><td align="left"
valign="top">
</td></tr>
@@ -9347,27 +9347,27 @@
<p>Text in chapter
</p>
-</div><p><strong>Text 1.1: </strong>C Text in chapter</p>
+<div class="float-caption"><p><strong>Text 1.1: </strong>C Text in
chapter</p></div></div>
<div class="float"><a
name="float-with-a-lot-of-features-and-no-shortcaption"></a>
-</div><p><strong>Text 1.2: </strong>An example of float caption, no
shortcaption<small class="enddots">...</small></p>
+<div class="float-caption"><p><strong>Text 1.2: </strong>An example of float
caption, no shortcaption<small class="enddots">...</small></p></div></div>
<div class="float"><a name="theoreme"></a>
<p>A théorème
</p>
-</div><p><strong>théorème 1.1: </strong>C A
théorème</p>
+<div class="float-caption"><p><strong>théorème 1.1: </strong>C A
théorème</p></div></div>
<div class="float"><a name="label-but-no-type-in-chapter"></a>
<p>float with no type.
</p>
-</div><p><strong>1.1: </strong>C No type in chapter</p>
+<div class="float-caption"><p><strong>1.1: </strong>C No type in
chapter</p></div></div>
<div class="float"><a name="warning-in-chapter"></a>
<p>A warning
</p>
-</div><p><strong>Warning 1.1: </strong>C A warning in chapter</p>
+<div class="float-caption"><p><strong>Warning 1.1: </strong>C A warning in
chapter</p></div></div>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top">• <a href="#section"
accesskey="1">section</a>:</td><td> </td><td align="left"
valign="top">
</td></tr>
@@ -9386,8 +9386,8 @@
<p>A text in float no caption a label a type.
</p>
-</div><p><strong>Text 1.3
-</strong></p>
+<div class="float-caption"><p><strong>Text 1.3
+</strong></p></div></div>
<hr>
<a name="Unnumbered"></a>
<div class="header">
@@ -9405,12 +9405,12 @@
<p>unnum
</p>
-</div><p><strong>Text 5: </strong>C unnumbered float</p><div class="float"><a
name="label-but-no-type-in-unnumbered"></a>
+<div class="float-caption"><p><strong>Text 5: </strong>C unnumbered
float</p></div></div><div class="float"><a
name="label-but-no-type-in-unnumbered"></a>
<p>float with no type.
</p>
-</div><p><strong>5: </strong>C No type in unnumbered</p>
+<div class="float-caption"><p><strong>5: </strong>C No type in
unnumbered</p></div></div>
<hr>
<a name="Section-within-unnumbered"></a>
@@ -9426,7 +9426,7 @@
<p>Section within unnumbered
</p>
-</div><p><strong>Text 6: </strong>C Section within unnumbered</p>
+<div class="float-caption"><p><strong>Text 6: </strong>C Section within
unnumbered</p></div></div>
<hr>
<a name="Chapter-with-unnumbsubsec"></a>
<div class="header">
@@ -9444,7 +9444,7 @@
<p>Chap
</p>
-</div><p><strong>Text 2.1: </strong>C Chapter with subsec</p>
+<div class="float-caption"><p><strong>Text 2.1: </strong>C Chapter with
subsec</p></div></div>
<hr>
<a name="unnumbered-sec"></a>
<div class="header">
@@ -9458,13 +9458,13 @@
<p>Chap
</p>
-</div><p><strong>Text 2.2: </strong>C unnumbered sec float</p>
+<div class="float-caption"><p><strong>Text 2.2: </strong>C unnumbered sec
float</p></div></div>
<div class="float"><a
name="label-but-no-type-in-unnumbered-subsec-in-chapter"></a>
<p>float with no type.
</p>
-</div><p><strong>2.1: </strong>C No type in unnumbered subsec in chapter</p>
+<div class="float-caption"><p><strong>2.1: </strong>C No type in unnumbered
subsec in chapter</p></div></div>
<hr>
<a name="Appendix-for-float"></a>
<div class="header">
@@ -9479,7 +9479,7 @@
<p>Appendix
</p>
-</div><p><strong>Text A.1: </strong>C appendix sec float</p>
+<div class="float-caption"><p><strong>Text A.1: </strong>C appendix sec
float</p></div></div>
<hr>
<a name="list-of-floats"></a>
<div class="header">
Index: t/results/float/ref_to_float.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/ref_to_float.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/float/ref_to_float.pl 25 Feb 2012 13:15:42 -0000 1.11
+++ t/results/float/ref_to_float.pl 5 Aug 2012 09:09:24 -0000 1.12
@@ -560,12 +560,12 @@
<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
<div class="float"><a name="Label1"></a>
<p>Float
-</p></div><p><strong>Text 1
-</strong></p>
+</p><div class="float-caption"><p><strong>Text 1
+</strong></p></div></div>
<div class="float"><a name="Label2"></a>
<p>In foat 2.
-</p></div><p><strong>1
-</strong></p>
+</p><div class="float-caption"><p><strong>1
+</strong></p></div></div>
<p><a href="#Label1">Label1</a>
</p>
<p><a href="#Label2">Label2</a>
Index: t/results/float/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/simple.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/float/simple.pl 25 Feb 2012 13:15:42 -0000 1.15
+++ t/results/float/simple.pl 5 Aug 2012 09:09:24 -0000 1.16
@@ -307,7 +307,7 @@
<p>In float.
</p>
-</div><p><strong>Type 1: </strong>Caption.</p>
+<div class="float-caption"><p><strong>Type 1: </strong>Caption.</p></div></div>
</body>
Index: t/results/misc_commands/comment_space_command_on_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/misc_commands/comment_space_command_on_line.pl 27 May 2012
10:45:16 -0000 1.23
+++ t/results/misc_commands/comment_space_command_on_line.pl 5 Aug 2012
09:09:24 -0000 1.24
@@ -948,8 +948,8 @@
<div class="float"><a name="label"></a>
<p>float
-</p></div><p><strong>Text 1
-</strong></p>
+</p><div class="float-caption"><p><strong>Text 1
+</strong></p></div></div>
<hr>
';
Index: t/results/paragraph/commands_in_flushright.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/paragraph/commands_in_flushright.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/paragraph/commands_in_flushright.pl 26 May 2012 09:47:39
-0000 1.7
+++ t/results/paragraph/commands_in_flushright.pl 5 Aug 2012 09:09:24
-0000 1.8
@@ -1899,7 +1899,7 @@
<p>in float
</p>
-</div><p><strong>label 1: </strong>in caption</p>
+<div class="float-caption"><p><strong>label 1: </strong>in
caption</p></div></div>
<p align="right">Sp:
</p><br>
<br>
Index: t/results/preformatted/caption_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/preformatted/caption_in_example.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/preformatted/caption_in_example.pl 11 Jan 2012 19:22:56
-0000 1.13
+++ t/results/preformatted/caption_in_example.pl 5 Aug 2012 09:09:24
-0000 1.14
@@ -373,7 +373,7 @@
After caption
</pre></div>
-</div><p><strong>float: </strong>caption</p>';
+<div class="float-caption"><p><strong>float: </strong>caption</p></div></div>';
$result_converted{'docbook'}->{'caption_in_example'} = '
Index: t/results/sectioning/double_node_anchor_float.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- t/results/sectioning/double_node_anchor_float.pl 14 Jul 2012 11:41:56
-0000 1.30
+++ t/results/sectioning/double_node_anchor_float.pl 5 Aug 2012 09:09:24
-0000 1.31
@@ -1095,14 +1095,14 @@
</div>
<div class="float">
-</div><p><strong>Text
-</strong></p>
+<div class="float-caption"><p><strong>Text
+</strong></p></div></div>
<div class="float">
-</div><p><strong>Text
-</strong></p>
+<div class="float-caption"><p><strong>Text
+</strong></p></div></div>
<div class="float"><a name="float1"></a>
-</div><p><strong>Text 1
-</strong></p>
+<div class="float-caption"><p><strong>Text 1
+</strong></p></div></div>
<hr>
<div class="header">
<p>
Index: t/results/sectioning/equivalent_labels.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/equivalent_labels.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/sectioning/equivalent_labels.pl 12 Jul 2012 18:09:19 -0000
1.1
+++ t/results/sectioning/equivalent_labels.pl 5 Aug 2012 09:09:24 -0000
1.2
@@ -798,8 +798,8 @@
</p>
<div class="float"><a name="floa"></a>
<p>In float
-</p></div><p><strong>truc 1
-</strong></p>
+</p><div class="float-caption"><p><strong>truc 1
+</strong></p></div></div>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top">• <a href="#anch"
accesskey="1">anch</a>:</td><td> </td><td align="left" valign="top">
</td></tr>
Index: t/results/sectioning/no_element.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/no_element.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/sectioning/no_element.pl 20 Jun 2012 23:44:29 -0000 1.25
+++ t/results/sectioning/no_element.pl 5 Aug 2012 09:09:25 -0000 1.26
@@ -1150,8 +1150,8 @@
</p>
<div class="float"><a name="float-anchor"></a>
<p>In float
-</p></div><p><strong>1
-</strong></p>
+</p><div class="float-caption"><p><strong>1
+</strong></p></div></div>
<p>Ref to float
<a href="#float-anchor">float anchor</a>.
</p>
Index: t/results/sectioning/placed_things_before_element.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/placed_things_before_element.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- t/results/sectioning/placed_things_before_element.pl 20 Jun 2012
23:44:29 -0000 1.24
+++ t/results/sectioning/placed_things_before_element.pl 5 Aug 2012
09:09:25 -0000 1.25
@@ -1268,8 +1268,8 @@
</p>
<div class="float"><a name="float-anchor"></a>
<p>In float
-</p></div><p><strong>1
-</strong></p>
+</p><div class="float-caption"><p><strong>1
+</strong></p></div></div>
<p>Ref to float
<a href="#float-anchor">float anchor</a>.
</p>
Index: t/results/sectioning/placed_things_before_node.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/placed_things_before_node.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/sectioning/placed_things_before_node.pl 20 Jun 2012 23:44:29
-0000 1.3
+++ t/results/sectioning/placed_things_before_node.pl 5 Aug 2012 09:09:25
-0000 1.4
@@ -1352,8 +1352,8 @@
</p>
<div class="float"><a name="float-anchor"></a>
<p>In float
-</p></div><p><strong>1
-</strong></p>
+</p><div class="float-caption"><p><strong>1
+</strong></p></div></div>
<p>Ref to float
<a href="#float-anchor">float anchor</a>.
</p>
Index: tests/sectioning/res_parser/equivalent_nodes/equivalent_nodes.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes/equivalent_nodes.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/sectioning/res_parser/equivalent_nodes/equivalent_nodes.html 25 Feb
2012 13:16:25 -0000 1.2
+++ tests/sectioning/res_parser/equivalent_nodes/equivalent_nodes.html 5 Aug
2012 09:09:25 -0000 1.3
@@ -99,8 +99,8 @@
<div class="float">
<p>A figure
-</p></div><p><strong>Figure
-</strong></p>
+</p><div class="float-caption"><p><strong>Figure
+</strong></p></div></div>
<dl class="listoffloats">
</dl>
Index:
tests/sectioning/res_parser/equivalent_nodes_no_node/equivalent_nodes.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_no_node/equivalent_nodes.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/sectioning/res_parser/equivalent_nodes_no_node/equivalent_nodes.html
25 Feb 2012 13:16:25 -0000 1.2
+++ tests/sectioning/res_parser/equivalent_nodes_no_node/equivalent_nodes.html
5 Aug 2012 09:09:25 -0000 1.3
@@ -56,8 +56,8 @@
<div class="float">
<p>A figure
-</p></div><p><strong>Figure
-</strong></p>
+</p><div class="float-caption"><p><strong>Figure
+</strong></p></div></div>
<dl class="listoffloats">
</dl>
Index:
tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
---
tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.html
25 Feb 2012 13:16:25 -0000 1.2
+++
tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.html
5 Aug 2012 09:09:25 -0000 1.3
@@ -56,8 +56,8 @@
<div class="float">
<p>A figure
-</p></div><p><strong>Figure
-</strong></p>
+</p><div class="float-caption"><p><strong>Figure
+</strong></p></div></div>
<dl class="listoffloats">
</dl>
Index:
tests/sectioning/res_parser/placed_things_before_element/placed_things_before_element.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser/placed_things_before_element/placed_things_before_element.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
---
tests/sectioning/res_parser/placed_things_before_element/placed_things_before_element.html
25 Feb 2012 13:16:27 -0000 1.2
+++
tests/sectioning/res_parser/placed_things_before_element/placed_things_before_element.html
5 Aug 2012 09:09:25 -0000 1.3
@@ -55,8 +55,8 @@
</p>
<div class="float"><a name="float-anchor"></a>
<p>In float
-</p></div><p><strong>1
-</strong></p>
+</p><div class="float-caption"><p><strong>1
+</strong></p></div></div>
<p>Ref to float
<a href="#float-anchor">1</a>.
</p>
Index: tests/sectioning/res_parser_html/equivalent_nodes/node.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser_html/equivalent_nodes/node.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/sectioning/res_parser_html/equivalent_nodes/node.html 25 Feb 2012
13:16:28 -0000 1.2
+++ tests/sectioning/res_parser_html/equivalent_nodes/node.html 5 Aug 2012
09:09:25 -0000 1.3
@@ -53,8 +53,8 @@
<div class="float">
<p>A figure
-</p></div><p><strong>Figure
-</strong></p>
+</p><div class="float-caption"><p><strong>Figure
+</strong></p></div></div>
<dl class="listoffloats">
</dl>
Index: tests/sectioning/res_parser_html/equivalent_nodes_no_node/node.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser_html/equivalent_nodes_no_node/node.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/sectioning/res_parser_html/equivalent_nodes_no_node/node.html 25 Feb
2012 13:16:29 -0000 1.2
+++ tests/sectioning/res_parser_html/equivalent_nodes_no_node/node.html 5 Aug
2012 09:09:25 -0000 1.3
@@ -53,8 +53,8 @@
<div class="float">
<p>A figure
-</p></div><p><strong>Figure
-</strong></p>
+</p><div class="float-caption"><p><strong>Figure
+</strong></p></div></div>
<dl class="listoffloats">
</dl>
Index:
tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/node.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/node.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
---
tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/node.html
25 Feb 2012 13:16:29 -0000 1.2
+++
tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/node.html
5 Aug 2012 09:09:25 -0000 1.3
@@ -53,8 +53,8 @@
<div class="float">
<p>A figure
-</p></div><p><strong>Figure
-</strong></p>
+</p><div class="float-caption"><p><strong>Figure
+</strong></p></div></div>
<dl class="listoffloats">
</dl>
Index: tests/sectioning/res_parser_html/placed_things_before_element/index.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser_html/placed_things_before_element/index.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tests/sectioning/res_parser_html/placed_things_before_element/index.html
14 Jul 2012 11:41:56 -0000 1.1
+++ tests/sectioning/res_parser_html/placed_things_before_element/index.html
5 Aug 2012 09:09:25 -0000 1.2
@@ -54,8 +54,8 @@
</p>
<div class="float"><a name="float-anchor"></a>
<p>In float
-</p></div><p><strong>1
-</strong></p>
+</p><div class="float-caption"><p><strong>1
+</strong></p></div></div>
<p>Ref to float
<a href="#float-anchor">float anchor</a>.
</p>
- texinfo/tp Texinfo/Convert/HTML.pm t/results/co...,
Patrice Dumas <=