[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ./ChangeLog ./NEWS ./TODO ./texi2html...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ./ChangeLog ./NEWS ./TODO ./texi2html... |
|
Date: |
Fri, 27 Jan 2006 16:42:57 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Branch:
Changes by: Patrice Dumas <address@hidden> 06/01/27 16:42:56
Modified files:
. : ChangeLog NEWS TODO texi2html.pl
Tests : test.sh
Tests/GermanNodeTest_res: nodetest.html
nodetest_for_makeinfo.html
Tests/formatting: commands_in_ifset.texi
Tests/formatting_res: commands_in_ifset.html
commands_in_ifset.passfirst
commands_in_ifset.passtexi
no_unicode_nodetest.html
no_unicode_nodetest_latin1.html
no_unicode_nodetest_utf8.html
nodetest_1.html nodetest_3.html
nodetest_4.html nodetest_latin1.html
nodetest_utf8.html verbatim_html.html
Tests/sectionning: ref_in_anchor.texi
Tests/sectionning_res: ref_in_anchor.html
ref_in_anchor.passfirst
ref_in_anchor.passtexi
i18n : pt pt_BR
Added files:
Tests/formatting: at_commands_in_refs.texi
Tests/formatting_res: at_commands_in_refs.2
at_commands_in_refs.html
at_commands_in_refs.passfirst
at_commands_in_refs.passtexi
Tests/macros_res: set_ifset_in_macro.2 set_ifset_in_macro.html
set_ifset_in_macro.passfirst
set_ifset_in_macro.passtexi
Log message:
* texi2html.pl: don't remove spaces around @-commands in xhtml
refs.
add back caching of html generated by latex2html. More accurate
counts and error messages for latex2html and other cleanings.
Cleaner interface for debug and verbose with main namespace.
* Tests/formatting/at_commands_in_refs.texi: test for @-commands
in external ref.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/ChangeLog.diff?tr1=1.232&tr2=1.233&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/NEWS.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/TODO.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/texi2html.pl.diff?tr1=1.154&tr2=1.155&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/test.sh.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/GermanNodeTest_res/nodetest.html.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/GermanNodeTest_res/nodetest_for_makeinfo.html.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting/at_commands_in_refs.texi?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting/commands_in_ifset.texi.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/at_commands_in_refs.2?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/at_commands_in_refs.html?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/at_commands_in_refs.passfirst?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/at_commands_in_refs.passtexi?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/commands_in_ifset.html.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/commands_in_ifset.passfirst.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/commands_in_ifset.passtexi.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/no_unicode_nodetest.html.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/no_unicode_nodetest_latin1.html.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/no_unicode_nodetest_utf8.html.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/nodetest_1.html.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/nodetest_3.html.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/nodetest_4.html.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/nodetest_latin1.html.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/nodetest_utf8.html.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/verbatim_html.html.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/macros_res/set_ifset_in_macro.2?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/macros_res/set_ifset_in_macro.html?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/macros_res/set_ifset_in_macro.passfirst?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/macros_res/set_ifset_in_macro.passtexi?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/sectionning/ref_in_anchor.texi.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/sectionning_res/ref_in_anchor.html.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/sectionning_res/ref_in_anchor.passfirst.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/sectionning_res/ref_in_anchor.passtexi.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/i18n/pt.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/i18n/pt_BR.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: texi2html/ChangeLog
diff -u texi2html/ChangeLog:1.232 texi2html/ChangeLog:1.233
--- texi2html/ChangeLog:1.232 Thu Dec 1 08:38:40 2005
+++ texi2html/ChangeLog Fri Jan 27 16:42:55 2006
@@ -1,3 +1,13 @@
+2006-01-27 Patrice Dumas <address@hidden>
+
+ * texi2html.pl: don't remove spaces around @-commands in xhtml
+ refs.
+ add back caching of html generated by latex2html. More accurate
+ counts and error messages for latex2html and other cleanings.
+ Cleaner interface for debug and verbose with main namespace.
+ * Tests/formatting/at_commands_in_refs.texi: test for @-commands
+ in external ref.
+
2005-11-30 Patrice Dumas <address@hidden>
* texi2html.pl, texi2html.init, examples/tex4ht.init, doc/*:
Index: texi2html/NEWS
diff -u texi2html/NEWS:1.46 texi2html/NEWS:1.47
--- texi2html/NEWS:1.46 Tue Nov 29 19:04:25 2005
+++ texi2html/NEWS Fri Jan 27 16:42:55 2006
@@ -64,6 +64,8 @@
* style_stack really contains the formatting @-commands.
+* caching of html generated by latex2html reenabled.
+
* FOR DEVELOPERS
--------------
Index: texi2html/TODO
diff -u texi2html/TODO:1.25 texi2html/TODO:1.26
--- texi2html/TODO:1.25 Mon Nov 14 11:13:58 2005
+++ texi2html/TODO Fri Jan 27 16:42:55 2006
@@ -78,6 +78,16 @@
* @m_cedilla appears in output with --macro-expand. That's a bug.
+* currently the following leads to an error:
+
address@hidden
+* @strong{node}::
address@hidden menu
+
address@hidden node
+
+Is it a bug or a feature?
+
* in chm.init (Jose Fonseca)
[WINDOWS]
Index: texi2html/Tests/GermanNodeTest_res/nodetest.html
diff -u texi2html/Tests/GermanNodeTest_res/nodetest.html:1.37
texi2html/Tests/GermanNodeTest_res/nodetest.html:1.38
--- texi2html/Tests/GermanNodeTest_res/nodetest.html:1.37 Tue Aug 23
23:51:10 2005
+++ texi2html/Tests/GermanNodeTest_res/nodetest.html Fri Jan 27 16:42:55 2006
@@ -166,7 +166,7 @@
</tr></table>
<h2 class="section"> 1.3 ï </h2>
<hr size="6">
-<a name="with-brace_00ef"></a>
+<a name="with-brace-_00ef"></a>
<a name="SEC5"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC4" title="Previous section
in reading order"> < </a>]</td>
@@ -186,7 +186,7 @@
</tr></table>
<h2 class="section"> 1.4 With brace ï </h2>
<hr size="6">
-<a name="with-dotless_00ef"></a>
+<a name="with-dotless-_00ef"></a>
<a name="SEC6"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC5" title="Previous section
in reading order"> < </a>]</td>
@@ -778,7 +778,7 @@
</tr></table>
<h2 class="section"> 3.3 ì </h2>
<hr size="6">
-<a name="with-brace_00ec"></a>
+<a name="with-brace-_00ec"></a>
<a name="SEC33"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC32" title="Previous section
in reading order"> < </a>]</td>
@@ -798,7 +798,7 @@
</tr></table>
<h2 class="section"> 3.4 ì </h2>
<hr size="6">
-<a name="with-dotless_00ec"></a>
+<a name="with-dotless-_00ec"></a>
<a name="SEC34"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC33" title="Previous section
in reading order"> < </a>]</td>
@@ -1052,7 +1052,7 @@
</tr></table>
<h2 class="section"> 4.3 î </h2>
<hr size="6">
-<a name="with-brace_00ee"></a>
+<a name="with-brace-_00ee"></a>
<a name="SEC46"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC45" title="Previous section
in reading order"> < </a>]</td>
@@ -1073,7 +1073,7 @@
<h2 class="section"> 4.4 î </h2>
<p>Test @^{i}.
</p><hr size="6">
-<a name="with-dotless_00ee"></a>
+<a name="with-dotless-_00ee"></a>
<a name="SEC47"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC46" title="Previous section
in reading order"> < </a>]</td>
Index: texi2html/Tests/GermanNodeTest_res/nodetest_for_makeinfo.html
diff -u texi2html/Tests/GermanNodeTest_res/nodetest_for_makeinfo.html:1.22
texi2html/Tests/GermanNodeTest_res/nodetest_for_makeinfo.html:1.23
--- texi2html/Tests/GermanNodeTest_res/nodetest_for_makeinfo.html:1.22 Tue Aug
23 23:51:10 2005
+++ texi2html/Tests/GermanNodeTest_res/nodetest_for_makeinfo.html Fri Jan
27 16:42:55 2006
@@ -166,7 +166,7 @@
</tr></table>
<h2 class="section"> 1.3 ï </h2>
<hr size="6">
-<a name="with-brace_00ef"></a>
+<a name="with-brace-_00ef"></a>
<a name="SEC5"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC4" title="Previous section
in reading order"> < </a>]</td>
@@ -186,7 +186,7 @@
</tr></table>
<h2 class="section"> 1.4 With brace ï </h2>
<hr size="6">
-<a name="with-dotless_00ef"></a>
+<a name="with-dotless-_00ef"></a>
<a name="SEC6"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC5" title="Previous section
in reading order"> < </a>]</td>
@@ -778,7 +778,7 @@
</tr></table>
<h2 class="section"> 3.3 ì </h2>
<hr size="6">
-<a name="with-brace_00ec"></a>
+<a name="with-brace-_00ec"></a>
<a name="SEC33"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC32" title="Previous section
in reading order"> < </a>]</td>
@@ -798,7 +798,7 @@
</tr></table>
<h2 class="section"> 3.4 ì </h2>
<hr size="6">
-<a name="with-dotless_00ec"></a>
+<a name="with-dotless-_00ec"></a>
<a name="SEC34"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC33" title="Previous section
in reading order"> < </a>]</td>
@@ -1052,7 +1052,7 @@
</tr></table>
<h2 class="section"> 4.3 î </h2>
<hr size="6">
-<a name="with-brace_00ee"></a>
+<a name="with-brace-_00ee"></a>
<a name="SEC46"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC45" title="Previous section
in reading order"> < </a>]</td>
@@ -1073,7 +1073,7 @@
<h2 class="section"> 4.4 î </h2>
<p>Test @^{i}.
</p><hr size="6">
-<a name="with-dotless_00ee"></a>
+<a name="with-dotless-_00ee"></a>
<a name="SEC47"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC46" title="Previous section
in reading order"> < </a>]</td>
Index: texi2html/Tests/formatting/commands_in_ifset.texi
diff -u texi2html/Tests/formatting/commands_in_ifset.texi:1.1
texi2html/Tests/formatting/commands_in_ifset.texi:1.2
--- texi2html/Tests/formatting/commands_in_ifset.texi:1.1 Fri Aug 19
12:14:46 2005
+++ texi2html/Tests/formatting/commands_in_ifset.texi Fri Jan 27 16:42:55 2006
@@ -2,15 +2,23 @@
@setfilename commands_in_ifset.info
@node Top
@top Top section
address@hidden
address@hidden test a lot of constructs in @ifset, imbricated ifset, macro
expansion
address@hidden in ifset. The ifset are not set. Otherwise there would be a lot
of
address@hidden syntax errors.
+
address@hidden test @definfoenclose and @documentencoding in ifset
@ifset notset
@definfoenclose
address@hidden strog,:,:
address@hidden strong,:,:
@documentencoding ISO-8859-1
@end ifset
@strong{text}
address@hidden test all the regular constructs in ifset
+
@ifset notset
<
@@ -456,6 +464,8 @@
@end ifset
address@hidden test @copying in ifset
+
@ifset notset
@copying
copying
@@ -466,6 +476,8 @@
@copying
@end ifset
address@hidden test indices, @contents and @bye in ifset
+
@ifset notset
@cindex t--ruc
@cindex T--ruc
@@ -502,6 +514,8 @@
@bye
@end ifset
address@hidden test that @end ifset is ignored when appearing in @ignore
+
@ifset notset
@ignore
@end ifset
@@ -509,6 +523,8 @@
text
@end ifset
address@hidden test that lone braces are ignored in @ifset
+
@ifset notset
open {
@end ifset
@@ -517,6 +533,9 @@
close }
@end ifset
address@hidden test that @end ifset is ignored when appearing in @verb,
@verbatim,
address@hidden html,
+
@ifset notset
@verbatim
@end ifset
@@ -535,12 +554,15 @@
@end html
@end ifset
address@hidden test that there is no error with a @table, @example, @deffn and
address@hidden @itemize opening in @ifset
+
@ifset notset
@table
@end ifset
@ifset notset
address@hidden example
address@hidden
@end ifset
@ifset notset
@@ -548,13 +570,43 @@
@end ifset
@ifset notset
address@hidden
address@hidden my item
address@hidden ifset
+
address@hidden test that there is no error with a @table, @example, @deffn and
address@hidden @itemize end in @ifset
+
address@hidden notset
address@hidden table
address@hidden ifset
+
address@hidden notset
address@hidden example
address@hidden ifset
+
address@hidden notset
address@hidden deffn
address@hidden ifset
+
address@hidden notset
address@hidden itemize
address@hidden ifset
+
address@hidden test that @-command opening is ignored when appearing in @ignore
+
address@hidden notset
opend code @code{
@end ifset
address@hidden test that @deffnx is ignored in @ifset
+
@ifset notset
@deffnx something
@end ifset
address@hidden test nested ifset
+
@ifset notset
@ifset nonotset
@@ -563,6 +615,8 @@
@end ifset
@end ifset
address@hidden test that some wrong constructs are rightly ignored in nested
@ifset
+
@ifset notset
@ifset nonotset
@@ -587,10 +641,14 @@
@end ifset
@end ifset
address@hidden test for @node in @ifset
+
@ifset notset
@node
@end ifset
address@hidden test for @ifset without arg in @ifset
+
@ifset notset
text3
@ifset
@@ -598,5 +656,504 @@
@end ifset
@end ifset
-Line 593 Before bye
address@hidden define a macro and call it within a @ifset
+
address@hidden mymacro
+
+<
+>
+"
+&
+
+``simple-double--three---four----''@*
+code: @code{``simple-double--three---four----''} @*
+asis: @asis{``simple-double--three---four----''} @*
+strong: @strong{``simple-double--three---four----''} @*
+kbd: @kbd{``simple-double--three---four----''} @*
+
address@hidden --option
address@hidden ``
address@hidden ``
address@hidden --foption
+
+@@"u @"u
+@@"@address@hidden @"{U}
+@@~n @~n
+@@^a @^a
+@@'e @'e
+@@=o @=o
+@@`i @`i
+@@'@{@@address@hidden@address@hidden @'address@hidden
+@@address@hidden@} @dotless{i}
+@@address@hidden@} @dotless{ij}
+
+@@address@hidden@} @dotless{truc}
+
+@@* @*
+@@ followed by a space
+@
+@@ followed by a tab
+@
+@@ followed by a new line
+@
address@hidden@@-} @-
address@hidden@@|} @|
address@hidden@@:} @:
address@hidden@@!} @!
address@hidden@@?} @?
address@hidden@@.} @.
address@hidden@@@@} @@
address@hidden@@@}} @}
address@hidden@@@{} @{
address@hidden@@/} @/
address@hidden@@#} @#
+
+@@TeX @TeX{}
+@@LaTeX @LaTeX{}
address@hidden @br{}
+@@bullet @bullet{}
+@@copyright @copyright{}
+@@dots @dots{}
+@@enddots @enddots{}
+@@equiv @equiv{}
+@@error @error{}
+@@expansion @expansion{}
+@@minus @minus{}
+@@point @point{}
+@@print @print{}
+@@result @result{}
+@@today @today{}
+@@aa @aa{}
+@@AA @AA{}
+@@ae @ae{}
+@@oe @oe{}
+@@AE @AE{}
+@@OE @OE{}
+@@o @o{}
+@@O @O{}
+@@ss @ss{}
+@@l @l{}
+@@L @L{}
+@@exclamdown @exclamdown{}
+@@questiondown @questiondown{}
+@@pounds @pounds{}
+@@registeredsymbol @registeredsymbol{}
+@@ordf @ordf{}
+@@ordm @ordm{}
+@@comma @comma{}
+
address@hidden@@address@hidden,an accronym @@address@hidden@}
@@address@hidden@address@hidden @acronym{--a,an accronym @comma{} @enddots{}}
address@hidden@@address@hidden@}} @acronym{--a}
address@hidden@@address@hidden@}} @asis{--a}
address@hidden@@address@hidden@}} @b{--a}
address@hidden@@address@hidden@}} @cite{--a}
address@hidden@@address@hidden@}} @code{--a}
address@hidden@@address@hidden@}} @command{--a}
address@hidden@@address@hidden@}} @ctrl{--a}
address@hidden@@address@hidden@}} @dfn{--a}
address@hidden@@address@hidden@}} @dmn{--a}
address@hidden@@address@hidden,address@hidden @email{--a,--b}
address@hidden@@address@hidden,address@hidden @email{,--b}
address@hidden@@address@hidden@}} @email{--a}
address@hidden@@address@hidden@}} @emph{--a}
address@hidden@@address@hidden@}} @env{--a}
address@hidden@@address@hidden@}} @file{--a}
address@hidden@@address@hidden@}} @i{--a}
address@hidden@@address@hidden@}} @kbd{--a}
address@hidden@@address@hidden@}} @key{--a}
address@hidden@@address@hidden@}} @math{--a}
address@hidden@@address@hidden@}} @option{--a}
address@hidden@@address@hidden@}} @r{--a}
address@hidden@@address@hidden@}} @samp{--a}
address@hidden@@address@hidden@}} @sc{--a}
address@hidden@@address@hidden@}} @strong{--a}
address@hidden@@address@hidden@}} @t{--a}
address@hidden@@address@hidden@}} @titlefont{--a}
address@hidden@@address@hidden@}} @indicateurl{--a}
address@hidden@@address@hidden,address@hidden @uref{--a,--b}
address@hidden@@address@hidden@}} @uref{--a}
address@hidden@@address@hidden,address@hidden @uref{,--b}
address@hidden@@address@hidden,address@hidden @url{--a,--b}
address@hidden@@address@hidden,@}} @url{--a,}
address@hidden@@address@hidden,address@hidden @url{,--b}
address@hidden@@address@hidden@}} @var{--a}
address@hidden@@address@hidden:--a:@}} @verb{:--a:}
address@hidden@@address@hidden@}} @w{--a}
address@hidden@@address@hidden@}} @H{a}
address@hidden@@address@hidden@}} @H{--a}
address@hidden@@address@hidden@}} @dotaccent{a}
address@hidden@@address@hidden@}} @dotaccent{--a}
address@hidden@@address@hidden@}} @ringaccent{a}
address@hidden@@address@hidden@}} @ringaccent{--a}
address@hidden@@address@hidden@}} @tieaccent{a}
address@hidden@@address@hidden@}} @tieaccent{--a}
address@hidden@@address@hidden@}} @u{a}
address@hidden@@address@hidden@}} @u{--a}
address@hidden@@address@hidden@}} @ubaraccent{a}
address@hidden@@address@hidden@}} @ubaraccent{--a}
address@hidden@@address@hidden@}} @udotaccent{a}
address@hidden@@address@hidden@}} @udotaccent{--a}
address@hidden@@address@hidden@}} @v{a}
address@hidden@@address@hidden@}} @v{--a}
address@hidden@@,@address@hidden @,{c}
address@hidden@@,@address@hidden @,{--c}
address@hidden@@address@hidden@}} @dotless{--a}
address@hidden@@address@hidden@}} @dotless{a}
address@hidden@@address@hidden address@hidden @footnote{in footnote}
address@hidden@@address@hidden address@hidden @footnote{in footnote2}
+
address@hidden@@address@hidden,,address@hidden @image{f--ile,,e--xt}
address@hidden@@address@hidden,,,,address@hidden @image{f--ile,,,,e--xt}
address@hidden@@address@hidden,,,address@hidden @image{f--ile,,,alt}
address@hidden@@address@hidden,aze,az,alt,address@hidden
@image{f--ile,aze,az,alt,e--xt}
address@hidden@@address@hidden,aze,,address@hidden @image{f-ile,aze,,a--lt}
address@hidden@@address@hidden@}} @image{f--ile}
address@hidden@@address@hidden,,address@hidden @image{,,e--xt}
address@hidden@@address@hidden,,,address@hidden @image{,,,e--xt}
address@hidden@@address@hidden@@address@hidden:jk _"
%@@:@},,,alt@@address@hidden:jk _" %@@:@address@hidden @address@hidden:jk _"
%@:},,,address@hidden:jk _" %@:}}
address@hidden@@address@hidden@@address@hidden@}@@@@@@.,aze,az,alt,@@address@hidden
address@hidden e--xt@@@}} @address@hidden@@@.,aze,az,alt,@file{file ext}
address@hidden
+
address@hidden
address@hidden 2
+
address@hidden
+a q--uotation
address@hidden quotation
+
address@hidden
address@hidden i--temize
address@hidden itemize
+
address@hidden +
address@hidden i--tem +
address@hidden itemize
+
address@hidden @bullet
address@hidden b--ullet
address@hidden itemize
+
address@hidden @minus
address@hidden minu--s
address@hidden itemize
+
address@hidden @emph
address@hidden e--mph item
address@hidden itemize
+
address@hidden @emph after emph
address@hidden e--mph item
address@hidden itemize
+
address@hidden @bullet a--n itemize line
address@hidden i--tem 1
address@hidden i--tem 2
address@hidden itemize
+
address@hidden
address@hidden e--numerate
address@hidden enumerate
+
address@hidden @columnfractions 6 7
address@hidden mu--ltitable headitem @tab another tab
address@hidden mu--ltitable item @tab multitable tab
address@hidden multitable
+
address@hidden
+e--xample some
+ text
address@hidden example
+
address@hidden
+s--mallexample
address@hidden smallexample
+
address@hidden
+d--isplay
address@hidden display
+
address@hidden
+s--malldisplay
address@hidden smalldisplay
+
address@hidden
+l--isp
address@hidden lisp
+
address@hidden
+s--malllisp
address@hidden smalllisp
+
address@hidden
+f--ormat
address@hidden format
+
address@hidden
+s--mallformat
address@hidden smallformat
+
address@hidden c--ategory d--effn_name a--rguments...
+d--effn
address@hidden deffn
+
address@hidden cate--gory de--ffn_name ar--guments @
+ more args @* even more so
+def--fn
address@hidden deffn
+
address@hidden fset @var{i} a g
address@hidden {cmde} truc {}
address@hidden Command {log trap} {}
address@hidden Command { log trap1} {}
address@hidden Command {log trap2 } {}
address@hidden cmde @b{id ule} truc
address@hidden cmde2 @b{id @samp{i} ule} truc
address@hidden @b{id @samp{i} ule}
address@hidden
address@hidden aaa
address@hidden {} {}
address@hidden
address@hidden machin
address@hidden {bidule machin}
address@hidden machin
address@hidden { }
address@hidden
address@hidden {}
address@hidden {truc} followed by a comment
address@hidden comment
address@hidden truc machin bidule chose and }
address@hidden truc machin bidule chose and } after
address@hidden truc machin bidule chose and {
address@hidden truc machin bidule chose and { and after
+Various deff lines
address@hidden {truc} after a deff item
address@hidden comment
+text in def item for second def item
address@hidden {truc} deffnx before end deffn
address@hidden deffn
+
+
+
address@hidden c--ategory d--efvr_name
+d--efvr
address@hidden defvr
+
address@hidden c--ategory t--ype d--eftypefn_name a--rguments...
+d--eftypefn
address@hidden deftypefn
+
address@hidden c--ategory c--lass t--ype d--eftypeop_name a--rguments...
+d--eftypeop
address@hidden deftypeop
+
address@hidden c--ategory t--ype d--eftypevr_name
+d--eftypevr
address@hidden deftypevr
+
address@hidden c--ategory c--lass d--efcv_name
+d--efcv
address@hidden defcv
+
address@hidden c--ategory c--lass d--efop_name a--rguments...
+d--efop
address@hidden defop
+
address@hidden c--ategory d--eftp_name a--ttributes...
+d--eftp
address@hidden deftp
+
address@hidden d--efun_name a--rguments...
+d--efun
address@hidden defun
+
address@hidden d--efmac_name a--rguments...
+d--efmac
address@hidden defmac
+
address@hidden d--efspec_name a--rguments...
+d--efspec
address@hidden defspec
+
address@hidden d--efvar_name
+d--efvar
address@hidden defvar
+
address@hidden d--efopt_name
+d--efopt
address@hidden defopt
+
address@hidden t--ype d--eftypefun_name a--rguments...
+d--eftypefun
address@hidden deftypefun
+
address@hidden t--ype d--eftypevar_name
+d--eftypevar
address@hidden deftypevar
+
address@hidden c--lass d--efivar_name
+d--efivar
address@hidden defivar
+
address@hidden c--lass t--ype d--eftypeivar_name
+d--eftypeivar
address@hidden deftypeivar
+
address@hidden c--lass d--efmethod_name a--rguments...
+d--efmethod
address@hidden defmethod
+
address@hidden c--lass t--ype d--eftypemethod_name a--rguments...
+d--eftypemethod
address@hidden deftypemethod
+
address@hidden@@address@hidden, cross ref name, title, file name,
address@hidden @xref{chapter, cross ref name, title, file name, manual}
address@hidden@@address@hidden, cross ref name, title, file name,
address@hidden @ref{chapter, cross ref name, title, file name, manual}
address@hidden@@address@hidden, cross ref name, title, file name,
address@hidden @pxref{chapter, cross ref name, title, file name, manual}
address@hidden@@address@hidden, cross ref name, file address@hidden
@inforef{chapter, cross ref name, file name}
+
address@hidden@@address@hidden@}} @ref{chapter}
address@hidden@@address@hidden@}} @ref{node}
address@hidden@@address@hidden,cross ref address@hidden @ref{,cross ref name}
address@hidden@@address@hidden,,address@hidden @ref{,,title}
address@hidden@@address@hidden,,,file address@hidden @ref{,,,file name}
address@hidden@@address@hidden,,,,address@hidden @ref{,,,,manual}
address@hidden@@address@hidden,cross ref address@hidden @ref{chapter,cross ref
name}
address@hidden@@address@hidden,,address@hidden @ref{chapter,,title}
address@hidden@@address@hidden,,,file address@hidden @ref{chapter,,,file name}
address@hidden@@address@hidden,,,,address@hidden @ref{chapter,,,,manual}
address@hidden@@address@hidden,cross ref address@hidden @ref{node,cross ref
name}
address@hidden@@address@hidden,,address@hidden @ref{node,,title}
address@hidden@@address@hidden,,,file address@hidden @ref{node,,,file name}
address@hidden@@address@hidden,,,,address@hidden @ref{node,,,,manual}
address@hidden@@address@hidden,cross ref name,title,@}} @ref{chapter,cross ref
name,title,}
address@hidden@@address@hidden,cross ref name,,file address@hidden
@ref{chapter,cross ref name,,file name}
address@hidden@@address@hidden,cross ref name,,,address@hidden
@ref{chapter,cross ref name,,,manual}
address@hidden@@address@hidden,cross ref name,title,@}} @ref{node,cross ref
name,title,}
address@hidden@@address@hidden,cross ref name,,file address@hidden
@ref{node,cross ref name,,file name}
address@hidden@@address@hidden,cross ref name,,,address@hidden @ref{node,cross
ref name,,,manual}
address@hidden@@address@hidden,cross ref name,title,file address@hidden
@ref{chapter,cross ref name,title,file name}
address@hidden@@address@hidden,cross ref name,title,,address@hidden
@ref{chapter,cross ref name,title,,manual}
address@hidden@@address@hidden,cross ref name,title,file address@hidden
@ref{node,cross ref name,title,file name}
address@hidden@@address@hidden,cross ref name,title,,address@hidden
@ref{node,cross ref name,title,,manual}
address@hidden@@address@hidden,cross ref name,title, file name, address@hidden
@ref{chapter,cross ref name,title, file name, manual}
address@hidden@@address@hidden,cross ref name,title, file name, address@hidden
@ref{node,cross ref name,title, file name, manual}
address@hidden@@address@hidden,,title,file address@hidden
@ref{chapter,,title,file name}
address@hidden@@address@hidden,,title,,address@hidden
@ref{chapter,,title,,manual}
address@hidden@@address@hidden,,title,file address@hidden @ref{node,,title,file
name}
address@hidden@@address@hidden,,title,,address@hidden @ref{node,,title,,manual}
address@hidden@@address@hidden,,title, file name, address@hidden
@ref{chapter,,title, file name, manual}
address@hidden@@address@hidden,,title, file name, address@hidden
@ref{node,,title, file name, manual}
address@hidden@@address@hidden,,,file name,address@hidden @ref{chapter,,,file
name,manual}
address@hidden@@address@hidden,,,file name,address@hidden @ref{node,,,file
name,manual}
address@hidden@@address@hidden,cross ref name,title,@}} @ref{,cross ref
name,title,}
address@hidden@@address@hidden,cross ref name,,file address@hidden @ref{,cross
ref name,,file name}
address@hidden@@address@hidden,cross ref name,,,address@hidden @ref{,cross ref
name,,,manual}
address@hidden@@address@hidden,cross ref name,title,file address@hidden
@ref{,cross ref name,title,file name}
address@hidden@@address@hidden,cross ref name,title,,address@hidden @ref{,cross
ref name,title,,manual}
address@hidden@@address@hidden,cross ref name,title, file name, address@hidden
@ref{,cross ref name,title, file name, manual}
address@hidden@@address@hidden,,title,file address@hidden @ref{,,title,file
name}
address@hidden@@address@hidden,,title,,address@hidden @ref{,,title,,manual}
address@hidden@@address@hidden,,title, file name, address@hidden @ref{,,title,
file name, manual}
address@hidden@@address@hidden,,,file name,address@hidden @ref{,,,file
name,manual}
+
address@hidden@@address@hidden, cross ref name, file address@hidden
@inforef{chapter, cross ref name, file name}
address@hidden@@address@hidden@}} @inforef{chapter}
address@hidden@@address@hidden, cross ref address@hidden @inforef{chapter,
cross ref name}
address@hidden@@address@hidden,,file address@hidden @inforef{chapter,,file name}
address@hidden@@address@hidden, cross ref name, file address@hidden
@inforef{node, cross ref name, file name}
address@hidden@@address@hidden@}} @inforef{node}
address@hidden@@address@hidden, cross ref address@hidden @inforef{node, cross
ref name}
address@hidden@@address@hidden,,file address@hidden @inforef{node,,file name}
address@hidden@@address@hidden,cross ref name @}} @inforef{,cross ref name }
address@hidden@@address@hidden,,file address@hidden @inforef{,,file name}
address@hidden@@address@hidden,cross ref name, file address@hidden
@inforef{,cross ref name, file name}
+
address@hidden@@address@hidden@@address@hidden@}ion, a @@address@hidden@} in
cross
+ref, a comma@@address@hidden@} in title, a comma@@address@hidden@} in file, a
@@address@hidden@} in manual name @}}
address@hidden@comma{}ion, a @comma{} in cross
+ref, a address@hidden in title, a address@hidden in file, a @comma{} in manual
name }
+
address@hidden@@address@hidden@@address@hidden@address@hidden @address@hidden
+
address@hidden @bullet
address@hidden a
+l--ine
address@hidden table
+
address@hidden @asis
address@hidden a
+l--ine
address@hidden vtable
+
address@hidden @minus
address@hidden a
+l--ine
address@hidden ftable
+
address@hidden
+flushleft
address@hidden flushleft
+
address@hidden
+flushright
address@hidden flushright
+
address@hidden centered line
+
address@hidden simplest.texi
+
+
address@hidden t--ruc
address@hidden T--ruc
address@hidden .
address@hidden ?
address@hidden a
address@hidden t--ruc
address@hidden T--ruc
address@hidden .
address@hidden ?
address@hidden a
+
+
+cp
address@hidden cp
+
+fn
address@hidden fn
+
+vr
address@hidden vr
+
+ky
address@hidden ky
+
+pg
address@hidden pg
+
+tp
address@hidden tp
+
address@hidden
address@hidden
address@hidden
address@hidden macro
+
address@hidden now call the macro within @ifset
+
address@hidden notset
address@hidden
address@hidden
address@hidden copying
address@hidden ifset
+
address@hidden notset
address@hidden
address@hidden ifset
+
address@hidden notset
address@hidden
address@hidden
address@hidden example
address@hidden ifset
+
+Line 1158 Before bye
@bye
Index: texi2html/Tests/formatting_res/commands_in_ifset.html
diff -u texi2html/Tests/formatting_res/commands_in_ifset.html:1.1
texi2html/Tests/formatting_res/commands_in_ifset.html:1.2
--- texi2html/Tests/formatting_res/commands_in_ifset.html:1.1 Fri Aug 19
12:14:46 2005
+++ texi2html/Tests/formatting_res/commands_in_ifset.html Fri Jan 27
16:42:56 2006
@@ -45,6 +45,7 @@
<h1 class="unnumbered"> Top section </h1>
+
<p><strong>text</strong>
</p>
@@ -66,7 +67,32 @@
-<p>Line 593 Before bye
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<p>Line 1158 Before bye
</p><hr size="1">
<p>
<font size="-1">
Index: texi2html/Tests/formatting_res/commands_in_ifset.passfirst
diff -u texi2html/Tests/formatting_res/commands_in_ifset.passfirst:1.1
texi2html/Tests/formatting_res/commands_in_ifset.passfirst:1.2
--- texi2html/Tests/formatting_res/commands_in_ifset.passfirst:1.1 Fri Aug
19 12:14:46 2005
+++ texi2html/Tests/formatting_res/commands_in_ifset.passfirst Fri Jan 27
16:42:56 2006
@@ -1,28 +1,78 @@
commands_in_ifset.texi(,2) @setfilename commands_in_ifset.info
commands_in_ifset.texi(,3) @node Top
commands_in_ifset.texi(,4) @top Top section
-commands_in_ifset.texi(,5)
+commands_in_ifset.texi(,5) @c
+commands_in_ifset.texi(,6) @c test a lot of constructs in @ifset, imbricated
ifset, macro expansion
+commands_in_ifset.texi(,7) @c in ifset. The ifset are not set. Otherwise there
would be a lot of
+commands_in_ifset.texi(,8) @c syntax errors.
+commands_in_ifset.texi(,9)
+commands_in_ifset.texi(,10) @c test @definfoenclose and @documentencoding in
ifset
commands_in_ifset.texi(,11)
-commands_in_ifset.texi(,12) @strong{text}
-commands_in_ifset.texi(,13)
-commands_in_ifset.texi(,458)
-commands_in_ifset.texi(,464)
+commands_in_ifset.texi(,17)
+commands_in_ifset.texi(,18) @strong{text}
+commands_in_ifset.texi(,19)
+commands_in_ifset.texi(,20) @c test all the regular constructs in ifset
+commands_in_ifset.texi(,21)
+commands_in_ifset.texi(,466)
+commands_in_ifset.texi(,467) @c test @copying in ifset
commands_in_ifset.texi(,468)
-commands_in_ifset.texi(,504)
-commands_in_ifset.texi(,511)
-commands_in_ifset.texi(,515)
-commands_in_ifset.texi(,519)
+commands_in_ifset.texi(,474)
+commands_in_ifset.texi(,478)
+commands_in_ifset.texi(,479) @c test indices, @contents and @bye in ifset
+commands_in_ifset.texi(,480)
+commands_in_ifset.texi(,516)
+commands_in_ifset.texi(,517) @c test that @end ifset is ignored when appearing
in @ignore
+commands_in_ifset.texi(,518)
commands_in_ifset.texi(,525)
+commands_in_ifset.texi(,526) @c test that lone braces are ignored in @ifset
+commands_in_ifset.texi(,527)
commands_in_ifset.texi(,531)
-commands_in_ifset.texi(,537)
-commands_in_ifset.texi(,541)
-commands_in_ifset.texi(,545)
-commands_in_ifset.texi(,549)
-commands_in_ifset.texi(,553)
-commands_in_ifset.texi(,557)
-commands_in_ifset.texi(,565)
-commands_in_ifset.texi(,589)
-commands_in_ifset.texi(,593)
-commands_in_ifset.texi(,600)
-commands_in_ifset.texi(,601) Line 593 Before bye
-commands_in_ifset.texi(,602) @bye
+commands_in_ifset.texi(,535)
+commands_in_ifset.texi(,536) @c test that @end ifset is ignored when appearing
in @verb, @verbatim,
+commands_in_ifset.texi(,537) @c html,
+commands_in_ifset.texi(,538)
+commands_in_ifset.texi(,544)
+commands_in_ifset.texi(,550)
+commands_in_ifset.texi(,556)
+commands_in_ifset.texi(,557) @c test that there is no error with a @table,
@example, @deffn and
+commands_in_ifset.texi(,558) @c @itemize opening in @ifset
+commands_in_ifset.texi(,559)
+commands_in_ifset.texi(,563)
+commands_in_ifset.texi(,567)
+commands_in_ifset.texi(,571)
+commands_in_ifset.texi(,576)
+commands_in_ifset.texi(,577) @c test that there is no error with a @table,
@example, @deffn and
+commands_in_ifset.texi(,578) @c @itemize end in @ifset
+commands_in_ifset.texi(,579)
+commands_in_ifset.texi(,583)
+commands_in_ifset.texi(,587)
+commands_in_ifset.texi(,591)
+commands_in_ifset.texi(,595)
+commands_in_ifset.texi(,596) @c test that @-command opening is ignored when
appearing in @ignore
+commands_in_ifset.texi(,597)
+commands_in_ifset.texi(,601)
+commands_in_ifset.texi(,602) @c test that @deffnx is ignored in @ifset
+commands_in_ifset.texi(,603)
+commands_in_ifset.texi(,607)
+commands_in_ifset.texi(,608) @c test nested ifset
+commands_in_ifset.texi(,609)
+commands_in_ifset.texi(,617)
+commands_in_ifset.texi(,618) @c test that some wrong constructs are rightly
ignored in nested @ifset
+commands_in_ifset.texi(,619)
+commands_in_ifset.texi(,643)
+commands_in_ifset.texi(,644) @c test for @node in @ifset
+commands_in_ifset.texi(,645)
+commands_in_ifset.texi(,649)
+commands_in_ifset.texi(,650) @c test for @ifset without arg in @ifset
+commands_in_ifset.texi(,651)
+commands_in_ifset.texi(,658)
+commands_in_ifset.texi(,659) @c define a macro and call it within a @ifset
+commands_in_ifset.texi(,660)
+commands_in_ifset.texi(,1139)
+commands_in_ifset.texi(,1140) @c now call the macro within @ifset
+commands_in_ifset.texi(,1141)
+commands_in_ifset.texi(,1147)
+commands_in_ifset.texi(,1151)
+commands_in_ifset.texi(,1157)
+commands_in_ifset.texi(,1158) Line 1158 Before bye
+commands_in_ifset.texi(,1159) @bye
Index: texi2html/Tests/formatting_res/commands_in_ifset.passtexi
diff -u texi2html/Tests/formatting_res/commands_in_ifset.passtexi:1.1
texi2html/Tests/formatting_res/commands_in_ifset.passtexi:1.2
--- texi2html/Tests/formatting_res/commands_in_ifset.passtexi:1.1 Fri Aug
19 12:14:46 2005
+++ texi2html/Tests/formatting_res/commands_in_ifset.passtexi Fri Jan 27
16:42:56 2006
@@ -1,28 +1,78 @@
commands_in_ifset.texi(,2) @setfilename commands_in_ifset.info
commands_in_ifset.texi(,3) @node Top
commands_in_ifset.texi(,4) @top Top section
-commands_in_ifset.texi(,5)
+commands_in_ifset.texi(,5) @c
+commands_in_ifset.texi(,6) @c test a lot of constructs in @ifset, imbricated
ifset, macro expansion
+commands_in_ifset.texi(,7) @c in ifset. The ifset are not set. Otherwise there
would be a lot of
+commands_in_ifset.texi(,8) @c syntax errors.
+commands_in_ifset.texi(,9)
+commands_in_ifset.texi(,10) @c test @definfoenclose and @documentencoding in
ifset
commands_in_ifset.texi(,11)
-commands_in_ifset.texi(,12) @strong{text}
-commands_in_ifset.texi(,13)
-commands_in_ifset.texi(,458)
-commands_in_ifset.texi(,464)
+commands_in_ifset.texi(,17)
+commands_in_ifset.texi(,18) @strong{text}
+commands_in_ifset.texi(,19)
+commands_in_ifset.texi(,20) @c test all the regular constructs in ifset
+commands_in_ifset.texi(,21)
+commands_in_ifset.texi(,466)
+commands_in_ifset.texi(,467) @c test @copying in ifset
commands_in_ifset.texi(,468)
-commands_in_ifset.texi(,504)
-commands_in_ifset.texi(,511)
-commands_in_ifset.texi(,515)
-commands_in_ifset.texi(,519)
+commands_in_ifset.texi(,474)
+commands_in_ifset.texi(,478)
+commands_in_ifset.texi(,479) @c test indices, @contents and @bye in ifset
+commands_in_ifset.texi(,480)
+commands_in_ifset.texi(,516)
+commands_in_ifset.texi(,517) @c test that @end ifset is ignored when appearing
in @ignore
+commands_in_ifset.texi(,518)
commands_in_ifset.texi(,525)
+commands_in_ifset.texi(,526) @c test that lone braces are ignored in @ifset
+commands_in_ifset.texi(,527)
commands_in_ifset.texi(,531)
-commands_in_ifset.texi(,537)
-commands_in_ifset.texi(,541)
-commands_in_ifset.texi(,545)
-commands_in_ifset.texi(,549)
-commands_in_ifset.texi(,553)
-commands_in_ifset.texi(,557)
-commands_in_ifset.texi(,565)
-commands_in_ifset.texi(,589)
-commands_in_ifset.texi(,593)
-commands_in_ifset.texi(,600)
-commands_in_ifset.texi(,601) Line 593 Before bye
-commands_in_ifset.texi(,602) @bye
+commands_in_ifset.texi(,535)
+commands_in_ifset.texi(,536) @c test that @end ifset is ignored when appearing
in @verb, @verbatim,
+commands_in_ifset.texi(,537) @c html,
+commands_in_ifset.texi(,538)
+commands_in_ifset.texi(,544)
+commands_in_ifset.texi(,550)
+commands_in_ifset.texi(,556)
+commands_in_ifset.texi(,557) @c test that there is no error with a @table,
@example, @deffn and
+commands_in_ifset.texi(,558) @c @itemize opening in @ifset
+commands_in_ifset.texi(,559)
+commands_in_ifset.texi(,563)
+commands_in_ifset.texi(,567)
+commands_in_ifset.texi(,571)
+commands_in_ifset.texi(,576)
+commands_in_ifset.texi(,577) @c test that there is no error with a @table,
@example, @deffn and
+commands_in_ifset.texi(,578) @c @itemize end in @ifset
+commands_in_ifset.texi(,579)
+commands_in_ifset.texi(,583)
+commands_in_ifset.texi(,587)
+commands_in_ifset.texi(,591)
+commands_in_ifset.texi(,595)
+commands_in_ifset.texi(,596) @c test that @-command opening is ignored when
appearing in @ignore
+commands_in_ifset.texi(,597)
+commands_in_ifset.texi(,601)
+commands_in_ifset.texi(,602) @c test that @deffnx is ignored in @ifset
+commands_in_ifset.texi(,603)
+commands_in_ifset.texi(,607)
+commands_in_ifset.texi(,608) @c test nested ifset
+commands_in_ifset.texi(,609)
+commands_in_ifset.texi(,617)
+commands_in_ifset.texi(,618) @c test that some wrong constructs are rightly
ignored in nested @ifset
+commands_in_ifset.texi(,619)
+commands_in_ifset.texi(,643)
+commands_in_ifset.texi(,644) @c test for @node in @ifset
+commands_in_ifset.texi(,645)
+commands_in_ifset.texi(,649)
+commands_in_ifset.texi(,650) @c test for @ifset without arg in @ifset
+commands_in_ifset.texi(,651)
+commands_in_ifset.texi(,658)
+commands_in_ifset.texi(,659) @c define a macro and call it within a @ifset
+commands_in_ifset.texi(,660)
+commands_in_ifset.texi(,1139)
+commands_in_ifset.texi(,1140) @c now call the macro within @ifset
+commands_in_ifset.texi(,1141)
+commands_in_ifset.texi(,1147)
+commands_in_ifset.texi(,1151)
+commands_in_ifset.texi(,1157)
+commands_in_ifset.texi(,1158) Line 1158 Before bye
+commands_in_ifset.texi(,1159) @bye
Index: texi2html/Tests/formatting_res/no_unicode_nodetest.html
diff -u texi2html/Tests/formatting_res/no_unicode_nodetest.html:1.3
texi2html/Tests/formatting_res/no_unicode_nodetest.html:1.4
--- texi2html/Tests/formatting_res/no_unicode_nodetest.html:1.3 Tue Aug 23
23:51:13 2005
+++ texi2html/Tests/formatting_res/no_unicode_nodetest.html Fri Jan 27
16:42:56 2006
@@ -166,7 +166,7 @@
</tr></table>
<h2 class="section"> 1.3 ï </h2>
<hr size="6">
-<a name="with-brace_00ef"></a>
+<a name="with-brace-_00ef"></a>
<a name="SEC5"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC4" title="Previous section
in reading order"> < </a>]</td>
@@ -186,7 +186,7 @@
</tr></table>
<h2 class="section"> 1.4 With brace ï </h2>
<hr size="6">
-<a name="with-dotless_00ef"></a>
+<a name="with-dotless-_00ef"></a>
<a name="SEC6"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC5" title="Previous section
in reading order"> < </a>]</td>
@@ -778,7 +778,7 @@
</tr></table>
<h2 class="section"> 3.3 ì </h2>
<hr size="6">
-<a name="with-brace_00ec"></a>
+<a name="with-brace-_00ec"></a>
<a name="SEC33"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC32" title="Previous section
in reading order"> < </a>]</td>
@@ -798,7 +798,7 @@
</tr></table>
<h2 class="section"> 3.4 ì </h2>
<hr size="6">
-<a name="with-dotless_00ec"></a>
+<a name="with-dotless-_00ec"></a>
<a name="SEC34"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC33" title="Previous section
in reading order"> < </a>]</td>
@@ -1052,7 +1052,7 @@
</tr></table>
<h2 class="section"> 4.3 î </h2>
<hr size="6">
-<a name="with-brace_00ee"></a>
+<a name="with-brace-_00ee"></a>
<a name="SEC46"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC45" title="Previous section
in reading order"> < </a>]</td>
@@ -1073,7 +1073,7 @@
<h2 class="section"> 4.4 î </h2>
<p>Test @^{i}.
</p><hr size="6">
-<a name="with-dotless_00ee"></a>
+<a name="with-dotless-_00ee"></a>
<a name="SEC47"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC46" title="Previous section
in reading order"> < </a>]</td>
Index: texi2html/Tests/formatting_res/no_unicode_nodetest_latin1.html
diff -u texi2html/Tests/formatting_res/no_unicode_nodetest_latin1.html:1.3
texi2html/Tests/formatting_res/no_unicode_nodetest_latin1.html:1.4
--- texi2html/Tests/formatting_res/no_unicode_nodetest_latin1.html:1.3 Tue Aug
23 23:51:13 2005
+++ texi2html/Tests/formatting_res/no_unicode_nodetest_latin1.html Fri Jan
27 16:42:56 2006
@@ -734,7 +734,7 @@
</tr></table>
<h2 class="section"> 3.3 ì </h2>
<hr size="6">
-<a name="with-brace_00ec"></a>
+<a name="with-brace-_00ec"></a>
<a name="SEC31"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC30" title="Previous section
in reading order"> < </a>]</td>
@@ -754,7 +754,7 @@
</tr></table>
<h2 class="section"> 3.4 ì </h2>
<hr size="6">
-<a name="with-dotless_00ec"></a>
+<a name="with-dotless-_00ec"></a>
<a name="SEC32"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC31" title="Previous section
in reading order"> < </a>]</td>
Index: texi2html/Tests/formatting_res/no_unicode_nodetest_utf8.html
diff -u texi2html/Tests/formatting_res/no_unicode_nodetest_utf8.html:1.3
texi2html/Tests/formatting_res/no_unicode_nodetest_utf8.html:1.4
--- texi2html/Tests/formatting_res/no_unicode_nodetest_utf8.html:1.3 Tue Aug
23 23:51:13 2005
+++ texi2html/Tests/formatting_res/no_unicode_nodetest_utf8.html Fri Jan
27 16:42:56 2006
@@ -734,7 +734,7 @@
</tr></table>
<h2 class="section"> 3.3 ì </h2>
<hr size="6">
-<a name="with-brace_00ec"></a>
+<a name="with-brace-_00ec"></a>
<a name="SEC31"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC30" title="Previous section
in reading order"> < </a>]</td>
@@ -754,7 +754,7 @@
</tr></table>
<h2 class="section"> 3.4 ì </h2>
<hr size="6">
-<a name="with-dotless_00ec"></a>
+<a name="with-dotless-_00ec"></a>
<a name="SEC32"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC31" title="Previous section
in reading order"> < </a>]</td>
Index: texi2html/Tests/formatting_res/nodetest_1.html
diff -u texi2html/Tests/formatting_res/nodetest_1.html:1.18
texi2html/Tests/formatting_res/nodetest_1.html:1.19
--- texi2html/Tests/formatting_res/nodetest_1.html:1.18 Tue Aug 9 17:19:22 2005
+++ texi2html/Tests/formatting_res/nodetest_1.html Fri Jan 27 16:42:56 2006
@@ -141,7 +141,7 @@
</tr></table>
<h2 class="section"> 1.3 ï </h2>
<hr size="6">
-<a name="with-brace_00ef"></a>
+<a name="with-brace-_00ef"></a>
<a name="SEC5"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC4" title="Previous section
in reading order"> < </a>]</td>
@@ -161,7 +161,7 @@
</tr></table>
<h2 class="section"> 1.4 With brace ï </h2>
<hr size="6">
-<a name="with-dotless_00ef"></a>
+<a name="with-dotless-_00ef"></a>
<a name="SEC6"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC5" title="Previous section
in reading order"> < </a>]</td>
Index: texi2html/Tests/formatting_res/nodetest_3.html
diff -u texi2html/Tests/formatting_res/nodetest_3.html:1.12
texi2html/Tests/formatting_res/nodetest_3.html:1.13
--- texi2html/Tests/formatting_res/nodetest_3.html:1.12 Tue Aug 9 17:19:22 2005
+++ texi2html/Tests/formatting_res/nodetest_3.html Fri Jan 27 16:42:56 2006
@@ -134,7 +134,7 @@
</tr></table>
<h2 class="section"> 3.3 ì </h2>
<hr size="6">
-<a name="with-brace_00ec"></a>
+<a name="with-brace-_00ec"></a>
<a name="SEC33"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC32" title="Previous section
in reading order"> < </a>]</td>
@@ -154,7 +154,7 @@
</tr></table>
<h2 class="section"> 3.4 ì </h2>
<hr size="6">
-<a name="with-dotless_00ec"></a>
+<a name="with-dotless-_00ec"></a>
<a name="SEC34"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC33" title="Previous section
in reading order"> < </a>]</td>
Index: texi2html/Tests/formatting_res/nodetest_4.html
diff -u texi2html/Tests/formatting_res/nodetest_4.html:1.13
texi2html/Tests/formatting_res/nodetest_4.html:1.14
--- texi2html/Tests/formatting_res/nodetest_4.html:1.13 Tue Aug 9 17:19:22 2005
+++ texi2html/Tests/formatting_res/nodetest_4.html Fri Jan 27 16:42:56 2006
@@ -134,7 +134,7 @@
</tr></table>
<h2 class="section"> 4.3 î </h2>
<hr size="6">
-<a name="with-brace_00ee"></a>
+<a name="with-brace-_00ee"></a>
<a name="SEC46"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC45" title="Previous section
in reading order"> < </a>]</td>
@@ -155,7 +155,7 @@
<h2 class="section"> 4.4 î </h2>
<p>Test @^{i}.
</p><hr size="6">
-<a name="with-dotless_00ee"></a>
+<a name="with-dotless-_00ee"></a>
<a name="SEC47"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC46" title="Previous section
in reading order"> < </a>]</td>
Index: texi2html/Tests/formatting_res/nodetest_latin1.html
diff -u texi2html/Tests/formatting_res/nodetest_latin1.html:1.7
texi2html/Tests/formatting_res/nodetest_latin1.html:1.8
--- texi2html/Tests/formatting_res/nodetest_latin1.html:1.7 Tue Aug 23
23:51:13 2005
+++ texi2html/Tests/formatting_res/nodetest_latin1.html Fri Jan 27 16:42:56 2006
@@ -734,7 +734,7 @@
</tr></table>
<h2 class="section"> 3.3 ì </h2>
<hr size="6">
-<a name="with-brace_00ec"></a>
+<a name="with-brace-_00ec"></a>
<a name="SEC31"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC30" title="Previous section
in reading order"> < </a>]</td>
@@ -754,7 +754,7 @@
</tr></table>
<h2 class="section"> 3.4 ì </h2>
<hr size="6">
-<a name="with-dotless_00ec"></a>
+<a name="with-dotless-_00ec"></a>
<a name="SEC32"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC31" title="Previous section
in reading order"> < </a>]</td>
Index: texi2html/Tests/formatting_res/nodetest_utf8.html
diff -u texi2html/Tests/formatting_res/nodetest_utf8.html:1.7
texi2html/Tests/formatting_res/nodetest_utf8.html:1.8
--- texi2html/Tests/formatting_res/nodetest_utf8.html:1.7 Tue Aug 23
23:51:13 2005
+++ texi2html/Tests/formatting_res/nodetest_utf8.html Fri Jan 27 16:42:56 2006
@@ -734,7 +734,7 @@
</tr></table>
<h2 class="section"> 3.3 ì </h2>
<hr size="6">
-<a name="with-brace_00ec"></a>
+<a name="with-brace-_00ec"></a>
<a name="SEC31"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC30" title="Previous section
in reading order"> < </a>]</td>
@@ -754,7 +754,7 @@
</tr></table>
<h2 class="section"> 3.4 ì </h2>
<hr size="6">
-<a name="with-dotless_00ec"></a>
+<a name="with-dotless-_00ec"></a>
<a name="SEC32"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC31" title="Previous section
in reading order"> < </a>]</td>
Index: texi2html/Tests/formatting_res/verbatim_html.html
diff -u texi2html/Tests/formatting_res/verbatim_html.html:1.34
texi2html/Tests/formatting_res/verbatim_html.html:1.35
--- texi2html/Tests/formatting_res/verbatim_html.html:1.34 Tue Aug 23
23:51:13 2005
+++ texi2html/Tests/formatting_res/verbatim_html.html Fri Jan 27 16:42:56 2006
@@ -290,7 +290,7 @@
<hr size="6">
-<a name="node_00e1"></a>
+<a name="node-_00e1"></a>
<a name="SEC2"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC1" title="Previous section
in reading order"> < </a>]</td>
Index: texi2html/Tests/sectionning/ref_in_anchor.texi
diff -u texi2html/Tests/sectionning/ref_in_anchor.texi:1.1
texi2html/Tests/sectionning/ref_in_anchor.texi:1.2
--- texi2html/Tests/sectionning/ref_in_anchor.texi:1.1 Fri May 2 18:20:31 2003
+++ texi2html/Tests/sectionning/ref_in_anchor.texi Fri Jan 27 16:42:56 2006
@@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
address@hidden double_top
address@hidden ref_in_anchor
@node Top
Top node
Index: texi2html/Tests/sectionning_res/ref_in_anchor.html
diff -u texi2html/Tests/sectionning_res/ref_in_anchor.html:1.14
texi2html/Tests/sectionning_res/ref_in_anchor.html:1.15
--- texi2html/Tests/sectionning_res/ref_in_anchor.html:1.14 Tue Aug 9
17:19:23 2005
+++ texi2html/Tests/sectionning_res/ref_in_anchor.html Fri Jan 27 16:42:56 2006
@@ -44,8 +44,8 @@
<h1 class="node"> Top </h1>
<p>Top node
</p>
-<p>anchor{TOP} <a name="TOP"></a>.
-ref to TOP @ref{Top}: <a href="#TOP">TOP <a href="#Top">Top</a></a>.
+<p>anchor{TOP} <a name="TOP-"></a>.
+ref to TOP @ref{Top}: <a href="#TOP-">TOP <a href="#Top">Top</a></a>.
</p>
<hr size="1">
<p>
Index: texi2html/Tests/sectionning_res/ref_in_anchor.passfirst
diff -u texi2html/Tests/sectionning_res/ref_in_anchor.passfirst:1.5
texi2html/Tests/sectionning_res/ref_in_anchor.passfirst:1.6
--- texi2html/Tests/sectionning_res/ref_in_anchor.passfirst:1.5 Sat Jan 15
23:45:56 2005
+++ texi2html/Tests/sectionning_res/ref_in_anchor.passfirst Fri Jan 27
16:42:56 2006
@@ -1,5 +1,5 @@
ref_in_anchor.texi(,2)
-ref_in_anchor.texi(,3) @setfilename double_top
+ref_in_anchor.texi(,3) @setfilename ref_in_anchor
ref_in_anchor.texi(,4)
ref_in_anchor.texi(,5) @node Top
ref_in_anchor.texi(,6) Top node
Index: texi2html/Tests/sectionning_res/ref_in_anchor.passtexi
diff -u texi2html/Tests/sectionning_res/ref_in_anchor.passtexi:1.2
texi2html/Tests/sectionning_res/ref_in_anchor.passtexi:1.3
--- texi2html/Tests/sectionning_res/ref_in_anchor.passtexi:1.2 Tue Nov 25
10:35:22 2003
+++ texi2html/Tests/sectionning_res/ref_in_anchor.passtexi Fri Jan 27
16:42:56 2006
@@ -1,5 +1,5 @@
ref_in_anchor.texi(,2)
-ref_in_anchor.texi(,3) @setfilename double_top
+ref_in_anchor.texi(,3) @setfilename ref_in_anchor
ref_in_anchor.texi(,4)
ref_in_anchor.texi(,5) @node Top
ref_in_anchor.texi(,6) Top node
Index: texi2html/Tests/test.sh
diff -u texi2html/Tests/test.sh:1.52 texi2html/Tests/test.sh:1.53
--- texi2html/Tests/test.sh:1.52 Thu Dec 1 08:38:41 2005
+++ texi2html/Tests/test.sh Fri Jan 27 16:42:55 2006
@@ -177,6 +177,7 @@
test_texi macros ifclear_in_macro.texi
test_texi macros macro_call_in_ifset.texi
test_texi macros ifset_in_macro.texi
+test_texi macros ifset_in_macro.texi "-D notes -prefix set_ifset_in_macro" 0
texi set_ifset_in_macro
test_texi macros not_ifset_text.texi
test_texi macros bib-example.texi
test_texi sectionning
@@ -249,6 +250,7 @@
test_texi formatting test_refs.texi "-init cross_manual.init"
test_texi formatting test_refs.texi "-init cross_manual.init -prefix
chapter_test_refs -split chapter -output ." 0 texi chapter_test_refs
test_texi formatting test_refs.texi "-init cross_manual.init -prefix
node_test_refs -split node -node-files -use-nodes -output ." 0 texi
node_test_refs
+test_texi formatting at_commands_in_refs.texi
test_texi texi2html
test_texi viper_monolithic viper.texi "-ifinfo"
test_texi viper viper.texi "-split chapter -ifinfo -output ."
Index: texi2html/i18n/pt
diff -u texi2html/i18n/pt:1.12 texi2html/i18n/pt:1.13
--- texi2html/i18n/pt:1.12 Thu Dec 1 08:38:42 2005
+++ texi2html/i18n/pt Fri Jan 27 16:42:56 2006
@@ -63,8 +63,8 @@
'NodeUp' => 'Nodo Acima',
'November' => 'Novembro',
'October' => 'Outubro',
- 'Overview' => '',
- 'Overview:' => '',
+ 'Overview' => 'address@hidden geral',
+ 'Overview:' => 'address@hidden geral:',
'Prev' => 'address@hidden'evio',
'Previous node' => 'Nodo anterior',
'Previous section in reading order' =>
'Se@,address@hidden anterior na ordem de leitura',
Index: texi2html/i18n/pt_BR
diff -u texi2html/i18n/pt_BR:1.2 texi2html/i18n/pt_BR:1.3
--- texi2html/i18n/pt_BR:1.2 Thu Dec 1 08:38:42 2005
+++ texi2html/i18n/pt_BR Fri Jan 27 16:42:56 2006
@@ -63,8 +63,8 @@
'NodeUp' => 'Nodo Acima',
'November' => 'Novembro',
'October' => 'Outubro',
- 'Overview' => '',
- 'Overview:' => '',
+ 'Overview' => 'address@hidden geral',
+ 'Overview:' => 'address@hidden geral:',
'Prev' => 'address@hidden'evio',
'Previous node' => 'Nodo anterior',
'Previous section in reading order' =>
'Se@,address@hidden anterior na ordem de leitura',
Index: texi2html/texi2html.pl
diff -u texi2html/texi2html.pl:1.154 texi2html/texi2html.pl:1.155
--- texi2html/texi2html.pl:1.154 Thu Dec 1 08:38:40 2005
+++ texi2html/texi2html.pl Fri Jan 27 16:42:55 2006
@@ -62,7 +62,7 @@
#--##############################################################################
# CVS version:
-# $Id: texi2html.pl,v 1.154 2005/12/01 08:38:40 pertusus Exp $
+# $Id: texi2html.pl,v 1.155 2006/01/27 16:42:55 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -716,7 +716,6 @@
my $style_stack = shift;
$text = uc($text) if (in_small_caps($style_stack));
- $text = main::normalise_space($text);
my $result = '';
while ($text ne '')
{
@@ -1490,6 +1489,7 @@
{
my $text = shift;
#print STDERR "cross_manual_line $text\n";
+#print STDERR "remove_texi text ". remove_texi($text)."\n\n\n";
$simple_map_texi_ref = \%cross_ref_simple_map_texi;
$style_map_texi_ref = \%cross_ref_style_map_texi;
$texi_map_ref = \%cross_ref_texi_map;
@@ -1510,7 +1510,7 @@
$simple_map_texi_ref = \%Texi2HTML::Config::simple_map_texi;
$style_map_texi_ref = \%Texi2HTML::Config::style_map_texi;
$texi_map_ref = \%Texi2HTML::Config::texi_map;
-#print STDERR "cross_ref $cross_ref\n";
+#print STDERR "\n\ncross_ref $cross_ref\n";
return $cross_ref;
}
@@ -2292,8 +2292,8 @@
$T2H_DEBUG = $Texi2HTML::Config::DEBUG;
$T2H_VERBOSE = $Texi2HTML::Config::VERBOSE;
-$Texi2HTML::LaTeX2HTML::debug = 0;
-$Texi2HTML::LaTeX2HTML::debug = 1 if ($T2H_DEBUG & $DEBUG_L2H);
+$Texi2HTML::THISDOC{'debug_l2h'} = 0;
+$Texi2HTML::THISDOC{'debug_l2h'} = 1 if ($T2H_DEBUG & $DEBUG_L2H);
#+++############################################################################
@@ -2837,7 +2837,11 @@
foreach my $file (@texinfo_htmlxref_files)
{
print STDERR "html refs config file: $file\n" if ($T2H_DEBUG);
- open (HTMLXREF, $file);
+ unless (open (HTMLXREF, $file))
+ {
+ warn "Cannot open html refs config file ${file}: $!";
+ next;
+ }
while (<HTMLXREF>)
{
my $line = $_;
@@ -2906,10 +2910,11 @@
# init l2h defaults for files and names
-# variable which shouldn't be global FIXME
+# global variable used for caching
use vars qw(
- %l2h_img
+ %l2h_cache
);
+
my ($l2h_name, $l2h_latex_file, $l2h_cache_file, $l2h_html_file, $l2h_prefix);
# holds the status of latex2html operations. If 0 it means that there was
@@ -2917,13 +2922,12 @@
my $status = 0;
my $debug;
+my $verbose;
my $docu_rdir;
my $docu_name;
-#if ($Texi2HTML::Config::L2H)
sub init
{
-# $debug = shift;
$docu_name = $Texi2HTML::THISDOC{'file_base_name'};
$docu_rdir = $Texi2HTML::THISDOC{'out_dir'};
$l2h_name = "${docu_name}_l2h";
@@ -2933,15 +2937,17 @@
# as dir of enclosing html document --
$l2h_html_file = "$docu_rdir${l2h_name}.html";
$l2h_prefix = "${l2h_name}_";
+ $debug = $Texi2HTML::THISDOC{'debug_l2h'};
+ $verbose = $Texi2HTML::Config::VERBOSE;
$status = init_to_latex();
}
##########################
#
# First stage: Generation of Latex file
-# Initialize with: l2h_InitToLatex
-# Add content with: l2h_ToLatex($text) --> HTML placeholder comment
-# Finish with: l2h_FinishToLatex
+# Initialize with: init_to_latex
+# Add content with: to_latex ($text) --> HTML placeholder comment
+# Finish with: finish_to_latex
#
my $l2h_latex_preamble = <<EOT;
@@ -2956,42 +2962,45 @@
\\end{document}
EOT
-my %l2h_to_latex = ();
-my @l2h_to_latex = ();
-my $l2h_latex_count = 0; # number of latex texts really stored
-my $l2h_to_latex_count = 0; # total number of latex texts processed
-my $l2h_cached_count = 0; # number of cached latex text
-my %l2h_cache = ();
+my %l2h_to_latex = (); # associate a latex text with the index in the
+ # html result array.
+my @l2h_to_latex = (); # array used to associate the index with
+ # the original latex text.
+my $latex_count = 0; # number of latex texts really stored
+my $latex_converted_count = 0; # number of latex texts passed through
latex2html
+my $to_latex_count = 0; # total number of latex texts processed
+my $cached_count = 0; # number of cached latex texts
+%l2h_cache = (); # the cache hash. Associate latex text with
+ # html from the previous run
+my @l2h_from_html; # array of resulting html
+
+my %global_count = (); # associate a command name and the
+ # corresponding counter to the index in the
+ # html result array
-my %global_count = ();
-#$Texi2HTML::Config::L2H = l2h_InitToLatex() if ($Texi2HTML::Config::L2H);
-
-# return used latex 1, if l2h could be initalized properly, 0 otherwise
-#sub l2h_InitToLatex
+# return 1, if l2h could be initalized properly, 0 otherwise
sub init_to_latex()
{
unless ($Texi2HTML::Config::L2H_SKIP)
{
unless (open(L2H_LATEX, ">$l2h_latex_file"))
{
- warn "$ERROR Error l2h: Can't open latex file '$l2h_latex_file'
for writing\n";
+ warn "$ERROR l2h: Can't open latex file '$l2h_latex_file' for
writing: $!\n";
return 0;
}
- print STDERR "# l2h: use ${l2h_latex_file} as latex file\n" if
($T2H_VERBOSE);
+ warn "# l2h: use ${l2h_latex_file} as latex file\n" if ($verbose);
print L2H_LATEX $l2h_latex_preamble;
}
- # open database for caching
- #l2h_InitCache();
+ # open the database that holds cached text
init_cache();
return 1;
}
-# print text (1st arg) into latex file (if not already there), return
-# @tex_$number which can be later on replaced by the latex2html
-# generated text
-#sub l2h_ToLatex
-sub to_latex
+# print text (2nd arg) into latex file (if not already there nor in cache)
+# which can be later on replaced by the latex2html generated text.
+#
+sub to_latex($$$)
{
my $command = shift;
my $text = shift;
@@ -3004,57 +3013,58 @@
{
$text = "\$".$text."\$";
}
- $l2h_to_latex_count++;
+ $to_latex_count++;
$text =~ s/(\s*)$//;
- # try whether we can cache it
- #my $cached_text = l2h_FromCache($text);
- my $cached_text = from_cache($text);
- if ($cached_text)
- {
- $l2h_cached_count++;
- return $cached_text;
- }
# try whether we have text already on things to do
my $count = $l2h_to_latex{$text};
unless ($count)
{
- $count = $l2h_latex_count;
- $l2h_latex_count++;
- $l2h_to_latex{$text} = $count;
- $l2h_to_latex[$count] = $text;
- unless ($Texi2HTML::Config::L2H_SKIP)
+ $latex_count++;
+ $count = $latex_count;
+ # try whether we can get it from cache
+ my $cached_text = from_cache($text);
+ if (defined($cached_text))
{
- print L2H_LATEX "\\begin{rawhtml}\n";
- print L2H_LATEX "<!-- l2h_begin ${l2h_name} ${count} -->\n";
- print L2H_LATEX "\\end{rawhtml}\n";
-
- print L2H_LATEX "$text\n";
-
- print L2H_LATEX "\\begin{rawhtml}\n";
- print L2H_LATEX "<!-- l2h_end ${l2h_name} ${count} -->\n";
- print L2H_LATEX "\\end{rawhtml}\n";
+ $cached_count++;
+ # put the cached result in the html result array
+ $l2h_from_html[$count] = $cached_text;
+ }
+ else
+ {
+ $latex_converted_count++;
+ unless ($Texi2HTML::Config::L2H_SKIP)
+ {
+ print L2H_LATEX "\\begin{rawhtml}\n";
+ print L2H_LATEX "<!-- l2h_begin $l2h_name $count -->\n";
+ print L2H_LATEX "\\end{rawhtml}\n";
+
+ print L2H_LATEX "$text\n";
+
+ print L2H_LATEX "\\begin{rawhtml}\n";
+ print L2H_LATEX "<!-- l2h_end $l2h_name $count -->\n";
+ print L2H_LATEX "\\end{rawhtml}\n";
+ }
}
+ $l2h_to_latex[$count] = $text;
+ $l2h_to_latex{$text} = $count;
}
$global_count{"${command}_$counter"} = $count;
- #return "address@hidden ";
return 1;
}
# print closing into latex file and close it
-#sub l2h_FinishToLatex
sub finish_to_latex()
{
- my ($reused);
- $reused = $l2h_to_latex_count - $l2h_latex_count - $l2h_cached_count;
+ my $reused = $to_latex_count - $latex_converted_count - $cached_count;
unless ($Texi2HTML::Config::L2H_SKIP)
{
print L2H_LATEX $l2h_latex_closing;
- close(L2H_LATEX);
+ close (L2H_LATEX);
}
- print STDERR "# l2h: finished to latex ($l2h_cached_count cached, $reused
reused, $l2h_latex_count contents)\n" if ($T2H_VERBOSE);
- unless ($l2h_latex_count)
+ warn "# l2h: finished to latex ($cached_count cached, $reused reused,
$latex_converted_count to process)\n" if ($verbose);
+ unless ($latex_count)
{
- #l2h_Finish();
+ # no @tex nor @math
finish();
return 0;
}
@@ -3064,19 +3074,20 @@
###################################
# Second stage: Use latex2html to generate corresponding html code and images
#
-# l2h_ToHtml([$l2h_latex_file, [$l2h_html_dir]]):
+# to_html([$l2h_latex_file, [$l2h_html_dir]]):
# Call latex2html on $l2h_latex_file
# Put images (prefixed with $l2h_name."_") and html file(s) in $l2h_html_dir
# Return 1, on success
# 0, otherwise
#
-#sub l2h_ToHtml
sub to_html()
{
my ($call, $dotbug);
- if ($Texi2HTML::Config::L2H_SKIP)
+ # when there are no tex constructs to convert (happens in case everything
+ # comes from the cache), there is no latex2html run
+ if ($Texi2HTML::Config::L2H_SKIP or ($latex_converted_count == 0))
{
- print STDERR "# l2h: skipping latex2html run\n" if ($T2H_VERBOSE);
+ warn "# l2h: skipping latex2html run\n" if ($verbose);
return 1;
}
# Check for dot in directory where dvips will work
@@ -3106,226 +3117,253 @@
# set output dir
$call .= ($docu_rdir ? " -dir $docu_rdir" : " -no_subdir");
# use l2h_tmp, if specified
- $call = $call . " -tmp $Texi2HTML::Config::L2H_TMP" if
($Texi2HTML::Config::L2H_TMP);
+ $call .= " -tmp $Texi2HTML::Config::L2H_TMP" if
($Texi2HTML::Config::L2H_TMP);
# use a given html version if specified
- $call = $call . " -html_version $Texi2HTML::Config::L2H_HTML_VERSION" if
($Texi2HTML::Config::L2H_HTML_VERSION);
+ $call .= " -html_version $Texi2HTML::Config::L2H_HTML_VERSION" if
($Texi2HTML::Config::L2H_HTML_VERSION);
# options we want to be sure of
- $call = $call ." -address 0 -info 0 -split 0 -no_navigation -no_auto_link";
- $call = $call ." -prefix ${l2h_prefix} $l2h_latex_file";
+ $call .= " -address 0 -info 0 -split 0 -no_navigation -no_auto_link";
+ $call .= " -prefix $l2h_prefix $l2h_latex_file";
- print STDERR "# l2h: executing '$call'\n" if ($Texi2HTML::Config::VERBOSE);
+ warn "# l2h: executing '$call'\n" if ($verbose);
if (system($call))
{
- warn "l2h ***Error: '${call}' did not succeed\n";
+ warn "$ERROR l2h: '${call}' did not succeed\n";
return 0;
}
else
{
- print STDERR "# l2h: latex2html finished successfully\n" if
($Texi2HTML::Config::VERBOSE);
+ warn "# l2h: latex2html finished successfully\n" if ($verbose);
return 1;
}
}
##########################
# Third stage: Extract generated contents from latex2html run
-# Initialize with: l2h_InitFromHtml
+# Initialize with: init_from_html
# open $l2h_html_file for reading
# reads in contents into array indexed by numbers
# return 1, on success -- 0, otherwise
-# Extract Html code with: l2h_FromHtml($text)
-# replaces in $text all previosuly inserted comments by generated html code
-# returns (possibly changed) $text
-# Finish with: l2h_FinishFromHtml
+# Finish with: finish
# closes $l2h_html_dir/$l2h_name.".$docu_ext"
-my $l2h_extract_error = 0;
-my $l2h_range_error = 0;
-my @l2h_from_html;
+# the images generated by latex2html have names like ${docu_name}_l2h_img?.png
+# they are copied to ${docu_name}_?.png, and html is changed accordingly.
+my %l2h_img; # associate src file to destination file
+ # such that files are not copied twice
+my $image_count = 1;
+sub change_image_file_names($)
+{
+ my $content = shift;
+ my @images = ($content =~ /SRC="(.*?)"/g);
+ my ($src, $dest);
+
+ for $src (@images)
+ {
+ $dest = $l2h_img{$src};
+ unless ($dest)
+ {
+ my $ext = '';
+ if ($src =~ /.*\.(.*)$/ && $1 ne $docu_ext)
+ {
+ $ext = ".$1";
+ }
+ else
+ {
+ warn "$ERROR: L2h image $src has invalid extension\n";
+ next;
+ }
+ while (-e "$docu_rdir${docu_name}_${image_count}$ext")
+ {
+ $image_count++;
+ }
+ $dest = "${docu_name}_${image_count}$ext";
+# FIXME this isn't portable. + error condition not checked.
+ system("cp -f $docu_rdir$src $docu_rdir$dest");
+ $l2h_img{$src} = $dest;
+# FIXME error condition not checked
+ unlink "$docu_rdir$src" unless ($debug);
+ }
+ $content =~ s/SRC="$src"/SRC="$dest"/g;
+ }
+ return $content;
+}
+
+my $extract_error_count = 0;
+my $invalid_counter_count = 0;
-#sub l2h_InitFromHtml()
sub init_from_html()
{
- local(%l2h_img);
- my ($count, $h_line);
+ # when there are no tex constructs to convert (happens in case everything
+ # comes from the cache), the html file that was generated by previous
+ # latex2html runs isn't reused.
+ if ($latex_converted_count == 0)
+ {
+ return 1;
+ }
- if (! open(L2H_HTML, "<${l2h_html_file}"))
+ if (! open(L2H_HTML, "<$l2h_html_file"))
{
- print STDERR "$ERROR Error l2h: Can't open ${l2h_html_file} for
reading\n";
+ warn "$ERROR l2h: Can't open $l2h_html_file for reading\n";
return 0;
}
- print STDERR "# l2h: use ${l2h_html_file} as html file\n" if
($T2H_VERBOSE);
+ warn "# l2h: use $l2h_html_file as html file\n" if ($verbose);
- my $l2h_html_count = 0;
+ my $html_converted_count = 0; # number of html resulting texts
+ # retrieved in the file
+
+ my ($count, $h_line);
while ($h_line = <L2H_HTML>)
{
if ($h_line =~ /^<!-- l2h_begin $l2h_name ([0-9]+) -->/)
{
$count = $1;
- my $h_content = "";
+ my $h_content = '';
+ my $h_end_found = 0;
while ($h_line = <L2H_HTML>)
{
if ($h_line =~ /^<!-- l2h_end $l2h_name $count -->/)
{
+ $h_end_found = 1;
chomp $h_content;
chomp $h_content;
- $l2h_html_count++;
- #$h_content = l2h_ToCache($count, $h_content);
- $h_content = to_cache($count, $h_content);
+ $html_converted_count++;
+ # transform image file names and copy image files
+ $h_content = change_image_file_names($h_content);
+ # store result in the html result array
$l2h_from_html[$count] = $h_content;
- $h_content = '';
+ # also add the result in cache hash
+ $l2h_cache{$l2h_to_latex[$count]} = $h_content;
last;
}
$h_content = $h_content.$h_line;
}
- if ($h_content)
- {
- print STDERR "$ERROR Warning l2h: l2h_end $l2h_name $count not
found\n"
- if ($Texi2HTML::Config::VERBOSE);
+ unless ($h_end_found)
+ { # couldn't found the closing comment. Certainly a bug.
+ warn "$ERROR l2h(BUG): l2h_end $l2h_name $count not found\n";
close(L2H_HTML);
return 0;
}
}
}
- print STDERR "# l2h: Got $l2h_html_count of $l2h_latex_count html
contents\n"
- if ($Texi2HTML::Config::VERBOSE);
+
+ # Not the same number of converted elements and retrieved elements
+ if ($latex_converted_count != $html_converted_count)
+ {
+ warn "$ERROR l2h(BUG): waiting for $latex_converted_count elements
found $html_converted_count\n";
+ }
+
+ warn "# l2h: Got $html_converted_count of $latex_count html contents\n"
+ if ($verbose);
close(L2H_HTML);
return 1;
}
-sub latex2html()
-{
- return unless($status);
- return unless ($status = finish_to_latex());
- return unless ($status = to_html());
- return unless ($status = init_from_html());
-}
-
-# FIXME used ??
-#sub l2h_FromHtml($)
-sub from_html($)
-{
- my($text) = @_;
- my($done, $to_do, $count);
- $to_do = $text;
- $done = '';
- while ($to_do =~ /([^\000]*)<!-- l2h_replace $l2h_name ([0-9]+)
-->([^\000]*)/)
- {
- $to_do = $1;
- $count = $2;
- $done = $3.$done;
- $done = "<!-- l2h_end $l2h_name $count -->".$done
- #if ($T2H_DEBUG & $DEBUG_L2H);
- if ($debug);
-
- #$done = l2h_ExtractFromHtml($count) . $done;
- $done = extract_from_html($count) . $done;
-
- $done = "<!-- l2h_begin $l2h_name $count -->".$done
- #if ($T2H_DEBUG & $DEBUG_L2H);
- if ($debug);
- }
- return $to_do.$done;
-}
+my $html_output_count = 0; # html text outputed in html result file
+# called each time a construct handled by latex2html is encountered, should
+# output the corresponding html
sub do_tex($$$$)
{
my $style = shift;
my $counter = shift;
my $count = $global_count{"${style}_$counter"};
- my $result = '';
- $result = "<!-- l2h_begin $l2h_name $count -->"
- #if ($T2H_DEBUG & $DEBUG_L2H);
- if ($debug);
- $result .= extract_from_html($count);
- $result .= "<!-- l2h_end $l2h_name $count -->"
- #if ($T2H_DEBUG & $DEBUG_L2H);
- if ($debug);
- return $result;
-}
-
-#sub l2h_ExtractFromHtml($)
-sub extract_from_html($)
-{
- my $count = shift;
- return $l2h_from_html[$count] if ($l2h_from_html[$count]);
- if ($count >= 0 && $count < $l2h_latex_count)
+ # begin debug section (incorrect counts)
+ if (!defined($count))
{
- # now we are in trouble
- my $line;
- $l2h_extract_error++;
- print STDERR "$ERROR l2h: can't extract content $count from html\n"
- if ($T2H_VERBOSE);
- # try simple (ordinary) substition (without l2h)
- #my $l_l2h = $Texi2HTML::Config::L2H;
- $Texi2HTML::Config::L2H = 0;
- my $l_l2h = $status;
- $status = 0;
- $line = $l2h_to_latex{$count};
- $line = main::substitute_text({}, $line);
- $line = "<!-- l2h: ". __LINE__ . " use texi2html -->" . $line
- #if ($T2H_DEBUG & $DEBUG_L2H);
- if ($debug);
- #$Texi2HTML::Config::L2H = $l_l2h;
- $status = $l_l2h;
- return $line;
+ # counter is undefined
+ $invalid_counter_count++;
+ warn "$ERROR l2h(BUG): undefined count for ${style}_$counter\n";
+ return ("<!-- l2h: ". __LINE__ . " undef count for ${style}_$counter
-->")
+ if ($debug);
+ return '';
+ }
+ elsif(($count <= 0) or ($count > $latex_count))
+ {
+ # counter out of range
+ $invalid_counter_count++;
+ warn "$ERROR l2h(BUG): Request of $count content which is out of
valide range [0,$latex_count)\n";
+ return ("<!-- l2h: ". __LINE__ . " out of range count $count -->")
+ if ($debug);
+ return '';
}
+ # end debug section (incorrect counts)
+
+ # this seems to be a valid counter
+ my $result = '';
+ $result = "<!-- l2h_begin $l2h_name $count -->" if ($debug);
+ if (defined($l2h_from_html[$count]))
+ {
+ $html_output_count++;
+ $result .= $l2h_from_html[$count];
+ }
else
{
- # now we have been incorrectly called
- $l2h_range_error++;
- print STDERR "$ERROR l2h: Request of $count content which is out of
valide range [0,$l2h_latex_count)\n";
- return "<!-- l2h: ". __LINE__ . " out of range count $count -->"
- #if ($T2H_DEBUG & $DEBUG_L2H);
- if ($debug);
- return "<!-- l2h: out of range count $count -->";
+ # if the result is not in @l2h_from_html, there is an error somewhere.
+ $extract_error_count++;
+ warn "$ERROR l2h(BUG): can't extract content $count from html\n";
+ # try simple (ordinary) substitution (without l2h)
+ $result .= "<!-- l2h: ". __LINE__ . " use texi2html -->" if ($debug);
+ $result .= main::substitute_text({}, $l2h_to_latex[$count]);
}
+ $result .= "<!-- l2h_end $l2h_name $count -->" if ($debug);
+ return $result;
}
-#sub l2h_FinishFromHtml()
-sub finish_from_html()
+# store results in the cache and remove temporary files.
+sub finish()
{
- if ($Texi2HTML::Config::VERBOSE)
+ return unless($status);
+ if ($verbose)
{
- if ($l2h_extract_error + $l2h_range_error)
+ if ($extract_error_count + $invalid_counter_count)
{
- print STDERR "# l2h: finished from html ($l2h_extract_error
extract and $l2h_range_error errors)\n";
+ warn "# l2h: finished from html ($extract_error_count extract and
$invalid_counter_count invalid counter errors)\n";
}
else
{
- print STDERR "# l2h: finished from html (no errors)\n";
+ warn "# l2h: finished from html (no error)\n";
+ }
+ if ($html_output_count != $latex_converted_count)
+ { # this may happen if @-commands are collected at some places
+ # but @-command at those places are not expanded later. For
+ # example @math on @multitable lines.
+ warn "# l2h: $html_output_count html outputed for
$latex_converted_count converted\n";
}
}
-}
-
-#sub l2h_Finish()
-sub finish()
-{
- return unless($status);
- finish_from_html();
- #l2h_StoreCache();
store_cache();
if ($Texi2HTML::Config::L2H_CLEAN)
{
local ($_);
- print STDERR "# l2h: removing temporary files generated by l2h
extension\n"
- if $Texi2HTML::Config::VERBOSE;
+ warn "# l2h: removing temporary files generated by l2h extension\n"
+ if $verbose;
while (<"$docu_rdir$l2h_name"*>)
{
+# FIXME error condition not checked
unlink $_;
}
}
- print STDERR "# l2h: Finished\n" if $Texi2HTML::Config::VERBOSE;
+ warn "# l2h: Finished\n" if $verbose;
return 1;
}
+# the driver of end of first pass, second pass and beginning of third pass
+#
+sub latex2html()
+{
+ return unless($status);
+ return unless ($status = finish_to_latex());
+ return unless ($status = to_html());
+ return unless ($status = init_from_html());
+}
+
+
##############################
# stuff for l2h caching
#
# I tried doing this with a dbm data base, but it did not store all
# keys/values. Hence, I did as latex2html does it
-#sub l2h_InitCache
sub init_cache
{
if (-r "$l2h_cache_file")
@@ -3336,12 +3374,16 @@
}
}
-#sub l2h_StoreCache
+# store all the text obtained through latex2html
sub store_cache
{
- return unless $l2h_latex_count;
+ return unless $latex_count;
my ($key, $value);
- open(FH, ">$l2h_cache_file") || return warn"$ERROR l2h Error: could not
open $docu_rdir$l2h_cache_file for writing: $!\n";
+ unless (open(FH, ">$l2h_cache_file"))
+ {
+ warn "$ERROR l2h Error: could not open $docu_rdir$l2h_cache_file for
writing: $!\n";
+ return;
+ }
while (($key, $value) = each %l2h_cache)
{
# escape stuff
@@ -3357,17 +3399,16 @@
print FH "\$l2h_cache{\$l2h_cache_key} = q|$value|;\n";
}
print FH "1;";
- close(FH);
+ close (FH);
}
# return cached html, if it exists for text, and if all pictures
# are there, as well
-#sub l2h_FromCache
-sub from_cache
+sub from_cache($)
{
my $text = shift;
my $cached = $l2h_cache{$text};
- if ($cached)
+ if (defined($cached))
{
while ($cached =~ m/SRC="(.*?)"/g)
{
@@ -3381,48 +3422,6 @@
return undef;
}
-# insert generated html into cache, move away images,
-# return transformed html
-my $maximage = 1;
-#sub l2h_ToCache($$)
-sub to_cache($$)
-{
- my $count = shift;
- my $content = shift;
- my @images = ($content =~ /SRC="(.*?)"/g);
- my ($src, $dest);
-
- for $src (@images)
- {
- $dest = $l2h_img{$src};
- unless ($dest)
- {
- my $ext;
- if ($src =~ /.*\.(.*)$/ && $1 ne $docu_ext)
- {
- $ext = $1;
- }
- else
- {
- warn "$ERROR: L2h image $src has invalid extension\n";
- next;
- }
- while (-e "$docu_rdir${docu_name}_$maximage"
- . ($ext ? ".$ext" : ""))
- {
- $maximage++;
- }
- $dest = "${docu_name}_$maximage" . ($ext ? ".$ext" : "");
- system("cp -f $docu_rdir$src $docu_rdir$dest");
- $l2h_img{$src} = $dest;
- #unlink "$docu_rdir$src" unless ($T2H_DEBUG & $DEBUG_L2H);
- unlink "$docu_rdir$src" unless ($debug);
- }
- $content =~ s/$src/$dest/g;
- }
- $l2h_cache{$l2h_to_latex[$count]} = $content;
- return $content;
-}
}
@@ -5721,7 +5720,8 @@
{
my $section = $sections{$number};
$section->{'name'} = substitute_line($section->{'texi'});
- # FIXME the user should be able to give a raw texinfo himself
+ # FIXME the user should be able to give a raw texinfo himself for
+ # section number formatting
$section->{'text'} =
&$Texi2HTML::Config::protect_text($section->{'number'}) . " " .
$section->{'name'};
$section->{'text'} =~ s/^\s*//;
$section->{'no_texi'} = $section->{'number'} . " "
.remove_texi($section->{'texi'});
@@ -5742,6 +5742,7 @@
{
my $page = $element->{'page'};
# FIXME the user should be able to give a raw texinfo himself
+ # for additionnal index page section title
my $letter_raw = ($page->{'first_letter'} ne
$page->{'last_letter'} ?
"$page->{'first_letter'} -- $page->{'last_letter'}" :
"$page->{'first_letter'}");
@@ -7087,12 +7088,6 @@
return $text;
}
-sub do_math($;$)
-{
- #return Texi2HTML::LaTeX2HTML::to_latex("\$".$_[0]."\$");
- return Texi2HTML::LaTeX2HTML::to_latex('math',$_[0]);
-}
-
sub do_anchor_label($$$$)
{
my $command = shift;
@@ -8259,7 +8254,8 @@
{
$file_name = "$base.$args[4]";
}
- # FIXME there should instead be a list of file extension to search for.
+ # FIXME there should instead be a list of file extension to search for,
+ # set by the user.
elsif ($image = locate_include_file("$base.png"))
{
$file_name = "$base.png";
@@ -9651,11 +9647,6 @@
$state->{'place'} = $state->{'footnote_place'};
}
}
- #elsif ($style->{'style'} eq 'math' and
$Texi2HTML::Config::L2H)
- #{
- # add_prev ($text, $stack, do_math($style->{'text'}));
- # next;
- #}
elsif ($style->{'style'} eq 'caption' or $style->{'style'}
eq 'shortcaption' and $state->{'float'})
{
@@ -10314,11 +10305,6 @@
}
# the following macros are not modified but just ignored
# if we are removing texi
-# if ($macro =~ /^tex_(\d+)$/o)
-# {
-# add_prev($text, $stack, Texi2HTML::LaTeX2HTML::do_tex($1));
-# next;
-# }
if ($state->{'remove_texi'})
{
if ((($macro =~ /^(\w+?)index$/) and ($1 ne 'print')) or
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ./ChangeLog ./NEWS ./TODO ./texi2html...,
Patrice Dumas <=