branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_float

texinfo-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_float_comm

From:	Patrice Dumas
Subject:	branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_float_command): use @caption or @shortcaption as caption class for the div element if there is a non empty caption/shortcaption, otherwise use the type-number-float class.
Date:	Mon, 10 Jan 2022 16:08:55 -0500
This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 42ec9a3364 * tp/Texinfo/Convert/HTML.pm (_convert_float_command): use 
@caption or @shortcaption as caption class for the div element if there is a 
non empty caption/shortcaption, otherwise use the type-number-float class.
42ec9a3364 is described below

commit 42ec9a336416dd8e109474b1cfee1cd3fbd77c5d
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Jan 10 22:08:44 2022 +0100

    * tp/Texinfo/Convert/HTML.pm (_convert_float_command): use
    @caption or @shortcaption as caption class for the div element
    if there is a non empty caption/shortcaption, otherwise use the
    type-number-float class.
---
 ChangeLog                                          |  7 ++++
 tp/Texinfo/Convert/HTML.pm                         | 15 +++++---
 tp/t/results/coverage/block_commands.pl            |  2 +-
 .../coverage/punctuation_in_line_commands.pl       |  4 +--
 tp/t/results/coverage_braces/test_image.pl         |  4 +--
 tp/t/results/float/anchor_in_caption.pl            |  2 +-
 tp/t/results/float/cindex_in_caption.pl            |  2 +-
 .../results/float/comment_space_comand_in_float.pl |  2 +-
 tp/t/results/float/complex_float.pl                |  4 +--
 tp/t/results/float/empty_caption.pl                |  4 +--
 .../float/empty_listoffloats_with_floats.pl        |  6 ++--
 tp/t/results/float/float_copying.pl                |  6 ++--
 tp/t/results/float/float_with_at_commands.pl       |  2 +-
 tp/t/results/float/footnote_in_caption.pl          |  2 +-
 .../results/float/footnote_in_caption_and_error.pl |  2 +-
 .../float/numbering_captions_listoffloats.pl       | 40 +++++++++++-----------
 tp/t/results/float/ref_to_float.pl                 |  4 +--
 tp/t/results/float/simple.pl                       |  2 +-
 .../float_copying/res_html/Copying-and-floats.html |  4 +--
 .../formatting/float_copying/res_html/index.html   |  2 +-
 .../misc_commands/comment_space_command_on_line.pl |  2 +-
 .../res_html/equivalent_nodes.html                 |  2 +-
 .../res_html/equivalent_nodes.html                 |  2 +-
 .../res_html/placed_things_before_element.html     |  2 +-
 tp/t/results/paragraph/commands_in_flushright.pl   |  2 +-
 tp/t/results/preformatted/caption_in_example.pl    |  2 +-
 .../results/sectioning/double_node_anchor_float.pl |  6 ++--
 tp/t/results/sectioning/equivalent_labels.pl       |  2 +-
 tp/t/results/sectioning/no_element.pl              |  2 +-
 .../sectioning/placed_things_before_element.pl     |  2 +-
 .../sectioning/placed_things_before_node.pl        |  2 +-
 31 files changed, 77 insertions(+), 65 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 68310c6cbd..f7fbf1e1c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-01-10  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (_convert_float_command): use
+       @caption or @shortcaption as caption class for the div element
+       if there is a non empty caption/shortcaption, otherwise use the
+       type-number-float class.
+
 2022-01-10  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (_convert_float_command): convert
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 886399b6f3..37b6b20cdf 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -3938,13 +3938,18 @@ sub _convert_float_command($$$$$)
       $caption->{'args'}->[0], 'float caption');
   }
   
-  if ($prepended_text.$caption_text ne '') {
-    $prepended_text = $self->html_attribute_class('div','float-caption'). '>'
-        . $prepended_text;
-    $caption_text .= '</div>';
+  my $float_type_number_caption = '';
+  if ($caption_text ne '') {
+    $float_type_number_caption
+      = $self->html_attribute_class('div',$caption_command_name). '>'
+                       .$caption_text.'</div>';
+  } elsif ($prepended_text ne '') {
+    $float_type_number_caption
+      = $self->html_attribute_class('div','type-number-float'). '>'
+                       . $prepended_text .'</div>';
   }
   return $self->html_attribute_class('div',$cmdname). "${id_str}>\n".$content.
-     $prepended_text.$caption_text . '</div>';
+     $float_type_number_caption . '</div>';
 }
 $default_commands_conversion{'float'} = \&_convert_float_command;
 
diff --git a/tp/t/results/coverage/block_commands.pl 
b/tp/t/results/coverage/block_commands.pl
index 1c8d1006f1..34920b157c 100644
--- a/tp/t/results/coverage/block_commands.pl
+++ b/tp/t/results/coverage/block_commands.pl
@@ -469,7 +469,7 @@ $result_converted{'html_text'}->{'block_commands'} = '
 </p>
 
 
