[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Convert/HTML.pm Texinfo/Conv...
From: |
Patrice Dumas |
Subject: |
texinfo/tp Texinfo/Convert/HTML.pm Texinfo/Conv... |
Date: |
Mon, 14 May 2012 23:56:15 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/05/14 23:56:14
Modified files:
tp/Texinfo/Convert: HTML.pm Plaintext.pm
tp/t/results/converters_tests: at_commands_in_refs.pl
at_commands_in_refs_latin1.pl
at_commands_in_refs_utf8.pl
tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html:
-_0040-_007b_007d-_002e-.html
cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
f_002d_002dile1-f_002d_002dile.html
http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info:
at_commands_in_refs_latin1.info
tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html:
-_0040-_007b_007d-_002e-.html
cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
f_002d_002dile1-f_002d_002dile.html
http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info:
at_commands_in_refs_utf8.info
tp/t/results/coverage_braces: test_image.pl verb_in_xref.pl
tp/t/results/invalid_nestings: table_in_code.pl
tp/t/results/raw: verbatim_in_brace_command.pl
tp/tests : Makefile.am README long_tests.sh
tp/tests/coverage/res_parser/formatting: formatting.2
tp/tests/coverage/res_parser/formatting_fr: formatting.2
tp/tests/coverage/res_parser/formatting_utf8_enable_encoding:
formatting_utf8.2
tp/tests/coverage/res_parser/texi_formatting: formatting.2
formatting.texi
tp/tests/layout/res_parser/formatting_chm: formatting.2
tp/tests/layout/res_parser/formatting_exotic: formatting.2
tp/tests/layout/res_parser/formatting_fr_icons: formatting.2
tp/tests/layout/res_parser/formatting_html: formatting.2
tp/tests/layout/res_parser/formatting_html32: formatting.2
tp/tests/layout/res_parser/formatting_html_nodes: formatting.2
tp/tests/layout/res_parser/formatting_nodes: formatting.2
tp/tests/layout/res_parser/formatting_regions:
formatting_regions.2
tp/tests/layout/res_parser/formatting_weird_quotes: formatting.2
tp/tests/tex_html/res_parser/tex_complex_httex: tex_complex.html
tex_complex_tex4ht_math.html
tp/tests/tex_html/res_parser/tex_httex: tex.html
tex_tex4ht_math.html
Log message:
Don't remove invalid nested command results from output.
Don't run the Tex4ht and Latex2HTML tests automatically.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.233&r2=1.234
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.207&r2=1.208
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/test_image.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/verb_in_xref.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/table_in_code.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/verbatim_in_brace_command.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/Makefile.am?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/README?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/long_tests.sh?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/formatting/formatting.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/formatting_fr/formatting.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/texi_formatting/formatting.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/texi_formatting/formatting.texi?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.html?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex.html?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.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.233
retrieving revision 1.234
diff -u -b -r1.233 -r1.234
--- Texinfo/Convert/HTML.pm 21 Apr 2012 17:44:48 -0000 1.233
+++ Texinfo/Convert/HTML.pm 14 May 2012 23:56:09 -0000 1.234
@@ -7209,10 +7209,11 @@
}
if ($root->{'extra'}) {
- if ($root->{'extra'}->{'invalid_nesting'}) {
- print STDERR "INVALID_NESTING\n" if ($self->get_conf('DEBUG'));
- return '';
- } elsif ($root->{'extra'}->{'missing_argument'}
+ #if ($root->{'extra'}->{'invalid_nesting'}) {
+ # print STDERR "INVALID_NESTING\n" if ($self->get_conf('DEBUG'));
+ # return '';
+ #} elsif ($root->{'extra'}->{'missing_argument'}
+ if ($root->{'extra'}->{'missing_argument'}
and (!$root->{'contents'} or address@hidden>{'contents'}})) {
print STDERR "MISSING_ARGUMENT\n" if ($self->get_conf('DEBUG'));
return '';
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -b -r1.207 -r1.208
--- Texinfo/Convert/Plaintext.pm 14 Feb 2012 22:27:43 -0000 1.207
+++ Texinfo/Convert/Plaintext.pm 14 May 2012 23:56:10 -0000 1.208
@@ -1158,10 +1158,11 @@
}
if ($root->{'extra'}) {
- if ($root->{'extra'}->{'invalid_nesting'}) {
- print STDERR "INVALID_NESTING\n" if ($self->get_conf('DEBUG'));
- return '';
- } elsif ($root->{'extra'}->{'missing_argument'}
+ #if ($root->{'extra'}->{'invalid_nesting'}) {
+ # print STDERR "INVALID_NESTING\n" if ($self->get_conf('DEBUG'));
+ # return '';
+ #} elsif ($root->{'extra'}->{'missing_argument'}
+ if ($root->{'extra'}->{'missing_argument'}
and (!$root->{'contents'} or address@hidden>{'contents'}})) {
print STDERR "MISSING_ARGUMENT\n" if ($self->get_conf('DEBUG'));
return '';
Index: t/results/converters_tests/at_commands_in_refs.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/converters_tests/at_commands_in_refs.pl 21 Apr 2012 17:44:49
-0000 1.5
+++ t/results/converters_tests/at_commands_in_refs.pl 14 May 2012 23:56:10
-0000 1.6
@@ -21746,8 +21746,8 @@
19 [f--ile1] [Image description""\\.]
************************************
-20
-***
+20 @ {} .
+***********
21 \'cite asis\' in @w b in r SC *str* t VAR "dfn" i
**************************************************
@@ -21780,10 +21780,10 @@
e\'\' e;:: *note e. e( e_ .e e< j ee[:: *note i E=` C\',:: *note `` \'\' ` \'
,, ,:: *note << >> << >> < >:: *note `` \'\' --- -- ` \':: *note AAA (fff)
AAA BBB:: *note CCC (rrr) CCC DDD:: *note the someone <address@hidden>
-<address@hidden>:: *note [f--ile1] [Image description""\\.]:: *note :: *note
\'cite asis\' in @w b in r
-SC *str* t VAR "dfn" i:: *note \'env\' \'code\' \'option\' \'samp\' \'command\'
-\'file\' \'C-x <ESC>\':: *note 8.27in:: *note sansserif slanted:: *note
-<indicateurl>:: *note \'http://somewhere_aaa\' text (url) ls::
+<address@hidden>:: *note [f--ile1] [Image description""\\.]:: *note @ {} . ::
*note \'cite asis\' in @w b
+in r SC *str* t VAR "dfn" i:: *note \'env\' \'code\' \'option\' \'samp\'
+\'command\' \'file\' \'C-x <ESC>\':: *note 8.27in:: *note sansserif slanted::
+*note <indicateurl>:: *note \'http://somewhere_aaa\' text (url) ls::
';
@@ -21799,15 +21799,6 @@
},
{
'file_name' => '',
- 'error_line' => ':24: warning: Node expansion ` @ {} .\' in menu differs
from normal node expansion `\'
-',
- 'text' => 'Node expansion ` @ {} .\' in menu differs from normal node
expansion `\'',
- 'type' => 'warning',
- 'macro' => '',
- 'line_nr' => 24
- },
- {
- 'file_name' => '',
'error_line' => ':91: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
@@ -22100,7 +22091,7 @@
<a name="f_002d_002dile1-f_002d_002dile"></a>
<div class="header">
<p>
-Previous: <a href="#the-someone-no_005fexplain_0040there" accesskey="p"
rel="previous"><a href="mailto:address@hidden">the someone</a> <a
href="mailto:address@hidden">address@hidden</a></a>, Up: <a href="#Top"
accesskey="u" rel="up">Top</a> </p>
+Next: <a href="#-_0040-_007b_007d-_002e-" accesskey="n" rel="next"><tt> @ {} .
</tt></a>, Previous: <a href="#the-someone-no_005fexplain_0040there"
accesskey="p" rel="previous"><a href="mailto:address@hidden">the someone</a> <a
href="mailto:address@hidden">address@hidden</a></a>, Up: <a href="#Top"
accesskey="u" rel="up">Top</a> </p>
</div>
<a name="f_002d_002dile1-f_002d_002dile-1"></a>
<h2 class="chapter">19 <img src="f--ile1.jpg" alt="f--ile1"> <img
src="f--ile.png" alt="alt"></h2>
@@ -22112,13 +22103,13 @@
Next: <a href="#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i" accesskey="n"
rel="next"><cite>cite asis</cite> in @w <b>b</b><!-- /@w --> <span
class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt>
<var>var</var> <em>dfn</em> <i>i</i></a>, Previous: <a
href="#f_002d_002dile1-f_002d_002dile" accesskey="p" rel="previous"><img
src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a>, Up: <a
href="#Top" accesskey="u" rel="up">Top</a> </p>
</div>
<a name="-_0040-_007b_007d-_002e--1"></a>
-<h2 class="chapter">20 </h2>
+<h2 class="chapter">20 <tt> @ {} . </tt></h2>
<hr>
<a name="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"></a>
<div class="header">
<p>
-Next: <a href="#env-code-option-samp-command-file-C_002dx-ESC" accesskey="n"
rel="next"><code>env</code> <code>code</code> ‘<samp>option</samp>’
‘<samp>samp</samp>’ <code>command</code>
‘<tt>file</tt>’ <kbd>C-x <ESC></kbd></a>, Up: <a href="#Top"
accesskey="u" rel="up">Top</a> </p>
+Next: <a href="#env-code-option-samp-command-file-C_002dx-ESC" accesskey="n"
rel="next"><code>env</code> <code>code</code> ‘<samp>option</samp>’
‘<samp>samp</samp>’ <code>command</code>
‘<tt>file</tt>’ <kbd>C-x <ESC></kbd></a>, Previous: <a
href="#-_0040-_007b_007d-_002e-" accesskey="p" rel="previous"><tt> @ {} .
</tt></a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> </p>
</div>
<a name="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i-1"></a>
<h2 class="chapter">21 <cite>cite asis</cite> in @w <b>b</b><!-- /@w
--> <span class="roman">in r</span> <small>SC</small> <strong>str</strong>
<tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></h2>
@@ -22190,7 +22181,7 @@
<a href="#CCC-CCC-DDD"><abbr title="rrr">CCC</abbr> (rrr) <abbr
title="rrr">CCC</abbr> <abbr>DDD</abbr></a>
<a href="#the-someone-no_005fexplain_0040there"><a
href="mailto:address@hidden">the someone</a> <a
href="mailto:address@hidden">address@hidden</a></a>
<a href="#f_002d_002dile1-f_002d_002dile"><img src="f--ile1.jpg"
alt="f--ile1"> <img src="f--ile.png" alt="alt"></a>
-<a href="#-_0040-_007b_007d-_002e-"></a>
+<a href="#-_0040-_007b_007d-_002e-"><tt> @ {} . </tt></a>
<a href="#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><cite>cite
asis</cite> in @w <b>b</b><!-- /@w --> <span class="roman">in
r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var>
<em>dfn</em> <i>i</i></a>
<a href="#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code>
<code>code</code> ‘<samp>option</samp>’
‘<samp>samp</samp>’ <code>command</code>
‘<tt>file</tt>’ <kbd>C-x <ESC></kbd></a>
<a href="#g_t8_002e27in">8.27in</a>
@@ -22735,20 +22726,20 @@
****************************************************
-File: , Node: [f--ile1] [image src="f--ile.png" alt="alt" text="[Image
description\\"\\"\\\\.]"