[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp TODO Texinfo/Convert/DocBook.pm Texi...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp TODO Texinfo/Convert/DocBook.pm Texi... |
|
Date: |
Sat, 04 Aug 2012 22:45:48 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/08/04 22:45:48
Modified files:
tp : TODO
tp/Texinfo/Convert: DocBook.pm HTML.pm Plaintext.pm XML.pm
tp/t : converters_tests.t
tp/t/results/coverage_braces: test_image.pl
tp/t/results/misc_commands: test_allowcodebreaks.pl
tp/tests/coverage/res_parser/formatting: formatting.html
tp/tests/coverage/res_parser/formatting_fr: formatting.html
tp/tests/coverage/res_parser/formatting_utf8_enable_encoding:
formatting_utf8.html
tp/tests/coverage/res_parser_info/formatting: formatting.info
tp/tests/coverage/res_parser_info/formatting_fr: formatting.info
tp/tests/coverage/res_parser_info/formatting_utf8_enable_encoding:
formatting_utf8.info
tp/tests/layout/res_parser/formatting_chm: formatting.html
tp/tests/layout/res_parser/formatting_docbook: formatting.xml
tp/tests/layout/res_parser/formatting_exotic: index.html
tp/tests/layout/res_parser/formatting_fr_icons: formatting.html
tp/tests/layout/res_parser/formatting_html: formatting.html
tp/tests/layout/res_parser/formatting_html32: formatting.html
tp/tests/layout/res_parser/formatting_html_nodes: index.html
tp/tests/layout/res_parser/formatting_nodes: index.html
tp/tests/layout/res_parser/formatting_plaintext: formatting.1
tp/tests/layout/res_parser/formatting_regions:
formatting_regions.html
tp/tests/layout/res_parser/formatting_singular: index.htm
tp/tests/layout/res_parser/formatting_weird_quotes:
formatting.html
tp/tests/layout/res_parser/formatting_xml: formatting.xml
Added files:
tp/t/results/converters_tests: normal_font_in_monospace.pl
Log message:
Style @-commands that sets a normal font revert the from from being
monospace.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.283&r2=1.284
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/DocBook.pm?cvsroot=texinfo&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.244&r2=1.245
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.218&r2=1.219
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/converters_tests.t?cvsroot=texinfo&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/normal_font_in_monospace.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/test_image.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/test_allowcodebreaks.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/formatting/formatting.html?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/formatting_fr/formatting.html?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser_info/formatting/formatting.info?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser_info/formatting_fr/formatting.info?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser_info/formatting_utf8_enable_encoding/formatting_utf8.info?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.html?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_docbook/formatting.xml?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_exotic/index.html?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.html?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.html?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/index.html?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_nodes/index.html?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_plaintext/formatting.1?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_singular/index.htm?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml?cvsroot=texinfo&r1=1.2&r2=1.3
Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -b -r1.283 -r1.284
--- TODO 31 Jul 2012 21:54:35 -0000 1.283
+++ TODO 4 Aug 2012 22:45:43 -0000 1.284
@@ -11,10 +11,6 @@
Bugs
====
address@hidden
-in example @r{in r now @code{in code}}
address@hidden example
-
Delayed bugs
============
Index: Texinfo/Convert/DocBook.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- Texinfo/Convert/DocBook.pm 4 Aug 2012 20:08:02 -0000 1.49
+++ Texinfo/Convert/DocBook.pm 4 Aug 2012 22:45:44 -0000 1.50
@@ -195,6 +195,7 @@
my %default_args_code_style
= %Texinfo::Convert::Converter::default_args_code_style;
+my %regular_font_style_commands =
%Texinfo::Common::regular_font_style_commands;
my %defcommand_name_type = (
'deffn' => 'function',
@@ -542,16 +543,20 @@
}
$result .= "<term>";
$result .= $self->_index_entry($root);
- my $in_code;
- $in_code = 1
- if ($format_item_command
- and defined($default_args_code_style{$format_item_command})
- and $default_args_code_style{$format_item_command}->[0]);
- push @{$self->{'document_context'}->[-1]->{'monospace'}}, 1
- if ($in_code);
+ my $in_monospace_not_normal;
+ if ($format_item_command) {
+ if (defined($default_args_code_style{$format_item_command})
+ and $default_args_code_style{$format_item_command}->[0]) {
+ $in_monospace_not_normal = 1;
+ } elsif ($regular_font_style_commands{$format_item_command}) {
+ $in_monospace_not_normal = 0;
+ }
+ }
+ push @{$self->{'document_context'}->[-1]->{'monospace'}},
$in_monospace_not_normal
+ if (defined($in_monospace_not_normal));
$result .= $self->_convert($arg_tree);
pop @{$self->{'document_context'}->[-1]->{'monospace'}}
- if ($in_code);
+ if (defined($in_monospace_not_normal));
chomp ($result);
$result .= "\n";
$result .= "</term>";
@@ -696,17 +701,22 @@
}
} elsif ($root->{'type'}
and $root->{'type'} eq 'definfoenclose_command') {
- my $in_code;
- $in_code = 1
+
+ my $in_monospace_not_normal;
if (defined($default_args_code_style{$root->{'cmdname'}})
- and $default_args_code_style{$root->{'cmdname'}}->[0]);
- push @{$self->{'document_context'}->[-1]->{'monospace'}}, 1
- if ($in_code);
+ and $default_args_code_style{$root->{'cmdname'}}->[0]) {
+ $in_monospace_not_normal = 1;
+ } elsif ($regular_font_style_commands{$root->{'cmdname'}}) {
+ $in_monospace_not_normal = 0;
+ }
+ push @{$self->{'document_context'}->[-1]->{'monospace'}},
+ $in_monospace_not_normal
+ if (defined($in_monospace_not_normal));
my $arg = $self->_convert($root->{'args'}->[0]);
$result .= $self->xml_protect_text($root->{'extra'}->{'begin'}).$arg
.$self->xml_protect_text($root->{'extra'}->{'end'});
pop @{$self->{'document_context'}->[-1]->{'monospace'}}
- if ($in_code);
+ if (defined($in_monospace_not_normal));
} elsif ($root->{'args'}
and exists($Texinfo::Common::brace_commands{$root->{'cmdname'}}))
{
if ($style_commands_formatting{$root->{'cmdname'}}) {
@@ -714,12 +724,18 @@
push @{$self->{'document_context'}}, {'monospace' => [0]};
}
my $formatting = $style_commands_formatting{$root->{'cmdname'}};
- my $in_code;
- $in_code = 1
+
+ my $in_monospace_not_normal;
if (defined($default_args_code_style{$root->{'cmdname'}})
- and $default_args_code_style{$root->{'cmdname'}}->[0]);
- push @{$self->{'document_context'}->[-1]->{'monospace'}}, 1
- if ($in_code);
+ and $default_args_code_style{$root->{'cmdname'}}->[0]) {
+ $in_monospace_not_normal = 1;
+ } elsif ($regular_font_style_commands{$root->{'cmdname'}}) {
+ $in_monospace_not_normal = 0;
+ }
+ push @{$self->{'document_context'}->[-1]->{'monospace'}},
+ $in_monospace_not_normal
+ if (defined($in_monospace_not_normal));
+
my ($style, $attribute_text) =
_parse_attribute($formatting->{'attribute'});
my $result = $self->_convert($root->{'args'}->[0]);
if ($style ne '' and (!$self->{'document_context'}->[-1]->{'inline'}
@@ -734,7 +750,7 @@
. $self->get_conf('CLOSE_QUOTE_SYMBOL');
}
pop @{$self->{'document_context'}->[-1]->{'monospace'}}
- if ($in_code);
+ if (defined($in_monospace_not_normal));
if ($Texinfo::Common::context_brace_commands{$root->{'cmdname'}}) {
pop @{$self->{'document_context'}};
}
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -b -r1.244 -r1.245
--- Texinfo/Convert/HTML.pm 4 Aug 2012 20:59:56 -0000 1.244
+++ Texinfo/Convert/HTML.pm 4 Aug 2012 22:45:44 -0000 1.245
@@ -74,6 +74,7 @@
my %format_raw_commands = %Texinfo::Common::format_raw_commands;
my %inline_format_commands = %Texinfo::Common::inline_format_commands;
my %code_style_commands = %Texinfo::Common::code_style_commands;
+my %regular_font_style_commands =
%Texinfo::Common::regular_font_style_commands;
my %preformatted_code_commands = %Texinfo::Common::preformatted_code_commands;
my %default_index_commands = %Texinfo::Common::default_index_commands;
my %style_commands = %Texinfo::Common::style_commands;
@@ -7293,6 +7294,8 @@
if ($code_style_commands{$command_name} or
$preformatted_code_commands{$command_name}) {
push @{$self->{'document_context'}->[-1]->{'monospace'}}, 1;
+ } elsif ($regular_font_style_commands{$command_name}) {
+ push @{$self->{'document_context'}->[-1]->{'monospace'}}, 0;
} elsif ($upper_case_commands{$command_name}) {
$self->{'document_context'}->[-1]->{'formatting_context'}->[-1]->{'upper_case'}++;
} elsif ($command_name eq 'math') {
@@ -7367,8 +7370,9 @@
if ($pre_class_commands{$command_name}) {
pop @{$self->{'document_context'}->[-1]->{'preformatted_classes'}};
}
- if ($code_style_commands{$command_name} or
- $preformatted_code_commands{$command_name}) {
+ if ($code_style_commands{$command_name}
+ or $preformatted_code_commands{$command_name}
+ or $regular_font_style_commands{$command_name}) {
#$self->{'document_context'}->[-1]->{'code'}--;
pop @{$self->{'document_context'}->[-1]->{'monospace'}};
} elsif ($upper_case_commands{$command_name}) {
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -b -r1.218 -r1.219
--- Texinfo/Convert/Plaintext.pm 4 Aug 2012 20:08:02 -0000 1.218
+++ Texinfo/Convert/Plaintext.pm 4 Aug 2012 22:45:44 -0000 1.219
@@ -91,6 +91,7 @@
my %raw_commands = %Texinfo::Common::raw_commands;
my %format_raw_commands = %Texinfo::Common::format_raw_commands;
my %code_style_commands = %Texinfo::Common::code_style_commands;
+my %regular_font_style_commands =
%Texinfo::Common::regular_font_style_commands;
my %preformatted_code_commands = %Texinfo::Common::preformatted_code_commands;
my %default_index_commands = %Texinfo::Common::default_index_commands;
my %letter_no_arg_commands = %Texinfo::Common::letter_no_arg_commands;
@@ -1555,6 +1556,13 @@
$formatter->{'font_type_stack'}->[-1]->{'monospace'}++;
}
#$formatter->{'code'}++;
+ } elsif ($regular_font_style_commands{$command}) {
+ if ($formatter->{'font_type_stack'}->[-1]->{'monospace'}) {
+ push @{$formatter->{'font_type_stack'}}, {'monospace' => 0,
+ 'normal' => 1};
+ } elsif ($formatter->{'font_type_stack'}->[-1]->{'normal'}) {
+ $formatter->{'font_type_stack'}->[-1]->{'normal'}++;
+ }
}
if ($no_punctation_munging_commands{$command}) {
push @{$formatter->{'frenchspacing_stack'}}, 'on';
@@ -1620,6 +1628,12 @@
$formatter->{'font_type_stack'}->[-1]->{'monospace'}--;
pop @{$formatter->{'font_type_stack'}}
if !$formatter->{'font_type_stack'}->[-1]->{'monospace'};
+ } elsif ($regular_font_style_commands{$command}) {
+ if ($formatter->{'font_type_stack'}->[-1]->{'normal'}) {
+ $formatter->{'font_type_stack'}->[-1]->{'normal'}--;
+ pop @{$formatter->{'font_type_stack'}}
+ if !$formatter->{'font_type_stack'}->[-1]->{'normal'};
+ }
}
if ($quoted_code_commands{$command}) {
#$formatter->{'code_command'}--;
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- Texinfo/Convert/XML.pm 4 Aug 2012 20:08:02 -0000 1.66
+++ Texinfo/Convert/XML.pm 4 Aug 2012 22:45:44 -0000 1.67
@@ -158,6 +158,7 @@
my %default_args_code_style
= %Texinfo::Convert::Converter::default_args_code_style;
+my %regular_font_style_commands =
%Texinfo::Common::regular_font_style_commands;
my %commands_args_elements = (
'email' => ['emailaddress', 'emailname'],
@@ -477,10 +478,22 @@
if ($format_item_command
and defined($default_args_code_style{$format_item_command})
and $default_args_code_style{$format_item_command}->[0]);
- push @{$self->{'document_context'}->[-1]->{'monospace'}}, 1
- if ($in_code);
+ my $in_monospace_not_normal;
+ if ($format_item_command) {
+ if (defined($default_args_code_style{$format_item_command})
+ and $default_args_code_style{$format_item_command}->[0]) {
+ $in_monospace_not_normal = 1;
+ } elsif ($regular_font_style_commands{$format_item_command}) {
+ $in_monospace_not_normal = 0;
+ }
+ }
+ push @{$self->{'document_context'}->[-1]->{'monospace'}},
+ $in_monospace_not_normal
+ if (defined($in_monospace_not_normal));
+
$result .= $self->_convert($root->{'args'}->[0]);
- pop @{$self->{'document_context'}->[-1]->{'monospace'}} if ($in_code);
+ pop @{$self->{'document_context'}->[-1]->{'monospace'}}
+ if (defined($in_monospace_not_normal));
chomp ($result);
if ($format_item_command) {
$result .= "</itemformat>";
@@ -685,17 +698,22 @@
}
} elsif ($root->{'type'}
and $root->{'type'} eq 'definfoenclose_command') {
- my $in_code;
- $in_code = 1
+ my $in_monospace_not_normal;
if (defined($default_args_code_style{$root->{'cmdname'}})
- and $default_args_code_style{$root->{'cmdname'}}->[0]);
- push @{$self->{'document_context'}->[-1]->{'monospace'}}, 1
- if ($in_code);
+ and $default_args_code_style{$root->{'cmdname'}}->[0]) {
+ $in_monospace_not_normal = 1;
+ } elsif ($regular_font_style_commands{$root->{'cmdname'}}) {
+ $in_monospace_not_normal = 0;
+ }
+ push @{$self->{'document_context'}->[-1]->{'monospace'}},
+ $in_monospace_not_normal
+ if (defined($in_monospace_not_normal));
my $arg = $self->_convert($root->{'args'}->[0]);
$result .= "<infoenclose command=\"$root->{'cmdname'}\""
. $self->_infoenclose_attribute($root)
.">$arg</infoenclose>";
- pop @{$self->{'document_context'}->[-1]->{'monospace'}} if ($in_code);
+ pop @{$self->{'document_context'}->[-1]->{'monospace'}}
+ if (defined($in_monospace_not_normal));
} elsif ($root->{'args'}
and exists($Texinfo::Common::brace_commands{$root->{'cmdname'}}))
{
if ($Texinfo::Common::context_brace_commands{$root->{'cmdname'}}) {
@@ -739,18 +757,23 @@
my $arg_index = 0;
foreach my $element (@elements) {
if (defined($root->{'args'}->[$arg_index])) {
- my $in_code;
- $in_code = 1
+ my $in_monospace_not_normal;
if (defined($default_args_code_style{$root->{'cmdname'}})
- and $default_args_code_style{$root->{'cmdname'}}->[$arg_index]);
- push @{$self->{'document_context'}->[-1]->{'monospace'}}, 1
- if ($in_code);
+ and $default_args_code_style{$root->{'cmdname'}}->[$arg_index]) {
+ $in_monospace_not_normal = 1;
+ } elsif ($regular_font_style_commands{$root->{'cmdname'}}) {
+ $in_monospace_not_normal = 0;
+ }
+ push @{$self->{'document_context'}->[-1]->{'monospace'}},
+ $in_monospace_not_normal
+ if (defined($in_monospace_not_normal));
my $arg = $self->_convert($root->{'args'}->[$arg_index]);
if (!defined($command) or $arg ne '') {
# ${attribute} is only set for @verb
$result .= "<$element${attribute}>$arg</$element>";
}
- pop @{$self->{'document_context'}->[-1]->{'monospace'}} if
($in_code);
+ pop @{$self->{'document_context'}->[-1]->{'monospace'}}
+ if (defined($in_monospace_not_normal));
} else {
last;
}
Index: t/converters_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/converters_tests.t,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- t/converters_tests.t 28 Jul 2012 12:23:49 -0000 1.36
+++ t/converters_tests.t 4 Aug 2012 22:45:44 -0000 1.37
@@ -746,6 +746,13 @@
@address@hidden }}
'],
+['normal_font_in_monospace',
+'@example
+in example @r{in r---now @code{in co---de}}
address@hidden example
+
address@hidden command---c @r{in r---r @file{in file---}}}.
+'],
);
my @html_text_cases = (
Index: t/results/coverage_braces/test_image.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/test_image.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/coverage_braces/test_image.pl 14 May 2012 23:56:11 -0000
1.19
+++ t/results/coverage_braces/test_image.pl 4 Aug 2012 22:45:45 -0000
1.20
@@ -4673,7 +4673,7 @@
<div class="example">
<pre class="example">[ address@hidden a@<"%@ < & @ % " ]
-In text [ alt <b>î--le..</b> a
+In text [ alt <b>î–le..</b> a
<"%@<tt> < & @ % " </tt> ].
</pre></div>
@@ -4913,7 +4913,7 @@
<div class="example">
<pre class="example">[ address@hidden a@<"%@ < & @ % " ]
-In text [ alt <b>î--le..</b> a
+In text [ alt <b>î–le..</b> a
<"%@<tt> < & @ % " </tt> ].
</pre></div>
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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/misc_commands/test_allowcodebreaks.pl 28 Jul 2012 17:55:25
-0000 1.18
+++ t/results/misc_commands/test_allowcodebreaks.pl 4 Aug 2012 22:45:45
-0000 1.19
@@ -2770,7 +2770,7 @@
<code>1aaa</code> <code><span class="nocodebreak">2aaa-</span></code>
<code><span class="nocodebreak">-3bbb</span></code> <code><span
class="nocodebreak">4aaa-bbb</span></code>
<code> <span class="nocodebreak">5aaa-bb</span></code> <code><span
class="nocodebreak">6aaa-bb</span> </code> <code>ccc <span
class="nocodebreak">7aaa-bbb</span></code> <code>ccc <span
class="nocodebreak">8aaa-bbb</span> ddd</code>
<code><span class="nocodebreak">9aaa-bbb</span> <span
class="nocodebreak">rrr_vv</span></code>
-‘<samp><span class="nocodebreak">fff--</span> <span
class="nocodebreak">---</span> minus-b <span
class="nocodebreak">aa-tt</span>é<span class="nocodebreak">ff_gg</span>
aa<span class="roman"><span class="nocodebreak">r-oman</span></span>
+‘<samp><span class="nocodebreak">fff--</span> <span
class="nocodebreak">---</span> minus-b <span
class="nocodebreak">aa-tt</span>é<span class="nocodebreak">ff_gg</span>
aa<span class="roman">r-oman</span>
<span class="nocodebreak">anc-hor</span><a name="A-node1"></a></samp>’
</p>
<div class="example">
@@ -2778,7 +2778,7 @@
</pre></div>
<p>In w:
-Out of code — <span
class="nolinebreak">out-of-code.</span> <code>1aaa</code> <code><span
class="nocodebreak">2aaa-</span></code> <code><span
class="nocodebreak">-3bbb</span></code> <code><span
class="nocodebreak">4aaa-bbb</span></code> <code> <span
class="nocodebreak">5aaa-bb</span></code> <code><span
class="nocodebreak">6aaa-bb</span> </code> <code>ccc <span
class="nocodebreak">7aaa-bbb</span></code> <code>ccc <span
class="nocodebreak">8aaa-bbb</span> ddd</code> <code><span
class="nocodebreak">9aaa-bbb</span> <span
class="nocodebreak">rrr_vv</span></code> ‘<samp><span
class="nocodebreak">fff--</span> <span
class="nocodebreak">---</span> minus-b <span
class="nocodebreak">aa-tt</span>é<span
class="nocodebreak">ff_gg</span> aa<span class="roman"><span
class="nocodebreak">r-oman</span></span> <span
class="nocodebreak">anc-hor</span><a
name="A-nodew"></a></samp>’ <!-- /@w -->
+Out of code — <span
class="nolinebreak">out-of-code.</span> <code>1aaa</code> <code><span
class="nocodebreak">2aaa-</span></code> <code><span
class="nocodebreak">-3bbb</span></code> <code><span
class="nocodebreak">4aaa-bbb</span></code> <code> <span
class="nocodebreak">5aaa-bb</span></code> <code><span
class="nocodebreak">6aaa-bb</span> </code> <code>ccc <span
class="nocodebreak">7aaa-bbb</span></code> <code>ccc <span
class="nocodebreak">8aaa-bbb</span> ddd</code> <code><span
class="nocodebreak">9aaa-bbb</span> <span
class="nocodebreak">rrr_vv</span></code> ‘<samp><span
class="nocodebreak">fff--</span> <span
class="nocodebreak">---</span> minus-b <span
class="nocodebreak">aa-tt</span>é<span
class="nocodebreak">ff_gg</span> aa<span class="roman"><span
class="nolinebreak">r-oman</span></span> <span
class="nocodebreak">anc-hor</span><a
name="A-nodew"></a></samp>’ <!-- /@w -->
</p>
<div class="example">
<pre class="example"><code>in-example</code><!-- /@w -->
Index: tests/coverage/res_parser/formatting/formatting.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/coverage/res_parser/formatting/formatting.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/coverage/res_parser/formatting/formatting.html 2 Aug 2012
23:49:26 -0000 1.7
+++ tests/coverage/res_parser/formatting/formatting.html 4 Aug 2012
22:45:45 -0000 1.8
@@ -3685,7 +3685,7 @@
<code>@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr
title="Étude Autonome">É--. ,A.</abbr> (Étude Autonome)
<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="Étude
Autonome">É--. ,A.</abbr>
<code>@asis{--a}</code> --a
-<code>@b{--a}</code> <b>--a</b>
+<code>@b{--a}</code> <b>–a</b>
<code>@cite{--a}</code> <cite>--a</cite>
<code>@code{--a}</code> <code>--a</code>
<code>@command{--a}</code> <code>--a</code>
@@ -3698,18 +3698,18 @@
<code>@emph{--a}</code> <em>--a</em>
<code>@env{--a}</code> <code>--a</code>
<code>@file{--a}</code> <samp>--a</samp>
-<code>@i{--a}</code> <i>--a</i>
+<code>@i{--a}</code> <i>–a</i>
<code>@kbd{--a}</code> <kbd>--a</kbd>
<code>@key{--a}</code> <--a>
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
<code>@option{--a}</code> <samp>--a</samp>
-<code>@r{--a}</code> <span class="roman">--a</span>
+<code>@r{--a}</code> <span class="roman">–a</span>
<code>@samp{--a}</code> ‘<samp>--a</samp>’
<code>@sc{--a}</code> --A
<code>@strong{--a}</code> <strong>--a</strong>
<code>@t{--a}</code> <tt>--a</tt>
-<code>@sansserif{--a}</code> <span class="sansserif">--a</span>
-<code>@slanted{--a}</code> <i>--a</i>
+<code>@sansserif{--a}</code> <span class="sansserif">–a</span>
+<code>@slanted{--a}</code> <i>–a</i>
<code>@titlefont{--a}</code> </pre><h1 class="titlefont">--a</h1><pre
class="example">
<code>@indicateurl{--a}</code> ‘<code>--a</code>’
<code>@uref{--a,--b}</code> <a href="--a">--b</a>
Index: tests/coverage/res_parser/formatting_fr/formatting.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/coverage/res_parser/formatting_fr/formatting.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/coverage/res_parser/formatting_fr/formatting.html 2 Aug 2012
23:49:26 -0000 1.7
+++ tests/coverage/res_parser/formatting_fr/formatting.html 4 Aug 2012
22:45:45 -0000 1.8
@@ -3685,7 +3685,7 @@
<code>@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr
title="Étude Autonome">É--. ,A.</abbr> (Étude Autonome)
<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="Étude
Autonome">É--. ,A.</abbr>
<code>@asis{--a}</code> --a
-<code>@b{--a}</code> <b>--a</b>
+<code>@b{--a}</code> <b>–a</b>
<code>@cite{--a}</code> <cite>--a</cite>
<code>@code{--a}</code> <code>--a</code>
<code>@command{--a}</code> <code>--a</code>
@@ -3698,18 +3698,18 @@
<code>@emph{--a}</code> <em>--a</em>
<code>@env{--a}</code> <code>--a</code>
<code>@file{--a}</code> <samp>--a</samp>
-<code>@i{--a}</code> <i>--a</i>
+<code>@i{--a}</code> <i>–a</i>
<code>@kbd{--a}</code> <kbd>--a</kbd>
<code>@key{--a}</code> <--a>
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
<code>@option{--a}</code> <samp>--a</samp>
-<code>@r{--a}</code> <span class="roman">--a</span>
+<code>@r{--a}</code> <span class="roman">–a</span>
<code>@samp{--a}</code> ‘<samp>--a</samp>’
<code>@sc{--a}</code> --A
<code>@strong{--a}</code> <strong>--a</strong>
<code>@t{--a}</code> <tt>--a</tt>
-<code>@sansserif{--a}</code> <span class="sansserif">--a</span>
-<code>@slanted{--a}</code> <i>--a</i>
+<code>@sansserif{--a}</code> <span class="sansserif">–a</span>
+<code>@slanted{--a}</code> <i>–a</i>
<code>@titlefont{--a}</code> </pre><h1 class="titlefont">--a</h1><pre
class="example">
<code>@indicateurl{--a}</code> ‘<code>--a</code>’
<code>@uref{--a,--b}</code> <a href="--a">--b</a>
Index:
tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
---
tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html
2 Aug 2012 23:49:26 -0000 1.7
+++
tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html
4 Aug 2012 22:45:45 -0000 1.8
@@ -3687,7 +3687,7 @@
<code>@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr title="Ãtude
Autonome">Ã--. ,A.</abbr> (Ãtude Autonome)
<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="Ãtude Autonome">Ã--.
,A.</abbr>
<code>@asis{--a}</code> --a
-<code>@b{--a}</code> <b>--a</b>
+<code>@b{--a}</code> <b>–a</b>
<code>@cite{--a}</code> <cite>--a</cite>
<code>@code{--a}</code> <code>--a</code>
<code>@command{--a}</code> <code>--a</code>
@@ -3700,18 +3700,18 @@
<code>@emph{--a}</code> <em>--a</em>
<code>@env{--a}</code> <code>--a</code>
<code>@file{--a}</code> <samp>--a</samp>
-<code>@i{--a}</code> <i>--a</i>
+<code>@i{--a}</code> <i>–a</i>
<code>@kbd{--a}</code> <kbd>--a</kbd>
<code>@key{--a}</code> <--a>
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} â</em>
<code>@option{--a}</code> <samp>--a</samp>
-<code>@r{--a}</code> <span class="roman">--a</span>
+<code>@r{--a}</code> <span class="roman">–a</span>
<code>@samp{--a}</code> ‘<samp>--a</samp>’
<code>@sc{--a}</code> --A
<code>@strong{--a}</code> <strong>--a</strong>
<code>@t{--a}</code> <tt>--a</tt>
-<code>@sansserif{--a}</code> <span class="sansserif">--a</span>
-<code>@slanted{--a}</code> <i>--a</i>
+<code>@sansserif{--a}</code> <span class="sansserif">–a</span>
+<code>@slanted{--a}</code> <i>–a</i>
<code>@titlefont{--a}</code> </pre><h1 class="titlefont">--a</h1><pre
class="example">
<code>@indicateurl{--a}</code> ‘<code>--a</code>’
<code>@uref{--a,--b}</code> <a href="--a">--b</a>
Index: tests/coverage/res_parser_info/formatting/formatting.info
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/coverage/res_parser_info/formatting/formatting.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
Binary files /tmp/cvs2FTcnL and /tmp/cvs4sa5D1 differ
Index: tests/coverage/res_parser_info/formatting_fr/formatting.info
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/coverage/res_parser_info/formatting_fr/formatting.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
Binary files /tmp/cvsRY60EJ and /tmp/cvsGT8aXZ differ
Index:
tests/coverage/res_parser_info/formatting_utf8_enable_encoding/formatting_utf8.info
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/coverage/res_parser_info/formatting_utf8_enable_encoding/formatting_utf8.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
Binary files /tmp/cvsQrh5fK and /tmp/cvsKdDsz0 differ
Index: tests/layout/res_parser/formatting_chm/formatting.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/layout/res_parser/formatting_chm/formatting.html 2 Aug 2012
23:49:27 -0000 1.7
+++ tests/layout/res_parser/formatting_chm/formatting.html 4 Aug 2012
22:45:46 -0000 1.8
@@ -3669,7 +3669,7 @@
<code>@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr
title="Étude Autonome">É--. ,A.</abbr> (Étude Autonome)
<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="Étude
Autonome">É--. ,A.</abbr>
<code>@asis{--a}</code> --a
-<code>@b{--a}</code> <b>--a</b>
+<code>@b{--a}</code> <b>–a</b>
<code>@cite{--a}</code> <cite>--a</cite>
<code>@code{--a}</code> <code>--a</code>
<code>@command{--a}</code> <code>--a</code>
@@ -3682,18 +3682,18 @@
<code>@emph{--a}</code> <em>--a</em>
<code>@env{--a}</code> <code>--a</code>
<code>@file{--a}</code> <samp>--a</samp>
-<code>@i{--a}</code> <i>--a</i>
+<code>@i{--a}</code> <i>–a</i>
<code>@kbd{--a}</code> <kbd>--a</kbd>
<code>@key{--a}</code> <--a>
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
<code>@option{--a}</code> <samp>--a</samp>
-<code>@r{--a}</code> <span class="roman">--a</span>
+<code>@r{--a}</code> <span class="roman">–a</span>
<code>@samp{--a}</code> ‘<samp>--a</samp>’
<code>@sc{--a}</code> --A
<code>@strong{--a}</code> <strong>--a</strong>
<code>@t{--a}</code> <tt>--a</tt>
-<code>@sansserif{--a}</code> <span class="sansserif">--a</span>
-<code>@slanted{--a}</code> <i>--a</i>
+<code>@sansserif{--a}</code> <span class="sansserif">–a</span>
+<code>@slanted{--a}</code> <i>–a</i>
<code>@titlefont{--a}</code> </pre><h1 class="titlefont">--a</h1><pre
class="example">
<code>@indicateurl{--a}</code> ‘<code>--a</code>’
<code>@uref{--a,--b}</code> <a href="--a">--b</a>
Index: tests/layout/res_parser/formatting_docbook/formatting.xml
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_docbook/formatting.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tests/layout/res_parser/formatting_docbook/formatting.xml 22 Jul 2012
22:28:16 -0000 1.4
+++ tests/layout/res_parser/formatting_docbook/formatting.xml 4 Aug 2012
22:45:46 -0000 1.5
@@ -2628,7 +2628,7 @@
<literal>@abbr{@'E--. @comma{}A., @'Etude Autonome }</literal>
<abbrev>É--. ,A.</abbrev> (Étude Autonome)
<literal>@abbr{@'E--. @comma{}A.}</literal> <abbrev>É--. ,A.</abbrev>
<literal>@asis{--a}</literal> --a
-<literal>@b{--a}</literal> <emphasis role="bold">--a</emphasis>
+<literal>@b{--a}</literal> <emphasis role="bold">–a</emphasis>
<literal>@cite{--a}</literal> <citetitle>--a</citetitle>
<literal>@code{--a}</literal> <literal>--a</literal>
<literal>@command{--a}</literal> <command>--a</command>
@@ -2641,18 +2641,18 @@
<literal>@emph{--a}</literal> <emphasis>--a</emphasis>
<literal>@env{--a}</literal> <envar>--a</envar>
<literal>@file{--a}</literal> <filename>--a</filename>
-<literal>@i{--a}</literal> <emphasis>--a</emphasis>
+<literal>@i{--a}</literal> <emphasis>–a</emphasis>
<literal>@kbd{--a}</literal> <userinput>--a</userinput>
<literal>@key{--a}</literal> <keycap>--a</keycap>
<literal>@math{--a {\frac{1}{2}} @minus{}}</literal>
<inlineequation><mathphrase>--a {\frac{1}{2}}
−</mathphrase></inlineequation>
<literal>@option{--a}</literal> <option>--a</option>
-<literal>@r{--a}</literal> <lineannotation>--a</lineannotation>
+<literal>@r{--a}</literal> <lineannotation>–a</lineannotation>
<literal>@samp{--a}</literal> ‘<literal>--a</literal>’
<literal>@sc{--a}</literal> --a
<literal>@strong{--a}</literal> <emphasis role="bold">--a</emphasis>
<literal>@t{--a}</literal> <literal>--a</literal>
-<literal>@sansserif{--a}</literal> --a
-<literal>@slanted{--a}</literal> --a
+<literal>@sansserif{--a}</literal> –a
+<literal>@slanted{--a}</literal> –a
<literal>@titlefont{--a}</literal> </screen>--a<screen>
<literal>@indicateurl{--a}</literal> <literal>--a</literal>
<literal>@uref{--a,--b}</literal> <ulink url="--a">--b</ulink>
Index: tests/layout/res_parser/formatting_exotic/index.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/index.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- tests/layout/res_parser/formatting_exotic/index.html 2 Aug 2012
23:49:27 -0000 1.8
+++ tests/layout/res_parser/formatting_exotic/index.html 4 Aug 2012
22:45:46 -0000 1.9
@@ -2225,7 +2225,7 @@
<code>@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr
title="Étude Autonome">É--. ,A.</abbr> (Étude Autonome)
<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="Étude
Autonome">É--. ,A.</abbr>
<code>@asis{--a}</code> --a
-<code>@b{--a}</code> <b>--a</b>
+<code>@b{--a}</code> <b>–a</b>
<code>@cite{--a}</code> <cite>--a</cite>
<code>@code{--a}</code> <code>--a</code>
<code>@command{--a}</code> <code>--a</code>
@@ -2238,18 +2238,18 @@
<code>@emph{--a}</code> <em>--a</em>
<code>@env{--a}</code> <code>--a</code>
<code>@file{--a}</code> <samp>--a</samp>
-<code>@i{--a}</code> <i>--a</i>
+<code>@i{--a}</code> <i>–a</i>
<code>@kbd{--a}</code> <kbd>--a</kbd>
<code>@key{--a}</code> <--a>
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
<code>@option{--a}</code> <samp>--a</samp>
-<code>@r{--a}</code> <span class="roman">--a</span>
+<code>@r{--a}</code> <span class="roman">–a</span>
<code>@samp{--a}</code> ‘<samp>--a</samp>’
<code>@sc{--a}</code> --A
<code>@strong{--a}</code> <strong>--a</strong>
<code>@t{--a}</code> <tt>--a</tt>
-<code>@sansserif{--a}</code> <span class="sansserif">--a</span>
-<code>@slanted{--a}</code> <i>--a</i>
+<code>@sansserif{--a}</code> <span class="sansserif">–a</span>
+<code>@slanted{--a}</code> <i>–a</i>
<code>@titlefont{--a}</code> </pre><h1 class="titlefont">--a</h1><pre
class="example">
<code>@indicateurl{--a}</code> ‘<code>--a</code>’
<code>@uref{--a,--b}</code> <a href="--a">--b</a>
Index: tests/layout/res_parser/formatting_fr_icons/formatting.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/layout/res_parser/formatting_fr_icons/formatting.html 2 Aug 2012
23:49:27 -0000 1.7
+++ tests/layout/res_parser/formatting_fr_icons/formatting.html 4 Aug 2012
22:45:46 -0000 1.8
@@ -3685,7 +3685,7 @@
<code>@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr
title="Étude Autonome">É--. ,A.</abbr> (Étude Autonome)
<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="Étude
Autonome">É--. ,A.</abbr>
<code>@asis{--a}</code> --a
-<code>@b{--a}</code> <b>--a</b>
+<code>@b{--a}</code> <b>–a</b>
<code>@cite{--a}</code> <cite>--a</cite>
<code>@code{--a}</code> <code>--a</code>
<code>@command{--a}</code> <code>--a</code>
@@ -3698,18 +3698,18 @@
<code>@emph{--a}</code> <em>--a</em>
<code>@env{--a}</code> <code>--a</code>
<code>@file{--a}</code> <samp>--a</samp>
-<code>@i{--a}</code> <i>--a</i>
+<code>@i{--a}</code> <i>–a</i>
<code>@kbd{--a}</code> <kbd>--a</kbd>
<code>@key{--a}</code> <--a>
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
<code>@option{--a}</code> <samp>--a</samp>
-<code>@r{--a}</code> <span class="roman">--a</span>
+<code>@r{--a}</code> <span class="roman">–a</span>
<code>@samp{--a}</code> ‘<samp>--a</samp>’
<code>@sc{--a}</code> --A
<code>@strong{--a}</code> <strong>--a</strong>
<code>@t{--a}</code> <tt>--a</tt>
-<code>@sansserif{--a}</code> <span class="sansserif">--a</span>
-<code>@slanted{--a}</code> <i>--a</i>
+<code>@sansserif{--a}</code> <span class="sansserif">–a</span>
+<code>@slanted{--a}</code> <i>–a</i>
<code>@titlefont{--a}</code> </pre><h1 class="titlefont">--a</h1><pre
class="example">
<code>@indicateurl{--a}</code> ‘<code>--a</code>’
<code>@uref{--a,--b}</code> <a href="--a">--b</a>
Index: tests/layout/res_parser/formatting_html/formatting.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/layout/res_parser/formatting_html/formatting.html 2 Aug 2012
23:49:27 -0000 1.7
+++ tests/layout/res_parser/formatting_html/formatting.html 4 Aug 2012
22:45:46 -0000 1.8
@@ -3685,7 +3685,7 @@
<code>@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr
title="Étude Autonome">É--. ,A.</abbr> (Étude Autonome)
<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="Étude
Autonome">É--. ,A.</abbr>
<code>@asis{--a}</code> --a
-<code>@b{--a}</code> <b>--a</b>
+<code>@b{--a}</code> <b>–a</b>
<code>@cite{--a}</code> <cite>--a</cite>
<code>@code{--a}</code> <code>--a</code>
<code>@command{--a}</code> <code>--a</code>
@@ -3698,18 +3698,18 @@
<code>@emph{--a}</code> <em>--a</em>
<code>@env{--a}</code> <code>--a</code>
<code>@file{--a}</code> <samp>--a</samp>
-<code>@i{--a}</code> <i>--a</i>
+<code>@i{--a}</code> <i>–a</i>
<code>@kbd{--a}</code> <kbd>--a</kbd>
<code>@key{--a}</code> <--a>
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
<code>@option{--a}</code> <samp>--a</samp>
-<code>@r{--a}</code> <span class="roman">--a</span>
+<code>@r{--a}</code> <span class="roman">–a</span>
<code>@samp{--a}</code> ‘<samp>--a</samp>’
<code>@sc{--a}</code> --A
<code>@strong{--a}</code> <strong>--a</strong>
<code>@t{--a}</code> <tt>--a</tt>
-<code>@sansserif{--a}</code> <span class="sansserif">--a</span>
-<code>@slanted{--a}</code> <i>--a</i>
+<code>@sansserif{--a}</code> <span class="sansserif">–a</span>
+<code>@slanted{--a}</code> <i>–a</i>
<code>@titlefont{--a}</code> </pre><h1 class="titlefont">--a</h1><pre
class="example">
<code>@indicateurl{--a}</code> ‘<code>--a</code>’
<code>@uref{--a,--b}</code> <a href="--a">--b</a>
Index: tests/layout/res_parser/formatting_html32/formatting.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/layout/res_parser/formatting_html32/formatting.html 2 Aug 2012
23:49:27 -0000 1.7
+++ tests/layout/res_parser/formatting_html32/formatting.html 4 Aug 2012
22:45:47 -0000 1.8
@@ -3627,7 +3627,7 @@
<code>@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> É--. ,A.
(Étude Autonome)
<code>@abbr{@'E--. @comma{}A.}</code> É--. ,A.
<code>@asis{--a}</code> --a
-<code>@b{--a}</code> <b>--a</b>
+<code>@b{--a}</code> <b>-a</b>
<code>@cite{--a}</code> <cite>--a</cite>
<code>@code{--a}</code> <code>--a</code>
<code>@command{--a}</code> <code>--a</code>
@@ -3640,18 +3640,18 @@
<code>@emph{--a}</code> <em>--a</em>
<code>@env{--a}</code> <code>--a</code>
<code>@file{--a}</code> <samp>--a</samp>
-<code>@i{--a}</code> <i>--a</i>
+<code>@i{--a}</code> <i>-a</i>
<code>@kbd{--a}</code> <kbd>--a</kbd>
<code>@key{--a}</code> <--a>
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
<code>@option{--a}</code> <samp>--a</samp>
-<code>@r{--a}</code> --a
+<code>@r{--a}</code> -a
<code>@samp{--a}</code> `<samp>--a</samp>'
<code>@sc{--a}</code> --A
<code>@strong{--a}</code> <strong>--a</strong>
<code>@t{--a}</code> <tt>--a</tt>
-<code>@sansserif{--a}</code> --a
-<code>@slanted{--a}</code> <i>--a</i>
+<code>@sansserif{--a}</code> -a
+<code>@slanted{--a}</code> <i>-a</i>
<code>@titlefont{--a}</code> </pre><h1>--a</h1><pre>
<code>@indicateurl{--a}</code> `<code>--a</code>'
<code>@uref{--a,--b}</code> <a href="--a">--b</a>
Index: tests/layout/res_parser/formatting_html_nodes/index.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/index.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- tests/layout/res_parser/formatting_html_nodes/index.html 2 Aug 2012
23:49:27 -0000 1.8
+++ tests/layout/res_parser/formatting_html_nodes/index.html 4 Aug 2012
22:45:47 -0000 1.9
@@ -3686,7 +3686,7 @@
<code>@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr
title="Étude Autonome">É--. ,A.</abbr> (Étude Autonome)
<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="Étude
Autonome">É--. ,A.</abbr>
<code>@asis{--a}</code> --a
-<code>@b{--a}</code> <b>--a</b>
+<code>@b{--a}</code> <b>–a</b>
<code>@cite{--a}</code> <cite>--a</cite>
<code>@code{--a}</code> <code>--a</code>
<code>@command{--a}</code> <code>--a</code>
@@ -3699,18 +3699,18 @@
<code>@emph{--a}</code> <em>--a</em>
<code>@env{--a}</code> <code>--a</code>
<code>@file{--a}</code> <samp>--a</samp>
-<code>@i{--a}</code> <i>--a</i>
+<code>@i{--a}</code> <i>–a</i>
<code>@kbd{--a}</code> <kbd>--a</kbd>
<code>@key{--a}</code> <--a>
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
<code>@option{--a}</code> <samp>--a</samp>
-<code>@r{--a}</code> <span class="roman">--a</span>
+<code>@r{--a}</code> <span class="roman">–a</span>
<code>@samp{--a}</code> ‘<samp>--a</samp>’
<code>@sc{--a}</code> --A
<code>@strong{--a}</code> <strong>--a</strong>
<code>@t{--a}</code> <tt>--a</tt>
-<code>@sansserif{--a}</code> <span class="sansserif">--a</span>
-<code>@slanted{--a}</code> <i>--a</i>
+<code>@sansserif{--a}</code> <span class="sansserif">–a</span>
+<code>@slanted{--a}</code> <i>–a</i>
<code>@titlefont{--a}</code> </pre><h1 class="titlefont">--a</h1><pre
class="example">
<code>@indicateurl{--a}</code> ‘<code>--a</code>’
<code>@uref{--a,--b}</code> <a href="--a">--b</a>
Index: tests/layout/res_parser/formatting_nodes/index.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/index.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- tests/layout/res_parser/formatting_nodes/index.html 2 Aug 2012 23:49:27
-0000 1.8
+++ tests/layout/res_parser/formatting_nodes/index.html 4 Aug 2012 22:45:47
-0000 1.9
@@ -3686,7 +3686,7 @@
<code>@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr
title="Étude Autonome">É--. ,A.</abbr> (Étude Autonome)
<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="Étude
Autonome">É--. ,A.</abbr>
<code>@asis{--a}</code> --a
-<code>@b{--a}</code> <b>--a</b>
+<code>@b{--a}</code> <b>–a</b>
<code>@cite{--a}</code> <cite>--a</cite>
<code>@code{--a}</code> <code>--a</code>
<code>@command{--a}</code> <code>--a</code>
@@ -3699,18 +3699,18 @@
<code>@emph{--a}</code> <em>--a</em>
<code>@env{--a}</code> <code>--a</code>
<code>@file{--a}</code> <samp>--a</samp>
-<code>@i{--a}</code> <i>--a</i>
+<code>@i{--a}</code> <i>–a</i>
<code>@kbd{--a}</code> <kbd>--a</kbd>
<code>@key{--a}</code> <--a>
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
<code>@option{--a}</code> <samp>--a</samp>
-<code>@r{--a}</code> <span class="roman">--a</span>
+<code>@r{--a}</code> <span class="roman">–a</span>
<code>@samp{--a}</code> ‘<samp>--a</samp>’
<code>@sc{--a}</code> --A
<code>@strong{--a}</code> <strong>--a</strong>
<code>@t{--a}</code> <tt>--a</tt>
-<code>@sansserif{--a}</code> <span class="sansserif">--a</span>
-<code>@slanted{--a}</code> <i>--a</i>
+<code>@sansserif{--a}</code> <span class="sansserif">–a</span>
+<code>@slanted{--a}</code> <i>–a</i>
<code>@titlefont{--a}</code> </pre><h1 class="titlefont">--a</h1><pre
class="example">
<code>@indicateurl{--a}</code> ‘<code>--a</code>’
<code>@uref{--a,--b}</code> <a href="--a">--b</a>
Index: tests/layout/res_parser/formatting_plaintext/formatting.1
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_plaintext/formatting.1,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tests/layout/res_parser/formatting_plaintext/formatting.1 31 Jul 2012
19:04:00 -0000 1.5
+++ tests/layout/res_parser/formatting_plaintext/formatting.1 4 Aug 2012
22:45:47 -0000 1.6
@@ -822,7 +822,7 @@
@abbr{@'E--. @comma{}A., @'Etude Autonome } E'--. ,A. (E'tude Autonome)
@abbr{@'E--. @comma{}A.} E'--. ,A.
@asis{--a} --a
- @b{--a} --a
+ @b{--a} -a
@cite{--a} '--a'
@code{--a} --a
@command{--a} --a
@@ -835,18 +835,18 @@
@emph{--a} _--a_
@env{--a} --a
@file{--a} --a
- @i{--a} --a
+ @i{--a} -a
@kbd{--a} --a
@key{--a} <--a>
@math{--a {\frac{1}{2}} @minus{}} --a {\frac{1}{2}} -
@option{--a} --a
- @r{--a} --a
+ @r{--a} -a
@samp{--a} '--a'
@sc{--a} --A
@strong{--a} *--a*
@t{--a} --a
- @sansserif{--a} --a
- @slanted{--a} --a
+ @sansserif{--a} -a
+ @slanted{--a} -a
@titlefont{--a}
-a
*******
Index: tests/layout/res_parser/formatting_regions/formatting_regions.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/layout/res_parser/formatting_regions/formatting_regions.html 2 Aug
2012 23:49:27 -0000 1.7
+++ tests/layout/res_parser/formatting_regions/formatting_regions.html 4 Aug
2012 22:45:47 -0000 1.8
@@ -2934,7 +2934,7 @@
<code>@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr
title="Étude Autonome">É--. ,A.</abbr> (Étude Autonome)
<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="Étude
Autonome">É--. ,A.</abbr>
<code>@asis{--a}</code> --a
-<code>@b{--a}</code> <b>--a</b>
+<code>@b{--a}</code> <b>–a</b>
<code>@cite{--a}</code> <cite>--a</cite>
<code>@code{--a}</code> <code>--a</code>
<code>@command{--a}</code> <code>--a</code>
@@ -2947,18 +2947,18 @@
<code>@emph{--a}</code> <em>--a</em>
<code>@env{--a}</code> <code>--a</code>
<code>@file{--a}</code> <samp>--a</samp>
-<code>@i{--a}</code> <i>--a</i>
+<code>@i{--a}</code> <i>–a</i>
<code>@kbd{--a}</code> <kbd>--a</kbd>
<code>@key{--a}</code> <--a>
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
<code>@option{--a}</code> <samp>--a</samp>
-<code>@r{--a}</code> <span class="roman">--a</span>
+<code>@r{--a}</code> <span class="roman">–a</span>
<code>@samp{--a}</code> ‘<samp>--a</samp>’
<code>@sc{--a}</code> --A
<code>@strong{--a}</code> <strong>--a</strong>
<code>@t{--a}</code> <tt>--a</tt>
-<code>@sansserif{--a}</code> <span class="sansserif">--a</span>
-<code>@slanted{--a}</code> <i>--a</i>
+<code>@sansserif{--a}</code> <span class="sansserif">–a</span>
+<code>@slanted{--a}</code> <i>–a</i>
<code>@titlefont{--a}</code> </pre><h1 class="titlefont">--a</h1><pre
class="example">
<code>@indicateurl{--a}</code> ‘<code>--a</code>’
<code>@uref{--a,--b}</code> <a href="--a">--b</a>
Index: tests/layout/res_parser/formatting_singular/index.htm
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_singular/index.htm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/layout/res_parser/formatting_singular/index.htm 2 Aug 2012
23:49:28 -0000 1.7
+++ tests/layout/res_parser/formatting_singular/index.htm 4 Aug 2012
22:45:47 -0000 1.8
@@ -2305,7 +2305,7 @@
<code>@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr
title="Étude Autonome">É--. ,A.</abbr> (Étude Autonome)
<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="Étude
Autonome">É--. ,A.</abbr>
<code>@asis{--a}</code> --a
-<code>@b{--a}</code> <b>--a</b>
+<code>@b{--a}</code> <b>–a</b>
<code>@cite{--a}</code> <cite>--a</cite>
<code>@code{--a}</code> <code>--a</code>
<code>@command{--a}</code> <code>--a</code>
@@ -2318,7 +2318,7 @@
<code>@emph{--a}</code> <em>--a</em>
<code>@env{--a}</code> <code>--a</code>
<code>@file{--a}</code> <samp>--a</samp>
-<code>@i{--a}</code> <i>--a</i>
+<code>@i{--a}</code> <i>–a</i>
<code>@kbd{--a}</code> <kbd>--a</kbd>
<code>@key{--a}</code> <--a>
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <!-- MATH
@@ -2329,13 +2329,13 @@
SRC="sing_2.png"
ALT="$--a {\frac{1}{2}} @minus{}$"></SPAN>
<code>@option{--a}</code> <samp>--a</samp>
-<code>@r{--a}</code> <span class="roman">--a</span>
+<code>@r{--a}</code> <span class="roman">–a</span>
<code>@samp{--a}</code> ‘<samp>--a</samp>’
<code>@sc{--a}</code> --A
<code>@strong{--a}</code> <strong>--a</strong>
<code>@t{--a}</code> <tt>--a</tt>
-<code>@sansserif{--a}</code> <span class="sansserif">--a</span>
-<code>@slanted{--a}</code> <i>--a</i>
+<code>@sansserif{--a}</code> <span class="sansserif">–a</span>
+<code>@slanted{--a}</code> <i>–a</i>
<code>@titlefont{--a}</code> </pre><h1 class="titlefont">--a</h1><pre
class="example">
<code>@indicateurl{--a}</code> ‘<code>--a</code>’
<code>@uref{--a,--b}</code> <a href="--a">--b</a>
Index: tests/layout/res_parser/formatting_weird_quotes/formatting.html
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/layout/res_parser/formatting_weird_quotes/formatting.html 2 Aug
2012 23:49:28 -0000 1.7
+++ tests/layout/res_parser/formatting_weird_quotes/formatting.html 4 Aug
2012 22:45:47 -0000 1.8
@@ -3685,7 +3685,7 @@
<code>@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr
title="Étude Autonome">É--. ,A.</abbr> (Étude Autonome)
<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="Étude
Autonome">É--. ,A.</abbr>
<code>@asis{--a}</code> --a
-<code>@b{--a}</code> <b>--a</b>
+<code>@b{--a}</code> <b>–a</b>
<code>@cite{--a}</code> <cite>--a</cite>
<code>@code{--a}</code> <code>--a</code>
<code>@command{--a}</code> <code>--a</code>
@@ -3698,18 +3698,18 @@
<code>@emph{--a}</code> <em>--a</em>
<code>@env{--a}</code> <code>--a</code>
<code>@file{--a}</code> <samp>--a</samp>
-<code>@i{--a}</code> <i>--a</i>
+<code>@i{--a}</code> <i>–a</i>
<code>@kbd{--a}</code> <kbd>--a</kbd>
<code>@key{--a}</code> <--a>
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
<code>@option{--a}</code> <samp>--a</samp>
-<code>@r{--a}</code> <span class="roman">--a</span>
+<code>@r{--a}</code> <span class="roman">–a</span>
<code>@samp{--a}</code> @<samp>--a</samp>'‘
<code>@sc{--a}</code> --A
<code>@strong{--a}</code> <strong>--a</strong>
<code>@t{--a}</code> <tt>--a</tt>
-<code>@sansserif{--a}</code> <span class="sansserif">--a</span>
-<code>@slanted{--a}</code> <i>--a</i>
+<code>@sansserif{--a}</code> <span class="sansserif">–a</span>
+<code>@slanted{--a}</code> <i>–a</i>
<code>@titlefont{--a}</code> </pre><h1 class="titlefont">--a</h1><pre
class="example">
<code>@indicateurl{--a}</code> @<code>--a</code>'‘
<code>@uref{--a,--b}</code> <a href="--a">--b</a>
Index: tests/layout/res_parser/formatting_xml/formatting.xml
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/layout/res_parser/formatting_xml/formatting.xml 24 Jan 2012
22:17:09 -0000 1.2
+++ tests/layout/res_parser/formatting_xml/formatting.xml 4 Aug 2012
22:45:47 -0000 1.3
@@ -2665,7 +2665,7 @@
<code>&arobase;abbr{&arobase;'E--. &arobase;comma{}A.,
&arobase;'Etude Autonome }</code> <abbr><abbrword><accent
type="acute">E</accent>--. ,A.</abbrword><abbrdesc><accent
type="acute">E</accent>tude Autonome </abbrdesc></abbr>
<code>&arobase;abbr{&arobase;'E--.
&arobase;comma{}A.}</code> <abbr><abbrword><accent
type="acute">E</accent>--. ,A.</abbrword></abbr>
<code>&arobase;asis{--a}</code> <asis>--a</asis>
-<code>&arobase;b{--a}</code> <b>--a</b>
+<code>&arobase;b{--a}</code> <b>&textndash;a</b>
<code>&arobase;cite{--a}</code> <cite>--a</cite>
<code>&arobase;code{--a}</code> <code>--a</code>
<code>&arobase;command{--a}</code> <command>--a</command>
@@ -2678,18 +2678,18 @@
<code>&arobase;emph{--a}</code> <emph>--a</emph>
<code>&arobase;env{--a}</code> <env>--a</env>
<code>&arobase;file{--a}</code> <file>--a</file>
-<code>&arobase;i{--a}</code> <i>--a</i>
+<code>&arobase;i{--a}</code> <i>&textndash;a</i>
<code>&arobase;kbd{--a}</code> <kbd>--a</kbd>
<code>&arobase;key{--a}</code> <key>--a</key>
<code>&arobase;math{--a
{\frac{1}{2}}
&arobase;minus{}}</code> <math>--a {\frac{1}{2}}
−</math>
<code>&arobase;option{--a}</code> <option>--a</option>
-<code>&arobase;r{--a}</code> <r>--a</r>
+<code>&arobase;r{--a}</code> <r>&textndash;a</r>
<code>&arobase;samp{--a}</code> <samp>--a</samp>
<code>&arobase;sc{--a}</code> <sc>--a</sc>
<code>&arobase;strong{--a}</code> <strong>--a</strong>
<code>&arobase;t{--a}</code> <t>--a</t>
-<code>&arobase;sansserif{--a}</code> <sansserif>--a</sansserif>
-<code>&arobase;slanted{--a}</code> <slanted>--a</slanted>
+<code>&arobase;sansserif{--a}</code>
<sansserif>&textndash;a</sansserif>
+<code>&arobase;slanted{--a}</code>
<slanted>&textndash;a</slanted>
<code>&arobase;titlefont{--a}</code>
</pre><titlefont>--a</titlefont><pre xml:space="preserve">
<code>&arobase;indicateurl{--a}</code>
<indicateurl>--a</indicateurl>
<code>&arobase;uref{--a,--b}</code>
<uref><urefurl>--a</urefurl><urefdesc>--b</urefdesc></uref>
Index: t/results/converters_tests/normal_font_in_monospace.pl
===================================================================
RCS file: t/results/converters_tests/normal_font_in_monospace.pl
diff -N t/results/converters_tests/normal_font_in_monospace.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/converters_tests/normal_font_in_monospace.pl 4 Aug 2012
22:45:44 -0000 1.1
@@ -0,0 +1,286 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'normal_font_in_monospace'} = {
+ 'contents' => [
+ {
+ 'cmdname' => 'example',
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in example '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in r---now '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in co---de'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'r',
+ 'contents' => [],
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'example'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'example',
+ 'text_arg' => 'example'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in command---c '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in r---r '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in file---'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'file',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'r',
+ 'contents' => [],
+ 'line_nr' => {},
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'command',
+ 'contents' => [],
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'normal_font_in_monospace'}{'contents'}[0];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'normal_font_in_monospace'}{'contents'}[0];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'}
=
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'normal_font_in_monospace'}{'contents'}[0];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[2];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[2];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'normal_font_in_monospace'}{'contents'}[0];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'normal_font_in_monospace'}{'contents'}[0];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'extra'}{'end_command'}
= $result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[2];
+$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'parent'} =
$result_trees{'normal_font_in_monospace'};
+$result_trees{'normal_font_in_monospace'}{'contents'}[1]{'parent'} =
$result_trees{'normal_font_in_monospace'};
+$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'args'}[0];
+$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}
=
$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'args'}[0];
+$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0];
+$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'line_nr'}
=
$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'normal_font_in_monospace'}{'contents'}[2];
+$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'normal_font_in_monospace'}{'contents'}[2];
+$result_trees{'normal_font_in_monospace'}{'contents'}[2]{'parent'} =
$result_trees{'normal_font_in_monospace'};
+
+$result_texis{'normal_font_in_monospace'} = '@example
+in example @r{in r---now @code{in co---de}}
address@hidden example
+
address@hidden command---c @r{in r---r @file{in file---}}}.
+';
+
+
+$result_texts{'normal_font_in_monospace'} = 'in example in r---now in co---de
+
+in command---c in r---r in file---.
+';
+
+$result_errors{'normal_font_in_monospace'} = [];
+
+
+
+$result_converted{'plaintext'}->{'normal_font_in_monospace'} = ' in
example in r--now \'in co---de\'
+
+ \'in command---c in r--r \'in file---\'\'.
+';
+
+
+$result_converted{'html_text'}->{'normal_font_in_monospace'} = '<div
class="example">
+<pre class="example">in example <span class="roman">in r—now <code>in
co---de</code></span>
+</pre></div>
+
+<p><code>in command---c <span class="roman">in r—r <samp>in
file---</samp></span></code>.
+</p>';
+
+
+$result_converted{'xml'}->{'normal_font_in_monospace'} = '<example>
+<pre xml:space="preserve">in example <r>in r&textmdash;now <code>in
co---de</code></r>
+</pre></example>
+
+<para><command>in command---c <r>in r&textmdash;r <file>in
file---</file></r></command>.
+</para>';
+
+
+$result_converted{'docbook'}->{'normal_font_in_monospace'} = '<screen>in
example <lineannotation>in r—now <literal>in
co---de</literal></lineannotation>
+</screen>
+<para><command>in command---c <lineannotation>in r—r <filename>in
file---</filename></lineannotation></command>.
+</para>';
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp TODO Texinfo/Convert/DocBook.pm Texi...,
Patrice Dumas <=