-<div class="float-caption"><p><strong class="strong">a float 1: </strong>in 
caption
+<div class="caption"><p><strong class="strong">a float 1: </strong>in caption
 </p>
 <p>in caption</p></div></div>';
 
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 84e5a426b3..da6f6d0365 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -1205,11 +1205,11 @@ 
$result_converted{'html_text'}->{'punctuation_in_line_commands'} = '
 <div class="float" id="float-label_0021-After-punc">
 <p>In float
 </p>
-<div class="float-caption"><p><strong class="strong">float type! After punc 1: 
</strong>shortcaption! After punc</p></div></div>
+<div class="shortcaption"><p><strong class="strong">float type! After punc 1: 
</strong>shortcaption! After punc</p></div></div>
 <div class="float" id="label-with-caption">
 <p>In float with caption.
 </p>
-<div class="float-caption"><p><strong class="strong">float type! After punc 2: 
</strong>caption! After punc</p></div></div>
+<div class="caption"><p><strong class="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>
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index 29a3af9ccc..773e9aaee8 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -3951,7 +3951,7 @@ In text <img class="image" src="f@i--le..  a@&lt;&quot;%@ 
 &lt; &amp; @ % &quot;
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.
 </p>
 
-<div class="float-caption"><img class="image" src="f@i--le..  a@&lt;&quot;%@  
&lt; &amp; @ % &quot; .ext@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; " 
alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
+<div class="caption"><img class="image" src="f@i--le..  a@&lt;&quot;%@  &lt; 
&amp; @ % &quot; .ext@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; " 
alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
 
 <p><strong class="strong">Image 1: </strong>In text <img class="image" 
src="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; .ext@i--le..  
a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="alt &icirc;&ndash;le..  a
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.</p></div></div>
@@ -4192,7 +4192,7 @@ In text <img class="image" src="f@i--le..  a@&lt;&quot;%@ 
 &lt; &amp; @ % &quot;
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.
 </p>
 
-<div class="float-caption"><img class="image" src="f@i--le..  a@&lt;&quot;%@  
&lt; &amp; @ % &quot; .ext@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; " 
alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
+<div class="caption"><img class="image" src="f@i--le..  a@&lt;&quot;%@  &lt; 
&amp; @ % &quot; .ext@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; " 
alt="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
 
 <p><strong class="strong">Image 1: </strong>In text <img class="image" 
src="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; .ext@i--le..  
a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="alt &icirc;&ndash;le..  a
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.</p></div></div>
diff --git a/tp/t/results/float/anchor_in_caption.pl 
b/tp/t/results/float/anchor_in_caption.pl
index bf3f37ee76..eb33f397f3 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -443,7 +443,7 @@ $result_converted{'html'}->{'anchor_in_caption'} = 
'<!DOCTYPE html>
 <div class="float" id="label">
 <p>In float.
 </p>
-<div class="float-caption"><p><strong class="strong">fl 1: </strong>in 
caption<a class="anchor" id="in-anchor"></a></p></div></div>
+<div class="caption"><p><strong class="strong">fl 1: </strong>in caption<a 
class="anchor" id="in-anchor"></a></p></div></div>
 
 
 </body>
diff --git a/tp/t/results/float/cindex_in_caption.pl 
b/tp/t/results/float/cindex_in_caption.pl
index 466ee3be08..73db064eb4 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -539,7 +539,7 @@ a.summary-letter {text-decoration: none}
 <div class="float" id="label">
 <p>In float.
 </p>
-<div class="float-caption"><p><strong class="strong">fl 1: </strong>in caption
+<div class="caption"><p><strong class="strong">fl 1: </strong>in caption
 <a class="index-entry-anchor" id="index-index-entry"></a>
 </p></div></div>
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#Top_cp_letter-I"><b>I</b></a>
diff --git a/tp/t/results/float/comment_space_comand_in_float.pl 
b/tp/t/results/float/comment_space_comand_in_float.pl
index 4a71f08902..4476ca2b19 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -412,7 +412,7 @@ 
$result_converted{'html'}->{'comment_space_comand_in_float'} = '<!DOCTYPE html>
 
 <div class="float" id="label--">
 <p>Float
-</p><div class="float-caption"><p><strong class="strong">Text &nbsp; 1
+</p><div class="type-number-float"><p><strong class="strong">Text &nbsp; 1
 </strong></p></div></div>
 <dl class="listoffloats">
 <dt><a href="#label--">Text &nbsp; 1</a></dt><dd></dd>
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index 0bff439f76..6eb42f2faf 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -4959,7 +4959,7 @@ A footnote.
 
 
 
