[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht... |
|
Date: |
Sun, 18 Jan 2009 00:59:34 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 09/01/18 00:59:34
Modified files:
. : ChangeLog TODO texi2html.init texi2html.pl
examples : info.init
test/coverage : tests.txt
test/coverage/res/comments: comments.html
test/coverage/res/pass0_macros: pass0_macros.html
test/formatting/res/comments_redefine_need: comments.html
test/macros : tests.txt
test/macros/res/macro_in_misc: macro_in_misc.html
test/macros/res/value_in_misc: value_in_misc_valid.html
test/manuals/res/texinfo: texinfo_21.html texinfo_4.html
texinfo_9.html
test/manuals/res/texinfo_nodes: Top-Node-Naming.html
headings-on-off.html
makeinfo-advantages.html
test/misc/res/viper_chapter_split: viper_2.html
test/misc/res/viper_unsplit: viper.html
test/tar_manual/res/tar: tar.html
test/xemacs_manual/res/xemacs: xemacs.html xemacs_32.html
xemacs_4.html
test/xemacs_manual/res/xemacs_frame: xemacs.html xemacs_32.html
xemacs_4.html
Log message:
* texi2html.pl, texi2html.init: ignore more text and remove more
end of lines after @-commands.
Ignore @-commands prior from detecting empty lines, to allow
for stopping paragraphs when there are only @-commands to be
ignored that don't swallow end of lines.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.363&r2=1.364
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.177&r2=1.178
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.260&r2=1.261
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/info.init?cvsroot=texi2html&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/tests.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/comments/comments.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/pass0_macros/pass0_macros.html?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/comments_redefine_need/comments.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/tests.txt?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/macro_in_misc/macro_in_misc.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/value_in_misc/value_in_misc_valid.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texinfo/texinfo_21.html?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texinfo/texinfo_4.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texinfo/texinfo_9.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texinfo_nodes/Top-Node-Naming.html?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texinfo_nodes/headings-on-off.html?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texinfo_nodes/makeinfo-advantages.html?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res/viper_chapter_split/viper_2.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res/viper_unsplit/viper.html?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/tar_manual/res/tar/tar.html?cvsroot=texi2html&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/xemacs_manual/res/xemacs/xemacs.html?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/xemacs_manual/res/xemacs/xemacs_32.html?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/xemacs_manual/res/xemacs/xemacs_4.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/xemacs_manual/res/xemacs_frame/xemacs.html?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/xemacs_manual/res/xemacs_frame/xemacs_32.html?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/xemacs_manual/res/xemacs_frame/xemacs_4.html?cvsroot=texi2html&r1=1.6&r2=1.7
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -b -r1.363 -r1.364
--- ChangeLog 17 Jan 2009 14:30:41 -0000 1.363
+++ ChangeLog 18 Jan 2009 00:59:29 -0000 1.364
@@ -1,5 +1,13 @@
2009-01-17 Patrice Dumas <address@hidden>
+ * texi2html.pl, texi2html.init: ignore more text and remove more
+ end of lines after @-commands.
+ Ignore @-commands prior from detecting empty lines, to allow
+ for stopping paragraphs when there are only @-commands to be
+ ignored that don't swallow end of lines.
+
+2009-01-17 Patrice Dumas <address@hidden>
+
* texi2html.pl, texi2html.init: consider the @itemize argument
either as an @-command or a leading text, not both, and remove
spaces in @itemize arguments better.
Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- TODO 17 Jan 2009 14:30:42 -0000 1.81
+++ TODO 18 Jan 2009 00:59:30 -0000 1.82
@@ -415,3 +415,5 @@
* @chapter following a @appendix still uses a number for numbering, and
is not affected by the @appendix number
+
+* @syncodeindex and @finalout should swallow end of line
Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -b -r1.177 -r1.178
--- texi2html.init 17 Jan 2009 14:30:42 -0000 1.177
+++ texi2html.init 18 Jan 2009 00:59:30 -0000 1.178
@@ -12,7 +12,7 @@
# Afterwards, load the file with command-line
# option -init-file <your_init_file>
#
-# $Id: texi2html.init,v 1.177 2009/01/17 14:30:42 pertusus Exp $
+# $Id: texi2html.init,v 1.178 2009/01/18 00:59:30 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -4150,9 +4150,10 @@
'paragraphindent' => {'skip' => 'line', 'arg' => 1}, # arg none asis
# or a number and forbids anything else on the
line
'firstparagraphindent' => {'skip' => 'line', 'arg' => 1}, # none insert
- 'frenchspacing' => {'arg' => 1}, # on off
+ 'frenchspacing' => {'arg' => 1, 'skip' => 'line'}, # on off
+ #Â not so sure about 'skip' => 'line'
'fonttextsize' => {'arg' => 1}, # 10 11
- 'allowcodebreaks' => {'arg' => 1}, # false or true
+ 'allowcodebreaks' => {'arg' => 1, 'skip' => 'line'}, # false or true
'exampleindent' => {'skip' => 'line', 'arg' => 1}, # asis or a number
'footnotestyle'=> {'skip' => 'line', 'arg' => 1}, # end and separate
# and nothing else on the line
@@ -4193,8 +4194,7 @@
# language code arg
'kbdinputstyle' => {'skip' => 'whitespace', 'arg' => 1}, # code
#example distinct
- 'everyheadingmarks' => {'skip' => 'whitespace', 'arg' => 1}, # top
bottom
- #makeinfo ignore line
+ 'everyheadingmarks' => {'skip' => 'line', 'arg' => 1}, # top bottom
'everyfootingmarks' => {'skip' => 'whitespace', 'arg' => 1},
'evenheadingmarks' => {'skip' => 'whitespace', 'arg' => 1},
'oddheadingmarks' => {'skip' => 'whitespace', 'arg' => 1},
@@ -4214,10 +4214,11 @@
'cropmarks' => {}, # no arg
# miscalleneous
'verbatiminclude'=> {'skip' => 'line'},
- 'documentencoding' => {'arg' => 1}, # makeinfo ignore the whole line
+ 'documentencoding' => {'arg' => 1, 'skip' => 'line'},
# ???
'filbreak' => {},
- # obsolete @-commands
+ # obsolete @-commands. Remove spaces and end of lines after the
+ #Â commands? If no, they can lead to empty lines
'quote-arg' => {},
'allow-recursion' => {},
);
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -b -r1.260 -r1.261
--- texi2html.pl 17 Jan 2009 14:30:42 -0000 1.260
+++ texi2html.pl 18 Jan 2009 00:59:30 -0000 1.261
@@ -74,7 +74,7 @@
}
# CVS version:
-# $Id: texi2html.pl,v 1.260 2009/01/17 14:30:42 pertusus Exp $
+# $Id: texi2html.pl,v 1.261 2009/01/18 00:59:30 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -5007,10 +5007,8 @@
}
($remaining, $skipped, $args) =
&$Texi2HTML::Config::preserve_misc_command($line, $macro);
-#print STDERR "ZZZZZZZZZZZ r $remaining ZZ a @$args ZZZZ s `$skipped'\n" if
($keep);
return ($skipped.$remaining) if ($keep);
- return $remaining if ($remaining ne '');
- return undef;
+ return $remaining;
}
# merge the things appearing before the first @node or sectionning command
@@ -7431,7 +7429,7 @@
#print STDERR "after scan_line: $cline";
#dump_stack(\$text, address@hidden, \%state);
next if (@stack);
- if ($text ne '' )
+ if ($text ne '')
{
push @{$Texi2HTML::THIS_SECTION}, $text;
$text = '';
@@ -11730,6 +11728,27 @@
}
}
}
+
+ #Â The commands to ignore are ignored now in case after ignoring them
+ #Â there is an empty line, to be able to stop the paragraph
+ my $leading_spaces = '';
+ while (1)
+ {
+ my $next_tag = next_tag($cline);
+ if (defined($next_tag) and
defined($Texi2HTML::Config::misc_command{$next_tag}) and
!$Texi2HTML::Config::misc_command{$next_tag}->{'keep'})
+ {
+ $cline =~ s/^(\s*)address@hidden//;
+ $leading_spaces .= $1;
+ $cline = misc_command_text($cline, $next_tag, $stack, $state,
$text, $line_nr);
+ }
+ else
+ {
+ last;
+ }
+ }
+ add_prev ($text, $stack, $leading_spaces);
+ return '' if (!defined($cline) or $cline eq '');
+
my $top_stack = top_stack($stack);
if (($top_stack->{'format'} and $top_stack->{'format'} eq
'menu_description') or $state->{'raw'} or $state->{'preformatted'} or
$state->{'no_paragraph'} or $state->{'keep_texi'} or $state->{'remove_texi'})
{ # empty lines are left unmodified in these contexts.
Index: examples/info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/info.init,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- examples/info.init 17 Jan 2009 14:30:43 -0000 1.17
+++ examples/info.init 18 Jan 2009 00:59:30 -0000 1.18
@@ -390,7 +390,10 @@
my $word = $1;
$pending_word = '' if (!defined($pending_word));
$pending_word .= $word;
- if (length($pending_spaces)+length($pending_word) +
$line_char_counter > $info_default_max_column)
+ # The $line_char_counter != 0 is here to cope with the case of a
+ # word longer than $line_char_counter followed by more letters:
+ #Â a line would be passed each time some text is appended.
+ if ((length($pending_spaces)+length($pending_word) +
$line_char_counter > $info_default_max_column) and $line_char_counter != 0)
{
$pending_spaces = '';
$result .= "\n";
@@ -495,8 +498,6 @@
my $preformatted = 0;
my $indent_level = 0;
my $exdent_line = 0;
- my $indent_para;
- my $noindent_para;
my $item_pending;
my $in_exdent = 0;
my $in_para = 0;
@@ -558,9 +559,9 @@
{
$pending_spaces = '';
$in_para = 0;
- $indent_para = undef;
- $noindent_para = undef;
- $text_added = $content->{'end'};
+ $info_state->{'indent_para'} = undef;
+ $info_state->{'noindent_para'} = undef;
+ $text_added = "\n" unless ($line_char_counter == 0);
$info_state->{'waiting_for_line'} = 1;
# FIXME needed?
goto new_text;
@@ -619,7 +620,7 @@
{
($current, $index, $close) =
info_default_skip_spaces($current, $index, $close);
$content->{'begin'} = ' ' x $info_default_para_indent_length
if
- ($line_char_counter == 0 and !($indent_level) and
($indent_para or (!$noindent_para and $content->{'paragraph_in_element_nr'})));
+ ($line_char_counter == 0 and !($indent_level) and
($info_state->{'indent_para'} or (!$info_state->{'noindent_para'} and
$content->{'paragraph_in_element_nr'})));
$in_para = 1;
}
elsif ($content->{'command'} eq 'preformatted')
@@ -633,11 +634,11 @@
}
elsif ($content->{'command'} eq 'indent')
{
- $indent_para = 1;
+ $info_state->{'indent_para'} = 1;
}
elsif ($content->{'command'} eq 'noindent')
{
- $noindent_para = 1;
+ $info_state->{'noindent_para'} = 1;
}
elsif ($content->{'command'} eq 'image')
{
@@ -1071,7 +1072,7 @@
{
}
- return info_default_close_command(undef, undef, 'paragraph', undef, undef,
undef, '', undef, "\n", {'paragraph_in_element_nr' =>
($info_state->{'paragraph_in_element_nr'} -1), 'top_stack' => $top_stack});
+ return info_default_close_command(undef, undef, 'paragraph', undef, undef,
undef, '', undef, undef, {'paragraph_in_element_nr' =>
($info_state->{'paragraph_in_element_nr'} -1), 'top_stack' => $top_stack});
}
sub info_default_preformatted($$$$$$$$$$$$)
@@ -1797,8 +1798,8 @@
my $max_len =
$info_default_index_line_string_length{$info_index_entry_ref->{'index_name'}};
my $line_nr_spaces = sprintf("%${max_len}d", $line_nr);
my $line_part = "(line ${line_nr_spaces})";
-print STDERR "GGGGGGGGGG name: $info_index_entry_ref->{'index_name'} max:
${max_len} line_nr: `$line_nr' line_nr_spaces `$line_nr_spaces' $line_part \n";
- if (length($result)+length($line_part) > $info_default_max_column)
+#print STDERR "GGGGGGGGGG name: $info_index_entry_ref->{'index_name'} max:
${max_len} line_nr: `$line_nr' line_nr_spaces `$line_nr_spaces' $line_part \n";
+ if (length($result)+length($line_part) +1 > $info_default_max_column)
{
$result .= "\n" . ' ' x ($info_default_max_column -
length($line_part)) ;
}
Index: test/coverage/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/coverage/tests.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/coverage/tests.txt 18 Aug 2008 18:02:09 -0000 1.1
+++ test/coverage/tests.txt 18 Jan 2009 00:59:30 -0000 1.2
@@ -8,3 +8,4 @@
pass0_macros pass0_macros.texi
float float.texi
imbrications imbrications.texi
+comments_info comments.texi -init info.init
Index: test/coverage/res/comments/comments.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/coverage/res/comments/comments.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/coverage/res/comments/comments.html 3 Nov 2008 23:24:18 -0000
1.6
+++ test/coverage/res/comments/comments.html 18 Jan 2009 00:59:31 -0000
1.7
@@ -101,16 +101,9 @@
<p>@paragraphindent asis @paragraphindent 0 @paragraphindent none
@paragraphindent 4 @firstparagraphindent none @exampleindent 6 @exampleindent 6
@footnotestyle @footnotestyle </p>
<p>Special arg for documentencoding. makeinfo complains, not tex
</p>
-<p>@documentencoding encoding name
-
address@hidden
address@hidden
address@hidden
address@hidden on line following everyheadingmarks
-
-<code>false
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</code>
+<p>@documentencoding @frenchspacing @frenchspacing @fonttextsize
address@hidden <code>false
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</code>
</p>
-
<p><code>true
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</code>
</p>
@@ -119,8 +112,8 @@
<p>And now finalout:
Text line followed by finalout on the same line and another below
-
-Text line after the finalout followed by a fianlout
+</p>
+<p>Text line after the finalout followed by a fianlout
Text line after the text line followed by the finalout.
</p>
<p>Test text after finalout
@@ -133,8 +126,8 @@
noindent on the preceding line
noindent after space at beginning of line
page at beginning of line
-
-After page on it’s own line.
+</p>
+<p>After page on it’s own line.
</p>
<p>@page @noindent @refill @novalidate something
</p>
Index: test/coverage/res/pass0_macros/pass0_macros.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/coverage/res/pass0_macros/pass0_macros.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/coverage/res/pass0_macros/pass0_macros.html 1 Nov 2008 18:26:29
-0000 1.5
+++ test/coverage/res/pass0_macros/pass0_macros.html 18 Jan 2009 00:59:31
-0000 1.6
@@ -79,8 +79,8 @@
<p>before syncodeindex
</p>
<p>syncodeindex on its line
-
-line following syncodeindex
+</p>
+<p>line following syncodeindex
</p>
<p>One more thing following syncodeindex
truc
Index: test/formatting/res/comments_redefine_need/comments.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/comments_redefine_need/comments.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/formatting/res/comments_redefine_need/comments.html 3 Nov 2008
23:24:21 -0000 1.6
+++ test/formatting/res/comments_redefine_need/comments.html 18 Jan 2009
00:59:31 -0000 1.7
@@ -105,16 +105,9 @@
<p>@paragraphindent asis @paragraphindent 0 @paragraphindent none
@paragraphindent 4 @firstparagraphindent none @exampleindent 6 @exampleindent 6
@footnotestyle @footnotestyle </p>
<p>Special arg for documentencoding. makeinfo complains, not tex
</p>
-<p>@documentencoding encoding name
-
address@hidden
address@hidden
address@hidden
address@hidden on line following everyheadingmarks
-
-<code>false
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</code>
+<p>@documentencoding @frenchspacing @frenchspacing @fonttextsize
address@hidden <code>false
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</code>
</p>
-
<p><code>true
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</code>
</p>
@@ -123,8 +116,8 @@
<p>And now finalout:
Text line followed by finalout on the same line and another below
-
-Text line after the finalout followed by a fianlout
+</p>
+<p>Text line after the finalout followed by a fianlout
Text line after the text line followed by the finalout.
</p>
<p>Test text after finalout
@@ -137,8 +130,8 @@
noindent on the preceding line
noindent after space at beginning of line
page at beginning of line
-
-After page on it’s own line.
+</p>
+<p>After page on it’s own line.
</p>
<p>@page @noindent @refill @novalidate something
</p>
Index: test/macros/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/macros/tests.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/macros/tests.txt 9 Jan 2009 21:20:45 -0000 1.7
+++ test/macros/tests.txt 18 Jan 2009 00:59:31 -0000 1.8
@@ -47,6 +47,7 @@
macros_in_pass0_macros macros_in_pass0_macros.texi -init makeinfo.init
node-expand node-expand.texi -init makeinfo.init
node-expand_xml node-expand.texi -init xml.init
+node-expand_info node-expand.texi -init info.init
include-value include-value.texi
value_in_misc value_in_misc_valid.texi --iftex
macro_in_misc macro_in_misc.texi
Index: test/macros/res/macro_in_misc/macro_in_misc.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/macros/res/macro_in_misc/macro_in_misc.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/macros/res/macro_in_misc/macro_in_misc.html 3 Nov 2008 23:24:26
-0000 1.6
+++ test/macros/res/macro_in_misc/macro_in_misc.html 18 Jan 2009 00:59:31
-0000 1.7
@@ -87,13 +87,8 @@
-
-
-
-
<p><code>false
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</code>
</p>
-
<p><code>true
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</code>
</p>
<a name="command-removed"></a>
@@ -108,8 +103,8 @@
noindent on the preceding line
noindent after space at beginning of line
page at beginning of line
-
-After page on it’s own line.
+</p>
+<p>After page on it’s own line.
</p>
<p>@page @noindent @refill
</p>
Index: test/macros/res/value_in_misc/value_in_misc_valid.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/macros/res/value_in_misc/value_in_misc_valid.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/macros/res/value_in_misc/value_in_misc_valid.html 3 Nov 2008
23:24:26 -0000 1.6
+++ test/macros/res/value_in_misc/value_in_misc_valid.html 18 Jan 2009
00:59:31 -0000 1.7
@@ -101,8 +101,8 @@
noindent on the preceding line
noindent after space at beginning of line
page at beginning of line
-
-After page on it’s own line.
+</p>
+<p>After page on it’s own line.
</p>
<p>@page @noindent @refill
</p>
Index: test/manuals/res/texinfo/texinfo_21.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/manuals/res/texinfo/texinfo_21.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/manuals/res/texinfo/texinfo_21.html 23 Dec 2008 10:55:32 -0000
1.7
+++ test/manuals/res/texinfo/texinfo_21.html 18 Jan 2009 00:59:31 -0000
1.8
@@ -177,8 +177,8 @@
of three ways: from an operating system shell, from a shell inside
Emacs, or by typing the <kbd>C-c C-m C-r</kbd> or the <kbd>C-c C-m C-b</kbd>
command in Texinfo mode in Emacs.
-
</p>
+
<p>The <code>texinfo-format-region</code> and the
<code>texinfo-format-buffer</code>
commands are useful if you cannot run <code>makeinfo</code>. Also, in some
circumstances, they format short regions or buffers more quickly than
Index: test/manuals/res/texinfo/texinfo_4.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res/texinfo/texinfo_4.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/manuals/res/texinfo/texinfo_4.html 1 Nov 2008 18:27:50 -0000
1.6
+++ test/manuals/res/texinfo/texinfo_4.html 18 Jan 2009 00:59:32 -0000
1.7
@@ -1174,8 +1174,8 @@
</dd>
<dt> <code>@headings single</code></dt>
<dd><p>Turn on page headings appropriate for single-sided printing.
-
</p>
+
</dd>
<dt> <code>@headings double</code></dt>
<dt> <code>@headings on</code></dt>
Index: test/manuals/res/texinfo/texinfo_9.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res/texinfo/texinfo_9.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/manuals/res/texinfo/texinfo_9.html 1 Nov 2008 18:27:50 -0000
1.6
+++ test/manuals/res/texinfo/texinfo_9.html 18 Jan 2009 00:59:32 -0000
1.7
@@ -758,8 +758,8 @@
provide a meaningful section topic or title in the printed cross
reference (instead of the word ‘Top’), you must write an
appropriate
entry for the third argument to the <code>@xref</code> command.
-
</p>
+
<p>Thus, to make a cross reference to <cite>The GNU Make Manual</cite>,
write:
</p>
Index: test/manuals/res/texinfo_nodes/Top-Node-Naming.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/manuals/res/texinfo_nodes/Top-Node-Naming.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/manuals/res/texinfo_nodes/Top-Node-Naming.html 1 Nov 2008 18:28:03
-0000 1.5
+++ test/manuals/res/texinfo_nodes/Top-Node-Naming.html 18 Jan 2009 00:59:32
-0000 1.6
@@ -90,8 +90,8 @@
provide a meaningful section topic or title in the printed cross
reference (instead of the word ‘Top’), you must write an
appropriate
entry for the third argument to the <code>@xref</code> command.
-
</p>
+
<p>Thus, to make a cross reference to <cite>The GNU Make Manual</cite>,
write:
</p>
Index: test/manuals/res/texinfo_nodes/headings-on-off.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/manuals/res/texinfo_nodes/headings-on-off.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/manuals/res/texinfo_nodes/headings-on-off.html 1 Nov 2008 18:28:07
-0000 1.5
+++ test/manuals/res/texinfo_nodes/headings-on-off.html 18 Jan 2009 00:59:32
-0000 1.6
@@ -99,8 +99,8 @@
</dd>
<dt> <code>@headings single</code></dt>
<dd><p>Turn on page headings appropriate for single-sided printing.
-
</p>
+
</dd>
<dt> <code>@headings double</code></dt>
<dt> <code>@headings on</code></dt>
Index: test/manuals/res/texinfo_nodes/makeinfo-advantages.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/manuals/res/texinfo_nodes/makeinfo-advantages.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/manuals/res/texinfo_nodes/makeinfo-advantages.html 1 Nov 2008
18:28:08 -0000 1.4
+++ test/manuals/res/texinfo_nodes/makeinfo-advantages.html 18 Jan 2009
00:59:32 -0000 1.5
@@ -90,8 +90,8 @@
of three ways: from an operating system shell, from a shell inside
Emacs, or by typing the <kbd>C-c C-m C-r</kbd> or the <kbd>C-c C-m C-b</kbd>
command in Texinfo mode in Emacs.
-
</p>
+
<p>The <code>texinfo-format-region</code> and the
<code>texinfo-format-buffer</code>
commands are useful if you cannot run <code>makeinfo</code>. Also, in some
circumstances, they format short regions or buffers more quickly than
Index: test/misc/res/viper_chapter_split/viper_2.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/misc/res/viper_chapter_split/viper_2.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/misc/res/viper_chapter_split/viper_2.html 1 Nov 2008 18:28:19
-0000 1.6
+++ test/misc/res/viper_chapter_split/viper_2.html 18 Jan 2009 00:59:32
-0000 1.7
@@ -546,8 +546,8 @@
See <a href="../emacs/Recursive-Edit.html#Recursive-Edit">Recursive Edit:
(emacs)Recursive Edit</a> section ‘Recursive Edit’ in <cite>The GNU
Emacs Manual</cite>.
At user level 1, <kbd>C-g</kbd> is bound to <code>viper-info-on-file</code>
function instead.
-
-</p></dd>
+</p>
+</dd>
<dt> <kbd>C-\</kbd></dt>
<dd><a name="index-C_002d_005c"></a>
<a name="index-Meta-key-1"></a>
@@ -659,8 +659,8 @@
command will appear in the history list. This is because having <kbd>:r</kbd>
alone as a default is meaningless, since this command requires a file
argument.
-
-</p></dd>
+</p>
+</dd>
</dl>
<p>As Vi, Viper’s destructive commands can be re-executed by typing
‘<kbd>.</kbd>’.
However, in addition, Viper keeps track of the history of such commands. This
Index: test/misc/res/viper_unsplit/viper.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/misc/res/viper_unsplit/viper.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/misc/res/viper_unsplit/viper.html 3 Nov 2008 23:24:29 -0000
1.9
+++ test/misc/res/viper_unsplit/viper.html 18 Jan 2009 00:59:32 -0000
1.10
@@ -671,8 +671,8 @@
See <a href="emacs.html#Recursive-Edit">Recursive Edit: (emacs)Recursive
Edit</a> section ‘Recursive Edit’ in <cite>The GNU Emacs
Manual</cite>.
At user level 1, <kbd>C-g</kbd> is bound to <code>viper-info-on-file</code>
function instead.
-
-</p></dd>
+</p>
+</dd>
<dt> <kbd>C-\</kbd></dt>
<dd><a name="index-C_002d_005c"></a>
<a name="index-Meta-key-1"></a>
@@ -784,8 +784,8 @@
command will appear in the history list. This is because having <kbd>:r</kbd>
alone as a default is meaningless, since this command requires a file
argument.
-
-</p></dd>
+</p>
+</dd>
</dl>
<p>As Vi, Viper’s destructive commands can be re-executed by typing
‘<kbd>.</kbd>’.
However, in addition, Viper keeps track of the history of such commands. This
Index: test/tar_manual/res/tar/tar.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/tar_manual/res/tar/tar.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- test/tar_manual/res/tar/tar.html 26 Nov 2008 19:09:05 -0000 1.13
+++ test/tar_manual/res/tar/tar.html 18 Jan 2009 00:59:33 -0000 1.14
@@ -888,8 +888,8 @@
</p>
<p>When reporting a bug, please be sure to include as much detail as
possible, in order to reproduce it.
-
-.
+</p>
+<p>.
</p>
<hr size="6">
<a name="Tutorial"></a>
@@ -1077,8 +1077,8 @@
of the operations and options have no short or “old” forms;
however,
the operations and options which we will cover in this tutorial have
corresponding abbreviations.
-
-We will indicate those abbreviations appropriately to get
+</p>
+<p>We will indicate those abbreviations appropriately to get
you used to seeing them. (Note that the “old style” option forms
exist in <acronym>GNU</acronym> <code>tar</code> for compatibility with Unix
<code>tar</code>. In this book we present a full discussion of this way
@@ -2996,9 +2996,9 @@
example contains only old style option letters (repeating option
‘<samp>c</samp>’ twice), not all of which are meaningful (eg.,
‘<samp>.</samp>’,
‘<samp>h</samp>’, or ‘<samp>i</samp>’), with no
argument value.
-
</p>
+
<hr size="6">
<a name="All-Options"></a>
<table cellpadding="1" cellspacing="1" border="0">
@@ -6975,9 +6975,9 @@
files to store names of other files which you can then call as
arguments to <code>tar</code> (this can help you save time if you expect to
archive the same list of files a number of times), and so forth.
+</p>
-</p>
<p>If there are too many files to conveniently list on the command line,
you can list the names in a file, and <code>tar</code> will read that file.
@@ -11030,9 +11030,9 @@
the file is read <strong>twice</strong>. So, always bear in mind that the
time needed to process all files with this option is roughly twice
the time needed to archive them without it.
+</p>
-</p>
<a name="index-sparse-formats_002c-defined"></a>
<p>When using ‘<samp>POSIX</samp>’ archive format,
<acronym>GNU</acronym> <code>tar</code> is able to store
@@ -13271,9 +13271,9 @@
specified number of archive files on the tape. This will allow you
to move to the beginning of an archive before extracting or reading
it, or to the end of all the archives before writing a new one.
+</p>
-</p>
<p>The syntax of the <code>mt</code> command is:
</p>
@@ -14422,8 +14422,8 @@
member name. One way this situation can occur is if more than one
version of a file has been stored in the archive. For information
about adding new versions of a file to an archive, see <a
href="#update">Updating an Archive</a>.
-
</p>
+
<p>In addition to entries describing archive members, an archive may
contain entries which <code>tar</code> itself uses to store information.
See section <a href="#label">Including a Label in the Archive</a>, for an
example of such an archive entry.
@@ -15719,8 +15719,8 @@
option specifies output <em>format</em>: a comma-separated list of
<code>struct stat</code> fields to be displayed. This list can contain
following identifiers
-
-:
+</p>
+<p>:
</p>
<dl compact="compact">
<dt> name</dt>
Index: test/xemacs_manual/res/xemacs/xemacs.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/xemacs_manual/res/xemacs/xemacs.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/xemacs_manual/res/xemacs/xemacs.html 1 Nov 2008 18:32:16 -0000
1.5
+++ test/xemacs_manual/res/xemacs/xemacs.html 18 Jan 2009 00:59:33 -0000
1.6
@@ -64,8 +64,8 @@
except that the sections entitled “The GNU Manifesto”,
“Distribution” and “GNU General Public License” may be
included in a
translation approved by the author instead of in the original English.
-
-</p><a name="Top"></a>
+</p>
+<a name="Top"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#Top" title="Cover (top) of
document">Top</a>]</td>
<td valign="middle" align="left">[<a href="xemacs_toc.html#SEC_Contents"
title="Table of contents">Contents</a>]</td>
Index: test/xemacs_manual/res/xemacs/xemacs_32.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/xemacs_manual/res/xemacs/xemacs_32.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/xemacs_manual/res/xemacs/xemacs_32.html 1 Nov 2008 18:32:20
-0000 1.4
+++ test/xemacs_manual/res/xemacs/xemacs_32.html 18 Jan 2009 00:59:33
-0000 1.5
@@ -426,8 +426,8 @@
companies don’t succeed, this will show that advertising was not really
necessary to spread GNU. Why is it that free market advocates don’t want
to let the free market decide this?
-
-</p><blockquote><p>“My company needs a proprietary operating system
+</p>
+<blockquote><p>“My company needs a proprietary operating system
to get a competitive edge.”
</p></blockquote>
@@ -581,8 +581,8 @@
Artificial Intelligence Lab for far less money than they could have had
anywhere else. They got many kinds of non-monetary rewards: fame and
appreciation, for example. And creativity is also fun, a reward in itself.
-
-Then most of them left when offered a chance to do the same interesting
+</p>
+<p>Then most of them left when offered a chance to do the same interesting
work for a lot of money.
</p>
<p>What the facts show is that people will program for reasons other than
@@ -631,8 +631,8 @@
himself, he can take a credit against the tax. He can donate to
the project of his own choosing—often, chosen because he hopes to
use the results when
-
-it is done. He can take a credit for any amount
+</p>
+<p>it is done. He can take a credit for any amount
of donation up to the total tax he had to pay.
</p>
<p>The total tax rate could be decided by a vote of the payers of
Index: test/xemacs_manual/res/xemacs/xemacs_4.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/xemacs_manual/res/xemacs/xemacs_4.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/xemacs_manual/res/xemacs/xemacs_4.html 1 Nov 2008 18:32:21 -0000
1.6
+++ test/xemacs_manual/res/xemacs/xemacs_4.html 18 Jan 2009 00:59:33 -0000
1.7
@@ -82,8 +82,8 @@
<em>XEmacs windows</em> inside the X window that contains the XEmacs frame.
You can even have multiple frames in different X windows, each with
their own set of subwindows.
-
-</p></dd>
+</p>
+</dd>
</dl>
<p>Each XEmacs frame displays a variety of information:
Index: test/xemacs_manual/res/xemacs_frame/xemacs.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/xemacs_manual/res/xemacs_frame/xemacs.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/xemacs_manual/res/xemacs_frame/xemacs.html 1 Nov 2008 18:32:23
-0000 1.5
+++ test/xemacs_manual/res/xemacs_frame/xemacs.html 18 Jan 2009 00:59:33
-0000 1.6
@@ -64,8 +64,8 @@
except that the sections entitled “The GNU Manifesto”,
“Distribution” and “GNU General Public License” may be
included in a
translation approved by the author instead of in the original English.
-
-</p><a name="Top"></a>
+</p>
+<a name="Top"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#Top" title="Cover (top) of
document">Top</a>]</td>
<td valign="middle" align="left">[<a href="xemacs_toc.html#SEC_Contents"
title="Table of contents">Contents</a>]</td>
Index: test/xemacs_manual/res/xemacs_frame/xemacs_32.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/xemacs_manual/res/xemacs_frame/xemacs_32.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/xemacs_manual/res/xemacs_frame/xemacs_32.html 1 Nov 2008 18:32:26
-0000 1.4
+++ test/xemacs_manual/res/xemacs_frame/xemacs_32.html 18 Jan 2009 00:59:33
-0000 1.5
@@ -426,8 +426,8 @@
companies don’t succeed, this will show that advertising was not really
necessary to spread GNU. Why is it that free market advocates don’t want
to let the free market decide this?
-
-</p><blockquote><p>“My company needs a proprietary operating system
+</p>
+<blockquote><p>“My company needs a proprietary operating system
to get a competitive edge.”
</p></blockquote>
@@ -581,8 +581,8 @@
Artificial Intelligence Lab for far less money than they could have had
anywhere else. They got many kinds of non-monetary rewards: fame and
appreciation, for example. And creativity is also fun, a reward in itself.
-
-Then most of them left when offered a chance to do the same interesting
+</p>
+<p>Then most of them left when offered a chance to do the same interesting
work for a lot of money.
</p>
<p>What the facts show is that people will program for reasons other than
@@ -631,8 +631,8 @@
himself, he can take a credit against the tax. He can donate to
the project of his own choosing—often, chosen because he hopes to
use the results when
-
-it is done. He can take a credit for any amount
+</p>
+<p>it is done. He can take a credit for any amount
of donation up to the total tax he had to pay.
</p>
<p>The total tax rate could be decided by a vote of the payers of
Index: test/xemacs_manual/res/xemacs_frame/xemacs_4.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/xemacs_manual/res/xemacs_frame/xemacs_4.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/xemacs_manual/res/xemacs_frame/xemacs_4.html 1 Nov 2008 18:32:27
-0000 1.6
+++ test/xemacs_manual/res/xemacs_frame/xemacs_4.html 18 Jan 2009 00:59:33
-0000 1.7
@@ -82,8 +82,8 @@
<em>XEmacs windows</em> inside the X window that contains the XEmacs frame.
You can even have multiple frames in different X windows, each with
their own set of subwindows.
-
-</p></dd>
+</p>
+</dd>
</dl>
<p>Each XEmacs frame displays a variety of information: