[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: |
Wed, 02 Sep 2009 15:32:25 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 09/09/02 15:32:21
Modified files:
. : ChangeLog TODO texi2html.init texi2html.pl
test/formatting: Makefile.in
test/formatting/res/images: images.2 images.html
test/formatting/res/images_docbook: images.2
test/formatting/res_all/images: images.2 images.txt
test/formatting/res_all/images_docbook: images.2
test/formatting/res_info/images: images.2 images.info
test/formatting/res_info/images_docbook: images.2
test/sectionning: Makefile.am Makefile.in tests.txt
Added files:
test/sectionning: weird_at_commands_in_nodes.texi
test/sectionning/res/weird_at_commands_in_nodes:
weird_at_commands_in_nodes.1
weird_at_commands_in_nodes.2
weird_at_commands_in_nodes.html
test/sectionning/res_all/weird_at_commands_in_nodes:
weird_at_commands_in_nodes.1
weird_at_commands_in_nodes.2
weird_at_commands_in_nodes.txt
test/sectionning/res_docbook/weird_at_commands_in_nodes:
weird_at_commands_in_nodes.1
weird_at_commands_in_nodes.2
weird_at_commands_in_nodes.xml
test/sectionning/res_html/weird_at_commands_in_nodes: a-.html
a.html
index.html
weird_at_commands_in_nodes.1
weird_at_commands_in_nodes.2
test/sectionning/res_info/weird_at_commands_in_nodes:
weird_at_commands_in_nodes.1
weird_at_commands_in_nodes.2
weird_at_commands_in_nodes.info
test/sectionning/res_xml/weird_at_commands_in_nodes:
weird_at_commands_in_nodes.1
weird_at_commands_in_nodes.2
weird_at_commands_in_nodes.xml
Log message:
* texi2html.pl, texi2html.init: take into account @ when
removing spaces at the end of texinfo strings.
Improve node name parsing and parse node name in menu taking
into
account @-commands that may protect some separator characters.
Fixes http://savannah.gnu.org/bugs/?8218.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.418&r2=1.419
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.131&r2=1.132
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.224&r2=1.225
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.319&r2=1.320
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/Makefile.in?cvsroot=texi2html&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/images/images.2?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/images/images.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/images_docbook/images.2?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/images/images.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/images/images.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/images_docbook/images.2?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/images/images.2?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/images/images.info?cvsroot=texi2html&rev=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/images_docbook/images.2?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/Makefile.am?cvsroot=texi2html&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/Makefile.in?cvsroot=texi2html&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/tests.txt?cvsroot=texi2html&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/weird_at_commands_in_nodes.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/weird_at_commands_in_nodes/weird_at_commands_in_nodes.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_all/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_all/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_all/weird_at_commands_in_nodes/weird_at_commands_in_nodes.txt?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_docbook/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_docbook/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_docbook/weird_at_commands_in_nodes/weird_at_commands_in_nodes.xml?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_html/weird_at_commands_in_nodes/a-.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_html/weird_at_commands_in_nodes/a.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_html/weird_at_commands_in_nodes/index.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_html/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_html/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_info/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_info/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_info/weird_at_commands_in_nodes/weird_at_commands_in_nodes.info?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_xml/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_xml/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_xml/weird_at_commands_in_nodes/weird_at_commands_in_nodes.xml?cvsroot=texi2html&rev=1.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -b -r1.418 -r1.419
--- ChangeLog 30 Aug 2009 23:11:27 -0000 1.418
+++ ChangeLog 2 Sep 2009 15:32:08 -0000 1.419
@@ -1,3 +1,11 @@
+2009-09-02 Patrice Dumas <address@hidden>
+
+ * texi2html.pl, texi2html.init: take into account @ when
+ removing spaces at the end of texinfo strings.
+ Improve node name parsing and parse node name in menu taking into
+ account @-commands that may protect some separator characters.
+ Fixes http://savannah.gnu.org/bugs/?8218.
+
2009-08-31 Patrice Dumas <address@hidden>
* texi2html.*: handle better @kbdinputstyle.
Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- TODO 30 Aug 2009 23:11:27 -0000 1.131
+++ TODO 2 Sep 2009 15:32:08 -0000 1.132
@@ -3,9 +3,6 @@
Before next release
-------------------
-* there is also undocumented features @hsep and @vsep to insert
- horizontal and vertical rules.
-
* sectionning/nodes_test html style, the @top and the @node Top,
although distinct nodes end up in the same element. I think that
there is a FIXME in the code covering that issue.
@@ -17,43 +14,47 @@
* add --command command line that gives inserted lines.
-* handle right @ everywhere, including before , and }.
+* there is also undocumented features @hsep and @vsep to insert
+ horizontal and vertical rules. Is there an example of manual using
+ those, and in which format are they supported right now, to see what
+ they do?
-* something like (ask Karl)
+* something like
@address@hidden {\frac{1}{2}}}
leads to errors in makeinfo about misplaced { } because it seems that
@minus turns on texinfo mode or the like, while
@math{{\frac{1}{2}} @minus{}}
- is error free.
-
-Asked on bug-texinfo:
+ is error free. Is it simply a bug in makeinfo or is there some language
+ issues with @-command in @math?
* for makeinfo, the following are not the same, looks like -I is not taken
into account with a leading ./:
@include ./d2t_singular/surf_lib_noEx.tex
@include d2t_singular/surf_lib_noEx.tex
- for texi2html they are the same.
+ for texi2html they are the same. What is right?
* the code of xml.c in makeinfo shows specific treatement of & in
- definition arguments. I don't know what it corresponds with. The
- formal definition argument parsing stuff is certainly worth asking
- on the texinfo list.
-
-* makeinfo warn when there is no @settitle nor @top where it finds its title
-in texi2tml there is no warning, and also the title is constructed
-differently.
- ../../sectionning.texi:4: warning: Must specify a title with least one of
@settitle or @top.
-
-* makeinfo in title, for @code{something} leads to `something'. In
-texi2html all the style commands are removed without extra formatting.
+ definition arguments. I don't know what it corresponds with.
+ What is the rules for definition argument parsing regarding &, and
+ are there general rules?
+
+* ../../sectionning.texi:4: warning: Must specify a title with least one of
@settitle or @top.
+ There should be a warning in texi2html when no title was found
+ texi2html uses
+ @settitle @title @shorttitlepage @titlefont.
+ makeinfo also uses @top. Is it right?
+
+* in html produced by makeinfo, in title and in comments (for example from
+ @copying), @code{something} leads to `something'. In texi2html all the
+ style commands are removed without extra formatting.
* What are the encodings known by info?
- unrecognized encoding name `ascii'.
+ (makeinfo says unrecognized encoding name `ascii').
* '00D8' which is Oslash is transliterated on OE?
* makeinfo: multiple index entries have <1>... appended.
- or they are removed. Ask on the list.
+ or they are removed. ?
Later
@@ -327,6 +328,12 @@
* images.texi should be tested in xml too.
+* Tests for
address@hidden @
address@hidden @:
address@hidden @asis{ }
address@hidden @.
+and other weirdness, and corresponding error messages.
Misc info and boring stuff
--------------------------
Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -b -r1.224 -r1.225
--- texi2html.init 30 Aug 2009 23:11:29 -0000 1.224
+++ texi2html.init 2 Sep 2009 15:32:09 -0000 1.225
@@ -13,7 +13,7 @@
# Afterwards, load the file with command-line
# option --init-file <your_init_file>
#
-# $Id: texi2html.init,v 1.224 2009/08/30 23:11:29 pertusus Exp $
+# $Id: texi2html.init,v 1.225 2009/09/02 15:32:09 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -3911,8 +3911,9 @@
#$text = main::normalise_space($text);
#my @args = split (/\s*,\s*/, $text);
my $file = $args->[0];
- $file =~ s/^\s*//;
- $file =~ s/\s*$//;
+ #$file =~ s/^\s*//;
+ #$file =~ s/\s*$//;
+ $file = main::trim_around_spaces($file);
return main::substitute_line($file, "address@hidden", {'remove_texi' => 1,
'code_style' => 1});
}
@@ -6487,8 +6488,7 @@
my $tag = shift;
my $texi = shift;
my $number = shift;
- $texi =~ s/\s*$//;
- $texi =~ s/^\s*//;
+ $texi = main::trim_around_spaces($texi);
return "$number $texi" if ($NUMBER_SECTIONS and defined($number) and
($number !~ /^\s*$/)) ;
return $texi;
}
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -b -r1.319 -r1.320
--- texi2html.pl 30 Aug 2009 23:11:29 -0000 1.319
+++ texi2html.pl 2 Sep 2009 15:32:09 -0000 1.320
@@ -86,7 +86,7 @@
}
# CVS version:
-# $Id: texi2html.pl,v 1.319 2009/08/30 23:11:29 pertusus Exp $
+# $Id: texi2html.pl,v 1.320 2009/09/02 15:32:09 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -180,7 +180,6 @@
my $WARN = "**"; # prefix for warnings
my $VARRE = '[\w\-]+'; # RE for a variable name
-my $NODERE = '[^:]+'; # RE for node names
my $MAX_LEVEL = 4;
my $MIN_LEVEL = 1;
@@ -725,7 +724,7 @@
'IN_ENCODING' => \$IN_ENCODING,
'setcontentsaftertitlepage' => \$SETCONTENTSAFTERTITLEPAGE,
'setshortcontentsaftertitlepage' => \$SETSHORTCONTENTSAFTERTITLEPAGE,
- 'kbdinputstyle' => \$KBDINPUTSTYLE
+ 'kbdinputstyle' => \$KBDINPUTSTYLE,
);
sub get_conf($)
@@ -4565,19 +4564,20 @@
return $section_ref;
}
-sub scan_node_line($)
+sub scan_line_separators($$)
{
my $node_line = shift;
- $node_line =~ s/address@hidden//;
- $node_line =~ s/\s*$//;
+ my $separators = shift;
my @command_stack;
my @results;
my $node_arg = '';
+#print STDERR "scan_line_separators($node_line , $separators)\n";
while (1)
{
+#print STDERR "$separators||Â $node_line ||Â $node_arg ||address@hidden";
#Â macro_regexp
- if ($node_line =~
s/^([^{},@]*)\@(["'address@hidden,\.!\?\s\*\-\^`=:\|\/\\])//o or $node_line =~
s/^([^{}@,]*)\@([a-zA-Z][\w-]*)(address@hidden)/$3/o or $node_line =~
s/^([^{},@]*)\@([a-zA-Z][\w-]*)$//o)
+ if ($node_line =~
s/^(address@hidden)\@(["'address@hidden,\.!\?\s\*\-\^`=:\|\/\\])// or
$node_line =~ s/^(address@hidden)\@([a-zA-Z][\w-]*)//)
{
$node_arg .= $1;
my $macro = $2;
@@ -4588,35 +4588,58 @@
push @command_stack, $macro;
$node_arg .= '{';
}
-
+ if ($macro eq 'verb')
+ {
+ if ($node_line =~ s/(.)//)
+ {
+ my $verb_char = quotemeta($1);
+ if ($node_line =~ s/(.*?${verb_char}\})//)
+ {
+ $node_arg .= $1;
+ }
+ else
+ {
+ return (undef, $node_line, undef);
}
- elsif ($node_line =~ s/^([^{},]*)([{}])//o)
+ }
+ else
+ {
+ return (undef, $node_line, undef);
+ }
+ pop @command_stack;
+ }
+ }
+ elsif ($node_line =~ s/^([^\{\}$separators]*)([{}])//)
{
$node_arg .= $1 . $2;
my $brace = $2;
- if (@command_stack)
+ if (@command_stack and $brace eq '}')
{
pop @command_stack;
}
}
- elsif ($node_line =~ s/^([^,]*)[,]//o)
+ elsif ($node_line =~ s/^([^${separators}]*)([$separators])//)
{
$node_arg .= $1;
+ my $separator = $2;
if (@command_stack)
{
- $node_arg .= ',';
+ $node_arg .= $separator;
}
else
{
- push @results, normalise_node($node_arg);
- $node_arg = '';
+ #push @results, normalise_node($node_arg);
+ return ($node_arg, $node_line, $separator);
+ #$node_arg = '';
}
}
else
{
$node_arg .= $node_line;
- push @results, normalise_node($node_arg);
- return @results;
+ $node_line = '';
+ return ($node_arg, $node_line, undef);
+ #push @results, normalise_node($node_arg);
+ #return @results;
}
}
}
@@ -4705,7 +4728,25 @@
{
my $node_ref;
my $auto_directions;
- my @node_res = scan_node_line($cline);
+ my $node_line = $cline;
+ $node_line =~ s/address@hidden//;
+ $node_line = trim_around_spaces($node_line);
+ my @node_res;
+ while ($node_line =~ /\S/)
+ {
+ my ($next_node, $separator);
+ ($next_node, $node_line, $separator) =
scan_line_separators($node_line, ',');
+ if (defined($next_node))
+ {
+ $next_node = normalise_node($next_node);
+ push @node_res, $next_node;
+ }
+ else
+ {
+ line_error ("Error scanning $cline", $line_nr);
+ last;
+ }
+ }
$auto_directions = 1 if (scalar(@node_res) == 1);
if (@node_res > 4)
{
@@ -5043,9 +5084,7 @@
# and pass_text 2
if ($macro eq 'setfilename')
{
- my $filename = $line;
- $filename =~ s/^\s*//;
- $filename =~ s/\s*$//;
+ my $filename = trim_around_spaces($line);
if ($filename ne '')
{
$filename = substitute_line($filename,
"address@hidden",{'code_style' => 1, 'remove_texi' => 1});
@@ -5216,9 +5255,7 @@
{
if ($macro eq 'setfilename' and $Texi2HTML::Config::USE_SETFILENAME)
{
- my $filename = $line;
- $filename =~ s/^\s*//;
- $filename =~ s/\s*$//;
+ my $filename = trim_around_spaces($line);
$filename = substitute_line($filename,
"address@hidden",{'code_style' => 1, 'remove_texi' => 1});
$Texi2HTML::THISDOC{$macro} = $filename;
# remove extension
@@ -8809,7 +8846,7 @@
if ($line =~ s/^([^\{\}]+?)(\s+)/$2/ or $line =~ s/^([^\{\}]+?)$//)
{
$result = $1;
- $result =~ s/\s*$//;
+ $result = trim_around_spaces($result);
return ($result, $line, $spaces);
}
elsif ($line =~ s/^([^\{\}]+?)([\{\}])/$2/)
@@ -8917,13 +8954,34 @@
return $href;
}
+sub trim_around_spaces($)
+{
+ my $text = shift;
+ $text =~ s/^\s*//;
+ $text =~ s/(\s)\s*$/$1/;
+ if ($text =~ /(address@hidden)\s$/)
+ {
+ my $arobases = $1;
+ if ((length($arobases) % 2) == 0)
+ {
+ $text =~ s/\s$//;
+ }
+ }
+ else
+ {
+ $text =~ s/\s$//;
+ }
+ return $text;
+}
+
sub normalise_space($)
{
return undef unless (defined ($_[0]));
my $text = shift;
+ $text = trim_around_spaces($text);
$text =~ s/\s+/ /go;
- $text =~ s/ $//;
- $text =~ s/^ //;
+ #$text =~ s/ $//;
+ #$text =~ s/^ //;
return $text;
}
@@ -10639,12 +10697,10 @@
if (defined($explanation))
{
- $explanation =~ s/^\s*//;
- $explanation =~ s/\s*$//;
+ $explanation = trim_around_spaces($explanation);
$explanation = undef if ($explanation eq '');
}
- $acronym_texi =~ s/^\s*//;
- $acronym_texi =~ s/\s*$//;
+ $acronym_texi = trim_around_spaces($acronym_texi);
return '' if ($acronym_texi eq '');
@@ -10750,11 +10806,12 @@
my $line_nr = shift;
my $text;
- $text_texi = undef if (defined($text_texi) and $text_texi=~/^\s*$/);
+ $text_texi = undef if (defined($text_texi) and $text_texi=~ /^\s*$/);
if (defined($text_texi))
{
+ $text_texi = trim_around_spaces($text_texi);
$text = substitute_line($text_texi, "address@hidden line",
duplicate_formatting_state($state), $line_nr);
- $text =~ s/\s*$//;
+ #$text =~ s/\s*$//;
}
my $quotation_args = { 'text' => $text, 'text_texi' => $text_texi };
push @{$state->{'quotation_stack'}}, $quotation_args;
@@ -10853,8 +10910,7 @@
my @args;
foreach my $arg (@$args)
{
- $arg =~ s/^\s*//;
- $arg =~ s/\s*$//;
+ $arg = trim_around_spaces($arg);
push @args, $arg;
}
#my $base = substitute_line($args[0], {'code_style' => 1});
@@ -11944,7 +12000,7 @@
if ($command->{'text'} =~ s/^(\s+)(.*)//o)
{
my $file_name = $2;
- $file_name =~ s/\s*$//;
+ $file_name = trim_around_spaces($file_name);
#$file_name = substitute_line($file_name,
{'code_style' => 1});
$file_name = substitute_line($file_name,
"address@hidden", {'code_style' => 1, 'remove_texi' => 1});
my $file = locate_include_file($file_name);
@@ -12110,6 +12166,44 @@
return 0;
}
+sub parse_menu_entry($)
+{
+ my $menu_line = shift;
+ my ($node, $name, $ending, $remaining);
+
+ return ($node, $name, $ending, $remaining) unless $menu_line =~ s/^\*//;
+
+ my ($before_colon, $separator);
+ ($before_colon, $remaining, $separator) = scan_line_separators($menu_line,
':');
+ if (defined($before_colon) and defined($separator))
+ {
+ if ($remaining =~ s/^://)
+ {
+ $node = $before_colon;
+ $ending = '::';
+ }
+ elsif ($remaining =~ /\S/)
+ {
+ my $after_colon;
+ $node = '';
+ $ending = "\n";
+ ($after_colon, $remaining, $separator) =
scan_line_separators($remaining, '\t,\.');
+ return (undef, $name, $ending, $remaining) if
(!defined($after_colon));
+ $node .= $after_colon;
+
+ while ($separator eq '.' and (defined($remaining) and $remaining !~
/^\s/))
+ {
+ ($after_colon, $remaining, $separator) =
scan_line_separators($remaining, '\t,\.');
+ return (undef, $name, $ending, $remaining) if
(!defined($after_colon));
+ $node .= $separator.$after_colon;
+ }
+ $name = $before_colon;
+ $ending = $separator if (defined($separator));
+ }
+ }
+ #Â remaining may be defined even if $node isn't.
+ return ($node, $name, $ending, $remaining);
+}
sub scan_structure($$$$;$)
{
@@ -12125,21 +12219,12 @@
#dump_stack ($text, $stack, $state);
if (!$state->{'raw'} and (!exists($state->{'region_lines'})))
{
- if (!$state->{'verb'} and $state->{'menu'} and $cline =~ /^\*/o)
+ #if (!$state->{'verb'} and $state->{'menu'} and $cline =~ /^\*\s+/o)
+ if (!$state->{'verb'} and $state->{'menu'})
{
# new menu entry
- my $menu_line = $cline;
- my $node;
- if ($cline =~ /^\*\s+($NODERE)::/)
- {
- $node = $1;
- }
- elsif ($cline =~ /^\*\s+([^:]+):\s*([^\t,\n]*?)([\t,\n]|\.\s)/)
- {
- #$name = $1;
- $node = $2;
- }
- if ($node)
+ my ($node, $name, $ending, $remaining) = parse_menu_entry($cline);
+ if (defined($node))
{
menu_entry_texi(normalise_node($node), $state, $line_nr);
}
@@ -12741,22 +12826,10 @@
{
if (!$state->{'raw'} and !$state->{'verb'} and ($state->{'menu'} or
$state->{'direntry'}))
{ # new menu entry
- my ($node, $name, $ending);
- if ($cline =~ s/^\*(\s+$NODERE)(::)//o)
- {
- $node = $1;
- $ending = $2;
- }
- elsif ($cline =~
s/^\*(\s+[^:]+):(\s*[^\t,\n]*?)(([\t,\n])|((\.)(\s)))//o)
- {
- $name = $1;
- $node = $2;
- $ending = $4;
- $ending = $6 if (!$ending);
- $cline = $7.$cline if (defined($7));
- }
- if ($node)
+ my ($node, $name, $ending, $remaining) = parse_menu_entry($cline);
+ if (defined($node))
{
+ $cline = $remaining;
print STDERR "# Potential menu entry: $node\n" if ($T2H_DEBUG
& $DEBUG_MENU);
$new_menu_entry = 1;
my $menu_entry = { 'name' => $name, 'node' => $node, 'ending'
=> $ending };
@@ -12826,7 +12899,7 @@
close_paragraph($text, $stack, $state, "address@hidden",
$line_nr, 1) if (stop_paragraph_command($next_command));
my $arg_texi = $cline;
$arg_texi =~ s/address@hidden//;
- $arg_texi =~ s/\s*$//;
+ $arg_texi = trim_around_spaces($arg_texi);
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));
return '';
@@ -13507,10 +13580,8 @@
if (index_command_prefix($macro) ne '')
{
my $index_name = index_command_prefix($macro);
- $cline =~ s/^\s*//;
- my $entry_texi = $cline;
+ my $entry_texi = trim_around_spaces($cline);
chomp($entry_texi);
- $entry_texi =~ s/\s*$//;
# FIXME multiple_pass?
my $entry_text = substitute_line($entry_texi,
"address@hidden", prepare_state_multiple_pass($macro, $state));
my ($index_entry, $formatted_index_entry, $index_label) =
do_index_entry_label($macro,$state,$line_nr, $entry_texi);
@@ -15129,8 +15200,7 @@
#Â reuse get_deff_index.
my $line = shift;
- $entry_texi =~ s/^\s*//;
- $entry_texi =~ s/\s*$//;
+ $entry_texi = trim_around_spaces($entry_texi);
# index entries are not entered in special regions
my $region = 'document';
Index: test/formatting/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/Makefile.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- test/formatting/Makefile.in 29 Aug 2009 23:02:13 -0000 1.21
+++ test/formatting/Makefile.in 2 Sep 2009 15:32:10 -0000 1.22
@@ -146,6 +146,7 @@
kbdinputstyle.texi simple_images.texi simple_table.texi empty_item.texi \
direntry_dircategory.texi nested_table.texi symbol_after_command.texi \
paragraph_in_samp.texi formats_only_titles.texi \
+ def_end_of_line_footnote.texi \
f--ile.gif f--ile.jpeg f--ile.png f---ile.gr--a f--ile.jpg f--ile.txt \
simple_menu.init weird_quotes.init redefine_need.init file.css tests.txt res \
res_all res_info
Index: test/formatting/res/images/images.2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/res/images/images.2,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/formatting/res/images/images.2 25 Aug 2009 21:32:14 -0000 1.6
+++ test/formatting/res/images/images.2 2 Sep 2009 15:32:11 -0000 1.7
@@ -3,7 +3,6 @@
images.texi:25: warning: no image file for address@hidden a@<"%@ < & @ % " ,
(using address@hidden a@<"%@ < & @ % " address@hidden a@<"%@ < & @ % " )
(via @files_char)
images.texi:25: warning: no image file for address@hidden a@<"%@ < & @ % " ,
(using address@hidden a@<"%@ < & @ % " address@hidden a@<"%@ < & @ % " )
(via @files_char)
images.texi:50: no file argument for @image
-images.texi:51: warning: Unknown command `@'
images.texi:52: no file argument for @image
images.texi:59: warning: no image file for f---ile, (using f---ile.jpeg)
images.texi:64: warning: no image file for address@hidden a@<"%@ < & @ % " ,
(using address@hidden a@<"%@ < & @ % " address@hidden a@<"%@ < & @ % " )
(via @files_char)
Index: test/formatting/res/images/images.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/res/images/images.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/formatting/res/images/images.html 25 Aug 2009 21:32:14 -0000
1.8
+++ test/formatting/res/images/images.html 2 Sep 2009 15:32:11 -0000
1.9
@@ -88,7 +88,7 @@
<p>An image with a @ followed by a space or : from
<a
href="https://savannah.gnu.org/bugs/?8218";>https://savannah.gnu.org/bugs/?8218</a>:
.
-<img src="f--ile.png" alt="@">.
+<img src="f--ile.png" alt=" ">.
.
<img src="f--ile.png" alt="f--ile">.
</p>
Index: test/formatting/res/images_docbook/images.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/images_docbook/images.2,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/formatting/res/images_docbook/images.2 25 Aug 2009 21:32:14 -0000
1.6
+++ test/formatting/res/images_docbook/images.2 2 Sep 2009 15:32:12 -0000
1.7
@@ -6,7 +6,6 @@
images.texi:25: warning: Cannot find @image file address@hidden a@<"%@ < & @
% " .txt' (via @files_char)
images.texi:38: warning: Cannot find @image file `f---ile.txt'
images.texi:50: no file argument for @image
-images.texi:51: warning: Unknown command `@'
images.texi:52: no file argument for @image
images.texi:59: warning: Cannot find @image file `f---ile.txt'
images.texi:64: warning: Cannot find @image file address@hidden a@<"%@ < & @
% " .txt' (via @files_char)
Index: test/formatting/res_all/images/images.2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/res_all/images/images.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/formatting/res_all/images/images.2 25 Aug 2009 21:32:14 -0000
1.2
+++ test/formatting/res_all/images/images.2 2 Sep 2009 15:32:12 -0000
1.3
@@ -1,3 +1,2 @@
images.texi:50: no file argument for @image
-images.texi:51: warning: Unknown command `@'
images.texi:52: no file argument for @image
Index: test/formatting/res_all/images/images.txt
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_all/images/images.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/formatting/res_all/images/images.txt 25 Aug 2009 21:32:14 -0000
1.2
+++ test/formatting/res_all/images/images.txt 2 Sep 2009 15:32:12 -0000
1.3
@@ -32,7 +32,7 @@
An image with a @ followed by a space or : from
<https://savannah.gnu.org/bugs/?8218>:
.
-[ f--ile.png: @ ].
+[ f--ile.png ].
.
[ f--ile.png ].
Index: test/formatting/res_all/images_docbook/images.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_all/images_docbook/images.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/formatting/res_all/images_docbook/images.2 25 Aug 2009 21:32:14
-0000 1.4
+++ test/formatting/res_all/images_docbook/images.2 2 Sep 2009 15:32:13
-0000 1.5
@@ -6,7 +6,6 @@
images.texi:25: warning: Cannot find @image file address@hidden a@<"%@ < & @
% " .txt' (via @files_char)
images.texi:38: warning: Cannot find @image file `f---ile.txt'
images.texi:50: no file argument for @image
-images.texi:51: warning: Unknown command `@'
images.texi:52: no file argument for @image
images.texi:59: warning: Cannot find @image file `f---ile.txt'
images.texi:64: warning: Cannot find @image file address@hidden a@<"%@ < & @
% " .txt' (via @files_char)
Index: test/formatting/res_info/images/images.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_info/images/images.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/formatting/res_info/images/images.2 25 Aug 2009 21:32:15 -0000
1.4
+++ test/formatting/res_info/images/images.2 2 Sep 2009 15:32:14 -0000
1.5
@@ -3,7 +3,6 @@
images.texi:25: warning: Cannot find @image file address@hidden a@<"%@ < & @
% " .txt' (via @files_char)
images.texi:25: warning: Cannot find @image file address@hidden a@<"%@ < & @
% " .txt' (via @files_char)
images.texi:50: no file argument for @image
-images.texi:51: warning: Unknown command `@'
images.texi:52: no file argument for @image
images.texi:59: warning: Cannot find @image file `f---ile.txt'
images.texi:64: warning: Cannot find @image file address@hidden a@<"%@ < & @
% " .txt' (via @files_char)
Index: test/formatting/res_info/images/images.info
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_info/images/images.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
Binary files /tmp/cvsUKL84s and /tmp/cvs9kmdyo differ
Index: test/formatting/res_info/images_docbook/images.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_info/images_docbook/images.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/formatting/res_info/images_docbook/images.2 25 Aug 2009 21:32:15
-0000 1.4
+++ test/formatting/res_info/images_docbook/images.2 2 Sep 2009 15:32:14
-0000 1.5
@@ -6,7 +6,6 @@
images.texi:25: warning: Cannot find @image file address@hidden a@<"%@ < & @
% " .txt' (via @files_char)
images.texi:38: warning: Cannot find @image file `f---ile.txt'
images.texi:50: no file argument for @image
-images.texi:51: warning: Unknown command `@'
images.texi:52: no file argument for @image
images.texi:59: warning: Cannot find @image file `f---ile.txt'
images.texi:64: warning: Cannot find @image file address@hidden a@<"%@ < & @
% " .txt' (via @files_char)
Index: test/sectionning/Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/sectionning/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- test/sectionning/Makefile.am 30 Aug 2009 19:00:43 -0000 1.17
+++ test/sectionning/Makefile.am 2 Sep 2009 15:32:15 -0000 1.18
@@ -14,6 +14,7 @@
no_element.texi anchor_in_footnote.texi test_two_include.texi \
only_documentencoding.texi more_sections_than_nodes.texi \
nodename_parentheses.texi one_element.texi \
+ weird_at_commands_in_nodes.texi \
test_directions.init tests.txt res res_all res_info
DISTCLEANFILES = l2h_tmp_dir.init tests.log tests.out
Index: test/sectionning/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/sectionning/Makefile.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- test/sectionning/Makefile.in 29 Aug 2009 10:23:52 -0000 1.20
+++ test/sectionning/Makefile.in 2 Sep 2009 15:32:15 -0000 1.21
@@ -145,7 +145,8 @@
placed_things_before_element.texi menutextorder.texi semi_auto.texi \
no_element.texi anchor_in_footnote.texi test_two_include.texi \
only_documentencoding.texi more_sections_than_nodes.texi \
- nodename_parentheses.texi \
+ nodename_parentheses.texi one_element.texi \
+ weird_at_commands_in_nodes.texi \
test_directions.init tests.txt res res_all res_info
DISTCLEANFILES = l2h_tmp_dir.init tests.log tests.out
Index: test/sectionning/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/sectionning/tests.txt,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- test/sectionning/tests.txt 30 Aug 2009 19:00:44 -0000 1.21
+++ test/sectionning/tests.txt 2 Sep 2009 15:32:15 -0000 1.22
@@ -71,6 +71,7 @@
anchor_in_footnote anchor_in_footnote.texi
test_two_include test_two_include.texi -I
address@hidden@../address@hidden@../macros
only_documentencoding only_documentencoding.texi
+weird_at_commands_in_nodes weird_at_commands_in_nodes.texi
test_refs_docbook test_refs.texi --docbook
at_commands_in_refs_info at_commands_in_refs.texi --init info.init
Index: test/sectionning/weird_at_commands_in_nodes.texi
===================================================================
RCS file: test/sectionning/weird_at_commands_in_nodes.texi
diff -N test/sectionning/weird_at_commands_in_nodes.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/sectionning/weird_at_commands_in_nodes.texi 2 Sep 2009 15:32:15
-0000 1.1
@@ -0,0 +1,17 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden weird_at_commands_in_nodes.info
+
address@hidden Top
address@hidden Top
+
address@hidden
+* a@ ::
+* a@:::
address@hidden menu
+
address@hidden a@
+
address@hidden a@:
+
address@hidden
Index:
test/sectionning/res/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1
===================================================================
RCS file:
test/sectionning/res/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1
diff -N
test/sectionning/res/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1
Index:
test/sectionning/res/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2
===================================================================
RCS file:
test/sectionning/res/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2
diff -N
test/sectionning/res/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2
Index:
test/sectionning/res/weird_at_commands_in_nodes/weird_at_commands_in_nodes.html
===================================================================
RCS file:
test/sectionning/res/weird_at_commands_in_nodes/weird_at_commands_in_nodes.html
diff -N
test/sectionning/res/weird_at_commands_in_nodes/weird_at_commands_in_nodes.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/sectionning/res/weird_at_commands_in_nodes/weird_at_commands_in_nodes.html
2 Sep 2009 15:32:16 -0000 1.1
@@ -0,0 +1,68 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html
+texi2html was written by:
+ Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+-->
+<head>
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2html">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.smallquotation {font-size: smaller}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<a name="Top"></a>
+<a name="Top-1"></a>
+<h1 class="unnumbered">Top</h1>
+
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="#a-">•
a </a></td><td> </td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top"><a href="#a">•
a</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<a name="a-"></a>
+
+<a name="a"></a>
+
+<hr>
+<p>
+ <font size="-1">
+ This document was generated on <i>a sunny day</i> using <a
href="http://www.nongnu.org/texi2html/";><i>texi2html</i></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>
Index:
test/sectionning/res_all/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1
===================================================================
RCS file:
test/sectionning/res_all/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1
diff -N
test/sectionning/res_all/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1
Index:
test/sectionning/res_all/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2
===================================================================
RCS file:
test/sectionning/res_all/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2
diff -N
test/sectionning/res_all/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2
Index:
test/sectionning/res_all/weird_at_commands_in_nodes/weird_at_commands_in_nodes.txt
===================================================================
RCS file:
test/sectionning/res_all/weird_at_commands_in_nodes/weird_at_commands_in_nodes.txt
diff -N
test/sectionning/res_all/weird_at_commands_in_nodes/weird_at_commands_in_nodes.txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/sectionning/res_all/weird_at_commands_in_nodes/weird_at_commands_in_nodes.txt
2 Sep 2009 15:32:17 -0000 1.1
@@ -0,0 +1,12 @@
+Top
+***
+
+* a ::
+* a::
+
+a
+--
+
+a
+-
+
Index:
test/sectionning/res_docbook/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1
===================================================================
RCS file:
test/sectionning/res_docbook/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1
diff -N
test/sectionning/res_docbook/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1
Index:
test/sectionning/res_docbook/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2
===================================================================
RCS file:
test/sectionning/res_docbook/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2
diff -N
test/sectionning/res_docbook/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2
Index:
test/sectionning/res_docbook/weird_at_commands_in_nodes/weird_at_commands_in_nodes.xml
===================================================================
RCS file:
test/sectionning/res_docbook/weird_at_commands_in_nodes/weird_at_commands_in_nodes.xml
diff -N
test/sectionning/res_docbook/weird_at_commands_in_nodes/weird_at_commands_in_nodes.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/sectionning/res_docbook/weird_at_commands_in_nodes/weird_at_commands_in_nodes.xml
2 Sep 2009 15:32:18 -0000 1.1
@@ -0,0 +1,20 @@
+<?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="weird_at_commands_in_nodes.xml" lang="en">
+<chapter label="" xreflabel="Top" id="Top">
+<title>Top</title>
+
+
+
+
+</chapter>
+</book><!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-indent-step:1
+sgml-indent-data:nil
+End:
+-->
Index: test/sectionning/res_html/weird_at_commands_in_nodes/a-.html
===================================================================
RCS file: test/sectionning/res_html/weird_at_commands_in_nodes/a-.html
diff -N test/sectionning/res_html/weird_at_commands_in_nodes/a-.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/sectionning/res_html/weird_at_commands_in_nodes/a-.html 2 Sep
2009 15:32:19 -0000 1.1
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html
+texi2html was written by:
+ Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+-->
+<head>
+<title>Untitled Document: a </title>
+
+<meta name="description" content="Untitled Document: a ">
+<meta name="keywords" content="Untitled Document: a ">
+<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="Top">
+<link href="weird_at_commands_in_nodes_abt.html#SEC_About" rel="help"
title="About This Document">
+<link href="index.html#Top" rel="up" title="Top">
+<link href="a.html#a" rel="next" title="a">
+<link href="index.html#Top" rel="previous" title="Top">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.smallquotation {font-size: smaller}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<a name="a-"></a>
+<div class="node">
+<p>
+Next: <a href="a.html#a" accesskey="n" rel="next">a</a>, Previous: <a
href="index.html#Top" accesskey="p" rel="previous">Top</a>, Up: <a
href="index.html#Top" accesskey="u" rel="up">Top</a> </p>
+</div>
+<hr>
+<h3 class="node">a </h3>
+
+<p>
+
+
+</p>
+</body>
+</html>
Index: test/sectionning/res_html/weird_at_commands_in_nodes/a.html
===================================================================
RCS file: test/sectionning/res_html/weird_at_commands_in_nodes/a.html
diff -N test/sectionning/res_html/weird_at_commands_in_nodes/a.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/sectionning/res_html/weird_at_commands_in_nodes/a.html 2 Sep 2009
15:32:19 -0000 1.1
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html
+texi2html was written by:
+ Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+-->
+<head>
+<title>Untitled Document: a</title>
+
+<meta name="description" content="Untitled Document: a">
+<meta name="keywords" content="Untitled Document: a">
+<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="Top">
+<link href="weird_at_commands_in_nodes_abt.html#SEC_About" rel="help"
title="About This Document">
+<link href="index.html#Top" rel="up" title="Top">
+<link href="a-.html#a-" rel="previous" title="a ">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.smallquotation {font-size: smaller}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<a name="a"></a>
+<div class="node">
+<p>
+Previous: <a href="a-.html#a-" accesskey="p" rel="previous">a </a>, Up:
<a href="index.html#Top" accesskey="u" rel="up">Top</a> </p>
+</div>
+<hr>
+<h3 class="node">a</h3>
+
+<p>
+
+
+</p>
+</body>
+</html>
Index: test/sectionning/res_html/weird_at_commands_in_nodes/index.html
===================================================================
RCS file: test/sectionning/res_html/weird_at_commands_in_nodes/index.html
diff -N test/sectionning/res_html/weird_at_commands_in_nodes/index.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/sectionning/res_html/weird_at_commands_in_nodes/index.html 2 Sep
2009 15:32:19 -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 on a sunny day by texi2html
+texi2html was written by:
+ Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+-->
+<head>
+<title>Untitled Document: Top</title>
+
+<meta name="description" content="Untitled Document: Top">
+<meta name="keywords" content="Untitled Document: 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="Top">
+<link href="weird_at_commands_in_nodes_abt.html#SEC_About" rel="help"
title="About This Document">
+<link href="a.html#a" rel="next" title="a">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.smallquotation {font-size: smaller}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<a name="Top"></a>
+<div class="node">
+<p>
+Next: <a href="a-.html#a-" accesskey="n" rel="next">a </a>, Up: <a
href="../dir/index.html#Top" accesskey="u" rel="up">(dir)</a> </p>
+</div>
+<hr>
+<a name="Top-1"></a>
+<h1 class="settitle">Top</h1>
+
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="a-.html#a-" accesskey="1">•
a </a></td><td> </td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top"><a href="a.html#a" accesskey="2">•
a</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<hr>
+<div class="node">
+<p>
+Next: <a href="a-.html#a-" accesskey="n" rel="next">a </a>, Up: <a
href="../dir/index.html#Top" accesskey="u" rel="up">(dir)</a> </p>
+</div>
+<p>
+
+
+</p>
+</body>
+</html>
Index:
test/sectionning/res_html/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1
===================================================================
RCS file:
test/sectionning/res_html/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1
diff -N
test/sectionning/res_html/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1
Index:
test/sectionning/res_html/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2
===================================================================
RCS file:
test/sectionning/res_html/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2
diff -N
test/sectionning/res_html/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2
Index:
test/sectionning/res_info/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1
===================================================================
RCS file:
test/sectionning/res_info/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1
diff -N
test/sectionning/res_info/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1
Index:
test/sectionning/res_info/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2
===================================================================
RCS file:
test/sectionning/res_info/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2
diff -N
test/sectionning/res_info/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2
Index:
test/sectionning/res_info/weird_at_commands_in_nodes/weird_at_commands_in_nodes.info
===================================================================
RCS file:
test/sectionning/res_info/weird_at_commands_in_nodes/weird_at_commands_in_nodes.info
diff -N
test/sectionning/res_info/weird_at_commands_in_nodes/weird_at_commands_in_nodes.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/sectionning/res_info/weird_at_commands_in_nodes/weird_at_commands_in_nodes.info
2 Sep 2009 15:32:20 -0000 1.1
@@ -0,0 +1,28 @@
+This is weird_at_commands_in_nodes.info, produced by makeinfo version
+4.13 from weird_at_commands_in_nodes.texi.
+
+
+File: weird_at_commands_in_nodes.info, Node: Top, Next: a , Up: (dir)
+
+Top
+***
+
+* Menu:
+
+* a ::
+* a::
+
+
+File: weird_at_commands_in_nodes.info, Node: a , Next: a, Prev: Top, Up:
Top
+
+
+File: weird_at_commands_in_nodes.info, Node: a, Prev: a , Up: Top
+
+
+
+Tag Table:
+Node: Top114
+Node: a 222
+Node: a306
+
+End Tag Table
Index:
test/sectionning/res_xml/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1
===================================================================
RCS file:
test/sectionning/res_xml/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1
diff -N
test/sectionning/res_xml/weird_at_commands_in_nodes/weird_at_commands_in_nodes.1
Index:
test/sectionning/res_xml/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2
===================================================================
RCS file:
test/sectionning/res_xml/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2
diff -N
test/sectionning/res_xml/weird_at_commands_in_nodes/weird_at_commands_in_nodes.2
Index:
test/sectionning/res_xml/weird_at_commands_in_nodes/weird_at_commands_in_nodes.xml
===================================================================
RCS file:
test/sectionning/res_xml/weird_at_commands_in_nodes/weird_at_commands_in_nodes.xml
diff -N
test/sectionning/res_xml/weird_at_commands_in_nodes/weird_at_commands_in_nodes.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/sectionning/res_xml/weird_at_commands_in_nodes/weird_at_commands_in_nodes.xml
2 Sep 2009 15:32:21 -0000 1.1
@@ -0,0 +1,49 @@
+<?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">
+
+<setfilename>weird_at_commands_in_nodes.xml</setfilename>
+
+<node>
+<nodename>Top</nodename>
+<nodenext>a&space;</nodenext>
+<nodeup>(dir)</nodeup>
+</node>
+<unnumbered>
+<title>Top</title>
+
+<menu>
+<menuentry>
+<menunode>a&space;</menunode>
+<menutitle>a&space;</menutitle>
+<menucomment>
+</menucomment>
+</menuentry><menuentry>
+<menunode>a</menunode>
+<menutitle>a</menutitle>
+<menucomment>
+</menucomment>
+</menuentry></menu>
+
+</unnumbered>
+<node>
+<nodename>a&space;</nodename>
+<nodenext>a</nodenext>
+<nodeprev>Top</nodeprev>
+<nodeup>Top</nodeup>
+</node>
+
+<node>
+<nodename>a</nodename>
+<nodeprev>a&space;</nodeprev>
+<nodeup>Top</nodeup>
+</node>
+
+</texinfo>
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-indent-step:1
+sgml-indent-data:nil
+End:
+-->
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht...,
Patrice Dumas <=
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht..., Patrice Dumas, 2009/09/03
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht..., Patrice Dumas, 2009/09/06
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht..., Patrice Dumas, 2009/09/07
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht..., Patrice Dumas, 2009/09/08
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht..., Patrice Dumas, 2009/09/08
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht..., Patrice Dumas, 2009/09/26