[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp TODO Texinfo/Common.pm Texinfo/Conve...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp TODO Texinfo/Common.pm Texinfo/Conve... |
|
Date: |
Thu, 02 Jun 2011 19:46:30 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/06/02 19:46:29
Modified files:
tp : TODO
tp/Texinfo : Common.pm
tp/Texinfo/Convert: Converter.pm HTML.pm Plaintext.pm Text.pm
tp/t/results/coverage: def.pl
tp/t/results/def: all_commands.pl all_commands_delimiters.pl
all_commands_delimiters_printindex.pl
all_commands_printindex.pl
def_defx_mismatch.pl defx_after_comment.pl
defx_after_comment_in_example.pl
defx_after_empty_line.pl
defx_after_empty_line_in_example.pl
defx_after_paragraph_end.pl
defx_after_preformatted_with_text.pl
defx_after_text.pl defx_in_example.pl
double_command.pl empty_def_arguments.pl
empty_def_command.pl empty_deftype.pl
empty_deftypeop_name.pl
end_of_line_end_file.pl
end_of_line_protect_at_end.pl
end_of_lines_protected.pl
inter_item_commands_in_def.pl
leading_space_in_def_arg.pl
no_category_or_no_name.pl not_closed.pl
protected_brace.pl space_in_def_for_index.pl
wrong_braces_simple.pl
wrong_braces_with_end_of_lines.pl
tp/t/results/indices: empty_index_entry.pl
tp/t/results/info_tests: def_in_copying.pl
tp/t/results/invalid_nestings: block_not_matching.pl
def_in_style_command.pl
def_not_closed_in_menu_description.pl
on_def_line.pl
tp/t/results/languages: multiple.pl simple.pl
tp/t/results/menu: menu_in_deffn.pl
tp/t/results/preformatted: def_in_example.pl
Log message:
Handle better @def* line formatting in Texinfo::Convert::Text.
Use a 'converter' in options to have a possibility of translation.
Put generic function for @def* line handling in Texinfo::Common.
Associate index entry not associated with any element to the top
element.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.129&r2=1.130
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.139&r2=1.140
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/def.pl?cvsroot=texinfo&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands_delimiters.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands_delimiters_printindex.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands_printindex.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/def_defx_mismatch.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_comment.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_comment_in_example.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_empty_line.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_empty_line_in_example.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_paragraph_end.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_preformatted_with_text.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_text.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_in_example.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/double_command.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_def_arguments.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_def_command.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_deftype.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_deftypeop_name.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/end_of_line_end_file.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/end_of_line_protect_at_end.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/end_of_lines_protected.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/inter_item_commands_in_def.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/leading_space_in_def_arg.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/no_category_or_no_name.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/not_closed.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/protected_brace.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/space_in_def_for_index.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/wrong_braces_simple.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/wrong_braces_with_end_of_lines.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/empty_index_entry.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/def_in_copying.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/block_not_matching.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/def_in_style_command.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/on_def_line.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/languages/multiple.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/languages/simple.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_in_deffn.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/def_in_example.pl?cvsroot=texinfo&r1=1.7&r2=1.8
Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- TODO 31 May 2011 20:29:14 -0000 1.129
+++ TODO 2 Jun 2011 19:46:26 -0000 1.130
@@ -1,3 +1,5 @@
+Handle better @exdent in html?
+
LINKS_BUTTONS as config, check and document.
API HTML:
Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- Texinfo/Common.pm 2 May 2011 22:22:57 -0000 1.43
+++ Texinfo/Common.pm 2 Jun 2011 19:46:27 -0000 1.44
@@ -762,4 +762,56 @@
return ($canonical_texinfo_encoding, $perl_encoding,
$canonical_output_encoding);
}
+sub definition_category($$)
+{
+ my $self = shift;
+ my $current = shift;
+
+ return undef if (!$current->{'extra'} or !$current->{'extra'}->{'def_args'});
+
+ my $arg_category = $current->{'extra'}->{'def_parsed_hash'}->{'category'};
+ my $arg_class = $current->{'extra'}->{'def_parsed_hash'}->{'class'};
+
+ return $arg_category
+ if (!defined($arg_class));
+
+ my $style =
+ $command_index_prefix{$current->{'extra'}->{'def_command'}};
+ if ($style eq 'f') {
+ if ($self) {
+ return $self->gdt('{category} on {class}', { 'category' => $arg_category,
+ 'class' => $arg_class });
+ } else {
+ return {'contents' => [$arg_category, {'text' => ' on '}, $arg_class]};
+ }
+ } elsif ($style eq 'v') {
+ if ($self) {
+ return $self->gdt('{category} of {class}', { 'category' => $arg_category,
+ 'class' => $arg_class });
+ } else {
+ return {'contents' => [$arg_category, {'text' => ' of '}, $arg_class]};
+ }
+ }
+}
+
+sub definition_arguments_content($)
+{
+ my $root = shift;
+ my $result;
+
+ my @args = @{$root->{'extra'}->{'def_args'}};
+ while (@args) {
+ last if ($args[0]->[0] ne 'spaces'
+ and !$root->{'extra'}->{'def_parsed_hash'}->{$args[0]->[0]});
+ shift @args;
+ }
+ if (@args) {
+ foreach my $arg (@args) {
+ push @$result, $arg->[1];
+ }
+ }
+ return $result;
+}
+
+
1;
Index: Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- Texinfo/Convert/Converter.pm 1 Jun 2011 21:30:10 -0000 1.18
+++ Texinfo/Convert/Converter.pm 2 Jun 2011 19:46:27 -0000 1.19
@@ -421,53 +421,6 @@
'day' => $mday, 'year' => $year });
}
-sub definition_category($$$$)
-{
- my $self = shift;
- my $current = shift;
- my $arg_category = shift;
- my $arg_class = shift;
- return $arg_category
- if (!defined($arg_class));
-
- my $style =
-
$Texinfo::Common::command_index_prefix{$current->{'extra'}->{'def_command'}};
- #my $category = Texinfo::Convert::Texinfo::convert($arg_category->[0]);
- #my $class = Texinfo::Convert::Texinfo::convert($arg_class->[0]);
- #print STDERR "DEFINITION CATEGORY($style): $category $class\n"
- # if ($self->get_conf('DEBUG'));
- if ($style eq 'f') {
- #return Texinfo::Parser::parse_texi_line (undef, "$category on $class");
- return $self->gdt('{category} on {class}', { 'category' => $arg_category,
- 'class' => $arg_class });
- } elsif ($style eq 'v') {
- #return Texinfo::Parser::parse_texi_line (undef, "$category of $class");
- return $self->gdt('{category} of {class}', { 'category' => $arg_category,
- 'class' => $arg_class });
- }
- return $arg_category;
-}
-
-sub definition_arguments_content($$)
-{
- my $self = shift;
- my $root = shift;
- my $result;
-
- my @args = @{$root->{'extra'}->{'def_args'}};
- while (@args) {
- last if ($args[0]->[0] ne 'spaces'
- and !$root->{'extra'}->{'def_parsed_hash'}->{$args[0]->[0]});
- shift @args;
- }
- if (@args) {
- foreach my $arg (@args) {
- push @$result, $arg->[1];
- }
- }
- return $result;
-}
-
sub _create_destination_directory($)
{
my $self = shift;
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- Texinfo/Convert/HTML.pm 2 Jun 2011 17:13:05 -0000 1.75
+++ Texinfo/Convert/HTML.pm 2 Jun 2011 19:46:27 -0000 1.76
@@ -286,6 +286,16 @@
return undef;
}
+sub element_command($$)
+{
+ my $self = shift;
+ my $element = shift;
+
+ if ($element and $element->{'extra'}) {
+ return $element->{'extra'}->{'element_command'};
+ }
+ return undef;
+}
sub command_node($$)
{
@@ -480,6 +490,13 @@
return $self->{'special_elements'}->{$type};
}
+sub global_element($$)
+{
+ my $self = shift;
+ my $type = shift;
+ return $self->{'global_target_elements'}->{$type};
+}
+
# see http://www.w3.org/TR/REC-html40/types.html#type-links
# see http://www.w3.org/TR/REC-html40/types.html#type-links
my %BUTTONS_REL =
@@ -2441,6 +2458,11 @@
if (!$associated_command) {
$associated_command
= $self->command_element_command($index_entry_ref->{'command'});
+ if (!$associated_command) {
+ # Use Top if not associated command found
+ $associated_command
+ = $self->element_command($self->global_element('Top'));
+ }
}
my ($associated_command_href, $associated_command_text);
if ($associated_command) {
@@ -2899,16 +2921,16 @@
my $category_prepared = '';
if ($command->{'extra'} and $command->{'extra'}->{'def_args'}
and @{$command->{'extra'}->{'def_args'}}) {
- my $parsed_definition_category = $self->definition_category ($command,
- $command->{'extra'}->{'def_parsed_hash'}->{'category'},
- $command->{'extra'}->{'def_parsed_hash'}->{'class'});
+ my $parsed_definition_category
+ = Texinfo::Common::definition_category ($self, $command);
if ($parsed_definition_category) {
$category_prepared = $self->convert_tree({'type' => '_code',
'contents' => [$parsed_definition_category]});
}
}
- my $arguments_content = $self->definition_arguments_content($command);
+ my $arguments_content
+ = Texinfo::Common::definition_arguments_content($command);
my $arguments = '';
if ($arguments_content) {
$arguments = $self->convert_tree({'type' => '_code',
@@ -4126,8 +4148,8 @@
foreach my $index_name (keys(%$index_entries)) {
foreach my $index_entry (@{$index_entries->{$index_name}}) {
my $region = '';
- $region = "$index_entry->{'region'}-"
- if (defined($index_entry->{'region'}) and $index_entry->{'region'}
ne '');
+ $region = "$index_entry->{'region'}->{'cmdname'}-"
+ if (defined($index_entry->{'region'}));
my $normalized_index =
Texinfo::Convert::NodeNameNormalization::transliterate_texinfo(
{'contents' => $index_entry->{'content'}},
@@ -4221,7 +4243,8 @@
my $file;
if ($external_node->{'manual_content'}) {
my $manual_name = Texinfo::Convert::Text::convert(
- {'contents' => $external_node->{'manual_content'}});
+ {'contents' => $external_node->{'manual_content'}},
+ {'converter' => $self});
my $manual_base = $manual_name;
$manual_base =~ s/\.[^\.]*$//;
$manual_base =~ s/^.*\///;
@@ -4907,7 +4930,7 @@
# copying comment
if ($self->{'extra'}->{'copying'}) {
- my $options;
+ my $options = {'converter' => $self};
if ($self->get_conf('ENABLE_ENCODING')
and $self->{'encoding_name'}) {
$options->{'enabled_encoding'} = $self->{'encoding_name'};
@@ -5158,6 +5181,8 @@
}
}
+ #if ($root->{'extra'} and $root->{'extra'}->{'index_entry'}) {
+ #}
#and !$self->{'multiple_pass'} and !$self->{'in_copying_header'}) {
# special case for index entry not associated with a node but seen.
# this will be an index entry in @copying, in @insertcopying.
@@ -5168,7 +5193,7 @@
# print STDERR "INDEX ENTRY lines_count $location->{'lines'}, index_entry
$location->{'index_entry'}\n"
# if ($self->get_conf('DEBUG'));
- # TODO special: center, footnote
+ # TODO special: footnote
# commands like @deffnx have both a cmdname and a def_line type. It is
# better to consider them as a def_line type, as the whole point of the
@@ -5270,7 +5295,8 @@
$self->{'document_context'}->[-1]->{'context'}->[-1]->{'code'}--;
} elsif ($arg_type eq 'text') {
$arg_formatted->{$arg_type}
- = Texinfo::Convert::Text::convert($arg);
+ = Texinfo::Convert::Text::convert($arg,
+ {'converter' => $self});
}
}
@@ -5421,8 +5447,6 @@
# unshift @{$self->{'current_contents'}->[-1]}, $expansion;
# #return '';
# return $result;
-# } elsif ($root->{'cmdname'} eq 'center') {
-# #my ($counts, $new_locations);
# } elsif ($root->{'cmdname'} eq 'insertcopying') {
# if ($self->{'extra'} and $self->{'extra'}->{'copying'}) {
# unshift @{$self->{'current_contents'}->[-1]},
@@ -5430,17 +5454,6 @@
# }
# return '';
# } elsif ($root->{'cmdname'} eq 'listoffloats') {
-# TODO types
-# } elsif ($root->{'type'} eq 'preformatted') {
- # TODO ?
- # } elsif ($root->{'cmdname'} eq 'quotation' and $root->{'extra'}
- # and $root->{'extra'}->{'authors'}) {
- # foreach my $author (@{$root->{'extra'}->{'authors'}}) {
- # $result .= $self->_convert(
- # $self->gdt("address@hidden --- address@hidden",
- # {'author' => $author->{'extra'}->{'misc_content'}}));
- # }
- # }
print STDERR "DEBUG: HERE!($root)\n";
#return $result;
}
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- Texinfo/Convert/Plaintext.pm 31 May 2011 22:59:30 -0000 1.139
+++ Texinfo/Convert/Plaintext.pm 2 Jun 2011 19:46:27 -0000 1.140
@@ -2074,9 +2074,8 @@
} elsif ($root->{'type'} eq 'def_line') {
if ($root->{'extra'} and $root->{'extra'}->{'def_args'}
and @{$root->{'extra'}->{'def_args'}}) {
- my $parsed_definition_category = $self->definition_category ($root,
- $root->{'extra'}->{'def_parsed_hash'}->{'category'},
- $root->{'extra'}->{'def_parsed_hash'}->{'class'});
+ my $parsed_definition_category
+ = Texinfo::Common::definition_category ($self, $root);
# FIXME need i18n here?
my @contents = ($parsed_definition_category, {'text' => ': '});
if ($root->{'extra'}->{'def_parsed_hash'}->{'type'}) {
@@ -2085,7 +2084,7 @@
}
push @contents, $root->{'extra'}->{'def_parsed_hash'}->{'name'};
- my $arguments = $self->definition_arguments_content($root);
+ my $arguments = Texinfo::Common::definition_arguments_content($root);
if ($arguments) {
push @contents, {'text' => ' '};
push @contents, @$arguments;
Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- Texinfo/Convert/Text.pm 27 Mar 2011 22:55:13 -0000 1.36
+++ Texinfo/Convert/Text.pm 2 Jun 2011 19:46:27 -0000 1.37
@@ -996,7 +996,26 @@
}
if ($root->{'type'} and $root->{'type'} eq 'def_line') {
#print STDERR "$root->{'extra'}->{'def_command'}\n";
- $result = convert($root->{'args'}->[0], $options) if ($root->{'args'});
+ if ($root->{'extra'} and $root->{'extra'}->{'def_args'}
+ and @{$root->{'extra'}->{'def_args'}}) {
+ my $parsed_definition_category
+ = Texinfo::Common::definition_category ($options->{'converter'},
$root);
+ my @contents = ($parsed_definition_category, {'text' => ': '});
+ if ($root->{'extra'}->{'def_parsed_hash'}->{'type'}) {
+ push @contents, ($root->{'extra'}->{'def_parsed_hash'}->{'type'},
+ {'text' => ' '});
+ }
+ push @contents, $root->{'extra'}->{'def_parsed_hash'}->{'name'};
+
+ my $arguments = Texinfo::Common::definition_arguments_content($root);
+ if ($arguments) {
+ push @contents, {'text' => ' '};
+ push @contents, @$arguments;
+ }
+ push @contents, {'text' => "\n"};
+ $result = convert({'contents' => address@hidden, $options);
+ }
+ #$result = convert($root->{'args'}->[0], $options) if ($root->{'args'});
} elsif ($root->{'type'} and $root->{'type'} eq 'menu_entry') {
foreach my $arg (@{$root->{'args'}}) {
$result .= convert($arg, $options);
Index: t/results/coverage/def.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/def.pl,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- t/results/coverage/def.pl 17 Apr 2011 06:27:09 -0000 1.38
+++ t/results/coverage/def.pl 2 Jun 2011 19:46:27 -0000 1.39
@@ -2118,26 +2118,26 @@
$result_texts{'def'} = '
-c--ategory d--effn_name a--rguments...
+c--ategory: d--effn_name a--rguments...
d--effn
-cate--gory de--ffn_name ar--guments more args
+cate--gory: de--ffn_name ar--guments more args
even more so
def--fn
-fset i a g
-cmde truc
-Command log trap
-Command log trap1
-Command log trap2
-cmde id ule truc
-cmde2 id i ule truc
- machin
- bidule machin
-truc machin
-truc followed by a comment
-truc after a deff item
-truc deffnx before end deffn
+fset: i a g
+cmde: truc
+Command: log trap
+Command: log trap1
+Command: log trap2
+cmde: id ule truc
+cmde2: id i ule truc
+: machin
+: bidule machin
+truc: machin
+truc: followed by a comment
+truc: after a deff item
+truc: deffnx before end deffn
Various deff lines
';
Index: t/results/def/all_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/all_commands.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/def/all_commands.pl 16 Apr 2011 18:08:49 -0000 1.22
+++ t/results/def/all_commands.pl 2 Jun 2011 19:46:27 -0000 1.23
@@ -3323,58 +3323,58 @@
';
-$result_texts{'all_commands'} = 'c--ategory d--efvr_name
+$result_texts{'all_commands'} = 'c--ategory: d--efvr_name
d--efvr
-c--ategory t--ype d--eftypefn_name a--rguments...
+c--ategory: t--ype d--eftypefn_name a--rguments...
d--eftypefn
-c--ategory c--lass t--ype d--eftypeop_name a--rguments...
+c--ategory on c--lass: t--ype d--eftypeop_name a--rguments...
d--eftypeop
-c--ategory t--ype d--eftypevr_name
+c--ategory: t--ype d--eftypevr_name
d--eftypevr
-c--ategory c--lass d--efcv_name
+c--ategory of c--lass: d--efcv_name
d--efcv
-c--ategory c--lass d--efop_name a--rguments...
+c--ategory on c--lass: d--efop_name a--rguments...
d--efop
-c--ategory d--eftp_name a--ttributes...
+c--ategory: d--eftp_name a--ttributes...
d--eftp
-d--efun_name a--rguments...
+Function: d--efun_name a--rguments...
d--efun
-d--efmac_name a--rguments...
+Macro: d--efmac_name a--rguments...
d--efmac
-d--efspec_name a--rguments...
+Special Form: d--efspec_name a--rguments...
d--efspec
-d--efvar_name
+Variable: d--efvar_name
d--efvar
-d--efopt_name
+User Option: d--efopt_name
d--efopt
-t--ype d--eftypefun_name a--rguments...
+Function: t--ype d--eftypefun_name a--rguments...
d--eftypefun
-t--ype d--eftypevar_name
+Variable: t--ype d--eftypevar_name
d--eftypevar
-c--lass d--efivar_name
+Instance Variable of c--lass: d--efivar_name
d--efivar
-c--lass t--ype d--eftypeivar_name
+Instance Variable of c--lass: t--ype d--eftypeivar_name
d--eftypeivar
-c--lass d--efmethod_name a--rguments...
+Method on c--lass: d--efmethod_name a--rguments...
d--efmethod
-c--lass t--ype d--eftypemethod_name a--rguments...
+Method on c--lass: t--ype d--eftypemethod_name a--rguments...
d--eftypemethod
';
Index: t/results/def/all_commands_delimiters.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/all_commands_delimiters.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/def/all_commands_delimiters.pl 6 Mar 2011 14:44:01 -0000
1.23
+++ t/results/def/all_commands_delimiters.pl 2 Jun 2011 19:46:27 -0000
1.24
@@ -15246,101 +15246,101 @@
';
-$result_texts{'all_commands_delimiters'} = 'Command forward--char nchars
argument2 argument3 (arg in brace, [something in v--ar, in, b , comma
apref p]) last
+$result_texts{'all_commands_delimiters'} = 'Command: forward--char nchars
argument2 argument3 (arg in brace, [something in v--ar, in, b , comma
apref p]) last
-Variable fill-column argument1 argument2 (arg in brace, [something in
v--ar, in, b , comma apref p]) last
+Variable: fill-column argument1 argument2 (arg in brace, [something in
v--ar, in, b , comma apref p]) last
-Library Function int foobar (int foo, float bar)
+Library Function: int foobar (int foo, float bar)
-Library Function int foobar (int foo, float bar) (arg in brace,
[something in v--ar, in, b , comma apref p]) ct
+Library Function: int foobar (int foo, float bar) (arg in brace,
[something in v--ar, in, b , comma apref p]) ct
last
-Library Function int foobug [something
+Library Function: int foobug [something
-stacks private push (s:in out stack; n:in integer) ; ;barg
aarg; ; end
+stacks: private push (s:in out stack; n:in integer) ; ;barg
aarg; ; end
-Global Flag int enable (arg in brace, [something in v--ar, in, b ,
comma apref p]) last
+Global Flag: int enable (arg in brace, [something in v--ar, in, b , comma
apref p]) last
-Data type pair car cdr (arg in brace, [something in v--ar, in, b ,
comma apref p]) last
+Data type: pair car cdr (arg in brace, [something in v--ar, in, b ,
comma apref p]) last
-Class Option Window border-pattern (arg in brace, [something in v--ar,
in, b , comma apref p]) last
+Class Option of Window: border-pattern (arg in brace, [something in v--ar, in,
b , comma apref p]) last
-Class Option2 Window int border-pattern (arg in brace, [something in
v--ar, in, b , comma apref p]) last
+Class Option2 of Window: int border-pattern (arg in brace, [something in
v--ar, in, b , comma apref p]) last
-Operation windows expose (arg in brace, [something in v--ar, in, b ,
comma apref p]) last
+Operation on windows: expose (arg in brace, [something in v--ar, in, b , comma
apref p]) last
-Operation2 W,indow int expose (arg in brace, [something in v--ar, in,
b , comma apref p]) last
+Operation2 on W,indow: int expose (arg in brace, [something in v--ar, in, b ,
comma apref p]) last
-Operation5 Window int expose type arg
+Operation5 on Window: int expose type arg
-Operation3 W,indow int e,xpose type arg
+Operation3 on W,indow: int e,xpose type arg
-Operation4 ,Window int ,expose type arg
+Operation4 on ,Window: int ,expose type arg
-Operation6 W,indow int e,xpose type arg
+Operation6 on W,indow: int e,xpose type arg
-Operation7 ,Window int ,expose type arg
+Operation7 on ,Window: int ,expose type arg
-Operation13 W)indow int e)xpose type arg
+Operation13 on W)indow: int e)xpose type arg
-Operation14 )Window int )expose type arg
+Operation14 on )Window: int )expose type arg
-Operation16 W)indow int e)xpose type arg
+Operation16 on W)indow: int e)xpose type arg
-Operation17 )Window int )expose type arg
+Operation17 on )Window: int )expose type arg
-Operation18 W;indow int e;xpose type arg
+Operation18 on W;indow: int e;xpose type arg
-Operation19 ;Window int ;expose type arg
+Operation19 on ;Window: int ;expose type arg
-Operation20 W;indow int e;xpose type arg
+Operation20 on W;indow: int e;xpose type arg
-Operation21 ;Window int ;expose type arg
+Operation21 on ;Window: int ;expose type arg
-Commandcom Windowint exposeexp name
+Command on com: Windowint expose exp name
-apply function &rest arguments
+Function: apply function &rest arguments
-A1 A2 A3 A4
+A1: A2 A3 A4
-A1 A2 A3 A4
+A1: A2 A3 A4
-A1 A2 A3 A4
+A1: A2 A3 A4
-A1 A2 A3 A4
+A1: A2 A3 A4
-A1 A2 A3 A4 A5
+A1: A2 A3 A4 A5
-A1 A2 A3 A4 A5
+A1: A2 A3 A4 A5
-A1 A2 A3 A4 A5
+A1: A2 A3 A4 A5
-A1 A2 A3 A4 A5
+A1: A2 A3 A4 A5
-A1 A2 A3 A4
+A1: A2 A3 A4
-A1 A2 A3 A4
+A1: A2 A3 A4
-A1 A2 A3 A4 A5
+A1 of A2: A3 A4 A5
-A1 A2 A3 A4 A5
+A1: A2 A3 A4 A5
-A1 A2 A3 A4 A5 A6
+A1 of A2: A3 A4 A5 A6
-A1 A2 A3 A4 A5 A6
+A1 of A2: A3 A4 A5 A6
-A1 A2 A3 A4 A5
+A1 on A2: A3 A4 A5
-A1 A2 A3 A4 A5
+A1 on A2: A3 A4 A5
-A1 A2 A3 A4 A5 A6
+A1 on A2: A3 A4 A5 A6
-A1 A2 A3 A4 A5 A6
+A1 on A2: A3 A4 A5 A6
-code then var ret_type fun_name A1 A2 A3 A4
+code then var: ret_type fun_name A1 A2 A3 A4
-var then code ret_type1 fun_name1 A1 A2 A3 A4
+var then code: ret_type1 fun_name1 A1 A2 A3 A4
';
$result_errors{'all_commands_delimiters'} = [
Index: t/results/def/all_commands_delimiters_printindex.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/def/all_commands_delimiters_printindex.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/def/all_commands_delimiters_printindex.pl 6 Mar 2011 14:44:01
-0000 1.13
+++ t/results/def/all_commands_delimiters_printindex.pl 2 Jun 2011 19:46:27
-0000 1.14
@@ -15735,101 +15735,101 @@
';
-$result_texts{'all_commands_delimiters_printindex'} = 'Command forward--char
nchars argument2 argument3 (arg in brace, [something in v--ar, in, b ,
comma apref p]) last
+$result_texts{'all_commands_delimiters_printindex'} = 'Command: forward--char
nchars argument2 argument3 (arg in brace, [something in v--ar, in, b ,
comma apref p]) last
-Variable fill-column argument1 argument2 (arg in brace, [something in
v--ar, in, b , comma apref p]) last
+Variable: fill-column argument1 argument2 (arg in brace, [something in
v--ar, in, b , comma apref p]) last
-Library Function int foobar (int foo, float bar)
+Library Function: int foobar (int foo, float bar)
-Library Function int foobar (int foo, float bar) (arg in brace,
[something in v--ar, in, b , comma apref p]) ct
+Library Function: int foobar (int foo, float bar) (arg in brace,
[something in v--ar, in, b , comma apref p]) ct
last
-Library Function int foobug [something
+Library Function: int foobug [something
-stacks private push (s:in out stack; n:in integer) ; ;barg
aarg; ; end
+stacks: private push (s:in out stack; n:in integer) ; ;barg
aarg; ; end
-Global Flag int enable (arg in brace, [something in v--ar, in, b ,
comma apref p]) last
+Global Flag: int enable (arg in brace, [something in v--ar, in, b , comma
apref p]) last
-Data type pair car cdr (arg in brace, [something in v--ar, in, b ,
comma apref p]) last
+Data type: pair car cdr (arg in brace, [something in v--ar, in, b ,
comma apref p]) last
-Class Option Window border-pattern (arg in brace, [something in v--ar,
in, b , comma apref p]) last
+Class Option of Window: border-pattern (arg in brace, [something in v--ar, in,
b , comma apref p]) last
-Class Option2 Window int border-pattern (arg in brace, [something in
v--ar, in, b , comma apref p]) last
+Class Option2 of Window: int border-pattern (arg in brace, [something in
v--ar, in, b , comma apref p]) last
-Operation windows expose (arg in brace, [something in v--ar, in, b ,
comma apref p]) last
+Operation on windows: expose (arg in brace, [something in v--ar, in, b , comma
apref p]) last
-Operation2 W,indow int expose (arg in brace, [something in v--ar, in,
b , comma apref p]) last
+Operation2 on W,indow: int expose (arg in brace, [something in v--ar, in, b ,
comma apref p]) last
-Operation5 Window int expose type arg
+Operation5 on Window: int expose type arg
-Operation3 W,indow int e,xpose type arg
+Operation3 on W,indow: int e,xpose type arg
-Operation4 ,Window int ,expose type arg
+Operation4 on ,Window: int ,expose type arg
-Operation6 W,indow int e,xpose type arg
+Operation6 on W,indow: int e,xpose type arg
-Operation7 ,Window int ,expose type arg
+Operation7 on ,Window: int ,expose type arg
-Operation13 W)indow int e)xpose type arg
+Operation13 on W)indow: int e)xpose type arg
-Operation14 )Window int )expose type arg
+Operation14 on )Window: int )expose type arg
-Operation16 W)indow int e)xpose type arg
+Operation16 on W)indow: int e)xpose type arg
-Operation17 )Window int )expose type arg
+Operation17 on )Window: int )expose type arg
-Operation18 W;indow int e;xpose type arg
+Operation18 on W;indow: int e;xpose type arg
-Operation19 ;Window int ;expose type arg
+Operation19 on ;Window: int ;expose type arg
-Operation20 W;indow int e;xpose type arg
+Operation20 on W;indow: int e;xpose type arg
-Operation21 ;Window int ;expose type arg
+Operation21 on ;Window: int ;expose type arg
-Commandcom Windowint exposeexp name
+Command on com: Windowint expose exp name
-apply function &rest arguments
+Function: apply function &rest arguments
-A1 A2 A3 A4
+A1: A2 A3 A4
-A1 A2 A3 A4
+A1: A2 A3 A4
-A1 A2 A3 A4
+A1: A2 A3 A4
-A1 A2 A3 A4
+A1: A2 A3 A4
-A1 A2 A3 A4 A5
+A1: A2 A3 A4 A5
-A1 A2 A3 A4 A5
+A1: A2 A3 A4 A5
-A1 A2 A3 A4 A5
+A1: A2 A3 A4 A5
-A1 A2 A3 A4 A5
+A1: A2 A3 A4 A5
-A1 A2 A3 A4
+A1: A2 A3 A4
-A1 A2 A3 A4
+A1: A2 A3 A4
-A1 A2 A3 A4 A5
+A1 of A2: A3 A4 A5
-A1 A2 A3 A4 A5
+A1: A2 A3 A4 A5
-A1 A2 A3 A4 A5 A6
+A1 of A2: A3 A4 A5 A6
-A1 A2 A3 A4 A5 A6
+A1 of A2: A3 A4 A5 A6
-A1 A2 A3 A4 A5
+A1 on A2: A3 A4 A5
-A1 A2 A3 A4 A5
+A1 on A2: A3 A4 A5
-A1 A2 A3 A4 A5 A6
+A1 on A2: A3 A4 A5 A6
-A1 A2 A3 A4 A5 A6
+A1 on A2: A3 A4 A5 A6
-code then var ret_type fun_name A1 A2 A3 A4
+code then var: ret_type fun_name A1 A2 A3 A4
-var then code ret_type1 fun_name1 A1 A2 A3 A4
+var then code: ret_type1 fun_name1 A1 A2 A3 A4
Functions
=========
Index: t/results/def/all_commands_printindex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/all_commands_printindex.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/def/all_commands_printindex.pl 16 Apr 2011 18:08:49 -0000
1.12
+++ t/results/def/all_commands_printindex.pl 2 Jun 2011 19:46:28 -0000
1.13
@@ -3725,58 +3725,58 @@
';
-$result_texts{'all_commands_printindex'} = 'c--ategory d--efvr_name
+$result_texts{'all_commands_printindex'} = 'c--ategory: d--efvr_name
d--efvr
-c--ategory t--ype d--eftypefn_name a--rguments...
+c--ategory: t--ype d--eftypefn_name a--rguments...
d--eftypefn
-c--ategory c--lass t--ype d--eftypeop_name a--rguments...
+c--ategory on c--lass: t--ype d--eftypeop_name a--rguments...
d--eftypeop
-c--ategory t--ype d--eftypevr_name
+c--ategory: t--ype d--eftypevr_name
d--eftypevr
-c--ategory c--lass d--efcv_name
+c--ategory of c--lass: d--efcv_name
d--efcv
-c--ategory c--lass d--efop_name a--rguments...
+c--ategory on c--lass: d--efop_name a--rguments...
d--efop
-c--ategory d--eftp_name a--ttributes...
+c--ategory: d--eftp_name a--ttributes...
d--eftp
-d--efun_name a--rguments...
+Function: d--efun_name a--rguments...
d--efun
-d--efmac_name a--rguments...
+Macro: d--efmac_name a--rguments...
d--efmac
-d--efspec_name a--rguments...
+Special Form: d--efspec_name a--rguments...
d--efspec
-d--efvar_name
+Variable: d--efvar_name
d--efvar
-d--efopt_name
+User Option: d--efopt_name
d--efopt
-t--ype d--eftypefun_name a--rguments...
+Function: t--ype d--eftypefun_name a--rguments...
d--eftypefun
-t--ype d--eftypevar_name
+Variable: t--ype d--eftypevar_name
d--eftypevar
-c--lass d--efivar_name
+Instance Variable of c--lass: d--efivar_name
d--efivar
-c--lass t--ype d--eftypeivar_name
+Instance Variable of c--lass: t--ype d--eftypeivar_name
d--eftypeivar
-c--lass d--efmethod_name a--rguments...
+Method on c--lass: d--efmethod_name a--rguments...
d--efmethod
-c--lass t--ype d--eftypemethod_name a--rguments...
+Method on c--lass: t--ype d--eftypemethod_name a--rguments...
d--eftypemethod
Functions
Index: t/results/def/def_defx_mismatch.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/def_defx_mismatch.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/def/def_defx_mismatch.pl 16 Apr 2011 18:08:49 -0000 1.21
+++ t/results/def/def_defx_mismatch.pl 2 Jun 2011 19:46:28 -0000 1.22
@@ -445,8 +445,8 @@
';
-$result_texts{'def_defx_mismatch'} = 'my def args arg ...
-type name and now the args
+$result_texts{'def_defx_mismatch'} = 'Function: my def args arg ...
+type: name and now the args
In defun.
Index: t/results/def/defx_after_comment.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/defx_after_comment.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/def/defx_after_comment.pl 6 Mar 2011 14:44:02 -0000 1.21
+++ t/results/def/defx_after_comment.pl 2 Jun 2011 19:46:28 -0000 1.22
@@ -307,8 +307,8 @@
@end deffn';
-$result_texts{'defx_after_comment'} = 'fset i a g
-truc bidulr machin...
+$result_texts{'defx_after_comment'} = 'fset: i a g
+truc: bidulr machin...
';
$result_errors{'defx_after_comment'} = [
Index: t/results/def/defx_after_comment_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/def/defx_after_comment_in_example.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/def/defx_after_comment_in_example.pl 6 Mar 2011 14:44:02
-0000 1.5
+++ t/results/def/defx_after_comment_in_example.pl 2 Jun 2011 19:46:28
-0000 1.6
@@ -390,8 +390,8 @@
';
-$result_texts{'defx_after_comment_in_example'} = 'fset i a g
-truc bidulr machin...
+$result_texts{'defx_after_comment_in_example'} = 'fset: i a g
+truc: bidulr machin...
';
$result_errors{'defx_after_comment_in_example'} = [
Index: t/results/def/defx_after_empty_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/defx_after_empty_line.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/def/defx_after_empty_line.pl 6 Mar 2011 14:44:02 -0000
1.21
+++ t/results/def/defx_after_empty_line.pl 2 Jun 2011 19:46:28 -0000
1.22
@@ -300,9 +300,9 @@
@end deffn';
-$result_texts{'defx_after_empty_line'} = 'fset i a g
+$result_texts{'defx_after_empty_line'} = 'fset: i a g
-truc bidulr machin...
+truc: bidulr machin...
';
$result_errors{'defx_after_empty_line'} = [
Index: t/results/def/defx_after_empty_line_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/def/defx_after_empty_line_in_example.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/def/defx_after_empty_line_in_example.pl 6 Mar 2011 14:44:02
-0000 1.5
+++ t/results/def/defx_after_empty_line_in_example.pl 2 Jun 2011 19:46:28
-0000 1.6
@@ -421,10 +421,10 @@
';
-$result_texts{'defx_after_empty_line_in_example'} = 'fset i a g
+$result_texts{'defx_after_empty_line_in_example'} = 'fset: i a g
-truc bidulr machin...
+truc: bidulr machin...
';
$result_errors{'defx_after_empty_line_in_example'} = [
Index: t/results/def/defx_after_paragraph_end.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/def/defx_after_paragraph_end.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/def/defx_after_paragraph_end.pl 16 Apr 2011 18:08:49 -0000
1.21
+++ t/results/def/defx_after_paragraph_end.pl 2 Jun 2011 19:46:28 -0000
1.22
@@ -322,10 +322,10 @@
@end deffn';
-$result_texts{'defx_after_paragraph_end'} = 'fset i a g
+$result_texts{'defx_after_paragraph_end'} = 'fset: i a g
Text in paragraph.
-truc bidulr machin...
+truc: bidulr machin...
';
$result_errors{'defx_after_paragraph_end'} = [
Index: t/results/def/defx_after_preformatted_with_text.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/def/defx_after_preformatted_with_text.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/def/defx_after_preformatted_with_text.pl 16 Apr 2011 18:08:49
-0000 1.6
+++ t/results/def/defx_after_preformatted_with_text.pl 2 Jun 2011 19:46:28
-0000 1.7
@@ -398,10 +398,10 @@
';
-$result_texts{'defx_after_preformatted_with_text'} = 'fset i a g
+$result_texts{'defx_after_preformatted_with_text'} = 'fset: i a g
Text in preformatted.
-truc bidulr machin...
+truc: bidulr machin...
';
$result_errors{'defx_after_preformatted_with_text'} = [
Index: t/results/def/defx_after_text.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/defx_after_text.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/def/defx_after_text.pl 16 Apr 2011 18:08:49 -0000 1.22
+++ t/results/def/defx_after_text.pl 2 Jun 2011 19:46:28 -0000 1.23
@@ -314,9 +314,9 @@
@end deffn';
-$result_texts{'defx_after_text'} = 'fset i a g
+$result_texts{'defx_after_text'} = 'fset: i a g
Text in deffn
-truc bidulr machin...
+truc: bidulr machin...
';
$result_errors{'defx_after_text'} = [
Index: t/results/def/defx_in_example.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/defx_in_example.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/def/defx_in_example.pl 6 Mar 2011 14:44:02 -0000 1.5
+++ t/results/def/defx_in_example.pl 2 Jun 2011 19:46:28 -0000 1.6
@@ -368,8 +368,8 @@
';
-$result_texts{'defx_in_example'} = 'fset i a g
-truc bidulr machin...
+$result_texts{'defx_in_example'} = 'fset: i a g
+truc: bidulr machin...
';
$result_errors{'defx_in_example'} = [
Index: t/results/def/double_command.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/double_command.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/def/double_command.pl 16 Apr 2011 18:08:49 -0000 1.22
+++ t/results/def/double_command.pl 2 Jun 2011 19:46:28 -0000 1.23
@@ -709,10 +709,12 @@
';
-$result_texts{'double_command'} = 'func plot (a, b, c, ...) func plot2 (a, b,
c, ..., d)
+$result_texts{'double_command'} = 'func: plot (a, b, c, ...) func: plot2 (a,
b, c, ..., d)
+
aaa
-func aaaa args c--ategory d--efvr_name
+func: aaaa args c--ategory: d--efvr_name
+
bbb
';
Index: t/results/def/empty_def_arguments.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/empty_def_arguments.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/def/empty_def_arguments.pl 17 Apr 2011 06:27:09 -0000
1.20
+++ t/results/def/empty_def_arguments.pl 2 Jun 2011 19:46:28 -0000
1.21
@@ -787,14 +787,14 @@
';
-$result_texts{'empty_def_arguments'} = 'fset i a g
-id i ule
-aaa
-
-
-truc
-truc
-
+$result_texts{'empty_def_arguments'} = 'fset: i a g
+id i ule:
+aaa:
+:
+:
+truc:
+truc:
+:
';
$result_errors{'empty_def_arguments'} = [
Index: t/results/def/empty_def_command.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/empty_def_command.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/def/empty_def_command.pl 6 Mar 2011 14:44:02 -0000 1.20
+++ t/results/def/empty_def_command.pl 2 Jun 2011 19:46:28 -0000 1.21
@@ -383,10 +383,10 @@
';
-$result_texts{'empty_def_command'} = 'empty deffn
+$result_texts{'empty_def_command'} = 'empty: deffn
-empty deffn with deffnx
-empty deffnx
+empty: deffn with deffnx
+empty: deffnx
';
$result_errors{'empty_def_command'} = [
Index: t/results/def/empty_deftype.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/empty_deftype.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/def/empty_deftype.pl 16 Apr 2011 18:08:49 -0000 1.22
+++ t/results/def/empty_deftype.pl 2 Jun 2011 19:46:28 -0000 1.23
@@ -962,16 +962,16 @@
';
-$result_texts{'empty_deftype'} = ' f (const type& x)
+$result_texts{'empty_deftype'} = 'Function: f (const type& x)
Deftypefun.
-f (const type& x)
+Function: f (const type& x)
Defun.
-c f (const type& x)
+Method on c: f (const type& x)
Deftypemethod.
-c f (const type& x)
+Method on c: f (const type& x)
Defmethod.
';
Index: t/results/def/empty_deftypeop_name.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/empty_deftypeop_name.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/def/empty_deftypeop_name.pl 6 Mar 2011 14:44:02 -0000
1.19
+++ t/results/def/empty_deftypeop_name.pl 2 Jun 2011 19:46:28 -0000
1.20
@@ -279,7 +279,7 @@
';
-$result_texts{'empty_deftypeop_name'} = 'Commandcom Windowint exposeexp
+$result_texts{'empty_deftypeop_name'} = 'Command on com: Windowint expose exp
';
$result_errors{'empty_deftypeop_name'} = [
Index: t/results/def/end_of_line_end_file.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/end_of_line_end_file.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/def/end_of_line_end_file.pl 6 Mar 2011 14:44:02 -0000
1.2
+++ t/results/def/end_of_line_end_file.pl 2 Jun 2011 19:46:28 -0000
1.3
@@ -55,7 +55,7 @@
';
-$result_texts{'end_of_line_end_file'} = 'category deffn_name arguments ';
+$result_texts{'end_of_line_end_file'} = '';
$result_errors{'end_of_line_end_file'} = [
{
Index: t/results/def/end_of_line_protect_at_end.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/def/end_of_line_protect_at_end.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/def/end_of_line_protect_at_end.pl 6 Mar 2011 14:44:02 -0000
1.19
+++ t/results/def/end_of_line_protect_at_end.pl 2 Jun 2011 19:46:28 -0000
1.20
@@ -116,7 +116,8 @@
$result_texts{'end_of_line_protect_at_end'} = '
-category2 deffn_name2 arguments2 ';
+category2: deffn_name2 arguments2
+';
$result_errors{'end_of_line_protect_at_end'} = [
{
Index: t/results/def/end_of_lines_protected.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/end_of_lines_protected.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/def/end_of_lines_protected.pl 16 Apr 2011 18:08:49 -0000
1.20
+++ t/results/def/end_of_lines_protected.pl 2 Jun 2011 19:46:28 -0000
1.21
@@ -328,7 +328,7 @@
';
-$result_texts{'end_of_lines_protected'} = 'category deffn_name arguments
more args with end of line within with 3 @ @ one last arg
+$result_texts{'end_of_lines_protected'} = 'category: deffn_name arguments
more args with end of line within with 3 @ @ one last arg
deffn
';
Index: t/results/def/inter_item_commands_in_def.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/def/inter_item_commands_in_def.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/def/inter_item_commands_in_def.pl 17 Apr 2011 06:27:09 -0000
1.3
+++ t/results/def/inter_item_commands_in_def.pl 2 Jun 2011 19:46:28 -0000
1.4
@@ -626,10 +626,10 @@
';
-$result_texts{'inter_item_commands_in_def'} = 'fset i a g
+$result_texts{'inter_item_commands_in_def'} = 'fset: i a g
-Command log trap1
-cmde2 id i ule truc
+Command: log trap1
+cmde2: id i ule truc
In deff item.
';
Index: t/results/def/leading_space_in_def_arg.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/def/leading_space_in_def_arg.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/def/leading_space_in_def_arg.pl 17 Apr 2011 06:27:09 -0000
1.1
+++ t/results/def/leading_space_in_def_arg.pl 2 Jun 2011 19:46:28 -0000
1.2
@@ -134,7 +134,7 @@
';
-$result_texts{'leading_space_in_def_arg'} = 'category name arg
+$result_texts{'leading_space_in_def_arg'} = 'category: name arg
';
$result_errors{'leading_space_in_def_arg'} = [
Index: t/results/def/no_category_or_no_name.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/no_category_or_no_name.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/def/no_category_or_no_name.pl 16 Apr 2011 18:08:49 -0000
1.7
+++ t/results/def/no_category_or_no_name.pl 2 Jun 2011 19:46:28 -0000
1.8
@@ -536,11 +536,11 @@
$result_texts{'no_category_or_no_name'} = 'no category no name
-only category
+only category:
no name
-a b c d
-deffnx_category
+a: b c d
+deffnx_category:
with deffnx missing category or name
';
Index: t/results/def/not_closed.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/not_closed.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/def/not_closed.pl 16 Apr 2011 18:08:49 -0000 1.20
+++ t/results/def/not_closed.pl 2 Jun 2011 19:46:28 -0000 1.21
@@ -314,9 +314,9 @@
';
-$result_texts{'not_closed'} = 'truc bidule machin
-truc chose args
-type1 var bidule
+$result_texts{'not_closed'} = 'truc: bidule machin
+truc: chose args
+Variable: type1 var bidule
';
$result_errors{'not_closed'} = [
Index: t/results/def/protected_brace.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/protected_brace.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/def/protected_brace.pl 6 Mar 2011 14:44:02 -0000 1.10
+++ t/results/def/protected_brace.pl 2 Jun 2011 19:46:28 -0000 1.11
@@ -152,7 +152,7 @@
';
-$result_texts{'protected_brace'} = 'c {
+$result_texts{'protected_brace'} = 'c: {
';
$result_errors{'protected_brace'} = [
Index: t/results/def/space_in_def_for_index.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/space_in_def_for_index.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/def/space_in_def_for_index.pl 17 Apr 2011 06:27:09 -0000
1.4
+++ t/results/def/space_in_def_for_index.pl 2 Jun 2011 19:46:28 -0000
1.5
@@ -491,8 +491,8 @@
$result_texts{'space_in_def_for_index'} = '
-Category name argument argument2...
-AAA1 AAA2 arg3
+Category : name argument argument2...
+AAA1: AAA2 arg3
';
Index: t/results/def/wrong_braces_simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/wrong_braces_simple.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/def/wrong_braces_simple.pl 17 Apr 2011 06:27:10 -0000
1.19
+++ t/results/def/wrong_braces_simple.pl 2 Jun 2011 19:46:28 -0000
1.20
@@ -1498,17 +1498,21 @@
';
-$result_texts{'wrong_braces_simple'} = 'truc machin bidule chose and
+$result_texts{'wrong_braces_simple'} = 'truc: machin bidule chose and
-truc machin bidule chose and after
+truc: machin bidule chose and after
-truc machin bidule chose and
-truc machin bidule chose and and after
+truc: machin bidule chose and
+
+truc: machin bidule chose and and after
+
+
+a: b c d e
+truc: machin bidule chose and
+truc: machin bidule chose and after
+truc: machin bidule chose and
+truc: machin bidule chose and and after
-a b c d e
-truc machin bidule chose and
-truc machin bidule chose and after
-truc machin bidule chose and truc machin bidule chose and and after
';
$result_errors{'wrong_braces_simple'} = [
Index: t/results/def/wrong_braces_with_end_of_lines.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/def/wrong_braces_with_end_of_lines.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/def/wrong_braces_with_end_of_lines.pl 17 Apr 2011 06:27:10
-0000 1.19
+++ t/results/def/wrong_braces_with_end_of_lines.pl 2 Jun 2011 19:46:28
-0000 1.20
@@ -428,10 +428,11 @@
';
-$result_texts{'wrong_braces_with_end_of_lines'} = 'category name args more args
+$result_texts{'wrong_braces_with_end_of_lines'} = 'category: name args more
args
+
deffn with {
-category name args more args
+category: name args more args
deffn with }
';
Index: t/results/indices/empty_index_entry.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/empty_index_entry.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/indices/empty_index_entry.pl 17 Apr 2011 06:27:10 -0000
1.4
+++ t/results/indices/empty_index_entry.pl 2 Jun 2011 19:46:28 -0000
1.5
@@ -296,7 +296,7 @@
$result_texts{'empty_index_entry'} = '
-
+:
';
Index: t/results/info_tests/def_in_copying.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/info_tests/def_in_copying.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/info_tests/def_in_copying.pl 16 Apr 2011 18:08:49 -0000
1.6
+++ t/results/info_tests/def_in_copying.pl 2 Jun 2011 19:46:29 -0000
1.7
@@ -885,8 +885,8 @@
In text
-aa bb cc
-aax bbx ccx
+aa: bb cc
+aax: bbx ccx
deffnx lines
';
Index: t/results/invalid_nestings/block_not_matching.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/block_not_matching.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/invalid_nestings/block_not_matching.pl 31 May 2011 20:29:18
-0000 1.27
+++ t/results/invalid_nestings/block_not_matching.pl 2 Jun 2011 19:46:29
-0000 1.28
@@ -624,7 +624,7 @@
$result_texts{'block_not_matching'} = 'A quotation
-Function Reference print_navigation $filehandle
+Function Reference: print_navigation $filehandle
Text
item
Index: t/results/invalid_nestings/def_in_style_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/def_in_style_command.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/invalid_nestings/def_in_style_command.pl 16 Apr 2011 18:08:50
-0000 1.2
+++ t/results/invalid_nestings/def_in_style_command.pl 2 Jun 2011 19:46:29
-0000 1.3
@@ -214,7 +214,7 @@
$result_texts{'def_in_style_command'} = '
-name args...
+Function: name args...
text
';
Index: t/results/invalid_nestings/def_not_closed_in_menu_description.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/invalid_nestings/def_not_closed_in_menu_description.pl 23 Apr
2011 15:59:06 -0000 1.22
+++ t/results/invalid_nestings/def_not_closed_in_menu_description.pl 2 Jun
2011 19:46:29 -0000 1.23
@@ -257,7 +257,7 @@
';
-$result_texts{'def_not_closed_in_menu_description'} = '* (info):: before deff
bidule truc chose
+$result_texts{'def_not_closed_in_menu_description'} = '* (info):: before deff
bidule: truc chose
deffn text
';
Index: t/results/invalid_nestings/on_def_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/on_def_line.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/invalid_nestings/on_def_line.pl 6 Mar 2011 14:44:04 -0000
1.16
+++ t/results/invalid_nestings/on_def_line.pl 2 Jun 2011 19:46:29 -0000
1.17
@@ -585,8 +585,10 @@
';
-$result_texts{'on_def_line'} = ' in titlefont exdent
- in titlefontx exdentx
+$result_texts{'on_def_line'} = ': in titlefont exdent
+
+: in titlefontx exdentx
+
';
$result_errors{'on_def_line'} = [
Index: t/results/languages/multiple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/languages/multiple.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/languages/multiple.pl 6 Apr 2011 23:48:53 -0000 1.1
+++ t/results/languages/multiple.pl 2 Jun 2011 19:46:29 -0000 1.2
@@ -840,12 +840,12 @@
$result_texts{'multiple'} = '
-fr BBB CCC
+Instance Variable of fr: BBB CCC
-pt BBB CCC
+Instance Variable of pt: BBB CCC
';
Index: t/results/languages/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/languages/simple.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/languages/simple.pl 20 Mar 2011 20:29:01 -0000 1.1
+++ t/results/languages/simple.pl 2 Jun 2011 19:46:29 -0000 1.2
@@ -316,7 +316,7 @@
$result_texts{'simple'} = '
-AAA BBB CCC
+Instance Variable of AAA: BBB CCC
';
$result_sectioning{'simple'} = {};
Index: t/results/menu/menu_in_deffn.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/menu_in_deffn.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/menu/menu_in_deffn.pl 23 Apr 2011 15:59:07 -0000 1.6
+++ t/results/menu/menu_in_deffn.pl 2 Jun 2011 19:46:29 -0000 1.7
@@ -365,7 +365,7 @@
$result_texts{'menu_in_deffn'} = '
-a b c
+a: b c
* (mynode)::
';
Index: t/results/preformatted/def_in_example.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/preformatted/def_in_example.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/preformatted/def_in_example.pl 16 Apr 2011 18:08:50 -0000
1.7
+++ t/results/preformatted/def_in_example.pl 2 Jun 2011 19:46:29 -0000
1.8
@@ -245,7 +245,7 @@
';
-$result_texts{'def_in_example'} = 'name arg
+$result_texts{'def_in_example'} = 'Function: name arg
in defun
';
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp TODO Texinfo/Common.pm Texinfo/Conve...,
Patrice Dumas <=