[5281]

[Patrice Dumas]

Revision: 5281
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5281
Author:   pertusus
Date:     2013-08-06 23:16:56 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------

        * tp/Texinfo/Convert/HTML.pm(_default_protect_text), 
        tp/init/html32.pm: protect ^L with an entity.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/HTML.pm
    trunk/tp/init/html32.pm
    trunk/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2013-08-06 21:57:06 UTC (rev 5280)
+++ trunk/ChangeLog     2013-08-06 23:16:56 UTC (rev 5281)
@@ -1,3 +1,8 @@
+2013-08-07  Patrice Dumas  <address@hidden>
+
+       * tp/Texinfo/Convert/HTML.pm(_default_protect_text), 
+       tp/init/html32.pm: protect ^L with an entity.
+
 2013-08-06  Patrice Dumas  <address@hidden>
 
        * tp/Texinfo/Convert/TexinfoXML.pm(_xml_attributes):

Modified: trunk/tp/Texinfo/Convert/HTML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/HTML.pm    2013-08-06 21:57:06 UTC (rev 5280)
+++ trunk/tp/Texinfo/Convert/HTML.pm    2013-08-06 23:16:56 UTC (rev 5281)
@@ -1843,7 +1843,9 @@
 sub _default_protect_text($$) {
   my $self = shift;
   my $text = shift;
-  return $self->xml_protect_text($text);
+  my $result = $self->xml_protect_text($text);
+  $result =~ s/\f/&#12;/g;
+  return $result;
 }
 
 sub _default_heading_text($$$$$)

Modified: trunk/tp/init/html32.pm
===================================================================
--- trunk/tp/init/html32.pm     2013-08-06 21:57:06 UTC (rev 5280)
+++ trunk/tp/init/html32.pm     2013-08-06 23:16:56 UTC (rev 5281)
@@ -89,6 +89,7 @@
   $text =~ s/</&lt;/g;
   $text =~ s/>/&gt;/g;
   $text =~ s/\"/&#34;/g;
+  $text =~ s/\f/&#12;/g;
   return $text;
 }
 

Modified: trunk/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl   
2013-08-06 21:57:06 UTC (rev 5280)
+++ trunk/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl   
2013-08-06 23:16:56 UTC (rev 5281)
@@ -319,15 +319,15 @@
 ';
 
 
-$result_converted{'html_text'}->{'form_feed_in_brace_commands'} = '<p><samp> 
aa</samp> <a name="aa"></a></p><p>something <a href="mailto:aaa";>fff</a><a 
name="DOCF1" href="#FOOT1"><sup>1</sup></a> <a name="DOCF2" 
href="#FOOT2"><sup>2</sup></a>.
+$result_converted{'html_text'}->{'form_feed_in_brace_commands'} = '<p><samp> 
&#12;aa</samp> <a name="aa"></a></p>&#12;<p>something <a 
href="mailto:aaa";>fff</a><a name="DOCF1" href="#FOOT1"><sup>1</sup></a> <a 
name="DOCF2" href="#FOOT2"><sup>2</sup></a>.
 </p><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
 <h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
-<p>f1 </p>
+<p>f1 </p>&#12;
 <h3><a name="FOOT2" href="#DOCF2">(2)</a></h3>
-<p>gg</p><p>jj</p>
+<p>gg</p>&#12;<p>jj</p>
 </div>
 ';