-<div class="float-caption"><p><strong class="strong">Text 1: </strong>An 
example of float caption<small class="enddots">...</small>
+<div class="caption"><p><strong class="strong">Text 1: </strong>An example of 
float caption<small class="enddots">...</small>
 An example.
 </p><div class="example">
 <pre class="example">example
@@ -5012,7 +5012,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Test 
floats</a>, Up: <a href="
 </p>
 
 
-<div class="float-caption"><p><strong class="strong">Text 1.1: </strong>An 
example of float caption<small class="enddots">...</small> 2
+<div class="caption"><p><strong class="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
diff --git a/tp/t/results/float/empty_caption.pl 
b/tp/t/results/float/empty_caption.pl
index 1932b598c0..794b534fd9 100644
--- a/tp/t/results/float/empty_caption.pl
+++ b/tp/t/results/float/empty_caption.pl
@@ -584,10 +584,10 @@ $result_converted{'html'}->{'empty_caption'} = '<!DOCTYPE 
html>
 <body lang="en">
 <div class="float" id="b">
 <p>In float A, B
-</p><div class="float-caption"><p><strong class="strong">a 1: 
</strong></p></div></div>
+</p><div class="type-number-float"><p><strong class="strong">a 1: 
</strong></p></div></div>
 <div class="float" id="c">
 <p>In float , C
-</p><div class="float-caption"><p><strong class="strong">1: 
</strong></p></div></div>
+</p><div class="type-number-float"><p><strong class="strong">1: 
</strong></p></div></div>
 <div class="float">
 <p>In float
 </p></div>
diff --git a/tp/t/results/float/empty_listoffloats_with_floats.pl 
b/tp/t/results/float/empty_listoffloats_with_floats.pl
index f94a48d7f4..e35c4afc91 100644
--- a/tp/t/results/float/empty_listoffloats_with_floats.pl
+++ b/tp/t/results/float/empty_listoffloats_with_floats.pl
@@ -676,19 +676,19 @@ 
$result_converted{'html'}->{'empty_listoffloats_with_floats'} = '<!DOCTYPE html>
 <body lang="en">
 <div class="float" id="label1">
 <p>Label no caption.
-</p><div class="float-caption"><p><strong class="strong">1
+</p><div class="type-number-float"><p><strong class="strong">1
 </strong></p></div></div>
 <div class="float" id="label2">
 <p>Label and caption.
 </p>
-<div class="float-caption"><p><strong class="strong">2: </strong>caption with 
label</p></div></div>
+<div class="caption"><p><strong class="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 class="float-caption"><p>caption no label</p></div></div>
+<div class="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>
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index 8733755fd7..097498584c 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -1641,7 +1641,7 @@ Next: <a href="#Copying-and-floats" accesskey="n" 
rel="next">Copying and floats<
 <p>Public domain is not really a licence, as it means than
 the author abandon his copyright.
 </p>
-<div class="float-caption"><p><strong class="strong">Copyright notice 1: 
</strong>The Public Domain notice<a class="footnote" id="DOCF1" 
href="#FOOT1"><sup>1</sup></a>
+<div class="caption"><p><strong class="strong">Copyright notice 1: 
</strong>The Public Domain notice<a class="footnote" id="DOCF1" 
href="#FOOT1"><sup>1</sup></a>
 </p>
 <a class="anchor" id="public-domain-anchor"></a><a class="index-entry-anchor" 
id="index-copying-indexed-caption"></a>
 <a class="index-entry-anchor" id="index-copying-indexed-caption-function"></a>
@@ -1664,7 +1664,7 @@ Previous: <a href="#Top" accesskey="p" 
rel="prev">Top</a>, Up: <a href="#Top" ac
 <p>Public domain is not really a licence, as it means than
 the author abandon his copyright.
 </p>
-<div class="float-caption"><p><strong class="strong">Copyright notice 1: 
</strong>The Public Domain notice<a class="footnote" id="DOCF1_2" 
href="#FOOT1_2"><sup>2</sup></a>
+<div class="caption"><p><strong class="strong">Copyright notice 1: 
</strong>The Public Domain notice<a class="footnote" id="DOCF1_2" 
href="#FOOT1_2"><sup>2</sup></a>
 </p>
 <a class="anchor" id="public-domain-anchor"></a><a class="index-entry-anchor" 
id="index-copying-indexed-caption"></a>
 <a class="index-entry-anchor" id="index-copying-indexed-caption-function"></a>
@@ -1674,7 +1674,7 @@ the author abandon his copyright.
 <p>Public domain is not really a licence, as it means than
 the author abandon his copyright.
 </p>
