[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[6928] extra newline after <pre>
|
From: |
Gavin D. Smith |
|
Subject: |
[6928] extra newline after <pre> |
|
Date: |
Wed, 06 Jan 2016 20:40:20 +0000 |
Revision: 6928
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6928
Author: gavin
Date: 2016-01-06 20:40:19 +0000 (Wed, 06 Jan 2016)
Log Message:
-----------
extra newline after <pre>
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Convert/HTML.pm
trunk/tp/t/results/converters_tests/complex_nestings.pl
trunk/tp/t/results/coverage/preformatted.pl
trunk/tp/t/results/html_tests/simple_menu.pl
trunk/tp/t/results/itemize/itemize_in_example.pl
trunk/tp/t/results/menu/block_commands_in_menu_description.pl
trunk/tp/t/results/menu/dash_in_menu.pl
trunk/tp/t/results/menu/detailmenu.pl
trunk/tp/t/results/menu/detailmenu_on_subnodes.pl
trunk/tp/t/results/menu/entry_after_detailmenu.pl
trunk/tp/t/results/menu/example_in_menu_comment.pl
trunk/tp/t/results/menu/example_in_menu_description.pl
trunk/tp/t/results/menu/formats_in_menu.pl
trunk/tp/t/results/menu/inlineraw_in_menu_description.pl
trunk/tp/t/results/menu/menu_in_example.pl
trunk/tp/t/results/menu/sc_in_menu.pl
trunk/tp/t/results/menu/simple.pl
trunk/tp/t/results/menu/verb_in_menu_description.pl
trunk/tp/t/results/preformatted/caption_in_example.pl
trunk/tp/t/results/preformatted/insertcopying_in_example.pl
trunk/tp/t/results/preformatted/nested_formats.pl
trunk/tp/t/results/preformatted/titlefont_in_example.pl
trunk/tp/t/results/raw/raw_in_example.pl
trunk/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
trunk/tp/t/results/xtable/table_nested.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2016-01-06 20:19:06 UTC (rev 6927)
+++ trunk/ChangeLog 2016-01-06 20:40:19 UTC (rev 6928)
@@ -1,5 +1,11 @@
2016-01-06 Gavin Smith <address@hidden>
+ * tp/Texinfo/Convert/HTML.pm (_convert_preformatted_type): Add an
+ extra newline after a <pre> tag if the contents begins with a
+ newline.
+
+2016-01-06 Gavin Smith <address@hidden>
+
* tp/t/README,
* tp/tests/README: 2016 in copyright dates.
Modified: trunk/tp/Texinfo/Convert/HTML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/HTML.pm 2016-01-06 20:19:06 UTC (rev 6927)
+++ trunk/tp/Texinfo/Convert/HTML.pm 2016-01-06 20:40:19 UTC (rev 6928)
@@ -3703,6 +3703,7 @@
if ($self->in_string()) {
return $content;
}
+ $content =~ s/^\n/\n\n/; # a newline immediately after a <pre> is ignored.
my $result = $self->_attribute_class('pre',
$pre_class).">".$content."</pre>";
# this may happen with lines without textual content
Modified: trunk/tp/t/results/converters_tests/complex_nestings.pl
===================================================================
--- trunk/tp/t/results/converters_tests/complex_nestings.pl 2016-01-06
20:19:06 UTC (rev 6927)
+++ trunk/tp/t/results/converters_tests/complex_nestings.pl 2016-01-06
20:40:19 UTC (rev 6928)
@@ -1592,6 +1592,7 @@
<dd><dl>
<dt><a name="index-variables"></a>Variable: <strong>variables</strong>
<em>variable-name</em></dt>
<dd><pre class="example">
+
</pre></dd><dt><a name="index-variables-too"></a>Variable: <strong>variables
too</strong> <em>other-variable</em></dt>
<dd><pre class="example">THis is the defvar
@@ -1605,11 +1606,13 @@
<dt><tt>second item</tt></dt>
</dl>
<pre class="example">
+
explanation
</pre></dd></dl>
</dd></dl>
</dd></dl>
<pre class="example">
+
</pre></div>
<hr>
';
Modified: trunk/tp/t/results/coverage/preformatted.pl
===================================================================
--- trunk/tp/t/results/coverage/preformatted.pl 2016-01-06 20:19:06 UTC (rev
6927)
+++ trunk/tp/t/results/coverage/preformatted.pl 2016-01-06 20:40:19 UTC (rev
6928)
@@ -483,6 +483,7 @@
<a name="index-item-in-table-in-format"></a>
</dt>
<dd><pre class="format">
+
in table in format
</pre></dd>
</dl>
Modified: trunk/tp/t/results/html_tests/simple_menu.pl
===================================================================
--- trunk/tp/t/results/html_tests/simple_menu.pl 2016-01-06 20:19:06 UTC
(rev 6927)
+++ trunk/tp/t/results/html_tests/simple_menu.pl 2016-01-06 20:40:19 UTC
(rev 6928)
@@ -2377,6 +2377,7 @@
<li> <pre class="menu-preformatted">iaa
</pre></li></ul>
<pre class="menu-preformatted">
+
in html title
BBB
@@ -2405,6 +2406,7 @@
<li> <pre class="menu-preformatted">detailiaa
</pre></li></ul>
<pre class="menu-preformatted">
+
detailin html detailtitle
detailBBB
Modified: trunk/tp/t/results/itemize/itemize_in_example.pl
===================================================================
--- trunk/tp/t/results/itemize/itemize_in_example.pl 2016-01-06 20:19:06 UTC
(rev 6927)
+++ trunk/tp/t/results/itemize/itemize_in_example.pl 2016-01-06 20:40:19 UTC
(rev 6928)
@@ -798,14 +798,17 @@
more.
</pre></li></ul>
<pre class="example">
+
</pre><ul class="no-bullet">
<li> <pre class="example">as is
</pre></li></ul>
<pre class="example">
+
</pre><ul class="no-bullet">
<li>+ <pre class="example">item +
</pre></li></ul>
<pre class="example">
+
</pre><ul class="no-bullet">
<li>• a–n itemize line <pre class="example">in an itemize line
</pre></li></ul>
Modified: trunk/tp/t/results/menu/block_commands_in_menu_description.pl
===================================================================
--- trunk/tp/t/results/menu/block_commands_in_menu_description.pl
2016-01-06 20:19:06 UTC (rev 6927)
+++ trunk/tp/t/results/menu/block_commands_in_menu_description.pl
2016-01-06 20:40:19 UTC (rev 6928)
@@ -1027,14 +1027,17 @@
<tr><td align="left" valign="top">• <a href="manual.html#Top"
accesskey="1">(manual)</a>:</td><td> </td><td align="left"
valign="top">
<ul>
<li><pre class="menu-preformatted">
+
</pre></li><li> <pre class="menu-preformatted">in item
</pre></li></ul>
<dl compact="compact">
<dd><pre class="menu-preformatted">
+
</pre></dd>
<dt>table item</dt>
<dd><pre class="menu-preformatted">
+
Text.
</pre></dd>
Modified: trunk/tp/t/results/menu/dash_in_menu.pl
===================================================================
--- trunk/tp/t/results/menu/dash_in_menu.pl 2016-01-06 20:19:06 UTC (rev
6927)
+++ trunk/tp/t/results/menu/dash_in_menu.pl 2016-01-06 20:40:19 UTC (rev
6928)
@@ -315,6 +315,7 @@
<tr><td align="left" valign="top">• <a
href="manual.html#n_002d_002d_002dode"
accesskey="1">entry—in</a>:</td><td> </td><td align="left"
valign="top">description — in.
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
comment — in.
</pre></th></tr></table>
Modified: trunk/tp/t/results/menu/detailmenu.pl
===================================================================
--- trunk/tp/t/results/menu/detailmenu.pl 2016-01-06 20:19:06 UTC (rev
6927)
+++ trunk/tp/t/results/menu/detailmenu.pl 2016-01-06 20:40:19 UTC (rev
6928)
@@ -444,6 +444,7 @@
<tr><td align="left" valign="top">• Copying
Conditions:</td><td> </td><td align="left" valign="top">Your rights.
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
</pre></th></tr><tr><td align="left" valign="top">•
detailmenu:</td><td> </td><td align="left" valign="top">
</td></tr>
</table>
Modified: trunk/tp/t/results/menu/detailmenu_on_subnodes.pl
===================================================================
--- trunk/tp/t/results/menu/detailmenu_on_subnodes.pl 2016-01-06 20:19:06 UTC
(rev 6927)
+++ trunk/tp/t/results/menu/detailmenu_on_subnodes.pl 2016-01-06 20:40:19 UTC
(rev 6928)
@@ -2242,9 +2242,11 @@
<tr><td align="left" valign="top">• <a href="#chapter-2"
accesskey="2">chapter 2</a>:</td><td> </td><td align="left"
valign="top">
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
</pre></th></tr><tr><td align="left" valign="top">• <a href="#section"
accesskey="3">section</a>:</td><td> </td><td align="left"
valign="top">
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
</pre></th></tr><tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment">Chap 2
</pre></th></tr><tr><td align="left" valign="top">• <a
href="#section-chap-2" accesskey="4">section chap
2</a>:</td><td> </td><td align="left" valign="top">
Modified: trunk/tp/t/results/menu/entry_after_detailmenu.pl
===================================================================
--- trunk/tp/t/results/menu/entry_after_detailmenu.pl 2016-01-06 20:19:06 UTC
(rev 6927)
+++ trunk/tp/t/results/menu/entry_after_detailmenu.pl 2016-01-06 20:40:19 UTC
(rev 6928)
@@ -961,11 +961,13 @@
<tr><td align="left" valign="top">• <a href="#second"
accesskey="1">second</a>:</td><td> </td><td align="left"
valign="top">
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
Menu comment
</pre></th></tr><tr><td align="left" valign="top">• <a href="#first"
accesskey="2">first</a>:</td><td> </td><td align="left" valign="top">
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
</pre></th></tr><tr><td align="left" valign="top">• <a href="#second"
accesskey="3">second</a>:</td><td> </td><td align="left"
valign="top">
</td></tr>
<tr><td align="left" valign="top">• <a href="#second"
accesskey="4">second</a>:</td><td> </td><td align="left"
valign="top">
Modified: trunk/tp/t/results/menu/example_in_menu_comment.pl
===================================================================
--- trunk/tp/t/results/menu/example_in_menu_comment.pl 2016-01-06 20:19:06 UTC
(rev 6927)
+++ trunk/tp/t/results/menu/example_in_menu_comment.pl 2016-01-06 20:40:19 UTC
(rev 6928)
@@ -417,12 +417,14 @@
<tr><td align="left" valign="top">• entry:</td><td> </td><td
align="left" valign="top">
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
</pre><div class="example">
<pre class="example">in
example
</pre></div>
<pre class="menu-comment">
+
menu comment.
</pre></th></tr></table>
Modified: trunk/tp/t/results/menu/example_in_menu_description.pl
===================================================================
--- trunk/tp/t/results/menu/example_in_menu_description.pl 2016-01-06
20:19:06 UTC (rev 6927)
+++ trunk/tp/t/results/menu/example_in_menu_description.pl 2016-01-06
20:40:19 UTC (rev 6928)
@@ -593,6 +593,7 @@
</pre></div>
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
</pre></th></tr></table>
<hr>
Modified: trunk/tp/t/results/menu/formats_in_menu.pl
===================================================================
--- trunk/tp/t/results/menu/formats_in_menu.pl 2016-01-06 20:19:06 UTC (rev
6927)
+++ trunk/tp/t/results/menu/formats_in_menu.pl 2016-01-06 20:40:19 UTC (rev
6928)
@@ -1180,6 +1180,7 @@
</dl>
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
</pre></th></tr><tr><td align="left" valign="top">• <a
href="info.html#Top" accesskey="2">(info)</a>:</td><td> </td><td
align="left" valign="top">
<pre class="verbatim">some @ verb{x atim
* texinfo:: in @ verbatim
@@ -1193,11 +1194,13 @@
* acronym::</acronym>
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
</pre><div class="example">
<pre class="example">* subsubsection::
Menu comment
</pre></div>
<pre class="menu-comment">
+
</pre></th></tr></table>
<hr>
Modified: trunk/tp/t/results/menu/inlineraw_in_menu_description.pl
===================================================================
--- trunk/tp/t/results/menu/inlineraw_in_menu_description.pl 2016-01-06
20:19:06 UTC (rev 6927)
+++ trunk/tp/t/results/menu/inlineraw_in_menu_description.pl 2016-01-06
20:40:19 UTC (rev 6928)
@@ -562,6 +562,7 @@
end inlineraw
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
</pre></th></tr></table>
<hr>
Modified: trunk/tp/t/results/menu/menu_in_example.pl
===================================================================
--- trunk/tp/t/results/menu/menu_in_example.pl 2016-01-06 20:19:06 UTC (rev
6927)
+++ trunk/tp/t/results/menu/menu_in_example.pl 2016-01-06 20:40:19 UTC (rev
6928)
@@ -860,16 +860,20 @@
<div class="example">
<table class="menu" border="0" cellspacing="0"><tr><td>
<pre class="menu-preformatted">• <a href="entry.html#Top"
accesskey="1">(entry)</a>::
+
</pre><table class="cartouche" border="1"><tr><td>
<pre class="menu-preformatted">in cartouche in description in menu in example
</pre></td></tr></table>
</pre><pre class="menu-comment">
+
</pre><table class="cartouche" border="1"><tr><td>
<pre class="menu-comment">in cartouche in menu comment in menu in example
</pre></td></tr></table>
<pre class="menu-comment">
+
</pre><pre class="menu-preformatted">• <a href="node.html#menu"
accesskey="2">(node) menu</a>:: a node in menu
</pre><pre class="menu-preformatted">• a menu name:<a
href="other.html#node" accesskey="3">(other) node</a>.
+
</pre></td></tr></table>
</div>
<hr>
Modified: trunk/tp/t/results/menu/sc_in_menu.pl
===================================================================
--- trunk/tp/t/results/menu/sc_in_menu.pl 2016-01-06 20:19:06 UTC (rev
6927)
+++ trunk/tp/t/results/menu/sc_in_menu.pl 2016-01-06 20:40:19 UTC (rev
6928)
@@ -1272,6 +1272,7 @@
<tr><td align="left" valign="top">• <a href="#NODE"
accesskey="1"><small>VALUE</small></a>:</td><td> </td><td
align="left" valign="top"><small>DESCRIP TION</small>
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
MENU COMMENT
</pre><div class="example">
@@ -1293,6 +1294,7 @@
<table class="menu" border="0" cellspacing="0"><tr><td>
<pre class="menu-preformatted">• EXAMPLE VALUE:<a
href="dir.html#EXAMPLE-NODE" accesskey="1">(dir)EXAMPLE NODE</a>. EXAMPLE
DESCRIP TION
</pre><pre class="menu-comment">
+
EXAMPLE COMMENT
</pre></td></tr></table>
</div>
Modified: trunk/tp/t/results/menu/simple.pl
===================================================================
--- trunk/tp/t/results/menu/simple.pl 2016-01-06 20:19:06 UTC (rev 6927)
+++ trunk/tp/t/results/menu/simple.pl 2016-01-06 20:40:19 UTC (rev 6928)
@@ -717,6 +717,7 @@
still description
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
new comment
</pre></th></tr><tr><td align="left" valign="top">• last node entry
:</td><td> </td><td align="left" valign="top">
</td></tr>
Modified: trunk/tp/t/results/menu/verb_in_menu_description.pl
===================================================================
--- trunk/tp/t/results/menu/verb_in_menu_description.pl 2016-01-06 20:19:06 UTC
(rev 6927)
+++ trunk/tp/t/results/menu/verb_in_menu_description.pl 2016-01-06 20:40:19 UTC
(rev 6928)
@@ -526,6 +526,7 @@
</tt>
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
</pre></th></tr></table>
<hr>
Modified: trunk/tp/t/results/preformatted/caption_in_example.pl
===================================================================
--- trunk/tp/t/results/preformatted/caption_in_example.pl 2016-01-06
20:19:06 UTC (rev 6927)
+++ trunk/tp/t/results/preformatted/caption_in_example.pl 2016-01-06
20:40:19 UTC (rev 6928)
@@ -389,6 +389,7 @@
</pre><pre class="example">
+
After caption
</pre></div>
<div class="float-caption"><p><strong>float: </strong>caption</p></div></div>';
Modified: trunk/tp/t/results/preformatted/insertcopying_in_example.pl
===================================================================
--- trunk/tp/t/results/preformatted/insertcopying_in_example.pl 2016-01-06
20:19:06 UTC (rev 6927)
+++ trunk/tp/t/results/preformatted/insertcopying_in_example.pl 2016-01-06
20:40:19 UTC (rev 6928)
@@ -140,6 +140,7 @@
$result_converted{'html_text'}->{'insertcopying_in_example'} = '<div
class="example">
<pre class="example">
+
text
</pre></div>
';
Modified: trunk/tp/t/results/preformatted/nested_formats.pl
===================================================================
--- trunk/tp/t/results/preformatted/nested_formats.pl 2016-01-06 20:19:06 UTC
(rev 6927)
+++ trunk/tp/t/results/preformatted/nested_formats.pl 2016-01-06 20:40:19 UTC
(rev 6928)
@@ -428,6 +428,7 @@
$result_converted{'html_text'}->{'nested_formats'} = '<div class="format">
<div class="example">
<pre class="example">
+
in -- format/example
</pre></div>
@@ -436,6 +437,7 @@
<div class="example">
<div class="format">
<pre class="example">
+
in -- example/format
</pre></div>
Modified: trunk/tp/t/results/preformatted/titlefont_in_example.pl
===================================================================
--- trunk/tp/t/results/preformatted/titlefont_in_example.pl 2016-01-06
20:19:06 UTC (rev 6927)
+++ trunk/tp/t/results/preformatted/titlefont_in_example.pl 2016-01-06
20:40:19 UTC (rev 6928)
@@ -169,6 +169,7 @@
$result_converted{'html_text'}->{'titlefont_in_example'} = '<div
class="example">
<h1 class="titlefont">Title</h1><pre class="example">
+
Text.
</pre></div>
';
Modified: trunk/tp/t/results/raw/raw_in_example.pl
===================================================================
--- trunk/tp/t/results/raw/raw_in_example.pl 2016-01-06 20:19:06 UTC (rev
6927)
+++ trunk/tp/t/results/raw/raw_in_example.pl 2016-01-06 20:40:19 UTC (rev
6928)
@@ -602,6 +602,7 @@
<div class="example">
<pre class="example">
+
Some html <code>some code</code>.
Modified: trunk/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
===================================================================
--- trunk/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
2016-01-06 20:19:06 UTC (rev 6927)
+++ trunk/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
2016-01-06 20:40:19 UTC (rev 6928)
@@ -633,6 +633,7 @@
<dd><pre class="example"><a
name="index-index-entry-between-item-and-itemx"></a></pre></dd>
<dt><tt><var>b</var></tt></dt>
<dd><pre class="example">
+
</pre></dd>
<dt><tt><var>c</var></tt></dt>
<dd><pre class="example">l--ine
Modified: trunk/tp/t/results/xtable/table_nested.pl
===================================================================
--- trunk/tp/t/results/xtable/table_nested.pl 2016-01-06 20:19:06 UTC (rev
6927)
+++ trunk/tp/t/results/xtable/table_nested.pl 2016-01-06 20:40:19 UTC (rev
6928)
@@ -3314,6 +3314,7 @@
<a name="index-second-itemx-1"></a>
</dt>
<dd><pre class="example">
+
Text.
</pre></dd>
@@ -3321,6 +3322,7 @@
<a name="index-second-item-1"></a>
</dt>
<dd><pre class="example">
+
Text 2
</pre></dd>
@@ -3329,6 +3331,7 @@
</dt>
</dl>
<pre class="example">
+
Something.
</pre><dl compact="compact">
<dt><tt><em>in item</em></tt></dt>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [6928] extra newline after <pre>,
Gavin D. Smith <=