[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ./ChangeLog ./T2h_l2h.pm ./TODO ./tex...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ./ChangeLog ./T2h_l2h.pm ./TODO ./tex... |
|
Date: |
Sun, 23 Apr 2006 20:47:28 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Branch:
Changes by: Patrice Dumas <address@hidden> 06/04/23 20:47:28
Modified files:
. : ChangeLog T2h_l2h.pm TODO texi2html.init
texi2html.pl
Tests : Makefile.am Makefile.in test.sh
Tests/formatting: .cvsignore simplest.texi
Tests/formatting_res: clean.html exotic_formatting.html
exotic_formatting_1.html
exotic_formatting_2.html
exotic_formatting_3.html
exotic_formatting_abt.html
exotic_formatting_ovr.html
exotic_formatting_toc.html formatting.html
fr_formatting.html
icons_fr_formatting.html simplest.html
simplest.passfirst simplest.passtexi
to_utf8_formatting.html verbatim_html.2
weird_quotes_formatting.html
Added files:
Tests/floats : float_copying.texi
Tests/floats_res: float_copying.2 float_copying.html
float_copying.passfirst float_copying.passtexi
float_copying_1.html float_copying_abt.html
Tests/formatting: footnote_not_closed.texi node_in_copying.texi
tex_in_copying.texi
Tests/formatting_res: footnote_not_closed.2
footnote_not_closed.html
footnote_not_closed.passfirst
footnote_not_closed.passtexi
node_in_copying.2 node_in_copying.html
node_in_copying.passfirst
node_in_copying.passtexi
tex_in_copying.html
tex_in_copying.passfirst
tex_in_copying.passtexi
Log message:
* texi2html.pl, texi2html.init, T2h_l2h.pm: handle @tex,
@verbatim and @verbatiminclude in @copying comments (with
'remove_texi').
Handle @float and @need at the right place.
* texi2html.init: More cleanings of -- in html comments.
* Tests/*: add test for @tex and @float in @copying, for
@node in @copying.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/ChangeLog.diff?tr1=1.244&tr2=1.245&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/T2h_l2h.pm.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/TODO.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/texi2html.init.diff?tr1=1.103&tr2=1.104&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/texi2html.pl.diff?tr1=1.165&tr2=1.166&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/Makefile.am.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/Makefile.in.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/test.sh.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/floats/float_copying.texi?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/floats_res/float_copying.2?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/floats_res/float_copying.html?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/floats_res/float_copying.passfirst?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/floats_res/float_copying.passtexi?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/floats_res/float_copying_1.html?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/floats_res/float_copying_abt.html?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting/footnote_not_closed.texi?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting/node_in_copying.texi?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting/simplest.texi.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting/tex_in_copying.texi?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/clean.html.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/exotic_formatting.html.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/exotic_formatting_1.html.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/exotic_formatting_2.html.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/exotic_formatting_3.html.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/exotic_formatting_abt.html.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/exotic_formatting_ovr.html.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/exotic_formatting_toc.html.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/footnote_not_closed.2?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/footnote_not_closed.html?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/footnote_not_closed.passfirst?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/footnote_not_closed.passtexi?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/formatting.html.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/fr_formatting.html.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/icons_fr_formatting.html.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/node_in_copying.2?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/node_in_copying.html?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/node_in_copying.passfirst?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/node_in_copying.passtexi?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/simplest.html.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/simplest.passfirst.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/simplest.passtexi.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/tex_in_copying.html?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/tex_in_copying.passfirst?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/tex_in_copying.passtexi?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/to_utf8_formatting.html.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/verbatim_html.2.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/weird_quotes_formatting.html.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: texi2html/ChangeLog
diff -u texi2html/ChangeLog:1.244 texi2html/ChangeLog:1.245
--- texi2html/ChangeLog:1.244 Mon Apr 17 23:11:09 2006
+++ texi2html/ChangeLog Sun Apr 23 20:47:27 2006
@@ -1,3 +1,13 @@
+2006-04-23 Patrice Dumas <address@hidden>
+
+ * texi2html.pl, texi2html.init, T2h_l2h.pm: handle @tex,
+ @verbatim and @verbatiminclude in @copying comments (with
+ 'remove_texi').
+ Handle @float and @need at the right place.
+ * texi2html.init: More cleanings of -- in html comments.
+ * Tests/*: add test for @tex and @float in @copying, for
+ @node in @copying.
+
2006-04-17 Patrice Dumas <address@hidden>
* texi2html.pl, texi2html.init: hanldle rightly centerchap.
Index: texi2html/T2h_l2h.pm
diff -u texi2html/T2h_l2h.pm:1.2 texi2html/T2h_l2h.pm:1.3
--- texi2html/T2h_l2h.pm:1.2 Sat Mar 25 13:26:46 2006
+++ texi2html/T2h_l2h.pm Sun Apr 23 20:47:27 2006
@@ -396,8 +396,9 @@
{
my $style = shift;
my $counter = shift;
+ my $state = shift;
my $count = $global_count{"${style}_$counter"};
- # begin debug section (incorrect counts)
+ ################################## begin debug section (incorrect counts)
if (!defined($count))
{
# counter is undefined
@@ -416,7 +417,7 @@
if ($debug);
return '';
}
- # end debug section (incorrect counts)
+ ################################## end debug section (incorrect counts)
# this seems to be a valid counter
my $result = '';
@@ -424,7 +425,17 @@
if (defined($l2h_from_html[$count]))
{
$html_output_count++;
- $result .= $l2h_from_html[$count];
+ # maybe we could also have something if simple_format
+ # with Texi2HTML::Config::protect_text, once simple_format
+ # may happen for anything else than lines
+ if ($state->{'remove_texi'})
+ {# don't protect anything
+ $result .= $l2h_to_latex[$count];
+ }
+ else
+ {
+ $result .= $l2h_from_html[$count];
+ }
}
else
{
Index: texi2html/TODO
diff -u texi2html/TODO:1.28 texi2html/TODO:1.29
--- texi2html/TODO:1.28 Mon Apr 17 23:11:09 2006
+++ texi2html/TODO Sun Apr 23 20:47:27 2006
@@ -95,10 +95,6 @@
http://docbook.sourceforge.net/release/xsl/snapshot/doc/html/rn20.html
all the CHM related parameters one can change).
-* test @tex in @copying with -l2h
-
-* test @copying closed by a @node
-
* BUG?: @special in multitable extracted but ignored later.
The real fix would be to give to multitable each header within brace
texi and formatted result.
Index: texi2html/Tests/Makefile.am
diff -u texi2html/Tests/Makefile.am:1.15 texi2html/Tests/Makefile.am:1.16
--- texi2html/Tests/Makefile.am:1.15 Mon Apr 10 14:43:32 2006
+++ texi2html/Tests/Makefile.am Sun Apr 23 20:47:27 2006
@@ -13,7 +13,7 @@
-for dir in ${SUBDIR_TESTS}; do \
[ -d $${dir}_res ] && cp $$dir/*.passfirst $$dir/*.html $$dir/*.htm
$$dir/*.2 $$dir/*.passtexi $${dir}_res;\
done
- -rm -f formatting_res/*_l2h.html formatting_res/tex.2
+ -rm -f formatting_res/*_l2h.html formatting_res/tex.2
formatting_res/tex_in_copying.2
-rm -f singular_res/*_l2h.html singular_res/sing.2
clean-local:
Index: texi2html/Tests/Makefile.in
diff -u texi2html/Tests/Makefile.in:1.35 texi2html/Tests/Makefile.in:1.36
--- texi2html/Tests/Makefile.in:1.35 Mon Apr 10 14:43:33 2006
+++ texi2html/Tests/Makefile.in Sun Apr 23 20:47:27 2006
@@ -282,7 +282,7 @@
-for dir in ${SUBDIR_TESTS}; do \
[ -d $${dir}_res ] && cp $$dir/*.passfirst $$dir/*.html $$dir/*.htm
$$dir/*.2 $$dir/*.passtexi $${dir}_res;\
done
- -rm -f formatting_res/*_l2h.html formatting_res/tex.2
+ -rm -f formatting_res/*_l2h.html formatting_res/tex.2
formatting_res/tex_in_copying.2
-rm -f singular_res/*_l2h.html singular_res/sing.2
clean-local:
Index: texi2html/Tests/formatting/.cvsignore
diff -u texi2html/Tests/formatting/.cvsignore:1.1
texi2html/Tests/formatting/.cvsignore:1.2
--- texi2html/Tests/formatting/.cvsignore:1.1 Wed Feb 11 19:09:05 2004
+++ texi2html/Tests/formatting/.cvsignore Sun Apr 23 20:47:27 2006
@@ -9,3 +9,8 @@
tex_l2h_images.log
tex_l2h.css
tex_not_closed_l2h.css
+tex_in_copying_l2h.css
+tex_in_copying_l2h_images.log
+tex_in_copying_l2h_images.out
+tex_l2h_images.out
+l2h_cache.pm
Index: texi2html/Tests/formatting/simplest.texi
diff -u texi2html/Tests/formatting/simplest.texi:1.2
texi2html/Tests/formatting/simplest.texi:1.3
--- texi2html/Tests/formatting/simplest.texi:1.2 Mon Apr 17 23:11:10 2006
+++ texi2html/Tests/formatting/simplest.texi Sun Apr 23 20:47:28 2006
@@ -4,6 +4,6 @@
@node Top
-This is a very simple texi manual.
+This is a very simple texi manual @ <>.
@bye
Index: texi2html/Tests/formatting_res/clean.html
diff -u texi2html/Tests/formatting_res/clean.html:1.22
texi2html/Tests/formatting_res/clean.html:1.23
--- texi2html/Tests/formatting_res/clean.html:1.22 Mon Apr 17 23:11:10 2006
+++ texi2html/Tests/formatting_res/clean.html Sun Apr 23 20:47:28 2006
@@ -6,11 +6,11 @@
"
&
-"simple-double-three--four---"
-code: ``simple-double--three---four----''
-asis: "simple-double-three--four---"
-strong: "simple-double-three--four---"
-kbd: ``simple-double--three---four----''
+"simple-double-three-four-"
+code: ``simple-double-three-four-''
+asis: "simple-double-three-four-"
+strong: "simple-double-three-four-"
+kbd: ``simple-double-three-four-''
@"u u"
@@ -75,68 +75,68 @@
@ordm o
@comma ,
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,--b} -b
address@hidden,--b} -b
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden,--b} --a,-b
address@hidden --a
address@hidden,--b} ,-b
address@hidden,--b} --a,-b
address@hidden,} --a,
address@hidden,--b} ,-b
address@hidden -a
address@hidden:--a:} --a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -b
address@hidden,-b} -b
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -a,-b
address@hidden -a
address@hidden,-b} ,-b
address@hidden,-b} -a,-b
address@hidden,} -a,
address@hidden,-b} ,-b
address@hidden -a
address@hidden:-a:} -a
address@hidden -a
@H{a} a''
address@hidden -a''
address@hidden -a''
@dotaccent{a} a.
address@hidden -a.
address@hidden -a.
@ringaccent{a} a*
address@hidden -a*
address@hidden -a*
@tieaccent{a} a[
address@hidden -a[
address@hidden -a[
@u{a} a(
address@hidden -a(
address@hidden -a(
@ubaraccent{a} a_
address@hidden -a_
address@hidden -a_
@udotaccent{a} .a
address@hidden .-a
address@hidden .-a
@v{a} a<
address@hidden -a<
address@hidden -a<
@,{c} c,
-@,{--c} -c,
+@,{-c} -c,
@footnote{in footnote}
@footnote{in footnote2}
address@hidden,,} f--ile
address@hidden f--ile
address@hidden,,,a--lt} f--ile
address@hidden,,,,e--xt} f--ile
address@hidden,2cm,4cm,alt,e--xt} f--ile
address@hidden,,} f-ile
address@hidden f-ile
address@hidden,,,a-lt} f-ile
address@hidden,,,,e-xt} f-ile
address@hidden,2cm,4cm,alt,e-xt} f-ile
a q-uotation
@@ -347,6 +347,15 @@
centered line
+\input texinfo @c -*-texinfo-*-
+
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @ <>.
+
address@hidden
-->
<!-- Created on a sunny day by texi2html -->
@@ -852,7 +861,7 @@
@node Top
-This is a very simple texi manual.
+This is a very simple texi manual @ <>.
@bye
</pre>
@@ -1281,7 +1290,7 @@
@node Top
-This is a very simple texi manual.
+This is a very simple texi manual @ <>.
@bye
</pre>
@@ -1692,7 +1701,7 @@
@node Top
-This is a very simple texi manual.
+This is a very simple texi manual @ <>.
@bye
</pre>
Index: texi2html/Tests/formatting_res/exotic_formatting.html
diff -u texi2html/Tests/formatting_res/exotic_formatting.html:1.56
texi2html/Tests/formatting_res/exotic_formatting.html:1.57
--- texi2html/Tests/formatting_res/exotic_formatting.html:1.56 Mon Apr 17
23:11:10 2006
+++ texi2html/Tests/formatting_res/exotic_formatting.html Sun Apr 23
20:47:28 2006
@@ -6,11 +6,11 @@
"
&
-"simple-double-three--four---"
-code: ``simple-double--three---four----''
-asis: "simple-double-three--four---"
-strong: "simple-double-three--four---"
-kbd: ``simple-double--three---four----''
+"simple-double-three-four-"
+code: ``simple-double-three-four-''
+asis: "simple-double-three-four-"
+strong: "simple-double-three-four-"
+kbd: ``simple-double-three-four-''
@"u u"
@@ -84,76 +84,76 @@
@TeX, but without brace TeX
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,--b} -b
address@hidden,--b} -b
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden,--b} --a,-b
address@hidden --a
address@hidden,--b} ,-b
address@hidden,--b} --a,-b
address@hidden,} --a,
address@hidden,--b} ,-b
address@hidden -a
address@hidden:--a:} --a
address@hidden -a
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -b
address@hidden,-b} -b
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -a,-b
address@hidden -a
address@hidden,-b} ,-b
address@hidden,-b} -a,-b
address@hidden,} -a,
address@hidden,-b} ,-b
address@hidden -a
address@hidden:-a:} -a
address@hidden -a
@H{a} a''
address@hidden -a''
address@hidden -a''
@dotaccent{a} a.
address@hidden -a.
address@hidden -a.
@ringaccent{a} a*
address@hidden -a*
address@hidden -a*
@tieaccent{a} a[
address@hidden -a[
address@hidden -a[
@u{a} a(
address@hidden -a(
address@hidden -a(
@ubaraccent{a} a_
address@hidden -a_
address@hidden -a_
@udotaccent{a} .a
address@hidden .-a
address@hidden .-a
@v{a} a<
address@hidden -a<
address@hidden -a<
@,{c} c,
-@,{--c} -c,
address@hidden -a
+@,{-c} -c,
address@hidden -a
@dotless{a} a
@footnote{in footnote}
@footnote{in footnote2}
address@hidden,,e--xt} f--ile
address@hidden,,,,e--xt} f--ile
address@hidden,,,alt} f--ile
address@hidden,aze,az,alt,e--xt} f--ile
address@hidden,aze,,a--lt} f-ile
address@hidden f--ile
address@hidden,,e--xt}
address@hidden,,,e--xt}
address@hidden,,e-xt} f-ile
address@hidden,,,,e-xt} f-ile
address@hidden,,,alt} f-ile
address@hidden,aze,az,alt,e-xt} f-ile
address@hidden,aze,,a-lt} f-ile
address@hidden f-ile
address@hidden,,e-xt}
address@hidden,,,e-xt}
@address@hidden:jk _" %@:},,,address@hidden:jk _" %@:}} address@hidden:jk _"
%@:}
address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f--ile}@@@.
address@hidden@file{f-ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f-ile}@@@.
a q-uotation
@@ -395,11 +395,11 @@
@inforef{,,file name}
@inforef{,cross ref name, file name}
address@hidden@comma{}ion, a @comma{} in cross
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@comma{}ion}
address@hidden@comma{}ion}
a
l-ine
@@ -423,6 +423,15 @@
centered line
+\input texinfo @c -*-texinfo-*-
+
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @ <>.
+
address@hidden
-->
<!-- Created on a sunny day by texi2html -->
@@ -1175,7 +1184,7 @@
@node Top
-This is a very simple texi manual.
+This is a very simple texi manual @ <>.
@bye
</pre>
@@ -1827,7 +1836,7 @@
@node Top
-This is a very simple texi manual.
+This is a very simple texi manual @ <>.
@bye
</pre>
Index: texi2html/Tests/formatting_res/exotic_formatting_1.html
diff -u texi2html/Tests/formatting_res/exotic_formatting_1.html:1.35
texi2html/Tests/formatting_res/exotic_formatting_1.html:1.36
--- texi2html/Tests/formatting_res/exotic_formatting_1.html:1.35 Mon Apr
17 23:11:10 2006
+++ texi2html/Tests/formatting_res/exotic_formatting_1.html Sun Apr 23
20:47:28 2006
@@ -6,11 +6,11 @@
"
&
-"simple-double-three--four---"
-code: ``simple-double--three---four----''
-asis: "simple-double-three--four---"
-strong: "simple-double-three--four---"
-kbd: ``simple-double--three---four----''
+"simple-double-three-four-"
+code: ``simple-double-three-four-''
+asis: "simple-double-three-four-"
+strong: "simple-double-three-four-"
+kbd: ``simple-double-three-four-''
@"u u"
@@ -84,76 +84,76 @@
@TeX, but without brace TeX
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,--b} -b
address@hidden,--b} -b
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden,--b} --a,-b
address@hidden --a
address@hidden,--b} ,-b
address@hidden,--b} --a,-b
address@hidden,} --a,
address@hidden,--b} ,-b
address@hidden -a
address@hidden:--a:} --a
address@hidden -a
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -b
address@hidden,-b} -b
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -a,-b
address@hidden -a
address@hidden,-b} ,-b
address@hidden,-b} -a,-b
address@hidden,} -a,
address@hidden,-b} ,-b
address@hidden -a
address@hidden:-a:} -a
address@hidden -a
@H{a} a''
address@hidden -a''
address@hidden -a''
@dotaccent{a} a.
address@hidden -a.
address@hidden -a.
@ringaccent{a} a*
address@hidden -a*
address@hidden -a*
@tieaccent{a} a[
address@hidden -a[
address@hidden -a[
@u{a} a(
address@hidden -a(
address@hidden -a(
@ubaraccent{a} a_
address@hidden -a_
address@hidden -a_
@udotaccent{a} .a
address@hidden .-a
address@hidden .-a
@v{a} a<
address@hidden -a<
address@hidden -a<
@,{c} c,
-@,{--c} -c,
address@hidden -a
+@,{-c} -c,
address@hidden -a
@dotless{a} a
@footnote{in footnote}
@footnote{in footnote2}
address@hidden,,e--xt} f--ile
address@hidden,,,,e--xt} f--ile
address@hidden,,,alt} f--ile
address@hidden,aze,az,alt,e--xt} f--ile
address@hidden,aze,,a--lt} f-ile
address@hidden f--ile
address@hidden,,e--xt}
address@hidden,,,e--xt}
address@hidden,,e-xt} f-ile
address@hidden,,,,e-xt} f-ile
address@hidden,,,alt} f-ile
address@hidden,aze,az,alt,e-xt} f-ile
address@hidden,aze,,a-lt} f-ile
address@hidden f-ile
address@hidden,,e-xt}
address@hidden,,,e-xt}
@address@hidden:jk _" %@:},,,address@hidden:jk _" %@:}} address@hidden:jk _"
%@:}
address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f--ile}@@@.
address@hidden@file{f-ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f-ile}@@@.
a q-uotation
@@ -395,11 +395,11 @@
@inforef{,,file name}
@inforef{,cross ref name, file name}
address@hidden@comma{}ion, a @comma{} in cross
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@comma{}ion}
address@hidden@comma{}ion}
a
l-ine
@@ -423,6 +423,15 @@
centered line
+\input texinfo @c -*-texinfo-*-
+
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @ <>.
+
address@hidden
-->
<!-- Created on a sunny day by texi2html -->
Index: texi2html/Tests/formatting_res/exotic_formatting_2.html
diff -u texi2html/Tests/formatting_res/exotic_formatting_2.html:1.32
texi2html/Tests/formatting_res/exotic_formatting_2.html:1.33
--- texi2html/Tests/formatting_res/exotic_formatting_2.html:1.32 Sat Apr
8 22:40:16 2006
+++ texi2html/Tests/formatting_res/exotic_formatting_2.html Sun Apr 23
20:47:28 2006
@@ -6,11 +6,11 @@
"
&
-"simple-double-three--four---"
-code: ``simple-double--three---four----''
-asis: "simple-double-three--four---"
-strong: "simple-double-three--four---"
-kbd: ``simple-double--three---four----''
+"simple-double-three-four-"
+code: ``simple-double-three-four-''
+asis: "simple-double-three-four-"
+strong: "simple-double-three-four-"
+kbd: ``simple-double-three-four-''
@"u u"
@@ -84,76 +84,76 @@
@TeX, but without brace TeX
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,--b} -b
address@hidden,--b} -b
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden,--b} --a,-b
address@hidden --a
address@hidden,--b} ,-b
address@hidden,--b} --a,-b
address@hidden,} --a,
address@hidden,--b} ,-b
address@hidden -a
address@hidden:--a:} --a
address@hidden -a
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -b
address@hidden,-b} -b
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -a,-b
address@hidden -a
address@hidden,-b} ,-b
address@hidden,-b} -a,-b
address@hidden,} -a,
address@hidden,-b} ,-b
address@hidden -a
address@hidden:-a:} -a
address@hidden -a
@H{a} a''
address@hidden -a''
address@hidden -a''
@dotaccent{a} a.
address@hidden -a.
address@hidden -a.
@ringaccent{a} a*
address@hidden -a*
address@hidden -a*
@tieaccent{a} a[
address@hidden -a[
address@hidden -a[
@u{a} a(
address@hidden -a(
address@hidden -a(
@ubaraccent{a} a_
address@hidden -a_
address@hidden -a_
@udotaccent{a} .a
address@hidden .-a
address@hidden .-a
@v{a} a<
address@hidden -a<
address@hidden -a<
@,{c} c,
-@,{--c} -c,
address@hidden -a
+@,{-c} -c,
address@hidden -a
@dotless{a} a
@footnote{in footnote}
@footnote{in footnote2}
address@hidden,,e--xt} f--ile
address@hidden,,,,e--xt} f--ile
address@hidden,,,alt} f--ile
address@hidden,aze,az,alt,e--xt} f--ile
address@hidden,aze,,a--lt} f-ile
address@hidden f--ile
address@hidden,,e--xt}
address@hidden,,,e--xt}
address@hidden,,e-xt} f-ile
address@hidden,,,,e-xt} f-ile
address@hidden,,,alt} f-ile
address@hidden,aze,az,alt,e-xt} f-ile
address@hidden,aze,,a-lt} f-ile
address@hidden f-ile
address@hidden,,e-xt}
address@hidden,,,e-xt}
@address@hidden:jk _" %@:},,,address@hidden:jk _" %@:}} address@hidden:jk _"
%@:}
address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f--ile}@@@.
address@hidden@file{f-ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f-ile}@@@.
a q-uotation
@@ -395,11 +395,11 @@
@inforef{,,file name}
@inforef{,cross ref name, file name}
address@hidden@comma{}ion, a @comma{} in cross
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@comma{}ion}
address@hidden@comma{}ion}
a
l-ine
@@ -423,6 +423,15 @@
centered line
+\input texinfo @c -*-texinfo-*-
+
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @ <>.
+
address@hidden
-->
<!-- Created on a sunny day by texi2html -->
Index: texi2html/Tests/formatting_res/exotic_formatting_3.html
diff -u texi2html/Tests/formatting_res/exotic_formatting_3.html:1.36
texi2html/Tests/formatting_res/exotic_formatting_3.html:1.37
--- texi2html/Tests/formatting_res/exotic_formatting_3.html:1.36 Mon Apr
17 23:11:10 2006
+++ texi2html/Tests/formatting_res/exotic_formatting_3.html Sun Apr 23
20:47:28 2006
@@ -6,11 +6,11 @@
"
&
-"simple-double-three--four---"
-code: ``simple-double--three---four----''
-asis: "simple-double-three--four---"
-strong: "simple-double-three--four---"
-kbd: ``simple-double--three---four----''
+"simple-double-three-four-"
+code: ``simple-double-three-four-''
+asis: "simple-double-three-four-"
+strong: "simple-double-three-four-"
+kbd: ``simple-double-three-four-''
@"u u"
@@ -84,76 +84,76 @@
@TeX, but without brace TeX
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,--b} -b
address@hidden,--b} -b
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden,--b} --a,-b
address@hidden --a
address@hidden,--b} ,-b
address@hidden,--b} --a,-b
address@hidden,} --a,
address@hidden,--b} ,-b
address@hidden -a
address@hidden:--a:} --a
address@hidden -a
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -b
address@hidden,-b} -b
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -a,-b
address@hidden -a
address@hidden,-b} ,-b
address@hidden,-b} -a,-b
address@hidden,} -a,
address@hidden,-b} ,-b
address@hidden -a
address@hidden:-a:} -a
address@hidden -a
@H{a} a''
address@hidden -a''
address@hidden -a''
@dotaccent{a} a.
address@hidden -a.
address@hidden -a.
@ringaccent{a} a*
address@hidden -a*
address@hidden -a*
@tieaccent{a} a[
address@hidden -a[
address@hidden -a[
@u{a} a(
address@hidden -a(
address@hidden -a(
@ubaraccent{a} a_
address@hidden -a_
address@hidden -a_
@udotaccent{a} .a
address@hidden .-a
address@hidden .-a
@v{a} a<
address@hidden -a<
address@hidden -a<
@,{c} c,
-@,{--c} -c,
address@hidden -a
+@,{-c} -c,
address@hidden -a
@dotless{a} a
@footnote{in footnote}
@footnote{in footnote2}
address@hidden,,e--xt} f--ile
address@hidden,,,,e--xt} f--ile
address@hidden,,,alt} f--ile
address@hidden,aze,az,alt,e--xt} f--ile
address@hidden,aze,,a--lt} f-ile
address@hidden f--ile
address@hidden,,e--xt}
address@hidden,,,e--xt}
address@hidden,,e-xt} f-ile
address@hidden,,,,e-xt} f-ile
address@hidden,,,alt} f-ile
address@hidden,aze,az,alt,e-xt} f-ile
address@hidden,aze,,a-lt} f-ile
address@hidden f-ile
address@hidden,,e-xt}
address@hidden,,,e-xt}
@address@hidden:jk _" %@:},,,address@hidden:jk _" %@:}} address@hidden:jk _"
%@:}
address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f--ile}@@@.
address@hidden@file{f-ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f-ile}@@@.
a q-uotation
@@ -395,11 +395,11 @@
@inforef{,,file name}
@inforef{,cross ref name, file name}
address@hidden@comma{}ion, a @comma{} in cross
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@comma{}ion}
address@hidden@comma{}ion}
a
l-ine
@@ -423,6 +423,15 @@
centered line
+\input texinfo @c -*-texinfo-*-
+
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @ <>.
+
address@hidden
-->
<!-- Created on a sunny day by texi2html -->
Index: texi2html/Tests/formatting_res/exotic_formatting_abt.html
diff -u texi2html/Tests/formatting_res/exotic_formatting_abt.html:1.29
texi2html/Tests/formatting_res/exotic_formatting_abt.html:1.30
--- texi2html/Tests/formatting_res/exotic_formatting_abt.html:1.29 Sat Apr
8 22:40:16 2006
+++ texi2html/Tests/formatting_res/exotic_formatting_abt.html Sun Apr 23
20:47:28 2006
@@ -6,11 +6,11 @@
"
&
-"simple-double-three--four---"
-code: ``simple-double--three---four----''
-asis: "simple-double-three--four---"
-strong: "simple-double-three--four---"
-kbd: ``simple-double--three---four----''
+"simple-double-three-four-"
+code: ``simple-double-three-four-''
+asis: "simple-double-three-four-"
+strong: "simple-double-three-four-"
+kbd: ``simple-double-three-four-''
@"u u"
@@ -84,76 +84,76 @@
@TeX, but without brace TeX
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,--b} -b
address@hidden,--b} -b
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden,--b} --a,-b
address@hidden --a
address@hidden,--b} ,-b
address@hidden,--b} --a,-b
address@hidden,} --a,
address@hidden,--b} ,-b
address@hidden -a
address@hidden:--a:} --a
address@hidden -a
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -b
address@hidden,-b} -b
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -a,-b
address@hidden -a
address@hidden,-b} ,-b
address@hidden,-b} -a,-b
address@hidden,} -a,
address@hidden,-b} ,-b
address@hidden -a
address@hidden:-a:} -a
address@hidden -a
@H{a} a''
address@hidden -a''
address@hidden -a''
@dotaccent{a} a.
address@hidden -a.
address@hidden -a.
@ringaccent{a} a*
address@hidden -a*
address@hidden -a*
@tieaccent{a} a[
address@hidden -a[
address@hidden -a[
@u{a} a(
address@hidden -a(
address@hidden -a(
@ubaraccent{a} a_
address@hidden -a_
address@hidden -a_
@udotaccent{a} .a
address@hidden .-a
address@hidden .-a
@v{a} a<
address@hidden -a<
address@hidden -a<
@,{c} c,
-@,{--c} -c,
address@hidden -a
+@,{-c} -c,
address@hidden -a
@dotless{a} a
@footnote{in footnote}
@footnote{in footnote2}
address@hidden,,e--xt} f--ile
address@hidden,,,,e--xt} f--ile
address@hidden,,,alt} f--ile
address@hidden,aze,az,alt,e--xt} f--ile
address@hidden,aze,,a--lt} f-ile
address@hidden f--ile
address@hidden,,e--xt}
address@hidden,,,e--xt}
address@hidden,,e-xt} f-ile
address@hidden,,,,e-xt} f-ile
address@hidden,,,alt} f-ile
address@hidden,aze,az,alt,e-xt} f-ile
address@hidden,aze,,a-lt} f-ile
address@hidden f-ile
address@hidden,,e-xt}
address@hidden,,,e-xt}
@address@hidden:jk _" %@:},,,address@hidden:jk _" %@:}} address@hidden:jk _"
%@:}
address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f--ile}@@@.
address@hidden@file{f-ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f-ile}@@@.
a q-uotation
@@ -395,11 +395,11 @@
@inforef{,,file name}
@inforef{,cross ref name, file name}
address@hidden@comma{}ion, a @comma{} in cross
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@comma{}ion}
address@hidden@comma{}ion}
a
l-ine
@@ -423,6 +423,15 @@
centered line
+\input texinfo @c -*-texinfo-*-
+
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @ <>.
+
address@hidden
-->
<!-- Created on a sunny day by texi2html -->
Index: texi2html/Tests/formatting_res/exotic_formatting_ovr.html
diff -u texi2html/Tests/formatting_res/exotic_formatting_ovr.html:1.29
texi2html/Tests/formatting_res/exotic_formatting_ovr.html:1.30
--- texi2html/Tests/formatting_res/exotic_formatting_ovr.html:1.29 Sat Apr
8 22:40:16 2006
+++ texi2html/Tests/formatting_res/exotic_formatting_ovr.html Sun Apr 23
20:47:28 2006
@@ -6,11 +6,11 @@
"
&
-"simple-double-three--four---"
-code: ``simple-double--three---four----''
-asis: "simple-double-three--four---"
-strong: "simple-double-three--four---"
-kbd: ``simple-double--three---four----''
+"simple-double-three-four-"
+code: ``simple-double-three-four-''
+asis: "simple-double-three-four-"
+strong: "simple-double-three-four-"
+kbd: ``simple-double-three-four-''
@"u u"
@@ -84,76 +84,76 @@
@TeX, but without brace TeX
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,--b} -b
address@hidden,--b} -b
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden,--b} --a,-b
address@hidden --a
address@hidden,--b} ,-b
address@hidden,--b} --a,-b
address@hidden,} --a,
address@hidden,--b} ,-b
address@hidden -a
address@hidden:--a:} --a
address@hidden -a
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -b
address@hidden,-b} -b
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -a,-b
address@hidden -a
address@hidden,-b} ,-b
address@hidden,-b} -a,-b
address@hidden,} -a,
address@hidden,-b} ,-b
address@hidden -a
address@hidden:-a:} -a
address@hidden -a
@H{a} a''
address@hidden -a''
address@hidden -a''
@dotaccent{a} a.
address@hidden -a.
address@hidden -a.
@ringaccent{a} a*
address@hidden -a*
address@hidden -a*
@tieaccent{a} a[
address@hidden -a[
address@hidden -a[
@u{a} a(
address@hidden -a(
address@hidden -a(
@ubaraccent{a} a_
address@hidden -a_
address@hidden -a_
@udotaccent{a} .a
address@hidden .-a
address@hidden .-a
@v{a} a<
address@hidden -a<
address@hidden -a<
@,{c} c,
-@,{--c} -c,
address@hidden -a
+@,{-c} -c,
address@hidden -a
@dotless{a} a
@footnote{in footnote}
@footnote{in footnote2}
address@hidden,,e--xt} f--ile
address@hidden,,,,e--xt} f--ile
address@hidden,,,alt} f--ile
address@hidden,aze,az,alt,e--xt} f--ile
address@hidden,aze,,a--lt} f-ile
address@hidden f--ile
address@hidden,,e--xt}
address@hidden,,,e--xt}
address@hidden,,e-xt} f-ile
address@hidden,,,,e-xt} f-ile
address@hidden,,,alt} f-ile
address@hidden,aze,az,alt,e-xt} f-ile
address@hidden,aze,,a-lt} f-ile
address@hidden f-ile
address@hidden,,e-xt}
address@hidden,,,e-xt}
@address@hidden:jk _" %@:},,,address@hidden:jk _" %@:}} address@hidden:jk _"
%@:}
address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f--ile}@@@.
address@hidden@file{f-ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f-ile}@@@.
a q-uotation
@@ -395,11 +395,11 @@
@inforef{,,file name}
@inforef{,cross ref name, file name}
address@hidden@comma{}ion, a @comma{} in cross
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@comma{}ion}
address@hidden@comma{}ion}
a
l-ine
@@ -423,6 +423,15 @@
centered line
+\input texinfo @c -*-texinfo-*-
+
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @ <>.
+
address@hidden
-->
<!-- Created on a sunny day by texi2html -->
Index: texi2html/Tests/formatting_res/exotic_formatting_toc.html
diff -u texi2html/Tests/formatting_res/exotic_formatting_toc.html:1.29
texi2html/Tests/formatting_res/exotic_formatting_toc.html:1.30
--- texi2html/Tests/formatting_res/exotic_formatting_toc.html:1.29 Sat Apr
8 22:40:16 2006
+++ texi2html/Tests/formatting_res/exotic_formatting_toc.html Sun Apr 23
20:47:28 2006
@@ -6,11 +6,11 @@
"
&
-"simple-double-three--four---"
-code: ``simple-double--three---four----''
-asis: "simple-double-three--four---"
-strong: "simple-double-three--four---"
-kbd: ``simple-double--three---four----''
+"simple-double-three-four-"
+code: ``simple-double-three-four-''
+asis: "simple-double-three-four-"
+strong: "simple-double-three-four-"
+kbd: ``simple-double-three-four-''
@"u u"
@@ -84,76 +84,76 @@
@TeX, but without brace TeX
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,--b} -b
address@hidden,--b} -b
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden,--b} --a,-b
address@hidden --a
address@hidden,--b} ,-b
address@hidden,--b} --a,-b
address@hidden,} --a,
address@hidden,--b} ,-b
address@hidden -a
address@hidden:--a:} --a
address@hidden -a
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -b
address@hidden,-b} -b
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -a,-b
address@hidden -a
address@hidden,-b} ,-b
address@hidden,-b} -a,-b
address@hidden,} -a,
address@hidden,-b} ,-b
address@hidden -a
address@hidden:-a:} -a
address@hidden -a
@H{a} a''
address@hidden -a''
address@hidden -a''
@dotaccent{a} a.
address@hidden -a.
address@hidden -a.
@ringaccent{a} a*
address@hidden -a*
address@hidden -a*
@tieaccent{a} a[
address@hidden -a[
address@hidden -a[
@u{a} a(
address@hidden -a(
address@hidden -a(
@ubaraccent{a} a_
address@hidden -a_
address@hidden -a_
@udotaccent{a} .a
address@hidden .-a
address@hidden .-a
@v{a} a<
address@hidden -a<
address@hidden -a<
@,{c} c,
-@,{--c} -c,
address@hidden -a
+@,{-c} -c,
address@hidden -a
@dotless{a} a
@footnote{in footnote}
@footnote{in footnote2}
address@hidden,,e--xt} f--ile
address@hidden,,,,e--xt} f--ile
address@hidden,,,alt} f--ile
address@hidden,aze,az,alt,e--xt} f--ile
address@hidden,aze,,a--lt} f-ile
address@hidden f--ile
address@hidden,,e--xt}
address@hidden,,,e--xt}
address@hidden,,e-xt} f-ile
address@hidden,,,,e-xt} f-ile
address@hidden,,,alt} f-ile
address@hidden,aze,az,alt,e-xt} f-ile
address@hidden,aze,,a-lt} f-ile
address@hidden f-ile
address@hidden,,e-xt}
address@hidden,,,e-xt}
@address@hidden:jk _" %@:},,,address@hidden:jk _" %@:}} address@hidden:jk _"
%@:}
address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f--ile}@@@.
address@hidden@file{f-ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f-ile}@@@.
a q-uotation
@@ -395,11 +395,11 @@
@inforef{,,file name}
@inforef{,cross ref name, file name}
address@hidden@comma{}ion, a @comma{} in cross
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@comma{}ion}
address@hidden@comma{}ion}
a
l-ine
@@ -423,6 +423,15 @@
centered line
+\input texinfo @c -*-texinfo-*-
+
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @ <>.
+
address@hidden
-->
<!-- Created on a sunny day by texi2html -->
Index: texi2html/Tests/formatting_res/formatting.html
diff -u texi2html/Tests/formatting_res/formatting.html:1.56
texi2html/Tests/formatting_res/formatting.html:1.57
--- texi2html/Tests/formatting_res/formatting.html:1.56 Mon Apr 17 23:11:10 2006
+++ texi2html/Tests/formatting_res/formatting.html Sun Apr 23 20:47:28 2006
@@ -6,11 +6,11 @@
"
&
-"simple-double-three--four---"
-code: ``simple-double--three---four----''
-asis: "simple-double-three--four---"
-strong: "simple-double-three--four---"
-kbd: ``simple-double--three---four----''
+"simple-double-three-four-"
+code: ``simple-double-three-four-''
+asis: "simple-double-three-four-"
+strong: "simple-double-three-four-"
+kbd: ``simple-double-three-four-''
@"u u"
@@ -84,76 +84,76 @@
@TeX, but without brace TeX
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,--b} -b
address@hidden,--b} -b
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden,--b} --a,-b
address@hidden --a
address@hidden,--b} ,-b
address@hidden,--b} --a,-b
address@hidden,} --a,
address@hidden,--b} ,-b
address@hidden -a
address@hidden:--a:} --a
address@hidden -a
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -b
address@hidden,-b} -b
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -a,-b
address@hidden -a
address@hidden,-b} ,-b
address@hidden,-b} -a,-b
address@hidden,} -a,
address@hidden,-b} ,-b
address@hidden -a
address@hidden:-a:} -a
address@hidden -a
@H{a} a''
address@hidden -a''
address@hidden -a''
@dotaccent{a} a.
address@hidden -a.
address@hidden -a.
@ringaccent{a} a*
address@hidden -a*
address@hidden -a*
@tieaccent{a} a[
address@hidden -a[
address@hidden -a[
@u{a} a(
address@hidden -a(
address@hidden -a(
@ubaraccent{a} a_
address@hidden -a_
address@hidden -a_
@udotaccent{a} .a
address@hidden .-a
address@hidden .-a
@v{a} a<
address@hidden -a<
address@hidden -a<
@,{c} c,
-@,{--c} -c,
address@hidden -a
+@,{-c} -c,
address@hidden -a
@dotless{a} a
@footnote{in footnote}
@footnote{in footnote2}
address@hidden,,e--xt} f--ile
address@hidden,,,,e--xt} f--ile
address@hidden,,,alt} f--ile
address@hidden,aze,az,alt,e--xt} f--ile
address@hidden,aze,,a--lt} f-ile
address@hidden f--ile
address@hidden,,e--xt}
address@hidden,,,e--xt}
address@hidden,,e-xt} f-ile
address@hidden,,,,e-xt} f-ile
address@hidden,,,alt} f-ile
address@hidden,aze,az,alt,e-xt} f-ile
address@hidden,aze,,a-lt} f-ile
address@hidden f-ile
address@hidden,,e-xt}
address@hidden,,,e-xt}
@address@hidden:jk _" %@:},,,address@hidden:jk _" %@:}} address@hidden:jk _"
%@:}
address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f--ile}@@@.
address@hidden@file{f-ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f-ile}@@@.
a q-uotation
@@ -395,11 +395,11 @@
@inforef{,,file name}
@inforef{,cross ref name, file name}
address@hidden@comma{}ion, a @comma{} in cross
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@comma{}ion}
address@hidden@comma{}ion}
a
l-ine
@@ -423,6 +423,15 @@
centered line
+\input texinfo @c -*-texinfo-*-
+
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @ <>.
+
address@hidden
-->
<!-- Created on a sunny day by texi2html -->
@@ -1040,7 +1049,7 @@
@node Top
-This is a very simple texi manual.
+This is a very simple texi manual @ <>.
@bye
</pre>
@@ -1557,7 +1566,7 @@
@node Top
-This is a very simple texi manual.
+This is a very simple texi manual @ <>.
@bye
</pre>
Index: texi2html/Tests/formatting_res/fr_formatting.html
diff -u texi2html/Tests/formatting_res/fr_formatting.html:1.49
texi2html/Tests/formatting_res/fr_formatting.html:1.50
--- texi2html/Tests/formatting_res/fr_formatting.html:1.49 Mon Apr 17
23:11:11 2006
+++ texi2html/Tests/formatting_res/fr_formatting.html Sun Apr 23 20:47:28 2006
@@ -6,11 +6,11 @@
"
&
-"simple-double-three--four---"
-code: ``simple-double--three---four----''
-asis: "simple-double-three--four---"
-strong: "simple-double-three--four---"
-kbd: ``simple-double--three---four----''
+"simple-double-three-four-"
+code: ``simple-double-three-four-''
+asis: "simple-double-three-four-"
+strong: "simple-double-three-four-"
+kbd: ``simple-double-three-four-''
@"u u"
@@ -84,76 +84,76 @@
@TeX, but without brace TeX
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,--b} -b
address@hidden,--b} -b
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden,--b} --a,-b
address@hidden --a
address@hidden,--b} ,-b
address@hidden,--b} --a,-b
address@hidden,} --a,
address@hidden,--b} ,-b
address@hidden -a
address@hidden:--a:} --a
address@hidden -a
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -b
address@hidden,-b} -b
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -a,-b
address@hidden -a
address@hidden,-b} ,-b
address@hidden,-b} -a,-b
address@hidden,} -a,
address@hidden,-b} ,-b
address@hidden -a
address@hidden:-a:} -a
address@hidden -a
@H{a} a''
address@hidden -a''
address@hidden -a''
@dotaccent{a} a.
address@hidden -a.
address@hidden -a.
@ringaccent{a} a*
address@hidden -a*
address@hidden -a*
@tieaccent{a} a[
address@hidden -a[
address@hidden -a[
@u{a} a(
address@hidden -a(
address@hidden -a(
@ubaraccent{a} a_
address@hidden -a_
address@hidden -a_
@udotaccent{a} .a
address@hidden .-a
address@hidden .-a
@v{a} a<
address@hidden -a<
address@hidden -a<
@,{c} c,
-@,{--c} -c,
address@hidden -a
+@,{-c} -c,
address@hidden -a
@dotless{a} a
@footnote{in footnote}
@footnote{in footnote2}
address@hidden,,e--xt} f--ile
address@hidden,,,,e--xt} f--ile
address@hidden,,,alt} f--ile
address@hidden,aze,az,alt,e--xt} f--ile
address@hidden,aze,,a--lt} f-ile
address@hidden f--ile
address@hidden,,e--xt}
address@hidden,,,e--xt}
address@hidden,,e-xt} f-ile
address@hidden,,,,e-xt} f-ile
address@hidden,,,alt} f-ile
address@hidden,aze,az,alt,e-xt} f-ile
address@hidden,aze,,a-lt} f-ile
address@hidden f-ile
address@hidden,,e-xt}
address@hidden,,,e-xt}
@address@hidden:jk _" %@:},,,address@hidden:jk _" %@:}} address@hidden:jk _"
%@:}
address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f--ile}@@@.
address@hidden@file{f-ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f-ile}@@@.
a q-uotation
@@ -395,11 +395,11 @@
@inforef{,,file name}
@inforef{,cross ref name, file name}
address@hidden@comma{}ion, a @comma{} in cross
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@comma{}ion}
address@hidden@comma{}ion}
a
l-ine
@@ -423,6 +423,15 @@
centered line
+\input texinfo @c -*-texinfo-*-
+
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @ <>.
+
address@hidden
-->
<!-- Created on a sunny day by texi2html -->
@@ -1040,7 +1049,7 @@
@node Top
-This is a very simple texi manual.
+This is a very simple texi manual @ <>.
@bye
</pre>
@@ -1557,7 +1566,7 @@
@node Top
-This is a very simple texi manual.
+This is a very simple texi manual @ <>.
@bye
</pre>
Index: texi2html/Tests/formatting_res/icons_fr_formatting.html
diff -u texi2html/Tests/formatting_res/icons_fr_formatting.html:1.11
texi2html/Tests/formatting_res/icons_fr_formatting.html:1.12
--- texi2html/Tests/formatting_res/icons_fr_formatting.html:1.11 Mon Apr
17 23:11:11 2006
+++ texi2html/Tests/formatting_res/icons_fr_formatting.html Sun Apr 23
20:47:28 2006
@@ -6,11 +6,11 @@
"
&
-"simple-double-three--four---"
-code: ``simple-double--three---four----''
-asis: "simple-double-three--four---"
-strong: "simple-double-three--four---"
-kbd: ``simple-double--three---four----''
+"simple-double-three-four-"
+code: ``simple-double-three-four-''
+asis: "simple-double-three-four-"
+strong: "simple-double-three-four-"
+kbd: ``simple-double-three-four-''
@"u u"
@@ -84,76 +84,76 @@
@TeX, but without brace TeX
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,--b} -b
address@hidden,--b} -b
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden,--b} --a,-b
address@hidden --a
address@hidden,--b} ,-b
address@hidden,--b} --a,-b
address@hidden,} --a,
address@hidden,--b} ,-b
address@hidden -a
address@hidden:--a:} --a
address@hidden -a
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -b
address@hidden,-b} -b
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -a,-b
address@hidden -a
address@hidden,-b} ,-b
address@hidden,-b} -a,-b
address@hidden,} -a,
address@hidden,-b} ,-b
address@hidden -a
address@hidden:-a:} -a
address@hidden -a
@H{a} a''
address@hidden -a''
address@hidden -a''
@dotaccent{a} a.
address@hidden -a.
address@hidden -a.
@ringaccent{a} a*
address@hidden -a*
address@hidden -a*
@tieaccent{a} a[
address@hidden -a[
address@hidden -a[
@u{a} a(
address@hidden -a(
address@hidden -a(
@ubaraccent{a} a_
address@hidden -a_
address@hidden -a_
@udotaccent{a} .a
address@hidden .-a
address@hidden .-a
@v{a} a<
address@hidden -a<
address@hidden -a<
@,{c} c,
-@,{--c} -c,
address@hidden -a
+@,{-c} -c,
address@hidden -a
@dotless{a} a
@footnote{in footnote}
@footnote{in footnote2}
address@hidden,,e--xt} f--ile
address@hidden,,,,e--xt} f--ile
address@hidden,,,alt} f--ile
address@hidden,aze,az,alt,e--xt} f--ile
address@hidden,aze,,a--lt} f-ile
address@hidden f--ile
address@hidden,,e--xt}
address@hidden,,,e--xt}
address@hidden,,e-xt} f-ile
address@hidden,,,,e-xt} f-ile
address@hidden,,,alt} f-ile
address@hidden,aze,az,alt,e-xt} f-ile
address@hidden,aze,,a-lt} f-ile
address@hidden f-ile
address@hidden,,e-xt}
address@hidden,,,e-xt}
@address@hidden:jk _" %@:},,,address@hidden:jk _" %@:}} address@hidden:jk _"
%@:}
address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f--ile}@@@.
address@hidden@file{f-ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f-ile}@@@.
a q-uotation
@@ -395,11 +395,11 @@
@inforef{,,file name}
@inforef{,cross ref name, file name}
address@hidden@comma{}ion, a @comma{} in cross
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@comma{}ion}
address@hidden@comma{}ion}
a
l-ine
@@ -423,6 +423,15 @@
centered line
+\input texinfo @c -*-texinfo-*-
+
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @ <>.
+
address@hidden
-->
<!-- Created on a sunny day by texi2html -->
@@ -1040,7 +1049,7 @@
@node Top
-This is a very simple texi manual.
+This is a very simple texi manual @ <>.
@bye
</pre>
@@ -1557,7 +1566,7 @@
@node Top
-This is a very simple texi manual.
+This is a very simple texi manual @ <>.
@bye
</pre>
Index: texi2html/Tests/formatting_res/simplest.html
diff -u texi2html/Tests/formatting_res/simplest.html:1.10
texi2html/Tests/formatting_res/simplest.html:1.11
--- texi2html/Tests/formatting_res/simplest.html:1.10 Mon Apr 17 23:11:11 2006
+++ texi2html/Tests/formatting_res/simplest.html Sun Apr 23 20:47:28 2006
@@ -56,7 +56,7 @@
<a name="Top"></a>
<h1 class="node"> Top </h1>
-<p>This is a very simple texi manual.
+<p>This is a very simple texi manual <>.
</p>
<hr size="1">
<p>
Index: texi2html/Tests/formatting_res/simplest.passfirst
diff -u texi2html/Tests/formatting_res/simplest.passfirst:1.3
texi2html/Tests/formatting_res/simplest.passfirst:1.4
--- texi2html/Tests/formatting_res/simplest.passfirst:1.3 Mon Apr 17
23:11:11 2006
+++ texi2html/Tests/formatting_res/simplest.passfirst Sun Apr 23 20:47:28 2006
@@ -3,6 +3,6 @@
simplest.texi(,4)
simplest.texi(,5) @node Top
simplest.texi(,6)
-simplest.texi(,7) This is a very simple texi manual.
+simplest.texi(,7) This is a very simple texi manual @ <>.
simplest.texi(,8)
simplest.texi(,9) @bye
Index: texi2html/Tests/formatting_res/simplest.passtexi
diff -u texi2html/Tests/formatting_res/simplest.passtexi:1.2
texi2html/Tests/formatting_res/simplest.passtexi:1.3
--- texi2html/Tests/formatting_res/simplest.passtexi:1.2 Mon Apr 17
23:11:11 2006
+++ texi2html/Tests/formatting_res/simplest.passtexi Sun Apr 23 20:47:28 2006
@@ -3,6 +3,6 @@
simplest.texi(,4)
simplest.texi(,5) @node Top
simplest.texi(,6)
-simplest.texi(,7) This is a very simple texi manual.
+simplest.texi(,7) This is a very simple texi manual @ <>.
simplest.texi(,8)
simplest.texi(,9) @bye
Index: texi2html/Tests/formatting_res/to_utf8_formatting.html
diff -u texi2html/Tests/formatting_res/to_utf8_formatting.html:1.6
texi2html/Tests/formatting_res/to_utf8_formatting.html:1.7
--- texi2html/Tests/formatting_res/to_utf8_formatting.html:1.6 Mon Apr 17
23:11:11 2006
+++ texi2html/Tests/formatting_res/to_utf8_formatting.html Sun Apr 23
20:47:28 2006
@@ -7,10 +7,10 @@
&
âsimple-doubleâthreeâfourâ-â
-code: ``simple-double--three---four----''
+code: ``simple-double-three-four-''
asis: âsimple-doubleâthreeâfourâ-â
strong: âsimple-doubleâthreeâfourâ-â
-kbd: ``simple-double--three---four----''
+kbd: ``simple-double-three-four-''
@"u ü
@@ -84,76 +84,76 @@
@TeX, but without brace TeX
address@hidden,an accronym @comma{} @enddots{}} âa
address@hidden âa
address@hidden âa
address@hidden âa
address@hidden âa
address@hidden --a
address@hidden --a
address@hidden âa
address@hidden âa
address@hidden âa
address@hidden,--b} âb
address@hidden,--b} âb
address@hidden --a
address@hidden âa
address@hidden --a
address@hidden --a
address@hidden âa
address@hidden --a
address@hidden âa
address@hidden âa
address@hidden --a
address@hidden âa
address@hidden --a
address@hidden âA
address@hidden âa
address@hidden âa
address@hidden âa
address@hidden --a
address@hidden,--b} --a,âb
address@hidden --a
address@hidden,--b} ,âb
address@hidden,--b} --a,âb
address@hidden,} --a,
address@hidden,--b} ,âb
address@hidden âa
address@hidden:--a:} --a
address@hidden âa
address@hidden,an accronym @comma{} @enddots{}} âa
address@hidden âa
address@hidden âa
address@hidden âa
address@hidden âa
address@hidden -a
address@hidden -a
address@hidden âa
address@hidden âa
address@hidden âa
address@hidden,-b} âb
address@hidden,-b} âb
address@hidden -a
address@hidden âa
address@hidden -a
address@hidden -a
address@hidden âa
address@hidden -a
address@hidden âa
address@hidden âa
address@hidden -a
address@hidden âa
address@hidden -a
address@hidden âA
address@hidden âa
address@hidden âa
address@hidden âa
address@hidden -a
address@hidden,-b} -a,âb
address@hidden -a
address@hidden,-b} ,âb
address@hidden,-b} -a,âb
address@hidden,} -a,
address@hidden,-b} ,âb
address@hidden âa
address@hidden:-a:} -a
address@hidden âa
@H{a} aÌ
address@hidden âaÌ
address@hidden âaÌ
@dotaccent{a} ȧ
address@hidden âȧ
address@hidden âȧ
@ringaccent{a} å
address@hidden âÃ¥
address@hidden âÃ¥
@tieaccent{a} a[
address@hidden âa[
address@hidden âa[
@u{a} Ä
address@hidden âÄ
address@hidden âÄ
@ubaraccent{a} a̲
address@hidden âa̲
address@hidden âa̲
@udotaccent{a} ạ
address@hidden âạ
address@hidden âạ
@v{a} Ç
address@hidden âÇ
address@hidden âÇ
@,{c} ç
-@,{--c} âç
address@hidden âa
+@,{-c} âç
address@hidden âa
@dotless{a} a
@footnote{in footnote}
@footnote{in footnote2}
address@hidden,,e--xt} f--ile
address@hidden,,,,e--xt} f--ile
address@hidden,,,alt} f--ile
address@hidden,aze,az,alt,e--xt} f--ile
address@hidden,aze,,a--lt} f-ile
address@hidden f--ile
address@hidden,,e--xt}
address@hidden,,,e--xt}
address@hidden,,e-xt} f-ile
address@hidden,,,,e-xt} f-ile
address@hidden,,,alt} f-ile
address@hidden,aze,az,alt,e-xt} f-ile
address@hidden,aze,,a-lt} f-ile
address@hidden f-ile
address@hidden,,e-xt}
address@hidden,,,e-xt}
@address@hidden:jk _" %@:},,,address@hidden:jk _" %@:}} address@hidden:jk _"
%@:}
address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f--ile}@@@.
address@hidden@file{f-ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f-ile}@@@.
a qâuotation
@@ -395,11 +395,11 @@
@inforef{,,file name}
@inforef{,cross ref name, file name}
address@hidden@comma{}ion, a @comma{} in cross
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@comma{}ion}
address@hidden@comma{}ion}
a
lâine
@@ -423,6 +423,15 @@
centered line
+\input texinfo @c -*-texinfo-*-
+
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @ <>.
+
address@hidden
-->
<!-- Created on a sunny day by texi2html -->
@@ -1040,7 +1049,7 @@
@node Top
-This is a very simple texi manual.
+This is a very simple texi manual @ <>.
@bye
</pre>
@@ -1557,7 +1566,7 @@
@node Top
-This is a very simple texi manual.
+This is a very simple texi manual @ <>.
@bye
</pre>
Index: texi2html/Tests/formatting_res/verbatim_html.2
diff -u texi2html/Tests/formatting_res/verbatim_html.2:1.12
texi2html/Tests/formatting_res/verbatim_html.2:1.13
--- texi2html/Tests/formatting_res/verbatim_html.2:1.12 Sat Jan 15 23:45:34 2005
+++ texi2html/Tests/formatting_res/verbatim_html.2 Sun Apr 23 20:47:28 2006
@@ -1,7 +1,7 @@
*** waiting for end of quotation, found @end cartouche (l. 23)
** closing `quotation' (l. 23)
** Waiting for @end deffn, found @end deftypefun (l. 27)
-** Waiting for @end table, found @end vtable (l. 32)
+** Waiting for @end table, found @end vtable (l. 32)
*** waiting for end of example, found @end display (l. 38)
** closing `example' (l. 38)
** closing `table' (l. 38)
Index: texi2html/Tests/formatting_res/weird_quotes_formatting.html
diff -u texi2html/Tests/formatting_res/weird_quotes_formatting.html:1.4
texi2html/Tests/formatting_res/weird_quotes_formatting.html:1.5
--- texi2html/Tests/formatting_res/weird_quotes_formatting.html:1.4 Mon Apr
17 23:11:11 2006
+++ texi2html/Tests/formatting_res/weird_quotes_formatting.html Sun Apr 23
20:47:28 2006
@@ -6,11 +6,11 @@
"
&
-"simple-double-three--four---"
-code: ``simple-double--three---four----''
-asis: "simple-double-three--four---"
-strong: "simple-double-three--four---"
-kbd: ``simple-double--three---four----''
+"simple-double-three-four-"
+code: ``simple-double-three-four-''
+asis: "simple-double-three-four-"
+strong: "simple-double-three-four-"
+kbd: ``simple-double-three-four-''
@"u u"
@@ -84,76 +84,76 @@
@TeX, but without brace TeX
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,--b} -b
address@hidden,--b} -b
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden -a
address@hidden --a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden --a
address@hidden,--b} --a,-b
address@hidden --a
address@hidden,--b} ,-b
address@hidden,--b} --a,-b
address@hidden,} --a,
address@hidden,--b} ,-b
address@hidden -a
address@hidden:--a:} --a
address@hidden -a
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -b
address@hidden,-b} -b
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -a,-b
address@hidden -a
address@hidden,-b} ,-b
address@hidden,-b} -a,-b
address@hidden,} -a,
address@hidden,-b} ,-b
address@hidden -a
address@hidden:-a:} -a
address@hidden -a
@H{a} a''
address@hidden -a''
address@hidden -a''
@dotaccent{a} a.
address@hidden -a.
address@hidden -a.
@ringaccent{a} a*
address@hidden -a*
address@hidden -a*
@tieaccent{a} a[
address@hidden -a[
address@hidden -a[
@u{a} a(
address@hidden -a(
address@hidden -a(
@ubaraccent{a} a_
address@hidden -a_
address@hidden -a_
@udotaccent{a} .a
address@hidden .-a
address@hidden .-a
@v{a} a<
address@hidden -a<
address@hidden -a<
@,{c} c,
-@,{--c} -c,
address@hidden -a
+@,{-c} -c,
address@hidden -a
@dotless{a} a
@footnote{in footnote}
@footnote{in footnote2}
address@hidden,,e--xt} f--ile
address@hidden,,,,e--xt} f--ile
address@hidden,,,alt} f--ile
address@hidden,aze,az,alt,e--xt} f--ile
address@hidden,aze,,a--lt} f-ile
address@hidden f--ile
address@hidden,,e--xt}
address@hidden,,,e--xt}
address@hidden,,e-xt} f-ile
address@hidden,,,,e-xt} f-ile
address@hidden,,,alt} f-ile
address@hidden,aze,az,alt,e-xt} f-ile
address@hidden,aze,,a-lt} f-ile
address@hidden f-ile
address@hidden,,e-xt}
address@hidden,,,e-xt}
@address@hidden:jk _" %@:},,,address@hidden:jk _" %@:}} address@hidden:jk _"
%@:}
address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f--ile}@@@.
address@hidden@file{f-ile}@@@.,aze,az,alt,@file{file ext} address@hidden
@file{f-ile}@@@.
a q-uotation
@@ -395,11 +395,11 @@
@inforef{,,file name}
@inforef{,cross ref name, file name}
address@hidden@comma{}ion, a @comma{} in cross
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@comma{}ion}
address@hidden@comma{}ion}
a
l-ine
@@ -423,6 +423,15 @@
centered line
+\input texinfo @c -*-texinfo-*-
+
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @ <>.
+
address@hidden
-->
<!-- Created on a sunny day by texi2html -->
@@ -1040,7 +1049,7 @@
@node Top
-This is a very simple texi manual.
+This is a very simple texi manual @ <>.
@bye
</pre>
@@ -1557,7 +1566,7 @@
@node Top
-This is a very simple texi manual.
+This is a very simple texi manual @ <>.
@bye
</pre>
Index: texi2html/Tests/test.sh
diff -u texi2html/Tests/test.sh:1.58 texi2html/Tests/test.sh:1.59
--- texi2html/Tests/test.sh:1.58 Mon Apr 17 23:11:09 2006
+++ texi2html/Tests/test.sh Sun Apr 23 20:47:27 2006
@@ -220,6 +220,7 @@
test_texi floats float.texi
#test_texi floats float.texi "-split chapter -node-files -top-file index.html"
0 texi float_node_files
test_texi floats float_with_at_commands.texi
+test_texi floats float_copying.texi "-split chapter -output ."
test_texi formatting clean.texi
test_texi formatting formatting.texi
test_texi formatting formatting.texi "-split section -nosec-nav -nonumber
-toc-links -def-table -short-ref -no-separated-footnotes -prefix
exotic_formatting -output ." 0 texi exotic_formatting
@@ -259,7 +260,10 @@
test_texi formatting html_not_closed.texi "" 1
test_texi formatting verbatim_not_closed.texi "" 1
test_texi formatting copying_not_closed.texi "" 1
+test_texi formatting node_in_copying.texi "" 1
+test_texi formatting tex_in_copying.texi "-l2h -expand tex"
test_texi formatting titlepage_not_closed.texi "" 1
+test_texi formatting footnote_not_closed.texi "" 1
test_texi formatting nested_ignore.texi
test_texi formatting test_refs.texi
test_texi formatting test_refs.texi "-prefix chapter_test_refs -split chapter
-output ." 0 texi chapter_test_refs
Index: texi2html/texi2html.init
diff -u texi2html/texi2html.init:1.103 texi2html/texi2html.init:1.104
--- texi2html/texi2html.init:1.103 Mon Apr 17 23:11:09 2006
+++ texi2html/texi2html.init Sun Apr 23 20:47:27 2006
@@ -12,7 +12,7 @@
# Afterwards, load the file with command-line
# option -init-file <your_init_file>
#
-# $Id: texi2html.init,v 1.103 2006/04/17 23:11:09 pertusus Exp $
+# $Id: texi2html.init,v 1.104 2006/04/23 20:47:27 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -3133,9 +3133,10 @@
$cell = \&t2h_default_cell;
$list_item = \&t2h_default_list_item;
$comment = \&t2h_default_comment;
-$def_line = \&t2h_default_def_line;
+$def_line = \&t2h_default_def_line;
$def_line_no_texi = \&t2h_default_def_line_no_texi;
$raw = \&t2h_default_raw;
+$raw_no_texi = \&t2h_default_raw_no_texi;
$heading = \&t2h_default_heading;
$paragraph = \&t2h_default_paragraph;
$preformatted = \&t2h_default_preformatted;
@@ -4052,10 +4053,7 @@
sub t2h_default_comment($)
{
my $text = shift;
- while ($text =~ /-->/) # --> ends an html comment !
- {
- $text =~ s/-->/->/go;
- }
+ $text =~ s/--+/-/go;
return '<!-- ' . $text . ' -->' . "\n";
}
@@ -4177,7 +4175,7 @@
}
# formatting of raw regions
-# ih L2H is true another mechanism is used for tex
+# if L2H is true another mechanism is used for tex
sub t2h_default_raw($$)
{
my $style = shift;
@@ -4197,6 +4195,14 @@
}
}
+# raw environment when removing texi (in comments)
+sub t2h_default_raw_no_texi($$)
+{
+ my $style = shift;
+ my $text = shift;
+ return $text;
+}
+
# This function formats a footnote reference and the footnote text associated
# with a given footnote.
# The footnote reference is the text appearing in the main document pointing
Index: texi2html/texi2html.pl
diff -u texi2html/texi2html.pl:1.165 texi2html/texi2html.pl:1.166
--- texi2html/texi2html.pl:1.165 Mon Apr 17 23:11:09 2006
+++ texi2html/texi2html.pl Sun Apr 23 20:47:27 2006
@@ -59,7 +59,7 @@
#--##########################################################################
# CVS version:
-# $Id: texi2html.pl,v 1.165 2006/04/17 23:11:09 pertusus Exp $
+# $Id: texi2html.pl,v 1.166 2006/04/23 20:47:27 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -376,6 +376,7 @@
$def_line
$def_line_no_texi
$raw
+$raw_no_texi
$heading
$paragraph
$preformatted
@@ -1251,7 +1252,7 @@
'direntry' => 0,
'verbatim' => 'raw',
'ifclear' => 'value',
- 'ifset' => 'value'
+ 'ifset' => 'value' ,
);
foreach my $key (keys(%text_macros))
@@ -3354,12 +3355,11 @@
#
# analyze the tag
#
- if ($tag and $tag eq 'node' or defined($sec2level{$tag}) or $tag
eq 'printindex' or $tag eq 'float')
+ if ($tag and $tag eq 'node' or defined($sec2level{$tag}) or $tag
eq 'printindex')
{
$_ = substitute_texi_line($_);
- if (@stack and $tag eq 'node' or defined($sec2level{$tag}) or
-$tag eq 'float')
- {# in pass structure node and float shouldn't appear in formats
+ if ($tag eq 'node' or defined($sec2level{$tag}))
+ {# in pass structure node shouldn't appear in formats
close_stack_texi_structure(\$text, address@hidden, $state,
$line_nr);
if (exists($state->{'region_lines'}))
{
@@ -3546,49 +3546,6 @@
}
}
}
- elsif ($tag eq 'float')
- {
- my ($style_texi, $label_texi) = split(/,/, $_);
- $style_texi =~ s/address@hidden//;
- $style_texi = normalise_space($style_texi);
- $label_texi = undef if (defined($label_texi) and
($label_texi =~ /^\s*$/));
- if (defined($label_texi))
- { # The float may be a target for refs if it has a label
- $label_texi = normalise_node($label_texi);
- if (exists($nodes{$label_texi}) and
defined($nodes{$label_texi})
- and $nodes{$label_texi}->{'seen'})
- {
- echo_error ("Duplicate label found: $label_texi",
$line_nr);
- while ($_ =~ /,/)
- {
- $_ =~ s/,.*$//;
- }
- }
- else
- {
- my $float = { };
- if (exists($nodes{$label_texi}) and
defined($nodes{$label_texi}))
- { # float appeared in a menu
- $float = $nodes{$label_texi};
- }
- else
- {
- $nodes{$label_texi} = $float;
- }
- $float->{'float'} = 1;
- $float->{'tag'} = 'float';
- $float->{'texi'} = $label_texi;
- $float->{'seen'} = 1;
- $float->{'id'} = $label_texi;
-#print STDERR "FLOAT: $float $float->{'texi'}, place $state->{'place'}\n";
- push @{$state->{'place'}}, $float;
- $float->{'element'} = $state->{'element'};
- $state->{'float'} = $float;
- $float->{'style_texi'} = $style_texi;
- push @floats, $float;
- }
- }
- }
elsif (/address@hidden(\w+)/)
{
unless (@elements_list)
@@ -3918,6 +3875,14 @@
$arg =~ s/^\s+//;
$Texi2HTML::THISDOC{$macro} = $arg;
}
+ elsif ($macro eq 'need')
+ {
+ unless (($line =~ /^\s+([0-9]+(\.[0-9]*)?)[^\w\-]/) or
+ ($line =~ /^\s+(\.[0-9]+)[^\w\-]/))
+ {
+ echo_warn ("Bad address@hidden", $line_nr);
+ }
+ }
($text, $line, $args) = preserve_command($line, $macro);
return ($text, $line);
@@ -3959,7 +3924,10 @@
echo_error ("address@hidden needs a numeric arg or no arg",
$line_nr);
}
$sp_number = 1 if ($sp_number eq '');
- add_prev($text, $stack, &$Texi2HTML::Config::sp($sp_number,
$state->{'preformatted'}));
+ if (!$state->{'remove_texi'})
+ {
+ add_prev($text, $stack, &$Texi2HTML::Config::sp($sp_number,
$state->{'preformatted'}));
+ }
}
elsif($macro eq 'verbatiminclude' and !$keep)
{
@@ -3980,7 +3948,15 @@
{
$verb_text .= $line;
}
- add_prev($text, $stack,
&$Texi2HTML::Config::raw('verbatim',$verb_text));
+
+ if ($state->{'remove_texi'})
+ {
+ add_prev ($text, $stack,
&$Texi2HTML::Config::raw_no_texi('verbatim', $verb_text));
+ }
+ else
+ {
+ add_prev($text, $stack,
&$Texi2HTML::Config::raw('verbatim', $verb_text));
+ }
close VERBINCLUDE;
}
}
@@ -3994,14 +3970,6 @@
echo_error ("Bad address@hidden line: $_", $line_nr);
}
}
- elsif ($macro eq 'need')
- {
- unless (($line =~ /^\s+([0-9]+(\.[0-9]*)?)[^\w\-]/) or
- ($line =~ /^\s+(\.[0-9]+)[^\w\-]/))
- {
- echo_warn ("Bad address@hidden", $line_nr);
- }
- }
elsif ($macro eq 'indent' or $macro eq 'noindent')
{
$state->{'paragraph_indent'} = $macro;
@@ -7466,7 +7434,7 @@
{
if (!defined($state->{'float'}))
{
- echo_warn ("Waiting for address@hidden $format_ref->{'format'},
found address@hidden $format", $line_nr);
+ echo_warn ("Waiting for address@hidden $format_ref->{'format'},
found address@hidden $format ", $line_nr);
}
else
{
@@ -7501,7 +7469,7 @@
#dump_stack($text, $stack, $state);
if ($format_ref->{'format'} ne $format)
{
- echo_warn ("Waiting for address@hidden $format_ref->{'format'},
found address@hidden $format", $line_nr);
+ echo_warn ("Waiting for address@hidden $format_ref->{'format'},
found address@hidden $format ", $line_nr);
}
if ($Texi2HTML::Config::format_map{$format})
{ # table or list has a simple format
@@ -7542,7 +7510,7 @@
{
if ($format_ref->{'format'} ne $format)
{ # FIXME hasn't that case been handled before ?
- echo_warn ("Waiting for address@hidden $format_ref->{'format'},
found address@hidden $format", $line_nr);
+ echo_warn ("Waiting for address@hidden $format_ref->{'format'},
found address@hidden $format ", $line_nr);
}
add_prev($text, $stack, end_simple_format($format_ref->{'format'},
$format_ref->{'text'}));
}
@@ -8124,7 +8092,8 @@
'code_style' => $state->{'code_style'},
'keep_texi' => $state->{'keep_texi'},
'keep_nr' => $state->{'keep_nr'},
- 'preformatted_stack' => $state->{'preformatted_stack'}
+ 'preformatted_stack' => $state->{'preformatted_stack'},
+ 'multiple_pass' => $state->{'multiple_pass'}
};
return $new_state;
}
@@ -9131,7 +9100,7 @@
while(1)
{
# scan structure
- #print STDERR "WHILE\n";
+ #print STDERR "WHILE (s):$_";
#dump_stack($text, $stack, $state);
# as texinfo 4.5
@@ -9229,6 +9198,7 @@
{
add_prev($text, $stack, $1);
my $end_tag = $2;
+ #print STDERR "END STRUCTURE $end_tag\n";
$state->{'detailmenu'}-- if ($end_tag eq 'detailmenu' and
$state->{'detailmenu'});
if (defined($state->{'text_macro_stack'})
and @{$state->{'text_macro_stack'}}
@@ -9356,6 +9326,50 @@
#dump_stack ($text, $stack, $state);
return if (/^\s*$/);
}
+ elsif ($macro eq 'float')
+ {
+ my ($style_texi, $label_texi) = split(/,/, $_);
+ $style_texi = normalise_space($style_texi);
+ $label_texi = undef if (defined($label_texi) and ($label_texi
=~ /^\s*$/));
+ if (defined($label_texi))
+ { # The float may be a target for refs if it has a label
+ $label_texi = normalise_node($label_texi);
+ if (exists($nodes{$label_texi}) and
defined($nodes{$label_texi})
+ and $nodes{$label_texi}->{'seen'})
+ {
+ echo_error ("Duplicate label found: $label_texi",
$line_nr);
+ while ($_ =~ /,/)
+ {
+ $_ =~ s/,.*$//;
+ }
+ }
+ else
+ {
+ my $float = { };
+ if (exists($nodes{$label_texi}) and
defined($nodes{$label_texi}))
+ { # float appeared in a menu
+ $float = $nodes{$label_texi};
+ }
+ else
+ {
+ $nodes{$label_texi} = $float;
+ }
+ $float->{'float'} = 1;
+ $float->{'tag'} = 'float';
+ $float->{'texi'} = $label_texi;
+ $float->{'seen'} = 1;
+ $float->{'id'} = $label_texi;
+#print STDERR "FLOAT: $float $float->{'texi'}, place $state->{'place'}\n";
+ push @{$state->{'place'}}, $float;
+ $float->{'element'} = $state->{'element'};
+ $state->{'float'} = $float;
+ $float->{'style_texi'} = $style_texi;
+ push @floats, $float;
+ }
+ }
+ add_prev($text, $stack, "address@hidden" . $_);
+ last;
+ }
elsif (defined($Texi2HTML::Config::def_map{$macro}))
{
#We must enter the index entries
@@ -9694,13 +9708,13 @@
my $style = pop @$stack;
if ($style->{'text'} !~ /^\s*$/)
{
- if ($state->{'remove_texi'})
+ if ($state->{'keep_texi'})
{
- add_prev ($text, $stack, $style->{'text'});
+ add_prev ($text, $stack, $style->{'text'} .
"address@hidden $state->{'raw'}");
}
- elsif ($state->{'keep_texi'})
+ elsif ($state->{'remove_texi'})
{
- add_prev ($text, $stack, $style->{'text'} .
"address@hidden $state->{'raw'}");
+ add_prev ($text, $stack,
&$Texi2HTML::Config::raw_no_texi($style->{'style'}, $style->{'text'}));
}
else
{
@@ -9940,18 +9954,12 @@
# @item we don't want to keep @c or @comment as otherwise it
# eats the @item line. Other commands could do that too but
# then the user deserves what he gets.
- if (
- ($state->{'keep_texi'} and
+ if ($state->{'keep_texi'} and
(!$state->{'check_item'} or ($macro ne 'c' and
$macro ne 'comment')))
- or $state->{'remove_texi'}
- )
{
my ($line, $args);
($_, $line, $args) = preserve_command($_, $macro);
- if ($state->{'keep_texi'})
- {
- add_prev($text, $stack, "address@hidden". $line);
- }
+ add_prev($text, $stack, "address@hidden". $line);
next;
}
@@ -11206,6 +11214,7 @@
return undef unless (@$stack or $state->{'raw'} or $state->{'macro'} or
$state->{'macro_name'} or $state->{'ignored'});
+ #print STDERR "close_stack_texi_structure\n";
#dump_stack ($text, $stack, $state);
my $stack_level = $#$stack + 1;
my $string = '';
@@ -11576,6 +11585,14 @@
}
print STDERR "\n";
}
+ if (defined($state->{'region_lines'}))
+ {
+ print STDERR "region_lines($state->{'region_lines'}->{'number'}):
$state->{'region_lines'}->{'format'}\n";
+ }
+ if (defined($state->{'text_macro_stack'}) and
@{$state->{'text_macro_stack'}})
+ {
+ print STDERR "text_macro_stack: (@{$state->{'text_macro_stack'}})\n";
+ }
}
# for debugging
@@ -11682,6 +11699,7 @@
{
my $text = shift;
return $text if $text =~ /^\s*$/;
+ #print STDERR "substitute_texi_line $text\n";
my @text = substitute_text({'structure' => 1}, $text);
my @result = ();
while (@text)
@@ -11890,6 +11908,13 @@
rearrange_elements();
do_names();
+
+#Texi2HTML::LaTeX2HTML::latex2html();
+foreach my $handler(@Texi2HTML::Config::command_handler_process)
+{
+ &$handler;
+}
+
if (@{$region_lines{'documentdescription'}} and
(!defined($Texi2HTML::Config::DOCUMENT_DESCRIPTION)))
{
my $documentdescription =
remove_texi(@{$region_lines{'documentdescription'}});
@@ -11910,11 +11935,6 @@
&$Texi2HTML::Config::toc_body(address@hidden);
$sec_num = 0;
-#Texi2HTML::LaTeX2HTML::latex2html();
-foreach my $handler(@Texi2HTML::Config::command_handler_process)
-{
- &$handler;
-}
&$Texi2HTML::Config::css_lines(address@hidden, address@hidden);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ./ChangeLog ./T2h_l2h.pm ./TODO ./tex...,
Patrice Dumas <=