-<div class="float-caption"><p><strong class="strong">Copyright notice 1: 
</strong>The Public Domain notice<a class="footnote" id="DOCF1_3" 
href="#FOOT1_3"><sup>3</sup></a>
+<div class="caption"><p><strong class="strong">Copyright notice 1: 
</strong>The Public Domain notice<a class="footnote" id="DOCF1_3" 
href="#FOOT1_3"><sup>3</sup></a>
 </p>
 <a class="anchor" id="public-domain-anchor"></a><a class="index-entry-anchor" 
id="index-copying-indexed-caption"></a>
 <a class="index-entry-anchor" id="index-copying-indexed-caption-function"></a>
diff --git a/tp/t/results/float/float_with_at_commands.pl 
b/tp/t/results/float/float_with_at_commands.pl
index cb779389ad..c886fb6724 100644
--- a/tp/t/results/float/float_with_at_commands.pl
+++ b/tp/t/results/float/float_with_at_commands.pl
@@ -596,7 +596,7 @@ $result_converted{'html'}->{'float_with_at_commands'} = 
'<!DOCTYPE html>
 <p>Ceci est notre premi&egrave;re entr&eacute;e.
 </p>
 
-<div class="float-caption"><p><strong class="strong">entr&eacute;e 1: 
</strong>La premi&egrave;re entr&eacute;e est importante</p></div></div>
+<div class="caption"><p><strong class="strong">entr&eacute;e 1: </strong>La 
premi&egrave;re entr&eacute;e est importante</p></div></div>
 
 <dl class="listoffloats">
 <dt><a href="#premi_00e8re-entr_00e9e">entr&eacute;e 1</a></dt><dd><p>La 
premi&egrave;re entr&eacute;e est importante</p></dd>
diff --git a/tp/t/results/float/footnote_in_caption.pl 
b/tp/t/results/float/footnote_in_caption.pl
index 72170d0c2e..6f98a66b83 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -453,7 +453,7 @@ $result_converted{'html'}->{'footnote_in_caption'} = 
'<!DOCTYPE html>
 <div class="float" id="label">
 <p>In float.
 </p>
-<div class="float-caption"><p><strong class="strong">fl 1: </strong>in 
caption<a class="footnote" id="DOCF1" 
href="#FOOT1"><sup>2</sup></a></p></div></div><div class="footnote">
+<div class="caption"><p><strong class="strong">fl 1: </strong>in caption<a 
class="footnote" id="DOCF1" href="#FOOT1"><sup>2</sup></a></p></div></div><div 
class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
diff --git a/tp/t/results/float/footnote_in_caption_and_error.pl 
b/tp/t/results/float/footnote_in_caption_and_error.pl
index 800d68247b..f48ce9fa21 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -440,7 +440,7 @@ 
$result_converted{'html'}->{'footnote_in_caption_and_error'} = '<!DOCTYPE html>
 <div class="float" id="label">
 <p>In float.
 </p>
-<div class="float-caption"><p><strong class="strong">fl 1: </strong>in 
caption<a class="footnote" id="DOCF1" 
href="#FOOT1"><sup>2</sup></a></p></div></div><div class="footnote">
+<div class="caption"><p><strong class="strong">fl 1: </strong>in caption<a 
class="footnote" id="DOCF1" href="#FOOT1"><sup>2</sup></a></p></div></div><div 
class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl 
b/tp/t/results/float/numbering_captions_listoffloats.pl
index 654242ae66..8d9b9d6ada 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -8062,24 +8062,24 @@ Next: <a href="#chapter" accesskey="n" rel="next">A 
chapter</a> &nbsp; </p>
 
 
 
-<div class="float-caption"><p><strong class="strong">Text 1: </strong>An 
example of float caption<small class="enddots">...</small></p></div></div>
+<div class="caption"><p><strong class="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 class="float-caption"><p><strong class="strong">Text: </strong>C No 
label</p></div></div>
+<div class="caption"><p><strong class="strong">Text: </strong>C No 
label</p></div></div>
 <div class="float" id="label-but-no-type">
 <p>No type but caption and shortcaption.
 </p>
 
 
-<div class="float-caption"><p><strong class="strong">1: </strong>C No 
type</p></div></div>
+<div class="caption"><p><strong class="strong">1: </strong>C No 
type</p></div></div>
 
 <div class="float" id="label-but-no-type-and-no-caption">
 <p>No type but label and no caption nor shortcaption.
 </p>
-<div class="float-caption"><p><strong class="strong">2
+<div class="type-number-float"><p><strong class="strong">2
 </strong></p></div></div>
 
 <div class="float">
@@ -8090,19 +8090,19 @@ Next: <a href="#chapter" accesskey="n" rel="next">A 
chapter</a> &nbsp; </p>
 <p>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="caption"><p>C No label, no type, but caption and 
