[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog NEWS texi2html.init texi2ht...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog NEWS texi2html.init texi2ht... |
|
Date: |
Mon, 01 Oct 2007 10:42:03 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 07/10/01 10:42:03
Modified files:
. : ChangeLog NEWS texi2html.init texi2html.pl
Tests : test.sh
Tests/floats_res: caption_not_closed.html
Tests/formatting_res: bad_nesting.html center.html
formats_not_closed.html
html_not_closed.passtexi
not_closed_in_menu.html tables.html
tex.passtexi tex_not_closed.passtexi
verbatim_html.html verbatim_html.passfirst
verbatim_html.passtexi
verbatim_not_closed.passtexi
Tests/tex_httex_res: tex.passtexi
doc : texi2html.html
Added files:
Tests/formatting: symbol_after_block.texi
Tests/formatting_res: symbol_after_block.2
symbol_after_block.html
symbol_after_block.passfirst
symbol_after_block.passtexi
Log message:
* texi2html.pl, texi2html.init: Handle @end commands entered as
misc commands like other misc commands during pass_text.
Don't add a space after an @end command, and don't remove it
when there is no reason to.
Handle right @end block commands followed by something else
than a
spacing character (report from Graham Percival).
* Test/Formatting/symbol_after_block.texi: test for symbols
after
@end block commands.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.271&r2=1.272
http://cvs.savannah.gnu.org/viewcvs/texi2html/NEWS?cvsroot=texi2html&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.120&r2=1.121
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.187&r2=1.188
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/test.sh?cvsroot=texi2html&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/floats_res/caption_not_closed.html?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting/symbol_after_block.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/bad_nesting.html?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/center.html?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/formats_not_closed.html?cvsroot=texi2html&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/html_not_closed.passtexi?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/not_closed_in_menu.html?cvsroot=texi2html&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/tables.html?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/tex.passtexi?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/tex_not_closed.passtexi?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/verbatim_html.html?cvsroot=texi2html&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/verbatim_html.passfirst?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/verbatim_html.passtexi?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/verbatim_not_closed.passtexi?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/symbol_after_block.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/symbol_after_block.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/symbol_after_block.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/symbol_after_block.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/tex_httex_res/tex.passtexi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/texi2html.html?cvsroot=texi2html&r1=1.54&r2=1.55
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -b -r1.271 -r1.272
--- ChangeLog 30 Sep 2007 13:21:01 -0000 1.271
+++ ChangeLog 1 Oct 2007 10:41:59 -0000 1.272
@@ -1,3 +1,14 @@
+2007-10-01 Patrice Dumas <address@hidden>
+
+ * texi2html.pl, texi2html.init: Handle @end commands entered as
+ misc commands like other misc commands during pass_text.
+ Don't add a space after an @end command, and don't remove it
+ when there is no reason to.
+ Handle right @end block commands followed by something else than a
+ spacing character (report from Graham Percival).
+ * Test/Formatting/symbol_after_block.texi: test for symbols after
+ @end block commands.
+
2007-09-30 Patrice Dumas <address@hidden>
* texi2html.pl: don't have # perl on the shebang line. Report by
Index: NEWS
===================================================================
RCS file: /cvsroot/texi2html/texi2html/NEWS,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- NEWS 30 Sep 2007 12:47:11 -0000 1.64
+++ NEWS 1 Oct 2007 10:41:59 -0000 1.65
@@ -37,6 +37,9 @@
is used. Using tex4ht for html generation should also lead to a correct
result.
+* Handle right @end block commands follwed by something else than a
+ spacing character.
+
1.78 (2007-06-05)
* NEW FEATURES
Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- texi2html.init 30 Sep 2007 12:47:11 -0000 1.120
+++ texi2html.init 1 Oct 2007 10:41:59 -0000 1.121
@@ -12,7 +12,7 @@
# Afterwards, load the file with command-line
# option -init-file <your_init_file>
#
-# $Id: texi2html.init,v 1.120 2007/09/30 12:47:11 pertusus Exp $
+# $Id: texi2html.init,v 1.121 2007/10/01 10:41:59 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -3094,7 +3094,7 @@
'setcontentsaftertitlepage' => {}, # no arg
'setshortcontentsaftertitlepage' => {}, # no arg
'detailmenu' => {'skip' => 'whitespace'}, # no arg
- 'end detailmenu' => {'skip' => 'space'}, # no arg
+ 'end detailmenu' => {'skip' => 'whitespace'}, # no arg
'bye' => {'skip' => 'line'}, # no arg
# set, clear
'set' => {'skip' => 'line'}, # special arg
@@ -3177,7 +3177,7 @@
'shortcontents', 1, # no arg
'summarycontents', 1, # no arg
'detailmenu', 'whitespace', # no arg
- 'end detailmenu', 'space', # no arg
+ 'end detailmenu', 'whitespace', # no arg
#'end detailmenu', 1, # no arg
'novalidate', 1, # no arg
'bye', 'line', # no arg
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -b -r1.187 -r1.188
--- texi2html.pl 30 Sep 2007 13:21:01 -0000 1.187
+++ texi2html.pl 1 Oct 2007 10:41:59 -0000 1.188
@@ -60,7 +60,7 @@
#--##########################################################################
# CVS version:
-# $Id: texi2html.pl,v 1.187 2007/09/30 13:21:01 pertusus Exp $
+# $Id: texi2html.pl,v 1.188 2007/10/01 10:41:59 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -4175,6 +4175,21 @@
my $text = shift;
my $line_nr = shift;
my ($skipped, $remaining, $args);
+
+ # The strange condition associated with 'keep_texi' is
+ # there because for an argument appearing on an @itemize
+ # line (we're in 'check_item'), meant to be prepended to an
+ # @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
+ (!$state->{'check_item'} or ($macro ne 'c' and $macro ne 'comment')))
+ {
+ ($remaining, $skipped, $args) = preserve_command($line, $macro);
+ add_prev($text, $stack, "address@hidden". $skipped);
+ return $remaining;
+ }
+
# if it is true the command args are kept so the user can modify how
# they are skipped and handle them as unknown @-commands
my $keep = $Texi2HTML::Config::misc_command{$macro}->{'keep'};
@@ -4183,6 +4198,10 @@
{
$state->{'detailmenu'}++;
}
+ elsif ($macro eq 'end detailmenu')
+ {
+ $state->{'detailmenu'}-- if ($state->{'detailmenu'});
+ }
elsif ($macro eq 'sp')
{
my $sp_number;
@@ -8836,8 +8855,11 @@
exit 1;
}
- if (s/^(.*?)(address@hidden)$// or s/^(.*?)(address@hidden)//)
- {# we add it even if 'ignored', it'll be discarded when there is
+ # macro_regexp
+ if (/^(.*?)address@hidden([a-zA-Z][\w-]*)/o and ($2 eq $tag))
+ {
+ s/^(.*?)(address@hidden)//;
+ # we add it even if 'ignored', it'll be discarded when there is
# the @end
add_prev ($text, $stack, $1);
my $end = $2;
@@ -8848,9 +8870,7 @@
# what is in the raw format however
# it will be removed later anyway
{# ARG_EXPANSION
- my $after_macro = '';
- $after_macro = ' ' unless (/^\s*$/);
- add_prev ($text, $stack, $style->{'text'} . $end .
$after_macro) unless ($state->{'ignored'});
+ add_prev ($text, $stack, $style->{'text'} . $end) unless
($state->{'ignored'});
delete $state->{'raw'};
}
next;
@@ -9471,8 +9491,10 @@
exit 1;
}
################# end debug
- if (s/^(.*?)address@hidden// or s/^(.*?)address@hidden//)
+ # macro_regexp
+ if (/^(.*?)address@hidden([a-zA-Z][\w-]*)/o and ($2 eq $tag))
{
+ s/^(.*?)address@hidden//;
add_prev ($text, $stack, $1);
delete $state->{'raw'};
my $style = pop @$stack;
@@ -9486,9 +9508,7 @@
}
else
{
- my $after_macro = '';
- $after_macro = ' ' unless (/^\s*$/);
- add_prev ($text, $stack, $style->{'text'} .
"address@hidden $tag" . $after_macro);
+ add_prev ($text, $stack, $style->{'text'} .
"address@hidden $tag");
}
unless (no_line($_))
{
@@ -9975,9 +9995,11 @@
if (defined($state->{'raw'}))
{
(dump_stack($text, $stack, $state), die "Bug for raw
($state->{'raw'})") if (! @$stack or ! ($stack->[-1]->{'style'} eq
$state->{'raw'}));
- if (s/^(.*?)address@hidden>{'raw'}$// or
s/^(.*?)address@hidden>{'raw'}\s+//)
+ # macro_regexp
+ if (/^(.*?)address@hidden([a-zA-Z][\w-]*)/o and ($2 eq
$state->{'raw'}))
# don't protect html, it is done by Texi2HTML::Config::raw if
needed
{
+ s/^(.*?)address@hidden>{'raw'}//;
print STDERR "# end raw $state->{'raw'}\n" if ($T2H_DEBUG &
$DEBUG_FORMATS);
add_prev ($text, $stack, $1);
my $style = pop @$stack;
@@ -10071,26 +10093,30 @@
next;
}
# macro_regexp
- if (s/^([^{}@,]*)address@hidden([a-zA-Z][\w-]*)\s//o or
s/^([^{}@,]*)address@hidden([a-zA-Z][\w-]*)$//o)
+ #if (s/^([^{}@,]*)address@hidden([a-zA-Z][\w-]*)\s//o or
s/^([^{}@,]*)address@hidden([a-zA-Z][\w-]*)$//o)
+ if (s/^([^{}@,]*)address@hidden([a-zA-Z][\w-]*)//o)
{
add_prev($text, $stack, do_text($1, $state));
my $end_tag = $2;
#print STDERR "END_MACRO $end_tag\n";
#dump_stack ($text, $stack, $state);
+ # first handle @end formats registered as misc_commands. In the
+ # default case it is only @end detailmenu
+ my $end_macro = "end $end_tag";
+ if (defined($Texi2HTML::Config::misc_command{$end_macro}))
+ {
+ $_ = misc_command_text($_, $end_macro, $stack, $state, $text,
$line_nr);
+ return unless (defined($_));
+ next;
+ }
+
# First we test if the stack is not empty.
# Then we test if the end tag is a format tag.
# We then close paragraphs and preformatted at top of the stack.
# We handle the end tag (even when it was not the tag which appears
# on the top of the stack; in that case we close anything
# until that element)
- $state->{'detailmenu'}-- if ($end_tag eq 'detailmenu' and
$state->{'detailmenu'});
- # FIXME handle below (look for misc_command) to let the user
- # keep that end tag. On the other hand it is only used for
- # end detailmenu, so maybe it should just go and detailmenu
- # could be handled like a normal format. Last there could be
- # something similar than what is done for other misc_commands.
- next if (defined($Texi2HTML::Config::misc_command{"end
$end_tag"}));
my $top_stack = top_stack($stack);
if (!$top_stack)
{
@@ -10192,7 +10218,8 @@
}
# We should now be able to handle the format
if (defined($format_type{$end_tag}) and $format_type{$end_tag} ne
'fake')
- {
+ {# remove the space or new line following the @end command
+ s/\s//;
end_format($text, $stack, $state, $end_tag, $line_nr);
begin_paragraph_after_command($state,$stack,$end_tag,$_);
}
@@ -10256,21 +10283,6 @@
}
if (defined($Texi2HTML::Config::misc_command{$macro}))
{
- # The strange condition associated with 'keep_texi' is
- # there because for an argument appearing on an @itemize
- # line (we're in 'check_item'), meant to be prepended to an
- # @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
- (!$state->{'check_item'} or ($macro ne 'c' and
$macro ne 'comment')))
- {
- my ($line, $args);
- ($_, $line, $args) = preserve_command($_, $macro);
- add_prev($text, $stack, "address@hidden". $line);
- next;
- }
-
# Handle the misc command
$_ = misc_command_text($_, $macro, $stack, $state, $text,
$line_nr);
return unless (defined($_));
@@ -11571,7 +11583,7 @@
elsif ($state->{'raw'})
{
echo_warn ("closing address@hidden>{'raw'} raw format", $line_nr);
- $string .= "address@hidden $state->{'raw'} ";
+ $string .= "address@hidden $state->{'raw'}";
}
if ($string ne '')
{
Index: Tests/test.sh
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/test.sh,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- Tests/test.sh 30 Sep 2007 12:47:12 -0000 1.70
+++ Tests/test.sh 1 Oct 2007 10:42:00 -0000 1.71
@@ -275,6 +275,7 @@
test_texi formatting imbrications.texi "" 2
test_texi formatting complex_command_in_simple_command.texi
test_texi formatting verbatim_html.texi "-l2h -expand tex" 16
+test_texi formatting symbol_after_block.texi
test_texi formatting center.texi
test_texi formatting tables.texi
test_texi formatting tex.texi "-l2h -expand tex" "no"
Index: Tests/floats_res/caption_not_closed.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/Tests/floats_res/caption_not_closed.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Tests/floats_res/caption_not_closed.html 6 May 2007 12:57:06 -0000
1.3
+++ Tests/floats_res/caption_not_closed.html 1 Oct 2007 10:42:00 -0000
1.4
@@ -55,6 +55,7 @@
</strong></p>
@end float
+
<p><strong></strong>
</p><hr size="1">
<p>
Index: Tests/formatting_res/bad_nesting.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/formatting_res/bad_nesting.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Tests/formatting_res/bad_nesting.html 6 May 2007 12:57:06 -0000
1.3
+++ Tests/formatting_res/bad_nesting.html 1 Oct 2007 10:42:00 -0000
1.4
@@ -50,6 +50,7 @@
<blockquote><p>A quotation
</p></blockquote>
+
<dl>
<dt><u>Function Reference:</u> <b>print_navigation</b><i> $filehandle</i>
<a name="IDX1"></a>
@@ -67,21 +68,27 @@
<dt> <em>ref</em></dt>
<dd><table><tr><td> </td><td><pre class="example">example
</pre></td></tr></table>
-</dd>
+ </dd>
</dl>
+
@end table
+
<p>in group
</p>
+
<p>in group 2
</p>
+
<table class="cartouche" border="1"><tr><td>
<p>cartouche
</p></td></tr></table>
+
<table class="cartouche" border="1"><tr><td>
<p>carouche
</p></td></tr></table>
+
<hr size="1">
<p>
<font size="-1">
Index: Tests/formatting_res/center.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/formatting_res/center.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Tests/formatting_res/center.html 6 May 2007 12:57:06 -0000 1.3
+++ Tests/formatting_res/center.html 1 Oct 2007 10:42:00 -0000 1.4
@@ -135,6 +135,7 @@
<p><samp><samp>Line in center
</samp></samp></p> second item
@end table
+
<hr size="6">
<a name="SEC_Foot"></a>
<table cellpadding="1" cellspacing="1" border="0">
Index: Tests/formatting_res/formats_not_closed.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/Tests/formatting_res/formats_not_closed.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- Tests/formatting_res/formats_not_closed.html 6 May 2007 12:57:06
-0000 1.23
+++ Tests/formatting_res/formats_not_closed.html 1 Oct 2007 10:42:00
-0000 1.24
@@ -69,8 +69,8 @@
<li><pre class="example"> first item
</pre></li><li><pre class="example"> an item
-</pre></li></ol>
-</dd>
+</pre> </li></ol>
+ </dd>
</dl>
</td></tr></table>
@@ -82,12 +82,13 @@
</p>
<p>an end table without correspondiing opening part
</p>@end table
+
<p>Multitable not closed with item and tab
</p>
<table>
<tr><td><p> rt </p></td><td><p> ds
</p>
-</td></tr>
+ </td></tr>
</table>
<hr size="6">
<a name="SEC2"></a>
@@ -113,7 +114,7 @@
<table>
<tr><td><p> rt
</p>
-</td></tr>
+ </td></tr>
</table>
<hr size="6">
<a name="SEC3"></a>
@@ -166,7 +167,7 @@
<a name="IDX3"></a>
</dt>
</dl>
-</dd></dl>
+ </dd></dl>
<hr size="6">
<a name="SEC5"></a>
<table cellpadding="1" cellspacing="1" border="0">
Index: Tests/formatting_res/html_not_closed.passtexi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/Tests/formatting_res/html_not_closed.passtexi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Index: Tests/formatting_res/not_closed_in_menu.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/Tests/formatting_res/not_closed_in_menu.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- Tests/formatting_res/not_closed_in_menu.html 6 May 2007 12:57:06
-0000 1.23
+++ Tests/formatting_res/not_closed_in_menu.html 1 Oct 2007 10:42:01
-0000 1.24
@@ -48,9 +48,9 @@
<tr><td align="left" valign="top"><a href="gcc.html#Top">•
(gcc)</a></td><td> </td><td align="left" valign="top"> text <dl
compact="compact">
<dt>- item</dt>
<dd><p>table line
-</p></dd>
+</p> </dd>
</dl>
-</td></tr>
+ </td></tr>
</table>
<p>Some text.
@@ -62,9 +62,9 @@
<dt>• item</dt>
<dd><pre class="menu-comment">comment
<a href="manual2.html#Top">• (manual2)</a>::
-</pre></dd>
+</pre> </dd>
</dl>
-</th></tr></table>
+ </th></tr></table>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="info.html#Top">•
(info)</a></td><td> </td><td align="left" valign="top"> before deff
<dl>
@@ -72,8 +72,8 @@
<a name="IDX1"></a>
</dt>
<dd><p>deffn text
-</p></dd></dl>
-</td></tr>
+</p> </dd></dl>
+ </td></tr>
</table>
<p>After menu
</p>
@@ -81,7 +81,7 @@
<tr><td align="left" valign="top"><a href="manual_in_menu.html#Top">•
(manual_in_menu)</a></td><td> </td><td align="left" valign="top">
desc2
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
-</pre></th></tr></table>
+</pre> </th></tr></table>
<hr size="1">
<p>
<font size="-1">
Index: Tests/formatting_res/tables.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/formatting_res/tables.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Tests/formatting_res/tables.html 6 May 2007 12:57:06 -0000 1.3
+++ Tests/formatting_res/tables.html 1 Oct 2007 10:42:01 -0000 1.4
@@ -55,7 +55,7 @@
<dt> first item</dt>
<dd><p>First item text
</p>
-<p><a href="#SEC_Top">title in first item second item @end table</a></p></dd>
+<p><a href="#SEC_Top">title in first item second item @end table</a></p> </dd>
</dl>
<hr size="1">
<a name="SEC1"></a>
Index: Tests/formatting_res/tex.passtexi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/formatting_res/tex.passtexi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
Index: Tests/formatting_res/tex_not_closed.passtexi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/Tests/formatting_res/tex_not_closed.passtexi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Index: Tests/formatting_res/verbatim_html.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/formatting_res/verbatim_html.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- Tests/formatting_res/verbatim_html.html 6 May 2007 12:57:06 -0000
1.41
+++ Tests/formatting_res/verbatim_html.html 1 Oct 2007 10:42:02 -0000
1.42
@@ -72,6 +72,7 @@
<blockquote><p>A quotation
</p></blockquote>
+
<dl>
<dt><u>Function Reference:</u> <b>print_navigation</b><i> $filehandle</i>
<a name="IDX1"></a>
@@ -89,11 +90,13 @@
<dt> <em>ref</em></dt>
<dd><table><tr><td> </td><td><pre class="example">example
</pre></td></tr></table>
-</dd>
+ </dd>
</dl>
+
@end table
+
<hr size="1">
<a name="First-node"></a>
<a name="SEC1"></a>
@@ -162,7 +165,7 @@
text
-@@@@ @ text before @end verbatim </pre>Text following end verbatim, must be
exactly one space
+@@@@ @ text before @end verbatim </pre> Text following end verbatim, must be
exactly one space
<p>between end and verbatim. @end verbatim doesn't need to begin at beginning
of line.
</p>
@@ -175,7 +178,7 @@
<p>Now html <b>
some html </b>
-bidule ignored
+ bidule ignored
</p>
<p>@end html begins the line, and there must be exactly one space between @end
and html and thing following @end html are ignored in info. Strangely
@@ -329,7 +332,7 @@
</p>
<p>Some @verbatim, @verb and @ignore within an xref, very hard for TeX:
-See section <a href="#SEC1"><pre class="verbatim"> some verbatim @@ text
within an xref </pre>and now verb delimited with * with an empty line a comment
and @samp <tt>with verb @c comment and samp @samp{text } next line </tt> last
ignored sentence</a>.
+See section <a href="#SEC1"><pre class="verbatim"> some verbatim @@ text
within an xref </pre> and now verb delimited with * with an empty line a
comment and @samp <tt>with verb @c comment and samp @samp{text } next line
</tt> last ignored sentence</a>.
</p>
<p>See section <a href="#SEC1">no verb</a>.
</p>
Index: Tests/formatting_res/verbatim_html.passfirst
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/Tests/formatting_res/verbatim_html.passfirst,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
Index: Tests/formatting_res/verbatim_html.passtexi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/Tests/formatting_res/verbatim_html.passtexi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
Index: Tests/formatting_res/verbatim_not_closed.passtexi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/Tests/formatting_res/verbatim_not_closed.passtexi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Index: Tests/tex_httex_res/tex.passtexi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/tex_httex_res/tex.passtexi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Index: doc/texi2html.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/texi2html.html,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- doc/texi2html.html 30 Sep 2007 13:21:02 -0000 1.54
+++ doc/texi2html.html 1 Oct 2007 10:42:02 -0000 1.55
@@ -31,7 +31,7 @@
permission notice may be stated in a translation approved
by the Free Software Foundation.
-->
-<!-- Created on September, 30 2007 by texi2html 1.79 -->
+<!-- Created on October, 1 2007 by texi2html 1.79 -->
<!--
Written by: Lionel Cons <address@hidden> (original author)
Karl Berry <address@hidden>
@@ -7112,7 +7112,7 @@
</tr></table>
<h1>About This Document</h1>
<p>
- This document was generated by <em>Patrice Dumas</em> on <em>September, 30
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>October, 1
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:
@@ -7214,7 +7214,7 @@
<hr size="1">
<p>
<font size="-1">
- This document was generated by <em>Patrice Dumas</em> on <em>September, 30
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>October, 1
2007</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html
1.79</em></a>.
</font>
<br>
Index: Tests/formatting/symbol_after_block.texi
===================================================================
RCS file: Tests/formatting/symbol_after_block.texi
diff -N Tests/formatting/symbol_after_block.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Tests/formatting/symbol_after_block.texi 1 Oct 2007 10:42:00 -0000
1.1
@@ -0,0 +1,89 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden symbol_after_block.info
+
address@hidden Top
address@hidden Symbol after block
+
+Html:
+
address@hidden
+In html
address@hidden html. On the line.
+
address@hidden
+In html
address@hidden html@@ On the line.
+
+Verbatim:
+
address@hidden
+In verbatim
address@hidden verbatim;
+
address@hidden
+In verbatim
address@hidden verbatim@@
+
+Table:
+
address@hidden @bullet
address@hidden a
+l--ine
address@hidden table+
+
address@hidden @bullet
address@hidden a
+l--ine
address@hidden table@@
+
+Itemize:
+
address@hidden @emph
address@hidden e--mph item
address@hidden itemize''
+
address@hidden @emph
address@hidden e--mph item
address@hidden itemize@@
+
+Multitable:
+
address@hidden @columnfractions 6 7
address@hidden mu--ltitable headitem @tab another tab
address@hidden mu--ltitable item @tab multitable tab
address@hidden multitable^
+
address@hidden @columnfractions 6 7
address@hidden mu--ltitable headitem @tab another tab
address@hidden mu--ltitable item @tab multitable tab
address@hidden address@hidden
+
+Flushleft:
+
address@hidden
+flushleft
address@hidden flushleft!
+
address@hidden
+flushleft
address@hidden flushleft@@
+
+Copying:
+
address@hidden
+Copying
address@hidden copying*
+
address@hidden
+Copying
address@hidden copying@@
+
address@hidden
+
+An html, all on one line:
+
+Hi, my name is @html
address@hidden html.
+
address@hidden
Index: Tests/formatting_res/symbol_after_block.2
===================================================================
RCS file: Tests/formatting_res/symbol_after_block.2
diff -N Tests/formatting_res/symbol_after_block.2
Index: Tests/formatting_res/symbol_after_block.html
===================================================================
RCS file: Tests/formatting_res/symbol_after_block.html
diff -N Tests/formatting_res/symbol_after_block.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Tests/formatting_res/symbol_after_block.html 1 Oct 2007 10:42:01
-0000 1.1
@@ -0,0 +1,135 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/loose.dtd";>
+<html>
+<!-- Copying
+Copying
+ -->
+<!-- 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"> Symbol after block </h1>
+
+<p>Html:
+</p>
+In html
+. On the line.
+
+In html
+@ On the line.
+
+<p>Verbatim:
+</p>
+<pre class="verbatim">In verbatim
+</pre>;
+
+<pre class="verbatim">In verbatim
+</pre>@
+
+<p>Table:
+</p>
+<dl compact="compact">
+<dt>• a</dt>
+<dd><p>l–ine
+</p></dd>
+</dl>
+<p>+</p>
+<dl compact="compact">
+<dt>• a</dt>
+<dd><p>l–ine
+</p></dd>
+</dl>
+<p>@</p>
+<p>Itemize:
+</p>
+<ul class="toc">
+<li><em> e–mph item</em>
+</li></ul>
+<p>”</p>
+<ul class="toc">
+<li><em> e–mph item</em>
+</li></ul>
+<p>@</p>
+<p>Multitable:
+</p>
+<table>
+<thead><tr><th><p> mu–ltitable headitem </p></th><th><p> another tab
+</p></th></tr></thead>
+<tr><td><p> mu–ltitable item </p></td><td><p> multitable tab
+</p></td></tr>
+</table>
+<p>^</p>
+<table>
+<thead><tr><th><p> mu–ltitable headitem </p></th><th><p> another tab
+</p></th></tr></thead>
+<tr><td><p> mu–ltitable item </p></td><td><p> multitable tab
+</p></td></tr>
+</table>
+<p>{</p>
+<p>Flushleft:
+</p>
+<p align="left">flushleft
+</p><p>!</p>
+<p align="left">flushleft
+</p><p>@</p>
+<p>Copying:
+</p>
+<p>*
+</p>
+<p>@
+</p>
+<p>Copying
+Copying
+</p>
+<p>An html, all on one line:
+</p>
+<p>Hi, my name is Graham.
+</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/symbol_after_block.passfirst
===================================================================
RCS file: Tests/formatting_res/symbol_after_block.passfirst
diff -N Tests/formatting_res/symbol_after_block.passfirst
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Tests/formatting_res/symbol_after_block.passfirst 1 Oct 2007 10:42:01
-0000 1.1
@@ -0,0 +1,84 @@
+symbol_after_block.texi(,2)
+symbol_after_block.texi(,3) @setfilename symbol_after_block.info
+symbol_after_block.texi(,4)
+symbol_after_block.texi(,5) @node Top
+symbol_after_block.texi(,6) @top Symbol after block
+symbol_after_block.texi(,7)
+symbol_after_block.texi(,8) Html:
+symbol_after_block.texi(,9)
+symbol_after_block.texi(,10) @html
+symbol_after_block.texi(,11) In html
+symbol_after_block.texi(,12) @end html. On the line.
+symbol_after_block.texi(,13)
+symbol_after_block.texi(,14) @html
+symbol_after_block.texi(,15) In html
+symbol_after_block.texi(,16) @end html@@ On the line.
+symbol_after_block.texi(,17)
+symbol_after_block.texi(,18) Verbatim:
+symbol_after_block.texi(,19)
+symbol_after_block.texi(,20) @verbatim
+symbol_after_block.texi(,21) In verbatim
+symbol_after_block.texi(,22) @end verbatim;
+symbol_after_block.texi(,23)
+symbol_after_block.texi(,24) @verbatim
+symbol_after_block.texi(,25) In verbatim
+symbol_after_block.texi(,26) @end verbatim@@
+symbol_after_block.texi(,27)
+symbol_after_block.texi(,28) Table:
+symbol_after_block.texi(,29)
+symbol_after_block.texi(,30) @table @bullet
+symbol_after_block.texi(,31) @item a
+symbol_after_block.texi(,32) l--ine
+symbol_after_block.texi(,33) @end table+
+symbol_after_block.texi(,34)
+symbol_after_block.texi(,35) @table @bullet
+symbol_after_block.texi(,36) @item a
+symbol_after_block.texi(,37) l--ine
+symbol_after_block.texi(,38) @end table@@
+symbol_after_block.texi(,39)
+symbol_after_block.texi(,40) Itemize:
+symbol_after_block.texi(,41)
+symbol_after_block.texi(,42) @itemize @emph
+symbol_after_block.texi(,43) @item e--mph item
+symbol_after_block.texi(,44) @end itemize''
+symbol_after_block.texi(,45)
+symbol_after_block.texi(,46) @itemize @emph
+symbol_after_block.texi(,47) @item e--mph item
+symbol_after_block.texi(,48) @end itemize@@
+symbol_after_block.texi(,49)
+symbol_after_block.texi(,50) Multitable:
+symbol_after_block.texi(,51)
+symbol_after_block.texi(,52) @multitable @columnfractions 6 7
+symbol_after_block.texi(,53) @headitem mu--ltitable headitem @tab another tab
+symbol_after_block.texi(,54) @item mu--ltitable item @tab multitable tab
+symbol_after_block.texi(,55) @end multitable^
+symbol_after_block.texi(,56)
+symbol_after_block.texi(,57) @multitable @columnfractions 6 7
+symbol_after_block.texi(,58) @headitem mu--ltitable headitem @tab another tab
+symbol_after_block.texi(,59) @item mu--ltitable item @tab multitable tab
+symbol_after_block.texi(,60) @end address@hidden
+symbol_after_block.texi(,61)
+symbol_after_block.texi(,62) Flushleft:
+symbol_after_block.texi(,63)
+symbol_after_block.texi(,64) @flushleft
+symbol_after_block.texi(,65) flushleft
+symbol_after_block.texi(,66) @end flushleft!
+symbol_after_block.texi(,67)
+symbol_after_block.texi(,68) @flushleft
+symbol_after_block.texi(,69) flushleft
+symbol_after_block.texi(,70) @end flushleft@@
+symbol_after_block.texi(,71)
+symbol_after_block.texi(,72) Copying:
+symbol_after_block.texi(,73)
+symbol_after_block.texi(,76) *
+symbol_after_block.texi(,77)
+symbol_after_block.texi(,80) @@
+symbol_after_block.texi(,81)
+symbol_after_block.texi(,82) @insertcopying
+symbol_after_block.texi(,83)
+symbol_after_block.texi(,84) An html, all on one line:
+symbol_after_block.texi(,85)
+symbol_after_block.texi(,86) Hi, my name is @html
+symbol_after_block.texi(,87) address@hidden html.
+symbol_after_block.texi(,88)
+symbol_after_block.texi(,89) @bye
Index: Tests/formatting_res/symbol_after_block.passtexi
===================================================================
RCS file: Tests/formatting_res/symbol_after_block.passtexi
diff -N Tests/formatting_res/symbol_after_block.passtexi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Tests/formatting_res/symbol_after_block.passtexi 1 Oct 2007 10:42:01
-0000 1.1
@@ -0,0 +1,88 @@
+symbol_after_block.texi(,2)
+symbol_after_block.texi(,3) @setfilename symbol_after_block.info
+symbol_after_block.texi(,4)
+symbol_after_block.texi(,5) @node Top
+symbol_after_block.texi(,6) @top Symbol after block
+symbol_after_block.texi(,7)
+symbol_after_block.texi(,8) Html:
+symbol_after_block.texi(,9)
+symbol_after_block.texi(,10) @html
+symbol_after_block.texi(,11) In html
+symbol_after_block.texi(,12) @end html. On the line.
+symbol_after_block.texi(,13)
+symbol_after_block.texi(,14) @html
+symbol_after_block.texi(,15) In html
+symbol_after_block.texi(,16) @end html@@ On the line.
+symbol_after_block.texi(,17)
+symbol_after_block.texi(,18) Verbatim:
+symbol_after_block.texi(,19)
+symbol_after_block.texi(,20) @verbatim
+symbol_after_block.texi(,21) In verbatim
+symbol_after_block.texi(,22) @end verbatim;
+symbol_after_block.texi(,23)
+symbol_after_block.texi(,24) @verbatim
+symbol_after_block.texi(,25) In verbatim
+symbol_after_block.texi(,26) @end verbatim@@
+symbol_after_block.texi(,27)
+symbol_after_block.texi(,28) Table:
+symbol_after_block.texi(,29)
+symbol_after_block.texi(,30) @table @bullet
+symbol_after_block.texi(,31) @item a
+symbol_after_block.texi(,32) l--ine
+symbol_after_block.texi(,33) @end table+
+symbol_after_block.texi(,34)
+symbol_after_block.texi(,35) @table @bullet
+symbol_after_block.texi(,36) @item a
+symbol_after_block.texi(,37) l--ine
+symbol_after_block.texi(,38) @end table@@
+symbol_after_block.texi(,39)
+symbol_after_block.texi(,40) Itemize:
+symbol_after_block.texi(,41)
+symbol_after_block.texi(,42) @itemize @emph
+symbol_after_block.texi(,43) @item e--mph item
+symbol_after_block.texi(,44) @end itemize''
+symbol_after_block.texi(,45)
+symbol_after_block.texi(,46) @itemize @emph
+symbol_after_block.texi(,47) @item e--mph item
+symbol_after_block.texi(,48) @end itemize@@
+symbol_after_block.texi(,49)
+symbol_after_block.texi(,50) Multitable:
+symbol_after_block.texi(,51)
+symbol_after_block.texi(,52) @multitable @columnfractions 6 7
+symbol_after_block.texi(,53) @headitem mu--ltitable headitem @tab another tab
+symbol_after_block.texi(,54) @item mu--ltitable item @tab multitable tab
+symbol_after_block.texi(,55) @end multitable^
+symbol_after_block.texi(,56)
+symbol_after_block.texi(,57) @multitable @columnfractions 6 7
+symbol_after_block.texi(,58) @headitem mu--ltitable headitem @tab another tab
+symbol_after_block.texi(,59) @item mu--ltitable item @tab multitable tab
+symbol_after_block.texi(,60) @end address@hidden
+symbol_after_block.texi(,61)
+symbol_after_block.texi(,62) Flushleft:
+symbol_after_block.texi(,63)
+symbol_after_block.texi(,64) @flushleft
+symbol_after_block.texi(,65) flushleft
+symbol_after_block.texi(,66) @end flushleft!
+symbol_after_block.texi(,67)
+symbol_after_block.texi(,68) @flushleft
+symbol_after_block.texi(,69) flushleft
+symbol_after_block.texi(,70) @end flushleft@@
+symbol_after_block.texi(,71)
+symbol_after_block.texi(,72) Copying:
+symbol_after_block.texi(,73)
+symbol_after_block.texi(,74) @copying
+symbol_after_block.texi(,75) Copying
+symbol_after_block.texi(,76) @end copying*
+symbol_after_block.texi(,77)
+symbol_after_block.texi(,78) @copying
+symbol_after_block.texi(,79) Copying
+symbol_after_block.texi(,80) @end copying@@
+symbol_after_block.texi(,81)
+symbol_after_block.texi(,82) @insertcopying
+symbol_after_block.texi(,83)
+symbol_after_block.texi(,84) An html, all on one line:
+symbol_after_block.texi(,85)
+symbol_after_block.texi(,86) Hi, my name is @html
+symbol_after_block.texi(,87) address@hidden html.
+symbol_after_block.texi(,88)
+symbol_after_block.texi(,89) @bye
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog NEWS texi2html.init texi2ht...,
Patrice Dumas <=