[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo ChangeLog texi2html/TODO texi2html/texi...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo ChangeLog texi2html/TODO texi2html/texi... |
|
Date: |
Wed, 11 Aug 2010 12:46:09 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/08/11 12:46:09
Modified files:
. : ChangeLog
texi2html : TODO texi2html.pl
texi2html/formats: docbook.init info.init
texi2html/test/formatting: redefine_need.init
texi2html/test/formatting/res/comments_redefine_need: comments.2
texi2html/test/formatting/res_all/comments_redefine_need:
comments.2
texi2html/test/formatting/res_info/comments_redefine_need:
comments.2
texi2html/test/sectioning: Makefile.am tests.txt
Added files:
texi2html/test/sectioning: text_before_line_command.texi
texi2html/test/sectioning/res/text_before_line_command:
text_before_line_command.1
text_before_line_command.2
text_before_line_command.html
texi2html/test/sectioning/res_all/text_before_line_command:
text_before_line_command.1
text_before_line_command.2
text_before_node_command.txt
texi2html/test/sectioning/res_docbook/text_before_line_command:
text_before_line_command.1
text_before_line_command.2
text_before_node_command.xml
texi2html/test/sectioning/res_html/text_before_line_command:
index.html
text_before_line_command.1
text_before_line_command.2
ttt.html
texi2html/test/sectioning/res_info/text_before_line_command:
text_before_line_command.1
text_before_line_command.2
text_before_node_command.info
texi2html/test/sectioning/res_xml/text_before_line_command:
text_before_line_command.1
text_before_line_command.2
text_before_node_command.xml
Log message:
* texi2html/texi2html.pl (enter_author_command): format the
@author text if not already done. Check if command is @author
is now done outside of the function.
* texi2html/texi2html.pl (scan_line): prepare for detection of
commands that are not at the begining of the line though they
should be. Mostly not activated, since modifications to the
processed line leads to spurious error messages.
%begin_line_command hash holds all the commands that should
be at the begining of the line.
Don't treat sectioning commands like any heading command if they
are not at the begining of the line.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1098&r2=1.1099
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/TODO?cvsroot=texinfo&r1=1.197&r2=1.198
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/texi2html.pl?cvsroot=texinfo&r1=1.418&r2=1.419
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/formats/docbook.init?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/formats/info.init?cvsroot=texinfo&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/formatting/redefine_need.init?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/formatting/res/comments_redefine_need/comments.2?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/formatting/res_all/comments_redefine_need/comments.2?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/formatting/res_info/comments_redefine_need/comments.2?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/Makefile.am?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/tests.txt?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/text_before_line_command.texi?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res/text_before_line_command/text_before_line_command.1?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res/text_before_line_command/text_before_line_command.2?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res/text_before_line_command/text_before_line_command.html?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res_all/text_before_line_command/text_before_line_command.1?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res_all/text_before_line_command/text_before_line_command.2?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res_all/text_before_line_command/text_before_node_command.txt?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res_docbook/text_before_line_command/text_before_line_command.1?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res_docbook/text_before_line_command/text_before_line_command.2?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res_docbook/text_before_line_command/text_before_node_command.xml?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res_html/text_before_line_command/index.html?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res_html/text_before_line_command/text_before_line_command.1?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res_html/text_before_line_command/text_before_line_command.2?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res_html/text_before_line_command/ttt.html?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res_info/text_before_line_command/text_before_line_command.1?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res_info/text_before_line_command/text_before_line_command.2?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res_info/text_before_line_command/text_before_node_command.info?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res_xml/text_before_line_command/text_before_line_command.1?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res_xml/text_before_line_command/text_before_line_command.2?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/res_xml/text_before_line_command/text_before_node_command.xml?cvsroot=texinfo&rev=1.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1098
retrieving revision 1.1099
diff -u -b -r1.1098 -r1.1099
--- ChangeLog 10 Aug 2010 00:25:44 -0000 1.1098
+++ ChangeLog 11 Aug 2010 12:46:06 -0000 1.1099
@@ -1,3 +1,17 @@
+2010-08-11 Patrice Dumas <address@hidden>
+
+ * texi2html/texi2html.pl (enter_author_command): format the
+ @author text if not already done. Check if command is @author
+ is now done outside of the function.
+ * texi2html/texi2html.pl (scan_line): prepare for detection of
+ commands that are not at the begining of the line though they
+ should be. Mostly not activated, since modifications to the
+ processed line leads to spurious error messages.
+ %begin_line_command hash holds all the commands that should
+ be at the begining of the line.
+ Don't treat sectioning commands like any heading command if they
+ are not at the begining of the line.
+
2010-08-09 Karl Berry <address@hidden>
* doc/texinfo.txi (Output Elements Defined): rename/edit from
Index: texi2html/TODO
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/TODO,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -b -r1.197 -r1.198
--- texi2html/TODO 6 Aug 2010 10:43:01 -0000 1.197
+++ texi2html/TODO 11 Aug 2010 12:46:06 -0000 1.198
@@ -29,6 +29,9 @@
to bring back some info specific stuff (for info output a tree is done)
in the main program and have maybe something simpler.
+ Also remove all the modification of the texinfo. Instead modify the
+ generated tree.
+
* test --headers --output, and the other order, especially when in
info mode, such that it triggers also plaintext. Also test with
directories and files.
@@ -46,6 +49,14 @@
when formatting the menu_entry. This could allow not having a
colon after menu_entry when there is no description.
+* call a specific function reference to format the @author for
+ a quotation?
+
+* test a mix of misc commands that should be at the begining of a line
+ and those that don't need to (comment c sp refill noindent indent).
+ Test a misc command that should be at the begining of a line followed
+ by another one. And also mix with other type of command.
+
* line breaking could happen after a full width character.
Accordingly, in japanese.texi lines are not cut right.
Index: texi2html/texi2html.pl
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/texi2html.pl,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -b -r1.418 -r1.419
--- texi2html/texi2html.pl 9 Aug 2010 07:27:53 -0000 1.418
+++ texi2html/texi2html.pl 11 Aug 2010 12:46:07 -0000 1.419
@@ -90,7 +90,7 @@
}
# CVS version:
-# $Id: texi2html.pl,v 1.418 2010/08/09 07:27:53 pertusus Exp $
+# $Id: texi2html.pl,v 1.419 2010/08/11 12:46:07 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.gnu.org/software/texinfo/";;
@@ -2213,9 +2213,23 @@
set_no_line_macro($no_line_macro, 1);
}
+# holds all the @-commands that should be at the beginning of a line
+my %begin_line_command = ();
+
+foreach my $command ('node', 'end')
+{
+ $begin_line_command{$command} = $command;
+}
+
foreach my $key (keys(%Texi2HTML::Config::misc_command),
keys(%reference_sec2level))
{
set_no_line_macro($key, 1);
+ $begin_line_command{$key} = $key;
+}
+
+foreach my $misc_not_begin_line('comment', 'c', 'sp', 'refill', 'noindent',
'indent')
+{
+ delete $begin_line_command{$misc_not_begin_line};
}
# a hash associating a format @thing / @end thing with the type of the format
@@ -2279,6 +2293,11 @@
set_no_line_macro("end $macro", 1);
}
+foreach my $format (keys(%format_type))
+{
+ $begin_line_command{$format} = $format_type{$format};
+}
+
# fake format at the bottom of the stack
$format_type{'noformat'} = '';
@@ -2302,6 +2321,12 @@
# raw formats which are expanded especially
my @raw_regions = ('html', 'tex', 'xml', 'docbook');
+
+foreach my $format (keys(%Texi2HTML::Config::texi_formats_map), @raw_regions)
+{
+ $begin_line_command{$format} = $format;
+}
+
foreach my $format (keys(%Texi2HTML::Config::texi_formats_map))
{
push @raw_regions, $format if
($Texi2HTML::Config::texi_formats_map{$format} eq 'raw');
@@ -5815,9 +5840,6 @@
# well defined in html, however...
# @thisfile is the @include file. Should be in $line_nr.
- # Also if that command appears in the texi, the error message is
- # Unknown command address@hidden'
- # It could be better.
my $arg = $line;
$arg =~ s/^\s+//;
set_from_document($command, $arg);
@@ -6196,9 +6218,10 @@
my $stack = shift;
my $state = shift;
my $line_nr = shift;
+
$texi = trim_comment_spaces($texi, "address@hidden");
- if ($command eq 'author')
- {
+ $text = substitute_line($texi, "address@hidden",
duplicate_formatting_state($state)) if (!defined($text));
+
my $top_format = top_stack($stack, 2);
if (defined($top_format) and $format_type{$top_format->{'format'}} eq
'quotation')
{
@@ -6208,7 +6231,6 @@
{
line_warn (sprintf(__("address@hidden not meaningful outside
address@hidden' and address@hidden' environments"), $command), $line_nr);
}
- }
}
# return the line after removing things according to misc_command map.
@@ -6249,7 +6271,7 @@
($command, $line, $result) =
&$Texi2HTML::Config::misc_command_line($command, $line, $args, $stack, $state);
}
- enter_author_command ($command, $line, $result, $stack, $state, $line_nr);
+ enter_author_command ($command, $line, $result, $stack, $state, $line_nr)
if ($command eq 'author');
# for error messages
my $cline = $line;
@@ -14064,24 +14086,26 @@
}
}
+ my $first_command_on_line;
+ my $commands_count = -1;
unless ($state->{'raw'} or $state->{'verb'} or $state->{'keep_texi'})
{
# first the line commands are taken into account
- my $next_command = next_tag($cline);
- if (defined($next_command) and
defined($Texi2HTML::Config::line_command_map{$next_command}))
+ $first_command_on_line = next_tag($cline);
+ if (defined($first_command_on_line) and
defined($Texi2HTML::Config::line_command_map{$first_command_on_line}))
{
- close_paragraph($text, $stack, $state, "address@hidden", $line_nr,
1) if (stop_paragraph_command($next_command));
+ close_paragraph($text, $stack, $state, "address@hidden", $line_nr,
1) if (stop_paragraph_command($first_command_on_line));
my $arg_texi = $cline;
- $arg_texi =~ s/address@hidden//;
- $arg_texi = trim_comment_spaces ($arg_texi, "address@hidden",
$line_nr);
- my $arg_line = substitute_line($arg_texi, "address@hidden",
duplicate_formatting_state($state));
- add_prev ($text, $stack,
&$Texi2HTML::Config::line_command($next_command, $arg_line, $arg_texi, $state));
- enter_author_command ($next_command, $arg_texi, $arg_line, $stack,
$state, $line_nr);
+ $arg_texi =~ s/address@hidden//;
+ $arg_texi = trim_comment_spaces ($arg_texi, "address@hidden",
$line_nr);
+ my $arg_line = substitute_line($arg_texi, "address@hidden",
duplicate_formatting_state($state));
+ add_prev ($text, $stack,
&$Texi2HTML::Config::line_command($first_command_on_line, $arg_line, $arg_texi,
$state));
+ enter_author_command ($first_command_on_line, $arg_texi,
$arg_line, $stack, $state, $line_nr) if ($first_command_on_line eq 'author');
return '';
}
- elsif (defined($next_command) and ($next_command eq 'contents') or
($next_command eq 'summarycontents') or ($next_command eq 'shortcontents'))
+ elsif (defined($first_command_on_line) and ($first_command_on_line eq
'contents') or ($first_command_on_line eq 'summarycontents') or
($first_command_on_line eq 'shortcontents'))
{
- my $element_tag = $next_command;
+ my $element_tag = $first_command_on_line;
$element_tag = 'shortcontents' if ($element_tag ne 'contents');
# at that point the content_element is defined for sure since
# we already saw the tag
@@ -14091,7 +14115,7 @@
my $toc_lines =
&$Texi2HTML::Config::inline_contents($Texi2HTML::THISDOC{'FH'}, $element_tag,
$content_element, address@hidden);
add_prev ($text, $stack, join('',@$toc_lines)) if
(defined($toc_lines));
}
- return '' unless
(exists($Texi2HTML::Config::misc_command{$next_command}) and
$Texi2HTML::Config::misc_command{$next_command}->{'keep'});
+ return '' unless
(exists($Texi2HTML::Config::misc_command{$first_command_on_line}) and
$Texi2HTML::Config::misc_command{$first_command_on_line}->{'keep'});
}
# The commands to ignore are ignored now in case after ignoring them
@@ -14104,6 +14128,9 @@
close_paragraph($text, $stack, $state, "address@hidden", $line_nr,
1) if (stop_paragraph_command($next_tag));
if (defined($next_tag) and
defined($Texi2HTML::Config::misc_command{$next_tag}) and
!$Texi2HTML::Config::misc_command{$next_tag}->{'keep'})
{
+ $commands_count++;
+ # FIXME reenable when it is possible
+ #line_warn (sprintf(__('%s should only appear at the begining
of a line'), $next_tag), $line_nr) if ($commands_count and
$begin_line_command{$next_tag});
$cline =~ s/^(\s*)address@hidden//;
#$leading_spaces .= $1;
add_prev ($text, $stack, do_text($1, $state));
@@ -14280,6 +14307,7 @@
# macro_regexp
if ($cline =~ s/^(address@hidden)address@hidden([a-zA-Z][\w-]*)//)
{
+ $commands_count++;
my $end_tag = $2;
my $prev_text = $1;
if ($state->{'keep_texi'})
@@ -14297,6 +14325,9 @@
#print STDERR "END_MACRO $end_tag\n";
#dump_stack ($text, $stack, $state);
+ # FIXME reenable when it is possible
+ #line_warn (sprintf(__('%s should only appear at the begining of a
line'), 'end'), $line_nr) if ($commands_count or !$first_command_on_line);
+
# 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.
@@ -14415,6 +14446,7 @@
{
my $before_macro = $1;
my $macro = $2;
+ $commands_count++;
$macro = $alias{$macro} if (exists($alias{$macro}));
my $punct;
if (!$state->{'keep_texi'} and $macro eq ':' and $before_macro =~
/(.)$/ and $Texi2HTML::Config::colon_command_punctuation_characters{$1})
@@ -14427,6 +14459,8 @@
#print STDERR "MACRO $macro\n";
#print STDERR "LINE $cline";
#dump_stack ($text, $stack, $state);
+ # FIXME reenable when it is possible
+ #line_warn (sprintf(__('%s should only appear at the begining of a
line'), $macro), $line_nr) if ($begin_line_command{$macro} and ($commands_count
or !$first_command_on_line) and !$state->{'keep_texi'});
close_paragraph($text, $stack, $state, "address@hidden", $line_nr,
1) if (stop_paragraph_command($macro) and !$state->{'keep_texi'});
@@ -14714,7 +14748,7 @@
add_prev($text, $stack,
&$Texi2HTML::Config::def_line_no_texi($category, $name, $type, $arguments));
return;
}
- elsif (defined($sec2level{$macro}))
+ elsif (defined($sec2level{$macro}) and $macro =~ /heading/)
{ #FIXME there is certainly more intelligent stuff to do
my $num;
if ($state->{'region'})
@@ -14737,7 +14771,7 @@
}
# handle the other macros, we are in the context of normal text
- if (defined($sec2level{$macro}))
+ if (defined($sec2level{$macro}) and $macro =~ /heading/)
{
#dump_stack($text, $stack, $state);
my $num;
@@ -14757,8 +14791,7 @@
add_prev($text, $stack,
&$Texi2HTML::Config::heading($heading_element, $macro, $cline,
substitute_line($cline, "address@hidden"), $state->{'preformatted'}));
return;
}
-
- if (index_command_prefix($macro) ne '')
+ elsif (index_command_prefix($macro) ne '')
{
my $index_name = index_command_prefix($macro);
my $entry_texi = trim_comment_spaces($cline, "address@hidden",
$line_nr);
@@ -14779,7 +14812,7 @@
# on the next line, though.
return;
}
- if ($macro eq 'insertcopying')
+ elsif ($macro eq 'insertcopying')
{
#close_paragraph($text, $stack, $state, $line_nr);
add_prev($text, $stack, do_insertcopying($state, $line_nr));
@@ -14787,7 +14820,7 @@
begin_paragraph ($stack, $state) if ($state->{'preformatted'});
return;
}
- if ($macro =~ /^itemx?$/o or ($macro eq 'headitem'))
+ elsif ($macro =~ /^itemx?$/o or ($macro eq 'headitem'))
{
#print STDERR "ITEM: $cline";
#dump_stack($text, $stack, $state);
@@ -14878,7 +14911,7 @@
next;
}
- if ($macro eq 'tab')
+ elsif ($macro eq 'tab')
{
abort_empty_preformatted($stack, $state);
# FIXME let the user be able not to close the paragraph?
@@ -14913,7 +14946,7 @@
next;
}
# Macro opening a format (table, list, deff, example...)
- if ($format_type{$macro} and ($format_type{$macro} ne 'fake'))
+ elsif ($format_type{$macro} and ($format_type{$macro} ne 'fake'))
{
my $ignore_center = 0;
# @center is forbidden in @-command with braces, @*table
@@ -15316,7 +15349,6 @@
if ($format->{'cell'} <= $format->{'max_columns'})
{
- #print STDERR "ADD_CELL, really, really\n";
add_prev($text, $stack, &$Texi2HTML::Config::cell($cell->{'text'},
$row->{'item_cmd'}, $format->{'columnfractions'}, $format->{'prototype_row'},
$format->{'prototype_lengths'}, $format->{'max_columns'},
$cell->{'only_inter_commands'}, $format->{'first'}));
}
$format->{'cell'}++;
@@ -15637,6 +15669,10 @@
{
line_error (sprintf(__("%c%s expected braces"), ord('@'),
$macro), $line_nr);
}
+ elsif ($begin_line_command{$macro})
+ {
+ line_error (sprintf(__("Unexpected command `%s' here"), $macro),
$line_nr);
+ }
else
{
line_error (sprintf(__("Unknown command `%s'"), $macro),
$line_nr);
Index: texi2html/formats/docbook.init
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/formats/docbook.init,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- texi2html/formats/docbook.init 15 Jul 2010 12:27:00 -0000 1.37
+++ texi2html/formats/docbook.init 11 Aug 2010 12:46:07 -0000 1.38
@@ -661,6 +661,7 @@
my $state = shift;
#print STDERR "$macro $line";
#print STDERR "ARGS @$args\n" if defined ($args);
+ #my $result_text = undef;
my $result_text = undef;
if ($macro eq 'c' or $macro eq 'comment' and scalar(@$args))
{
Index: texi2html/formats/info.init
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/formats/info.init,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- texi2html/formats/info.init 15 Jul 2010 12:27:00 -0000 1.57
+++ texi2html/formats/info.init 11 Aug 2010 12:46:07 -0000 1.58
@@ -912,6 +912,7 @@
$followed_by_blank_line = 1 if (defined($text_next) and
$text_next =~ /^\s*$/);
}
}
+
if ($info_default_indented_commands{$content->{'command'}})
{
$indent_level--;
@@ -1217,7 +1218,7 @@
my $index_line_nr = $all_line_passed +
$info_state->{'line_count'};
if ($info_state->{'blank_line'} and
$content->{'index_command'} =~ /index$/)
{
- my ($current_next, $index_next, $close_nex) =
info_default_iterator_next($current, $index, $close);
+ my ($current_next, $index_next, $close_next) =
info_default_iterator_next($current, $index, $close);
$index_line_nr-- if (!defined($current_next));
}
elsif ($content->{'index_command'} =~ /^[vf]table$/)
@@ -3371,8 +3372,7 @@
{
info_default_open_command ($state, $command, {'format_name' =>
$format});
}
- # this should have already been done for @item when the line
- # is modified by the @-command and so on.
+ # this allows removing blank space in front of the item or tab argument
return $line;
}
Index: texi2html/test/formatting/redefine_need.init
===================================================================
RCS file:
/sources/texinfo/texinfo/texi2html/test/formatting/redefine_need.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- texi2html/test/formatting/redefine_need.init 18 Aug 2008 18:03:00
-0000 1.1
+++ texi2html/test/formatting/redefine_need.init 11 Aug 2010 12:46:08
-0000 1.2
@@ -1,3 +1,5 @@
+# test that @need is redefined, and evenheading is kept ans leads to
+# an error message.
$misc_command{'need'}->{'keep'} = 1;
$misc_command{'evenheading'}->{'keep'} = 1;
Index: texi2html/test/formatting/res/comments_redefine_need/comments.2
===================================================================
RCS file:
/sources/texinfo/texinfo/texi2html/test/formatting/res/comments_redefine_need/comments.2,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- texi2html/test/formatting/res/comments_redefine_need/comments.2 22 Dec
2009 23:27:41 -0000 1.12
+++ texi2html/test/formatting/res/comments_redefine_need/comments.2 11 Aug
2010 12:46:08 -0000 1.13
@@ -1,4 +1,4 @@
comments.texi:212: @clickstyle should only accept a @-command as argument, not
`something'
-comments.texi:49: Unknown command `evenheading'
+comments.texi:49: Unexpected command `evenheading' here
comments.texi:53: warning: need has the right arg: 0.1
comments.texi:55: warning: need has the right arg: 0.1
Index: texi2html/test/formatting/res_all/comments_redefine_need/comments.2
===================================================================
RCS file:
/sources/texinfo/texinfo/texi2html/test/formatting/res_all/comments_redefine_need/comments.2,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- texi2html/test/formatting/res_all/comments_redefine_need/comments.2 22 Dec
2009 23:27:42 -0000 1.8
+++ texi2html/test/formatting/res_all/comments_redefine_need/comments.2 11 Aug
2010 12:46:08 -0000 1.9
@@ -1,4 +1,4 @@
comments.texi:212: @clickstyle should only accept a @-command as argument, not
`something'
-comments.texi:49: Unknown command `evenheading'
+comments.texi:49: Unexpected command `evenheading' here
comments.texi:53: warning: need has the right arg: 0.1
comments.texi:55: warning: need has the right arg: 0.1
Index: texi2html/test/formatting/res_info/comments_redefine_need/comments.2
===================================================================
RCS file:
/sources/texinfo/texinfo/texi2html/test/formatting/res_info/comments_redefine_need/comments.2,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- texi2html/test/formatting/res_info/comments_redefine_need/comments.2
22 Dec 2009 23:27:43 -0000 1.8
+++ texi2html/test/formatting/res_info/comments_redefine_need/comments.2
11 Aug 2010 12:46:08 -0000 1.9
@@ -1,4 +1,4 @@
comments.texi:212: @clickstyle should only accept a @-command as argument, not
`something'
-comments.texi:49: Unknown command `evenheading'
+comments.texi:49: Unexpected command `evenheading' here
comments.texi:53: warning: need has the right arg: 0.1
comments.texi:55: warning: need has the right arg: 0.1
Index: texi2html/test/sectioning/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/test/sectioning/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- texi2html/test/sectioning/Makefile.am 20 Jul 2010 07:26:33 -0000
1.2
+++ texi2html/test/sectioning/Makefile.am 11 Aug 2010 12:46:08 -0000
1.3
@@ -26,7 +26,7 @@
section_chapter_before_top_nodes.texi section_chapter_before_top.texi \
part_node_appendix.texi part_appendix.texi part_node_part_appendix.texi \
part_node_part_node_appendix.texi part_node_node_part_appendix.texi \
- other_at_comands_in_nodes_refs.texi \
+ other_at_comands_in_nodes_refs.texi text_before_line_command.texi \
test_directions.init test_renamed_nodes.init tests.txt renamednodes.cnf-ref \
res res_all res_info res_docbook res_xml res_html
Index: texi2html/test/sectioning/tests.txt
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/test/sectioning/tests.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- texi2html/test/sectioning/tests.txt 9 Aug 2010 07:27:55 -0000 1.3
+++ texi2html/test/sectioning/tests.txt 11 Aug 2010 12:46:08 -0000 1.4
@@ -105,7 +105,7 @@
part_node_part_node_appendix part_node_part_node_appendix.texi
part_node_node_part_appendix part_node_node_part_appendix.texi
empty_top_node_up menu-whitespace.texi --set-init-var TOP_NODE_UP
-#text_before_line_command text_before_line_command.texi
+text_before_line_command text_before_line_command.texi
test_refs_docbook test_refs.texi --docbook
at_commands_in_refs_info at_commands_in_refs.texi --init info.init
Index: texi2html/test/sectioning/text_before_line_command.texi
===================================================================
RCS file: texi2html/test/sectioning/text_before_line_command.texi
diff -N texi2html/test/sectioning/text_before_line_command.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/test/sectioning/text_before_line_command.texi 11 Aug 2010
12:46:08 -0000 1.1
@@ -0,0 +1,30 @@
+\input texinfo @c -*-texinfo-*-
+
+before setfilename @setfilename text_before_node_command.info
+
+before title @title the title
+
address@hidden Top
address@hidden test text before a node
+
address@hidden
+* LD Version Scripts::
+* ttt::
address@hidden menu
+
address@hidden LD Version Scripts
+--- @chapter LD Version Scripts
+
+ddd @contents
+
address@hidden
+aaa @author quotation author
+quotation
address@hidden quotation
+
address@hidden ttt
address@hidden ttt chap
+
address@hidden
+
address@hidden
Index:
texi2html/test/sectioning/res/text_before_line_command/text_before_line_command.1
===================================================================
RCS file:
texi2html/test/sectioning/res/text_before_line_command/text_before_line_command.1
diff -N
texi2html/test/sectioning/res/text_before_line_command/text_before_line_command.1
Index:
texi2html/test/sectioning/res/text_before_line_command/text_before_line_command.2
===================================================================
RCS file:
texi2html/test/sectioning/res/text_before_line_command/text_before_line_command.2
diff -N
texi2html/test/sectioning/res/text_before_line_command/text_before_line_command.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
texi2html/test/sectioning/res/text_before_line_command/text_before_line_command.2
11 Aug 2010 12:46:08 -0000 1.1
@@ -0,0 +1,3 @@
+text_before_line_command.texi:11: Menu reference to nonexistent node `LD
Version Scripts'
+text_before_line_command.texi:15: Unexpected command `node' here
+text_before_line_command.texi:16: Unexpected command `chapter' here
Index:
texi2html/test/sectioning/res/text_before_line_command/text_before_line_command.html
===================================================================
RCS file:
texi2html/test/sectioning/res/text_before_line_command/text_before_line_command.html
diff -N
texi2html/test/sectioning/res/text_before_line_command/text_before_line_command.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
texi2html/test/sectioning/res/text_before_line_command/text_before_line_command.html
11 Aug 2010 12:46:08 -0000 1.1
@@ -0,0 +1,255 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texi2html, http://www.gnu.org/software/texinfo/ -->
+<head>
+<title>the title</title>
+
+<meta name="description" content="the title">
+<meta name="keywords" content="the title">
+<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}
+blockquote.smallquotation {font-size: smaller}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+div.smalldisplay {margin-left: 3.2em}
+div.smallexample {margin-left: 3.2em}
+div.smalllisp {margin-left: 3.2em}
+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.nocodebreak {white-space:pre}
+span.nolinebreak {white-space:pre}
+span.roman {font-family:serif; font-weight:normal}
+span.sansserif {font-family:sans-serif; font-weight:normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<p>before setfilename </p>
+<p>before title </p>
+<a name="Top"></a>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[ << ]</td>
+<td valign="middle" align="left">[ < ]</td>
+<td valign="middle" align="left">[ Up ]</td>
+<td valign="middle" align="left">[<a href="#ttt" title="Next section in
reading order"> > </a>]</td>
+<td valign="middle" align="left">[<a href="#ttt" title="Next chapter">
>> </a>]</td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left">[<a href="#Top" title="Cover (top) of
document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of
contents">Contents</a>]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
+</tr></table>
+<a name="test-text-before-a-node"></a>
+<h1 class="chapter">1 test text before a node</h1>
+
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top">• LD Version
Scripts</td><td> </td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top"><a href="#ttt">2 ttt
chap</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<p>address@hidden LD Version Scripts
+— </p>@chapter LD Version Scripts
+
+<p>ddd
+</p>
+<blockquote>
+<p>aaa quotation
+</p></blockquote>
+<p align="center">— <em>quotation author</em>
+</p>
+<hr>
+<a name="ttt"></a>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this
chapter or previous chapter"> << </a>]</td>
+<td valign="middle" align="left">[<a href="#Top" title="Previous section in
reading order"> < </a>]</td>
+<td valign="middle" align="left">[ Up ]</td>
+<td valign="middle" align="left">[ > ]</td>
+<td valign="middle" align="left">[ >> ]</td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left">[<a href="#Top" title="Cover (top) of
document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of
contents">Contents</a>]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
+</tr></table>
+<a name="ttt-chap"></a>
+<h1 class="chapter">2 ttt chap</h1>
+
+
+<hr size="6">
+<a name="SEC_Contents"></a>
+<table class="header" 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="#SEC_Contents" title="Table of
contents">Contents</a>]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
+</tr></table>
+<h1>Table of Contents</h1>
+
+<div class="contents">
+
+<ul class="no-bullet">
+ <li><a name="toc-test-text-before-a-node" href="#Top">1 test text before a
node</a></li>
+ <li><a name="toc-ttt-chap" href="#ttt">2 ttt chap</a></li>
+</ul>
+</div>
+<hr>
+<a name="SEC_Overview"></a>
+<table class="header" 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="#SEC_Contents" title="Table of
contents">Contents</a>]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
+</tr></table>
+<h1>Short Table of Contents</h1>
+
+<div class="shortcontents">
+<ul class="no-bullet">
+<li><a name="stoc-test-text-before-a-node" href="#Top">1 test text before a
node</a></li>
+<li><a name="stoc-ttt-chap" href="#ttt">2 ttt chap</a></li>
+</ul>
+</div>
+<hr>
+<a name="SEC_About"></a>
+<table class="header" 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="#SEC_Contents" title="Table of
contents">Contents</a>]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
+</tr></table>
+<h1>About This Document</h1>
+
+<p>
+ This document was generated on <em>a sunny day</em> using <a
href="http://www.gnu.org/software/texinfo/";><em>texi2html</em></a>.
+</p>
+<p>
+ The buttons in the navigation panels have the following meaning:
+</p>
+<table border="1">
+ <tr>
+ <th> Button </th>
+ <th> Name </th>
+ <th> Go to </th>
+ <th> From 1.2.3 go to</th>
+ </tr>
+ <tr>
+ <td align="center"> [ << ] </td>
+ <td align="center">FastBack</td>
+ <td>Beginning of this chapter or previous chapter</td>
+ <td>1</td>
+ </tr>
+ <tr>
+ <td align="center"> [ < ] </td>
+ <td align="center">Back</td>
+ <td>Previous section in reading order</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td align="center"> [ Up ] </td>
+ <td align="center">Up</td>
+ <td>Up section</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td align="center"> [ > ] </td>
+ <td align="center">Forward</td>
+ <td>Next section in reading order</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td align="center"> [ >> ] </td>
+ <td align="center">FastForward</td>
+ <td>Next chapter</td>
+ <td>2</td>
+ </tr>
+ <tr>
+ <td align="center"> [Top] </td>
+ <td align="center">Top</td>
+ <td>Cover (top) of document</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [Contents] </td>
+ <td align="center">Contents</td>
+ <td>Table of contents</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [Index] </td>
+ <td align="center">Index</td>
+ <td>Index</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [ ? ] </td>
+ <td align="center">About</td>
+ <td>About (help)</td>
+ <td> </td>
+ </tr>
+</table>
+
+<p>
+ where the <strong> Example </strong> assumes that the current position is at
<strong> Subsubsection One-Two-Three </strong> of a document of the following
structure:
+</p>
+
+<ul>
+ <li> 1. Section One
+ <ul>
+ <li>1.1 Subsection One-One
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+ <li>1.2 Subsection One-Two
+ <ul>
+ <li>1.2.1 Subsubsection One-Two-One</li>
+ <li>1.2.2 Subsubsection One-Two-Two</li>
+ <li>1.2.3 Subsubsection One-Two-Three
+ <strong><== Current Position </strong></li>
+ <li>1.2.4 Subsubsection One-Two-Four</li>
+ </ul>
+ </li>
+ <li>1.3 Subsection One-Three
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+ <li>1.4 Subsection One-Four</li>
+ </ul>
+ </li>
+</ul>
+
+<hr>
+<p>
+ <font size="-1">
+ This document was generated on <em>a sunny day</em> using <a
href="http://www.gnu.org/software/texinfo/";><em>texi2html</em></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>
Index:
texi2html/test/sectioning/res_all/text_before_line_command/text_before_line_command.1
===================================================================
RCS file:
texi2html/test/sectioning/res_all/text_before_line_command/text_before_line_command.1
diff -N
texi2html/test/sectioning/res_all/text_before_line_command/text_before_line_command.1
Index:
texi2html/test/sectioning/res_all/text_before_line_command/text_before_line_command.2
===================================================================
RCS file:
texi2html/test/sectioning/res_all/text_before_line_command/text_before_line_command.2
diff -N
texi2html/test/sectioning/res_all/text_before_line_command/text_before_line_command.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
texi2html/test/sectioning/res_all/text_before_line_command/text_before_line_command.2
11 Aug 2010 12:46:08 -0000 1.1
@@ -0,0 +1,3 @@
+text_before_line_command.texi:11: Menu reference to nonexistent node `LD
Version Scripts'
+text_before_line_command.texi:15: Unexpected command `node' here
+text_before_line_command.texi:16: Unexpected command `chapter' here
Index:
texi2html/test/sectioning/res_all/text_before_line_command/text_before_node_command.txt
===================================================================
RCS file:
texi2html/test/sectioning/res_all/text_before_line_command/text_before_node_command.txt
diff -N
texi2html/test/sectioning/res_all/text_before_line_command/text_before_node_command.txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
texi2html/test/sectioning/res_all/text_before_line_command/text_before_node_command.txt
11 Aug 2010 12:46:08 -0000 1.1
@@ -0,0 +1,25 @@
+before setfilename
+before title
+1 test text before a node
+*************************
+
+* LD Version Scripts::
+* ttt::
+
address@hidden LD Version Scripts
+-- @chapter LD Version Scripts
+
+ddd
+
+aaa quotation
+
+2 ttt chap
+**********
+
+Short Table of Contents
+***********************
+
+1 test text before a node
+2 ttt chap
+
+
Index:
texi2html/test/sectioning/res_docbook/text_before_line_command/text_before_line_command.1
===================================================================
RCS file:
texi2html/test/sectioning/res_docbook/text_before_line_command/text_before_line_command.1
diff -N
texi2html/test/sectioning/res_docbook/text_before_line_command/text_before_line_command.1
Index:
texi2html/test/sectioning/res_docbook/text_before_line_command/text_before_line_command.2
===================================================================
RCS file:
texi2html/test/sectioning/res_docbook/text_before_line_command/text_before_line_command.2
diff -N
texi2html/test/sectioning/res_docbook/text_before_line_command/text_before_line_command.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
texi2html/test/sectioning/res_docbook/text_before_line_command/text_before_line_command.2
11 Aug 2010 12:46:08 -0000 1.1
@@ -0,0 +1,2 @@
+text_before_line_command.texi:15: Unexpected command `node' here
+text_before_line_command.texi:16: Unexpected command `chapter' here
Index:
texi2html/test/sectioning/res_docbook/text_before_line_command/text_before_node_command.xml
===================================================================
RCS file:
texi2html/test/sectioning/res_docbook/text_before_line_command/text_before_node_command.xml
diff -N
texi2html/test/sectioning/res_docbook/text_before_line_command/text_before_node_command.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
texi2html/test/sectioning/res_docbook/text_before_line_command/text_before_node_command.xml
11 Aug 2010 12:46:08 -0000 1.1
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"; [
+ <!ENTITY tex "TeX">
+ <!ENTITY latex "LaTeX">
+]>
+<book id="text_before_node_command.xml" lang="en">
+<para>before setfilename </para>
+<para>before title </para>
+<chapter label="1" id="Top">
+<title>test text before a node</title>
+
+
+<para>address@hidden LD Version Scripts
+— </para>@chapter LD Version Scripts
+
+<para>ddd
+</para>
+<blockquote><attribution>quotation author</attribution>
+<para>aaa quotation
+</para></blockquote>
+
+</chapter>
+<chapter label="2" id="ttt">
+<title>ttt chap</title>
+
+
+</chapter>
+</book>
Index: texi2html/test/sectioning/res_html/text_before_line_command/index.html
===================================================================
RCS file: texi2html/test/sectioning/res_html/text_before_line_command/index.html
diff -N texi2html/test/sectioning/res_html/text_before_line_command/index.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/test/sectioning/res_html/text_before_line_command/index.html
11 Aug 2010 12:46:08 -0000 1.1
@@ -0,0 +1,86 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texi2html, http://www.gnu.org/software/texinfo/ -->
+<head>
+<title>the title: Top</title>
+
+<meta name="description" content="the title: Top">
+<meta name="keywords" content="the title: Top">
+<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">
+<link href="#Top" rel="start" title="the title">
+<link href="#SEC_Contents" rel="contents" title="Table of Contents">
+<link href="text_before_node_command_abt.html#SEC_About" rel="help"
title="About This Document">
+<link href="ttt.html#ttt" rel="next" title="ttt">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.smallquotation {font-size: smaller}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+div.smalldisplay {margin-left: 3.2em}
+div.smallexample {margin-left: 3.2em}
+div.smalllisp {margin-left: 3.2em}
+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.nocodebreak {white-space:pre}
+span.nolinebreak {white-space:pre}
+span.roman {font-family:serif; font-weight:normal}
+span.sansserif {font-family:sans-serif; font-weight:normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<p>before setfilename </p>
+<p>before title </p>
+<a name="Top"></a>
+<div class="header">
+<p>
+Next: <a href="LD-Version-Scripts.html#LD-Version-Scripts" accesskey="n"
rel="next">LD Version Scripts</a>, Up: <a href="../dir/index.html#Top"
accesskey="u" rel="up">(dir)</a> [<a href="#SEC_Contents" title="Table
of contents" rel="contents">Contents</a>]</p>
+</div>
+<hr>
+<a name="test-text-before-a-node"></a>
+<h1 class="chapter">1 test text before a node</h1>
+
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top">• LD Version
Scripts:</td><td> </td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">• <a href="ttt.html#ttt"
accesskey="2">ttt</a>:</td><td> </td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<p>address@hidden LD Version Scripts
+— </p>@chapter LD Version Scripts
+
+<p>ddd
+</p>
+<blockquote>
+<p>aaa quotation
+</p></blockquote>
+<p align="center">— <em>quotation author</em>
+</p>
+<hr>
+<div class="header">
+<p>
+Next: <a href="LD-Version-Scripts.html#LD-Version-Scripts" accesskey="n"
rel="next">LD Version Scripts</a>, Up: <a href="../dir/index.html#Top"
accesskey="u" rel="up">(dir)</a> [<a href="#SEC_Contents" title="Table
of contents" rel="contents">Contents</a>]</p>
+</div>
+<p>
+
+
+</p>
+</body>
+</html>
Index:
texi2html/test/sectioning/res_html/text_before_line_command/text_before_line_command.1
===================================================================
RCS file:
texi2html/test/sectioning/res_html/text_before_line_command/text_before_line_command.1
diff -N
texi2html/test/sectioning/res_html/text_before_line_command/text_before_line_command.1
Index:
texi2html/test/sectioning/res_html/text_before_line_command/text_before_line_command.2
===================================================================
RCS file:
texi2html/test/sectioning/res_html/text_before_line_command/text_before_line_command.2
diff -N
texi2html/test/sectioning/res_html/text_before_line_command/text_before_line_command.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
texi2html/test/sectioning/res_html/text_before_line_command/text_before_line_command.2
11 Aug 2010 12:46:09 -0000 1.1
@@ -0,0 +1,3 @@
+text_before_line_command.texi:11: Menu reference to nonexistent node `LD
Version Scripts'
+text_before_line_command.texi:15: Unexpected command `node' here
+text_before_line_command.texi:16: Unexpected command `chapter' here
Index: texi2html/test/sectioning/res_html/text_before_line_command/ttt.html
===================================================================
RCS file: texi2html/test/sectioning/res_html/text_before_line_command/ttt.html
diff -N texi2html/test/sectioning/res_html/text_before_line_command/ttt.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/test/sectioning/res_html/text_before_line_command/ttt.html
11 Aug 2010 12:46:09 -0000 1.1
@@ -0,0 +1,73 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texi2html, http://www.gnu.org/software/texinfo/ -->
+<head>
+<title>the title: ttt</title>
+
+<meta name="description" content="the title: ttt">
+<meta name="keywords" content="the title: ttt">
+<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">
+<link href="index.html#Top" rel="start" title="the title">
+<link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
+<link href="text_before_node_command_abt.html#SEC_About" rel="help"
title="About This Document">
+<link href="index.html#Top" rel="previous" title="Top">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.smallquotation {font-size: smaller}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+div.smalldisplay {margin-left: 3.2em}
+div.smallexample {margin-left: 3.2em}
+div.smalllisp {margin-left: 3.2em}
+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.nocodebreak {white-space:pre}
+span.nolinebreak {white-space:pre}
+span.roman {font-family:serif; font-weight:normal}
+span.sansserif {font-family:sans-serif; font-weight:normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<a name="ttt"></a>
+<div class="header">
+<p>
+Previous: <a href="index.html#Top" accesskey="p" rel="previous">Top</a>
[<a href="index.html#SEC_Contents" title="Table of contents"
rel="contents">Contents</a>]</p>
+</div>
+<hr>
+<a name="ttt-chap"></a>
+<h1 class="chapter">2 ttt chap</h1>
+
+<a name="SEC_Overview"></a>
+<h1>Short Table of Contents</h1>
+
+<div class="shortcontents">
+<ul class="no-bullet">
+<li><a name="stoc-test-text-before-a-node"
href="index.html#toc-test-text-before-a-node">1 test text before a node</a></li>
+<li><a name="stoc-ttt-chap" href="index.html#toc-ttt-chap">2 ttt chap</a></li>
+</ul>
+</div>
+
+
+<p>
+
+
+</p>
+</body>
+</html>
Index:
texi2html/test/sectioning/res_info/text_before_line_command/text_before_line_command.1
===================================================================
RCS file:
texi2html/test/sectioning/res_info/text_before_line_command/text_before_line_command.1
diff -N
texi2html/test/sectioning/res_info/text_before_line_command/text_before_line_command.1
Index:
texi2html/test/sectioning/res_info/text_before_line_command/text_before_line_command.2
===================================================================
RCS file:
texi2html/test/sectioning/res_info/text_before_line_command/text_before_line_command.2
diff -N
texi2html/test/sectioning/res_info/text_before_line_command/text_before_line_command.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
texi2html/test/sectioning/res_info/text_before_line_command/text_before_line_command.2
11 Aug 2010 12:46:09 -0000 1.1
@@ -0,0 +1,3 @@
+text_before_line_command.texi:11: Menu reference to nonexistent node `LD
Version Scripts'
+text_before_line_command.texi:15: Unexpected command `node' here
+text_before_line_command.texi:16: Unexpected command `chapter' here
Index:
texi2html/test/sectioning/res_info/text_before_line_command/text_before_node_command.info
===================================================================
RCS file:
texi2html/test/sectioning/res_info/text_before_line_command/text_before_node_command.info
diff -N
texi2html/test/sectioning/res_info/text_before_line_command/text_before_node_command.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
texi2html/test/sectioning/res_info/text_before_line_command/text_before_node_command.info
11 Aug 2010 12:46:09 -0000 1.1
@@ -0,0 +1,39 @@
+This is text_before_node_command.info, produced by makeinfo version 4.13
+from text_before_line_command.texi.
+
+before setfilename
+
+ before title
+
+
+File: text_before_node_command.info, Node: Top, Next: LD Version Scripts,
Up: (dir)
+
+1 test text before a node
+*************************
+
+* Menu:
+
+* LD Version Scripts::
+* ttt::
+
+ i LD Version Scripts --
address@hidden LD Version Scripts
+
+ ddd
+
+ aaa quotation
+ -- _quotation author_
+
+
+File: text_before_node_command.info, Node: ttt, Prev: Top
+
+2 ttt chap
+**********
+
+
+
+Tag Table:
+Node: Top147
+Node: ttt458
+
+End Tag Table
Index:
texi2html/test/sectioning/res_xml/text_before_line_command/text_before_line_command.1
===================================================================
RCS file:
texi2html/test/sectioning/res_xml/text_before_line_command/text_before_line_command.1
diff -N
texi2html/test/sectioning/res_xml/text_before_line_command/text_before_line_command.1
Index:
texi2html/test/sectioning/res_xml/text_before_line_command/text_before_line_command.2
===================================================================
RCS file:
texi2html/test/sectioning/res_xml/text_before_line_command/text_before_line_command.2
diff -N
texi2html/test/sectioning/res_xml/text_before_line_command/text_before_line_command.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
texi2html/test/sectioning/res_xml/text_before_line_command/text_before_line_command.2
11 Aug 2010 12:46:09 -0000 1.1
@@ -0,0 +1,3 @@
+text_before_line_command.texi:11: Menu reference to nonexistent node `LD
Version Scripts'
+text_before_line_command.texi:15: Unexpected command `node' here
+text_before_line_command.texi:16: Unexpected command `chapter' here
Index:
texi2html/test/sectioning/res_xml/text_before_line_command/text_before_node_command.xml
===================================================================
RCS file:
texi2html/test/sectioning/res_xml/text_before_line_command/text_before_node_command.xml
diff -N
texi2html/test/sectioning/res_xml/text_before_line_command/text_before_node_command.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
texi2html/test/sectioning/res_xml/text_before_line_command/text_before_node_command.xml
11 Aug 2010 12:46:09 -0000 1.1
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V4.12//EN"
"http://www.gnu.org/software/texinfo/dtd/4.12/texinfo.dtd";>
+<texinfo xml:lang="en">
+
+<para>before setfilename
<setfilename>text_before_node_command.xml</setfilename>
+</para>
+<para>before title <booktitle>the title</booktitle>
+</para>
+<node>
+<nodename>Top</nodename>
+<nodenext>LD Version Scripts</nodenext>
+<nodeup>(dir)</nodeup>
+</node>
+<chapter>
+<title>test text before a node</title>
+
+<menu>
+<menuentry>
+<menunode>LD Version Scripts</menunode>
+<menutitle>LD Version Scripts</menutitle>
+<menucomment>
+</menucomment>
+</menuentry><menuentry>
+<menunode>ttt</menunode>
+<menutitle>ttt</menutitle>
+<menucomment>
+</menucomment>
+</menuentry></menu>
+
+<para>address@hidden LD Version Scripts
+— </para>@chapter LD Version Scripts
+
+<para>ddd <contents></contents>
+</para>
+<quotation>
+<para>aaa <author>quotation author</author>
+quotation
+</para></quotation>
+
+</chapter>
+<node>
+<nodename>ttt</nodename>
+<nodeprev>Top</nodeprev>
+</node>
+<chapter>
+<title>ttt chap</title>
+
+<shortcontents></shortcontents>
+
+</chapter>
+</texinfo>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo ChangeLog texi2html/TODO texi2html/texi...,
Patrice Dumas <=