shortcaption.</p></div></div>
 <div class="float" id="label-but-no-type-2">
 <p>Second float with no type.
 </p>
 
 
-<div class="float-caption"><p><strong class="strong">3: </strong>C No type 
2</p></div></div>
+<div class="caption"><p><strong class="strong">3: </strong>C No type 
2</p></div></div>
 <div class="float" id="warning-in-top">
 <p>A warning
 </p>
 
 
-<div class="float-caption"><p><strong class="strong">Warning 1: </strong>C A 
warning</p></div></div>
+<div class="caption"><p><strong class="strong">Warning 1: </strong>C A 
warning</p></div></div>
 
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">A chapter</a></li>
@@ -8123,27 +8123,27 @@ Next: <a href="#Unnumbered" accesskey="n" 
rel="next">Unnumbered</a>, Previous: <
 <p>Text in chapter
 </p>
 
-<div class="float-caption"><p><strong class="strong">Text 1.1: </strong>C Text 
in chapter</p></div></div>
+<div class="caption"><p><strong class="strong">Text 1.1: </strong>C Text in 
chapter</p></div></div>
 <div class="float" id="float-with-a-lot-of-features-and-no-shortcaption">
 
-<div class="float-caption"><p><strong class="strong">Text 1.2: </strong>An 
example of float caption, no shortcaption<small 
class="enddots">...</small></p></div></div>
+<div class="caption"><p><strong class="strong">Text 1.2: </strong>An example 
of float caption, no shortcaption<small 
class="enddots">...</small></p></div></div>
 <div class="float" id="theoreme">
 <p>A th&eacute;or&egrave;me
 </p>
 
-<div class="float-caption"><p><strong class="strong">th&eacute;or&egrave;me 
1.1: </strong>C A th&eacute;or&egrave;me</p></div></div>
+<div class="caption"><p><strong class="strong">th&eacute;or&egrave;me 1.1: 
</strong>C A th&eacute;or&egrave;me</p></div></div>
 <div class="float" id="label-but-no-type-in-chapter">
 <p>float with no type.
 </p>
 
 
-<div class="float-caption"><p><strong class="strong">1.1: </strong>C No type 
in chapter</p></div></div>
+<div class="caption"><p><strong class="strong">1.1: </strong>C No type in 
chapter</p></div></div>
 <div class="float" id="warning-in-chapter">
 <p>A warning
 </p>
 
 
-<div class="float-caption"><p><strong class="strong">Warning 1.1: </strong>C A 
warning in chapter</p></div></div>
+<div class="caption"><p><strong class="strong">Warning 1.1: </strong>C A 
warning in chapter</p></div></div>
 
 <ul class="section-toc">
 <li><a href="#section" accesskey="1">A section</a></li>
@@ -8160,7 +8160,7 @@ Up: <a href="#chapter" accesskey="u" rel="up">A 
chapter</a> &nbsp; </p>
 
 <p>A text in float no caption a label a type.
 </p>
-<div class="float-caption"><p><strong class="strong">Text 1.3
+<div class="type-number-float"><p><strong class="strong">Text 1.3
 </strong></p></div></div>
 <hr>
 </div>
@@ -8176,12 +8176,12 @@ Next: <a href="#Chapter-with-unnumbsubsec" 
accesskey="n" rel="next">Chapter with
 <p>unnum
 </p>
 
-<div class="float-caption"><p><strong class="strong">Text 5: </strong>C 
unnumbered float</p></div></div><div class="float" 
id="label-but-no-type-in-unnumbered">
+<div class="caption"><p><strong class="strong">Text 5: </strong>C unnumbered 
float</p></div></div><div class="float" id="label-but-no-type-in-unnumbered">
 <p>float with no type.
 </p>
 
 
-<div class="float-caption"><p><strong class="strong">5: </strong>C No type in 
unnumbered</p></div></div>
+<div class="caption"><p><strong class="strong">5: </strong>C No type in 
unnumbered</p></div></div>
 
 <ul class="section-toc">
 <li><a href="#Section-within-unnumbered" accesskey="1">Section within 
unnumbered</a></li>
@@ -8199,7 +8199,7 @@ Up: <a href="#Unnumbered" accesskey="u" 
rel="up">Unnumbered</a> &nbsp; </p>
 <p>Section within unnumbered
 </p>
 
-<div class="float-caption"><p><strong class="strong">Text 6: </strong>C 
Section within unnumbered</p></div></div>
+<div class="caption"><p><strong class="strong">Text 6: </strong>C Section 
within unnumbered</p></div></div>
 <hr>
 </div>
 </div>
@@ -8214,7 +8214,7 @@ Next: <a href="#Appendix-for-float" accesskey="n" 
rel="next">Appendix for float<
 <p>Chap
 </p>
 
