[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[6681] last newline of raw block
|
From: |
Gavin D. Smith |
|
Subject: |
[6681] last newline of raw block |
|
Date: |
Thu, 08 Oct 2015 18:18:06 +0000 |
Revision: 6681
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6681
Author: gavin
Date: 2015-10-08 18:18:05 +0000 (Thu, 08 Oct 2015)
Log Message:
-----------
last newline of raw block
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Convert/DocBook.pm
trunk/tp/Texinfo/Convert/HTML.pm
trunk/tp/t/results/converters_tests/raw_block_commands.pl
trunk/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
trunk/tp/t/results/html_tests/raw_html.pl
trunk/tp/t/results/html_tests/simple_menu.pl
trunk/tp/t/results/menu/block_commands_in_menu_description.pl
trunk/tp/t/results/menu/formats_in_menu.pl
trunk/tp/t/results/raw/lone_braces_in_html.pl
trunk/tp/t/results/raw/raw_expanded_in_style.pl
trunk/tp/t/results/raw/raw_in_example.pl
trunk/tp/t/results/raw/raw_in_style.pl
trunk/tp/tests/formatting/res_parser/cond/cond.html
trunk/tp/tests/formatting/res_parser/cond_ifhtml_ifinfo_iftex/cond.html
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2015-10-08 15:48:55 UTC (rev 6680)
+++ trunk/ChangeLog 2015-10-08 18:18:05 UTC (rev 6681)
@@ -1,5 +1,11 @@
2015-10-08 Gavin Smith <address@hidden>
+ * tp/Texinfo/Convert/HTML.pm (_convert_raw_command),
+ * tp/Texinfo/Convert/Docbook.pm (_convert): Don't remove newline
+ from the last line of a raw format block.
+
+2015-10-08 Gavin Smith <address@hidden>
+
* doc/info-stnd.texi (Variables): Document 'nodeline' variable.
* NEWS: Announce new variables.
Modified: trunk/tp/Texinfo/Convert/DocBook.pm
===================================================================
--- trunk/tp/Texinfo/Convert/DocBook.pm 2015-10-08 15:48:55 UTC (rev 6680)
+++ trunk/tp/Texinfo/Convert/DocBook.pm 2015-10-08 18:18:05 UTC (rev 6681)
@@ -1348,15 +1348,11 @@
# a pending_prepend still there may happen if a quotation is empty.
delete $self->{'pending_prepend'};
#$result .= "</$root->{'cmdname'}>\n";
- if ($self->{'document_context'}->[-1]->{'raw'}) {
- chomp ($result);
- chomp ($result);
- } else {
- if (exists($docbook_preformatted_formats{$root->{'cmdname'}})) {
- my $format = pop
@{$self->{'document_context'}->[-1]->{'preformatted_stack'}};
- die "BUG $format ne $docbook_preformatted_formats{$root->{'cmdname'}}"
- if ($format ne $docbook_preformatted_formats{$root->{'cmdname'}});
- }
+ if (!$self->{'document_context'}->[-1]->{'raw'}
+ and exists($docbook_preformatted_formats{$root->{'cmdname'}})) {
+ my $format = pop
@{$self->{'document_context'}->[-1]->{'preformatted_stack'}};
+ die "BUG $format ne $docbook_preformatted_formats{$root->{'cmdname'}}"
+ if ($format ne $docbook_preformatted_formats{$root->{'cmdname'}});
}
if ($self->{'context_block_commands'}->{$root->{'cmdname'}}) {
pop @{$self->{'document_context'}};
Modified: trunk/tp/Texinfo/Convert/HTML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/HTML.pm 2015-10-08 15:48:55 UTC (rev 6680)
+++ trunk/tp/Texinfo/Convert/HTML.pm 2015-10-08 18:18:05 UTC (rev 6681)
@@ -2367,7 +2367,6 @@
my $content = shift;
if ($cmdname eq $self->{'output_format'}) {
- chomp ($content);
return $content;
}
$self->line_warn(sprintf($self->__("raw format %s is not converted"),
Modified: trunk/tp/t/results/converters_tests/raw_block_commands.pl
===================================================================
--- trunk/tp/t/results/converters_tests/raw_block_commands.pl 2015-10-08
15:48:55 UTC (rev 6680)
+++ trunk/tp/t/results/converters_tests/raw_block_commands.pl 2015-10-08
18:18:05 UTC (rev 6681)
@@ -496,6 +496,7 @@
<blink>html</blink> ``}
+
';
@@ -520,6 +521,7 @@
<emphasis>docbook</emphasis> ``}
+
';
1;
Modified: trunk/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
===================================================================
--- trunk/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
2015-10-08 15:48:55 UTC (rev 6680)
+++ trunk/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
2015-10-08 18:18:05 UTC (rev 6681)
@@ -535,6 +535,7 @@
-$\\underline{a < b <literal>tex \\hbox{ code }</literal>}$ ``}';
+$\\underline{a < b <literal>tex \\hbox{ code }</literal>}$ ``}
+';
1;
Modified: trunk/tp/t/results/html_tests/raw_html.pl
===================================================================
--- trunk/tp/t/results/html_tests/raw_html.pl 2015-10-08 15:48:55 UTC (rev
6680)
+++ trunk/tp/t/results/html_tests/raw_html.pl 2015-10-08 18:18:05 UTC (rev
6681)
@@ -161,6 +161,7 @@
<i>
+
</body>
</html>
';
Modified: trunk/tp/t/results/html_tests/simple_menu.pl
===================================================================
--- trunk/tp/t/results/html_tests/simple_menu.pl 2015-10-08 15:48:55 UTC
(rev 6680)
+++ trunk/tp/t/results/html_tests/simple_menu.pl 2015-10-08 18:18:05 UTC
(rev 6681)
@@ -2368,7 +2368,8 @@
</pre><ul>
<li> <pre class="menu-preformatted">idescr
</pre></li></ul>
-<pre class="menu-preformatted">in htmlAAA
+<pre class="menu-preformatted">in html
+AAA
CCC
@@ -2377,6 +2378,7 @@
</pre></li></ul>
<pre class="menu-preformatted">
in html title
+
BBB
</pre><ul>
@@ -2394,7 +2396,8 @@
</pre><ul>
<li> <pre class="menu-preformatted">idetaildescr
</pre></li></ul>
-<pre class="menu-preformatted">detailin detailhtmldetailAAA
+<pre class="menu-preformatted">detailin detailhtml
+detailAAA
detailCCC
@@ -2403,6 +2406,7 @@
</pre></li></ul>
<pre class="menu-preformatted">
detailin html detailtitle
+
detailBBB
</pre><ul>
Modified: trunk/tp/t/results/menu/block_commands_in_menu_description.pl
===================================================================
--- trunk/tp/t/results/menu/block_commands_in_menu_description.pl
2015-10-08 15:48:55 UTC (rev 6680)
+++ trunk/tp/t/results/menu/block_commands_in_menu_description.pl
2015-10-08 18:18:05 UTC (rev 6681)
@@ -1041,6 +1041,7 @@
</dl>
<b> in html </b>
+
<pre class="verbatim">
</pre></td></tr>
</table>
Modified: trunk/tp/t/results/menu/formats_in_menu.pl
===================================================================
--- trunk/tp/t/results/menu/formats_in_menu.pl 2015-10-08 15:48:55 UTC (rev
6680)
+++ trunk/tp/t/results/menu/formats_in_menu.pl 2015-10-08 18:18:05 UTC (rev
6681)
@@ -1186,7 +1186,8 @@
</pre></td></tr>
<tr><td align="left" valign="top">• <a href="manual2.html#Top"
accesskey="3">(manual2)</a>:</td><td> </td><td align="left"
valign="top">%
-<i></i>Log$
+<i></i>
+Log$
</td></tr>
<tr><td align="left" valign="top">• <a href="truc.html#Top"
accesskey="4">(truc)</a>:</td><td> </td><td align="left"
valign="top"><acronym>description
* acronym::</acronym>
Modified: trunk/tp/t/results/raw/lone_braces_in_html.pl
===================================================================
--- trunk/tp/t/results/raw/lone_braces_in_html.pl 2015-10-08 15:48:55 UTC
(rev 6680)
+++ trunk/tp/t/results/raw/lone_braces_in_html.pl 2015-10-08 18:18:05 UTC
(rev 6681)
@@ -217,6 +217,8 @@
$result_converted{'html_text'}->{'lone_braces_in_html'} = '}
-{';
+{
+';
+
1;
Modified: trunk/tp/t/results/raw/raw_expanded_in_style.pl
===================================================================
--- trunk/tp/t/results/raw/raw_expanded_in_style.pl 2015-10-08 15:48:55 UTC
(rev 6680)
+++ trunk/tp/t/results/raw/raw_expanded_in_style.pl 2015-10-08 18:18:05 UTC
(rev 6681)
@@ -156,6 +156,7 @@
$result_converted{'html_text'}->{'raw_expanded_in_style'} = '<p><code>
-in html</code></p>';
+in html
+</code></p>';
1;
Modified: trunk/tp/t/results/raw/raw_in_example.pl
===================================================================
--- trunk/tp/t/results/raw/raw_in_example.pl 2015-10-08 15:48:55 UTC (rev
6680)
+++ trunk/tp/t/results/raw/raw_in_example.pl 2015-10-08 18:18:05 UTC (rev
6681)
@@ -596,7 +596,8 @@
$result_converted{'html_text'}->{'raw_in_example'} = '<div class="example">
-<pre class="example">in html</pre></div>
+<pre class="example">in html
+</pre></div>
<div class="example">
<pre class="example">
@@ -604,6 +605,7 @@
Some html <code>some code</code>.
+
</pre></div>
';
Modified: trunk/tp/t/results/raw/raw_in_style.pl
===================================================================
--- trunk/tp/t/results/raw/raw_in_style.pl 2015-10-08 15:48:55 UTC (rev
6680)
+++ trunk/tp/t/results/raw/raw_in_style.pl 2015-10-08 18:18:05 UTC (rev
6681)
@@ -154,6 +154,7 @@
$result_converted{'html_text'}->{'raw_in_style'} = '<p><code>
-in html</code></p>';
+in html
+</code></p>';
1;
Modified: trunk/tp/tests/formatting/res_parser/cond/cond.html
===================================================================
--- trunk/tp/tests/formatting/res_parser/cond/cond.html 2015-10-08 15:48:55 UTC
(rev 6680)
+++ trunk/tp/tests/formatting/res_parser/cond/cond.html 2015-10-08 18:18:05 UTC
(rev 6681)
@@ -47,6 +47,7 @@
<a name="Top"></a>
This is html text.
+
<p>This is ifhtml text.
</p>
Modified:
trunk/tp/tests/formatting/res_parser/cond_ifhtml_ifinfo_iftex/cond.html
===================================================================
--- trunk/tp/tests/formatting/res_parser/cond_ifhtml_ifinfo_iftex/cond.html
2015-10-08 15:48:55 UTC (rev 6680)
+++ trunk/tp/tests/formatting/res_parser/cond_ifhtml_ifinfo_iftex/cond.html
2015-10-08 18:18:05 UTC (rev 6681)
@@ -47,6 +47,7 @@
<a name="Top"></a>
This is html text.
+
<p>This is ifhtml text.
</p>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [6681] last newline of raw block,
Gavin D. Smith <=