[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp texi2any.pl Texinfo/Parser.pm Texinf...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp texi2any.pl Texinfo/Parser.pm Texinf... |
|
Date: |
Sat, 14 Jul 2012 11:41:57 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/07/14 11:41:56
Modified files:
tp : texi2any.pl
tp/Texinfo : Parser.pm
tp/Texinfo/Convert: DocBook.pm HTML.pm XML.pm
tp/t : 30sectioning.t
tp/t/results/sectioning: double_node_anchor_float.pl
tp/tests/sectioning/res_parser_html/placed_things_before_element:
An-anchor.html
Anchor-in-footnote.html
float-anchor.html
Added files:
tp/tests/sectioning/res_parser_html/no_node_chapter_split:
index.html
tp/tests/sectioning/res_parser_html/placed_things_before_element:
index.html
Removed files:
tp/tests/sectioning/res_parser_html/no_node_chapter_split:
no_node_0.html
tp/tests/sectioning/res_parser_html/placed_things_before_element:
placed_things_before_element_0.html
Log message:
When using node names and there is no node, still use the top node file
name.
Handle better bogus nodes in XML and DocBook.
Make sure that, even if SHOW_MENU is not set, menu is still in the tree.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.130&r2=1.131
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.381&r2=1.382
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/DocBook.pm?cvsroot=texinfo&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.237&r2=1.238
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/30sectioning.t?cvsroot=texinfo&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser_html/no_node_chapter_split/index.html?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser_html/no_node_chapter_split/no_node_0.html?cvsroot=texinfo&r1=1.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser_html/placed_things_before_element/An-anchor.html?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser_html/placed_things_before_element/Anchor-in-footnote.html?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser_html/placed_things_before_element/float-anchor.html?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser_html/placed_things_before_element/index.html?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser_html/placed_things_before_element/placed_things_before_element_0.html?cvsroot=texinfo&r1=1.2&r2=0
Patches:
Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -b -r1.381 -r1.382
--- Texinfo/Parser.pm 10 Jul 2012 22:32:31 -0000 1.381
+++ Texinfo/Parser.pm 14 Jul 2012 11:41:55 -0000 1.382
@@ -3388,8 +3388,10 @@
} elsif ($arg->{'type'} eq 'menu_entry_node') {
$self->_isolate_last_space($arg, 'space_at_end_menu_node');
my $parsed_entry_node = _parse_node_manual($arg);
- if (! defined($parsed_entry_node) and $self->{'SHOW_MENU'}) {
+ if (! defined($parsed_entry_node)) {
+ if ($self->{'SHOW_MENU'}) {
$self->line_error ($self->__("Empty node in menu entry"), $line_nr);
+ }
} else {
$current->{'extra'}->{'menu_entry_node'} = $parsed_entry_node;
}
@@ -4501,17 +4503,21 @@
push @{$self->{'info'}->{'dircategory_direntry'}}, $block
if ($command eq 'direntry');
if ($self->{'current_node'}) {
- if ($command eq 'direntry' and $self->{'SHOW_MENU'}) {
+ if ($command eq 'direntry') {
+ if ($self->{'SHOW_MENU'}) {
$self->line_warn ($self->__("address@hidden after first
node"),
$line_nr);
+ }
} elsif ($command eq 'menu') {
push @{$self->{'current_node'}->{'menus'}}, $current;
}
- } elsif ($command ne 'direntry' and $self->{'SHOW_MENU'}) {
+ } elsif ($command ne 'direntry') {
+ if ($self->{'SHOW_MENU'}) {
$self->line_error (sprintf($self->__("address@hidden seen
before first address@hidden"),
$command), $line_nr);
$self->line_error ($self->__("perhaps your address@hidden
node should be wrapped in address@hidden rather than address@hidden"),
$line_nr, 1);
+ }
if ($command eq 'menu') {
push @{$self->{'info'}->{'unassociated_menus'}}, $current;
}
Index: Texinfo/Convert/DocBook.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- Texinfo/Convert/DocBook.pm 13 May 2012 22:48:08 -0000 1.45
+++ Texinfo/Convert/DocBook.pm 14 Jul 2012 11:41:55 -0000 1.46
@@ -599,11 +599,16 @@
}
} elsif ($type eq 'line') {
if ($root->{'cmdname'} eq 'node') {
- if (!$root->{'extra'} or !$root->{'extra'}->{'associated_section'}) {
+ if ($root->{'extra'} and !$root->{'extra'}->{'associated_section'}
+ and defined($root->{'extra'}->{'normalized'})) {
$result .= "<anchor id=\"$root->{'extra'}->{'normalized'}\"/>\n";
}
} elsif ($Texinfo::Common::root_commands{$root->{'cmdname'}}) {
my $attribute;
+ # FIXME it is not clear that a label should be set for
+ # @appendix* or @chapter/@*section as the formatter should be
+ # able to figure it out. For @unnumbered or if ! NUMBER_SECTIONS
+ # having a label (empty) is important.
my $label = '';
if (defined($root->{'number'})
and ($self->get_conf('NUMBER_SECTIONS')
@@ -732,7 +737,11 @@
}
return $result;
} elsif ($root->{'cmdname'} eq 'anchor') {
+ if ($root->{'extra'} and defined($root->{'extra'}->{'normalized'})) {
return "<anchor id=\"$root->{'extra'}->{'normalized'}\"/>";
+ } else {
+ return '';
+ }
} elsif ($Texinfo::Common::ref_commands{$root->{'cmdname'}}) {
if ($root->{'extra'} and $root->{'extra'}->{'brace_command_contents'})
{
if ($root->{'cmdname'} eq 'inforef') {
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -b -r1.237 -r1.238
--- Texinfo/Convert/HTML.pm 8 Jul 2012 08:25:05 -0000 1.237
+++ Texinfo/Convert/HTML.pm 14 Jul 2012 11:41:55 -0000 1.238
@@ -5253,9 +5253,14 @@
}
} else {
# when everything else has failed
+ if ($file_nr == 0 and !$node_top
+ and defined($top_node_filename)) {
+ $self->_set_element_file($file_element, $top_node_filename);
+ } else {
my $filename = $self->{'document_name'} . "_$file_nr";
$filename .= $extension;
$self->_set_element_file($element, $filename);
+ }
$file_nr++;
}
}
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- Texinfo/Convert/XML.pm 27 Jan 2012 00:16:35 -0000 1.63
+++ Texinfo/Convert/XML.pm 14 Jul 2012 11:41:55 -0000 1.64
@@ -534,7 +534,13 @@
return "<$command${attribute}>$arg</$command>$end_line";
} elsif ($type eq 'line') {
if ($root->{'cmdname'} eq 'node') {
- $result .= "<node name=\"$root->{'extra'}->{'normalized'}\">";
+ my $nodename;
+ if (defined($root->{'extra'}->{'normalized'})) {
+ $nodename = $root->{'extra'}->{'normalized'};
+ } else {
+ $nodename = '';
+ }
+ $result .= "<node name=\"$nodename\">";
$self->{'document_context'}->[-1]->{'code'}++;
$result .= "<nodename>".
$self->_convert({'contents' =>
$root->{'extra'}->{'node_content'}})
@@ -720,8 +726,14 @@
$attribute = " delimiter=\"".$self->xml_protect_text($root->{'type'})
."\"";
} elsif ($root->{'cmdname'} eq 'anchor') {
- $attribute = " name=\"$root->{'extra'}->{'normalized'}\"";
- };
+ my $anchor_name;
+ if (defined($root->{'extra'}->{'normalized'})) {
+ $anchor_name = $root->{'extra'}->{'normalized'};
+ } else {
+ $anchor_name = '';
+ }
+ $attribute = " name=\"$anchor_name\"";
+ }
my $arg_index = 0;
foreach my $element (@elements) {
if (defined($root->{'args'}->[$arg_index])) {
Index: t/30sectioning.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/30sectioning.t,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- t/30sectioning.t 12 Jul 2012 18:09:18 -0000 1.80
+++ t/30sectioning.t 14 Jul 2012 11:41:55 -0000 1.81
@@ -1867,13 +1867,18 @@
'more_nodes_than_sections', 'part_node_chapter_appendix',
'part_node_part_appendix', 'part_node_chapter_node_appendix',
'part_node_part_node_appendix', 'part_node_node_part_appendix',
- 'explicit_node_directions', 'nodes_after_top_before_chapter_nodes');
+ 'explicit_node_directions', 'nodes_after_top_before_chapter_nodes',
+ 'double_node_anchor_float');
+
+my @docbook_tests_info_tests = ('double_node_anchor_float');
foreach my $test (@tests_info) {
push @{$test->[2]->{'test_formats'}}, 'info';
push @{$test->[2]->{'test_formats'}}, 'html';
push @{$test->[2]->{'test_formats'}}, 'xml'
if (grep {$_ eq $test->[0]} @xml_tests_info_tests);
+ push @{$test->[2]->{'test_formats'}}, 'docbook'
+ if (grep {$_ eq $test->[0]} @docbook_tests_info_tests);
}
my @xml_tests_cases_tests = ('part_before_section',
Index: t/results/sectioning/double_node_anchor_float.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/results/sectioning/double_node_anchor_float.pl 25 Feb 2012 13:15:47
-0000 1.29
+++ t/results/sectioning/double_node_anchor_float.pl 14 Jul 2012 11:41:56
-0000 1.30
@@ -1126,4 +1126,38 @@
];
+
+$result_converted{'xml'}->{'double_node_anchor_float'} = '<node
name="node1"><nodename>node1</nodename></node>
+
+<node name=""><nodename></nodename></node>
+
+<anchor name="">node1</anchor>
+<anchor name="anchor1">anchor1</anchor>
+<node name=""><nodename></nodename></node>
+
+<float type="Text"><floattype>Text</floattype><floatname>node1</floatname>
+</float>
+
+<float type="Text"><floattype>Text</floattype><floatname>anchor1</floatname>
+</float>
+
+<float name="float1"
type="Text"><floattype>Text</floattype><floatname>float1</floatname>
+</float>
+
+<node name=""><nodename></nodename></node>
+';
+
+
+$result_converted{'docbook'}->{'double_node_anchor_float'} = '<anchor
id="node1"/>
+
+
+
+<anchor id="anchor1"/>
+
+
+
+<anchor id="float1"/>
+
+';
+
1;
Index:
tests/sectioning/res_parser_html/placed_things_before_element/An-anchor.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser_html/placed_things_before_element/An-anchor.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
---
tests/sectioning/res_parser_html/placed_things_before_element/An-anchor.html
14 Jan 2012 19:05:33 -0000 1.1
+++
tests/sectioning/res_parser_html/placed_things_before_element/An-anchor.html
14 Jul 2012 11:41:56 -0000 1.2
@@ -37,11 +37,11 @@
-->
</style>
-<meta http-equiv="Refresh" content="2;
url=placed_things_before_element_0.html#An-anchor">
+<meta http-equiv="Refresh" content="2; url=index.html#An-anchor">
</head>
<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
-<p>The node you are looking for is at <a
href="placed_things_before_element_0.html#An-anchor">An anchor</a>.</p>
+<p>The node you are looking for is at <a href="index.html#An-anchor">An
anchor</a>.</p>
</body>
Index:
tests/sectioning/res_parser_html/placed_things_before_element/Anchor-in-footnote.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser_html/placed_things_before_element/Anchor-in-footnote.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
---
tests/sectioning/res_parser_html/placed_things_before_element/Anchor-in-footnote.html
14 Jan 2012 19:05:33 -0000 1.1
+++
tests/sectioning/res_parser_html/placed_things_before_element/Anchor-in-footnote.html
14 Jul 2012 11:41:56 -0000 1.2
@@ -37,11 +37,11 @@
-->
</style>
-<meta http-equiv="Refresh" content="2;
url=placed_things_before_element_0.html#Anchor-in-footnote">
+<meta http-equiv="Refresh" content="2; url=index.html#Anchor-in-footnote">
</head>
<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
-<p>The node you are looking for is at <a
href="placed_things_before_element_0.html#Anchor-in-footnote">Anchor in
footnote</a>.</p>
+<p>The node you are looking for is at <a
href="index.html#Anchor-in-footnote">Anchor in footnote</a>.</p>
</body>
Index:
tests/sectioning/res_parser_html/placed_things_before_element/float-anchor.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser_html/placed_things_before_element/float-anchor.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
---
tests/sectioning/res_parser_html/placed_things_before_element/float-anchor.html
14 Jan 2012 19:05:33 -0000 1.1
+++
tests/sectioning/res_parser_html/placed_things_before_element/float-anchor.html
14 Jul 2012 11:41:56 -0000 1.2
@@ -37,11 +37,11 @@
-->
</style>
-<meta http-equiv="Refresh" content="2;
url=placed_things_before_element_0.html#float-anchor">
+<meta http-equiv="Refresh" content="2; url=index.html#float-anchor">
</head>
<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
-<p>The node you are looking for is at <a
href="placed_things_before_element_0.html#float-anchor">1</a>.</p>
+<p>The node you are looking for is at <a
href="index.html#float-anchor">1</a>.</p>
</body>
Index: tests/sectioning/res_parser_html/no_node_chapter_split/index.html
===================================================================
RCS file: tests/sectioning/res_parser_html/no_node_chapter_split/index.html
diff -N tests/sectioning/res_parser_html/no_node_chapter_split/index.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/sectioning/res_parser_html/no_node_chapter_split/index.html 14 Jul
2012 11:41:56 -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 texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<title>top section</title>
+
+<meta name="description" content="top section">
+<meta name="keywords" content="top section">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<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>Garbage
+</p>
+<a name="unnumbered"></a>
+<h2 class="unnumbered">unnumbered</h2>
+
+<p>in unnumbered
+</p>
+<a name="top-section"></a>
+<h2 class="unnumbered">top section</h2>
+<p>Top node
+</p>
+
+<a name="second"></a>
+<h3 class="section">second</h3>
+
+<p>second node
+</p>
+<a name="Chapter"></a>
+<h2 class="chapter">1 Chapter</h2>
+
+<p>Text of chapter
+</p>
+<a name="Section-of-chapter"></a>
+<h3 class="section">1.1 Section of chapter</h3>
+
+<a name="subsection-1"></a>
+<h4 class="subsection">1.1.1 subsection 1</h4>
+
+<a name="subsection-2"></a>
+<h4 class="subsection">1.1.2 subsection 2</h4>
+
+<a name="Chapter-2"></a>
+<h2 class="chapter">2 Chapter 2</h2>
+
+
+<p>Text of chapter 2
+</p>
+<hr>
+
+
+
+</body>
+</html>
Index: tests/sectioning/res_parser_html/placed_things_before_element/index.html
===================================================================
RCS file:
tests/sectioning/res_parser_html/placed_things_before_element/index.html
diff -N tests/sectioning/res_parser_html/placed_things_before_element/index.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/sectioning/res_parser_html/placed_things_before_element/index.html
14 Jul 2012 11:41:56 -0000 1.1
@@ -0,0 +1,95 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<title>before element test</title>
+
+<meta name="description" content="before element test">
+<meta name="keywords" content="before element test">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<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">
+<h1 class="settitle" align="center">before element test</h1>
+
+
+<a name="An-anchor"></a>
+<p>Ref to the anchor:
+<a href="#An-anchor">An anchor</a>
+</p>
+<p>Ref to the anchor in footnote:
+<a href="#Anchor-in-footnote">Anchor in footnote</a>.
+</p>
+<p><a name="DOCF1" href="#FOOT1">(1)</a>
+</p>
+<div class="float"><a name="float-anchor"></a>
+<p>In float
+</p></div><p><strong>1
+</strong></p>
+<p>Ref to float
+<a href="#float-anchor">float anchor</a>.
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top">• <a href="#An-anchor" accesskey="1">An
anchor</a>:</td><td> </td><td align="left" valign="top">menu entry
pointing to the anchor.
+</td></tr>
+</table>
+
+<a name="index-index-entry"></a>
+
+<a name="section"></a>
+<h3 class="section">1 section</h3>
+
+<p>Ref to anchor
+<a href="#An-anchor">An anchor</a>
+</p>
+<p>Ref to footnote anchor
+<a href="#Anchor-in-footnote">Anchor in footnote</a>
+</p>
+<div class="footnote">
+<hr>
+<h4 class="footnotes-heading">Footnotes</h4>
+
+<h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
+<p>In footnote.
+</p>
+<a name="Anchor-in-footnote"></a>
+<p>Ref to main text anchor
+<a href="#An-anchor">An anchor</a>
+</p>
+</div>
+<hr>
+
+
+
+</body>
+</html>
Index: tests/sectioning/res_parser_html/no_node_chapter_split/no_node_0.html
===================================================================
RCS file: tests/sectioning/res_parser_html/no_node_chapter_split/no_node_0.html
diff -N tests/sectioning/res_parser_html/no_node_chapter_split/no_node_0.html
--- tests/sectioning/res_parser_html/no_node_chapter_split/no_node_0.html
25 Feb 2012 13:16:29 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,86 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<title>top section</title>
-
-<meta name="description" content="top section">
-<meta name="keywords" content="top section">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<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>Garbage
-</p>
-<a name="unnumbered"></a>
-<h2 class="unnumbered">unnumbered</h2>
-
-<p>in unnumbered
-</p>
-<a name="top-section"></a>
-<h2 class="unnumbered">top section</h2>
-<p>Top node
-</p>
-
-<a name="second"></a>
-<h3 class="section">second</h3>
-
-<p>second node
-</p>
-<a name="Chapter"></a>
-<h2 class="chapter">1 Chapter</h2>
-
-<p>Text of chapter
-</p>
-<a name="Section-of-chapter"></a>
-<h3 class="section">1.1 Section of chapter</h3>
-
-<a name="subsection-1"></a>
-<h4 class="subsection">1.1.1 subsection 1</h4>
-
-<a name="subsection-2"></a>
-<h4 class="subsection">1.1.2 subsection 2</h4>
-
-<a name="Chapter-2"></a>
-<h2 class="chapter">2 Chapter 2</h2>
-
-
-<p>Text of chapter 2
-</p>
-<hr>
-
-
-
-</body>
-</html>
Index:
tests/sectioning/res_parser_html/placed_things_before_element/placed_things_before_element_0.html
===================================================================
RCS file:
tests/sectioning/res_parser_html/placed_things_before_element/placed_things_before_element_0.html
diff -N
tests/sectioning/res_parser_html/placed_things_before_element/placed_things_before_element_0.html
---
tests/sectioning/res_parser_html/placed_things_before_element/placed_things_before_element_0.html
25 Feb 2012 13:16:31 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,95 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<title>before element test</title>
-
-<meta name="description" content="before element test">
-<meta name="keywords" content="before element test">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<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">
-<h1 class="settitle" align="center">before element test</h1>
-
-
-<a name="An-anchor"></a>
-<p>Ref to the anchor:
-<a href="#An-anchor">An anchor</a>
-</p>
-<p>Ref to the anchor in footnote:
-<a href="#Anchor-in-footnote">Anchor in footnote</a>.
-</p>
-<p><a name="DOCF1" href="#FOOT1">(1)</a>
-</p>
-<div class="float"><a name="float-anchor"></a>
-<p>In float
-</p></div><p><strong>1
-</strong></p>
-<p>Ref to float
-<a href="#float-anchor">float anchor</a>.
-</p>
-<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">• <a href="#An-anchor" accesskey="1">An
anchor</a>:</td><td> </td><td align="left" valign="top">menu entry
pointing to the anchor.
-</td></tr>
-</table>
-
-<a name="index-index-entry"></a>
-
-<a name="section"></a>
-<h3 class="section">1 section</h3>
-
-<p>Ref to anchor
-<a href="#An-anchor">An anchor</a>
-</p>
-<p>Ref to footnote anchor
-<a href="#Anchor-in-footnote">Anchor in footnote</a>
-</p>
-<div class="footnote">
-<hr>
-<h4 class="footnotes-heading">Footnotes</h4>
-
-<h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
-<p>In footnote.
-</p>
-<a name="Anchor-in-footnote"></a>
-<p>Ref to main text anchor
-<a href="#An-anchor">An anchor</a>
-</p>
-</div>
-<hr>
-
-
-
-</body>
-</html>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp texi2any.pl Texinfo/Parser.pm Texinf...,
Patrice Dumas <=