-<div class="float-caption"><p><strong class="strong">Text 2.1: </strong>C 
Chapter with subsec</p></div></div>
+<div class="caption"><p><strong class="strong">Text 2.1: </strong>C Chapter 
with subsec</p></div></div>
 <ul class="section-toc">
 <li><a href="#unnumbered-sec" accesskey="1">unnumbered sec</a></li>
 </ul>
@@ -8230,13 +8230,13 @@ Up: <a href="#Chapter-with-unnumbsubsec" accesskey="u" 
rel="up">Chapter with unn
 <p>Chap
 </p>
 
-<div class="float-caption"><p><strong class="strong">Text 2.2: </strong>C 
unnumbered sec float</p></div></div>
+<div class="caption"><p><strong class="strong">Text 2.2: </strong>C unnumbered 
sec float</p></div></div>
 <div class="float" id="label-but-no-type-in-unnumbered-subsec-in-chapter">
 <p>float with no type.
 </p>
 
 
-<div class="float-caption"><p><strong class="strong">2.1: </strong>C No type 
in unnumbered subsec in chapter</p></div></div>
+<div class="caption"><p><strong class="strong">2.1: </strong>C No type in 
unnumbered subsec in chapter</p></div></div>
 <hr>
 </div>
 </div>
@@ -8252,7 +8252,7 @@ Next: <a href="#list-of-floats" accesskey="n" 
rel="next">list of floats</a>, Pre
 <p>Appendix
 </p>
 
-<div class="float-caption"><p><strong class="strong">Text A.1: </strong>C 
appendix sec float</p></div></div>
+<div class="caption"><p><strong class="strong">Text A.1: </strong>C appendix 
sec float</p></div></div>
 <hr>
 </div>
 <div class="unnumbered" id="list-of-floats">
diff --git a/tp/t/results/float/ref_to_float.pl 
b/tp/t/results/float/ref_to_float.pl
index f11d43aba6..d73e51c021 100644
--- a/tp/t/results/float/ref_to_float.pl
+++ b/tp/t/results/float/ref_to_float.pl
@@ -449,11 +449,11 @@ $result_converted{'html'}->{'ref_to_float'} = '<!DOCTYPE 
html>
 <body lang="en">
 <div class="float" id="Label1">
 <p>Float
-</p><div class="float-caption"><p><strong class="strong">Text 1
+</p><div class="type-number-float"><p><strong class="strong">Text 1
 </strong></p></div></div>
 <div class="float" id="Label2">
 <p>In foat 2.
-</p><div class="float-caption"><p><strong class="strong">1
+</p><div class="type-number-float"><p><strong class="strong">1
 </strong></p></div></div>
 <p><a class="ref" href="#Label1">Text 1</a>
 </p>
diff --git a/tp/t/results/float/simple.pl b/tp/t/results/float/simple.pl
index e93dfcdaf4..4995bdae97 100644
--- a/tp/t/results/float/simple.pl
+++ b/tp/t/results/float/simple.pl
@@ -257,7 +257,7 @@ $result_converted{'html'}->{'simple'} = '<!DOCTYPE html>
 
 <p>In float.
 </p>
-<div class="float-caption"><p><strong class="strong">Type 1: 
</strong>Caption.</p></div></div>
+<div class="caption"><p><strong class="strong">Type 1: 
</strong>Caption.</p></div></div>
 
 
 </body>
diff --git 
a/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html 
b/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html
index ad5dd6da3e..6791550d03 100644
--- a/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html
+++ b/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html
@@ -62,7 +62,7 @@ and the list of coyright notices (listoffloats).
 <p>Public domain is not really a licence, as it means than 
 the author abandon his copyright.
 </p>
-<div class="float-caption"><p><strong class="strong">Copyright notice 1: 
</strong>The Public Domain notice<a class="footnote" id="DOCF1_2" 
href="float_copying_fot.html#FOOT1_2"><sup>2</sup></a>
+<div class="caption"><p><strong class="strong">Copyright notice 1: 
</strong>The Public Domain notice<a class="footnote" id="DOCF1_2" 
href="float_copying_fot.html#FOOT1_2"><sup>2</sup></a>
 </p>
 <a class="anchor" id="public-domain-anchor"></a><a class="index-entry-anchor" 
id="index-copying-indexed-caption"></a>
 <a class="index-entry-anchor" id="index-copying-indexed-caption-function"></a>
@@ -72,7 +72,7 @@ the author abandon his copyright.
 <p>Public domain is not really a licence, as it means than 
 the author abandon his copyright.
 </p>
