[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[5880] * tp/Texinfo/Parser.pm (_parse_def): on @def* lines, cons
|
From: |
Patrice Dumas |
|
Subject: |
[5880] * tp/Texinfo/Parser.pm (_parse_def): on @def* lines, consider |
|
Date: |
Sun, 19 Oct 2014 21:36:43 +0000 |
Revision: 5880
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5880
Author: pertusus
Date: 2014-10-19 21:36:42 +0000 (Sun, 19 Oct 2014)
Log Message:
-----------
* tp/Texinfo/Parser.pm (_parse_def): on @def* lines, consider
@-commands and text not separated by space to be a single
word. From Werner LEMBERG (http://savannah.gnu.org/bugs/?43406).
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/results/def/all_commands_delimiters.pl
trunk/tp/t/results/def/all_commands_delimiters_printindex.pl
trunk/tp/t/results/def/empty_def_arguments.pl
trunk/tp/t/results/def/empty_deftypeop_name.pl
trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
trunk/tp/tests/nested_formats/res_parser_info/nested_flushright/nested_formats.info
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2014-10-19 21:27:50 UTC (rev 5879)
+++ trunk/ChangeLog 2014-10-19 21:36:42 UTC (rev 5880)
@@ -1,3 +1,9 @@
+2014-10-19 Patrice Dumas <address@hidden>
+
+ * tp/Texinfo/Parser.pm (_parse_def): on @def* lines, consider
+ @-commands and text not separated by space to be a single
+ word. From Werner LEMBERG (http://savannah.gnu.org/bugs/?43406).
+
2014-10-16 Patrice Dumas <address@hidden>
* tp/Texinfo/Convert/Plaintext.pm (_convert): with @w and @tie,
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2014-10-19 21:27:50 UTC (rev 5879)
+++ trunk/tp/Texinfo/Parser.pm 2014-10-19 21:36:42 UTC (rev 5880)
@@ -2341,6 +2341,7 @@
$spaces = shift @{$contents} if (defined($contents->[0]->{'text'}) and
$contents->[0]->{'text'} !~ /\S/);
if (defined($spaces)) {
+ #print STDERR "Gather spaces only text\n";
$spaces->{'type'} = 'spaces';
chomp $spaces->{'text'};
$spaces = undef if ($spaces->{'text'} eq '');
@@ -2426,20 +2427,90 @@
# Even when $arg_type is not set, that is for def* that is not documented
# to take args, everything is as is arg_type was set to arg.
$arg_type = pop @args if ($args[-1] eq 'arg' or $args[-1] eq 'argtype');
- foreach my $arg (@args) {
- #print STDERR "$command $arg"._print_current($contents[0]);
- #foreach my $content (@contents) {print STDERR "
"._print_current($content)};
- #print STDERR " contents ->".Texinfo::Convert::Texinfo::convert
({'contents' => address@hidden);
+ my @def_line = ();
+ # tokenize the line. We need to do that in order to be able to
+ # look ahead for spaces.
+ while (@contents) {
my ($spaces, $next) = $self->_next_bracketed_or_word(address@hidden);
+ # if there is no argument at all, the leading space is not associated
+ # to the @-command, so end up being gathered here. We do not want to
+ # have this leading space appear in the arguments ever, so we ignore
+ # it here.
+ push @def_line, ['spaces', $spaces] if ((defined($spaces)) and
scalar(@def_line) != 0);
+ #print STDERR "spaces `".Texinfo::Convert::Texinfo::convert($spaces)."'\n"
if (defined($spaces));
last if (!defined($next));
- #print STDERR "NEXT[$arg] ".Texinfo::Convert::Texinfo::convert($next)."\n";
- push @result, ['spaces', $spaces] if (defined($spaces));
- push @result, [$arg, $next];
+ #print "$next, $next->{'type'}\n";
+ #print STDERR "NEXT ".Texinfo::Convert::Texinfo::convert($next)."\n";
+ if ($next->{'type'} and $next->{'type'} eq 'bracketed_def_content') {
+ push @def_line, ['bracketed', $next];
+ } else {
+ push @def_line, ['text_or_cmd', $next];
+ }
}
-
+ my $argument_content = [];
+ my $arg = shift (@args);
+ while (@def_line) {
+ my $token = $def_line[0];
+ #print STDERR "next token: $token->[0]. arg $arg\n";
+ #print STDERR "NEXT ".Texinfo::Convert::Texinfo::convert($token->[1])."\n";
+ # finish previous item
+ if ($token->[0] eq 'spaces' or $token->[0] eq 'bracketed') {
+ # we create a {'contents' =>} only if there is more than one
+ # content gathered.
+ if (scalar(@$argument_content)) {
+ if (scalar(@$argument_content) > 1) {
+ push @result, [$arg, {'contents' => $argument_content}];
+ } elsif (scalar(@$argument_content) == 1) {
+ push @result, [$arg, $argument_content->[0]];
+ }
+ $argument_content = [];
+ if ($token->[0] eq 'spaces') {
+ $arg = shift (@args);
+ }
+ }
+ }
+ if ($token->[0] eq 'bracketed') {
+ my $bracketed = shift @def_line;
+ push @result, [$arg, $bracketed->[1]];
+ $arg = shift (@args);
+ } elsif ($token->[0] eq 'spaces') {
+ push @result, shift @def_line;
+ } else {
+ my $text_or_cmd = shift @def_line;
+ push @$argument_content, $text_or_cmd->[1];
+ }
+ last if (! defined($arg));
+ }
+ if (scalar(@$argument_content) > 1) {
+ push @result, [$arg, {'contents' => $argument_content}];
+ } elsif (scalar(@$argument_content) == 1) {
+ push @result, [$arg, $argument_content->[0]];
+ }
+ #foreach my $arg (@args) {
+ # #print STDERR "$command $arg"._print_current($contents[0]);
+ # #foreach my $content (@contents) {print STDERR "
"._print_current($content)};
+ # #print STDERR " contents ->".Texinfo::Convert::Texinfo::convert
({'contents' => address@hidden);
+ # my ($spaces, $next) = $self->_next_bracketed_or_word(address@hidden);
+ # last if (!defined($next));
+ # #my $spaces_string = 'NOSPACE';
+ # #if (defined($spaces)) {
+ # # $spaces_string = "`".Texinfo::Convert::Texinfo::convert($spaces)."'";
+ # #}
+ # #print STDERR "NEXT $spaces_string [$arg]
".Texinfo::Convert::Texinfo::convert($next)."\n";
+ # push @result, ['spaces', $spaces] if (defined($spaces));
+ # push @result, [$arg, $next];
+ #}
my @args_results;
- while (@contents) {
- my ($spaces, $next) = $self->_next_bracketed_or_word(address@hidden);
+ #while (@contents) {
+ while (@def_line) {
+ my $spaces;
+ my $next_token = shift @def_line;
+ if ($next_token->[0] eq 'spaces') {
+ $spaces = $next_token->[1];
+ $next_token = shift @def_line;
+ }
+ my $next = $next_token->[1];
+ #my ($spaces, $next) = $self->_next_bracketed_or_word(address@hidden);
push @args_results, ['spaces', $spaces] if (defined($spaces));
last if (!defined($next));
if (defined($next->{'text'})) {
@@ -2803,6 +2874,7 @@
#} else {
# $def_parsed_hash->{$arg->[0]} = $arg->[1];
#}
+ #print STDERR "DEF PARSED HASH $arg->[0]
$arg->[1]|".Texinfo::Convert::Texinfo::convert($arg->[1])."|\n";
$def_parsed_hash->{$arg->[0]} = $arg->[1];
}
$current->{'parent'}->{'extra'}->{'def_parsed_hash'} = $def_parsed_hash;
Modified: trunk/tp/t/results/def/all_commands_delimiters.pl
===================================================================
--- trunk/tp/t/results/def/all_commands_delimiters.pl 2014-10-19 21:27:50 UTC
(rev 5879)
+++ trunk/tp/t/results/def/all_commands_delimiters.pl 2014-10-19 21:36:42 UTC
(rev 5880)
@@ -8147,14 +8147,15 @@
[
'category',
{
- 'text' => 'Command'
+ 'contents' => [
+ {
+ 'text' => 'Command'
+ },
+ {}
+ ]
}
],
[
- 'class',
- {}
- ],
- [
'spaces',
{
'text' => ' ',
@@ -8162,7 +8163,7 @@
}
],
[
- 'type',
+ 'class',
{
'contents' => [],
'parent' => {},
@@ -8177,16 +8178,17 @@
}
],
[
- 'name',
+ 'type',
{
- 'text' => 'expose'
+ 'contents' => [
+ {
+ 'text' => 'expose'
+ },
+ {}
+ ]
}
],
[
- 'arg',
- {}
- ],
- [
'spaces',
{
'text' => ' ',
@@ -8194,7 +8196,7 @@
}
],
[
- 'typearg',
+ 'name',
{
'text' => 'name'
}
@@ -8234,7 +8236,7 @@
'index_name' => 'fn',
'index_prefix' => 'f',
'index_type_command' => 'deftypeop',
- 'key' => 'expose on com',
+ 'key' => 'name on Windowint',
'number' => 21
},
'original_def_cmdname' => 'deftypeop'
@@ -15149,20 +15151,20 @@
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[1][1]
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[3][1]{'contents'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4]{'contents'};
-$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[3][1]{'parent'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[6][1]
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[1]
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4]{'contents'};
+$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0];
+$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'}[1]
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6];
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[0][1];
-$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[5][1];
-$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[3][1];
+$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[6][1];
+$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[4][1];
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
= $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[5][1];
+$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[6][1];
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
-$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3]
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[5][1];
-$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3]
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[6][1];
+$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'line_nr'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'parent'}
= $result_trees{'all_commands_delimiters'}{'contents'}[50];
$result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[1];
@@ -16483,7 +16485,7 @@
Operation21 on ;Window: int ;expose type arg
-Command on com: Windowint expose exp name
+Commandcom on Windowint: exposeexp name
Function: apply function &rest arguments
@@ -17018,7 +17020,7 @@
-- Operation21 on ;Window: \'int\' ;expose type arg
- -- Command on \'com\': Window\'int\' expose EXP name
+ -- Command\'com\' on Window\'int\': exposeEXP name
-- Function: apply function &rest arguments
Modified: trunk/tp/t/results/def/all_commands_delimiters_printindex.pl
===================================================================
--- trunk/tp/t/results/def/all_commands_delimiters_printindex.pl
2014-10-19 21:27:50 UTC (rev 5879)
+++ trunk/tp/t/results/def/all_commands_delimiters_printindex.pl
2014-10-19 21:36:42 UTC (rev 5880)
@@ -8206,14 +8206,15 @@
[
'category',
{
- 'text' => 'Command'
+ 'contents' => [
+ {
+ 'text' => 'Command'
+ },
+ {}
+ ]
}
],
[
- 'class',
- {}
- ],
- [
'spaces',
{
'text' => ' ',
@@ -8221,7 +8222,7 @@
}
],
[
- 'type',
+ 'class',
{
'contents' => [],
'parent' => {},
@@ -8236,16 +8237,17 @@
}
],
[
- 'name',
+ 'type',
{
- 'text' => 'expose'
+ 'contents' => [
+ {
+ 'text' => 'expose'
+ },
+ {}
+ ]
}
],
[
- 'arg',
- {}
- ],
- [
'spaces',
{
'text' => ' ',
@@ -8253,7 +8255,7 @@
}
],
[
- 'typearg',
+ 'name',
{
'text' => 'name'
}
@@ -8293,7 +8295,7 @@
'index_name' => 'fn',
'index_prefix' => 'f',
'index_type_command' => 'deftypeop',
- 'key' => 'expose on com',
+ 'key' => 'name on Windowint',
'node' => {},
'number' => 21
},
@@ -15549,20 +15551,20 @@
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[1][1]
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[3][1]{'contents'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4]{'contents'};
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[3][1]{'parent'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[6][1]
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[1]
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4]{'contents'};
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'}[1]
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6];
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[0][1];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[5][1];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[3][1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[6][1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[4][1];
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[5][1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[6][1];
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3]
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[5][1];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3]
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[6][1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'line_nr'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50];
@@ -16967,7 +16969,7 @@
Operation21 on ;Window: int ;expose type arg
-Command on com: Windowint expose exp name
+Commandcom on Windowint: exposeexp name
Function: apply function &rest arguments
@@ -17120,7 +17122,7 @@
-- Operation21 on ;Window: \'int\' ;expose type arg
- -- Command on \'com\': Window\'int\' expose EXP name
+ -- Command\'com\' on Window\'int\': exposeEXP name
-- Function: apply function &rest arguments
@@ -17191,7 +17193,6 @@
* e,xpose on W,indow <1>: Top. (line 45)
* e;xpose on W;indow: Top. (line 57)
* e;xpose on W;indow <1>: Top. (line 61)
-* expose on \'com\': Top. (line 65)
* expose on W,indow: Top. (line 36)
* expose on Window: Top. (line 39)
* expose on windows: Top. (line 33)
@@ -17201,6 +17202,7 @@
* FORWARD--CHAR: Top. (line 3)
* fun_name: Top. (line 105)
* fun_name1: Top. (line 107)
+* name on Window\'int\': Top. (line 65)
* push: Top. (line 18)
Types
@@ -17390,7 +17392,7 @@
</dl>
<dl>
-<dt><a name="index-expose-on-com"></a>Command on <code>com</code>:
<em>Window<code>int</code></em> <strong>expose</strong> <em><var>exp</var>
name</em></dt>
+<dt><a name="index-name-on-Windowint"></a>Command<code>com</code> on
Window<code>int</code>: <em>expose<var>exp</var></em> <strong>name</strong></dt>
</dl>
<dl>
@@ -17492,6 +17494,8 @@
<a class="summary-letter" href="#Top_fn_letter-F"><b>F</b></a>
+<a class="summary-letter" href="#Top_fn_letter-N"><b>N</b></a>
+
<a class="summary-letter" href="#Top_fn_letter-P"><b>P</b></a>
</td></tr></table>
@@ -17528,7 +17532,6 @@
<tr><td></td><td valign="top"><a
href="#index-e_002cxpose-on-W_002cindow-1"><code>e,xpose on
W,indow</code></a>:</td><td> </td><td valign="top"><a
href="#Top">Top</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-e_003bxpose-on-W_003bindow"><code>e;xpose on
W;indow</code></a>:</td><td> </td><td valign="top"><a
href="#Top">Top</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-e_003bxpose-on-W_003bindow-1"><code>e;xpose on
W;indow</code></a>:</td><td> </td><td valign="top"><a
href="#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="#index-expose-on-com"><code>expose on
<code>com</code></code></a>:</td><td> </td><td valign="top"><a
href="#Top">Top</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-expose-on-W_002cindow"><code>expose on
W,indow</code></a>:</td><td> </td><td valign="top"><a
href="#Top">Top</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-expose-on-Window"><code>expose
on Window</code></a>:</td><td> </td><td valign="top"><a
href="#Top">Top</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-expose-on-windows"><code>expose
on windows</code></a>:</td><td> </td><td valign="top"><a
href="#Top">Top</a></td></tr>
@@ -17541,6 +17544,9 @@
<tr><td></td><td valign="top"><a
href="#index-fun_005fname"><code>fun_name</code></a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-fun_005fname1"><code>fun_name1</code></a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
+<tr><th><a name="Top_fn_letter-N">N</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-name-on-Windowint"><code>name on
Window<code>int</code></code></a>:</td><td> </td><td valign="top"><a
href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
<tr><th><a name="Top_fn_letter-P">P</a></th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a
href="#index-push"><code>push</code></a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
@@ -17558,6 +17564,8 @@
<a class="summary-letter" href="#Top_fn_letter-F"><b>F</b></a>
+<a class="summary-letter" href="#Top_fn_letter-N"><b>N</b></a>
+
<a class="summary-letter" href="#Top_fn_letter-P"><b>P</b></a>
</td></tr></table>
Modified: trunk/tp/t/results/def/empty_def_arguments.pl
===================================================================
--- trunk/tp/t/results/def/empty_def_arguments.pl 2014-10-19 21:27:50 UTC
(rev 5879)
+++ trunk/tp/t/results/def/empty_def_arguments.pl 2014-10-19 21:36:42 UTC
(rev 5880)
@@ -203,6 +203,13 @@
[
'category',
{}
+ ],
+ [
+ 'spaces',
+ {
+ 'text' => ' ',
+ 'type' => 'spaces'
+ }
]
],
'def_command' => 'deffn',
Modified: trunk/tp/t/results/def/empty_deftypeop_name.pl
===================================================================
--- trunk/tp/t/results/def/empty_deftypeop_name.pl 2014-10-19 21:27:50 UTC
(rev 5879)
+++ trunk/tp/t/results/def/empty_deftypeop_name.pl 2014-10-19 21:36:42 UTC
(rev 5880)
@@ -118,14 +118,15 @@
[
'category',
{
- 'text' => 'Command'
+ 'contents' => [
+ {
+ 'text' => 'Command'
+ },
+ {}
+ ]
}
],
[
- 'class',
- {}
- ],
- [
'spaces',
{
'text' => ' ',
@@ -133,7 +134,7 @@
}
],
[
- 'type',
+ 'class',
{
'contents' => [],
'parent' => {},
@@ -148,53 +149,23 @@
}
],
[
- 'name',
+ 'type',
{
- 'text' => 'expose'
+ 'contents' => [
+ {
+ 'text' => 'expose'
+ },
+ {}
+ ]
}
- ],
- [
- 'arg',
- {}
]
],
'def_command' => 'deftypeop',
'def_parsed_hash' => {
'category' => {},
'class' => {},
- 'name' => {},
'type' => {}
},
- 'index_entry' => {
- 'command' => {},
- 'content' => [
- {},
- {},
- {
- 'parent' => {
- 'contents' => [],
- 'type' => 'root_line'
- },
- 'text' => ' on '
- },
- {},
- {}
- ],
- 'content_normalized' => [
- {},
- {
- 'text' => ' on '
- },
- {}
- ],
- 'in_code' => 1,
- 'index_at_command' => 'deftypeop',
- 'index_name' => 'fn',
- 'index_prefix' => 'f',
- 'index_type_command' => 'deftypeop',
- 'key' => 'expose on com',
- 'number' => 1
- },
'original_def_cmdname' => 'deftypeop'
},
'line_nr' => {},
@@ -274,20 +245,13 @@
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'}
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[1][1]
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[3][1]{'contents'}
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'contents'};
-$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[3][1]{'parent'}
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[6][1]
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[1]
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'}
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'contents'};
+$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'}
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'}[1]
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6];
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
-$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[5][1];
-$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[3][1];
-$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
= $result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[5][1];
-$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'}
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
-$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3]
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[5][1];
-$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[4][1];
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'line_nr'}
=
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'empty_deftypeop_name'}{'contents'}[0];
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[1];
@@ -308,17 +272,17 @@
';
-$result_texts{'empty_deftypeop_name'} = 'Command on com: Windowint expose exp
+$result_texts{'empty_deftypeop_name'} = 'Commandcom on Windowint: exposeexp
';
$result_errors{'empty_deftypeop_name'} = [
{
- 'error_line' => ':1: warning: entry for index `fn\' outside of any node
+ 'error_line' => ':1: warning: missing name for @deftypeop
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => 'entry for index `fn\' outside of any node',
+ 'text' => 'missing name for @deftypeop',
'type' => 'warning'
}
];
Modified: trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
2014-10-19 21:27:50 UTC (rev 5879)
+++ trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
2014-10-19 21:36:42 UTC (rev 5880)
@@ -309,7 +309,7 @@
<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <replaceable></replaceable></synopsis>
<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<replaceable>truc</replaceable></synopsis>
-<synopsis><phrase role="category"><emphasis role="bold"><emphasis
role="bold">id ‘i’ ule</emphasis></emphasis>:</phrase></synopsis>
+<synopsis><phrase role="category"><emphasis role="bold"><emphasis
role="bold">id ‘i’ ule</emphasis></emphasis>:</phrase>
</synopsis>
<synopsis></synopsis>
<synopsis><phrase role="category"><emphasis
role="bold">aaa</emphasis>:</phrase></synopsis>
<synopsis><phrase role="category"><emphasis role="bold"></emphasis>:</phrase>
<function></function></synopsis>
@@ -806,7 +806,7 @@
<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <replaceable></replaceable></synopsis>
<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<replaceable>truc</replaceable></synopsis>
-<synopsis><phrase role="category"><emphasis role="bold"><emphasis
role="bold">id ‘i’ ule</emphasis></emphasis>:</phrase></synopsis>
+<synopsis><phrase role="category"><emphasis role="bold"><emphasis
role="bold">id ‘i’ ule</emphasis></emphasis>:</phrase>
</synopsis>
<synopsis></synopsis>
<synopsis><phrase role="category"><emphasis
role="bold">aaa</emphasis>:</phrase></synopsis>
<synopsis><phrase role="category"><emphasis role="bold"></emphasis>:</phrase>
<function></function></synopsis>
@@ -1304,7 +1304,7 @@
<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <replaceable></replaceable></synopsis>
<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<replaceable>truc</replaceable></synopsis>
-<synopsis><phrase role="category"><emphasis role="bold"><emphasis
role="bold">id ‘i’ ule</emphasis></emphasis>:</phrase></synopsis>
+<synopsis><phrase role="category"><emphasis role="bold"><emphasis
role="bold">id ‘i’ ule</emphasis></emphasis>:</phrase>
</synopsis>
<synopsis></synopsis>
<synopsis><phrase role="category"><emphasis
role="bold">aaa</emphasis>:</phrase></synopsis>
<synopsis><phrase role="category"><emphasis role="bold"></emphasis>:</phrase>
<function></function></synopsis>
@@ -1803,7 +1803,7 @@
<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <replaceable></replaceable></synopsis>
<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<replaceable>truc</replaceable></synopsis>
-<synopsis><phrase role="category"><emphasis role="bold"><emphasis
role="bold">id ‘i’ ule</emphasis></emphasis>:</phrase></synopsis>
+<synopsis><phrase role="category"><emphasis role="bold"><emphasis
role="bold">id ‘i’ ule</emphasis></emphasis>:</phrase>
</synopsis>
<synopsis></synopsis>
<synopsis><phrase role="category"><emphasis
role="bold">aaa</emphasis>:</phrase></synopsis>
<synopsis><phrase role="category"><emphasis role="bold"></emphasis>:</phrase>
<function></function></synopsis>
@@ -2301,7 +2301,7 @@
<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <replaceable></replaceable></synopsis>
<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<replaceable>truc</replaceable></synopsis>
-<synopsis><phrase role="category"><emphasis role="bold"><emphasis
role="bold">id ‘i’ ule</emphasis></emphasis>:</phrase></synopsis>
+<synopsis><phrase role="category"><emphasis role="bold"><emphasis
role="bold">id ‘i’ ule</emphasis></emphasis>:</phrase>
</synopsis>
<synopsis></synopsis>
<synopsis><phrase role="category"><emphasis
role="bold">aaa</emphasis>:</phrase></synopsis>
<synopsis><phrase role="category"><emphasis role="bold"></emphasis>:</phrase>
<function></function></synopsis>
@@ -2791,7 +2791,7 @@
<synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase
role="category"><emphasis role="bold">Command</emphasis>:</phrase>
<function>log trap2</function> <replaceable></replaceable></synopsis>
<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
ule</emphasis></primary></indexterm><phrase role="category"><emphasis
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
<synopsis><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></primary></indexterm><phrase
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase>
<function><emphasis role="bold">id ‘i’ ule</emphasis></function>
<replaceable>truc</replaceable></synopsis>
-<synopsis><phrase role="category"><emphasis role="bold"><emphasis
role="bold">id ‘i’ ule</emphasis></emphasis>:</phrase></synopsis>
+<synopsis><phrase role="category"><emphasis role="bold"><emphasis
role="bold">id ‘i’ ule</emphasis></emphasis>:</phrase>
</synopsis>
<synopsis></synopsis>
<synopsis><phrase role="category"><emphasis
role="bold">aaa</emphasis>:</phrase></synopsis>
<synopsis><phrase role="category"><emphasis role="bold"></emphasis>:</phrase>
<function></function></synopsis>
Modified: trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
2014-10-19 21:27:50 UTC (rev 5879)
+++ trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
2014-10-19 21:36:42 UTC (rev 5880)
@@ -1103,7 +1103,7 @@
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="9">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="10"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="11"><b>id
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory>
<deffunction><b>id <samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory> </definitionterm></deffnx>
<deffnx><definitionterm></definitionterm></deffnx>
<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
@@ -1704,7 +1704,7 @@
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="42">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="43"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="44"><b>id
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory>
<deffunction><b>id <samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory> </definitionterm></deffnx>
<deffnx><definitionterm></definitionterm></deffnx>
<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
@@ -2305,7 +2305,7 @@
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="75">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="76"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="77"><b>id
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory>
<deffunction><b>id <samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory> </definitionterm></deffnx>
<deffnx><definitionterm></definitionterm></deffnx>
<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
@@ -2900,7 +2900,7 @@
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="108">log
trap2 </indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="109"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="110"><b>id
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory>
<deffunction><b>id <samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory> </definitionterm></deffnx>
<deffnx><definitionterm></definitionterm></deffnx>
<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
Modified:
trunk/tp/tests/nested_formats/res_parser_info/nested_flushright/nested_formats.info
===================================================================
---
trunk/tp/tests/nested_formats/res_parser_info/nested_flushright/nested_formats.info
2014-10-19 21:27:50 UTC (rev 5879)
+++
trunk/tp/tests/nested_formats/res_parser_info/nested_flushright/nested_formats.info
2014-10-19 21:36:42 UTC (rev 5880)
@@ -795,8 +795,7 @@
s--mallexample
- -- c--ategory: d--effn_name
- a--rguments...
+ -- c--ategory: d--effn_name a--rguments...
d-effn
a
@@ -944,8 +943,7 @@
s--mallexample
- -- c--ategory: d--effn_name
- a--rguments...
+ -- c--ategory: d--effn_name a--rguments...
d-effn
a
@@ -976,8 +974,7 @@
s--mallexample
- -- c--ategory: d--effn_name
- a--rguments...
+ -- c--ategory: d--effn_name a--rguments...
d-effn
a
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [5880] * tp/Texinfo/Parser.pm (_parse_def): on @def* lines, consider,
Patrice Dumas <=