[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp TODO Texinfo/Convert/HTML.pm t/html_...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp TODO Texinfo/Convert/HTML.pm t/html_... |
|
Date: |
Sat, 13 Aug 2011 20:19:11 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/08/13 20:19:11
Modified files:
tp : TODO
tp/Texinfo/Convert: HTML.pm
tp/t : html_tests.t
tp/t/results/coverage_braces: inforef_too_much_args.pl
nested_args.pl nested_in_sc.pl
ref_in_style_command.pl
uref_in_ref.pl
tp/t/results/html_tests: commands_in_alt.pl
Added files:
tp/t/results/html_tests: commands_in_abbr.pl
Log message:
Start new contexts for strings formatting.
Handle separately @image formatting in preformatted and normal context.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.153&r2=1.154
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.125&r2=1.126
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/html_tests.t?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/inforef_too_much_args.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/nested_args.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/nested_in_sc.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/ref_in_style_command.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/uref_in_ref.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/html_tests/commands_in_alt.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/html_tests/commands_in_abbr.pl?cvsroot=texinfo&rev=1.1
Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -b -r1.153 -r1.154
--- TODO 13 Aug 2011 18:40:21 -0000 1.153
+++ TODO 13 Aug 2011 20:19:10 -0000 1.154
@@ -4,10 +4,6 @@
(*note Inserting Quotation Marks::).
-Make a test, maybe only for HTML? for the formatting of all
-possibilities of @*ref. Certainly in formatting.texi.
-
-
l 3273 in HTML.pm don't be in preformatted for the description.
but call the function for the other stuff.
@@ -149,11 +145,8 @@
enable encoding and entities.
in coverage/formatting
- Test -- in @image in alt in example, to check that -- -> –
-
- Test command in @abbr in @example -> @b -> <b>, it should not.
- do Internal_links_formatting.
+do Internal_links_formatting.
Test that some constructs in @copying in comments in HTML are converted
differently (as there is a 'converter' passed to Texinfo::Text) than when
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- Texinfo/Convert/HTML.pm 13 Aug 2011 13:33:26 -0000 1.125
+++ Texinfo/Convert/HTML.pm 13 Aug 2011 20:19:10 -0000 1.126
@@ -980,7 +980,7 @@
'xref' => [['code'],['normal'],['normal'],['text'],['normal']],
'pxref' => [['code'],['normal'],['normal'],['text'],['normal']],
'ref' => [['code'],['normal'],['normal'],['text'],['normal']],
- 'image' => [['text'],['text'],['text'],['string'],['text']],
+ 'image' => [['text'],['text'],['text'],['string', 'normal'],['text']],
'item' => [[]],
'itemx' => [[]],
);
@@ -1505,14 +1505,25 @@
#cluck "err ($self->{'ignore_notice'})";
$self->line_warn(sprintf($self->__("address@hidden file `%s' (for HTML)
not found, using `%s'"), $basefile, $image_file), $command->{'line_nr'});
}
- my $alt;
+ if ($self->in_preformatted()) {
+ my $alt_text;
+ if (defined($args->[3]) and defined($args->[3]->{'normal'})) {
+ $alt_text = $args->[3]->{'normal'};
+ }
+ if (!defined($alt_text) or ($alt_text eq '')) {
+ $alt_text = $self->xml_protect_text($basefile);
+ }
+ return "[ $alt_text ]";
+ } else {
+ my $alt_string;
if (defined($args->[3]) and defined($args->[3]->{'string'})) {
- $alt = $args->[3]->{'string'};
+ $alt_string = $args->[3]->{'string'};
+ }
+ if (!defined($alt_string) or ($alt_string eq '')) {
+ $alt_string = $self->xml_protect_text($basefile);
+ }
+ return "<img src=\"".$self->xml_protect_text($image_file)."\"
alt=\"$alt_string\">";
}
- $alt = $self->xml_protect_text($basefile)
- if (!defined($alt) or ($alt eq ''));
- return "[ $alt ]" if ($self->in_preformatted());
- return "<img src=\"".$self->xml_protect_text($image_file)."\"
alt=\"$alt\">";
}
return '';
}
@@ -5394,10 +5405,9 @@
my $date = '';
if ($self->get_conf('DATE_IN_HEADER')) {
- # FIXME new context?
- $self->{'document_context'}->[-1]->{'context'}->[-1]->{'string'} = 1;
+ $self->_new_document_context('DATE_IN_HEADER');
my $today = $self->convert_tree({'cmdname' => 'today'});
- delete $self->{'document_context'}->[-1]->{'context'}->[-1]->{'string'};
+ pop @{$self->{'document_context'}};
$date = "\n<meta name=\"date\" content=\"$today\">";
}
@@ -6359,15 +6369,16 @@
$arg_formatted->{$arg_type} = $self->_convert($arg,
$explanation);
$self->{'document_context'}->[-1]->{'context'}->[-1]->{'code'}--;
} elsif ($arg_type eq 'string') {
+ $self->_new_document_context($command_type);
$self->{'document_context'}->[-1]->{'context'}->[-1]->{$arg_type}++;
$arg_formatted->{$arg_type} = $self->_convert($arg,
$explanation);
-
$self->{'document_context'}->[-1]->{'context'}->[-1]->{$arg_type}--;
+ pop @{$self->{'document_context'}};
} elsif ($arg_type eq 'codestring') {
+ $self->_new_document_context($command_type);
$self->{'document_context'}->[-1]->{'context'}->[-1]->{'code'}++;
$self->{'document_context'}->[-1]->{'context'}->[-1]->{'string'}++;
$arg_formatted->{$arg_type} = $self->_convert($arg,
$explanation);
-
$self->{'document_context'}->[-1]->{'context'}->[-1]->{'string'}--;
-
$self->{'document_context'}->[-1]->{'context'}->[-1]->{'code'}--;
+ pop @{$self->{'document_context'}};
} elsif ($arg_type eq 'text') {
$arg_formatted->{$arg_type}
= Texinfo::Convert::Text::convert($arg,
Index: t/html_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/html_tests.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/html_tests.t 30 Jul 2011 09:46:19 -0000 1.5
+++ t/html_tests.t 13 Aug 2011 20:19:10 -0000 1.6
@@ -18,10 +18,17 @@
@end example
'],
['commands_in_alt',
-'@image{f--ile,,,alt @b{in b}}
+'@image{f--ile,,,alt -- @b{in b}}
@example
address@hidden,,,alt @b{in b}}
address@hidden,,,alt -- @b{in b}}
address@hidden example
+'],
+['commands_in_abbr',
+'@abbr{A, @b{abbr} -- b}.
+
address@hidden
address@hidden, @b{abbr} -- b}.
@end example
'],
['raw_html',
Index: t/results/coverage_braces/inforef_too_much_args.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/inforef_too_much_args.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/coverage_braces/inforef_too_much_args.pl 13 Aug 2011 15:33:07
-0000 1.2
+++ t/results/coverage_braces/inforef_too_much_args.pl 13 Aug 2011 20:19:10
-0000 1.3
@@ -211,7 +211,7 @@
$result_converted{'html_text'}->{'inforef_too_much_args'} = '<a
name="chapter"></a>
<h3 class="node-heading">chapter</h3>
-<p>See <a href="../file name, spurious arg.html#chapter">(file name, spurious
arg)cross ref name</a>
+<p>See <a href="file name, spurious arg.html#chapter">(file name, spurious
arg)cross ref name</a>
</p><hr>
';
Index: t/results/coverage_braces/nested_args.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/nested_args.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/coverage_braces/nested_args.pl 13 Aug 2011 15:33:07 -0000
1.27
+++ t/results/coverage_braces/nested_args.pl 13 Aug 2011 20:19:11 -0000
1.28
@@ -248,6 +248,6 @@
';
-$result_converted{'html_text'}->{'nested_args'} = '<p>See <a
href="../manual.html#g_t_0040-in-samp">(manual)Sẽction</a>.</p>';
+$result_converted{'html_text'}->{'nested_args'} = '<p>See <a
href="manual.html#g_t_0040-in-samp">(manual)Sẽction</a>.</p>';
1;
Index: t/results/coverage_braces/nested_in_sc.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/nested_in_sc.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/coverage_braces/nested_in_sc.pl 13 Aug 2011 15:33:07 -0000
1.7
+++ t/results/coverage_braces/nested_in_sc.pl 13 Aug 2011 20:19:11 -0000
1.8
@@ -278,7 +278,7 @@
';
-$result_converted{'html_text'}->{'nested_in_sc'} = '<p><small><small>AAA
Ñ Å Å~ <a name="DOCF1" href="#FOOT1">(1)</a>, <abbr
title="EXPL">ABR</abbr> (EXPL),
+$result_converted{'html_text'}->{'nested_in_sc'} = '<p><small><small>AAA
Ñ Å Å~ <a name="DOCF1" href="#FOOT1">(1)</a>, <abbr
title="expl">ABR</abbr> (EXPL),
<tt>in verb</tt></small></small>
</p><div class="footnote">
<hr>
Index: t/results/coverage_braces/ref_in_style_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/ref_in_style_command.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/coverage_braces/ref_in_style_command.pl 13 Aug 2011 15:33:07
-0000 1.9
+++ t/results/coverage_braces/ref_in_style_command.pl 13 Aug 2011 20:19:11
-0000 1.10
@@ -103,6 +103,6 @@
';
-$result_converted{'html_text'}->{'ref_in_style_command'} = '<p>‘<samp><a
href="../manula.html#other-node">(manula)other node</a></samp>’.</p>';
+$result_converted{'html_text'}->{'ref_in_style_command'} = '<p>‘<samp><a
href="manula.html#other-node">(manula)other node</a></samp>’.</p>';
1;
Index: t/results/coverage_braces/uref_in_ref.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/uref_in_ref.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/coverage_braces/uref_in_ref.pl 13 Aug 2011 15:33:08 -0000
1.8
+++ t/results/coverage_braces/uref_in_ref.pl 13 Aug 2011 20:19:11 -0000
1.9
@@ -363,7 +363,7 @@
';
-$result_converted{'html_text'}->{'uref_in_ref'} = '<p><a
href="../index3.html#node">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+$result_converted{'html_text'}->{'uref_in_ref'} = '<p><a
href="index3.html#node">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
</p>';
1;
Index: t/results/html_tests/commands_in_alt.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/html_tests/commands_in_alt.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/html_tests/commands_in_alt.pl 12 Jul 2011 08:41:23 -0000
1.1
+++ t/results/html_tests/commands_in_alt.pl 13 Aug 2011 20:19:11 -0000
1.2
@@ -33,7 +33,7 @@
'contents' => [
{
'parent' => {},
- 'text' => 'alt '
+ 'text' => 'alt -- '
},
{
'args' => [
@@ -131,7 +131,7 @@
'contents' => [
{
'parent' => {},
- 'text' => 'alt '
+ 'text' => 'alt -- '
},
{
'args' => [
@@ -285,10 +285,10 @@
$result_trees{'commands_in_alt'}{'contents'}[3]{'extra'}{'end_command'} =
$result_trees{'commands_in_alt'}{'contents'}[3]{'contents'}[2];
$result_trees{'commands_in_alt'}{'contents'}[3]{'parent'} =
$result_trees{'commands_in_alt'};
-$result_texis{'commands_in_alt'} = '@image{f--ile,,,alt @b{in b}}
+$result_texis{'commands_in_alt'} = '@image{f--ile,,,alt -- @b{in b}}
@example
address@hidden,,,alt @b{in b}}
address@hidden,,,alt -- @b{in b}}
@end example
';
@@ -345,10 +345,10 @@
<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
-<img src="f--ile.png" alt="alt in b">
+<img src="f--ile.png" alt="alt – in b">
<div class="example">
-<pre class="example">[ alt <b>in b</b> ]
+<pre class="example">[ alt -- <b>in b</b> ]
</pre></div>
<p>
Index: t/results/html_tests/commands_in_abbr.pl
===================================================================
RCS file: t/results/html_tests/commands_in_abbr.pl
diff -N t/results/html_tests/commands_in_abbr.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/html_tests/commands_in_abbr.pl 13 Aug 2011 20:19:11 -0000
1.1
@@ -0,0 +1,360 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'commands_in_abbr'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'A'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'abbr'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'b',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' -- b'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'abbr',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ],
+ [
+ {},
+ {}
+ ]
+ ],
+ 'normalized' => 'A'
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'example',
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'A'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'abbr'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'b',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' -- b'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'abbr',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ],
+ [
+ {},
+ {}
+ ]
+ ],
+ 'normalized' => 'A'
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'example'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'example',
+ 'text_arg' => 'example'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1];
+$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[1];
+$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'}
= $result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[1];
+$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1];
+$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][1]
=
$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[2];
+$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'line_nr'} =
$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'line_nr'};
+$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'commands_in_abbr'}{'contents'}[0];
+$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'commands_in_abbr'}{'contents'}[0];
+$result_trees{'commands_in_abbr'}{'contents'}[0]{'parent'} =
$result_trees{'commands_in_abbr'};
+$result_trees{'commands_in_abbr'}{'contents'}[1]{'parent'} =
$result_trees{'commands_in_abbr'};
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'commands_in_abbr'}{'contents'}[2];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'commands_in_abbr'}{'contents'}[2];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'}
=
$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][1]
=
$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'line_nr'}
=
$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'line_nr'};
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'commands_in_abbr'}{'contents'}[2];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[2];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[2];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'commands_in_abbr'}{'contents'}[2];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[2]{'parent'} =
$result_trees{'commands_in_abbr'}{'contents'}[2];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'extra'}{'end_command'} =
$result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[2];
+$result_trees{'commands_in_abbr'}{'contents'}[2]{'parent'} =
$result_trees{'commands_in_abbr'};
+
+$result_texis{'commands_in_abbr'} = '@abbr{A, @b{abbr} -- b}.
+
address@hidden
address@hidden, @b{abbr} -- b}.
address@hidden example
+';
+
+
+$result_texts{'commands_in_abbr'} = 'A (abbr -- b).
+
+A (abbr -- b).
+';
+
+$result_errors{'commands_in_abbr'} = [];
+
+
+
+$result_converted{'html'}->{'commands_in_abbr'} = '<!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>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}
+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><abbr title="abbr – b">A</abbr> (<b>abbr</b> – b).
+</p>
+<div class="example">
+<pre class="example"><abbr title="abbr – b">A</abbr> (<b>abbr</b> -- b).
+</pre></div>
+<p>
+
+
+</p>
+</body>
+</html>
+';
+
+$result_converted_errors{'html'}->{'commands_in_abbr'} = [
+ {
+ 'error_line' => 'warning: Must specify a title with a title command or @top
+',
+ 'text' => 'Must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp TODO Texinfo/Convert/HTML.pm t/html_...,
Patrice Dumas <=