[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog NEWS TODO texi2html.init te...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog NEWS TODO texi2html.init te... |
|
Date: |
Sun, 09 Sep 2007 20:19:13 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 07/09/09 20:19:13
Modified files:
. : ChangeLog NEWS TODO texi2html.init texi2html.pl
Tests : Makefile.am Makefile.in test.sh
Tests/formatting: tex.texi
Tests/formatting_res: tex.html tex.passfirst tex.passtexi
doc : texi2html.html
examples : tex4ht.init
Added files:
Tests/formatting: indicateurl_paragraph.texi
Tests/formatting_res: indicateurl_paragraph.2
indicateurl_paragraph.html
indicateurl_paragraph.passfirst
indicateurl_paragraph.passtexi tex_nol2h.2
tex_nol2h.html tex_nol2h.passfirst
tex_nol2h.passtexi
Tests/tex_httex_res: tex.html tex.passfirst tex.passtexi
tex_tex4ht_math.html tex_tex4ht_tex.html
Log message:
* texi2html.pl, texi2html.init: handle @\ and matching { } in
@math.
fix simple_style to be really used (typos in texi2html.init).
* examples/tex4ht.init: use httexi to handle @math, since
texinfo
@-commands are allowed in @math, and httex for @tex.
* Tests/*: add test for simple_style with a paragraph within.
more tests for @math.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.266&r2=1.267
http://cvs.savannah.gnu.org/viewcvs/texi2html/NEWS?cvsroot=texi2html&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.117&r2=1.118
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.183&r2=1.184
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/Makefile.am?cvsroot=texi2html&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/Makefile.in?cvsroot=texi2html&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/test.sh?cvsroot=texi2html&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting/tex.texi?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting/indicateurl_paragraph.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/tex.html?cvsroot=texi2html&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/tex.passfirst?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/tex.passtexi?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/indicateurl_paragraph.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/indicateurl_paragraph.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/indicateurl_paragraph.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/indicateurl_paragraph.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/tex_nol2h.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/tex_nol2h.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/tex_nol2h.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/tex_nol2h.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/tex_httex_res/tex.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/tex_httex_res/tex.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/tex_httex_res/tex.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/tex_httex_res/tex_tex4ht_math.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/tex_httex_res/tex_tex4ht_tex.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/texi2html.html?cvsroot=texi2html&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/tex4ht.init?cvsroot=texi2html&r1=1.2&r2=1.3
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -b -r1.266 -r1.267
--- ChangeLog 21 Aug 2007 17:02:03 -0000 1.266
+++ ChangeLog 9 Sep 2007 20:19:08 -0000 1.267
@@ -1,3 +1,12 @@
+2007-09-09 Patrice Dumas <address@hidden>
+
+ * texi2html.pl, texi2html.init: handle @\ and matching { } in @math.
+ fix simple_style to be really used (typos in texi2html.init).
+ * examples/tex4ht.init: use httexi to handle @math, since texinfo
+ @-commands are allowed in @math, and httex for @tex.
+ * Tests/*: add test for simple_style with a paragraph within.
+ more tests for @math.
+
2007-08-21 Patrice Dumas <address@hidden>
* texi2html.pl: handle @, command without brace like @,c.
Index: NEWS
===================================================================
RCS file: /cvsroot/texi2html/texi2html/NEWS,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- NEWS 21 Aug 2007 17:02:03 -0000 1.62
+++ NEWS 9 Sep 2007 20:19:08 -0000 1.63
@@ -8,12 +8,20 @@
* COMPATIBILITY
-------------
+* tex4ht.init now may use a different external program for @tex and for
+ @math, and therefore the configuration variables were doubled and
+ their name changed.
+
* BUG FIXES
---------
* @, followed by an argument without brace is now handled. Report from
Jorge Barros de Abreu.
+* @math is more compatible with makeinfo/texi2dvi when no external program
+ is used. Using tex4ht for html generation should also lead to a correct
+ result.
+
1.78 (2007-06-05)
* NEW FEATURES
Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- TODO 6 May 2007 12:57:06 -0000 1.34
+++ TODO 9 Sep 2007 20:19:08 -0000 1.35
@@ -112,3 +112,8 @@
not the associated node where the @cindex are. Good or bad?
* implement @alias
+
+* document the 'math' in 'args', in style_map, and simple_*math*. It
+ could also be more flexible and similar with other environments, that
+ is not only add a fixed key, but duplicate all the keys and add one.
+ Documentation should only done once the interface is stable.
Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- texi2html.init 21 Aug 2007 17:02:03 -0000 1.117
+++ texi2html.init 9 Sep 2007 20:19:08 -0000 1.118
@@ -12,7 +12,7 @@
# Afterwards, load the file with command-line
# option -init-file <your_init_file>
#
-# $Id: texi2html.init,v 1.117 2007/08/21 17:02:03 pertusus Exp $
+# $Id: texi2html.init,v 1.118 2007/09/09 20:19:08 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -1709,6 +1709,14 @@
%simple_map_pre = %simple_map;
$simple_map_pre{'*'} = "\n";
+# maps for the math specific commands
+%simple_map_math = (
+ '\\', '\\'
+ );
+
+%simple_map_pre_math = %simple_map_math;
+%simple_map_texi_math = %simple_map_math;
+
#
# texinfo "things" (@foo{}) to HTML ones
#
@@ -2080,12 +2088,12 @@
'cite', {'attribute' => 'cite'},
'code', {'args' => ['code'], 'attribute' => 'code'},
'command', {'args' => ['code'], 'attribute' => 'code'},
- 'ctrl', {'function' => \&t2h_default_ctrl,'type' =>
'simple_type'},
+ 'ctrl', {'function' => \&t2h_default_ctrl,'type' =>
'simple_style'},
'dfn', {'attribute' => 'em'},
'dmn', {},
'email', {'args' => ['code', 'normal'],
'function' => \&t2h_default_email,
- 'type' => 'simple_type'},
+ 'type' => 'simple_style'},
#'email', {'args' => ['normal', 'normal'],
# 'function' => \&t2h_default_email},
'emph', {'attribute' => 'em'},
@@ -2096,7 +2104,7 @@
'sansserif', {'attribute' => 'span class="sansserif"'},
'kbd', {'args' => ['code'], 'attribute' => 'kbd'},
'key', {'begin' => '<', 'end' => '>'},
- 'math', {'attribute' => 'em'},
+ 'math', {'function' => \&t2h_default_math, 'args' => ['math'] },
'option', {'args' => ['code'], 'attribute' => 'samp', 'quote' =>
'"'},
'r', {'attribute' => 'span class="roman"'},
'samp', {'args' => ['code'], 'attribute' => 'samp', 'quote' =>
'"'},
@@ -2106,18 +2114,18 @@
't', {'attribute' => 'tt'},
'uref', {'function' => \&t2h_default_uref,
'args' => ['code', 'normal', 'normal'],
- 'type' => 'simple_type' },
+ 'type' => 'simple_style' },
#'uref', {'function' => \&t2h_default_uref,
# 'args' => ['normal', 'normal', 'normal']},
'url', {'function' => \&t2h_default_uref,
'args' => ['code', 'normal', 'normal'],
- 'type' => 'simple_type'},
- 'indicateurl', {'args' => ['code'], 'begin' => '<<code>', 'end' =>
'</code>>','type' => 'simple_type'},
+ 'type' => 'simple_style'},
+ 'indicateurl', {'args' => ['code'], 'begin' => '<<code>', 'end' =>
'</code>>','type' => 'simple_style'},
'var', {'attribute' => 'var'},
'verb', {'args' => ['code'], 'attribute' => 'tt'},
'titlefont', {'function' => \&t2h_default_titlefont,
- 'type' => 'simple_type'},
- 'w', {'type' => 'simple_type'},
+ 'type' => 'simple_style'},
+ 'w', {'type' => 'simple_style'},
);
%command_type = ();
@@ -2678,6 +2686,17 @@
return &$anchor('', $url, $text);
}
+sub t2h_default_math($$)
+{
+ shift;
+ my $args = shift;
+ my $text = shift @$args;
+#print STDERR "t2h_default_math $text\n";
+ $text =~ s/[{}]//g;
+# $text =~ s/address@hidden/\\/g;
+ return "<em>$text</em>";
+}
+
sub default_email($$)
{
my $arg = shift;
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -b -r1.183 -r1.184
--- texi2html.pl 21 Aug 2007 17:02:03 -0000 1.183
+++ texi2html.pl 9 Sep 2007 20:19:08 -0000 1.184
@@ -59,7 +59,7 @@
#--##########################################################################
# CVS version:
-# $Id: texi2html.pl,v 1.183 2007/08/21 17:02:03 pertusus Exp $
+# $Id: texi2html.pl,v 1.184 2007/09/09 20:19:08 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -436,6 +436,9 @@
%simple_map
%simple_map_pre
%simple_map_texi
+%simple_map_math
+%simple_map_pre_math
+%simple_map_texi_math
%style_map
%style_map_pre
%style_map_texi
@@ -5809,6 +5812,7 @@
my $state = shift;
$state->{'preformatted'} = 0 unless exists($state->{'preformatted'});
$state->{'code_style'} = 0 unless exists($state->{'code_style'});
+ $state->{'math_style'} = 0 unless exists($state->{'math_style'});
$state->{'keep_texi'} = 0 unless exists($state->{'keep_texi'});
$state->{'keep_nr'} = 0 unless exists($state->{'keep_nr'});
$state->{'detailmenu'} = 0 unless exists($state->{'detailmenu'}); #
number of opened detailed menus
@@ -6792,7 +6796,7 @@
{
my $line = shift;
# macro_regexp
- if ($line =~ /^\s*\@(["'address@hidden,\.!\?\s\*\-\^`=:\|\/])/o or $line
=~ /^\s*\@([a-zA-Z][\w-]*)(address@hidden)/ or $line =~
/^\s*\@([a-zA-Z][\w-]*)$/)
+ if ($line =~ /^\s*\@(["'address@hidden,\.!\?\s\*\-\^`=:\|\/\\])/o or $line
=~ /^\s*\@([a-zA-Z][\w-]*)(address@hidden)/ or $line =~
/^\s*\@([a-zA-Z][\w-]*)$/)
{
return ($1);
}
@@ -8726,7 +8730,7 @@
next;
}
# macro_regexp
- elsif
(s/^(address@hidden)\@(["'address@hidden,\.!\?\s\*\-\^`=:\|\/])//o or
s/^(address@hidden)\@([a-zA-Z][\w-]*)(address@hidden)/$3/o or
s/^(address@hidden)\@([a-zA-Z][\w-]*)$//o)
+ elsif
(s/^(address@hidden)\@(["'address@hidden,\.!\?\s\*\-\^`=:\|\/\\])//o or
s/^(address@hidden)\@([a-zA-Z][\w-]*)(address@hidden)/$3/o or
s/^(address@hidden)\@([a-zA-Z][\w-]*)$//o)
{# ARG_EXPANSION
add_prev($text, $stack, $1) unless $state->{'ignored'};
my $macro = $2;
@@ -9034,7 +9038,7 @@
# macro character, like , is.
# So, for example @address@hidden would be very wrong while
# @,@ is less problematic.
- # A side efefct of that special handling is that strange
+ # A side effect of that special handling is that strange
# use of @, will not result in the same result than strange
# use of other accent commands.
if (s/^(.)//)
@@ -9389,7 +9393,7 @@
}
#elsif
(s/^(address@hidden)\@([a-zA-Z]\w*|["'address@hidden,\.!\?\s\*\-\^`=:\/])//o)
# macro_regexp
- elsif
(s/^(address@hidden)\@(["'address@hidden,\.!\?\s\*\-\^`=:\|\/])//o or
s/^(address@hidden)\@([a-zA-Z][\w-]*)(address@hidden)/$3/o or
s/^(address@hidden)\@([a-zA-Z][\w-]*)$//o)
+ elsif
(s/^(address@hidden)\@(["'address@hidden,\.!\?\s\*\-\^`=:\|\/\\])//o or
s/^(address@hidden)\@([a-zA-Z][\w-]*)(address@hidden)/$3/o or
s/^(address@hidden)\@([a-zA-Z][\w-]*)$//o)
{
add_prev($text, $stack, $1);
my $macro = $2;
@@ -10012,7 +10016,7 @@
# This is a macro
#elsif
(s/^(address@hidden)\@([a-zA-Z]\w*|["'address@hidden,\.!\?\s\*\-\^`=:\/])//o)
# macro_regexp
- elsif (s/^([^{},@]*)\@(["'address@hidden,\.!\?\s\*\-\^`=:\|\/])//o or
s/^([^{}@,]*)\@([a-zA-Z][\w-]*)(address@hidden)/$3/o or
s/^([^{},@]*)\@([a-zA-Z][\w-]*)$//o)
+ elsif (s/^([^{},@]*)\@(["'address@hidden,\.!\?\s\*\-\^`=:\|\/\\])//o
or s/^([^{}@,]*)\@([a-zA-Z][\w-]*)(address@hidden)/$3/o or
s/^([^{},@]*)\@([a-zA-Z][\w-]*)$//o)
{
add_prev($text, $stack, do_text($1, $state));
my $macro = $2;
@@ -10609,21 +10613,35 @@
if (defined($brace) and ($brace eq '{'))
{
add_prev($text, $stack, do_text('{',$state));
+ if ($state->{'math_style'})
+ {
+ $state->{'math_brace'}++;
+ }
+ else
+ {
unless ($state->{'keep_texi'} or $state->{'remove_texi'})
{
echo_error ("'{' without macro. Before: $_", $line_nr);
}
}
+ }
elsif (defined($brace) and ($brace eq '}') and
(address@hidden or (!defined($stack->[-1]->{'style'}))
# a non empty stack, but with 'cmd_line' as first item on the stack
# is like an empty stack
- or ($stack->[-1]->{'style'} eq 'cmd_line')))
+ or ($stack->[-1]->{'style'} eq 'cmd_line'))
+ # braces are allowed in math
+ or $state->{'math_brace'})
{
if ($state->{'keep_texi'})
{
add_prev($text, $stack, '}');
}
+ elsif($state->{'math_style'} and $state->{'math_brace'})
+ {
+ add_prev($text, $stack, do_text('}',$state));
+ $state->{'math_brace'}--;
+ }
else
{
echo_error("'}' without opening '{' before: $_", $line_nr);
@@ -10678,6 +10696,10 @@
{
echo_error ("Bug: negative code_style:
$state->{'code_style'}, line:$_", $line_nr);
}
+ if ($state->{'math_style'} < 0)
+ {
+ echo_error ("Bug: negative math_style:
$state->{'math_style'}, line:$_", $line_nr);
+ }
}
}
else
@@ -10787,14 +10809,29 @@
if (ref($::style_map_ref->{$macro}) eq 'HASH')
{
my $arg = $::style_map_ref->{$macro}->{'args'}->[$arg_nr];
- if ($arg eq 'code' and !$state->{'keep_texi'})
+ if ($arg eq 'keep')
+ {
+ $state->{'keep_nr'}++;
+ $state->{'keep_texi'} = 1;
+ }
+ elsif (!$state->{'keep_texi'})
+ {
+ if ($arg eq 'code')
{
$state->{'code_style'}++;
}
- elsif ($arg eq 'keep')
+ elsif ($arg eq 'math')
{
- $state->{'keep_nr'}++;
- $state->{'keep_texi'} = 1;
+ $state->{'math_style'}++;
+ if ($state->{'math_style'} == 1)
+ {
+ $state->{'math_brace'} = 0;
+ # FIXME quick hack to define @\ in @math
+ $::simple_map_ref->{'\\'} =
$Texi2HTML::Config::simple_map_math{'\\'};
+ $::simple_map_pre_ref->{'\\'} =
$Texi2HTML::Config::simple_map_pre_math{'\\'};
+ $::simple_map_texi_ref->{'\\'} =
$Texi2HTML::Config::simple_map_texi_math{'\\'};
+ }
+ }
}
}
elsif ($code_style_map{$macro} and !$state->{'keep_texi'})
@@ -10811,14 +10848,27 @@
if (ref($::style_map_ref->{$macro}) eq 'HASH')
{
my $arg = $::style_map_ref->{$macro}->{'args'}->[$arg_nr];
- if ($arg eq 'code' and !$state->{'keep_texi'})
+ if ($arg eq 'keep')
+ {
+ $state->{'keep_nr'}--;
+ $state->{'keep_texi'} = 0 if ($state->{'keep_nr'} == 0);
+ }
+ elsif (!$state->{'keep_texi'})
+ {
+ if ($arg eq 'code')
{
$state->{'code_style'}--;
}
- elsif ($arg eq 'keep')
+ elsif ($arg eq 'math')
{
- $state->{'keep_nr'}--;
- $state->{'keep_texi'} = 0 if ($state->{'keep_nr'} == 0);
+ $state->{'math_style'}--;
+ if ($state->{'math_style'} == 0)
+ {
+ delete $::simple_map_ref->{'\\'};
+ delete $::simple_map_pre_ref->{'\\'};
+ delete $::simple_map_texi_ref->{'\\'};
+ }
+ }
}
#print STDERR "c $arg_nr $macro $arg $state->{'code_style'}\n";
}
Index: Tests/Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- Tests/Makefile.am 7 May 2007 22:56:02 -0000 1.22
+++ Tests/Makefile.am 9 Sep 2007 20:19:09 -0000 1.23
@@ -5,7 +5,7 @@
node_utf8_translit_no_unidecode index_split_nodes \
more_before_top_section node_footnote node_in_chapter_index_split \
index_nodes tar htmlxref htmlxref-only_mono htmlxref-only_split \
- contents contents_book contents_inline
+ contents contents_book contents_inline tex_httex
#check-local:
@@ -16,7 +16,8 @@
[ -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 \
- formatting_res/tex_in_copying.2 formatting_res/math_not_closed.2
+ formatting_res/tex_in_copying.2 formatting_res/math_not_closed.2 \
+ tex_httex_res/tex.2
-rm -f singular_res/*_l2h.html singular_res/sing.2
clean-local:
Index: Tests/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/Makefile.in,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- Tests/Makefile.in 21 Aug 2007 17:02:04 -0000 1.44
+++ Tests/Makefile.in 9 Sep 2007 20:19:09 -0000 1.45
@@ -134,7 +134,7 @@
node_utf8_translit_no_unidecode index_split_nodes \
more_before_top_section node_footnote node_in_chapter_index_split \
index_nodes tar htmlxref htmlxref-only_mono htmlxref-only_split \
- contents contents_book contents_inline
+ contents contents_book contents_inline tex_httex
all: all-am
@@ -305,7 +305,8 @@
[ -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 \
- formatting_res/tex_in_copying.2 formatting_res/math_not_closed.2
+ formatting_res/tex_in_copying.2 formatting_res/math_not_closed.2 \
+ tex_httex_res/tex.2
-rm -f singular_res/*_l2h.html singular_res/sing.2
clean-local:
Index: Tests/test.sh
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/test.sh,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- Tests/test.sh 7 May 2007 22:56:02 -0000 1.67
+++ Tests/test.sh 9 Sep 2007 20:19:09 -0000 1.68
@@ -254,10 +254,12 @@
test_texi formatting center.texi
test_texi formatting tables.texi
test_texi formatting tex.texi "-l2h -expand tex" "no"
+test_texi formatting tex.texi "-prefix tex_nol2h" 0 texi tex_nol2h
test_texi formatting formats_in_menu.texi
test_texi formatting comments.texi
test_texi formatting comments.texi "-init redefine_need.init -prefix
comments_redefined" 0 texi comments_redefined
test_texi formatting equivalent_nodes.texi "" 5
+test_texi formatting indicateurl_paragraph.texi
test_texi formatting bad_nesting.texi
test_texi formatting formats_not_closed.texi "" 12
test_texi formatting commands_not_closed.texi "" 4
@@ -281,6 +283,8 @@
test_texi formatting test_refs.texi "-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 tex_httex ../formatting/tex.texi "-init ../../examples/tex4ht.init
--iftex"
+
test_texi contents contents_at_begin.texi
test_texi contents contents_at_end.texi
test_texi contents contents_in_middle_chapter.texi
Index: Tests/formatting/tex.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/formatting/tex.texi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Tests/formatting/tex.texi 8 Aug 2003 14:26:54 -0000 1.2
+++ Tests/formatting/tex.texi 9 Sep 2007 20:19:09 -0000 1.3
@@ -24,6 +24,21 @@
Same that @@html (but empty following line not ignored).
Test of @@math
-Here some @math{\frac{x^i}{\tan y}}.
+Here some @math{{x^i}\over{\tan y}}.
+
+Maths with protected \:
address@hidden @\ b}.
+
+Maths with code @@-command:
+
address@hidden@code{math code}}
+
+Maths with code @@-command and braces:
+
address@hidden address@hidden \hbox{ code }}} \sum_{i}{\underline{f}}}
+
+@@\ outside of math
+
address@hidden
@bye
Index: Tests/formatting_res/tex.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/formatting_res/tex.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- Tests/formatting_res/tex.html 21 Aug 2007 17:02:07 -0000 1.29
+++ Tests/formatting_res/tex.html 9 Sep 2007 20:19:11 -0000 1.30
@@ -79,12 +79,42 @@
</p>
<p>Test of @math
Here some <!-- MATH
- $\frac{x^i}{\tan y}$
+ ${x^i}\over{\tan y}$
-->
<SPAN CLASS="MATH"><IMG
WIDTH="36" HEIGHT="41" ALIGN="MIDDLE" BORDER="0"
SRC="tex_2.png"
- ALT="$\frac{x^i}{\tan y}$"></SPAN>.
+ ALT="${x^i}\over{\tan y}$"></SPAN>.
+</p>
+<p>Maths with protected \:
+<SPAN CLASS="MATH"><IMG
+ WIDTH="37" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
+ SRC="tex_3.png"
+ ALT="$a @\ b$"></SPAN>.
+</p>
+<p>Maths with code @-command:
+</p>
+<p><!-- MATH
+ address@hidden code}$
+ -->
+<SPAN CLASS="MATH"><IMG
+ WIDTH="115" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
+ SRC="tex_4.png"
+ ALT="address@hidden code}$"></SPAN>
+</p>
+<p>Maths with code @-command and braces:
+</p>
+<p><!-- MATH
+ address@hidden \hbox{ code }}} \sum_{i}{\underline{f}}$
+ -->
+<SPAN CLASS="MATH"><IMG
+ WIDTH="163" HEIGHT="32" ALIGN="MIDDLE" BORDER="0"
+ SRC="tex_5.png"
+ ALT="$ address@hidden \hbox{ code }}} \sum_{i}{\underline{f}}$"></SPAN>
+</p>
+<p>@\ outside of math
+</p>
+<p>@\
</p>
<hr size="1">
<p>
Index: Tests/formatting_res/tex.passfirst
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/formatting_res/tex.passfirst,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Tests/formatting_res/tex.passfirst 28 Aug 2005 08:39:57 -0000 1.7
+++ Tests/formatting_res/tex.passfirst 9 Sep 2007 20:19:11 -0000 1.8
@@ -13,4 +13,19 @@
tex.texi(,26) Test of @@math
tex.texi(,27) Here some @special_math_1{}.
tex.texi(,28)
-tex.texi(,29) @bye
+tex.texi(,29) Maths with protected \:
+tex.texi(,30) @special_math_2{}.
+tex.texi(,31)
+tex.texi(,32) Maths with code @@-command:
+tex.texi(,33)
+tex.texi(,34) @special_math_3{}
+tex.texi(,35)
+tex.texi(,36) Maths with code @@-command and braces:
+tex.texi(,37)
+tex.texi(,38) @special_math_4{}
+tex.texi(,39)
+tex.texi(,40) @@\ outside of math
+tex.texi(,41)
+tex.texi(,42) @\
+tex.texi(,43)
+tex.texi(,44) @bye
Index: Tests/formatting_res/tex.passtexi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/formatting_res/tex.passtexi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Tests/formatting_res/tex.passtexi 25 Nov 2003 10:35:17 -0000 1.3
+++ Tests/formatting_res/tex.passtexi 9 Sep 2007 20:19:11 -0000 1.4
@@ -21,6 +21,21 @@
tex.texi(,24) Same that @@html (but empty following line not ignored).
tex.texi(,25)
tex.texi(,26) Test of @@math
-tex.texi(,27) Here some @math{\frac{x^i}{\tan y}}.
+tex.texi(,27) Here some @math{{x^i}\over{\tan y}}.
tex.texi(,28)
-tex.texi(,29) @bye
+tex.texi(,29) Maths with protected \:
+tex.texi(,30) @math{a @\ b}.
+tex.texi(,31)
+tex.texi(,32) Maths with code @@-command:
+tex.texi(,33)
+tex.texi(,34) @address@hidden code}}
+tex.texi(,35)
+tex.texi(,36) Maths with code @@-command and braces:
+tex.texi(,37)
+tex.texi(,38) @math{ address@hidden \hbox{ code }}} \sum_{i}{\underline{f}}}
+tex.texi(,39)
+tex.texi(,40) @@\ outside of math
+tex.texi(,41)
+tex.texi(,42) @\
+tex.texi(,43)
+tex.texi(,44) @bye
Index: doc/texi2html.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/texi2html.html,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- doc/texi2html.html 21 Aug 2007 17:02:10 -0000 1.49
+++ doc/texi2html.html 9 Sep 2007 20:19:13 -0000 1.50
@@ -31,7 +31,7 @@
permission notice may be stated in a translation approved
by the Free Software Foundation.
-->
-<!-- Created on August, 21 2007 by texi2html 1.79 -->
+<!-- Created on September, 9 2007 by texi2html 1.79 -->
<!--
Written by: Lionel Cons <address@hidden> (original author)
Karl Berry <address@hidden>
@@ -7050,7 +7050,7 @@
</tr></table>
<h1>About This Document</h1>
<p>
- This document was generated by <em>Patrice Dumas</em> on <em>August, 21
2007</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html
1.79</em></a>.
+ This document was generated by <em>Patrice Dumas</em> on <em>September, 9
2007</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html
1.79</em></a>.
</p>
<p>
The buttons in the navigation panels have the following meaning:
@@ -7152,7 +7152,7 @@
<hr size="1">
<p>
<font size="-1">
- This document was generated by <em>Patrice Dumas</em> on <em>August, 21
2007</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html
1.79</em></a>.
+ This document was generated by <em>Patrice Dumas</em> on <em>September, 9
2007</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html
1.79</em></a>.
</font>
<br>
Index: examples/tex4ht.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/tex4ht.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- examples/tex4ht.init 1 Dec 2005 08:38:41 -0000 1.2
+++ examples/tex4ht.init 9 Sep 2007 20:19:13 -0000 1.3
@@ -1,9 +1,13 @@
# -*-perl-*-
# To customize the command and the options, you could set
-# $Texi2HTML::TeX4HT::STYLE to latex
+# $Texi2HTML::TeX4HT::STYLE_MATH to latex/tex
+# $Texi2HTML::TeX4HT::STYLE_TEX to latex/texi
# and/or change
-# $Texi2HTML::TeX4HT::tex4ht_command and $Texi2HTML::TeX4HT::tex4ht_options
+# $Texi2HTML::TeX4HT::tex4ht_command_math
+# and $Texi2HTML::TeX4HT::tex4ht_options_math
+# $Texi2HTML::TeX4HT::tex4ht_command_tex
+# and $Texi2HTML::TeX4HT::tex4ht_options_tex
push @command_handler_init, \&Texi2HTML::TeX4HT::tex4ht_init;
@@ -24,20 +28,34 @@
package Texi2HTML::TeX4HT;
-$STYLE = 'tex' if (!defined($STYLE));
+$STYLE_MATH = 'texi' if (!defined($STYLE_MATH));
+$STYLE_TEX = 'tex' if (!defined($STYLE_TEX));
-if (!defined($tex4ht_command))
+if (!defined($tex4ht_command_math))
{
- $tex4ht_command = 'httex';
- $tex4ht_command = 'htlatex' if ($STYLE eq 'latex');
+ $tex4ht_command_math = 'httexi';
+ $tex4ht_command_math = 'htlatex' if ($STYLE_MATH eq 'latex');
+ $tex4ht_command_math = 'httex' if ($STYLE_MATH eq 'tex');
+}
+if (!defined($tex4ht_command_tex))
+{
+ $tex4ht_command_tex = 'httex';
+ $tex4ht_command_tex = 'htlatex' if ($STYLE_TEX eq 'latex');
+ $tex4ht_command_tex = 'httexi' if ($STYLE_TEX eq 'texi');
}
+my %commands = ();
+
my $tex4ht_initial_dir;
my $tex4ht_out_dir;
-my $tex4ht_basename;
-my $tex4ht_latex_basefile;
-my $tex4ht_html_basefile;
-my $tex4ht_latex_rfile;
+my $tex4ht_math_basename;
+my $tex4ht_tex_basename;
+my $tex4ht_math_basefile;
+my $tex4ht_html_math_basefile;
+my $tex4ht_tex_basefile;
+my $tex4ht_html_tex_basefile;
+my $tex4ht_latex_math_rfile;
+my $tex4ht_latex_tex_rfile;
my $tex4ht_latex_failed = 0;
sub tex4ht_init
@@ -46,48 +64,88 @@
$tex4ht_initial_dir = Cwd::abs_path;
$tex4ht_out_dir = "$Texi2HTML::THISDOC{'out_dir'}";
$tex4ht_out_dir = './' if (!defined($tex4ht_out_dir) or $tex4ht_out_dir =~
/^\s*$/);
- $tex4ht_basename = "$Texi2HTML::THISDOC{'file_base_name'}_tex4ht";
- $tex4ht_latex_basefile = "$tex4ht_basename.tex";
- $tex4ht_html_basefile = "$tex4ht_basename.html";
- $tex4ht_latex_rfile = $tex4ht_out_dir . $tex4ht_latex_basefile;
-
- # begin tex file
- unless (open (TEX4HT_TEXFILE, ">$tex4ht_latex_rfile"))
+ my $tex4ht_basename = "$Texi2HTML::THISDOC{'file_base_name'}_tex4ht";
+ $commands{'math'}->{'style'} = $STYLE_MATH;
+ $commands{'tex'}->{'style'} = $STYLE_TEX;
+ $commands{'math'}->{'exec'} = $tex4ht_command_math;
+ $commands{'tex'}->{'exec'} = $tex4ht_command_tex;
+ foreach my $command ('math', 'tex')
+ {
+ my $style = $commands{$command}->{'style'};
+ $commands{$command}->{'basename'} = $tex4ht_basename . "_$command";
+ my $suffix = '.tex';
+ $suffix = '.texi' if ($style eq 'texi');
+ $commands{$command}->{'basefile'} = $commands{$command}->{'basename'} .
$suffix;
+ $commands{$command}->{'html_file'} = $commands{$command}->{'basename'} .
'.html';
+ $commands{$command}->{'rfile'} = $tex4ht_out_dir .
$commands{$command}->{'basefile'};
+ my $rfile = $commands{$command}->{'rfile'};
+ local *TEX4HT_TEXFILE;
+ unless (open (*TEX4HT_TEXFILE, ">$rfile"))
{
- warn "* tex4ht error opening $tex4ht_latex_rfile: $!\n";
+ warn "* tex4ht error opening $rfile: $!\n";
$tex4ht_latex_failed = 1;
return;
}
- print TEX4HT_TEXFILE "% Automatically generated\n";
- if ($STYLE eq 'latex')
+ $commands{$command}->{'handle'} = *TEX4HT_TEXFILE;
+ }
+ foreach my $command ('math', 'tex')
+ {
+ $commands{$command}->{'counter'} = 0;
+ my $style = $commands{$command}->{'style'};
+ my $fh = $commands{$command}->{'handle'};
+ my $comment = '@c';
+ $comment = '%' if ($style ne 'texi');
+ print $fh "$comment Automatically generated\n";
+ if ($style eq 'latex')
{
- print TEX4HT_TEXFILE "\\documentstyle{article}\n\\begin{document}\n";
+ print $fh "\\documentstyle{article}\n\\begin{document}\n";
}
- else
+ elsif ($style eq 'tex')
{
- print TEX4HT_TEXFILE "\\csname tex4ht\\endcsname\n";
+ print $fh "\\csname tex4ht\\endcsname\n";
+ }
+ elsif ($style eq 'texi')
+ {
+ print $fh "\\input texinfo
address@hidden $commands{$command}->{'basename'}.info\n";
+ }
}
}
-my $tex4ht_counter = 0;
-
sub tex4ht_to_latex
{
my $command = shift;
my $text = shift;
my $counter = shift;
+ my $style = $commands{$command}->{'style'};
+ my $fh = $commands{$command}->{'handle'};
+
# write to tex file
- print TEX4HT_TEXFILE "\\HCode{\\Hnewline <!-- tex4ht_begin $tex4ht_basename
$command $counter -->\\Hnewline}\n";
+ my $before_comment = "address@hidden";
+ $before_comment = "\\HCode{\\Hnewline " if ($style ne 'texi');
+ my $after_comment = "address@hidden verbatim\n";
+ $after_comment = "\\Hnewline}\n" if ($style ne 'texi');
+
+ my $begin_comment = "<!-- tex4ht_begin $commands{$command}->{'basename'}
$command $counter -->";
+ print $fh "$before_comment$begin_comment$after_comment";
if ($command eq 'tex')
{
- print TEX4HT_TEXFILE $text;
+ print $fh $text;
}
elsif ($command eq 'math')
{
- print TEX4HT_TEXFILE "\\IgnorePar \$" . $text . "\$";
+ if ($style eq 'texi')
+ {
+ print $fh '@math{' . $text . "}\n";
+ }
+ else
+ {
+ print $fh "\\IgnorePar \$" . $text . "\$";
}
- print TEX4HT_TEXFILE "\n\\HCode{\\Hnewline <!-- tex4ht_end $tex4ht_basename
$command $counter -->\\Hnewline}\n";
- $tex4ht_counter++;
+ }
+ my $end_comment = "<!-- tex4ht_end $commands{$command}->{'basename'}
$command $counter -->";
+ print $fh "$before_comment$end_comment$after_comment";
+ $commands{$command}->{'counter'}++;
return 1;
}
@@ -95,19 +153,36 @@
sub tex4ht_process
{
- return if ($tex4ht_latex_failed or (!$tex4ht_counter));
+ foreach my $command ('math', 'tex')
+ {
+ tex4ht_process_command($command);
+ }
+ tex4ht_return_to_dir();
+}
+
+sub tex4ht_process_command
+{
+#print STDERR "$style $tex4ht_latex_failed $tex4ht_counter\n";
+ my $command = shift;
+ my $style = $commands{$command}->{'style'};
+ my $fh = $commands{$command}->{'handle'};
+ return if ($tex4ht_latex_failed or (!$commands{$command}->{'counter'}));
# finish the tex file
- if ($STYLE eq 'latex')
+ if ($style eq 'latex')
+ {
+ print $fh "\\end{document}\n";
+ }
+ elsif ($style eq 'tex')
{
- print TEX4HT_TEXFILE "\\end{document}\n";
+ print $fh "\n\\bye\n";
}
else
{
- print TEX4HT_TEXFILE "\n\\bye\n";
+ print $fh "address@hidden";
}
- close (TEX4HT_TEXFILE);
+ close ($fh);
- # now run tex4th
+ # now run tex4ht
unless (chdir $tex4ht_out_dir)
{
warn "chdir to $tex4ht_out_dir failed\n";
@@ -115,8 +190,10 @@
return;
}
print STDERR "cwd($tex4ht_out_dir):" . cwd() ."\n" if ($VERBOSE);
- $tex4ht_options = '' if (!defined($tex4ht_options));
- my $cmd = "$tex4ht_command $tex4ht_latex_basefile $tex4ht_options";
+ my $options = '';
+ $options = $tex4ht_options_math if (($style eq 'math') and
defined($tex4ht_options_math));
+ $options = $tex4ht_options_tex if (($style eq 'tex') and
defined($tex4ht_options_tex));
+ my $cmd = "$commands{$command}->{'exec'} $commands{$command}->{'basefile'}
$options";
print STDERR "$cmd" if ($VERBOSE);
if (system($cmd))
{
@@ -127,9 +204,10 @@
}
# extract the html from the file created by tex4ht
- unless (open (TEX4HT_HTMLFILE, $tex4ht_html_basefile))
+ my $html_basefile = $commands{$command}->{'html_file'};
+ unless (open (TEX4HT_HTMLFILE, $html_basefile))
{
- warn "* tex4ht error opening $tex4ht_html_basefile: $!\n";
+ warn "* tex4ht error opening $html_basefile: $!\n";
tex4ht_return_to_dir();
$tex4ht_latex_failed = 1;
return;
@@ -139,7 +217,7 @@
while ($line = <TEX4HT_HTMLFILE>)
{
#print STDERR "while $line";
- if ($line =~ /^<!-- tex4ht_begin $tex4ht_basename (\w+) (\d+) -->\s*$/)
+ if ($line =~ /!-- tex4ht_begin $commands{$command}->{'basename'} (\w+)
(\d+) --/)
{
my $command = $1;
my $count = $2;
@@ -148,7 +226,7 @@
while ($line = <TEX4HT_HTMLFILE>)
{
#print STDERR "while search $command $count $line";
- if ($line =~ /^<!-- tex4ht_end $tex4ht_basename $command $count
-->\s*$/)
+ if ($line =~ /!-- tex4ht_end $commands{$command}->{'basename'}
$command $count --/)
{
$got_count++;
chomp($text);
@@ -167,15 +245,14 @@
}
}
}
- if ($got_count != $tex4ht_counter and ($Texi2HTML::Config::VERBOSE))
+ if ($got_count != $commands{$command}->{'counter'} and
($Texi2HTML::Config::VERBOSE))
{
- warn "* tex4ht: got $got_count for $tex4ht_counter items entered\n";
+ warn "* tex4ht: got $got_count for $commands{$command}->{'counter'} items
entered\n";
}
close (TEX4HT_HTMLFILE);
- push @{$Texi2HTML::THISDOC{'css_import_lines'}}, "address@hidden
\"$tex4ht_basename.css\";\n";
+ push @{$Texi2HTML::THISDOC{'css_import_lines'}}, "address@hidden
\"$commands{$command}->{'basename'}.css\";\n";
- tex4ht_return_to_dir();
}
sub tex4ht_return_to_dir
@@ -207,9 +284,14 @@
sub tex4ht_finish
{
- if (($tex4ht_output_counter != $tex4ht_counter) and
($Texi2HTML::Config::VERBOSE))
+ my $tex4ht_in_counter = 0;
+ foreach my $command (keys(%commands))
+ {
+ $tex4ht_in_counter += $commands{$command}->{'counter'};
+ }
+ if (($tex4ht_output_counter != $tex4ht_in_counter) and
($Texi2HTML::Config::VERBOSE))
{
- warn "* tex4ht: output $tex4ht_output_counter for $tex4ht_counter items
entered\n";
+ warn "* tex4ht: output $tex4ht_output_counter for $tex4ht_in_counter
items entered\n";
}
}
Index: Tests/formatting/indicateurl_paragraph.texi
===================================================================
RCS file: Tests/formatting/indicateurl_paragraph.texi
diff -N Tests/formatting/indicateurl_paragraph.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Tests/formatting/indicateurl_paragraph.texi 9 Sep 2007 20:19:09 -0000
1.1
@@ -0,0 +1,20 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden indicateurl_paragraph.info
+
address@hidden Top
+
+Test a indicateurl with end of line, and including a blank line. In texi2html
+indicateurl is a simple_style, meaning that it should not be cut by
+paragraph.
+
address@hidden://begin
+continue on other line}
+
address@hidden texi2dvi doesn't accept this
address@hidden://begin2
+
+cut by blank line}
+
+
address@hidden
Index: Tests/formatting_res/indicateurl_paragraph.2
===================================================================
RCS file: Tests/formatting_res/indicateurl_paragraph.2
diff -N Tests/formatting_res/indicateurl_paragraph.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Tests/formatting_res/indicateurl_paragraph.2 9 Sep 2007 20:19:10
-0000 1.1
@@ -0,0 +1 @@
+*** '}' without opening '{' before: (l. 17)
Index: Tests/formatting_res/indicateurl_paragraph.html
===================================================================
RCS file: Tests/formatting_res/indicateurl_paragraph.html
diff -N Tests/formatting_res/indicateurl_paragraph.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Tests/formatting_res/indicateurl_paragraph.html 9 Sep 2007 20:19:10
-0000 1.1
@@ -0,0 +1,68 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html -->
+<!--
+Written by: Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+
+-->
+<head>
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2html">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<a name="Top"></a>
+<h1 class="node"> Top </h1>
+
+<p>Test a indicateurl with end of line, and including a blank line. In
texi2html
+indicateurl is a simple_style, meaning that it should not be cut by
+paragraph.
+</p>
+<p><<code>http://begin
+continue on other line</code>>
+</p>
+<p><<code>http://begin2
+</p>
+<p>cut by blank line
+</p>
+
+<hr size="1">
+<p>
+ <font size="-1">
+ This document was generated by <em>a tester</em> on <em>a sunny day</em>
using <a href="http://www.nongnu.org/texi2html/";><em>texi2html</em></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>
Index: Tests/formatting_res/indicateurl_paragraph.passfirst
===================================================================
RCS file: Tests/formatting_res/indicateurl_paragraph.passfirst
diff -N Tests/formatting_res/indicateurl_paragraph.passfirst
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Tests/formatting_res/indicateurl_paragraph.passfirst 9 Sep 2007
20:19:10 -0000 1.1
@@ -0,0 +1,19 @@
+indicateurl_paragraph.texi(,2)
+indicateurl_paragraph.texi(,3) @setfilename indicateurl_paragraph.info
+indicateurl_paragraph.texi(,4)
+indicateurl_paragraph.texi(,5) @node Top
+indicateurl_paragraph.texi(,6)
+indicateurl_paragraph.texi(,7) Test a indicateurl with end of line, and
including a blank line. In texi2html
+indicateurl_paragraph.texi(,8) indicateurl is a simple_style, meaning that it
should not be cut by
+indicateurl_paragraph.texi(,9) paragraph.
+indicateurl_paragraph.texi(,10)
+indicateurl_paragraph.texi(,11) @indicateurl{http://begin
+indicateurl_paragraph.texi(,12) continue on other line}
+indicateurl_paragraph.texi(,13)
+indicateurl_paragraph.texi(,14) @c texi2dvi doesn't accept this
+indicateurl_paragraph.texi(,15) @indicateurl{http://begin2
+indicateurl_paragraph.texi(,16)
+indicateurl_paragraph.texi(,17) cut by blank line}
+indicateurl_paragraph.texi(,18)
+indicateurl_paragraph.texi(,19)
+indicateurl_paragraph.texi(,20) @bye
Index: Tests/formatting_res/indicateurl_paragraph.passtexi
===================================================================
RCS file: Tests/formatting_res/indicateurl_paragraph.passtexi
diff -N Tests/formatting_res/indicateurl_paragraph.passtexi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Tests/formatting_res/indicateurl_paragraph.passtexi 9 Sep 2007 20:19:11
-0000 1.1
@@ -0,0 +1,19 @@
+indicateurl_paragraph.texi(,2)
+indicateurl_paragraph.texi(,3) @setfilename indicateurl_paragraph.info
+indicateurl_paragraph.texi(,4)
+indicateurl_paragraph.texi(,5) @node Top
+indicateurl_paragraph.texi(,6)
+indicateurl_paragraph.texi(,7) Test a indicateurl with end of line, and
including a blank line. In texi2html
+indicateurl_paragraph.texi(,8) indicateurl is a simple_style, meaning that it
should not be cut by
+indicateurl_paragraph.texi(,9) paragraph.
+indicateurl_paragraph.texi(,10)
+indicateurl_paragraph.texi(,11) @indicateurl{http://begin
+indicateurl_paragraph.texi(,12) continue on other line}
+indicateurl_paragraph.texi(,13)
+indicateurl_paragraph.texi(,14) @c texi2dvi doesn't accept this
+indicateurl_paragraph.texi(,15) @indicateurl{http://begin2
+indicateurl_paragraph.texi(,16)
+indicateurl_paragraph.texi(,17) cut by blank line}
+indicateurl_paragraph.texi(,18)
+indicateurl_paragraph.texi(,19)
+indicateurl_paragraph.texi(,20) @bye
Index: Tests/formatting_res/tex_nol2h.2
===================================================================
RCS file: Tests/formatting_res/tex_nol2h.2
diff -N Tests/formatting_res/tex_nol2h.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Tests/formatting_res/tex_nol2h.2 9 Sep 2007 20:19:11 -0000 1.1
@@ -0,0 +1 @@
+** Unknown command address@hidden' (left as is) (l. 42)
Index: Tests/formatting_res/tex_nol2h.html
===================================================================
RCS file: Tests/formatting_res/tex_nol2h.html
diff -N Tests/formatting_res/tex_nol2h.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Tests/formatting_res/tex_nol2h.html 9 Sep 2007 20:19:11 -0000 1.1
@@ -0,0 +1,82 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html -->
+<!--
+Written by: Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+
+-->
+<head>
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2html">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<a name="Top"></a>
+<a name="SEC_Top"></a>
+<h1 class="unnumbered"> Tests </h1>
+
+<p>Now tex on the same line bidule
+Some text one the line following @end tex
+</p>
+<p>Now tex on the following line, valid fot tex (with @end tex on a line).
+</p>
+<p>Same that @html (but empty following line not ignored).
+</p>
+<p>Test of @math
+Here some <em>x^i\over\tan y</em>.
+</p>
+<p>Maths with protected \:
+<em>a \ b</em>.
+</p>
+<p>Maths with code @-command:
+</p>
+<p><em><code>math code</code></em>
+</p>
+<p>Maths with code @-command and braces:
+</p>
+<p><em> \underline<code>math \hbox code </code> \sum_i\underlinef</em>
+</p>
+<p>@\ outside of math
+</p>
+<p>@\
+</p>
+<hr size="1">
+<p>
+ <font size="-1">
+ This document was generated by <em>a tester</em> on <em>a sunny day</em>
using <a href="http://www.nongnu.org/texi2html/";><em>texi2html</em></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>
Index: Tests/formatting_res/tex_nol2h.passfirst
===================================================================
RCS file: Tests/formatting_res/tex_nol2h.passfirst
diff -N Tests/formatting_res/tex_nol2h.passfirst
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Tests/formatting_res/tex_nol2h.passfirst 9 Sep 2007 20:19:11 -0000
1.1
@@ -0,0 +1,30 @@
+tex.texi(,2)
+tex.texi(,3) @node Top
+tex.texi(,4) @top Tests
+tex.texi(,5)
+tex.texi(,14) Now tex on the same line bidule
+tex.texi(,15) Some text one the line following @@end tex
+tex.texi(,17)
+tex.texi(,18) Now tex on the following line, valid fot tex (with @@end tex on
a line).
+tex.texi(,23)
+tex.texi(,24) Same that @@html (but empty following line not ignored).
+tex.texi(,25)
+tex.texi(,26) Test of @@math
+tex.texi(,27) Here some @math{{x^i}\over{\tan y}}.
+tex.texi(,28)
+tex.texi(,29) Maths with protected \:
+tex.texi(,30) @math{a @\ b}.
+tex.texi(,31)
+tex.texi(,32) Maths with code @@-command:
+tex.texi(,33)
+tex.texi(,34) @address@hidden code}}
+tex.texi(,35)
+tex.texi(,36) Maths with code @@-command and braces:
+tex.texi(,37)
+tex.texi(,38) @math{ address@hidden \hbox{ code }}} \sum_{i}{\underline{f}}}
+tex.texi(,39)
+tex.texi(,40) @@\ outside of math
+tex.texi(,41)
+tex.texi(,42) @\
+tex.texi(,43)
+tex.texi(,44) @bye
Index: Tests/formatting_res/tex_nol2h.passtexi
===================================================================
RCS file: Tests/formatting_res/tex_nol2h.passtexi
diff -N Tests/formatting_res/tex_nol2h.passtexi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Tests/formatting_res/tex_nol2h.passtexi 9 Sep 2007 20:19:12 -0000
1.1
@@ -0,0 +1,30 @@
+tex.texi(,2)
+tex.texi(,3) @node Top
+tex.texi(,4) @top Tests
+tex.texi(,5)
+tex.texi(,14) Now tex on the same line tex.texi(,14) bidule
+tex.texi(,15) Some text one the line following @@end tex
+tex.texi(,17)
+tex.texi(,18) Now tex on the following line, valid fot tex (with @@end tex on
a line).
+tex.texi(,23)
+tex.texi(,24) Same that @@html (but empty following line not ignored).
+tex.texi(,25)
+tex.texi(,26) Test of @@math
+tex.texi(,27) Here some @math{{x^i}\over{\tan y}}.
+tex.texi(,28)
+tex.texi(,29) Maths with protected \:
+tex.texi(,30) @math{a @\ b}.
+tex.texi(,31)
+tex.texi(,32) Maths with code @@-command:
+tex.texi(,33)
+tex.texi(,34) @address@hidden code}}
+tex.texi(,35)
+tex.texi(,36) Maths with code @@-command and braces:
+tex.texi(,37)
+tex.texi(,38) @math{ address@hidden \hbox{ code }}} \sum_{i}{\underline{f}}}
+tex.texi(,39)
+tex.texi(,40) @@\ outside of math
+tex.texi(,41)
+tex.texi(,42) @\
+tex.texi(,43)
+tex.texi(,44) @bye
Index: Tests/tex_httex_res/tex.html
===================================================================
RCS file: Tests/tex_httex_res/tex.html
diff -N Tests/tex_httex_res/tex.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Tests/tex_httex_res/tex.html 9 Sep 2007 20:19:12 -0000 1.1
@@ -0,0 +1,99 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html -->
+<!--
+Written by: Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+
+-->
+<head>
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2html">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
address@hidden "tex_tex4ht_math.css";
address@hidden "tex_tex4ht_tex.css";
+
+a.summary-letter {text-decoration: none}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<a name="Top"></a>
+<a name="SEC_Top"></a>
+<h1 class="unnumbered"> Tests </h1>
+
+<p>Now tex on the same line some
+<!--l. 6--><p class="indent" >
+ <center class="math-display" >
+<img
+src="tex_tex4ht_tex0x.png" alt=" N ( )2
+χ2 = ∑ yi --(a+-bxi)
+ i=1 σi
+" class="math-display" ></center>
+<!--l. 11--><p class="indent" > bidule
+Some text one the line following @end tex
+</p>
+<p>Now tex on the following line, valid fot tex (with @end tex on a line).
+ some
+<!--l. 15--><p class="indent" > tex <span class="TEX">T<span
+class="E">E</span>X</span>
+</p>
+<p>Same that @html (but empty following line not ignored).
+</p>
+<p>Test of @math
+Here some xi
+_
+tan y.
+</p>
+<p>Maths with protected \:
+ a\b.
+</p>
+<p>Maths with code @-command:
+</p>
+<p> mathcode
+</p>
+<p>Maths with code @-command and braces:
+</p>
+<p> math code_∑
+ i f
+</p>
+<p>@\ outside of math
+</p>
+<p>@\
+</p>
+<hr size="1">
+<p>
+ <font size="-1">
+ This document was generated by <em>a tester</em> on <em>a sunny day</em>
using <a href="http://www.nongnu.org/texi2html/";><em>texi2html</em></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>
Index: Tests/tex_httex_res/tex.passfirst
===================================================================
RCS file: Tests/tex_httex_res/tex.passfirst
diff -N Tests/tex_httex_res/tex.passfirst
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Tests/tex_httex_res/tex.passfirst 9 Sep 2007 20:19:12 -0000 1.1
@@ -0,0 +1,31 @@
+../formatting/tex.texi(,2)
+../formatting/tex.texi(,3) @node Top
+../formatting/tex.texi(,4) @top Tests
+../formatting/tex.texi(,5)
+../formatting/tex.texi(,14) Now tex on the same line @special_tex_1{} bidule
+../formatting/tex.texi(,15) Some text one the line following @@end tex
+../formatting/tex.texi(,17)
+../formatting/tex.texi(,18) Now tex on the following line, valid fot tex (with
@@end tex on a line).
+../formatting/tex.texi(,22) @special_tex_2{}
+../formatting/tex.texi(,23)
+../formatting/tex.texi(,24) Same that @@html (but empty following line not
ignored).
+../formatting/tex.texi(,25)
+../formatting/tex.texi(,26) Test of @@math
+../formatting/tex.texi(,27) Here some @special_math_1{}.
+../formatting/tex.texi(,28)
+../formatting/tex.texi(,29) Maths with protected \:
+../formatting/tex.texi(,30) @special_math_2{}.
+../formatting/tex.texi(,31)
+../formatting/tex.texi(,32) Maths with code @@-command:
+../formatting/tex.texi(,33)
+../formatting/tex.texi(,34) @special_math_3{}
+../formatting/tex.texi(,35)
+../formatting/tex.texi(,36) Maths with code @@-command and braces:
+../formatting/tex.texi(,37)
+../formatting/tex.texi(,38) @special_math_4{}
+../formatting/tex.texi(,39)
+../formatting/tex.texi(,40) @@\ outside of math
+../formatting/tex.texi(,41)
+../formatting/tex.texi(,42) @\
+../formatting/tex.texi(,43)
+../formatting/tex.texi(,44) @bye
Index: Tests/tex_httex_res/tex.passtexi
===================================================================
RCS file: Tests/tex_httex_res/tex.passtexi
diff -N Tests/tex_httex_res/tex.passtexi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Tests/tex_httex_res/tex.passtexi 9 Sep 2007 20:19:12 -0000 1.1
@@ -0,0 +1,41 @@
+../formatting/tex.texi(,2)
+../formatting/tex.texi(,3) @node Top
+../formatting/tex.texi(,4) @top Tests
+../formatting/tex.texi(,5)
+../formatting/tex.texi(,7) Now tex on the same line @tex some
+../formatting/tex.texi(,8)
+../formatting/tex.texi(,9) $$ \chi^2 = \sum_{i=1}^N
+../formatting/tex.texi(,10) \left(y_i - (a + b x_i)
+../formatting/tex.texi(,11) \over \sigma_i\right)^2 $$
+../formatting/tex.texi(,12)
+../formatting/tex.texi(,13)
+../formatting/tex.texi(,14) @end tex bidule
+../formatting/tex.texi(,15) Some text one the line following @@end tex
+../formatting/tex.texi(,17)
+../formatting/tex.texi(,18) Now tex on the following line, valid fot tex (with
@@end tex on a line).
+../formatting/tex.texi(,19) @tex some
+../formatting/tex.texi(,20)
+../formatting/tex.texi(,21) tex \TeX
+../formatting/tex.texi(,22) @end tex
+../formatting/tex.texi(,23)
+../formatting/tex.texi(,24) Same that @@html (but empty following line not
ignored).
+../formatting/tex.texi(,25)
+../formatting/tex.texi(,26) Test of @@math
+../formatting/tex.texi(,27) Here some @math{{x^i}\over{\tan y}}.
+../formatting/tex.texi(,28)
+../formatting/tex.texi(,29) Maths with protected \:
+../formatting/tex.texi(,30) @math{a @\ b}.
+../formatting/tex.texi(,31)
+../formatting/tex.texi(,32) Maths with code @@-command:
+../formatting/tex.texi(,33)
+../formatting/tex.texi(,34) @address@hidden code}}
+../formatting/tex.texi(,35)
+../formatting/tex.texi(,36) Maths with code @@-command and braces:
+../formatting/tex.texi(,37)
+../formatting/tex.texi(,38) @math{ address@hidden \hbox{ code }}}
\sum_{i}{\underline{f}}}
+../formatting/tex.texi(,39)
+../formatting/tex.texi(,40) @@\ outside of math
+../formatting/tex.texi(,41)
+../formatting/tex.texi(,42) @\
+../formatting/tex.texi(,43)
+../formatting/tex.texi(,44) @bye
Index: Tests/tex_httex_res/tex_tex4ht_math.html
===================================================================
RCS file: Tests/tex_httex_res/tex_tex4ht_math.html
diff -N Tests/tex_httex_res/tex_tex4ht_math.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Tests/tex_httex_res/tex_tex4ht_math.html 9 Sep 2007 20:19:12 -0000
1.1
@@ -0,0 +1,18 @@
address@hidden Automatically generated
+ <!-- tex4ht_begin tex_tex4ht_math math 1 -->
+ xi
+_
+tan y
+ <!-- tex4ht_end tex_tex4ht_math math 1 -->
+ <!-- tex4ht_begin tex_tex4ht_math math 2 -->
+ a\b
+ <!-- tex4ht_end tex_tex4ht_math math 2 -->
+ <!-- tex4ht_begin tex_tex4ht_math math 3 -->
+ mathcode
+ <!-- tex4ht_end tex_tex4ht_math math 3 -->
+ <!-- tex4ht_begin tex_tex4ht_math math 4 -->
+ math code_∑
+ i f
+ <!-- tex4ht_end tex_tex4ht_math math 4 -->
+
+
Index: Tests/tex_httex_res/tex_tex4ht_tex.html
===================================================================
RCS file: Tests/tex_httex_res/tex_tex4ht_tex.html
diff -N Tests/tex_httex_res/tex_tex4ht_tex.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Tests/tex_httex_res/tex_tex4ht_tex.html 9 Sep 2007 20:19:12 -0000
1.1
@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd";>
+<html >
+<head>
+
+ <title>tex_tex4ht_tex.html</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta name="generator" content="TeX4ht
(http://www.cse.ohio-state.edu/~gurari/TeX4ht/)">
+<meta name="originator" content="TeX4ht
(http://www.cse.ohio-state.edu/~gurari/TeX4ht/)">
+<!-- html -->
+<meta name="src" content="tex_tex4ht_tex.tex">
+<meta name="date" content="2007-09-09 20:43:00">
+<link rel="stylesheet" type="text/css" href="tex_tex4ht_tex.css">
+</head><body
+>
+<!--l. 3--><p class="indent" >
+<!-- tex4ht_begin tex_tex4ht_tex tex 1 -->
+ some
+<!--l. 6--><p class="indent" >
+ <center class="math-display" >
+<img
+src="tex_tex4ht_tex0x.png" alt=" N ( )2
+χ2 = ∑ yi --(a+-bxi)
+ i=1 σi
+" class="math-display" ></center>
+<!--l. 11--><p class="indent" >
+<!-- tex4ht_end tex_tex4ht_tex tex 1 -->
+
+<!-- tex4ht_begin tex_tex4ht_tex tex 2 -->
+ some
+<!--l. 15--><p class="indent" > tex <span class="TEX">T<span
+class="E">E</span>X</span>
+<!-- tex4ht_end tex_tex4ht_tex tex 2 -->
+
+
+
+</body></html>
+
+
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog NEWS TODO texi2html.init te...,
Patrice Dumas <=