[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm Texinfo/Convert/HT...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm Texinfo/Convert/HT... |
|
Date: |
Sun, 14 Aug 2011 01:52:03 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/08/14 01:52:03
Modified files:
tp/Texinfo : Parser.pm
tp/Texinfo/Convert: HTML.pm Info.pm Plaintext.pm Text.pm
tp/t : 02coverage.t test_sort.t
tp/t/results/coverage: accent_and_dash.pl commands.pl def.pl
exdent_and_formats.pl item_container.pl
multitable.pl symbol_after_block.pl
symbol_after_command.pl
tp/t/results/coverage_braces: abbr_acronym.pl
email_possibilities.pl uref_url.pl
tp/t/results/def: all_commands.pl all_commands_printindex.pl
tp/t/results/html_tests: commands_in_abbr.pl
tp/t/results/include: value_expansion_in_include.pl
tp/t/results/indices: syncode_index_print_both.pl
tp/t/results/info_tests: direntry_dircategory_and_commands.pl
multitable_anchor_and_index_entry.pl
tp/t/results/itemize: inter_item_commands_in_enumerate.pl
inter_item_commands_in_itemize.pl
tp/t/results/menu: dash_in_menu.pl
tp/t/results/misc_commands:
codequoteundirected_codequotebacktick.pl
test_allowcodebreaks.pl
text_before_line_command.pl
tp/t/results/multitable: inter_item_commands_in_multitable.pl
tp/t/results/plaintext_tests:
flushright_not_closed_and_format.pl
tp/t/results/preformatted: quote_dash_in_display.pl
tp/t/results/quotation: quotation_and_author.pl
tp/t/results/sectioning: at_commands_in_refs.pl
tp/t/results/xtable: inter_item_commands_in_table.pl
Removed files:
tp/t/results/plaintext_tests: space_at_menu_end.pl
Log message:
Format differently ---, --, ``Â and '' when in code in Convert::Text.
Adapt the other converters accordingly.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.273&r2=1.274
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.127&r2=1.128
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.147&r2=1.148
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/02coverage.t?cvsroot=texinfo&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/test_sort.t?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/accent_and_dash.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/commands.pl?cvsroot=texinfo&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/def.pl?cvsroot=texinfo&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/exdent_and_formats.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/item_container.pl?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/multitable.pl?cvsroot=texinfo&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/symbol_after_block.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/symbol_after_command.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/abbr_acronym.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/email_possibilities.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/uref_url.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands_printindex.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/html_tests/commands_in_abbr.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/include/value_expansion_in_include.pl?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/syncode_index_print_both.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/direntry_dircategory_and_commands.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/inter_item_commands_in_enumerate.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/inter_item_commands_in_itemize.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/dash_in_menu.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/test_allowcodebreaks.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/text_before_line_command.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/inter_item_commands_in_multitable.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/flushright_not_closed_and_format.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/space_at_menu_end.pl?cvsroot=texinfo&r1=1.5&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/quote_dash_in_display.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/quotation/quotation_and_author.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/inter_item_commands_in_table.pl?cvsroot=texinfo&r1=1.8&r2=1.9
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -b -r1.273 -r1.274
--- Texinfo/Parser.pm 3 Aug 2011 22:33:52 -0000 1.273
+++ Texinfo/Parser.pm 14 Aug 2011 01:51:58 -0000 1.274
@@ -2588,7 +2588,8 @@
my $args = _parse_line_command_args ($self, $current, $line_nr);
$current->{'extra'}->{'misc_args'} = $args if (defined($args));
} elsif ($self->{'misc_commands'}->{$command} eq 'text') {
- my $text = Texinfo::Convert::Text::convert($current->{'args'}->[0]);
+ my $text = Texinfo::Convert::Text::convert($current->{'args'}->[0],
+ {'code' => 1});
if ($text eq '') {
$self->line_warn (sprintf($self->__("address@hidden missing
argument"),
$command), $line_nr);
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- Texinfo/Convert/HTML.pm 14 Aug 2011 00:34:05 -0000 1.127
+++ Texinfo/Convert/HTML.pm 14 Aug 2011 01:51:58 -0000 1.128
@@ -976,11 +976,11 @@
'url' => [['codestring'], ['normal'], ['normal']],
'printindex' => [[]],
'sp' => [[]],
- 'inforef' => [['code'],['normal'],['text']],
- 'xref' => [['code'],['normal'],['normal'],['text'],['normal']],
- 'pxref' => [['code'],['normal'],['normal'],['text'],['normal']],
- 'ref' => [['code'],['normal'],['normal'],['text'],['normal']],
- 'image' => [['text'],['text'],['text'],['string', 'normal'],['text']],
+ 'inforef' => [['code'],['normal'],['codetext']],
+ 'xref' => [['code'],['normal'],['normal'],['codetext'],['normal']],
+ 'pxref' => [['code'],['normal'],['normal'],['codetext'],['normal']],
+ 'ref' => [['code'],['normal'],['normal'],['codetext'],['normal']],
+ 'image' => [['codetext'],['codetext'],['codetext'],['string',
'normal'],['codetext']],
'item' => [[]],
'itemx' => [[]],
);
@@ -1478,11 +1478,11 @@
my @extensions = @image_files_extensions;
- if (defined($args->[0]->{'text'}) and $args->[0]->{'text'} ne '') {
- my $basefile = $args->[0]->{'text'};
+ if (defined($args->[0]->{'codetext'}) and $args->[0]->{'codetext'} ne '') {
+ my $basefile = $args->[0]->{'codetext'};
my $extension;
- if (defined($args->[4]) and defined($args->[4]->{'text'})) {
- $extension = $args->[4]->{'text'};
+ if (defined($args->[4]) and defined($args->[4]->{'codetext'})) {
+ $extension = $args->[4]->{'codetext'};
# FIXME determine with Karl if this is correct.
unshift @extensions, ".$extension";
unshift @extensions, "$extension";
@@ -2602,7 +2602,6 @@
}
}
my $result = $self->convert_tree ($tree);
- my $in_code_preformatted;
foreach my $command_name (reverse($self->commands_stack())) {
if ($preformatted_code_commands{$command_name}) {
$result = '<tt>' .$result. '</tt>';
@@ -2682,9 +2681,10 @@
my $file_arg_tree;
my $file = '';
- if (defined($args->[3]->{'text'}) and $args->[3]->{'text'} ne '') {
+ if (defined($args->[3]->{'codetext'})
+ and $args->[3]->{'codetext'} ne '') {
$file_arg_tree = $args->[3]->{'tree'};
- $file = $args->[3]->{'text'};
+ $file = $args->[3]->{'codetext'};
}
my $book = '';
@@ -2899,6 +2899,8 @@
# }
#}
+ $self->_new_document_context($cmdname);
+
my $result = '';
# First do the summary letters linking to the letters done below
@@ -2964,9 +2966,6 @@
my $letter = $letter_entry->{'letter'};
my $entries_text = '';
foreach my $index_entry_ref (@{$letter_entry->{'entries'}}) {
- my $in_code
- =
$self->{'index_names'}->{$index_name}->{$index_entry_ref->{'index_name'}};
-
my $already_formatted;
if (!$formatted_index_entries{$index_entry_ref}) {
$formatted_index_entries{$index_entry_ref} = 1;
@@ -2976,8 +2975,7 @@
}
my $entry;
- if ($in_code) {
- # FIXME clean state
+ if ($index_entry_ref->{'in_code'}) {
$entry = $self->convert_tree({'type' => '_code',
'contents' =>
$index_entry_ref->{'content'}});
} else {
@@ -2988,7 +2986,7 @@
}
next if ($entry !~ /\S/);
- $entry = '<code>' .$entry .'</code>' if ($in_code);
+ $entry = '<code>' .$entry .'</code>' if ($index_entry_ref->{'in_code'});
my $entry_href = $self->command_href ($index_entry_ref->{'command'});
my $associated_command;
if ($self->get_conf('NODE_NAME_IN_INDEX')) {
@@ -3029,6 +3027,9 @@
}
$result .= "</table>\n";
+
+ pop @{$self->{'document_context'}};
+
return $result .$summary;
}
$default_commands_conversion{'printindex'} = \&_convert_printindex_command;
@@ -3049,7 +3050,7 @@
if ($id ne '') {
$result .= "<a name=\"$id\"></a>\n";
}
- my $heading = $self->command_text($special_element, 'text');
+ my $heading = $self->command_text($special_element);
$result .= &{$self->{'heading_text'}}($self, $cmdname, $heading, 0)."\n";
$result .= $content . "\n";
return $result;
@@ -3775,7 +3776,7 @@
$self->get_conf('MISC_BUTTONS'), undef, $element);
}
- my $heading = $self->command_text($element, 'text');
+ my $heading = $self->command_text($element);
$result .= &{$self->{'heading_text'}}($self, '', $heading, 0)."\n";
my $special_element_body .= &{$self->{'special_element_body'}}($self,
@@ -5043,7 +5044,7 @@
if ($external_node->{'manual_content'}) {
my $manual_name = Texinfo::Convert::Text::convert(
{'contents' => $external_node->{'manual_content'}},
- {'converter' => $self});
+ {'converter' => $self, 'code' => 1});
my $manual_base = $manual_name;
$manual_base =~ s/\.[^\.]*$//;
$manual_base =~ s/^.*\///;
@@ -6381,10 +6382,11 @@
$self->{'document_context'}->[-1]->{'context'}->[-1]->{'string'}++;
$arg_formatted->{$arg_type} = $self->_convert($arg,
$explanation);
pop @{$self->{'document_context'}};
- } elsif ($arg_type eq 'text') {
+ } elsif ($arg_type eq 'codetext') {
$arg_formatted->{$arg_type}
= Texinfo::Convert::Text::convert($arg,
- {'converter' => $self});
+ {'converter' => $self,
+ 'code' => 1});
}
}
Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- Texinfo/Convert/Info.pm 14 Aug 2011 00:34:05 -0000 1.55
+++ Texinfo/Convert/Info.pm 14 Aug 2011 01:51:58 -0000 1.56
@@ -364,9 +364,8 @@
#my @keys = keys(%$entry);
#print STDERR "$index_name $entry: @keys\n";
next if ($ignored_entries{$entry});
- my $in_code =
$self->{'index_names'}->{$index_name}->{$entry->{'index_name'}};
my $entry_tree = {'contents' => $entry->{'content'}};
- if ($in_code) {
+ if ($entry->{'in_code'}) {
$entry_tree->{'type'} = 'code';
} else {
$entry_tree->{'type'} = 'frenchspacing';
@@ -526,10 +525,12 @@
if (defined($root->{'extra'}->{'brace_command_contents'}->[0])) {
my $basefile = Texinfo::Convert::Text::convert(
- {'contents' => $root->{'extra'}->{'brace_command_contents'}->[0]});
+ {'contents' => $root->{'extra'}->{'brace_command_contents'}->[0]},
+ {'code' => 1});
if (defined($root->{'extra'}->{'brace_command_contents'}->[4])) {
my $extension = Texinfo::Convert::Text::convert(
- {'contents' => $root->{'extra'}->{'brace_command_contents'}->[4]});
+ {'contents' => $root->{'extra'}->{'brace_command_contents'}->[4]},
+ {'code' => 1});
unshift @extensions, ".$extension";
unshift @extensions, "$extension";
}
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- Texinfo/Convert/Plaintext.pm 11 Aug 2011 22:08:51 -0000 1.147
+++ Texinfo/Convert/Plaintext.pm 14 Aug 2011 01:51:58 -0000 1.148
@@ -992,7 +992,8 @@
if (defined($root->{'extra'}->{'brace_command_contents'}->[0])) {
my $basefile = Texinfo::Convert::Text::convert(
- {'contents' => $root->{'extra'}->{'brace_command_contents'}->[0]});
+ {'contents' => $root->{'extra'}->{'brace_command_contents'}->[0]},
+ {'code' => 1});
my $result = $self->_image_text($root, $basefile);
if (defined($result)) {
if (!$self->{'formatters'}->[-1]->{'_top_formatter'}) {
Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- Texinfo/Convert/Text.pm 14 Aug 2011 00:34:05 -0000 1.54
+++ Texinfo/Convert/Text.pm 14 Aug 2011 01:51:59 -0000 1.55
@@ -60,12 +60,6 @@
$ignored_brace_commands{$ignored_brace_command} = 1;
}
-#my %code_style_commands;
-#foreach my $command ('code', 'command', 'env', 'file', 'kbd', 'key', 'option',
-# 'samp', 'indicateurl', 'verb') {
-# $code_style_commands{$command} = 1;
-#}
-
my %ignored_block_commands;
foreach my $ignored_command ('titlepage', 'copying', 'documentdescription',
'html', 'tex', 'xml', 'docbook', 'ignore', 'macro', 'rmacro') {
@@ -1018,15 +1012,13 @@
if ($options->{'sc'}) {
$result = uc($result);
}
- # FIXME don't do that in code and preformatted? This won't be right
- # for Xref anymore since '' `` should lead to " irrespective of code
- # style. However it is important, for instance in @image file
- # argument...
- #if (!$options->{'code'}) {
- # $result =~ s/``/"/g;
- # $result =~ s/\'\'/"/g;
- # $result =~ s/---/\x{1F}/g;
- # $result =~ s/--/-/g;
+ if (!$options->{'code'}) {
+ $result =~ s/``/"/g;
+ $result =~ s/\'\'/"/g;
+ $result =~ s/---/\x{1F}/g;
+ $result =~ s/--/-/g;
+ $result =~ s/\x{1F}/--/g;
+ }
}
}
if ($root->{'cmdname'}) {
@@ -1094,7 +1086,8 @@
my $result;
if ($root->{'cmdname'} eq 'sc') {
$options = {%$options, 'sc' => 1};
- } elsif ($Texinfo::Common::code_style_commands{$root->{'cmdname'}}) {
+ } elsif ($Texinfo::Common::code_style_commands{$root->{'cmdname'}}
+ or $root->{'cmdname'} eq 'math') {
$options = _code_options($options);
}
$result = convert($root->{'args'}->[0], $options);
Index: t/02coverage.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/02coverage.t,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- t/02coverage.t 13 Aug 2011 15:33:04 -0000 1.54
+++ t/02coverage.t 14 Aug 2011 01:51:59 -0000 1.55
@@ -9,7 +9,7 @@
@email{a, b} @code{code --- -- \'\' ``}
--- -- \'\' ``. @sc{small caps}.
address@hidden index entry in text @LaTeX{}
address@hidden index entry ``in text\'\' @LaTeX{}
@majorheading majorheading @b{in b}
'],
Index: t/test_sort.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/test_sort.t,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/test_sort.t 14 Aug 2011 00:34:06 -0000 1.9
+++ t/test_sort.t 14 Aug 2011 01:51:59 -0000 1.10
@@ -51,7 +51,7 @@
}
#Â e is before E because they are equal and e appears before E in the document
-my @entries_ref = ('!', '``', 'aaaaaaaaaaaa', 'e', 'E', 'e~', 'l');
+my @entries_ref = ('!', '"', 'aaaaaaaaaaaa', 'e', 'E', 'e~', 'l');
cmp_deeply (address@hidden, address@hidden, 'sorted index entries');
@@ -61,7 +61,7 @@
my @letter_entries_ref = (
{'!' => [ '!' ]},
- {'`' => [ '``' ]},
+ {'"' => [ '"' ]},
{'A' => [ 'aaaaaaaaaaaa' ]},
{'E' => [ 'e', 'E', 'e~']},
{'L' => [ 'l' ]},
Index: t/results/coverage/accent_and_dash.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/accent_and_dash.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/coverage/accent_and_dash.pl 13 Aug 2011 15:33:05 -0000
1.5
+++ t/results/coverage/accent_and_dash.pl 14 Aug 2011 01:51:59 -0000
1.6
@@ -46,13 +46,13 @@
$result_texis{'accent_and_dash'} = '@^{a--}';
-$result_texts{'accent_and_dash'} = 'a--^';
+$result_texts{'accent_and_dash'} = 'a-^';
$result_errors{'accent_and_dash'} = [];
-$result_converted{'plaintext'}->{'accent_and_dash'} = 'a--^
+$result_converted{'plaintext'}->{'accent_and_dash'} = 'a-^
';
Index: t/results/coverage/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/commands.pl,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- t/results/coverage/commands.pl 14 Aug 2011 00:34:06 -0000 1.42
+++ t/results/coverage/commands.pl 14 Aug 2011 01:51:59 -0000 1.43
@@ -311,7 +311,7 @@
},
{
'parent' => {},
- 'text' => 'index entry in text '
+ 'text' => 'index entry ``in text\'\' '
},
{
'args' => [
@@ -348,7 +348,7 @@
'index_at_command' => 'cindex',
'index_name' => 'cp',
'index_prefix' => 'c',
- 'key' => 'index entry in text LaTeX',
+ 'key' => 'index entry "in text" LaTeX',
'number' => 1
},
'misc_content' => []
@@ -513,7 +513,7 @@
@email{a, b} @code{code --- -- \'\' ``}
--- -- \'\' ``. @sc{small caps}.
address@hidden index entry in text @LaTeX{}
address@hidden index entry ``in text\'\' @LaTeX{}
@majorheading majorheading @b{in b}
';
@@ -522,7 +522,7 @@
$result_texts{'commands'} = '@ TeX e" i^ a~ a*
File -> Open.
b code --- -- \'\' ``
---- -- \'\' ``. SMALL CAPS.
+-- - " ". SMALL CAPS.
majorheading in b
@@ -557,7 +557,7 @@
<a href="mailto:a";>b</a> <code>code --- -- \'\' ``</code>
— – ” “. <small>SMALL CAPS</small>.
</p>
-<a name="index-index-entry-in-text-LaTeX"></a>
+<a name="index-index-entry-_0060_0060in-text_0027_0027-LaTeX"></a>
<a name="majorheading-in-b"></a>
<h1 class="majorheading">majorheading <b>in b</b></h1>
Index: t/results/coverage/def.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/def.pl,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- t/results/coverage/def.pl 14 Aug 2011 00:34:06 -0000 1.47
+++ t/results/coverage/def.pl 14 Aug 2011 01:51:59 -0000 1.48
@@ -2230,11 +2230,11 @@
$result_texts{'def'} = '
c--ategory: d--effn_name a--rguments...
-d--effn
+d-effn
cate--gory: de--ffn_name ar--guments more args
even more so
-def--fn
+def-fn
fset: i a g
cmde: truc
Index: t/results/coverage/exdent_and_formats.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/exdent_and_formats.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/coverage/exdent_and_formats.pl 13 Aug 2011 15:33:05 -0000
1.14
+++ t/results/coverage/exdent_and_formats.pl 14 Aug 2011 01:51:59 -0000
1.15
@@ -2227,7 +2227,7 @@
Nested Other line
exdented nested other line
-exdented quotation line and dash --- in quotation
+exdented quotation line and dash -- in quotation
Not exdented followed by exdented
exdented quotation line
Index: t/results/coverage/item_container.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/item_container.pl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- t/results/coverage/item_container.pl 13 Aug 2011 15:33:06 -0000
1.37
+++ t/results/coverage/item_container.pl 14 Aug 2011 01:51:59 -0000
1.38
@@ -450,9 +450,9 @@
$result_texts{'item_container'} = '
-i--tem +
+i-tem +
-b--ullet
+b-ullet
no itemize argument
';
Index: t/results/coverage/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/multitable.pl,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- t/results/coverage/multitable.pl 14 Aug 2011 00:34:06 -0000 1.40
+++ t/results/coverage/multitable.pl 14 Aug 2011 01:51:59 -0000 1.41
@@ -721,10 +721,10 @@
$result_texts{'multitable'} = '
-mu--ltitable headitem another tab
-mu--ltitable item multitable tab
-mu--ltitable item 2 multitable tab 2
-lone mu--ltitable item
+mu-ltitable headitem another tab
+mu-ltitable item multitable tab
+mu-ltitable item 2 multitable tab 2
+lone mu-ltitable item
truc bidule
';
Index: t/results/coverage/symbol_after_block.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/symbol_after_block.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/coverage/symbol_after_block.pl 4 Aug 2011 07:41:04 -0000
1.6
+++ t/results/coverage/symbol_after_block.pl 14 Aug 2011 01:51:59 -0000
1.7
@@ -2026,24 +2026,24 @@
Table:
a
-l--ine
+l-ine
a
-l--ine
+l-ine
Itemize:
-e--mph item
+e-mph item
-e--mph item
+e-mph item
Multitable:
-mu--ltitable headitem another tab
-mu--ltitable item multitable tab
+mu-ltitable headitem another tab
+mu-ltitable item multitable tab
-mu--ltitable headitem another tab
-mu--ltitable item multitable tab
+mu-ltitable headitem another tab
+mu-ltitable item multitable tab
Flushleft:
Index: t/results/coverage/symbol_after_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/symbol_after_command.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/coverage/symbol_after_command.pl 13 Aug 2011 15:33:06 -0000
1.6
+++ t/results/coverage/symbol_after_command.pl 14 Aug 2011 01:51:59 -0000
1.7
@@ -490,10 +490,10 @@
@ @
{ {
! exclam
-\'\' quotes
+" quotes
: colon
address@hidden {, @@ ?, !: @{ @\'\' @:
address@hidden {, @@ ?, !: @{ @" @:
';
$result_errors{'symbol_after_command'} = [];
Index: t/results/coverage_braces/abbr_acronym.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/abbr_acronym.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/coverage_braces/abbr_acronym.pl 13 Aug 2011 15:33:07 -0000
1.11
+++ t/results/coverage_braces/abbr_acronym.pl 14 Aug 2011 01:52:00 -0000
1.12
@@ -462,11 +462,11 @@
';
-$result_texts{'abbr_acronym'} = '--a (an accronym)
---a
---a (an accronym , ...)
-E\'--a. ,A. (E\'tude--, Autonome)
-E\'--a. ,A.
+$result_texts{'abbr_acronym'} = '-a (an accronym)
+-a
+-a (an accronym , ...)
+E\'-a. ,A. (E\'tude-, Autonome)
+E\'-a. ,A.
';
$result_errors{'abbr_acronym'} = [];
Index: t/results/coverage_braces/email_possibilities.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/email_possibilities.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/coverage_braces/email_possibilities.pl 13 Aug 2011 15:33:07
-0000 1.8
+++ t/results/coverage_braces/email_possibilities.pl 14 Aug 2011 01:52:00
-0000 1.9
@@ -164,8 +164,8 @@
';
-$result_texts{'email_possibilities'} = '--b
---b
+$result_texts{'email_possibilities'} = '-b
+-b
--a
';
Index: t/results/coverage_braces/uref_url.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/uref_url.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/coverage_braces/uref_url.pl 13 Aug 2011 15:33:08 -0000
1.11
+++ t/results/coverage_braces/uref_url.pl 14 Aug 2011 01:52:00 -0000
1.12
@@ -544,15 +544,15 @@
';
-$result_texts{'uref_url'} = '--a (--b)
+$result_texts{'uref_url'} = '--a (-b)
--c
- (--d)
---g
---i
---k
---l
---m (--n)
---q
+ (-d)
+-g
+-i
+-k
+-l
+--m (-n)
+-q
';
$result_errors{'uref_url'} = [];
Index: t/results/def/all_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/all_commands.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/def/all_commands.pl 14 Aug 2011 00:34:07 -0000 1.28
+++ t/results/def/all_commands.pl 14 Aug 2011 01:52:00 -0000 1.29
@@ -3505,58 +3505,58 @@
$result_texts{'all_commands'} = 'c--ategory: d--efvr_name
-d--efvr
+d-efvr
c--ategory: t--ype d--eftypefn_name a--rguments...
-d--eftypefn
+d-eftypefn
c--ategory on c--lass: t--ype d--eftypeop_name a--rguments...
-d--eftypeop
+d-eftypeop
c--ategory: t--ype d--eftypevr_name
-d--eftypevr
+d-eftypevr
c--ategory of c--lass: d--efcv_name
-d--efcv
+d-efcv
c--ategory on c--lass: d--efop_name a--rguments...
-d--efop
+d-efop
c--ategory: d--eftp_name a--ttributes...
-d--eftp
+d-eftp
Function: d--efun_name a--rguments...
-d--efun
+d-efun
Macro: d--efmac_name a--rguments...
-d--efmac
+d-efmac
Special Form: d--efspec_name a--rguments...
-d--efspec
+d-efspec
Variable: d--efvar_name
-d--efvar
+d-efvar
User Option: d--efopt_name
-d--efopt
+d-efopt
Function: t--ype d--eftypefun_name a--rguments...
-d--eftypefun
+d-eftypefun
Variable: t--ype d--eftypevar_name
-d--eftypevar
+d-eftypevar
Instance Variable of c--lass: d--efivar_name
-d--efivar
+d-efivar
Instance Variable of c--lass: t--ype d--eftypeivar_name
-d--eftypeivar
+d-eftypeivar
Method on c--lass: d--efmethod_name a--rguments...
-d--efmethod
+d-efmethod
Method on c--lass: t--ype d--eftypemethod_name a--rguments...
-d--eftypemethod
+d-eftypemethod
';
$result_errors{'all_commands'} = [
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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/def/all_commands_printindex.pl 14 Aug 2011 00:34:07 -0000
1.17
+++ t/results/def/all_commands_printindex.pl 14 Aug 2011 01:52:01 -0000
1.18
@@ -3917,58 +3917,58 @@
$result_texts{'all_commands_printindex'} = 'c--ategory: d--efvr_name
-d--efvr
+d-efvr
c--ategory: t--ype d--eftypefn_name a--rguments...
-d--eftypefn
+d-eftypefn
c--ategory on c--lass: t--ype d--eftypeop_name a--rguments...
-d--eftypeop
+d-eftypeop
c--ategory: t--ype d--eftypevr_name
-d--eftypevr
+d-eftypevr
c--ategory of c--lass: d--efcv_name
-d--efcv
+d-efcv
c--ategory on c--lass: d--efop_name a--rguments...
-d--efop
+d-efop
c--ategory: d--eftp_name a--ttributes...
-d--eftp
+d-eftp
Function: d--efun_name a--rguments...
-d--efun
+d-efun
Macro: d--efmac_name a--rguments...
-d--efmac
+d-efmac
Special Form: d--efspec_name a--rguments...
-d--efspec
+d-efspec
Variable: d--efvar_name
-d--efvar
+d-efvar
User Option: d--efopt_name
-d--efopt
+d-efopt
Function: t--ype d--eftypefun_name a--rguments...
-d--eftypefun
+d-eftypefun
Variable: t--ype d--eftypevar_name
-d--eftypevar
+d-eftypevar
Instance Variable of c--lass: d--efivar_name
-d--efivar
+d-efivar
Instance Variable of c--lass: t--ype d--eftypeivar_name
-d--eftypeivar
+d-eftypeivar
Method on c--lass: d--efmethod_name a--rguments...
-d--efmethod
+d-efmethod
Method on c--lass: t--ype d--eftypemethod_name a--rguments...
-d--eftypemethod
+d-eftypemethod
Functions
=========
Index: t/results/html_tests/commands_in_abbr.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/html_tests/commands_in_abbr.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/html_tests/commands_in_abbr.pl 13 Aug 2011 20:19:11 -0000
1.1
+++ t/results/html_tests/commands_in_abbr.pl 14 Aug 2011 01:52:01 -0000
1.2
@@ -282,7 +282,7 @@
';
-$result_texts{'commands_in_abbr'} = 'A (abbr -- b).
+$result_texts{'commands_in_abbr'} = 'A (abbr - b).
A (abbr -- b).
';
Index: t/results/include/value_expansion_in_include.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/include/value_expansion_in_include.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- t/results/include/value_expansion_in_include.pl 3 Jul 2011 14:50:56
-0000 1.30
+++ t/results/include/value_expansion_in_include.pl 14 Aug 2011 01:52:01
-0000 1.31
@@ -585,15 +585,15 @@
-testvar include: This is the included file (include-value2.txi) <> ---.
+testvar include: This is the included file (include-value2.txi) <> --.
testvar verbatiminclude:
-test-var include: This is the included file (include-value2.txi) <> ---.
+test-var include: This is the included file (include-value2.txi) <> --.
test-var verbatiminclude:
-test_var include: This is the included file (include-value2.txi) <> ---.
+test_var include: This is the included file (include-value2.txi) <> --.
test_var verbatiminclude: ';
Index: t/results/indices/syncode_index_print_both.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/indices/syncode_index_print_both.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/indices/syncode_index_print_both.pl 14 Aug 2011 00:34:10
-0000 1.6
+++ t/results/indices/syncode_index_print_both.pl 14 Aug 2011 01:52:01
-0000 1.7
@@ -133,7 +133,7 @@
'index_at_command' => 'cindex',
'index_name' => 'cp',
'index_prefix' => 'c',
- 'key' => 'c---oncept',
+ 'key' => 'c--oncept',
'node' => {},
'number' => 1
},
Index: t/results/info_tests/direntry_dircategory_and_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/info_tests/direntry_dircategory_and_commands.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/info_tests/direntry_dircategory_and_commands.pl 3 Jul 2011
14:50:57 -0000 1.7
+++ t/results/info_tests/direntry_dircategory_and_commands.pl 14 Aug 2011
01:52:01 -0000 1.8
@@ -669,7 +669,7 @@
';
-$result_texts{'direntry_dircategory_and_commands'} = '* foo: (foo).
``hello---there?\'\'
+$result_texts{'direntry_dircategory_and_commands'} = '* foo: (foo).
"hello--there?"
* aaa :: aaaa
bbbbb
Index: t/results/info_tests/multitable_anchor_and_index_entry.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/info_tests/multitable_anchor_and_index_entry.pl 14 Aug 2011
00:34:11 -0000 1.9
+++ t/results/info_tests/multitable_anchor_and_index_entry.pl 14 Aug 2011
01:52:01 -0000 1.10
@@ -1299,10 +1299,10 @@
$result_texts{'multitable_anchor_and_index_entry'} = '
-mu--ltitable headitem another tab
-mu--ltitable item multitable tab
-mu--ltitable item 2 multitable tab 2
-lone mu--ltitable item
+mu-ltitable headitem another tab
+mu-ltitable item multitable tab
+mu-ltitable item 2 multitable tab 2
+lone mu-ltitable item
A
B
Index: t/results/itemize/inter_item_commands_in_enumerate.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/itemize/inter_item_commands_in_enumerate.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/itemize/inter_item_commands_in_enumerate.pl 3 Jul 2011
14:50:58 -0000 1.5
+++ t/results/itemize/inter_item_commands_in_enumerate.pl 14 Aug 2011
01:52:01 -0000 1.6
@@ -156,7 +156,7 @@
$result_texts{'inter_item_commands_in_enumerate'} = '
-1. e--numerate
+1. e-numerate
';
$result_errors{'inter_item_commands_in_enumerate'} = [];
Index: t/results/itemize/inter_item_commands_in_itemize.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/itemize/inter_item_commands_in_itemize.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/itemize/inter_item_commands_in_itemize.pl 14 Aug 2011 00:34:12
-0000 1.6
+++ t/results/itemize/inter_item_commands_in_itemize.pl 14 Aug 2011 01:52:01
-0000 1.7
@@ -783,12 +783,12 @@
';
-$result_texts{'inter_item_commands_in_itemize'} = 'e--mph item
+$result_texts{'inter_item_commands_in_itemize'} = 'e-mph item
-i--tem 1
-i--tem 2
+i-tem 1
+i-tem 2
-T--ext before items.
+T-ext before items.
bullet item
';
Index: t/results/menu/dash_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/dash_in_menu.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/menu/dash_in_menu.pl 3 Jul 2011 14:50:59 -0000 1.11
+++ t/results/menu/dash_in_menu.pl 14 Aug 2011 01:52:01 -0000 1.12
@@ -219,9 +219,9 @@
$result_texts{'dash_in_menu'} = '
-* entry---in: (manual)n---ode. description --- in.
+* entry--in: (manual)n---ode. description -- in.
-comment --- in.
+comment -- in.
';
$result_errors{'dash_in_menu'} = [
Index: t/results/misc_commands/codequoteundirected_codequotebacktick.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/misc_commands/codequoteundirected_codequotebacktick.pl 13 Aug
2011 15:33:08 -0000 1.7
+++ t/results/misc_commands/codequoteundirected_codequotebacktick.pl 14 Aug
2011 01:52:02 -0000 1.8
@@ -5037,13 +5037,13 @@
test quotes
***********
-``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+"simple-double-three--four---" `simple\' quotedblleft: ``
code: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
-asis: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+asis: "simple-double-three--four---" `simple\' quotedblleft: ``
-strong: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+strong: "simple-double-three--four---" `simple\' quotedblleft: ``
kbd: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
@@ -5052,13 +5052,13 @@
@codequoteundirected on
@codequotebacktick on
-``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+"simple-double-three--four---" `simple\' quotedblleft: ``
code: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
-asis: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+asis: "simple-double-three--four---" `simple\' quotedblleft: ``
-strong: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+strong: "simple-double-three--four---" `simple\' quotedblleft: ``
kbd: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
@@ -5067,13 +5067,13 @@
@codequoteundirected off
@codequotebacktick off
-``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+"simple-double-three--four---" `simple\' quotedblleft: ``
code: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
-asis: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+asis: "simple-double-three--four---" `simple\' quotedblleft: ``
-strong: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+strong: "simple-double-three--four---" `simple\' quotedblleft: ``
kbd: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
Index: t/results/misc_commands/test_allowcodebreaks.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/misc_commands/test_allowcodebreaks.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/misc_commands/test_allowcodebreaks.pl 13 Aug 2011 15:33:10
-0000 1.11
+++ t/results/misc_commands/test_allowcodebreaks.pl 14 Aug 2011 01:52:02
-0000 1.12
@@ -2611,7 +2611,7 @@
Before first allowcodebreaks
-Out of code --- out-of-code.
+Out of code -- out-of-code.
1aaa 2aaa- -3bbb 4aaa-bbb
5aaa-bb 6aaa-bb ccc 7aaa-bbb ccc 8aaa-bbb ddd
9aaa-bbb rrr_vv
@@ -2621,7 +2621,7 @@
in-example
After false
-Out of code --- out-of-code.
+Out of code -- out-of-code.
1aaa 2aaa- -3bbb 4aaa-bbb
5aaa-bb 6aaa-bb ccc 7aaa-bbb ccc 8aaa-bbb ddd
9aaa-bbb rrr_vv
@@ -2631,7 +2631,7 @@
in-example
In w:
-Out of code --- out-of-code.
+Out of code -- out-of-code.
1aaa 2aaa- -3bbb 4aaa-bbb
5aaa-bb 6aaa-bb ccc 7aaa-bbb ccc 8aaa-bbb ddd
9aaa-bbb rrr_vv
@@ -2642,7 +2642,7 @@
in-example
After true
-Out of code --- out-of-code.
+Out of code -- out-of-code.
1aaa 2aaa- -3bbb 4aaa-bbb
5aaa-bb 6aaa-bb ccc 7aaa-bbb ccc 8aaa-bbb ddd
9aaa-bbb rrr_vv
Index: t/results/misc_commands/text_before_line_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/misc_commands/text_before_line_command.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/misc_commands/text_before_line_command.pl 3 Jul 2011 14:51:00
-0000 1.15
+++ t/results/misc_commands/text_before_line_command.pl 14 Aug 2011 01:52:02
-0000 1.16
@@ -407,7 +407,7 @@
$result_texts{'text_before_line_command'} = 'before title
-i--- 1 LD Version Scripts
+i-- 1 LD Version Scripts
********************
ddd
Index: t/results/multitable/inter_item_commands_in_multitable.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/inter_item_commands_in_multitable.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/multitable/inter_item_commands_in_multitable.pl 14 Aug 2011
00:34:12 -0000 1.7
+++ t/results/multitable/inter_item_commands_in_multitable.pl 14 Aug 2011
01:52:02 -0000 1.8
@@ -827,10 +827,10 @@
trouc
-mu--ltitable headitem another tab
-mu--ltitable item multitable tab
-mu--ltitable item 2 multitable tab 2
-lone mu--ltitable item
+mu-ltitable headitem another tab
+mu-ltitable item multitable tab
+mu-ltitable item 2 multitable tab 2
+lone mu-ltitable item
';
$result_errors{'inter_item_commands_in_multitable'} = [
Index: t/results/plaintext_tests/flushright_not_closed_and_format.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/flushright_not_closed_and_format.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/plaintext_tests/flushright_not_closed_and_format.pl 3 Jul
2011 14:51:01 -0000 1.6
+++ t/results/plaintext_tests/flushright_not_closed_and_format.pl 14 Aug
2011 01:52:02 -0000 1.7
@@ -153,7 +153,7 @@
$result_texts{'flushright_not_closed_and_format'} = 'flushright
-A quot---ation
+A quot--ation
';
$result_errors{'flushright_not_closed_and_format'} = [
Index: t/results/preformatted/quote_dash_in_display.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/preformatted/quote_dash_in_display.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/preformatted/quote_dash_in_display.pl 13 Aug 2011 15:33:11
-0000 1.7
+++ t/results/preformatted/quote_dash_in_display.pl 14 Aug 2011 01:52:02
-0000 1.8
@@ -121,7 +121,7 @@
$result_texts{'quote_dash_in_display'} = '
-and now -- yes---now and ``so\'\'.
+and now - yes--now and "so".
';
Index: t/results/quotation/quotation_and_author.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/quotation/quotation_and_author.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/quotation/quotation_and_author.pl 13 Jul 2011 14:49:12 -0000
1.5
+++ t/results/quotation/quotation_and_author.pl 14 Aug 2011 01:52:02 -0000
1.6
@@ -336,7 +336,7 @@
';
-$result_texts{'quotation_and_author'} = 'A quot---ation
+$result_texts{'quotation_and_author'} = 'A quot--ation
Note
A Note
Index: t/results/sectioning/at_commands_in_refs.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/at_commands_in_refs.pl,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- t/results/sectioning/at_commands_in_refs.pl 4 Aug 2011 07:41:05 -0000
1.47
+++ t/results/sectioning/at_commands_in_refs.pl 14 Aug 2011 01:52:02 -0000
1.48
@@ -18650,8 +18650,8 @@
12 << >> << >> < >
******************
-13 `` \'\' --- --
-***************
+13 " " -- -
+***********
14 AAA (fff) AAA BBB
********************
Index: t/results/xtable/inter_item_commands_in_table.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xtable/inter_item_commands_in_table.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/xtable/inter_item_commands_in_table.pl 14 Aug 2011 00:34:13
-0000 1.8
+++ t/results/xtable/inter_item_commands_in_table.pl 14 Aug 2011 01:52:03
-0000 1.9
@@ -1499,15 +1499,15 @@
$result_texts{'inter_item_commands_in_table'} = 'a
-l--ine
+l-ine
a
b
-l--ine
+l-ine
a
b
-l--ine
+l-ine
c
@@ -1515,7 +1515,7 @@
abb
-l--ine
+l-ine
Texte before first item.
abb
Index: t/results/plaintext_tests/space_at_menu_end.pl
===================================================================
RCS file: t/results/plaintext_tests/space_at_menu_end.pl
diff -N t/results/plaintext_tests/space_at_menu_end.pl
--- t/results/plaintext_tests/space_at_menu_end.pl 24 Jun 2011 07:42:46
-0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,256 +0,0 @@
-use vars qw(%result_texis %result_texts %result_trees %result_errors
- %result_indices %result_sectioning %result_nodes %result_menus
- %result_floats %result_converted %result_converted_errors);
-
-$result_trees{'space_at_menu_end'} = {
- 'contents' => [
- {
- 'contents' => [],
- 'parent' => {},
- 'type' => 'text_root'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- },
- {
- 'parent' => {},
- 'text' => 'Top'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
- }
- ],
- 'parent' => {},
- 'type' => 'misc_line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'menu',
- 'contents' => [
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'args' => [
- {
- 'parent' => {},
- 'text' => '* ',
- 'type' => 'menu_entry_leading_text'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => '(out)'
- }
- ],
- 'parent' => {},
- 'type' => 'menu_entry_node'
- },
- {
- 'parent' => {},
- 'text' => '::',
- 'type' => 'menu_entry_separator'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => '
-'
- }
- ],
- 'parent' => {},
- 'type' => 'menu_entry_description'
- }
- ],
- 'extra' => {
- 'menu_entry_node' => {
- 'manual_content' => [
- {
- 'parent' => {},
- 'text' => 'out'
- }
- ]
- }
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'menu_entry'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'after_description_line'
- },
- {
- 'contents' => [],
- 'parent' => {},
- 'type' => 'menu_comment'
- }
- ],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'A para.
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'extra' => {
- 'node_content' => [
- {}
- ],
- 'nodes_manuals' => [
- {
- 'node_content' => [],
- 'normalized' => 'Top'
- }
- ],
- 'normalized' => 'Top'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'type' => 'document_root'
-};
-$result_trees{'space_at_menu_end'}{'contents'}[0]{'parent'} =
$result_trees{'space_at_menu_end'};
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'space_at_menu_end'}{'contents'}[1]{'args'}[0];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'space_at_menu_end'}{'contents'}[1]{'args'}[0];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'space_at_menu_end'}{'contents'}[1]{'args'}[0];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'space_at_menu_end'}{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'space_at_menu_end'}{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'parent'}
=
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
=
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
=
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
=
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'space_at_menu_end'}{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'space_at_menu_end'}{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'space_at_menu_end'}{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[4];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[4]{'parent'} =
$result_trees{'space_at_menu_end'}{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'extra'}{'node_content'}[0]
= $result_trees{'space_at_menu_end'}{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
= $result_trees{'space_at_menu_end'}{'contents'}[1]{'extra'}{'node_content'};
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'parent'} =
$result_trees{'space_at_menu_end'};
-
-$result_texis{'space_at_menu_end'} = '@node Top
-
address@hidden
-* (out)::
-
address@hidden menu
-
-A para.
-';
-
-
-$result_texts{'space_at_menu_end'} = '
-* (out)::
-
-
-A para.
-';
-
-$result_sectioning{'space_at_menu_end'} = {};
-
-$result_nodes{'space_at_menu_end'} = {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'Top'
- },
- 'menus' => [
- {
- 'cmdname' => 'menu'
- }
- ],
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ]
- }
- }
-};
-
-$result_menus{'space_at_menu_end'} = {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'Top'
- }
-};
-
-$result_errors{'space_at_menu_end'} = [];
-
-
-
-$result_converted{'plaintext'}->{'space_at_menu_end'} = '
-* Menu:
-
-* (out)::
-
-A para.
-';
-
-1;
- texinfo/tp Texinfo/Parser.pm Texinfo/Convert/HT...,
Patrice Dumas <=