-<div class="float-caption"><p><strong class="strong">Copyright notice 1: 
</strong>The Public Domain notice<a class="footnote" id="DOCF1_3" 
href="float_copying_fot.html#FOOT1_3"><sup>3</sup></a>
+<div class="caption"><p><strong class="strong">Copyright notice 1: 
</strong>The Public Domain notice<a class="footnote" id="DOCF1_3" 
href="float_copying_fot.html#FOOT1_3"><sup>3</sup></a>
 </p>
 <a class="anchor" id="public-domain-anchor"></a><a class="index-entry-anchor" 
id="index-copying-indexed-caption"></a>
 <a class="index-entry-anchor" id="index-copying-indexed-caption-function"></a>
diff --git a/tp/t/results/formatting/float_copying/res_html/index.html 
b/tp/t/results/formatting/float_copying/res_html/index.html
index fb02a85d6d..52c9f2e380 100644
--- a/tp/t/results/formatting/float_copying/res_html/index.html
+++ b/tp/t/results/formatting/float_copying/res_html/index.html
@@ -53,7 +53,7 @@ span.smaller {font-size: smaller}
 <p>Public domain is not really a licence, as it means than 
 the author abandon his copyright.
 </p>
-<div class="float-caption"><p><strong class="strong">Copyright notice 1: 
</strong>The Public Domain notice<a class="footnote" id="DOCF1" 
href="float_copying_fot.html#FOOT1"><sup>1</sup></a>
+<div class="caption"><p><strong class="strong">Copyright notice 1: 
</strong>The Public Domain notice<a class="footnote" id="DOCF1" 
href="float_copying_fot.html#FOOT1"><sup>1</sup></a>
 </p>
 <a class="anchor" id="public-domain-anchor"></a><a class="index-entry-anchor" 
id="index-copying-indexed-caption"></a>
 <a class="index-entry-anchor" id="index-copying-indexed-caption-function"></a>
diff --git a/tp/t/results/misc_commands/comment_space_command_on_line.pl 
b/tp/t/results/misc_commands/comment_space_command_on_line.pl
index 080a9a793c..b5c9925dbf 100644
--- a/tp/t/results/misc_commands/comment_space_command_on_line.pl
+++ b/tp/t/results/misc_commands/comment_space_command_on_line.pl
@@ -854,7 +854,7 @@ 
$result_converted{'html_text'}->{'comment_space_command_on_line'} = '
 
 <div class="float" id="label">
 <p>float
-</p><div class="float-caption"><p><strong class="strong">Text 1
+</p><div class="type-number-float"><p><strong class="strong">Text 1
 </strong></p></div></div>
 
 </div>
diff --git 
a/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html 
b/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html
index de1ee8d676..275297308d 100644
--- 
a/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html
+++ 
b/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html
@@ -78,7 +78,7 @@ span.smaller {font-size: smaller}
 
 <div class="float">
 <p>A figure
-</p><div class="float-caption"><p><strong class="strong">Figure
+</p><div class="type-number-float"><p><strong class="strong">Figure
 </strong></p></div></div>
 <dl class="listoffloats">
 </dl>
diff --git 
a/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
 
b/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
index b02ef54eca..d64865c2c9 100644
--- 
a/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
+++ 
b/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
@@ -35,7 +35,7 @@ span.smaller {font-size: smaller}
 <a class="node-anchor" id="node"></a>
 <div class="float">
 <p>A figure
-</p><div class="float-caption"><p><strong class="strong">Figure
+</p><div class="type-number-float"><p><strong class="strong">Figure
 </strong></p></div></div>
 <dl class="listoffloats">
 </dl>
diff --git 
a/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
 
b/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
index 721e87fbd6..ee39522a15 100644
--- 
a/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
+++ 
b/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
@@ -38,7 +38,7 @@ span.smaller {font-size: smaller}
 </p>
 <div class="float" id="float-anchor">
 <p>In float
-</p><div class="float-caption"><p><strong class="strong">1
+</p><div class="type-number-float"><p><strong class="strong">1
 </strong></p></div></div>
 <p>Ref to float
 <a class="ref" href="#float-anchor">1</a>.
diff --git a/tp/t/results/paragraph/commands_in_flushright.pl 
b/tp/t/results/paragraph/commands_in_flushright.pl
index 9425c9c645..1e3710fcb1 100644
--- a/tp/t/results/paragraph/commands_in_flushright.pl
+++ b/tp/t/results/paragraph/commands_in_flushright.pl
@@ -1585,7 +1585,7 @@ 
$result_converted{'html_text'}->{'commands_in_flushright'} = '<div class="flushr
 <p>in float
 </p>
 
-<div class="float-caption"><p><strong class="strong">label 1: </strong>in 
caption</p></div></div>
+<div class="caption"><p><strong class="strong">label 1: </strong>in 
caption</p></div></div>
 <p class="flushright-paragraph">Sp:
 </p><br>
 <br>
