[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp TODO Texinfo/Convert/HTML.pm t/03cov...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp TODO Texinfo/Convert/HTML.pm t/03cov... |
|
Date: |
Fri, 19 Aug 2011 18:58:43 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/08/19 18:58:43
Modified files:
tp : TODO
tp/Texinfo/Convert: HTML.pm
tp/t : 03coverage_braces.t
Added files:
tp/t/results/coverage_braces: recursive_acronym.pl
Log message:
Handle recursive acronym.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.156&r2=1.157
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.133&r2=1.134
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/03coverage_braces.t?cvsroot=texinfo&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/recursive_acronym.pl?cvsroot=texinfo&rev=1.1
Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -b -r1.156 -r1.157
--- TODO 19 Aug 2011 18:31:23 -0000 1.156
+++ TODO 19 Aug 2011 18:58:43 -0000 1.157
@@ -218,9 +218,6 @@
test empty line in block or brace command in menu description.
-test recursive acronym
address@hidden, @acronym{GNU}'s Not Unix}
-
in hyphenation: only text and accent commands, and should
only appear in toplevel
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- Texinfo/Convert/HTML.pm 16 Aug 2011 22:07:20 -0000 1.133
+++ Texinfo/Convert/HTML.pm 19 Aug 2011 18:58:43 -0000 1.134
@@ -1351,21 +1351,24 @@
pop @{$self->{'document_context'}};
$self->{'ignore_notice'}--;
}
- my $opening;
+ my $result = $args->[0]->{'normal'};
+ if (!$self->in_string()) {
if (defined($explanation_string)) {
- $opening = "<$cmdname title=\"$explanation_string\">";
+ $result = "<$cmdname title=\"$explanation_string\">".$result;
} else {
- $opening = "<$cmdname>";
+ $result = "<$cmdname>".$result;
+ }
+ $result .= "</$cmdname>";
}
if ($with_explanation) {
- return $self->convert_tree ($self->gdt('{explained_string}
({explanation})',
+ $result = $self->convert_tree ($self->gdt('{explained_string}
({explanation})',
{'explained_string' => {'type' => '_converted',
- 'text' => $opening.$args->[0]->{'normal'}."</$cmdname>"},
+ 'text' => $result},
'explanation' => $args->[1]->{'tree'} }));
- } else {
- return $opening.$args->[0]->{'normal'}."</$cmdname>";
}
+ return $result;
}
+
foreach my $explained_command (keys(%explained_commands)) {
$default_commands_conversion{$explained_command}
= \&_convert_explained_command;
Index: t/03coverage_braces.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/03coverage_braces.t,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- t/03coverage_braces.t 13 Aug 2011 15:33:04 -0000 1.42
+++ t/03coverage_braces.t 19 Aug 2011 18:58:43 -0000 1.43
@@ -17,6 +17,9 @@
@address@hidden'E--a. @comma{}A., @\'address@hidden @b{Autonome} }
@address@hidden'E--a. @comma{}A.}
'],
+['recursive_acronym',
+'@acronym{GNU, @acronym{GNU}\'s Not Unix}
+'],
['uref_url',
'@uref{--a,--b}
@uref{--c}
Index: t/results/coverage_braces/recursive_acronym.pl
===================================================================
RCS file: t/results/coverage_braces/recursive_acronym.pl
diff -N t/results/coverage_braces/recursive_acronym.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/coverage_braces/recursive_acronym.pl 19 Aug 2011 18:58:43
-0000 1.1
@@ -0,0 +1,132 @@
+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{'recursive_acronym'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'GNU'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'GNU'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'acronym',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'normalized' => 'GNU'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '\'s Not Unix'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'acronym',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ],
+ [
+ {},
+ {}
+ ]
+ ],
+ 'normalized' => 'GNU'
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0];
+$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1];
+$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1];
+$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'}
= $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1];
+$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0];
+$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1];
+$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][1]
=
$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[2];
+$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'line_nr'} =
$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'line_nr'};
+$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'recursive_acronym'}{'contents'}[0];
+$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'recursive_acronym'}{'contents'}[0];
+$result_trees{'recursive_acronym'}{'contents'}[0]{'parent'} =
$result_trees{'recursive_acronym'};
+
+$result_texis{'recursive_acronym'} = '@acronym{GNU, @acronym{GNU}\'s Not Unix}
+';
+
+
+$result_texts{'recursive_acronym'} = 'GNU (GNU\'s Not Unix)
+';
+
+$result_errors{'recursive_acronym'} = [];
+
+
+
+$result_converted{'plaintext'}->{'recursive_acronym'} = 'GNU (GNU\'s Not Unix)
+';
+
+
+$result_converted{'html_text'}->{'recursive_acronym'} = '<p><acronym
title="GNU’s Not Unix">GNU</acronym> (<acronym>GNU</acronym>’s Not
Unix)
+</p>';
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp TODO Texinfo/Convert/HTML.pm t/03cov...,
Patrice Dumas <=