diff --git a/tp/t/results/preformatted/caption_in_example.pl 
b/tp/t/results/preformatted/caption_in_example.pl
index d914b8c0ca..34d6a14e67 100644
--- a/tp/t/results/preformatted/caption_in_example.pl
+++ b/tp/t/results/preformatted/caption_in_example.pl
@@ -327,7 +327,7 @@ $result_converted{'html_text'}->{'caption_in_example'} = 
'<div class="float">
 
 After caption
 </pre></div>
-<div class="float-caption"><p><strong class="strong">float: 
</strong>caption</p></div></div>';
+<div class="caption"><p><strong class="strong">float: 
</strong>caption</p></div></div>';
 
 
 $result_converted{'docbook'}->{'caption_in_example'} = '
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl 
b/tp/t/results/sectioning/double_node_anchor_float.pl
index b4bbd5e6c4..176fb961c5 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -881,13 +881,13 @@ $result_converted{'html'}->{'double_node_anchor_float'} = 
'<!DOCTYPE html>
 </div>
 
 <div class="float">
-<div class="float-caption"><p><strong class="strong">Text
+<div class="type-number-float"><p><strong class="strong">Text
 </strong></p></div></div>
 <div class="float">
-<div class="float-caption"><p><strong class="strong">Text
+<div class="type-number-float"><p><strong class="strong">Text
 </strong></p></div></div>
 <div class="float" id="float1">
-<div class="float-caption"><p><strong class="strong">Text 1
+<div class="type-number-float"><p><strong class="strong">Text 1
 </strong></p></div></div>
 <hr>
 <div class="header">
diff --git a/tp/t/results/sectioning/equivalent_labels.pl 
b/tp/t/results/sectioning/equivalent_labels.pl
index ca560037ba..e1d77ab7db 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -674,7 +674,7 @@ $result_converted{'html'}->{'equivalent_labels'} = 
'<!DOCTYPE html>
 </p>
 <div class="float" id="floa">
 <p>In float
-</p><div class="float-caption"><p><strong class="strong">truc 1
+</p><div class="type-number-float"><p><strong class="strong">truc 1
 </strong></p></div></div>
 
 
diff --git a/tp/t/results/sectioning/no_element.pl 
b/tp/t/results/sectioning/no_element.pl
index 0d4e6065e2..41f46b6a70 100644
--- a/tp/t/results/sectioning/no_element.pl
+++ b/tp/t/results/sectioning/no_element.pl
@@ -991,7 +991,7 @@ h1.settitle {text-align:center}
 </p>
 <div class="float" id="float-anchor">
 <p>In float
-</p><div class="float-caption"><p><strong class="strong">1
+</p><div class="type-number-float"><p><strong class="strong">1
 </strong></p></div></div>
 <p>Ref to float
 <a class="ref" href="#float-anchor">1</a>.
diff --git a/tp/t/results/sectioning/placed_things_before_element.pl 
b/tp/t/results/sectioning/placed_things_before_element.pl
index 69385f4f95..e2f325e848 100644
--- a/tp/t/results/sectioning/placed_things_before_element.pl
+++ b/tp/t/results/sectioning/placed_things_before_element.pl
@@ -1108,7 +1108,7 @@ 
$result_converted{'html'}->{'placed_things_before_element'} = '<!DOCTYPE html>
 </p>
 <div class="float" id="float-anchor">
 <p>In float
-</p><div class="float-caption"><p><strong class="strong">1
+</p><div class="type-number-float"><p><strong class="strong">1
 </strong></p></div></div>
 <p>Ref to float
 <a class="ref" href="#float-anchor">1</a>.
diff --git a/tp/t/results/sectioning/placed_things_before_node.pl 
b/tp/t/results/sectioning/placed_things_before_node.pl
index ab4d5749a4..a3355879ff 100644
--- a/tp/t/results/sectioning/placed_things_before_node.pl
+++ b/tp/t/results/sectioning/placed_things_before_node.pl
@@ -1171,7 +1171,7 @@ $result_converted{'html'}->{'placed_things_before_node'} 
= '<!DOCTYPE html>
 </p>
 <div class="float" id="float-anchor">
 <p>In float
-</p><div class="float-caption"><p><strong class="strong">1
+</p><div class="type-number-float"><p><strong class="strong">1
 </strong></p></div></div>
 <p>Ref to float
 <a class="ref" href="#float-anchor">1</a>.
[Prev in Thread]
Current Thread
[Next in Thread]
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_float_command): use @caption or @shortcaption as caption class for the div element if there is a non empty caption/shortcaption, otherwise use the type-number-float class., Patrice Dumas <=