texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo ChangeLog tp/Texinfo/Convert/Plaintext....


From: Patrice Dumas
Subject: texinfo ChangeLog tp/Texinfo/Convert/Plaintext....
Date: Tue, 24 Jan 2012 22:17:10 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/01/24 22:17:09

Modified files:
        .              : ChangeLog 
        tp/Texinfo/Convert: Plaintext.pm Unicode.pm XML.pm 
        tp/t/results/converters_tests: accent.pl accentenc.pl 
                                       image_formatting.pl 
                                       inline_expand_tex.pl 
                                       no_documentencoding_and_insertions.pl 
                                       raw_block_commands_expand_tex.pl 
                                       ref_error_formatting.pl 
                                       refs_formatting.pl top_in_ref.pl 
                                       unknown_value.pl 
        tp/t/results/coverage: center.pl commands.pl def.pl math.pl 
                               preformatted.pl table.pl 
                               table_command_comment.pl 
        tp/t/results/coverage_braces: empty_commands.pl kbd.pl nested.pl 
                                      nested_args.pl 
                                      ref_in_style_command.pl test_w.pl 
                                      uref_url.pl 
        tp/t/results/def: all_commands_delimiters.pl 
                          all_commands_delimiters_printindex.pl 
                          inter_item_commands_in_def.pl 
                          inter_item_commands_in_def_in_example.pl 
        tp/t/results/float: complex_float.pl 
        tp/t/results/indices: empty_string_index_entry.pl 
        tp/t/results/info_tests: ref_tests.pl xref_test.pl 
        tp/t/results/invalid_nestings: table_in_code.pl 
        tp/t/results/itemize: w_argument.pl 
        tp/t/results/misc_commands: 
                                    codequoteundirected_codequotebacktick.pl 
                                    test_allowcodebreaks.pl 
        tp/t/results/plaintext_tests: at_commands_glued_in_example.pl 
                                      at_commands_glued_in_paragraph.pl 
                                      code_commands_and_punctuation.pl 
                                      long_uref_after_item.pl 
                                      protect_spaces_on_line.pl 
                                      punctuation_and_code_style_commands.pl 
                                      punctuation_at_end_command.pl 
                                      punctuation_in_command.pl 
                                      punctuation_in_command_end_line.pl 
        tp/t/results/raw: raw_expanded_in_style.pl raw_in_style.pl 
                          verbatim_in_brace_command.pl 
        tp/t/results/sectioning: at_commands_in_refs.pl 
                                 equivalent_nodes.pl 
        tp/t/results/test_count: commands.pl 
        tp/t/results/xtable: accent_on_table_line.pl 
                             inter_item_commands_in_table.pl 
        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/encodings/res_parser/accentenc_info: accentenc.info 
        tp/tests/encodings/res_parser/nodetest_info: nodetest.info 
        tp/tests/encodings/res_parser_info/accent: accent.info 
        tp/tests/encodings/res_parser_info/accentenc: accentenc.info 
        tp/tests/encodings/res_parser_info/accentenc_encoding: 
                                                               accentenc.info 
        tp/tests/encodings/res_parser_info/accentenc_encoding_use_entity: 
                                                                          
accentenc.info 
        tp/tests/encodings/res_parser_info/accentenc_info: 
                                                           accentenc.info 
        tp/tests/encodings/res_parser_info/nodetest_info: nodetest.info 
        tp/tests/encodings/res_parser_info/nodetest_latin1: 
                                                            
nodetest_latin1.info 
        tp/tests/encodings/res_parser_info/nodetest_latin1_use_nodes: 
                                                                      
nodetest_latin1.info 
        tp/tests/encodings/res_parser_info/nodetest_use_nodes: 
                                                               nodetest.info 
        tp/tests/encodings/res_parser_info/nodetest_use_nodes_no_unidecode: 
                                                                            
nodetest.info 
        tp/tests/encodings/res_parser_info/nodetest_utf8: 
                                                          nodetest_utf8.info 
        tp/tests/encodings/res_parser_info/nodetest_utf8_use_nodes: 
                                                                    
nodetest_utf8.info 
        
tp/tests/encodings/res_parser_info/nodetest_utf8_use_nodes_no_unidecode: 
                                                                                
 nodetest_utf8.info 
        tp/tests/layout/res_parser/formatting_plaintext: formatting.1 
        tp/tests/layout/res_parser/formatting_xml: formatting.xml 
        util           : texinfo.dtd 

Log message:
                * tp/Texinfo/Convert/Plaintext.pm, 
tp/Texinfo/Convert/Unicode.pm,
                tp/Texinfo/Convert/XML.pm, util/texinfo.dtd: ` becomes ' in 
plaintext
                to follow the GNU coding standards change.  ` and ' are 
translated
                to unicode characters in XML and when @documentencoding is 
utf-8 and
                enable-encoding is set.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1315&r2=1.1316
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.202&r2=1.203
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Unicode.pm?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/accent.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/accentenc.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/image_formatting.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/inline_expand_tex.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/ref_error_formatting.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/refs_formatting.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/top_in_ref.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/unknown_value.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/center.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/commands.pl?cvsroot=texinfo&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/def.pl?cvsroot=texinfo&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/math.pl?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/preformatted.pl?cvsroot=texinfo&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table_command_comment.pl?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/empty_commands.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/kbd.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/nested.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/nested_args.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/ref_in_style_command.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/test_w.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/uref_url.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands_delimiters.pl?cvsroot=texinfo&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands_delimiters_printindex.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/inter_item_commands_in_def.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/inter_item_commands_in_def_in_example.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/complex_float.pl?cvsroot=texinfo&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/empty_string_index_entry.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/ref_tests.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/xref_test.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/table_in_code.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/w_argument.pl?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/test_allowcodebreaks.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/code_commands_and_punctuation.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/long_uref_after_item.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/protect_spaces_on_line.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/punctuation_at_end_command.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/punctuation_in_command.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/raw_expanded_in_style.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/raw_in_style.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/verbatim_in_brace_command.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/equivalent_nodes.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/test_count/commands.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/accent_on_table_line.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/inter_item_commands_in_table.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser_info/formatting/formatting.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser_info/formatting_fr/formatting.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser_info/formatting_utf8_enable_encoding/formatting_utf8.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser/accentenc_info/accentenc.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser/nodetest_info/nodetest.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser_info/accent/accent.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser_info/accentenc/accentenc.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser_info/accentenc_encoding/accentenc.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser_info/accentenc_encoding_use_entity/accentenc.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser_info/accentenc_info/accentenc.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser_info/nodetest_info/nodetest.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser_info/nodetest_latin1/nodetest_latin1.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser_info/nodetest_latin1_use_nodes/nodetest_latin1.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser_info/nodetest_use_nodes/nodetest.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser_info/nodetest_use_nodes_no_unidecode/nodetest.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser_info/nodetest_utf8/nodetest_utf8.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser_info/nodetest_utf8_use_nodes/nodetest_utf8.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/encodings/res_parser_info/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_plaintext/formatting.1?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/texinfo.dtd?cvsroot=texinfo&r1=1.29&r2=1.30

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1315
retrieving revision 1.1316
diff -u -b -r1.1315 -r1.1316
--- ChangeLog   21 Jan 2012 23:27:52 -0000      1.1315
+++ ChangeLog   24 Jan 2012 22:16:57 -0000      1.1316
@@ -1,3 +1,11 @@
+2012-01-24  Patrice Dumas  <address@hidden>
+
+       * tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/Convert/Unicode.pm,
+       tp/Texinfo/Convert/XML.pm, util/texinfo.dtd: ` becomes ' in plaintext
+       to follow the GNU coding standards change.  ` and ' are translated
+       to unicode characters in XML and when @documentencoding is utf-8 and
+       enable-encoding is set.
+
 2012-01-22  Patrice Dumas  <address@hidden>
 
        * tp/Texinfo/Convert/HTML.pm (_convert_xref_commands), 

Index: tp/Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -b -r1.202 -r1.203
--- tp/Texinfo/Convert/Plaintext.pm     17 Jan 2012 23:40:05 -0000      1.202
+++ tp/Texinfo/Convert/Plaintext.pm     24 Jan 2012 22:16:57 -0000      1.203
@@ -264,7 +264,8 @@
 # Quotes are reset in converter_initialize and unicode quotes are used 
 # if @documentencoding utf-8 is used.
 foreach my $quoted_command (@quoted_commands) {
-  $style_map{$quoted_command} = ['`', "'"];
+  #$style_map{$quoted_command} = ['`', "'"];
+  $style_map{$quoted_command} = ["'", "'"];
 }
 
 $style_map{'key'} = ['<', '>'];
@@ -473,12 +474,14 @@
     $text =~ s/\x{1F}/--/g;
     $text =~ s/``/"/g;
     $text =~ s/\'\'/"/g;
+    $text =~ s/`/'/g;
     if (defined($lower_case_text)) {
       $lower_case_text =~ s/---/\x{1F}/g;
       $lower_case_text =~ s/--/-/g;
       $lower_case_text =~ s/\x{1F}/--/g;
       $lower_case_text =~ s/``/"/g;
       $lower_case_text =~ s/\'\'/"/g;
+      $lower_case_text =~ s/`/'/g;
     }
   }
   return ($text, $lower_case_text);

Index: tp/Texinfo/Convert/Unicode.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Unicode.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- tp/Texinfo/Convert/Unicode.pm       6 Jan 2012 00:20:33 -0000       1.28
+++ tp/Texinfo/Convert/Unicode.pm       24 Jan 2012 22:16:57 -0000      1.29
@@ -1232,6 +1232,8 @@
     $text =~ s/--/\x{2013}/g;
     $text =~ s/``/\x{201C}/g;
     $text =~ s/''/\x{201D}/g;
+    $text =~ s/'/\x{2019}/g;
+    $text =~ s/`/\x{2018}/g;
   }
   return Unicode::Normalize::NFC($text);
 }

Index: tp/Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- tp/Texinfo/Convert/XML.pm   6 Jan 2012 00:20:33 -0000       1.60
+++ tp/Texinfo/Convert/XML.pm   24 Jan 2012 22:16:57 -0000      1.61
@@ -411,6 +411,8 @@
         $result =~ s/\'\'/&textrdquo;/g;
         $result =~ s/---/&textmdash;/g;
         $result =~ s/--/&textndash;/g;
+        $result =~ s/'/&textrsquo;/g;
+        $result =~ s/`/&textlsquo;/g;
       }
     }
     return $result;

Index: tp/t/results/converters_tests/accent.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/converters_tests/accent.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- tp/t/results/converters_tests/accent.pl     3 Jan 2012 23:43:32 -0000       
1.8
+++ tp/t/results/converters_tests/accent.pl     24 Jan 2012 22:16:57 -0000      
1.9
@@ -2971,7 +2971,7 @@
 $result_converted{'plaintext'}->{'accent'} = 'top
 ***
 
-should be e`: e` e`
+should be e\': e` e`
 
    should be e\': e\' e\'
 
@@ -2979,7 +2979,7 @@
 
    should be u": u" u"
 
-   should be i`: i` i`
+   should be i\': i` i`
 
    should be i\': i\' i\'
 
@@ -3029,7 +3029,7 @@
 
    pounds sterling: #
 
-   should be dotless i`: i`
+   should be dotless i\': i`
 
    should be dotless i\': i\'
 
@@ -3037,7 +3037,7 @@
 
    should be dotless i": i"
 
-   should be dotless j`: j`
+   should be dotless j\': j`
 
    should be dotless j\': j\'
 
@@ -3131,17 +3131,17 @@
 $result_converted{'xml'}->{'accent'} = '<node 
name="Top"><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
 <top><sectiontitle>top</sectiontitle>
 
-<para>should be e`: <accent type="grave">e</accent> <accent 
type="grave">e</accent>
+<para>should be e&textlsquo;: <accent type="grave">e</accent> <accent 
type="grave">e</accent>
 </para>
-<para>should be e\': <accent type="acute">e</accent> <accent 
type="acute">e</accent>
+<para>should be e&textrsquo;: <accent type="acute">e</accent> <accent 
type="acute">e</accent>
 </para>
 <para>should be e^: <accent type="circ">e</accent> <accent 
type="circ">e</accent>
 </para>
 <para>should be u&quot;: <accent type="uml">u</accent> <accent 
type="uml">u</accent>
 </para>
-<para>should be i`: <accent type="grave">i</accent> <accent 
type="grave">i</accent>
+<para>should be i&textlsquo;: <accent type="grave">i</accent> <accent 
type="grave">i</accent>
 </para>
-<para>should be i\': <accent type="acute">i</accent> <accent 
type="acute">i</accent>
+<para>should be i&textrsquo;: <accent type="acute">i</accent> <accent 
type="acute">i</accent>
 </para>
 <para>should be i^: <accent type="circ">i</accent> <accent 
type="circ">i</accent>
 </para>
@@ -3153,7 +3153,7 @@
 </para>
 <para>should be e=: <accent type="macr">e</accent> <accent 
type="macr">e</accent>
 </para>
-<para>should be e<w>\'</w>\': <accent type="doubleacute">e</accent> <accent 
type="doubleacute">e</accent>
+<para>should be e<w>&textrsquo;</w>&textrsquo;: <accent 
type="doubleacute">e</accent> <accent type="doubleacute">e</accent>
 </para>
 <para>should be e.: <accent type="dotaccent">e</accent> <accent 
type="dotaccent">e</accent>
 </para>
@@ -3190,18 +3190,18 @@
 <para>pounds sterling: &pound;
 </para>
 <!-- arg is command - @dotless{i} is special-cased for HTML -->
-<para>should be dotless i`: <accent type="grave"><dotless>i</dotless></accent>
+<para>should be dotless i&textlsquo;: <accent 
type="grave"><dotless>i</dotless></accent>
 </para>
-<para>should be dotless i\': <accent type="acute"><dotless>i</dotless></accent>
+<para>should be dotless i&textrsquo;: <accent 
type="acute"><dotless>i</dotless></accent>
 </para>
 <para>should be dotless i^: <accent type="circ"><dotless>i</dotless></accent>
 </para>
 <para>should be dotless i&quot;: <accent 
type="uml"><dotless>i</dotless></accent>
 </para>
 <!-- arg is command - @dotless{j} -->
-<para>should be dotless j`: <accent type="grave"><dotless>j</dotless></accent>
+<para>should be dotless j&textlsquo;: <accent 
type="grave"><dotless>j</dotless></accent>
 </para>
-<para>should be dotless j\': <accent type="acute"><dotless>j</dotless></accent>
+<para>should be dotless j&textrsquo;: <accent 
type="acute"><dotless>j</dotless></accent>
 </para>
 <para>should be dotless j^: <accent type="circ"><dotless>j</dotless></accent>
 </para>

Index: tp/t/results/converters_tests/accentenc.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/converters_tests/accentenc.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tp/t/results/converters_tests/accentenc.pl  3 Jan 2012 23:43:32 -0000       
1.9
+++ tp/t/results/converters_tests/accentenc.pl  24 Jan 2012 22:16:57 -0000      
1.10
@@ -3028,7 +3028,7 @@
 $result_converted{'plaintext'}->{'accentenc'} = 'top
 ***
 
-should be e`: è è
+should be e\': è è
 
    should be e\': é é
 
@@ -3036,7 +3036,7 @@
 
    should be u": ü ü
 
-   should be i`: ì ì
+   should be i\': ì ì
 
    should be i\': í í
 
@@ -3086,7 +3086,7 @@
 
    pounds sterling: £
 
-   should be dotless i`: ì
+   should be dotless i\': ì
 
    should be dotless i\': í
 
@@ -3094,7 +3094,7 @@
 
    should be dotless i": ï
 
-   should be dotless j`: j`
+   should be dotless j\': j`
 
    should be dotless j\': j\'
 
@@ -3191,17 +3191,17 @@
 <node name="Top"><nodename>Top</nodename><nodeup 
automatic="on">(dir)</nodeup></node>
 <top><sectiontitle>top</sectiontitle>
 
-<para>should be e`: <accent type="grave">e</accent> <accent 
type="grave">e</accent>
+<para>should be e&textlsquo;: <accent type="grave">e</accent> <accent 
type="grave">e</accent>
 </para>
-<para>should be e\': <accent type="acute">e</accent> <accent 
type="acute">e</accent>
+<para>should be e&textrsquo;: <accent type="acute">e</accent> <accent 
type="acute">e</accent>
 </para>
 <para>should be e^: <accent type="circ">e</accent> <accent 
type="circ">e</accent>
 </para>
 <para>should be u&quot;: <accent type="uml">u</accent> <accent 
type="uml">u</accent>
 </para>
-<para>should be i`: <accent type="grave">i</accent> <accent 
type="grave">i</accent>
+<para>should be i&textlsquo;: <accent type="grave">i</accent> <accent 
type="grave">i</accent>
 </para>
-<para>should be i\': <accent type="acute">i</accent> <accent 
type="acute">i</accent>
+<para>should be i&textrsquo;: <accent type="acute">i</accent> <accent 
type="acute">i</accent>
 </para>
 <para>should be i^: <accent type="circ">i</accent> <accent 
type="circ">i</accent>
 </para>
@@ -3213,7 +3213,7 @@
 </para>
 <para>should be e=: <accent type="macr">e</accent> <accent 
type="macr">e</accent>
 </para>
-<para>should be e<w>\'</w>\': <accent type="doubleacute">e</accent> <accent 
type="doubleacute">e</accent>
+<para>should be e<w>&textrsquo;</w>&textrsquo;: <accent 
type="doubleacute">e</accent> <accent type="doubleacute">e</accent>
 </para>
 <para>should be e.: <accent type="dotaccent">e</accent> <accent 
type="dotaccent">e</accent>
 </para>
@@ -3250,18 +3250,18 @@
 <para>pounds sterling: &pound;
 </para>
 <!-- arg is command - @dotless{i} is special-cased for HTML -->
-<para>should be dotless i`: <accent type="grave"><dotless>i</dotless></accent>
+<para>should be dotless i&textlsquo;: <accent 
type="grave"><dotless>i</dotless></accent>
 </para>
-<para>should be dotless i\': <accent type="acute"><dotless>i</dotless></accent>
+<para>should be dotless i&textrsquo;: <accent 
type="acute"><dotless>i</dotless></accent>
 </para>
 <para>should be dotless i^: <accent type="circ"><dotless>i</dotless></accent>
 </para>
 <para>should be dotless i&quot;: <accent 
type="uml"><dotless>i</dotless></accent>
 </para>
 <!-- arg is command - @dotless{j} -->
-<para>should be dotless j`: <accent type="grave"><dotless>j</dotless></accent>
+<para>should be dotless j&textlsquo;: <accent 
type="grave"><dotless>j</dotless></accent>
 </para>
-<para>should be dotless j\': <accent type="acute"><dotless>j</dotless></accent>
+<para>should be dotless j&textrsquo;: <accent 
type="acute"><dotless>j</dotless></accent>
 </para>
 <para>should be dotless j^: <accent type="circ"><dotless>j</dotless></accent>
 </para>

Index: tp/t/results/converters_tests/image_formatting.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/image_formatting.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/t/results/converters_tests/image_formatting.pl   11 Jan 2012 00:18:28 
-0000      1.1
+++ tp/t/results/converters_tests/image_formatting.pl   24 Jan 2012 22:16:57 
-0000      1.2
@@ -2775,23 +2775,23 @@
 
 
 
-$result_converted{'plaintext'}->{'image_formatting'} = 'address@hidden' [Image 
description""\\.] address@hidden,l--i}\' [Image description""\\.] 
address@hidden,,l--e}\' [Image description""\\.]
address@hidden,,,alt}\' [Image description""\\.] address@hidden,,,,e-d-xt}\' 
[Image description""\\.]
address@hidden,aze,az,alt,e--xt}\' [Image description""\\.] 
address@hidden,aze,,a--lt}\' [a-lt]
address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} address@hidden' 
[alt] [aaa
+$result_converted{'plaintext'}->{'image_formatting'} = '\'@image{f--ile}\' 
[Image description""\\.] \'@image{f--ile,l--i}\' [Image description""\\.] 
\'@image{f--ile,,l--e}\' [Image description""\\.]
+\'@image{f--ile,,,alt}\' [Image description""\\.] \'@image{f--ile,,,,e-d-xt}\' 
[Image description""\\.]
+\'@image{f--ile,aze,az,alt,e--xt}\' [Image description""\\.] 
\'@image{f-ile,aze,,a--lt}\' [a-lt]
+\'@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden' [alt] [aaa
 bbb
 ccc] [aaa
 bbb
 ccc]
 
-     address@hidden' [Image description""\\.]
-     address@hidden,l--i}\' [Image description""\\.]
-     address@hidden,,l--e}\' [Image description""\\.]
-     address@hidden,,,alt}\' [Image description""\\.]
-     address@hidden,,,,e-d-xt}\' [Image description""\\.]
-     address@hidden,aze,az,alt,e--xt}\' [Image description""\\.]
-     address@hidden,aze,,a--lt}\' [a-lt]
-     address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} 
address@hidden' [alt]
+     \'@image{f--ile}\' [Image description""\\.]
+     \'@image{f--ile,l--i}\' [Image description""\\.]
+     \'@image{f--ile,,l--e}\' [Image description""\\.]
+     \'@image{f--ile,,,alt}\' [Image description""\\.]
+     \'@image{f--ile,,,,e-d-xt}\' [Image description""\\.]
+     \'@image{f--ile,aze,az,alt,e--xt}\' [Image description""\\.]
+     \'@image{f-ile,aze,,a--lt}\' [a-lt]
+     \'@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden' [alt]
      [aaa
 bbb
 ccc] [aaa
@@ -2985,23 +2985,23 @@
 
 File: ,  Node: Top,  Up: (dir)
 
address@hidden' [image src="f--ile.png" text="[Image 
description\\"\\"\\\\.]"] address@hidden,l--i}\' [image src="f--ile.png" 
text="[Image description\\"\\"\\\\.]"] address@hidden,,l--e}\' [image 
src="f--ile.png" text="[Image description\\"\\"\\\\.]"]
address@hidden,,,alt}\' [image src="f--ile.png" alt="alt" text="[Image 
description\\"\\"\\\\.]"] address@hidden,,,,e-d-xt}\' [image 
src="f--ile.png" text="[Image description\\"\\"\\\\.]"]
address@hidden,aze,az,alt,e--xt}\' [image src="f--ile.png" alt="alt" 
text="[Image description\\"\\"\\\\.]"] address@hidden,aze,,a--lt}\' [a-lt]
address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} address@hidden' 
[alt] [aaa
+\'@image{f--ile}\' [image src="f--ile.png" text="[Image 
description\\"\\"\\\\.]"] \'@image{f--ile,l--i}\' [image src="f--ile.png" 
text="[Image description\\"\\"\\\\.]"] \'@image{f--ile,,l--e}\' [image 
src="f--ile.png" text="[Image description\\"\\"\\\\.]"]
+\'@image{f--ile,,,alt}\' [image src="f--ile.png" alt="alt" text="[Image 
description\\"\\"\\\\.]"] \'@image{f--ile,,,,e-d-xt}\' [image 
src="f--ile.png" text="[Image description\\"\\"\\\\.]"]
+\'@image{f--ile,aze,az,alt,e--xt}\' [image src="f--ile.png" alt="alt" 
text="[Image description\\"\\"\\\\.]"] \'@image{f-ile,aze,,a--lt}\' [a-lt]
+\'@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden' [alt] [aaa
 bbb
 ccc] [aaa
 bbb
 ccc]
 
-     address@hidden' [image src="f--ile.png" text="[Image 
description\\"\\"\\\\.]"]
-     address@hidden,l--i}\' [image src="f--ile.png" text="[Image 
description\\"\\"\\\\.]"]
-     address@hidden,,l--e}\' [image src="f--ile.png" text="[Image 
description\\"\\"\\\\.]"]
-     address@hidden,,,alt}\' [image src="f--ile.png" alt="alt" text="[Image 
description\\"\\"\\\\.]"]
-     address@hidden,,,,e-d-xt}\' [image src="f--ile.png" text="[Image 
description\\"\\"\\\\.]"]
-     address@hidden,aze,az,alt,e--xt}\' [image src="f--ile.png" alt="alt" 
text="[Image description\\"\\"\\\\.]"]
-     address@hidden,aze,,a--lt}\' [a-lt]
-     address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} 
address@hidden' [alt]
+     \'@image{f--ile}\' [image src="f--ile.png" text="[Image 
description\\"\\"\\\\.]"]
+     \'@image{f--ile,l--i}\' [image src="f--ile.png" text="[Image 
description\\"\\"\\\\.]"]
+     \'@image{f--ile,,l--e}\' [image src="f--ile.png" text="[Image 
description\\"\\"\\\\.]"]
+     \'@image{f--ile,,,alt}\' [image src="f--ile.png" alt="alt" text="[Image 
description\\"\\"\\\\.]"]
+     \'@image{f--ile,,,,e-d-xt}\' [image src="f--ile.png" text="[Image 
description\\"\\"\\\\.]"]
+     \'@image{f--ile,aze,az,alt,e--xt}\' [image src="f--ile.png" alt="alt" 
text="[Image description\\"\\"\\\\.]"]
+     \'@image{f-ile,aze,,a--lt}\' [a-lt]
+     \'@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden' [alt]
      [aaa
 bbb
 ccc] [aaa

Index: tp/t/results/converters_tests/inline_expand_tex.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/inline_expand_tex.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/t/results/converters_tests/inline_expand_tex.pl  5 Jan 2012 21:03:57 
-0000       1.1
+++ tp/t/results/converters_tests/inline_expand_tex.pl  24 Jan 2012 22:16:57 
-0000      1.2
@@ -801,9 +801,9 @@
 
 
 
-$result_converted{'plaintext'}->{'inline_expand_tex'} = ', , , , $\\underlinea 
< b `tex \\hbox code \'$ "
+$result_converted{'plaintext'}->{'inline_expand_tex'} = ', , , , $\\underlinea 
< b \'tex \\hbox code \'$ "
 
-   , , , , raw $\\underline{a < b `tex \\hbox{ code }\'}$ ``
+   , , , , raw $\\underline{a < b \'tex \\hbox{ code }\'}$ ``
 ';
 
 

Index: tp/t/results/converters_tests/no_documentencoding_and_insertions.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tp/t/results/converters_tests/no_documentencoding_and_insertions.pl 3 Jan 
2012 23:43:32 -0000       1.2
+++ tp/t/results/converters_tests/no_documentencoding_and_insertions.pl 24 Jan 
2012 22:16:57 -0000      1.3
@@ -252,9 +252,9 @@
 
 
 
-$result_converted{'plaintext'}->{'no_documentencoding_and_insertions'} = '- -- 
" " `in code\'.  e~.
+$result_converted{'plaintext'}->{'no_documentencoding_and_insertions'} = '- -- 
" " \'in code\'.  e~.
 
-     -- --- \'\' `` `in code\'. e~.
+     -- --- \'\' `` \'in code\'. e~.
 ';
 
 

Index: tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/t/results/converters_tests/raw_block_commands_expand_tex.pl      5 Jan 
2012 20:24:22 -0000       1.1
+++ tp/t/results/converters_tests/raw_block_commands_expand_tex.pl      24 Jan 
2012 22:16:58 -0000      1.2
@@ -473,7 +473,7 @@
 
 
 
-$result_converted{'plaintext'}->{'raw_block_commands_expand_tex'} = 
'$\\underline{a < b `tex \\hbox{ code }\'}$ ``}
+$result_converted{'plaintext'}->{'raw_block_commands_expand_tex'} = 
'$\\underline{a < b \'tex \\hbox{ code }\'}$ ``}
 ';
 
 

Index: tp/t/results/converters_tests/ref_error_formatting.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/ref_error_formatting.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tp/t/results/converters_tests/ref_error_formatting.pl       21 Jan 2012 
23:27:58 -0000      1.9
+++ tp/t/results/converters_tests/ref_error_formatting.pl       24 Jan 2012 
22:16:58 -0000      1.10
@@ -4750,40 +4750,40 @@
 
 
 
-$result_converted{'plaintext'}->{'ref_error_formatting'} = 'address@hidden' 
*note node::
+$result_converted{'plaintext'}->{'ref_error_formatting'} = '\'@ref{node}\' 
*note node::
 
-   address@hidden,cross ref name}\' *note cross ref name: . 
address@hidden,,title}\' *note
-title: . address@hidden,,,file name}\' *note (file name):: 
address@hidden,,,,manual}\'
-*note ():: address@hidden,cross ref name}\' *note cross ref name: node.
address@hidden,,title}\' *note title: node. address@hidden,,,file name}\' *note
-(file name)node:: address@hidden,,,,manual}\' *note ()node:: 
address@hidden,cross
-ref name,title,}\' *note cross ref name: node. address@hidden,cross ref
+   \'@ref{,cross ref name}\' *note cross ref name: . \'@ref{,,title}\' *note
+title: . \'@ref{,,,file name}\' *note (file name):: \'@ref{,,,,manual}\'
+*note ():: \'@ref{node,cross ref name}\' *note cross ref name: node.
+\'@ref{node,,title}\' *note title: node. \'@ref{node,,,file name}\' *note
+(file name)node:: \'@ref{node,,,,manual}\' *note ()node:: \'@ref{node,cross
+ref name,title,}\' *note cross ref name: node. \'@ref{node,cross ref
 name,,file name}\' *note cross ref name: (file name)node.
address@hidden,cross ref name,,,manual}\' *note cross ref name: ()node.
address@hidden,cross ref name,title,file name}\' *note cross ref name: (file
-name)node. address@hidden,cross ref name,title,,manual}\' *note cross ref
-name: ()node. address@hidden,cross ref name,title, file name, manual}\' *note
-cross ref name: (file name)node. address@hidden,,title,file name}\' *note
-title: (file name)node. address@hidden,,title,,manual}\' *note title: ()node.
address@hidden,,title, file name, manual}\' *note title: (file name)node.
address@hidden,,,file name,manual}\' *note (file name)node:: 
address@hidden,cross ref
-name,title,}\' *note cross ref name: . address@hidden,cross ref name,,file 
name}\'
-*note cross ref name: (file name). address@hidden,cross ref name,,,manual}\'
-*note cross ref name: (). address@hidden,cross ref name,title,file name}\' 
*note
-cross ref name: (file name). address@hidden,cross ref name,title,,manual}\' 
*note
-cross ref name: (). address@hidden,cross ref name,title, file name, manual}\'
-*note cross ref name: (file name). address@hidden,,title,file name}\' *note
-title: (file name). address@hidden,,title,,manual}\' *note title: ().
address@hidden,,title, file name, manual}\' *note title: (file name).
address@hidden,,,file name,manual}\' *note (file name)::
-
-   address@hidden,cross ref name }\' *note cross ref name: . 
address@hidden,,file
-name}\' *note (file name):: address@hidden,cross ref name, file name}\' *note
-cross ref name: (file name). address@hidden' *note ::
-
-   address@hidden, cross ref name, file name}\' *note cross ref name:
-(file name)node. address@hidden' *note node:: address@hidden, cross ref
-name}\' *note cross ref name: node. address@hidden,,file name}\' *note
+\'@ref{node,cross ref name,,,manual}\' *note cross ref name: ()node.
+\'@ref{node,cross ref name,title,file name}\' *note cross ref name: (file
+name)node. \'@ref{node,cross ref name,title,,manual}\' *note cross ref
+name: ()node. \'@ref{node,cross ref name,title, file name, manual}\' *note
+cross ref name: (file name)node. \'@ref{node,,title,file name}\' *note
+title: (file name)node. \'@ref{node,,title,,manual}\' *note title: ()node.
+\'@ref{node,,title, file name, manual}\' *note title: (file name)node.
+\'@ref{node,,,file name,manual}\' *note (file name)node:: \'@ref{,cross ref
+name,title,}\' *note cross ref name: . \'@ref{,cross ref name,,file name}\'
+*note cross ref name: (file name). \'@ref{,cross ref name,,,manual}\'
+*note cross ref name: (). \'@ref{,cross ref name,title,file name}\' *note
+cross ref name: (file name). \'@ref{,cross ref name,title,,manual}\' *note
+cross ref name: (). \'@ref{,cross ref name,title, file name, manual}\'
+*note cross ref name: (file name). \'@ref{,,title,file name}\' *note
+title: (file name). \'@ref{,,title,,manual}\' *note title: ().
+\'@ref{,,title, file name, manual}\' *note title: (file name).
+\'@ref{,,,file name,manual}\' *note (file name)::
+
+   \'@inforef{,cross ref name }\' *note cross ref name: . \'@inforef{,,file
+name}\' *note (file name):: \'@inforef{,cross ref name, file name}\' *note
+cross ref name: (file name). \'@inforef{}\' *note ::
+
+   \'@inforef{node, cross ref name, file name}\' *note cross ref name:
+(file name)node. \'@inforef{node}\' *note node:: \'@inforef{node, cross ref
+name}\' *note cross ref name: node. \'@inforef{node,,file name}\' *note
 (file name)node::
 ';
 

Index: tp/t/results/converters_tests/refs_formatting.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/refs_formatting.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tp/t/results/converters_tests/refs_formatting.pl    3 Jan 2012 23:43:33 
-0000       1.7
+++ tp/t/results/converters_tests/refs_formatting.pl    24 Jan 2012 22:16:58 
-0000      1.8
@@ -4696,44 +4696,44 @@
 $result_converted{'plaintext'}->{'refs_formatting'} = '1 chapter
 *********
 
address@hidden,cross ref name}\' *note cross ref name: chapter.
address@hidden,,title}\' *note title: chapter. address@hidden,,,file name}\'
-*note (file name)chapter:: address@hidden,,,,manual}\' *note ()chapter::
address@hidden,cross ref name,title,}\' *note cross ref name: chapter.
address@hidden,cross ref name,,file name}\' *note cross ref name: (file
-name)chapter. address@hidden,cross ref name,,,manual}\' *note cross ref
-name: ()chapter. address@hidden,cross ref name,title,file name}\' *note
-cross ref name: (file name)chapter. address@hidden,cross ref
+\'@ref{chapter,cross ref name}\' *note cross ref name: chapter.
+\'@ref{chapter,,title}\' *note title: chapter. \'@ref{chapter,,,file name}\'
+*note (file name)chapter:: \'@ref{chapter,,,,manual}\' *note ()chapter::
+\'@ref{chapter,cross ref name,title,}\' *note cross ref name: chapter.
+\'@ref{chapter,cross ref name,,file name}\' *note cross ref name: (file
+name)chapter. \'@ref{chapter,cross ref name,,,manual}\' *note cross ref
+name: ()chapter. \'@ref{chapter,cross ref name,title,file name}\' *note
+cross ref name: (file name)chapter. \'@ref{chapter,cross ref
 name,title,,manual}\' *note cross ref name: ()chapter.
address@hidden,cross ref name,title, file name, manual}\' *note cross ref
-name: (file name)chapter. address@hidden,,title,file name}\' *note title:
-(file name)chapter. address@hidden,,title,,manual}\' *note title:
-()chapter. address@hidden,,title, file name, manual}\' *note title: (file
-name)chapter. address@hidden,,,file name,manual}\' *note (file
+\'@ref{chapter,cross ref name,title, file name, manual}\' *note cross ref
+name: (file name)chapter. \'@ref{chapter,,title,file name}\' *note title:
+(file name)chapter. \'@ref{chapter,,title,,manual}\' *note title:
+()chapter. \'@ref{chapter,,title, file name, manual}\' *note title: (file
+name)chapter. \'@ref{chapter,,,file name,manual}\' *note (file
 name)chapter::
 
-   address@hidden(pman)anode,cross ref name}\' *note cross ref name: 
(pman)anode.
address@hidden(pman)anode,,title}\' *note title: (pman)anode.
address@hidden(pman)anode,,,file name}\' *note (file name)(pman)anode::
address@hidden(pman)anode,,,,manual}\' *note ()(pman)anode::
address@hidden(pman)anode,cross ref name,title,}\' *note cross ref name:
-(pman)anode. address@hidden(pman)anode,cross ref name,,file name}\' *note cross
-ref name: (file name)(pman)anode. address@hidden(pman)anode,cross ref
+   \'@ref{(pman)anode,cross ref name}\' *note cross ref name: (pman)anode.
+\'@ref{(pman)anode,,title}\' *note title: (pman)anode.
+\'@ref{(pman)anode,,,file name}\' *note (file name)(pman)anode::
+\'@ref{(pman)anode,,,,manual}\' *note ()(pman)anode::
+\'@ref{(pman)anode,cross ref name,title,}\' *note cross ref name:
+(pman)anode. \'@ref{(pman)anode,cross ref name,,file name}\' *note cross
+ref name: (file name)(pman)anode. \'@ref{(pman)anode,cross ref
 name,,,manual}\' *note cross ref name: ()(pman)anode.
address@hidden(pman)anode,cross ref name,title,file name}\' *note cross ref 
name:
-(file name)(pman)anode. address@hidden(pman)anode,cross ref 
name,title,,manual}\'
-*note cross ref name: ()(pman)anode. address@hidden(pman)anode,cross ref
+\'@ref{(pman)anode,cross ref name,title,file name}\' *note cross ref name:
+(file name)(pman)anode. \'@ref{(pman)anode,cross ref name,title,,manual}\'
+*note cross ref name: ()(pman)anode. \'@ref{(pman)anode,cross ref
 name,title, file name, manual}\' *note cross ref name: (file
-name)(pman)anode. address@hidden(pman)anode,,title,file name}\' *note title:
-(file name)(pman)anode. address@hidden(pman)anode,,title,,manual}\' *note 
title:
-()(pman)anode. address@hidden(pman)anode,,title, file name, manual}\' *note
-title: (file name)(pman)anode. address@hidden(pman)anode,,,file name,manual}\'
+name)(pman)anode. \'@ref{(pman)anode,,title,file name}\' *note title:
+(file name)(pman)anode. \'@ref{(pman)anode,,title,,manual}\' *note title:
+()(pman)anode. \'@ref{(pman)anode,,title, file name, manual}\' *note
+title: (file name)(pman)anode. \'@ref{(pman)anode,,,file name,manual}\'
 *note (file name)(pman)anode::
 
-   address@hidden, cross ref name, file name}\' *note cross ref name:
-(file name)chapter. address@hidden' *note chapter::
address@hidden, cross ref name}\' *note cross ref name: chapter.
address@hidden,,file name}\' *note (file name)chapter::
+   \'@inforef{chapter, cross ref name, file name}\' *note cross ref name:
+(file name)chapter. \'@inforef{chapter}\' *note chapter::
+\'@inforef{chapter, cross ref name}\' *note cross ref name: chapter.
+\'@inforef{chapter,,file name}\' *note (file name)chapter::
 ';
 
 

Index: tp/t/results/converters_tests/top_in_ref.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/converters_tests/top_in_ref.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/t/results/converters_tests/top_in_ref.pl 21 Jan 2012 23:27:58 -0000      
1.1
+++ tp/t/results/converters_tests/top_in_ref.pl 24 Jan 2012 22:16:58 -0000      
1.2
@@ -4627,40 +4627,40 @@
 
 
 
-$result_converted{'plaintext'}->{'top_in_ref'} = 'address@hidden,cross ref 
name}\' *note cross ref name: Top. address@hidden,,title}\'
-*note title: Top. address@hidden,,,file name}\' *note (file name)Top::
address@hidden,,,,manual}\' *note ()Top:: address@hidden,cross ref 
name,title,}\'
-*note cross ref name: Top. address@hidden,cross ref name,,file name}\' *note
-cross ref name: (file name)Top. address@hidden,cross ref name,,,manual}\'
-*note cross ref name: ()Top. address@hidden,cross ref name,title,file name}\'
-*note cross ref name: (file name)Top. address@hidden,cross ref
-name,title,,manual}\' *note cross ref name: ()Top. address@hidden,cross ref
+$result_converted{'plaintext'}->{'top_in_ref'} = '\'@ref{Top,cross ref name}\' 
*note cross ref name: Top. \'@ref{Top,,title}\'
+*note title: Top. \'@ref{Top,,,file name}\' *note (file name)Top::
+\'@ref{Top,,,,manual}\' *note ()Top:: \'@ref{Top,cross ref name,title,}\'
+*note cross ref name: Top. \'@ref{Top,cross ref name,,file name}\' *note
+cross ref name: (file name)Top. \'@ref{Top,cross ref name,,,manual}\'
+*note cross ref name: ()Top. \'@ref{Top,cross ref name,title,file name}\'
+*note cross ref name: (file name)Top. \'@ref{Top,cross ref
+name,title,,manual}\' *note cross ref name: ()Top. \'@ref{Top,cross ref
 name,title, file name, manual}\' *note cross ref name: (file name)Top.
address@hidden,,title,file name}\' *note title: (file name)Top.
address@hidden,,title,,manual}\' *note title: ()Top. address@hidden,,title, file
-name, manual}\' *note title: (file name)Top. address@hidden,,,file
+\'@ref{Top,,title,file name}\' *note title: (file name)Top.
+\'@ref{Top,,title,,manual}\' *note title: ()Top. \'@ref{Top,,title, file
+name, manual}\' *note title: (file name)Top. \'@ref{Top,,,file
 name,manual}\' *note (file name)Top::
 
-   address@hidden(pman)Top,cross ref name}\' *note cross ref name: (pman)Top.
address@hidden(pman)Top,,title}\' *note title: (pman)Top. 
address@hidden(pman)Top,,,file
-name}\' *note (file name)(pman)Top:: address@hidden(pman)Top,,,,manual}\' *note
-()(pman)Top:: address@hidden(pman)Top,cross ref name,title,}\' *note cross ref
-name: (pman)Top. address@hidden(pman)Top,cross ref name,,file name}\' *note 
cross
-ref name: (file name)(pman)Top. address@hidden(pman)Top,cross ref
-name,,,manual}\' *note cross ref name: ()(pman)Top. 
address@hidden(pman)Top,cross
+   \'@ref{(pman)Top,cross ref name}\' *note cross ref name: (pman)Top.
+\'@ref{(pman)Top,,title}\' *note title: (pman)Top. \'@ref{(pman)Top,,,file
+name}\' *note (file name)(pman)Top:: \'@ref{(pman)Top,,,,manual}\' *note
+()(pman)Top:: \'@ref{(pman)Top,cross ref name,title,}\' *note cross ref
+name: (pman)Top. \'@ref{(pman)Top,cross ref name,,file name}\' *note cross
+ref name: (file name)(pman)Top. \'@ref{(pman)Top,cross ref
+name,,,manual}\' *note cross ref name: ()(pman)Top. \'@ref{(pman)Top,cross
 ref name,title,file name}\' *note cross ref name: (file name)(pman)Top.
address@hidden(pman)Top,cross ref name,title,,manual}\' *note cross ref name:
-()(pman)Top. address@hidden(pman)Top,cross ref name,title, file name, manual}\'
-*note cross ref name: (file name)(pman)Top. address@hidden(pman)Top,,title,file
+\'@ref{(pman)Top,cross ref name,title,,manual}\' *note cross ref name:
+()(pman)Top. \'@ref{(pman)Top,cross ref name,title, file name, manual}\'
+*note cross ref name: (file name)(pman)Top. \'@ref{(pman)Top,,title,file
 name}\' *note title: (file name)(pman)Top.
address@hidden(pman)Top,,title,,manual}\' *note title: ()(pman)Top.
address@hidden(pman)Top,,title, file name, manual}\' *note title: (file
-name)(pman)Top. address@hidden(pman)Top,,,file name,manual}\' *note (file
+\'@ref{(pman)Top,,title,,manual}\' *note title: ()(pman)Top.
+\'@ref{(pman)Top,,title, file name, manual}\' *note title: (file
+name)(pman)Top. \'@ref{(pman)Top,,,file name,manual}\' *note (file
 name)(pman)Top::
 
-   address@hidden, cross ref name, file name}\' *note cross ref name:
-(file name)Top. address@hidden' *note Top:: address@hidden, cross ref
-name}\' *note cross ref name: Top. address@hidden,,file name}\' *note (file
+   \'@inforef{Top, cross ref name, file name}\' *note cross ref name:
+(file name)Top. \'@inforef{Top}\' *note Top:: \'@inforef{Top, cross ref
+name}\' *note cross ref name: Top. \'@inforef{Top,,file name}\' *note (file
 name)Top::
 ';
 

Index: tp/t/results/converters_tests/unknown_value.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/unknown_value.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tp/t/results/converters_tests/unknown_value.pl      3 Jan 2012 23:43:33 
-0000       1.3
+++ tp/t/results/converters_tests/unknown_value.pl      24 Jan 2012 22:16:58 
-0000      1.4
@@ -40,7 +40,7 @@
 
 
 
-$result_converted{'plaintext'}->{'unknown_value'} = '{No value for `unknown\'}
+$result_converted{'plaintext'}->{'unknown_value'} = '{No value for \'unknown\'}
 ';
 
 

Index: tp/t/results/coverage/center.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/center.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- tp/t/results/coverage/center.pl     1 Oct 2011 10:29:26 -0000       1.13
+++ tp/t/results/coverage/center.pl     24 Jan 2012 22:16:58 -0000      1.14
@@ -111,7 +111,7 @@
 
 
 
-$result_converted{'plaintext'}->{'center'} = '                          in 
center `in code\'
+$result_converted{'plaintext'}->{'center'} = '                          in 
center \'in code\'
 
 ';
 

Index: tp/t/results/coverage/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/commands.pl,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- tp/t/results/coverage/commands.pl   3 Dec 2011 14:58:31 -0000       1.51
+++ tp/t/results/coverage/commands.pl   24 Jan 2012 22:16:58 -0000      1.52
@@ -560,7 +560,7 @@
 
 
 
-$result_converted{'plaintext'}->{'commands'} = '@ TeX  e" i^ a~ a* File -> 
Open.  b <a> `code --- -- \'\' ``\' -- - " ".
+$result_converted{'plaintext'}->{'commands'} = '@ TeX  e" i^ a~ a* File -> 
Open.  b <a> \'code --- -- \'\' ``\' -- - " ".
 SMALL CAPS.
 
 majorheading in b

Index: tp/t/results/coverage/def.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/def.pl,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- tp/t/results/coverage/def.pl        3 Dec 2011 14:58:31 -0000       1.60
+++ tp/t/results/coverage/def.pl        24 Jan 2012 22:16:58 -0000      1.61
@@ -2518,7 +2518,7 @@
  -- Command: log trap1
  -- Command: log trap2
  -- cmde: id ule truc
- -- cmde2: id `i\' ule truc
+ -- cmde2: id \'i\' ule truc
  -- : machin
  -- : bidule machin
  -- truc: machin

Index: tp/t/results/coverage/math.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/math.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- tp/t/results/coverage/math.pl       29 Oct 2011 16:38:04 -0000      1.29
+++ tp/t/results/coverage/math.pl       24 Jan 2012 22:16:58 -0000      1.30
@@ -418,9 +418,9 @@
 
 $result_converted{'plaintext'}->{'math'} = 'Simple math --{x^i}\\over{\\tan y}
 
-   Math with @-command `math code\' a < b
+   Math with @-command \'math code\' a < b
 
-   Complex \\underline{`math \\hbox{ code }\'} \\i \\sum_{i}{\\underline{f}}
+   Complex \\underline{\'math \\hbox{ code }\'} \\i \\sum_{i}{\\underline{f}}
 
    @\\ outside of math \\
 

Index: tp/t/results/coverage/preformatted.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/preformatted.pl,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- tp/t/results/coverage/preformatted.pl       3 Dec 2011 14:58:31 -0000       
1.54
+++ tp/t/results/coverage/preformatted.pl       24 Jan 2012 22:16:58 -0000      
1.55
@@ -450,7 +450,7 @@
 
         text
 
-`item in table in format\'
+\'item in table in format\'
 
      in table in format
 ';

Index: tp/t/results/coverage/table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/table.pl,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- tp/t/results/coverage/table.pl      3 Dec 2011 14:58:32 -0000       1.55
+++ tp/t/results/coverage/table.pl      24 Jan 2012 22:16:59 -0000      1.56
@@ -792,8 +792,8 @@
 
      In table
 
-`vtable item\'
-`itemx vtable\'
+\'vtable item\'
+\'itemx vtable\'
 
 ';
 

Index: tp/t/results/coverage/table_command_comment.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/table_command_comment.pl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- tp/t/results/coverage/table_command_comment.pl      18 Sep 2011 17:58:19 
-0000      1.37
+++ tp/t/results/coverage/table_command_comment.pl      24 Jan 2012 22:16:59 
-0000      1.38
@@ -187,7 +187,7 @@
 
 
 
-$result_converted{'plaintext'}->{'table_command_comment'} = '`item\'
+$result_converted{'plaintext'}->{'table_command_comment'} = '\'item\'
 ';
 
 

Index: tp/t/results/coverage_braces/empty_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage_braces/empty_commands.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tp/t/results/coverage_braces/empty_commands.pl      3 Nov 2011 23:54:49 
-0000       1.7
+++ tp/t/results/coverage_braces/empty_commands.pl      24 Jan 2012 22:16:59 
-0000      1.8
@@ -263,7 +263,7 @@
 
 
 
-$result_converted{'plaintext'}->{'empty_commands'} = '`\'(1) ~
+$result_converted{'plaintext'}->{'empty_commands'} = '\'\'(1) ~
 
    ---------- Footnotes ----------
 

Index: tp/t/results/coverage_braces/kbd.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/kbd.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- tp/t/results/coverage_braces/kbd.pl 13 Aug 2011 15:33:07 -0000      1.8
+++ tp/t/results/coverage_braces/kbd.pl 24 Jan 2012 22:16:59 -0000      1.9
@@ -551,21 +551,21 @@
 
 
 
-$result_converted{'plaintext'}->{'kbd'} = 'kbd: `in kbd\'.
+$result_converted{'plaintext'}->{'kbd'} = 'kbd: \'in kbd\'.
 
-   kbd in code: `in first `in nested kbd\'\'.
+   kbd in code: \'in first \'in nested kbd\'\'.
 
-   kbd in kbd: `in top kbd `in nested kbd\'\'.
+   kbd in kbd: \'in top kbd \'in nested kbd\'\'.
 
    kbd in @example:
 
      in example
-     `in example in kbd\'.
+     \'in example in kbd\'.
 
    kbd in @format:
 
 in format
-`in format in kbd\'.
+\'in format in kbd\'.
 ';
 
 

Index: tp/t/results/coverage_braces/nested.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/nested.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- tp/t/results/coverage_braces/nested.pl      13 Aug 2011 15:33:07 -0000      
1.20
+++ tp/t/results/coverage_braces/nested.pl      24 Jan 2012 22:16:59 -0000      
1.21
@@ -84,7 +84,7 @@
 
 
 
-$result_converted{'plaintext'}->{'nested'} = 'type the characters `l o g o u t 
<RET>\'.
+$result_converted{'plaintext'}->{'nested'} = 'type the characters \'l o g o u 
t <RET>\'.
 ';
 
 

Index: tp/t/results/coverage_braces/nested_args.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/nested_args.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- tp/t/results/coverage_braces/nested_args.pl 13 Aug 2011 20:19:11 -0000      
1.28
+++ tp/t/results/coverage_braces/nested_args.pl 24 Jan 2012 22:16:59 -0000      
1.29
@@ -244,7 +244,7 @@
 
 
 
-$result_converted{'plaintext'}->{'nested_args'} = '*Note descr in b: 
(`manual\')@ `in samp\'.
+$result_converted{'plaintext'}->{'nested_args'} = '*Note descr in b: 
(\'manual\')@ \'in samp\'.
 ';
 
 

Index: tp/t/results/coverage_braces/ref_in_style_command.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage_braces/ref_in_style_command.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tp/t/results/coverage_braces/ref_in_style_command.pl        13 Aug 2011 
20:19:11 -0000      1.10
+++ tp/t/results/coverage_braces/ref_in_style_command.pl        24 Jan 2012 
22:16:59 -0000      1.11
@@ -99,7 +99,7 @@
 
 
 
-$result_converted{'plaintext'}->{'ref_in_style_command'} = '`*note 
(manula)other node::\'.
+$result_converted{'plaintext'}->{'ref_in_style_command'} = '\'*note 
(manula)other node::\'.
 ';
 
 

Index: tp/t/results/coverage_braces/test_w.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/test_w.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tp/t/results/coverage_braces/test_w.pl      16 Sep 2011 22:23:17 -0000      
1.9
+++ tp/t/results/coverage_braces/test_w.pl      24 Jan 2012 22:16:59 -0000      
1.10
@@ -941,7 +941,7 @@
 
    aaf   bbb.
 
-   begin and end quotations: ``...\'\'.  This convention should be
+   begin and end quotations: \'\'...\'\'.  This convention should be
 followed in Texinfo files.  TeX converts two single quotes to left- and
 right-hand doubled.
 ';

Index: tp/t/results/coverage_braces/uref_url.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/uref_url.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- tp/t/results/coverage_braces/uref_url.pl    14 Aug 2011 01:52:00 -0000      
1.12
+++ tp/t/results/coverage_braces/uref_url.pl    24 Jan 2012 22:16:59 -0000      
1.13
@@ -559,7 +559,7 @@
 
 
 
-$result_converted{'plaintext'}->{'uref_url'} = '-b (--a) `--c\' -d -g -i -k -l 
-n (--m) -q
+$result_converted{'plaintext'}->{'uref_url'} = '-b (--a) \'--c\' -d -g -i -k 
-l -n (--m) -q
 ';
 
 

Index: tp/t/results/def/all_commands_delimiters.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/all_commands_delimiters.pl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- tp/t/results/def/all_commands_delimiters.pl 3 Dec 2011 14:58:32 -0000       
1.33
+++ tp/t/results/def/all_commands_delimiters.pl 24 Jan 2012 22:16:59 -0000      
1.34
@@ -16795,84 +16795,84 @@
  -- Class Option of Window: border-pattern (arg in brace, [something IN
           V--AR, in, b , comma aPREF p]) last
 
- -- Class Option2 of Window: `int\' border-pattern (arg in brace,
+ -- Class Option2 of Window: \'int\' border-pattern (arg in brace,
           [something IN V--AR, in, b , comma aPREF p]) last
 
  -- Operation on windows: expose (arg in brace, [something IN V--AR, in,
           b , comma aPREF p]) last
 
- -- Operation2 on W,indow: `int\' expose (arg in brace, [something IN
+ -- Operation2 on W,indow: \'int\' expose (arg in brace, [something IN
           V--AR, in, b , comma aPREF p]) last
 
- -- Operation5 on Window: `int\' expose type arg
+ -- Operation5 on Window: \'int\' expose type arg
 
- -- Operation3 on W,indow: `int\' e,xpose type arg
+ -- Operation3 on W,indow: \'int\' e,xpose type arg
 
- -- Operation4 on ,Window: `int\' ,expose type arg
+ -- Operation4 on ,Window: \'int\' ,expose type arg
 
- -- Operation6 on W,indow: `int\' e,xpose type arg
+ -- Operation6 on W,indow: \'int\' e,xpose type arg
 
- -- Operation7 on ,Window: `int\' ,expose type arg
+ -- Operation7 on ,Window: \'int\' ,expose type arg
 
- -- Operation13 on W)indow: `int\' e)xpose type arg
+ -- Operation13 on W)indow: \'int\' e)xpose type arg
 
- -- Operation14 on )Window: `int\' )expose type arg
+ -- Operation14 on )Window: \'int\' )expose type arg
 
- -- Operation16 on W)indow: `int\' e)xpose type arg
+ -- Operation16 on W)indow: \'int\' e)xpose type arg
 
- -- Operation17 on )Window: `int\' )expose type arg
+ -- Operation17 on )Window: \'int\' )expose type arg
 
- -- Operation18 on W;indow: `int\' e;xpose type arg
+ -- Operation18 on W;indow: \'int\' e;xpose type arg
 
- -- Operation19 on ;Window: `int\' ;expose type arg
+ -- Operation19 on ;Window: \'int\' ;expose type arg
 
- -- Operation20 on W;indow: `int\' e;xpose type arg
+ -- Operation20 on W;indow: \'int\' e;xpose type arg
 
- -- Operation21 on ;Window: `int\' ;expose type arg
+ -- Operation21 on ;Window: \'int\' ;expose type arg
 
- -- Command on `com\': Window`int\' expose EXP name
+ -- Command on \'com\': Window\'int\' expose EXP name
 
  -- Function: apply function &rest arguments
 
  -- A1: A2 A3 A4
 
- -- `A1\': `A2\' `A3\' `A4\'
+ -- \'A1\': \'A2\' \'A3\' \'A4\'
 
  -- A1: A2 A3 A4
 
- -- `A1\': `A2\' `A3\' `A4\'
+ -- \'A1\': \'A2\' \'A3\' \'A4\'
 
  -- A1: A2 A3 A4 A5
 
- -- `A1\': `A2\' `A3\' `A4\' `A5\'
+ -- \'A1\': \'A2\' \'A3\' \'A4\' \'A5\'
 
  -- A1: A2 A3 A4 A5
 
- -- `A1\': A2 `A3\' `A4\' `A5\'
+ -- \'A1\': A2 \'A3\' \'A4\' \'A5\'
 
  -- A1: A2 A3 A4
 
- -- `A1\': `A2\' `A3\' `A4\'
+ -- \'A1\': \'A2\' \'A3\' \'A4\'
 
  -- A1 of A2: A3 A4 A5
 
- -- `A1\': `A2\' `A3\' `A4\' `A5\'
+ -- \'A1\': \'A2\' \'A3\' \'A4\' \'A5\'
 
  -- A1 of A2: A3 A4 A5 A6
 
- -- `A1\' of `A2\': `A3\' `A4\' `A5\' `A6\'
+ -- \'A1\' of \'A2\': \'A3\' \'A4\' \'A5\' \'A6\'
 
  -- A1 on A2: A3 A4 A5
 
- -- `A1\' on `A2\': `A3\' `A4\' `A5\'
+ -- \'A1\' on \'A2\': \'A3\' \'A4\' \'A5\'
 
  -- A1 on A2: A3 A4 A5 A6
 
- -- `A1\' on `A2\': `A3\' `A4\' `A5\' `A6\'
+ -- \'A1\' on \'A2\': \'A3\' \'A4\' \'A5\' \'A6\'
 
- -- code then var: ret_type fun_name `A1\' A2 `A3\' A4
+ -- code then var: ret_type fun_name \'A1\' A2 \'A3\' A4
 
- -- var then code: ret_type1 fun_name1 A1 `A2\' A3 `A4\'
+ -- var then code: ret_type1 fun_name1 A1 \'A2\' A3 \'A4\'
 ';
 
 1;

Index: tp/t/results/def/all_commands_delimiters_printindex.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/all_commands_delimiters_printindex.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- tp/t/results/def/all_commands_delimiters_printindex.pl      10 Jan 2012 
22:51:46 -0000      1.25
+++ tp/t/results/def/all_commands_delimiters_printindex.pl      24 Jan 2012 
22:16:59 -0000      1.26
@@ -16883,84 +16883,84 @@
  -- Class Option of Window: border-pattern (arg in brace, [something IN
           V--AR, in, b , comma aPREF p]) last
 
- -- Class Option2 of Window: `int\' border-pattern (arg in brace,
+ -- Class Option2 of Window: \'int\' border-pattern (arg in brace,
           [something IN V--AR, in, b , comma aPREF p]) last
 
  -- Operation on windows: expose (arg in brace, [something IN V--AR, in,
           b , comma aPREF p]) last
 
- -- Operation2 on W,indow: `int\' expose (arg in brace, [something IN
+ -- Operation2 on W,indow: \'int\' expose (arg in brace, [something IN
           V--AR, in, b , comma aPREF p]) last
 
- -- Operation5 on Window: `int\' expose type arg
+ -- Operation5 on Window: \'int\' expose type arg
 
- -- Operation3 on W,indow: `int\' e,xpose type arg
+ -- Operation3 on W,indow: \'int\' e,xpose type arg
 
- -- Operation4 on ,Window: `int\' ,expose type arg
+ -- Operation4 on ,Window: \'int\' ,expose type arg
 
- -- Operation6 on W,indow: `int\' e,xpose type arg
+ -- Operation6 on W,indow: \'int\' e,xpose type arg
 
- -- Operation7 on ,Window: `int\' ,expose type arg
+ -- Operation7 on ,Window: \'int\' ,expose type arg
 
- -- Operation13 on W)indow: `int\' e)xpose type arg
+ -- Operation13 on W)indow: \'int\' e)xpose type arg
 
- -- Operation14 on )Window: `int\' )expose type arg
+ -- Operation14 on )Window: \'int\' )expose type arg
 
- -- Operation16 on W)indow: `int\' e)xpose type arg
+ -- Operation16 on W)indow: \'int\' e)xpose type arg
 
- -- Operation17 on )Window: `int\' )expose type arg
+ -- Operation17 on )Window: \'int\' )expose type arg
 
- -- Operation18 on W;indow: `int\' e;xpose type arg
+ -- Operation18 on W;indow: \'int\' e;xpose type arg
 
- -- Operation19 on ;Window: `int\' ;expose type arg
+ -- Operation19 on ;Window: \'int\' ;expose type arg
 
- -- Operation20 on W;indow: `int\' e;xpose type arg
+ -- Operation20 on W;indow: \'int\' e;xpose type arg
 
- -- Operation21 on ;Window: `int\' ;expose type arg
+ -- Operation21 on ;Window: \'int\' ;expose type arg
 
- -- Command on `com\': Window`int\' expose EXP name
+ -- Command on \'com\': Window\'int\' expose EXP name
 
  -- Function: apply function &rest arguments
 
  -- A1: A2 A3 A4
 
- -- `A1\': `A2\' `A3\' `A4\'
+ -- \'A1\': \'A2\' \'A3\' \'A4\'
 
  -- A1: A2 A3 A4
 
- -- `A1\': `A2\' `A3\' `A4\'
+ -- \'A1\': \'A2\' \'A3\' \'A4\'
 
  -- A1: A2 A3 A4 A5
 
- -- `A1\': `A2\' `A3\' `A4\' `A5\'
+ -- \'A1\': \'A2\' \'A3\' \'A4\' \'A5\'
 
  -- A1: A2 A3 A4 A5
 
- -- `A1\': A2 `A3\' `A4\' `A5\'
+ -- \'A1\': A2 \'A3\' \'A4\' \'A5\'
 
  -- A1: A2 A3 A4
 
- -- `A1\': `A2\' `A3\' `A4\'
+ -- \'A1\': \'A2\' \'A3\' \'A4\'
 
  -- A1 of A2: A3 A4 A5
 
- -- `A1\': `A2\' `A3\' `A4\' `A5\'
+ -- \'A1\': \'A2\' \'A3\' \'A4\' \'A5\'
 
  -- A1 of A2: A3 A4 A5 A6
 
- -- `A1\' of `A2\': `A3\' `A4\' `A5\' `A6\'
+ -- \'A1\' of \'A2\': \'A3\' \'A4\' \'A5\' \'A6\'
 
  -- A1 on A2: A3 A4 A5
 
- -- `A1\' on `A2\': `A3\' `A4\' `A5\'
+ -- \'A1\' on \'A2\': \'A3\' \'A4\' \'A5\'
 
  -- A1 on A2: A3 A4 A5 A6
 
- -- `A1\' on `A2\': `A3\' `A4\' `A5\' `A6\'
+ -- \'A1\' on \'A2\': \'A3\' \'A4\' \'A5\' \'A6\'
 
- -- code then var: ret_type fun_name `A1\' A2 `A3\' A4
+ -- code then var: ret_type fun_name \'A1\' A2 \'A3\' A4
 
- -- var then code: ret_type1 fun_name1 A1 `A2\' A3 `A4\'
+ -- var then code: ret_type1 fun_name1 A1 \'A2\' A3 \'A4\'
 
 Functions
 =========
@@ -16975,13 +16975,13 @@
 * ;expose on ;Window:                    Top.                 (line  59)
 * ;expose on ;Window <1>:                Top.                 (line  63)
 * A2:                                    Top.                 (line  69)
-* `A2\':                                  Top.                 (line  71)
+* \'A2\':                                  Top.                 (line  71)
 * A3:                                    Top.                 (line  77)
-* `A3\':                                  Top.                 (line  79)
+* \'A3\':                                  Top.                 (line  79)
 * A3 on A2:                              Top.                 (line  97)
-* `A3\' on `A2\':                          Top.                 (line  99)
+* \'A3\' on \'A2\':                          Top.                 (line  99)
 * A4 on A2:                              Top.                 (line 101)
-* `A4\' on `A2\':                          Top.                 (line 103)
+* \'A4\' on \'A2\':                          Top.                 (line 103)
 * apply:                                 Top.                 (line  67)
 * e)xpose on W)indow:                    Top.                 (line  49)
 * e)xpose on W)indow <1>:                Top.                 (line  53)
@@ -16989,7 +16989,7 @@
 * e,xpose on W,indow <1>:                Top.                 (line  45)
 * e;xpose on W;indow:                    Top.                 (line  57)
 * e;xpose on W;indow <1>:                Top.                 (line  61)
-* expose on `com\':                       Top.                 (line  65)
+* expose on \'com\':                       Top.                 (line  65)
 * expose on W,indow:                     Top.                 (line  36)
 * expose on Window:                      Top.                 (line  39)
 * expose on windows:                     Top.                 (line  33)
@@ -17008,8 +17008,8 @@
 * Menu:
 
 * A2:                                    Top.                  (line 85)
-* `A2\':                                  Top.                  (line 87)
-* `A2\' <1>:                              Top.                  (line 91)
+* \'A2\':                                  Top.                  (line 87)
+* \'A2\' <1>:                              Top.                  (line 91)
 * pair:                                  Top.                  (line 24)
 
 Variables
@@ -17019,12 +17019,12 @@
 * Menu:
 
 * A2:                                    Top.                  (line 73)
-* `A2\':                                  Top.                  (line 75)
+* \'A2\':                                  Top.                  (line 75)
 * A3:                                    Top.                  (line 81)
-* `A3\':                                  Top.                  (line 83)
+* \'A3\':                                  Top.                  (line 83)
 * A3 <1>:                                Top.                  (line 89)
 * A4 of A2:                              Top.                  (line 93)
-* `A4\' of `A2\':                          Top.                  (line 95)
+* \'A4\' of \'A2\':                          Top.                  (line 95)
 * border-pattern:                        Top.                  (line 27)
 * border-pattern of Window:              Top.                  (line 30)
 * enable:                                Top.                  (line 21)

Index: tp/t/results/def/inter_item_commands_in_def.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/inter_item_commands_in_def.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- tp/t/results/def/inter_item_commands_in_def.pl      3 Dec 2011 14:58:34 
-0000       1.15
+++ tp/t/results/def/inter_item_commands_in_def.pl      24 Jan 2012 22:17:00 
-0000      1.16
@@ -765,7 +765,7 @@
 $result_converted{'plaintext'}->{'inter_item_commands_in_def'} = ' -- fset: I 
a g
 
  -- Command: log trap1
- -- cmde2: id `i\' ule truc
+ -- cmde2: id \'i\' ule truc
 
      In deff item.
 ';

Index: tp/t/results/def/inter_item_commands_in_def_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/inter_item_commands_in_def_in_example.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tp/t/results/def/inter_item_commands_in_def_in_example.pl   3 Dec 2011 
14:58:34 -0000       1.3
+++ tp/t/results/def/inter_item_commands_in_def_in_example.pl   24 Jan 2012 
22:17:00 -0000      1.4
@@ -855,7 +855,7 @@
 $result_converted{'plaintext'}->{'inter_item_commands_in_def_in_example'} = '  
    -- fset: I a g
 
       -- Command: log trap1
-      -- cmde2: id `i\' ule truc
+      -- cmde2: id \'i\' ule truc
 
           In deff item.
 ';

Index: tp/t/results/float/complex_float.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/complex_float.pl,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- tp/t/results/float/complex_float.pl 9 Jan 2012 22:07:15 -0000       1.34
+++ tp/t/results/float/complex_float.pl 24 Jan 2012 22:17:00 -0000      1.35
@@ -5270,7 +5270,7 @@
 
 * Menu:
 
-* Text 1: text with a lot of features.   TeX and _te\'i^`an_url\'_ AND ...
+* Text 1: text with a lot of features.   TeX and _te\'i^\'an_url\'_ AND ...
 * Text 1.1: float with a lot of features and no shortcaption.
                                          An example of float ...
 
@@ -5292,7 +5292,7 @@
 
 A ref.  *Note xref Text with features: Top.  A footnote.  (1).
 
-TeX and _te\'i^`an_url\'_ AND it is @verb  a word !@ AE.
+TeX and _te\'i^\'an_url\'_ AND it is @verb  a word !@ AE.
 
 Text 1: An example of float caption...  An example.
      example
@@ -5311,7 +5311,7 @@
 
 A ref.  *Note xref Text with features caption: Top.  A footnote.  (2).
 
-TeX and _te\'i^`an_url\'_ AND it is @verb  a word !@ AE.
+TeX and _te\'i^\'an_url\'_ AND it is @verb  a word !@ AE.
 
    ---------- Footnotes ----------
 
@@ -5344,7 +5344,7 @@
 A ref 2.  *Note xref Text with features caption: Top.  A footnote 2.
 (1).
 
-TeX and _te\'i^`an_url\'_ AND it is @verb  a word !@ AE.
+TeX and _te\'i^\'an_url\'_ AND it is @verb  a word !@ AE.
 
 *Note Text 1: text with a lot of features.
 

Index: tp/t/results/indices/empty_string_index_entry.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/empty_string_index_entry.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tp/t/results/indices/empty_string_index_entry.pl    7 Jan 2012 15:20:11 
-0000       1.2
+++ tp/t/results/indices/empty_string_index_entry.pl    24 Jan 2012 22:17:00 
-0000      1.3
@@ -928,7 +928,7 @@
 
 File: ,  Node: Top,  Up: (dir)
 
-`\'
+\'\'
 
  -- Function: 
  -- Function: 

Index: tp/t/results/info_tests/ref_tests.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/info_tests/ref_tests.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- tp/t/results/info_tests/ref_tests.pl        1 Nov 2011 12:26:07 -0000       
1.12
+++ tp/t/results/info_tests/ref_tests.pl        24 Jan 2012 22:17:00 -0000      
1.13
@@ -698,10 +698,10 @@
 File: ,  Node: Top,  Up: (dir)
 
 *note (m)in ref followed by comma::, *note (m)in ref not followed by
-comma:: after ref.  `*note (m)in ref followed by end command::\'.
+comma:: after ref.  \'*note (m)in ref followed by end command::\'.
 
    *note name: (m)in ref followed by comma, *note name: (m)in ref not
-followed by comma. after ref.  `*note name: (m)in ref followed by end
+followed by comma. after ref.  \'*note name: (m)in ref followed by end
 command.\'.  *note name: (m)in ref ending with a dot. after ref.
 
 

Index: tp/t/results/info_tests/xref_test.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/info_tests/xref_test.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tp/t/results/info_tests/xref_test.pl        1 Nov 2011 12:26:08 -0000       
1.10
+++ tp/t/results/info_tests/xref_test.pl        24 Jan 2012 22:17:00 -0000      
1.11
@@ -464,7 +464,7 @@
 
 File: ,  Node: Top,  Up: (dir)
 
-*Note (m)in xref::.  *Note (m)bad xref::.  after xref.  `*Note (m)bad
+*Note (m)in xref::.  *Note (m)bad xref::.  after xref.  \'*Note (m)bad
 nested xref::.\'.  *Note name: (m)in ref ending with a dot..  !  after
 xref and dot inside.  *Note (m)in ref followed by symbol::.# g.
 

Index: tp/t/results/invalid_nestings/table_in_code.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/table_in_code.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- tp/t/results/invalid_nestings/table_in_code.pl      29 Oct 2011 14:44:50 
-0000      1.13
+++ tp/t/results/invalid_nestings/table_in_code.pl      24 Jan 2012 22:17:01 
-0000      1.14
@@ -290,7 +290,7 @@
 
 
 
-$result_converted{'plaintext'}->{'table_in_code'} = '` in code \'
+$result_converted{'plaintext'}->{'table_in_code'} = '\' in code \'
 ';
 
 1;

Index: tp/t/results/itemize/w_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/w_argument.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- tp/t/results/itemize/w_argument.pl  11 Jan 2012 19:22:56 -0000      1.30
+++ tp/t/results/itemize/w_argument.pl  24 Jan 2012 22:17:01 -0000      1.31
@@ -260,8 +260,8 @@
 
 
 
-$result_converted{'plaintext'}->{'w_argument'} = '     `--build=\' platform on 
which the program is compiled,
-     `--target=\' target platform on which the program is processed.
+$result_converted{'plaintext'}->{'w_argument'} = '     \'--build=\' platform 
on which the program is compiled,
+     \'--target=\' target platform on which the program is processed.
 ';
 
 

Index: tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 1 Oct 
2011 10:29:30 -0000       1.11
+++ tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 24 Jan 
2012 22:17:01 -0000      1.12
@@ -5250,72 +5250,72 @@
 $result_converted{'plaintext'}->{'codequoteundirected_codequotebacktick'} = 
'test quotes
 ***********
 
-"simple-double-three--four---" `simple\' quotedblleft: ``
-code: ```simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
-asis: "simple-double-three--four---" `simple\' quotedblleft: ``
-strong: *"simple-double-three--four---" `simple\' quotedblleft: ``*
-kbd: ```simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
-samp: ```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: ``
+strong: *"simple-double-three--four---" \'simple\' quotedblleft: ``*
+kbd: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
+samp: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
 
      @codequoteundirected on
      @codequotebacktick on
-   "simple-double-three--four---" `simple\' quotedblleft: ``
-code: ```simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
-asis: "simple-double-three--four---" `simple\' quotedblleft: ``
-strong: *"simple-double-three--four---" `simple\' quotedblleft: ``*
-kbd: ```simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
-samp: ```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: ``
+strong: *"simple-double-three--four---" \'simple\' quotedblleft: ``*
+kbd: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
+samp: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
 
      @codequoteundirected off
      @codequotebacktick off
-   "simple-double-three--four---" `simple\' quotedblleft: ``
-code: ```simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
-asis: "simple-double-three--four---" `simple\' quotedblleft: ``
-strong: *"simple-double-three--four---" `simple\' quotedblleft: ``*
-kbd: ```simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
-samp: ```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: ``
+strong: *"simple-double-three--four---" \'simple\' quotedblleft: ``*
+kbd: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
+samp: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
 
      ``simple-double--three---four----\'\' `simple\' quotedblleft: `` 
 
-     code: ```simple-double--three---four----\'\' `simple\' quotedblleft: ``\' 
+     code: \'``simple-double--three---four----\'\' `simple\' quotedblleft: 
``\' 
 
      asis: ``simple-double--three---four----\'\' `simple\' quotedblleft: `` 
 
      strong: *``simple-double--three---four----\'\' `simple\' quotedblleft: 
``* 
 
-     kbd: ```simple-double--three---four----\'\' `simple\' quotedblleft: ``\' 
+     kbd: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\' 
 
-     samp: ```simple-double--three---four----\'\' `simple\' quotedblleft: ``\' 
+     samp: \'``simple-double--three---four----\'\' `simple\' quotedblleft: 
``\' 
 
 
           @codequoteundirected on
           @codequotebacktick on
      ``simple-double--three---four----\'\' `simple\' quotedblleft: `` 
 
-     code: ```simple-double--three---four----\'\' `simple\' quotedblleft: ``\' 
+     code: \'``simple-double--three---four----\'\' `simple\' quotedblleft: 
``\' 
 
      asis: ``simple-double--three---four----\'\' `simple\' quotedblleft: `` 
 
      strong: *``simple-double--three---four----\'\' `simple\' quotedblleft: 
``* 
 
-     kbd: ```simple-double--three---four----\'\' `simple\' quotedblleft: ``\' 
+     kbd: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\' 
 
-     samp: ```simple-double--three---four----\'\' `simple\' quotedblleft: ``\' 
+     samp: \'``simple-double--three---four----\'\' `simple\' quotedblleft: 
``\' 
 
 
           @codequoteundirected off
           @codequotebacktick off
      ``simple-double--three---four----\'\' `simple\' quotedblleft: `` 
 
-     code: ```simple-double--three---four----\'\' `simple\' quotedblleft: ``\' 
+     code: \'``simple-double--three---four----\'\' `simple\' quotedblleft: 
``\' 
 
      asis: ``simple-double--three---four----\'\' `simple\' quotedblleft: `` 
 
      strong: *``simple-double--three---four----\'\' `simple\' quotedblleft: 
``* 
 
-     kbd: ```simple-double--three---four----\'\' `simple\' quotedblleft: ``\' 
+     kbd: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\' 
 
-     samp: ```simple-double--three---four----\'\' `simple\' quotedblleft: ``\' 
+     samp: \'``simple-double--three---four----\'\' `simple\' quotedblleft: 
``\' 
 
 
 ';

Index: tp/t/results/misc_commands/test_allowcodebreaks.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/misc_commands/test_allowcodebreaks.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- tp/t/results/misc_commands/test_allowcodebreaks.pl  30 Oct 2011 00:51:19 
-0000      1.16
+++ tp/t/results/misc_commands/test_allowcodebreaks.pl  24 Jan 2012 22:17:01 
-0000      1.17
@@ -2724,27 +2724,27 @@
 
 
 
-$result_converted{'plaintext'}->{'test_allowcodebreaks'} = 'Before first 
allowcodebreaks 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\' `fff-- --- minus-b aa-tte\'ff_gg aar-oman anc-hor\'
+$result_converted{'plaintext'}->{'test_allowcodebreaks'} = 'Before first 
allowcodebreaks 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\' \'fff-- --- minus-b aa-tte\'ff_gg aar-oman anc-hor\'
 
-     `in-example\'
+     \'in-example\'
 
-   After false 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\' `fff-- --- minus-b aa-tte\'ff_gg aar-oman anc-hor\'
+   After false 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\' \'fff-- --- minus-b aa-tte\'ff_gg aar-oman anc-hor\'
 
-     `in-example\'
+     \'in-example\'
 
-   In w: 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\' 
`fff-- --- minus-b aa-tte\'ff_gg aar-oman  anc-hor\' 
+   In w: 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\' \'fff-- --- minus-b aa-tte\'ff_gg aar-oman  anc-hor\' 
 
-     `in-example\'
+     \'in-example\'
 
-   After true 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\' `fff-- --- minus-b aa-tte\'ff_gg aar-oman anc-hor\'
+   After true 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\' \'fff-- --- minus-b aa-tte\'ff_gg aar-oman anc-hor\'
 
-     `in-example\'
+     \'in-example\'
 ';
 
 

Index: tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- tp/t/results/plaintext_tests/at_commands_glued_in_example.pl        3 Dec 
2011 14:58:40 -0000       1.12
+++ tp/t/results/plaintext_tests/at_commands_glued_in_example.pl        24 Jan 
2012 22:17:01 -0000      1.13
@@ -779,7 +779,7 @@
 
 $result_converted{'plaintext'}->{'at_commands_glued_in_example'} = '     
address@hidden
      TeXTeXTeX.
-     code`in code\'code.
+     code\'in code\'code.
      acronymABC (aaa bb cc)acronym.
      acronym2ABCacronym.
      emailmali <somebody>email.

Index: tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl      3 Dec 
2011 14:58:40 -0000       1.12
+++ tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl      24 Jan 
2012 22:17:01 -0000      1.13
@@ -708,7 +708,7 @@
 
 
 
-$result_converted{'plaintext'}->{'at_commands_glued_in_paragraph'} = 
'address@hidden  TeXTeXTeX. code`in code\'code.  acronymABC (aaa bb cc)acronym.
+$result_converted{'plaintext'}->{'at_commands_glued_in_paragraph'} = 
'address@hidden  TeXTeXTeX. code\'in code\'code.  acronymABC (aaa bb cc)acronym.
 acronym2ABCacronym.  emailmali <somebody>email.  ref*note Top::ref.
 Foornote(1)after footnote.  accenti^accent.  and star
 star.  noindentafter noindent sp

Index: tp/t/results/plaintext_tests/code_commands_and_punctuation.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/code_commands_and_punctuation.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/t/results/plaintext_tests/code_commands_and_punctuation.pl       18 Oct 
2011 20:13:29 -0000      1.1
+++ tp/t/results/plaintext_tests/code_commands_and_punctuation.pl       24 Jan 
2012 22:17:01 -0000      1.2
@@ -87,7 +87,7 @@
 
 
 
-$result_converted{'plaintext'}->{'code_commands_and_punctuation'} = '`AA\'.  
`aa\'.  After.
+$result_converted{'plaintext'}->{'code_commands_and_punctuation'} = '\'AA\'.  
\'aa\'.  After.
 ';
 
 1;

Index: tp/t/results/plaintext_tests/long_uref_after_item.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/long_uref_after_item.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tp/t/results/plaintext_tests/long_uref_after_item.pl        3 Sep 2011 
07:26:54 -0000       1.9
+++ tp/t/results/plaintext_tests/long_uref_after_item.pl        24 Jan 2012 
22:17:01 -0000      1.10
@@ -184,7 +184,7 @@
 
 
 $result_converted{'plaintext'}->{'long_uref_after_item'} = '   * 
-     
`http://foo.org/some/long/url/which/goes/past/eighty/columns/and/has/no/alternative/text.html\'
+     
\'http://foo.org/some/long/url/which/goes/past/eighty/columns/and/has/no/alternative/text.html\'
 ';
 
 1;

Index: tp/t/results/plaintext_tests/protect_spaces_on_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/protect_spaces_on_line.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tp/t/results/plaintext_tests/protect_spaces_on_line.pl      3 Jul 2011 
14:51:01 -0000       1.9
+++ tp/t/results/plaintext_tests/protect_spaces_on_line.pl      24 Jan 2012 
22:17:01 -0000      1.10
@@ -297,9 +297,9 @@
 
 
 
-$result_converted{'plaintext'}->{'protect_spaces_on_line'} = 'Before samp.  
`a\'.  after samp, w in   w. after dot afterw
+$result_converted{'plaintext'}->{'protect_spaces_on_line'} = 'Before samp.  
\'a\'.  after samp, w in   w. after dot afterw
 
-before samp.  `a\'.  after samp, w in   w. after dot afterw
+before samp.  \'a\'.  after samp, w in   w. after dot afterw
 ';
 
 1;

Index: tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl 30 Oct 
2011 00:51:19 -0000      1.2
+++ tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl 24 Jan 
2012 22:17:02 -0000      1.3
@@ -367,8 +367,8 @@
 
 
 
-$result_converted{'plaintext'}->{'punctuation_and_code_style_commands'} = 
'`aaa\'.  `e~\'.  `aa\'.  `AAA\'.  `E~\'.  `AA\'.  `double AAA\'.  `double E~\'.
-`double AA\'.  End.
+$result_converted{'plaintext'}->{'punctuation_and_code_style_commands'} = 
'\'aaa\'.  \'e~\'.  \'aa\'.  \'AAA\'.  \'E~\'.  \'AA\'.  \'double AAA\'.  
\'double E~\'.
+\'double AA\'.  End.
 ';
 
 1;

Index: tp/t/results/plaintext_tests/punctuation_at_end_command.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_at_end_command.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tp/t/results/plaintext_tests/punctuation_at_end_command.pl  3 Jul 2011 
14:51:01 -0000       1.5
+++ tp/t/results/plaintext_tests/punctuation_at_end_command.pl  24 Jan 2012 
22:17:02 -0000      1.6
@@ -369,8 +369,8 @@
 
 
 
-$result_converted{'plaintext'}->{'punctuation_at_end_command'} = 'Text.  Email 
.  <.> dmn 1. and text.  indicateurl <.> and then kbd `.\'
-and math . and cite `.\' and emph _._  text.  asis in code `.\' text.  a
+$result_converted{'plaintext'}->{'punctuation_at_end_command'} = 'Text.  Email 
.  <.> dmn 1. and text.  indicateurl <.> and then kbd \'.\'
+and math . and cite \'.\' and emph _._  text.  asis in code \'.\' text.  a
 dot before a emph open ._  and in emph._
 ';
 

Index: tp/t/results/plaintext_tests/punctuation_in_command.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_in_command.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tp/t/results/plaintext_tests/punctuation_in_command.pl      3 Jul 2011 
14:51:01 -0000       1.4
+++ tp/t/results/plaintext_tests/punctuation_in_command.pl      24 Jan 2012 
22:17:02 -0000      1.5
@@ -332,8 +332,8 @@
 
 
 $result_converted{'plaintext'}->{'punctuation_in_command'} = 'Text.  Email a.  
b <a. b> dmn 1. 2 and text.  indicateurl <i. u> and
-then kbd `k. d\' and math m. a and cite `c. e\' and emph _e.  h_ text.
-asis in code `a. c\'
+then kbd \'k. d\' and math m. a and cite \'c. e\' and emph _e.  h_ text.
+asis in code \'a. c\'
 ';
 
 1;

Index: tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl     3 Jul 
2011 14:51:01 -0000       1.4
+++ tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl     24 Jan 
2012 22:17:03 -0000      1.5
@@ -434,8 +434,8 @@
 
 
 
-$result_converted{'plaintext'}->{'punctuation_in_command_end_line'} = 'Text.  
Email .  <.> dmn 1. and text.  indicateurl <.> and then kbd `.\'
-and math . and cite `.\' and emph _._  text.  asis in code `.\' text.  a
+$result_converted{'plaintext'}->{'punctuation_in_command_end_line'} = 'Text.  
Email .  <.> dmn 1. and text.  indicateurl <.> and then kbd \'.\'
+and math . and cite \'.\' and emph _._  text.  asis in code \'.\' text.  a
 dot before a emph open ._  and in emph._
 ';
 

Index: tp/t/results/raw/raw_expanded_in_style.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/raw_expanded_in_style.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/t/results/raw/raw_expanded_in_style.pl   5 Jan 2012 23:50:29 -0000       
1.1
+++ tp/t/results/raw/raw_expanded_in_style.pl   24 Jan 2012 22:17:03 -0000      
1.2
@@ -145,7 +145,7 @@
 
 
 
-$result_converted{'plaintext'}->{'raw_expanded_in_style'} = '` 
+$result_converted{'plaintext'}->{'raw_expanded_in_style'} = '\' 
 in html
 \'
 ';

Index: tp/t/results/raw/raw_in_style.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/raw_in_style.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/t/results/raw/raw_in_style.pl    5 Jan 2012 23:50:30 -0000       1.1
+++ tp/t/results/raw/raw_in_style.pl    24 Jan 2012 22:17:03 -0000      1.2
@@ -145,7 +145,7 @@
 
 
 
-$result_converted{'plaintext'}->{'raw_in_style'} = '` \'
+$result_converted{'plaintext'}->{'raw_in_style'} = '\' \'
 ';
 
 

Index: tp/t/results/raw/verbatim_in_brace_command.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/raw/verbatim_in_brace_command.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/t/results/raw/verbatim_in_brace_command.pl       5 Jan 2012 23:50:30 
-0000       1.1
+++ tp/t/results/raw/verbatim_in_brace_command.pl       24 Jan 2012 22:17:03 
-0000      1.2
@@ -139,7 +139,7 @@
 
 
 
-$result_converted{'plaintext'}->{'verbatim_in_brace_command'} = '` \'
+$result_converted{'plaintext'}->{'verbatim_in_brace_command'} = '\' \'
 ';
 
 1;

Index: tp/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.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- tp/t/results/sectioning/at_commands_in_refs.pl      5 Jan 2012 22:13:23 
-0000       1.62
+++ tp/t/results/sectioning/at_commands_in_refs.pl      24 Jan 2012 22:17:03 
-0000      1.63
@@ -20922,12 +20922,12 @@
 * the someone <address@hidden> <address@hidden>::
 * [f--ile1]  [image src="f--ile.png" alt="alt" text="[Image 
description\\"\\"\\\\.]"]::
 *  @ {} . ::
-* `cite asis\' in @w b in r SC *str* t VAR "dfn" i::
-* `env\' `code\' `option\' `samp\' `command\' `file\' `C-x <ESC>\'::
+* \'cite asis\' in @w b in r SC *str* t VAR "dfn" i::
+* \'env\' \'code\' \'option\' \'samp\' \'command\' \'file\' \'C-x <ESC>\'::
 * 8.27in::
 * sansserif slanted::
 * <indicateurl>::
-* `http://somewhere_aaa\' text (url) ls::
+* \'http://somewhere_aaa\' text (url) ls::
 
 
 File: ,  Node: { },  Next:     !
@@ -21043,25 +21043,25 @@
 
*********************************************************************************
 
 
-File: ,  Node:  @ {} . ,  Next: `cite asis\' in @w b in r SC *str* t VAR "dfn" 
i,  Prev: [f--ile1] [image src="f--ile.png" alt="alt" text="[Image 
description\\"\\"\\\\.]"],  Up: Top
+File: ,  Node:  @ {} . ,  Next: \'cite asis\' in @w b in r SC *str* t VAR 
"dfn" i,  Prev: [f--ile1] [image src="f--ile.png" alt="alt" text="[Image 
description\\"\\"\\\\.]"],  Up: Top
 
 19  @ {} . 
 ***********
 
 
-File: ,  Node: `cite asis\' in @w b in r SC *str* t VAR "dfn" i,  Next: `env\' 
`code\' `option\' `samp\' `command\' `file\' `C-x <ESC>\',  Prev:  @ {} . ,  
Up: Top
+File: ,  Node: \'cite asis\' in @w b in r SC *str* t VAR "dfn" i,  Next: 
\'env\' \'code\' \'option\' \'samp\' \'command\' \'file\' \'C-x <ESC>\',  Prev: 
 @ {} . ,  Up: Top
 
-20 `cite asis\' in @w b in r SC *str* t VAR "dfn" i
+20 \'cite asis\' in @w b in r SC *str* t VAR "dfn" i
 **************************************************
 
 
-File: ,  Node: `env\' `code\' `option\' `samp\' `command\' `file\' `C-x 
<ESC>\',  Next: 8.27in,  Prev: `cite asis\' in @w b in r SC *str* t VAR "dfn" 
i,  Up: Top
+File: ,  Node: \'env\' \'code\' \'option\' \'samp\' \'command\' \'file\' \'C-x 
<ESC>\',  Next: 8.27in,  Prev: \'cite asis\' in @w b in r SC *str* t VAR "dfn" 
i,  Up: Top
 
-21 `env\' `code\' `option\' `samp\' `command\' `file\' `C-x <ESC>\'
+21 \'env\' \'code\' \'option\' \'samp\' \'command\' \'file\' \'C-x <ESC>\'
 ************************************************************
 
 
-File: ,  Node: 8.27in,  Next: sansserif slanted,  Prev: `env\' `code\' 
`option\' `samp\' `command\' `file\' `C-x <ESC>\',  Up: Top
+File: ,  Node: 8.27in,  Next: sansserif slanted,  Prev: \'env\' \'code\' 
\'option\' \'samp\' \'command\' \'file\' \'C-x <ESC>\',  Up: Top
 
 22 8.27in
 *********
@@ -21073,15 +21073,15 @@
 ********************
 
 
-File: ,  Node: <indicateurl>,  Next: `http://somewhere_aaa\' text (url) ls,  
Prev: sansserif slanted,  Up: Top
+File: ,  Node: <indicateurl>,  Next: \'http://somewhere_aaa\' text (url) ls,  
Prev: sansserif slanted,  Up: Top
 
 24 <indicateurl>
 ****************
 
 
-File: ,  Node: `http://somewhere_aaa\' text (url) ls,  Prev: <indicateurl>,  
Up: Top
+File: ,  Node: \'http://somewhere_aaa\' text (url) ls,  Prev: <indicateurl>,  
Up: Top
 
-25 `http://somewhere_aaa\' text (url) ls
+25 \'http://somewhere_aaa\' text (url) ls
 ***************************************
 
 *note { }::
@@ -21097,10 +21097,10 @@
 e\'\' e;:: *note e. e( e_ .e e< j ee[:: *note `` \'\' ` \' ,, ,:: *note << >>
 << >> < >:: *note `` \'\' --- --:: *note AAA (fff) AAA BBB:: *note CCC
 (rrr) CCC DDD:: *note the someone <address@hidden>
-<address@hidden>:: *note [f--ile1] [image src="f--ile.png" alt="alt" 
text="[Image description\\"\\"\\\\.]"]:: *note  @ {} . :: *note `cite asis\' 
in @w b
-in r SC *str* t VAR "dfn" i:: *note `env\' `code\' `option\' `samp\'
-`command\' `file\' `C-x <ESC>\':: *note 8.27in:: *note sansserif slanted::
-*note <indicateurl>:: *note `http://somewhere_aaa\' text (url) ls::
+<address@hidden>:: *note [f--ile1] [image src="f--ile.png" alt="alt" 
text="[Image description\\"\\"\\\\.]"]:: *note  @ {} . :: *note \'cite asis\' 
in @w b
+in r SC *str* t VAR "dfn" i:: *note \'env\' \'code\' \'option\' \'samp\'
+\'command\' \'file\' \'C-x <ESC>\':: *note 8.27in:: *note sansserif slanted::
+*note <indicateurl>:: *note \'http://somewhere_aaa\' text (url) ls::
 
 
 
@@ -21126,12 +21126,12 @@
 Node: the someone <address@hidden> <address@hidden>3188
 Node: [f--ile1] [image src="f--ile.png" alt="alt" text="[Image 
description\\"\\"\\\\.]"]3490
 Node:  @ {} . 3846
-Node: `cite asis\' in @w b in r SC *str* t VAR "dfn" i4055
-Node: `env\' `code\' `option\' `samp\' `command\' `file\' `C-x <ESC>\'4317
+Node: \'cite asis\' in @w b in r SC *str* t VAR "dfn" i4055
+Node: \'env\' \'code\' \'option\' \'samp\' \'command\' \'file\' \'C-x 
<ESC>\'4317
 Node: 8.27in4597
 Node: sansserif slanted4745
 Node: <indicateurl>4871
-Node: `http://somewhere_aaa\' text (url) ls5019
+Node: \'http://somewhere_aaa\' text (url) ls5019
 
 End Tag Table
 ';

Index: tp/t/results/sectioning/equivalent_nodes.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/equivalent_nodes.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- tp/t/results/sectioning/equivalent_nodes.pl 1 Nov 2011 12:26:10 -0000       
1.14
+++ tp/t/results/sectioning/equivalent_nodes.pl 24 Jan 2012 22:17:04 -0000      
1.15
@@ -501,21 +501,21 @@
 $result_converted{'info'}->{'equivalent_nodes'} = 'This is , produced by tp 
version from .
 
 
-File: ,  Node: Top,  Next: `node\'
+File: ,  Node: Top,  Next: \'node\'
 
 * Menu:
 
 * *node*::
 
 
-File: ,  Node: `node\',  Up: Top
+File: ,  Node: \'node\',  Up: Top
 
-*Note `node\'::.
+*Note \'node\'::.
 
 
 Tag Table:
 Node: Top41
-Node: `node\'99
+Node: \'node\'99
 
 End Tag Table
 ';
@@ -523,9 +523,9 @@
 $result_converted_errors{'info'}->{'equivalent_nodes'} = [
   {
     'file_name' => '',
-    'error_line' => ':4: warning: Node expansion `*node*\' in menu differs 
from normal node expansion ``node\'\'
+    'error_line' => ':4: warning: Node expansion `*node*\' in menu differs 
from normal node expansion `\'node\'\'
 ',
-    'text' => 'Node expansion `*node*\' in menu differs from normal node 
expansion ``node\'\'',
+    'text' => 'Node expansion `*node*\' in menu differs from normal node 
expansion `\'node\'\'',
     'type' => 'warning',
     'macro' => '',
     'line_nr' => 4

Index: tp/t/results/test_count/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/test_count/commands.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- tp/t/results/test_count/commands.pl 3 Dec 2011 14:58:40 -0000       1.27
+++ tp/t/results/test_count/commands.pl 24 Jan 2012 22:17:05 -0000      1.28
@@ -677,7 +677,7 @@
 
      truc
 
-`vitem table\'
+\'vitem table\'
 
      text
 ';

Index: tp/t/results/xtable/accent_on_table_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/accent_on_table_line.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- tp/t/results/xtable/accent_on_table_line.pl 11 Sep 2011 19:05:10 -0000      
1.14
+++ tp/t/results/xtable/accent_on_table_line.pl 24 Jan 2012 22:17:05 -0000      
1.15
@@ -290,7 +290,7 @@
 
 
 $result_converted{'plaintext'}->{'accent_on_table_line'} = 'first item
-no at-command `code\'
+no at-command \'code\'
 ';
 
 

Index: tp/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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- tp/t/results/xtable/inter_item_commands_in_table.pl 3 Dec 2011 14:58:41 
-0000       1.18
+++ tp/t/results/xtable/inter_item_commands_in_table.pl 24 Jan 2012 22:17:06 
-0000      1.19
@@ -1778,7 +1778,7 @@
 
 
 
-$result_converted{'plaintext'}->{'inter_item_commands_in_table'} = '`a\'
+$result_converted{'plaintext'}->{'inter_item_commands_in_table'} = '\'a\'
      l-ine
 
 a
@@ -1792,11 +1792,11 @@
 
 D
 
-`abb\'
+\'abb\'
      l-ine
 
      Texte before first item.
-`abb\'
+\'abb\'
 ';
 
 

Index: tp/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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvsxHwpvy and /tmp/cvsvhD0MC differ

Index: tp/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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvsbRH53y and /tmp/cvsrhV2mD differ

Index: 
tp/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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvsPZh5Nx and /tmp/cvs4ncl8B differ

Index: tp/tests/encodings/res_parser/accentenc_info/accentenc.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser/accentenc_info/accentenc.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/tests/encodings/res_parser/accentenc_info/accentenc.info 14 Jan 2012 
18:58:27 -0000      1.1
+++ tp/tests/encodings/res_parser/accentenc_info/accentenc.info 24 Jan 2012 
22:17:06 -0000      1.2
@@ -7,7 +7,7 @@
 Accent encoding test top
 ************************
 
-should be e`: è è
+should be e': è è
 
    should be e': é é
 
@@ -15,7 +15,7 @@
 
    should be u": ü ü
 
-   should be i`: ì ì
+   should be i': ì ì
 
    should be i': í í
 
@@ -61,7 +61,7 @@
 
    pounds sterling: £
 
-   should be dotless i`: ì
+   should be dotless i': ì
 
    should be dotless i': í
 
@@ -69,7 +69,7 @@
 
    should be dotless i": ï
 
-   should be dotless j`: j`
+   should be dotless j': j`
 
    should be dotless j': j'
 

Index: tp/tests/encodings/res_parser/nodetest_info/nodetest.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser/nodetest_info/nodetest.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/tests/encodings/res_parser/nodetest_info/nodetest.info   14 Jan 2012 
18:58:41 -0000      1.1
+++ tp/tests/encodings/res_parser/nodetest_info/nodetest.info   24 Jan 2012 
22:17:06 -0000      1.2
@@ -180,7 +180,7 @@
 2.1 a'
 ======
 
-With brace a'.  Testing ' " ` ^.
+With brace a'.  Testing ' " ' ^.
 
 
 File: nodetest.info,  Node: e',  Up: acute accent

Index: tp/tests/encodings/res_parser_info/accent/accent.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser_info/accent/accent.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/tests/encodings/res_parser_info/accent/accent.info       14 Jan 2012 
18:59:48 -0000      1.1
+++ tp/tests/encodings/res_parser_info/accent/accent.info       24 Jan 2012 
22:17:06 -0000      1.2
@@ -6,7 +6,7 @@
 Accent test top
 ***************
 
-should be e`: e` e`
+should be e': e` e`
 
    should be e': e' e'
 
@@ -14,7 +14,7 @@
 
    should be u": u" u"
 
-   should be i`: i` i`
+   should be i': i` i`
 
    should be i': i' i'
 
@@ -60,7 +60,7 @@
 
    pounds sterling: #
 
-   should be dotless i`: i`
+   should be dotless i': i`
 
    should be dotless i': i'
 
@@ -68,7 +68,7 @@
 
    should be dotless i": i"
 
-   should be dotless j`: j`
+   should be dotless j': j`
 
    should be dotless j': j'
 

Index: tp/tests/encodings/res_parser_info/accentenc/accentenc.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser_info/accentenc/accentenc.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/tests/encodings/res_parser_info/accentenc/accentenc.info 14 Jan 2012 
18:59:49 -0000      1.1
+++ tp/tests/encodings/res_parser_info/accentenc/accentenc.info 24 Jan 2012 
22:17:07 -0000      1.2
@@ -7,7 +7,7 @@
 Accent encoding test top
 ************************
 
-should be e`: è è
+should be e': è è
 
    should be e': é é
 
@@ -15,7 +15,7 @@
 
    should be u": ü ü
 
-   should be i`: ì ì
+   should be i': ì ì
 
    should be i': í í
 
@@ -61,7 +61,7 @@
 
    pounds sterling: £
 
-   should be dotless i`: ì
+   should be dotless i': ì
 
    should be dotless i': í
 
@@ -69,7 +69,7 @@
 
    should be dotless i": ï
 
-   should be dotless j`: j`
+   should be dotless j': j`
 
    should be dotless j': j'
 

Index: tp/tests/encodings/res_parser_info/accentenc_encoding/accentenc.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser_info/accentenc_encoding/accentenc.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/tests/encodings/res_parser_info/accentenc_encoding/accentenc.info        
14 Jan 2012 18:59:49 -0000      1.1
+++ tp/tests/encodings/res_parser_info/accentenc_encoding/accentenc.info        
24 Jan 2012 22:17:07 -0000      1.2
@@ -7,7 +7,7 @@
 Accent encoding test top
 ************************
 
-should be e`: è è
+should be e': è è
 
    should be e': é é
 
@@ -15,7 +15,7 @@
 
    should be u": ü ü
 
-   should be i`: ì ì
+   should be i': ì ì
 
    should be i': í í
 
@@ -61,7 +61,7 @@
 
    pounds sterling: £
 
-   should be dotless i`: ì
+   should be dotless i': ì
 
    should be dotless i': í
 
@@ -69,7 +69,7 @@
 
    should be dotless i": ï
 
-   should be dotless j`: j`
+   should be dotless j': j`
 
    should be dotless j': j'
 

Index: 
tp/tests/encodings/res_parser_info/accentenc_encoding_use_entity/accentenc.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser_info/accentenc_encoding_use_entity/accentenc.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 
tp/tests/encodings/res_parser_info/accentenc_encoding_use_entity/accentenc.info 
    14 Jan 2012 18:59:49 -0000      1.1
+++ 
tp/tests/encodings/res_parser_info/accentenc_encoding_use_entity/accentenc.info 
    24 Jan 2012 22:17:07 -0000      1.2
@@ -7,7 +7,7 @@
 Accent encoding test top
 ************************
 
-should be e`: è è
+should be e': è è
 
    should be e': é é
 
@@ -15,7 +15,7 @@
 
    should be u": ü ü
 
-   should be i`: ì ì
+   should be i': ì ì
 
    should be i': í í
 
@@ -61,7 +61,7 @@
 
    pounds sterling: £
 
-   should be dotless i`: ì
+   should be dotless i': ì
 
    should be dotless i': í
 
@@ -69,7 +69,7 @@
 
    should be dotless i": ï
 
-   should be dotless j`: j`
+   should be dotless j': j`
 
    should be dotless j': j'
 

Index: tp/tests/encodings/res_parser_info/accentenc_info/accentenc.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser_info/accentenc_info/accentenc.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/tests/encodings/res_parser_info/accentenc_info/accentenc.info    14 Jan 
2012 18:59:50 -0000      1.1
+++ tp/tests/encodings/res_parser_info/accentenc_info/accentenc.info    24 Jan 
2012 22:17:07 -0000      1.2
@@ -7,7 +7,7 @@
 Accent encoding test top
 ************************
 
-should be e`: è è
+should be e': è è
 
    should be e': é é
 
@@ -15,7 +15,7 @@
 
    should be u": ü ü
 
-   should be i`: ì ì
+   should be i': ì ì
 
    should be i': í í
 
@@ -61,7 +61,7 @@
 
    pounds sterling: £
 
-   should be dotless i`: ì
+   should be dotless i': ì
 
    should be dotless i': í
 
@@ -69,7 +69,7 @@
 
    should be dotless i": ï
 
-   should be dotless j`: j`
+   should be dotless j': j`
 
    should be dotless j': j'
 

Index: tp/tests/encodings/res_parser_info/nodetest_info/nodetest.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser_info/nodetest_info/nodetest.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/tests/encodings/res_parser_info/nodetest_info/nodetest.info      14 Jan 
2012 19:00:00 -0000      1.1
+++ tp/tests/encodings/res_parser_info/nodetest_info/nodetest.info      24 Jan 
2012 22:17:07 -0000      1.2
@@ -180,7 +180,7 @@
 2.1 a'
 ======
 
-With brace a'.  Testing ' " ` ^.
+With brace a'.  Testing ' " ' ^.
 
 
 File: nodetest.info,  Node: e',  Up: acute accent

Index: tp/tests/encodings/res_parser_info/nodetest_latin1/nodetest_latin1.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser_info/nodetest_latin1/nodetest_latin1.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/tests/encodings/res_parser_info/nodetest_latin1/nodetest_latin1.info     
14 Jan 2012 19:00:01 -0000      1.1
+++ tp/tests/encodings/res_parser_info/nodetest_latin1/nodetest_latin1.info     
24 Jan 2012 22:17:08 -0000      1.2
@@ -166,7 +166,7 @@
 2.1 á
 =====
 
-With brace á.  Testing ' " ` ^.
+With brace á.  Testing ' " ' ^.
 
 
 File: nodetest_latin1.info,  Node: é,  Up: acute accent

Index: 
tp/tests/encodings/res_parser_info/nodetest_latin1_use_nodes/nodetest_latin1.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser_info/nodetest_latin1_use_nodes/nodetest_latin1.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 
tp/tests/encodings/res_parser_info/nodetest_latin1_use_nodes/nodetest_latin1.info
   14 Jan 2012 19:00:01 -0000      1.1
+++ 
tp/tests/encodings/res_parser_info/nodetest_latin1_use_nodes/nodetest_latin1.info
   24 Jan 2012 22:17:08 -0000      1.2
@@ -166,7 +166,7 @@
 2.1 á
 =====
 
-With brace á.  Testing ' " ` ^.
+With brace á.  Testing ' " ' ^.
 
 
 File: nodetest_latin1.info,  Node: é,  Up: acute accent

Index: tp/tests/encodings/res_parser_info/nodetest_use_nodes/nodetest.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser_info/nodetest_use_nodes/nodetest.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/tests/encodings/res_parser_info/nodetest_use_nodes/nodetest.info 14 Jan 
2012 19:00:08 -0000      1.1
+++ tp/tests/encodings/res_parser_info/nodetest_use_nodes/nodetest.info 24 Jan 
2012 22:17:08 -0000      1.2
@@ -180,7 +180,7 @@
 2.1 a'
 ======
 
-With brace a'.  Testing ' " ` ^.
+With brace a'.  Testing ' " ' ^.
 
 
 File: nodetest.info,  Node: e',  Up: acute accent

Index: 
tp/tests/encodings/res_parser_info/nodetest_use_nodes_no_unidecode/nodetest.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser_info/nodetest_use_nodes_no_unidecode/nodetest.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 
tp/tests/encodings/res_parser_info/nodetest_use_nodes_no_unidecode/nodetest.info
    14 Jan 2012 19:00:12 -0000      1.1
+++ 
tp/tests/encodings/res_parser_info/nodetest_use_nodes_no_unidecode/nodetest.info
    24 Jan 2012 22:17:08 -0000      1.2
@@ -180,7 +180,7 @@
 2.1 a'
 ======
 
-With brace a'.  Testing ' " ` ^.
+With brace a'.  Testing ' " ' ^.
 
 
 File: nodetest.info,  Node: e',  Up: acute accent

Index: tp/tests/encodings/res_parser_info/nodetest_utf8/nodetest_utf8.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser_info/nodetest_utf8/nodetest_utf8.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/tests/encodings/res_parser_info/nodetest_utf8/nodetest_utf8.info 14 Jan 
2012 19:00:16 -0000      1.1
+++ tp/tests/encodings/res_parser_info/nodetest_utf8/nodetest_utf8.info 24 Jan 
2012 22:17:08 -0000      1.2
@@ -166,7 +166,7 @@
 2.1 á
 =====
 
-With brace á.  Testing ' " ` ^.
+With brace á.  Testing ’ " ‘ ^.
 
 
 File: nodetest_utf8.info,  Node: é,  Up: acute accent
@@ -679,73 +679,73 @@
 Node: no section2021
 Node: acute accent2125
 Node: á2405
-Node: é2511
-Node: í2583
-Node: ó2655
-Node: ú2727
-Node: ý2799
-Node: Á2871
-Node: É2943
-Node: Í3015
-Node: Ó3087
-Node: Ú3161
-Node: Ý3235
-Node: grave accent3390
-Node: à3693
-Node: è3765
-Node: ì3837
-Node: with brace ì3909
-Node: with dotless ì3992
-Node: ò4077
-Node: ù4149
-Node: À4221
-Node: È4293
-Node: Ì4365
-Node: Ò4439
-Node: Ù4513
-Node: circumflex accent4587
-Node: â4854
-Node: ê4931
-Node: î5008
-Node: ô5085
-Node: û5162
-Node: Â5239
-Node: Ê5316
-Node: Î5393
-Node: Ô5470
-Node: Û5547
-Node: tilde accent5626
-Node: ã5808
-Node: ñ5880
-Node: õ5952
-Node: Ã6024
-Node: Õ6096
-Ref: x-spot6182
-Ref: é-o6221
-Node: cedilla accent6225
-Node: ç6371
-Node: Ç6445
-Node: rest6519
-Node: å6944
-Node: æ7008
-Node: œ7072
-Node: Å7136
-Node: Æ7200
-Node: Œ7264
-Node: ł7328
-Node: ø7392
-Node: Ł7456
-Node: Ø7520
-Node: a̋7586
-Node: ă7654
-Node: ǎ7720
-Node: ạ7786
-Node: ȧ7872
-Node: a͡7971
-Node: a̲8039
-Node: ı8107
-Node: j8173
-Node: ,8378
+Node: é2515
+Node: í2587
+Node: ó2659
+Node: ú2731
+Node: ý2803
+Node: Á2875
+Node: É2947
+Node: Í3019
+Node: Ó3091
+Node: Ú3165
+Node: Ý3239
+Node: grave accent3394
+Node: à3697
+Node: è3769
+Node: ì3841
+Node: with brace ì3913
+Node: with dotless ì3996
+Node: ò4081
+Node: ù4153
+Node: À4225
+Node: È4297
+Node: Ì4369
+Node: Ò4443
+Node: Ù4517
+Node: circumflex accent4591
+Node: â4858
+Node: ê4935
+Node: î5012
+Node: ô5089
+Node: û5166
+Node: Â5243
+Node: Ê5320
+Node: Î5397
+Node: Ô5474
+Node: Û5551
+Node: tilde accent5630
+Node: ã5812
+Node: ñ5884
+Node: õ5956
+Node: Ã6028
+Node: Õ6100
+Ref: x-spot6186
+Ref: é-o6225
+Node: cedilla accent6229
+Node: ç6375
+Node: Ç6449
+Node: rest6523
+Node: å6948
+Node: æ7012
+Node: œ7076
+Node: Å7140
+Node: Æ7204
+Node: Œ7268
+Node: ł7332
+Node: ø7396
+Node: Ł7460
+Node: Ø7524
+Node: a̋7590
+Node: ă7658
+Node: ǎ7724
+Node: ạ7790
+Node: ȧ7876
+Node: a͡7975
+Node: a̲8043
+Node: ı8111
+Node: j8177
+Node: ,8382
 
 End Tag Table
 

Index: 
tp/tests/encodings/res_parser_info/nodetest_utf8_use_nodes/nodetest_utf8.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser_info/nodetest_utf8_use_nodes/nodetest_utf8.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 
tp/tests/encodings/res_parser_info/nodetest_utf8_use_nodes/nodetest_utf8.info   
    14 Jan 2012 19:00:27 -0000      1.1
+++ 
tp/tests/encodings/res_parser_info/nodetest_utf8_use_nodes/nodetest_utf8.info   
    24 Jan 2012 22:17:08 -0000      1.2
@@ -166,7 +166,7 @@
 2.1 á
 =====
 
-With brace á.  Testing ' " ` ^.
+With brace á.  Testing ’ " ‘ ^.
 
 
 File: nodetest_utf8.info,  Node: é,  Up: acute accent
@@ -679,73 +679,73 @@
 Node: no section2021
 Node: acute accent2125
 Node: á2405
-Node: é2511
-Node: í2583
-Node: ó2655
-Node: ú2727
-Node: ý2799
-Node: Á2871
-Node: É2943
-Node: Í3015
-Node: Ó3087
-Node: Ú3161
-Node: Ý3235
-Node: grave accent3390
-Node: à3693
-Node: è3765
-Node: ì3837
-Node: with brace ì3909
-Node: with dotless ì3992
-Node: ò4077
-Node: ù4149
-Node: À4221
-Node: È4293
-Node: Ì4365
-Node: Ò4439
-Node: Ù4513
-Node: circumflex accent4587
-Node: â4854
-Node: ê4931
-Node: î5008
-Node: ô5085
-Node: û5162
-Node: Â5239
-Node: Ê5316
-Node: Î5393
-Node: Ô5470
-Node: Û5547
-Node: tilde accent5626
-Node: ã5808
-Node: ñ5880
-Node: õ5952
-Node: Ã6024
-Node: Õ6096
-Ref: x-spot6182
-Ref: é-o6221
-Node: cedilla accent6225
-Node: ç6371
-Node: Ç6445
-Node: rest6519
-Node: å6944
-Node: æ7008
-Node: œ7072
-Node: Å7136
-Node: Æ7200
-Node: Œ7264
-Node: ł7328
-Node: ø7392
-Node: Ł7456
-Node: Ø7520
-Node: a̋7586
-Node: ă7654
-Node: ǎ7720
-Node: ạ7786
-Node: ȧ7872
-Node: a͡7971
-Node: a̲8039
-Node: ı8107
-Node: j8173
-Node: ,8378
+Node: é2515
+Node: í2587
+Node: ó2659
+Node: ú2731
+Node: ý2803
+Node: Á2875
+Node: É2947
+Node: Í3019
+Node: Ó3091
+Node: Ú3165
+Node: Ý3239
+Node: grave accent3394
+Node: à3697
+Node: è3769
+Node: ì3841
+Node: with brace ì3913
+Node: with dotless ì3996
+Node: ò4081
+Node: ù4153
+Node: À4225
+Node: È4297
+Node: Ì4369
+Node: Ò4443
+Node: Ù4517
+Node: circumflex accent4591
+Node: â4858
+Node: ê4935
+Node: î5012
+Node: ô5089
+Node: û5166
+Node: Â5243
+Node: Ê5320
+Node: Î5397
+Node: Ô5474
+Node: Û5551
+Node: tilde accent5630
+Node: ã5812
+Node: ñ5884
+Node: õ5956
+Node: Ã6028
+Node: Õ6100
+Ref: x-spot6186
+Ref: é-o6225
+Node: cedilla accent6229
+Node: ç6375
+Node: Ç6449
+Node: rest6523
+Node: å6948
+Node: æ7012
+Node: œ7076
+Node: Å7140
+Node: Æ7204
+Node: Œ7268
+Node: ł7332
+Node: ø7396
+Node: Ł7460
+Node: Ø7524
+Node: a̋7590
+Node: ă7658
+Node: ǎ7724
+Node: ạ7790
+Node: ȧ7876
+Node: a͡7975
+Node: a̲8043
+Node: ı8111
+Node: j8177
+Node: ,8382
 
 End Tag Table
 

Index: 
tp/tests/encodings/res_parser_info/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/encodings/res_parser_info/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 
tp/tests/encodings/res_parser_info/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.info
  14 Jan 2012 19:00:29 -0000      1.1
+++ 
tp/tests/encodings/res_parser_info/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.info
  24 Jan 2012 22:17:09 -0000      1.2
@@ -166,7 +166,7 @@
 2.1 á
 =====
 
-With brace á.  Testing ' " ` ^.
+With brace á.  Testing ’ " ‘ ^.
 
 
 File: nodetest_utf8.info,  Node: é,  Up: acute accent
@@ -679,73 +679,73 @@
 Node: no section2021
 Node: acute accent2125
 Node: á2405
-Node: é2511
-Node: í2583
-Node: ó2655
-Node: ú2727
-Node: ý2799
-Node: Á2871
-Node: É2943
-Node: Í3015
-Node: Ó3087
-Node: Ú3161
-Node: Ý3235
-Node: grave accent3390
-Node: à3693
-Node: è3765
-Node: ì3837
-Node: with brace ì3909
-Node: with dotless ì3992
-Node: ò4077
-Node: ù4149
-Node: À4221
-Node: È4293
-Node: Ì4365
-Node: Ò4439
-Node: Ù4513
-Node: circumflex accent4587
-Node: â4854
-Node: ê4931
-Node: î5008
-Node: ô5085
-Node: û5162
-Node: Â5239
-Node: Ê5316
-Node: Î5393
-Node: Ô5470
-Node: Û5547
-Node: tilde accent5626
-Node: ã5808
-Node: ñ5880
-Node: õ5952
-Node: Ã6024
-Node: Õ6096
-Ref: x-spot6182
-Ref: é-o6221
-Node: cedilla accent6225
-Node: ç6371
-Node: Ç6445
-Node: rest6519
-Node: å6944
-Node: æ7008
-Node: œ7072
-Node: Å7136
-Node: Æ7200
-Node: Œ7264
-Node: ł7328
-Node: ø7392
-Node: Ł7456
-Node: Ø7520
-Node: a̋7586
-Node: ă7654
-Node: ǎ7720
-Node: ạ7786
-Node: ȧ7872
-Node: a͡7971
-Node: a̲8039
-Node: ı8107
-Node: j8173
-Node: ,8378
+Node: é2515
+Node: í2587
+Node: ó2659
+Node: ú2731
+Node: ý2803
+Node: Á2875
+Node: É2947
+Node: Í3019
+Node: Ó3091
+Node: Ú3165
+Node: Ý3239
+Node: grave accent3394
+Node: à3697
+Node: è3769
+Node: ì3841
+Node: with brace ì3913
+Node: with dotless ì3996
+Node: ò4081
+Node: ù4153
+Node: À4225
+Node: È4297
+Node: Ì4369
+Node: Ò4443
+Node: Ù4517
+Node: circumflex accent4591
+Node: â4858
+Node: ê4935
+Node: î5012
+Node: ô5089
+Node: û5166
+Node: Â5243
+Node: Ê5320
+Node: Î5397
+Node: Ô5474
+Node: Û5551
+Node: tilde accent5630
+Node: ã5812
+Node: ñ5884
+Node: õ5956
+Node: Ã6028
+Node: Õ6100
+Ref: x-spot6186
+Ref: é-o6225
+Node: cedilla accent6229
+Node: ç6375
+Node: Ç6449
+Node: rest6523
+Node: å6948
+Node: æ7012
+Node: œ7076
+Node: Å7140
+Node: Æ7204
+Node: Œ7268
+Node: ł7332
+Node: ø7396
+Node: Ł7460
+Node: Ø7524
+Node: a̋7590
+Node: ă7658
+Node: ǎ7724
+Node: ạ7790
+Node: ȧ7876
+Node: a͡7975
+Node: a̲8043
+Node: ı8111
+Node: j8177
+Node: ,8382
 
 End Tag Table
 

Index: tp/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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/tests/layout/res_parser/formatting_plaintext/formatting.1        14 Jan 
2012 19:04:02 -0000      1.1
+++ tp/tests/layout/res_parser/formatting_plaintext/formatting.1        24 Jan 
2012 22:17:09 -0000      1.2
@@ -4,23 +4,23 @@
 Insertcopying in normal text
    In copying
 
-   < > " & ' `
+   < > " & ' '
 
    "simple-double-three--four---"
-code: ```simple-double--three---four----'''
+code: '``simple-double--three---four----'''
 asis: "simple-double-three--four---"
 strong: *"simple-double-three--four---"*
-kbd: ```simple-double--three---four----'''
+kbd: '``simple-double--three---four----'''
 
-   ``simple-double--three--four---''
+   ''simple-double--three--four---''
 
-   @"u u" @"{U} U" @~n n~ @^a a^ @'e e' @=o o= @`i i` @'{e} e'
-@'address@hidden i' @dotless{i} i @dotless{j} j @address@hidden E=` @l{} /l
+   @"u u" @"{U} U" @~n n~ @^a a^ @'e e' @=o o= @'i i` @'{e} e'
+@'address@hidden i' @dotless{i} i @dotless{j} j @'address@hidden E=` @l{} /l
 @,{@'C} C', @,c c, @,c@"u c,u"
 
    @*
 @ followed by a space   @ followed by a tab   @ followed by a new line
- address@hidden' `@|' `@:' address@hidden' !  address@hidden' ?  
address@hidden' .  `@@' @ address@hidden' } address@hidden' { `@/'
+ '@-' '@|' '@:' '@!' !  '@?' ?  '@.' .  '@@' @ '@}' } '@{' { '@/'
 
    foo vs. bar.  colon :And something else.  semi colon ;.  And ?  ?.
 Now !  !@ but , ,
@@ -35,47 +35,47 @@
 @guillemotleft << @guillemotright >> @guilsinglleft < @guilsinglright >
 @textdegree o @euro Euro @arrow -> @leq <= @geq >=
 
-   address@hidden,an accronym}' -a (an accronym) address@hidden' -a
address@hidden@'E--. @comma{}A., @'Etude Autonome }' E'-. ,A. (E'tude Autonome)
address@hidden@'E--. @comma{}A.}' E'-. ,A. address@hidden' -a address@hidden' -a
address@hidden' `-a' address@hidden' `--a' address@hidden' `--a' address@hidden'
--a address@hidden' "-a" address@hidden' -a address@hidden,--b}' -b <--a>
address@hidden,--b}' -b address@hidden' <--a> address@hidden' _-a_ 
address@hidden'
-`--a' address@hidden' `--a' address@hidden' -a address@hidden' `--a' 
address@hidden'
-<--a> address@hidden {\frac{1}{2}} @minus{}}' --a {\frac{1}{2}} -
address@hidden' `--a' address@hidden' -a address@hidden' `--a' address@hidden' 
-A
address@hidden' *-a* address@hidden' -a address@hidden' -a address@hidden' -a
address@hidden'
+   '@acronym{--a,an accronym}' -a (an accronym) '@acronym{--a}' -a
+'@abbr{@'E--. @comma{}A., @'Etude Autonome }' E'-. ,A. (E'tude Autonome)
+'@abbr{@'E--. @comma{}A.}' E'-. ,A. '@asis{--a}' -a '@b{--a}' -a
+'@cite{--a}' '-a' '@code{--a}' '--a' '@command{--a}' '--a' '@ctrl{--a}'
+-a '@dfn{--a}' "-a" '@dmn{--a}' -a '@email{--a,--b}' -b <--a>
+'@email{,--b}' -b '@email{--a}' <--a> '@emph{--a}' _-a_ '@env{--a}'
+'--a' '@file{--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 '@samp{--a}' '--a' '@sc{--a}' -A
+'@strong{--a}' *-a* '@t{--a}' -a '@sansserif{--a}' -a '@slanted{--a}' -a
+'@titlefont{--a}'
 -a
 **
-   address@hidden' <--a> address@hidden,--b}' -b (--a) address@hidden'
-`--a' address@hidden,--b}' -b address@hidden,--b,--c}' -c 
address@hidden,--b,--c}' -c
address@hidden,,--c}' -c address@hidden,,--c}' -c address@hidden,--b}' -b (--a)
address@hidden,}' `--a' address@hidden,--b}' -b address@hidden' -A 
address@hidden:--a:}' --a
address@hidden:a < & @ % " -- b:}' a  < & @ % " --    b address@hidden a a a a 
a a a a a
+   '@indicateurl{--a}' <--a> '@uref{--a,--b}' -b (--a) '@uref{--a}'
+'--a' '@uref{,--b}' -b '@uref{--a,--b,--c}' -c '@uref{,--b,--c}' -c
+'@uref{--a,,--c}' -c '@uref{,,--c}' -c '@url{--a,--b}' -b (--a)
+'@url{--a,}' '--a' '@url{,--b}' -b '@var{--a}' -A '@verb{:--a:}' --a
+'@verb{:a < & @ % " -- b:}' a  < & @ % " --    b '@w{a a a a a a a a a a
 a a a a a a a a a a a a a a a a a a a a a a a a a}' a a a a a a a a a a a a a 
a a a a a a a a a a a a a a a a a a a a a a
address@hidden' a'' address@hidden' -a'' address@hidden' a. address@hidden' -a.
address@hidden' a* address@hidden' -a* address@hidden' a[
address@hidden' -a[ address@hidden' a( address@hidden' -a( address@hidden' a_
address@hidden' -a_ address@hidden' .a address@hidden' .-a
address@hidden' a< address@hidden' -a< `@,{c}' c, `@,{--c}' -c, address@hidden
-footnote}' (1) address@hidden footnote2}' (2)
-
-   address@hidden' [ggg
-aaa] address@hidden,l--i}' [ggg
-aaa] address@hidden,,l--e}' [ggg
+'@H{a}' a'' '@H{--a}' -a'' '@dotaccent{a}' a. '@dotaccent{--a}' -a.
+'@ringaccent{a}' a* '@ringaccent{--a}' -a* '@tieaccent{a}' a[
+'@tieaccent{--a}' -a[ '@u{a}' a( '@u{--a}' -a( '@ubaraccent{a}' a_
+'@ubaraccent{--a}' -a_ '@udotaccent{a}' .a '@udotaccent{--a}' .-a
+'@v{a}' a< '@v{--a}' -a< '@,{c}' c, '@,{--c}' -c, '@footnote{in
+footnote}' (1) '@footnote{in footnote2}' (2)
+
+   '@image{f--ile}' [ggg
+aaa] '@image{f--ile,l--i}' [ggg
+aaa] '@image{f--ile,,l--e}' [ggg
 aaa]
address@hidden,,,alt}' [ggg
-aaa] address@hidden,,,,e-d-xt}' [ggg
+'@image{f--ile,,,alt}' [ggg
+aaa] '@image{f--ile,,,,e-d-xt}' [ggg
 aaa]
address@hidden,aze,az,alt,e--xt}' [ggg
-aaa] address@hidden,aze,,a--lt}' [a-lt]
address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} address@hidden' [alt]
+'@image{f--ile,aze,az,alt,e--xt}' [ggg
+aaa] '@image{f-ile,aze,,a--lt}' [a-lt]
+'@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden' [alt]
 
 
 
-   address@hidden @click{} A}' click -> A After clickstyle =>
address@hidden @click{} A}' click => A
+   '@clicksequence{click @click{} A}' click -> A After clickstyle =>
+'@clicksequence{click @click{} A}' click => A
 
      A quot--ation
 
@@ -158,8 +158,8 @@
  -- Command: log trap1
  -- Command: log trap2
  -- cmde: id ule truc
- -- cmde2: id `i' ule truc
- -- id `i' ule:
+ -- cmde2: id 'i' ule truc
+ -- id 'i' ule:
  -- aaa:
  -- :
  -- :
@@ -236,67 +236,67 @@
  -- Method on c--lass: t--ype d--eftypemethod_name a--rguments...
      d-eftypemethod
 
-   address@hidden@@, cross r---ef name@@, t---itle@@, file n---ame@@,
+   '@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@,
 ma---nual@@}' *Note cross r--ef name@: (file n---ame@)address@hidden
address@hidden, cross ref name, title, file name, manual}' *note cross
-ref name: (file name)chapter. address@hidden, cross ref name, title,
+'@ref{chapter, cross ref name, title, file name, manual}' *note cross
+ref name: (file name)chapter. '@pxref{chapter, cross ref name, title,
 file name, manual}' *note cross ref name: (file name)chapter.
address@hidden, cross ref name, file name}' *note cross ref name:
+'@inforef{chapter, cross ref name, file name}' *note cross ref name:
 (file name)chapter.
 
-   address@hidden' *note chapter:: address@hidden' *Note chapter::.
address@hidden' *note chapter:: address@hidden@comma{}ion}' *note
+   '@ref{chapter}' *note chapter:: '@xref{chapter}' *Note chapter::.
+'@pxref{chapter}' *note chapter:: '@address@hidden' *note
 s--ect,ion::
 
-   address@hidden@comma{}ion, a @comma{} in cross ref, a address@hidden in
+   '@address@hidden, a @comma{} in cross ref, a address@hidden in
 title, a address@hidden in file, a @comma{} in manual name }' *note a ,
 in cross ref: (a comma, in file)s--ect,ion.
 
-   address@hidden,cross ref name}' *note cross ref name: chapter.
address@hidden,,title}' *note title: chapter. address@hidden,,,file name}'
-*note (file name)chapter:: address@hidden,,,,manual}' *note ()chapter::
address@hidden,cross ref name,title,}' *note cross ref name: chapter.
address@hidden,cross ref name,,file name}' *note cross ref name: (file
-name)chapter. address@hidden,cross ref name,,,manual}' *note cross ref
-name: ()chapter. address@hidden,cross ref name,title,file name}' *note
-cross ref name: (file name)chapter. address@hidden,cross ref
+   '@ref{chapter,cross ref name}' *note cross ref name: chapter.
+'@ref{chapter,,title}' *note title: chapter. '@ref{chapter,,,file name}'
+*note (file name)chapter:: '@ref{chapter,,,,manual}' *note ()chapter::
+'@ref{chapter,cross ref name,title,}' *note cross ref name: chapter.
+'@ref{chapter,cross ref name,,file name}' *note cross ref name: (file
+name)chapter. '@ref{chapter,cross ref name,,,manual}' *note cross ref
+name: ()chapter. '@ref{chapter,cross ref name,title,file name}' *note
+cross ref name: (file name)chapter. '@ref{chapter,cross ref
 name,title,,manual}' *note cross ref name: ()chapter.
address@hidden,cross ref name,title, file name, manual}' *note cross ref
-name: (file name)chapter. address@hidden,,title,file name}' *note title:
-(file name)chapter. address@hidden,,title,,manual}' *note title:
-()chapter. address@hidden,,title, file name, manual}' *note title: (file
-name)chapter. address@hidden,,,file name,manual}' *note (file
+'@ref{chapter,cross ref name,title, file name, manual}' *note cross ref
+name: (file name)chapter. '@ref{chapter,,title,file name}' *note title:
+(file name)chapter. '@ref{chapter,,title,,manual}' *note title:
+()chapter. '@ref{chapter,,title, file name, manual}' *note title: (file
+name)chapter. '@ref{chapter,,,file name,manual}' *note (file
 name)chapter::
 
-   address@hidden(pman)anode,cross ref name}' *note cross ref name: 
(pman)anode.
address@hidden(pman)anode,,title}' *note title: (pman)anode.
address@hidden(pman)anode,,,file name}' *note (file name)(pman)anode::
address@hidden(pman)anode,,,,manual}' *note ()(pman)anode::
address@hidden(pman)anode,cross ref name,title,}' *note cross ref name:
-(pman)anode. address@hidden(pman)anode,cross ref name,,file name}' *note cross
-ref name: (file name)(pman)anode. address@hidden(pman)anode,cross ref
+   '@ref{(pman)anode,cross ref name}' *note cross ref name: (pman)anode.
+'@ref{(pman)anode,,title}' *note title: (pman)anode.
+'@ref{(pman)anode,,,file name}' *note (file name)(pman)anode::
+'@ref{(pman)anode,,,,manual}' *note ()(pman)anode::
+'@ref{(pman)anode,cross ref name,title,}' *note cross ref name:
+(pman)anode. '@ref{(pman)anode,cross ref name,,file name}' *note cross
+ref name: (file name)(pman)anode. '@ref{(pman)anode,cross ref
 name,,,manual}' *note cross ref name: ()(pman)anode.
address@hidden(pman)anode,cross ref name,title,file name}' *note cross ref name:
-(file name)(pman)anode. address@hidden(pman)anode,cross ref 
name,title,,manual}'
-*note cross ref name: ()(pman)anode. address@hidden(pman)anode,cross ref
+'@ref{(pman)anode,cross ref name,title,file name}' *note cross ref name:
+(file name)(pman)anode. '@ref{(pman)anode,cross ref name,title,,manual}'
+*note cross ref name: ()(pman)anode. '@ref{(pman)anode,cross ref
 name,title, file name, manual}' *note cross ref name: (file
-name)(pman)anode. address@hidden(pman)anode,,title,file name}' *note title:
-(file name)(pman)anode. address@hidden(pman)anode,,title,,manual}' *note title:
-()(pman)anode. address@hidden(pman)anode,,title, file name, manual}' *note
-title: (file name)(pman)anode. address@hidden(pman)anode,,,file name,manual}'
+name)(pman)anode. '@ref{(pman)anode,,title,file name}' *note title:
+(file name)(pman)anode. '@ref{(pman)anode,,title,,manual}' *note title:
+()(pman)anode. '@ref{(pman)anode,,title, file name, manual}' *note
+title: (file name)(pman)anode. '@ref{(pman)anode,,,file name,manual}'
 *note (file name)(pman)anode::
 
-   address@hidden, cross ref name, file name}' *note cross ref name:
-(file name)chapter. address@hidden' *note chapter::
address@hidden, cross ref name}' *note cross ref name: chapter.
address@hidden,,file name}' *note (file name)chapter::
address@hidden, cross ref name, file name}' *note cross ref name: (file
-name)node. address@hidden' *note node:: address@hidden, cross ref
-name}' *note cross ref name: node. address@hidden,,file name}' *note
-(file name)node:: address@hidden, cross ref name, file name, spurious
+   '@inforef{chapter, cross ref name, file name}' *note cross ref name:
+(file name)chapter. '@inforef{chapter}' *note chapter::
+'@inforef{chapter, cross ref name}' *note cross ref name: chapter.
+'@inforef{chapter,,file name}' *note (file name)chapter::
+'@inforef{node, cross ref name, file name}' *note cross ref name: (file
+name)node. '@inforef{node}' *note node:: '@inforef{node, cross ref
+name}' *note cross ref name: node. '@inforef{node,,file name}' *note
+(file name)node:: '@inforef{chapter, cross ref name, file name, spurious
 arg}' *note cross ref name: (file name, spurious arg)chapter.
 
-   address@hidden@comma{}ion, a @comma{} in cross ref, a address@hidden
+   '@address@hidden, a @comma{} in cross ref, a address@hidden
 in file}' *note a , in cross ref: (a comma, in file)s--ect,ion.
 
 a
@@ -351,23 +351,23 @@
 
 Normal text
 
-   < > " & ' `
+   < > " & ' '
 
    "simple-double-three--four---"
-code: ```simple-double--three---four----'''
+code: '``simple-double--three---four----'''
 asis: "simple-double-three--four---"
 strong: *"simple-double-three--four---"*
-kbd: ```simple-double--three---four----'''
+kbd: '``simple-double--three---four----'''
 
-   ``simple-double--three--four---''
+   ''simple-double--three--four---''
 
-   @"u u" @"{U} U" @~n n~ @^a a^ @'e e' @=o o= @`i i` @'{e} e'
-@'address@hidden i' @dotless{i} i @dotless{j} j @address@hidden E=` @l{} /l
+   @"u u" @"{U} U" @~n n~ @^a a^ @'e e' @=o o= @'i i` @'{e} e'
+@'address@hidden i' @dotless{i} i @dotless{j} j @'address@hidden E=` @l{} /l
 @,{@'C} C', @,c c, @,c@"u c,u"
 
    @*
 @ followed by a space   @ followed by a tab   @ followed by a new line
- address@hidden' `@|' `@:' address@hidden' !  address@hidden' ?  
address@hidden' .  `@@' @ address@hidden' } address@hidden' { `@/'
+ '@-' '@|' '@:' '@!' !  '@?' ?  '@.' .  '@@' @ '@}' } '@{' { '@/'
 
    foo vs. bar.  colon :And something else.  semi colon ;.  And ?  ?.
 Now !  !@ but , ,
@@ -382,47 +382,47 @@
 @guillemotleft << @guillemotright >> @guilsinglleft < @guilsinglright >
 @textdegree o @euro Euro @arrow -> @leq <= @geq >=
 
-   address@hidden,an accronym}' -a (an accronym) address@hidden' -a
address@hidden@'E--. @comma{}A., @'Etude Autonome }' E'-. ,A. (E'tude Autonome)
address@hidden@'E--. @comma{}A.}' E'-. ,A. address@hidden' -a address@hidden' -a
address@hidden' `-a' address@hidden' `--a' address@hidden' `--a' address@hidden'
--a address@hidden' "-a" address@hidden' -a address@hidden,--b}' -b <--a>
address@hidden,--b}' -b address@hidden' <--a> address@hidden' _-a_ 
address@hidden'
-`--a' address@hidden' `--a' address@hidden' -a address@hidden' `--a' 
address@hidden'
-<--a> address@hidden {\frac{1}{2}} @minus{}}' --a {\frac{1}{2}} -
address@hidden' `--a' address@hidden' -a address@hidden' `--a' address@hidden' 
-A
address@hidden' *-a* address@hidden' -a address@hidden' -a address@hidden' -a
address@hidden'
+   '@acronym{--a,an accronym}' -a (an accronym) '@acronym{--a}' -a
+'@abbr{@'E--. @comma{}A., @'Etude Autonome }' E'-. ,A. (E'tude Autonome)
+'@abbr{@'E--. @comma{}A.}' E'-. ,A. '@asis{--a}' -a '@b{--a}' -a
+'@cite{--a}' '-a' '@code{--a}' '--a' '@command{--a}' '--a' '@ctrl{--a}'
+-a '@dfn{--a}' "-a" '@dmn{--a}' -a '@email{--a,--b}' -b <--a>
+'@email{,--b}' -b '@email{--a}' <--a> '@emph{--a}' _-a_ '@env{--a}'
+'--a' '@file{--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 '@samp{--a}' '--a' '@sc{--a}' -A
+'@strong{--a}' *-a* '@t{--a}' -a '@sansserif{--a}' -a '@slanted{--a}' -a
+'@titlefont{--a}'
 -a
 **
-   address@hidden' <--a> address@hidden,--b}' -b (--a) address@hidden'
-`--a' address@hidden,--b}' -b address@hidden,--b,--c}' -c 
address@hidden,--b,--c}' -c
address@hidden,,--c}' -c address@hidden,,--c}' -c address@hidden,--b}' -b (--a)
address@hidden,}' `--a' address@hidden,--b}' -b address@hidden' -A 
address@hidden:--a:}' --a
address@hidden:a < & @ % " -- b:}' a  < & @ % " --    b address@hidden a a a a 
a a a a a
+   '@indicateurl{--a}' <--a> '@uref{--a,--b}' -b (--a) '@uref{--a}'
+'--a' '@uref{,--b}' -b '@uref{--a,--b,--c}' -c '@uref{,--b,--c}' -c
+'@uref{--a,,--c}' -c '@uref{,,--c}' -c '@url{--a,--b}' -b (--a)
+'@url{--a,}' '--a' '@url{,--b}' -b '@var{--a}' -A '@verb{:--a:}' --a
+'@verb{:a < & @ % " -- b:}' a  < & @ % " --    b '@w{a a a a a a a a a a
 a a a a a a a a a a a a a a a a a a a a a a a a a}' a a a a a a a a a a a a a 
a a a a a a a a a a a a a a a a a a a a a a
address@hidden' a'' address@hidden' -a'' address@hidden' a. address@hidden' -a.
address@hidden' a* address@hidden' -a* address@hidden' a[
address@hidden' -a[ address@hidden' a( address@hidden' -a( address@hidden' a_
address@hidden' -a_ address@hidden' .a address@hidden' .-a
address@hidden' a< address@hidden' -a< `@,{c}' c, `@,{--c}' -c, address@hidden
-footnote}' (3) address@hidden footnote2}' (4)
-
-   address@hidden' [ggg
-aaa] address@hidden,l--i}' [ggg
-aaa] address@hidden,,l--e}' [ggg
+'@H{a}' a'' '@H{--a}' -a'' '@dotaccent{a}' a. '@dotaccent{--a}' -a.
+'@ringaccent{a}' a* '@ringaccent{--a}' -a* '@tieaccent{a}' a[
+'@tieaccent{--a}' -a[ '@u{a}' a( '@u{--a}' -a( '@ubaraccent{a}' a_
+'@ubaraccent{--a}' -a_ '@udotaccent{a}' .a '@udotaccent{--a}' .-a
+'@v{a}' a< '@v{--a}' -a< '@,{c}' c, '@,{--c}' -c, '@footnote{in
+footnote}' (3) '@footnote{in footnote2}' (4)
+
+   '@image{f--ile}' [ggg
+aaa] '@image{f--ile,l--i}' [ggg
+aaa] '@image{f--ile,,l--e}' [ggg
 aaa]
address@hidden,,,alt}' [ggg
-aaa] address@hidden,,,,e-d-xt}' [ggg
+'@image{f--ile,,,alt}' [ggg
+aaa] '@image{f--ile,,,,e-d-xt}' [ggg
 aaa]
address@hidden,aze,az,alt,e--xt}' [ggg
-aaa] address@hidden,aze,,a--lt}' [a-lt]
address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} address@hidden' [alt]
+'@image{f--ile,aze,az,alt,e--xt}' [ggg
+aaa] '@image{f-ile,aze,,a--lt}' [a-lt]
+'@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden' [alt]
 
 
 
-   address@hidden @click{} A}' click -> A After clickstyle =>
address@hidden @click{} A}' click => A
+   '@clicksequence{click @click{} A}' click -> A After clickstyle =>
+'@clicksequence{click @click{} A}' click => A
 
      A quot--ation
 
@@ -505,8 +505,8 @@
  -- Command: log trap1
  -- Command: log trap2
  -- cmde: id ule truc
- -- cmde2: id `i' ule truc
- -- id `i' ule:
+ -- cmde2: id 'i' ule truc
+ -- id 'i' ule:
  -- aaa:
  -- :
  -- :
@@ -583,67 +583,67 @@
  -- Method on c--lass: t--ype d--eftypemethod_name a--rguments...
      d-eftypemethod
 
-   address@hidden@@, cross r---ef name@@, t---itle@@, file n---ame@@,
+   '@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@,
 ma---nual@@}' *Note cross r--ef name@: (file n---ame@)address@hidden
address@hidden, cross ref name, title, file name, manual}' *note cross
-ref name: (file name)chapter. address@hidden, cross ref name, title,
+'@ref{chapter, cross ref name, title, file name, manual}' *note cross
+ref name: (file name)chapter. '@pxref{chapter, cross ref name, title,
 file name, manual}' *note cross ref name: (file name)chapter.
address@hidden, cross ref name, file name}' *note cross ref name:
+'@inforef{chapter, cross ref name, file name}' *note cross ref name:
 (file name)chapter.
 
-   address@hidden' *note chapter:: address@hidden' *Note chapter::.
address@hidden' *note chapter:: address@hidden@comma{}ion}' *note
+   '@ref{chapter}' *note chapter:: '@xref{chapter}' *Note chapter::.
+'@pxref{chapter}' *note chapter:: '@address@hidden' *note
 s--ect,ion::
 
-   address@hidden@comma{}ion, a @comma{} in cross ref, a address@hidden in
+   '@address@hidden, a @comma{} in cross ref, a address@hidden in
 title, a address@hidden in file, a @comma{} in manual name }' *note a ,
 in cross ref: (a comma, in file)s--ect,ion.
 
-   address@hidden,cross ref name}' *note cross ref name: chapter.
address@hidden,,title}' *note title: chapter. address@hidden,,,file name}'
-*note (file name)chapter:: address@hidden,,,,manual}' *note ()chapter::
address@hidden,cross ref name,title,}' *note cross ref name: chapter.
address@hidden,cross ref name,,file name}' *note cross ref name: (file
-name)chapter. address@hidden,cross ref name,,,manual}' *note cross ref
-name: ()chapter. address@hidden,cross ref name,title,file name}' *note
-cross ref name: (file name)chapter. address@hidden,cross ref
+   '@ref{chapter,cross ref name}' *note cross ref name: chapter.
+'@ref{chapter,,title}' *note title: chapter. '@ref{chapter,,,file name}'
+*note (file name)chapter:: '@ref{chapter,,,,manual}' *note ()chapter::
+'@ref{chapter,cross ref name,title,}' *note cross ref name: chapter.
+'@ref{chapter,cross ref name,,file name}' *note cross ref name: (file
+name)chapter. '@ref{chapter,cross ref name,,,manual}' *note cross ref
+name: ()chapter. '@ref{chapter,cross ref name,title,file name}' *note
+cross ref name: (file name)chapter. '@ref{chapter,cross ref
 name,title,,manual}' *note cross ref name: ()chapter.
address@hidden,cross ref name,title, file name, manual}' *note cross ref
-name: (file name)chapter. address@hidden,,title,file name}' *note title:
-(file name)chapter. address@hidden,,title,,manual}' *note title:
-()chapter. address@hidden,,title, file name, manual}' *note title: (file
-name)chapter. address@hidden,,,file name,manual}' *note (file
+'@ref{chapter,cross ref name,title, file name, manual}' *note cross ref
+name: (file name)chapter. '@ref{chapter,,title,file name}' *note title:
+(file name)chapter. '@ref{chapter,,title,,manual}' *note title:
+()chapter. '@ref{chapter,,title, file name, manual}' *note title: (file
+name)chapter. '@ref{chapter,,,file name,manual}' *note (file
 name)chapter::
 
-   address@hidden(pman)anode,cross ref name}' *note cross ref name: 
(pman)anode.
address@hidden(pman)anode,,title}' *note title: (pman)anode.
address@hidden(pman)anode,,,file name}' *note (file name)(pman)anode::
address@hidden(pman)anode,,,,manual}' *note ()(pman)anode::
address@hidden(pman)anode,cross ref name,title,}' *note cross ref name:
-(pman)anode. address@hidden(pman)anode,cross ref name,,file name}' *note cross
-ref name: (file name)(pman)anode. address@hidden(pman)anode,cross ref
+   '@ref{(pman)anode,cross ref name}' *note cross ref name: (pman)anode.
+'@ref{(pman)anode,,title}' *note title: (pman)anode.
+'@ref{(pman)anode,,,file name}' *note (file name)(pman)anode::
+'@ref{(pman)anode,,,,manual}' *note ()(pman)anode::
+'@ref{(pman)anode,cross ref name,title,}' *note cross ref name:
+(pman)anode. '@ref{(pman)anode,cross ref name,,file name}' *note cross
+ref name: (file name)(pman)anode. '@ref{(pman)anode,cross ref
 name,,,manual}' *note cross ref name: ()(pman)anode.
address@hidden(pman)anode,cross ref name,title,file name}' *note cross ref name:
-(file name)(pman)anode. address@hidden(pman)anode,cross ref 
name,title,,manual}'
-*note cross ref name: ()(pman)anode. address@hidden(pman)anode,cross ref
+'@ref{(pman)anode,cross ref name,title,file name}' *note cross ref name:
+(file name)(pman)anode. '@ref{(pman)anode,cross ref name,title,,manual}'
+*note cross ref name: ()(pman)anode. '@ref{(pman)anode,cross ref
 name,title, file name, manual}' *note cross ref name: (file
-name)(pman)anode. address@hidden(pman)anode,,title,file name}' *note title:
-(file name)(pman)anode. address@hidden(pman)anode,,title,,manual}' *note title:
-()(pman)anode. address@hidden(pman)anode,,title, file name, manual}' *note
-title: (file name)(pman)anode. address@hidden(pman)anode,,,file name,manual}'
+name)(pman)anode. '@ref{(pman)anode,,title,file name}' *note title:
+(file name)(pman)anode. '@ref{(pman)anode,,title,,manual}' *note title:
+()(pman)anode. '@ref{(pman)anode,,title, file name, manual}' *note
+title: (file name)(pman)anode. '@ref{(pman)anode,,,file name,manual}'
 *note (file name)(pman)anode::
 
-   address@hidden, cross ref name, file name}' *note cross ref name:
-(file name)chapter. address@hidden' *note chapter::
address@hidden, cross ref name}' *note cross ref name: chapter.
address@hidden,,file name}' *note (file name)chapter::
address@hidden, cross ref name, file name}' *note cross ref name: (file
-name)node. address@hidden' *note node:: address@hidden, cross ref
-name}' *note cross ref name: node. address@hidden,,file name}' *note
-(file name)node:: address@hidden, cross ref name, file name, spurious
+   '@inforef{chapter, cross ref name, file name}' *note cross ref name:
+(file name)chapter. '@inforef{chapter}' *note chapter::
+'@inforef{chapter, cross ref name}' *note cross ref name: chapter.
+'@inforef{chapter,,file name}' *note (file name)chapter::
+'@inforef{node, cross ref name, file name}' *note cross ref name: (file
+name)node. '@inforef{node}' *note node:: '@inforef{node, cross ref
+name}' *note cross ref name: node. '@inforef{node,,file name}' *note
+(file name)node:: '@inforef{chapter, cross ref name, file name, spurious
 arg}' *note cross ref name: (file name, spurious arg)chapter.
 
-   address@hidden@comma{}ion, a @comma{} in cross ref, a address@hidden
+   '@address@hidden, a @comma{} in cross ref, a address@hidden
 in file}' *note a , in cross ref: (a comma, in file)s--ect,ion.
 
 a
@@ -707,13 +707,13 @@
 
      ``simple-double--three---four----''
 
-     code: ```simple-double--three---four----''' 
+     code: '``simple-double--three---four----''' 
 
      asis: ``simple-double--three---four----'' 
 
      strong: *``simple-double--three---four----''* 
 
-     kbd: ```simple-double--three---four----''' 
+     kbd: '``simple-double--three---four----''' 
 
 
      ``simple-double--three---four----''
@@ -745,16 +745,16 @@
      @ followed by a tab
  
      @ followed by a new line
-      address@hidden' 
-     `@|' 
-     `@:' 
-     address@hidden' !
-     address@hidden' ?
-     address@hidden' .
-     `@@' @
-     address@hidden' }
-     address@hidden' {
-     `@/' 
+      '@-' 
+     '@|' 
+     '@:' 
+     '@!' !
+     '@?' ?
+     '@.' .
+     '@@' @
+     '@}' }
+     '@{' {
+     '@/' 
 
      foo vs. bar.
      colon :And something else.
@@ -817,97 +817,97 @@
      @leq <=
      @geq >=
 
-     address@hidden,an accronym}' --a (an accronym)
-     address@hidden' --a
-     address@hidden@'E--. @comma{}A., @'Etude Autonome }' E'--. ,A. (E'tude 
Autonome)
-     address@hidden@'E--. @comma{}A.}' E'--. ,A.
-     address@hidden' --a
-     address@hidden' --a
-     address@hidden' `--a'
-     address@hidden' `--a'
-     address@hidden' `--a'
-     address@hidden' --a
-     address@hidden' "--a"
-     address@hidden' --a
-     address@hidden,--b}' --b <--a>
-     address@hidden,--b}' --b
-     address@hidden' <--a>
-     address@hidden' _--a_
-     address@hidden' `--a'
-     address@hidden' `--a'
-     address@hidden' --a
-     address@hidden' `--a'
-     address@hidden' <--a>
-     address@hidden {\frac{1}{2}} @minus{}}' --a {\frac{1}{2}} -
-     address@hidden' `--a'
-     address@hidden' --a
-     address@hidden' `--a'
-     address@hidden' --A
-     address@hidden' *--a*
-     address@hidden' --a
-     address@hidden' --a
-     address@hidden' --a
-     address@hidden' 
+     '@acronym{--a,an accronym}' --a (an accronym)
+     '@acronym{--a}' --a
+     '@abbr{@'E--. @comma{}A., @'Etude Autonome }' E'--. ,A. (E'tude Autonome)
+     '@abbr{@'E--. @comma{}A.}' E'--. ,A.
+     '@asis{--a}' --a
+     '@b{--a}' --a
+     '@cite{--a}' '--a'
+     '@code{--a}' '--a'
+     '@command{--a}' '--a'
+     '@ctrl{--a}' --a
+     '@dfn{--a}' "--a"
+     '@dmn{--a}' --a
+     '@email{--a,--b}' --b <--a>
+     '@email{,--b}' --b
+     '@email{--a}' <--a>
+     '@emph{--a}' _--a_
+     '@env{--a}' '--a'
+     '@file{--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
+     '@samp{--a}' '--a'
+     '@sc{--a}' --A
+     '@strong{--a}' *--a*
+     '@t{--a}' --a
+     '@sansserif{--a}' --a
+     '@slanted{--a}' --a
+     '@titlefont{--a}' 
      -a
 *******
 
-     address@hidden' <--a>
-     address@hidden,--b}' --b (--a)
-     address@hidden' `--a'
-     address@hidden,--b}' --b
-     address@hidden,--b,--c}' --c
-     address@hidden,--b,--c}' --c
-     address@hidden,,--c}' --c
-     address@hidden,,--c}' --c
-     address@hidden,--b}' --b (--a)
-     address@hidden,}' `--a'
-     address@hidden,--b}' --b
-     address@hidden' --A
-     address@hidden:--a:}' --a
-     address@hidden:a  < & @ % " --    b:}' a  < & @ % " --    b
-     address@hidden a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a}' a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a
-     address@hidden' a''
-     address@hidden' -a''
-     address@hidden' a.
-     address@hidden' -a.
-     address@hidden' a*
-     address@hidden' -a*
-     address@hidden' a[
-     address@hidden' -a[
-     address@hidden' a(
-     address@hidden' -a(
-     address@hidden' a_
-     address@hidden' -a_
-     address@hidden' .a
-     address@hidden' .-a
-     address@hidden' a<
-     address@hidden' -a<
-     `@,{c}' c,
-     `@,{--c}' -c,
-     address@hidden footnote}' (5)
-     address@hidden footnote2}' (6)
+     '@indicateurl{--a}' <--a>
+     '@uref{--a,--b}' --b (--a)
+     '@uref{--a}' '--a'
+     '@uref{,--b}' --b
+     '@uref{--a,--b,--c}' --c
+     '@uref{,--b,--c}' --c
+     '@uref{--a,,--c}' --c
+     '@uref{,,--c}' --c
+     '@url{--a,--b}' --b (--a)
+     '@url{--a,}' '--a'
+     '@url{,--b}' --b
+     '@var{--a}' --A
+     '@verb{:--a:}' --a
+     '@verb{:a  < & @ % " --    b:}' a  < & @ % " --    b
+     '@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}' a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
+     '@H{a}' a''
+     '@H{--a}' -a''
+     '@dotaccent{a}' a.
+     '@dotaccent{--a}' -a.
+     '@ringaccent{a}' a*
+     '@ringaccent{--a}' -a*
+     '@tieaccent{a}' a[
+     '@tieaccent{--a}' -a[
+     '@u{a}' a(
+     '@u{--a}' -a(
+     '@ubaraccent{a}' a_
+     '@ubaraccent{--a}' -a_
+     '@udotaccent{a}' .a
+     '@udotaccent{--a}' .-a
+     '@v{a}' a<
+     '@v{--a}' -a<
+     '@,{c}' c,
+     '@,{--c}' -c,
+     '@footnote{in footnote}' (5)
+     '@footnote{in footnote2}' (6)
 
-     address@hidden' [ggg
+     '@image{f--ile}' [ggg
 aaa]
-     address@hidden,l--i}' [ggg
+     '@image{f--ile,l--i}' [ggg
 aaa]
-     address@hidden,,l--e}' [ggg
+     '@image{f--ile,,l--e}' [ggg
 aaa]
-     address@hidden,,,alt}' [ggg
+     '@image{f--ile,,,alt}' [ggg
 aaa]
-     address@hidden,,,,e-d-xt}' [ggg
+     '@image{f--ile,,,,e-d-xt}' [ggg
 aaa]
-     address@hidden,aze,az,alt,e--xt}' [ggg
+     '@image{f--ile,aze,az,alt,e--xt}' [ggg
 aaa]
-     address@hidden,aze,,a--lt}' [a-lt]
-     address@hidden@file{f--ile}@@@.,aze,az,alt,@file{file ext} 
address@hidden' [alt]
+     '@image{f-ile,aze,,a--lt}' [a-lt]
+     '@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden' [alt]
 
 
 
 
-     address@hidden @click{} A}' click -> A
+     '@clicksequence{click @click{} A}' click -> A
      After clickstyle =>
-     address@hidden @click{} A}' click => A
+     '@clicksequence{click @click{} A}' click => A
 
           A quot---ation
 
@@ -992,8 +992,8 @@
       -- Command: log trap1
       -- Command: log trap2
       -- cmde: id ule truc
-      -- cmde2: id `i' ule truc
-      -- id `i' ule:
+      -- cmde2: id 'i' ule truc
+      -- id 'i' ule:
       -- aaa:
       -- :
       -- :
@@ -1070,64 +1070,64 @@
       -- Method on c--lass: t--ype d--eftypemethod_name a--rguments...
           d--eftypemethod
 
-     address@hidden@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@}' *Note cross r---ef name@: (file n---ame@)address@hidden
-     address@hidden, cross ref name, title, file name, manual}' *note cross 
ref name: (file name)chapter.
-     address@hidden, cross ref name, title, file name, manual}' *note cross 
ref name: (file name)chapter.
-     address@hidden, cross ref name, file name}' *note cross ref name: (file 
name)chapter.
-
-     address@hidden' *note chapter::
-     address@hidden' *Note chapter::.
-     address@hidden' *note chapter::
-     address@hidden@comma{}ion}' *note s--ect,ion::
+     '@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@}' *Note cross r---ef name@: (file n---ame@)address@hidden
+     '@ref{chapter, cross ref name, title, file name, manual}' *note cross ref 
name: (file name)chapter.
+     '@pxref{chapter, cross ref name, title, file name, manual}' *note cross 
ref name: (file name)chapter.
+     '@inforef{chapter, cross ref name, file name}' *note cross ref name: 
(file name)chapter.
+
+     '@ref{chapter}' *note chapter::
+     '@xref{chapter}' *Note chapter::.
+     '@pxref{chapter}' *note chapter::
+     '@address@hidden' *note s--ect,ion::
 
-     address@hidden@comma{}ion, a @comma{} in cross
+     '@address@hidden, a @comma{} in cross
      ref, a address@hidden in title, a address@hidden in file, a @comma{} in 
manual name }'
      *note a , in cross
      ref: (a comma, in file)s--ect,ion.
 
-     address@hidden,cross ref name}' *note cross ref name: chapter.
-     address@hidden,,title}' *note title: chapter.
-     address@hidden,,,file name}' *note (file name)chapter::
-     address@hidden,,,,manual}' *note ()chapter::
-     address@hidden,cross ref name,title,}' *note cross ref name: chapter.
-     address@hidden,cross ref name,,file name}' *note cross ref name: (file 
name)chapter.
-     address@hidden,cross ref name,,,manual}' *note cross ref name: ()chapter.
-     address@hidden,cross ref name,title,file name}' *note cross ref name: 
(file name)chapter.
-     address@hidden,cross ref name,title,,manual}' *note cross ref name: 
()chapter.
-     address@hidden,cross ref name,title, file name, manual}' *note cross ref 
name: (file name)chapter.
-     address@hidden,,title,file name}' *note title: (file name)chapter.
-     address@hidden,,title,,manual}' *note title: ()chapter.
-     address@hidden,,title, file name, manual}' *note title: (file 
name)chapter.
-     address@hidden,,,file name,manual}' *note (file name)chapter::
-
-
-     address@hidden(pman)anode,cross ref name}' *note cross ref name: 
(pman)anode.
-     address@hidden(pman)anode,,title}' *note title: (pman)anode.
-     address@hidden(pman)anode,,,file name}' *note (file name)(pman)anode::
-     address@hidden(pman)anode,,,,manual}' *note ()(pman)anode::
-     address@hidden(pman)anode,cross ref name,title,}' *note cross ref name: 
(pman)anode.
-     address@hidden(pman)anode,cross ref name,,file name}' *note cross ref 
name: (file name)(pman)anode.
-     address@hidden(pman)anode,cross ref name,,,manual}' *note cross ref name: 
()(pman)anode.
-     address@hidden(pman)anode,cross ref name,title,file name}' *note cross 
ref name: (file name)(pman)anode.
-     address@hidden(pman)anode,cross ref name,title,,manual}' *note cross ref 
name: ()(pman)anode.
-     address@hidden(pman)anode,cross ref name,title, file name, manual}' *note 
cross ref name: (file name)(pman)anode.
-     address@hidden(pman)anode,,title,file name}' *note title: (file 
name)(pman)anode.
-     address@hidden(pman)anode,,title,,manual}' *note title: ()(pman)anode.
-     address@hidden(pman)anode,,title, file name, manual}' *note title: (file 
name)(pman)anode.
-     address@hidden(pman)anode,,,file name,manual}' *note (file 
name)(pman)anode::
-
-
-     address@hidden, cross ref name, file name}' *note cross ref name: (file 
name)chapter.
-     address@hidden' *note chapter::
-     address@hidden, cross ref name}' *note cross ref name: chapter.
-     address@hidden,,file name}' *note (file name)chapter::
-     address@hidden, cross ref name, file name}' *note cross ref name: (file 
name)node.
-     address@hidden' *note node::
-     address@hidden, cross ref name}' *note cross ref name: node.
-     address@hidden,,file name}' *note (file name)node::
-     address@hidden, cross ref name, file name, spurious arg}' *note cross ref 
name: (file name, spurious arg)chapter.
+     '@ref{chapter,cross ref name}' *note cross ref name: chapter.
+     '@ref{chapter,,title}' *note title: chapter.
+     '@ref{chapter,,,file name}' *note (file name)chapter::
+     '@ref{chapter,,,,manual}' *note ()chapter::
+     '@ref{chapter,cross ref name,title,}' *note cross ref name: chapter.
+     '@ref{chapter,cross ref name,,file name}' *note cross ref name: (file 
name)chapter.
+     '@ref{chapter,cross ref name,,,manual}' *note cross ref name: ()chapter.
+     '@ref{chapter,cross ref name,title,file name}' *note cross ref name: 
(file name)chapter.
+     '@ref{chapter,cross ref name,title,,manual}' *note cross ref name: 
()chapter.
+     '@ref{chapter,cross ref name,title, file name, manual}' *note cross ref 
name: (file name)chapter.
+     '@ref{chapter,,title,file name}' *note title: (file name)chapter.
+     '@ref{chapter,,title,,manual}' *note title: ()chapter.
+     '@ref{chapter,,title, file name, manual}' *note title: (file name)chapter.
+     '@ref{chapter,,,file name,manual}' *note (file name)chapter::
+
+
+     '@ref{(pman)anode,cross ref name}' *note cross ref name: (pman)anode.
+     '@ref{(pman)anode,,title}' *note title: (pman)anode.
+     '@ref{(pman)anode,,,file name}' *note (file name)(pman)anode::
+     '@ref{(pman)anode,,,,manual}' *note ()(pman)anode::
+     '@ref{(pman)anode,cross ref name,title,}' *note cross ref name: 
(pman)anode.
+     '@ref{(pman)anode,cross ref name,,file name}' *note cross ref name: (file 
name)(pman)anode.
+     '@ref{(pman)anode,cross ref name,,,manual}' *note cross ref name: 
()(pman)anode.
+     '@ref{(pman)anode,cross ref name,title,file name}' *note cross ref name: 
(file name)(pman)anode.
+     '@ref{(pman)anode,cross ref name,title,,manual}' *note cross ref name: 
()(pman)anode.
+     '@ref{(pman)anode,cross ref name,title, file name, manual}' *note cross 
ref name: (file name)(pman)anode.
+     '@ref{(pman)anode,,title,file name}' *note title: (file name)(pman)anode.
+     '@ref{(pman)anode,,title,,manual}' *note title: ()(pman)anode.
+     '@ref{(pman)anode,,title, file name, manual}' *note title: (file 
name)(pman)anode.
+     '@ref{(pman)anode,,,file name,manual}' *note (file name)(pman)anode::
+
+
+     '@inforef{chapter, cross ref name, file name}' *note cross ref name: 
(file name)chapter.
+     '@inforef{chapter}' *note chapter::
+     '@inforef{chapter, cross ref name}' *note cross ref name: chapter.
+     '@inforef{chapter,,file name}' *note (file name)chapter::
+     '@inforef{node, cross ref name, file name}' *note cross ref name: (file 
name)node.
+     '@inforef{node}' *note node::
+     '@inforef{node, cross ref name}' *note cross ref name: node.
+     '@inforef{node,,file name}' *note (file name)node::
+     '@inforef{chapter, cross ref name, file name, spurious arg}' *note cross 
ref name: (file name, spurious arg)chapter.
 
-     address@hidden@comma{}ion, a @comma{} in cross
+     '@address@hidden, a @comma{} in cross
      ref, a address@hidden in file}'
      *note a , in cross
      ref: (a comma, in file)s--ect,ion.

Index: tp/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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/tests/layout/res_parser/formatting_xml/formatting.xml    14 Jan 2012 
19:04:09 -0000      1.1
+++ tp/tests/layout/res_parser/formatting_xml/formatting.xml    24 Jan 2012 
22:17:09 -0000      1.2
@@ -749,8 +749,8 @@
 &gt;
 &quot;
 &amp;
-'
-`
+&textrsquo;
+&textlsquo;
 </para>
 
<para>&textldquo;simple-double&textndash;three&textmdash;four&textmdash;-&textrdquo;&linebreak;
 code: <code>``simple-double--three---four----''</code> &linebreak;
@@ -758,7 +758,7 @@
 strong: 
<strong>&textldquo;simple-double&textndash;three&textmdash;four&textmdash;-&textrdquo;</strong>
 &linebreak;
 kbd: <kbd>``simple-double--three---four----''</kbd> &linebreak;
 </para>
-<para>`<w></w>`simple-double-<w></w>-three&textmdash;four&textmdash;-'<w></w>'&linebreak;
+<para>&textlsquo;<w></w>&textlsquo;simple-double-<w></w>-three&textmdash;four&textmdash;-&textrsquo;<w></w>&textrsquo;&linebreak;
 </para>
 <cindex index="cp"><indexterm index="cp">&textndash;option</indexterm></cindex>
 <cindex index="cp"><indexterm index="cp">&textldquo;</indexterm></cindex>
@@ -769,16 +769,16 @@
 &arobase;&quot;&lbrace;U&rbrace; <accent type="uml">U</accent> 
 &arobase;~n <accent type="tilde">n</accent>
 &arobase;^a <accent type="circ">a</accent>
-&arobase;'e <accent type="acute">e</accent>
+&arobase;&textrsquo;e <accent type="acute">e</accent>
 &arobase;=o <accent type="macr">o</accent>
-&arobase;`i <accent type="grave">i</accent>
-&arobase;'&lbrace;e&rbrace; <accent type="acute">e</accent>
-&arobase;'&lbrace;&arobase;dotless&lbrace;i&rbrace;&rbrace; <accent 
type="acute"><dotless>i</dotless></accent> 
+&arobase;&textlsquo;i <accent type="grave">i</accent>
+&arobase;&textrsquo;&lbrace;e&rbrace; <accent type="acute">e</accent>
+&arobase;&textrsquo;&lbrace;&arobase;dotless&lbrace;i&rbrace;&rbrace; <accent 
type="acute"><dotless>i</dotless></accent> 
 &arobase;dotless&lbrace;i&rbrace; <dotless>i</dotless>
 &arobase;dotless&lbrace;j&rbrace; <dotless>j</dotless>
-&arobase;`&lbrace;&arobase;=E&rbrace; <accent type="grave"><accent 
type="macr">E</accent></accent> 
+&arobase;&textlsquo;&lbrace;&arobase;=E&rbrace; <accent type="grave"><accent 
type="macr">E</accent></accent> 
 &arobase;l&lbrace;&rbrace; &lslash;
-&arobase;,&lbrace;&arobase;'C&rbrace; <accent type="cedil"><accent 
type="acute">C</accent></accent>
+&arobase;,&lbrace;&arobase;&textrsquo;C&rbrace; <accent type="cedil"><accent 
type="acute">C</accent></accent>
 &arobase;,c <accent type="cedil">c</accent>
 &arobase;,c&arobase;&quot;u <accent type="cedil">c</accent><accent 
type="uml">u</accent> &linebreak;
 </para>
@@ -1351,8 +1351,8 @@
 &gt;
 &quot;
 &amp;
-'
-`
+&textrsquo;
+&textlsquo;
 </para>
 
<para>&textldquo;simple-double&textndash;three&textmdash;four&textmdash;-&textrdquo;&linebreak;
 code: <code>``simple-double--three---four----''</code> &linebreak;
@@ -1360,7 +1360,7 @@
 strong: 
<strong>&textldquo;simple-double&textndash;three&textmdash;four&textmdash;-&textrdquo;</strong>
 &linebreak;
 kbd: <kbd>``simple-double--three---four----''</kbd> &linebreak;
 </para>
-<para>`<w></w>`simple-double-<w></w>-three&textmdash;four&textmdash;-'<w></w>'&linebreak;
+<para>&textlsquo;<w></w>&textlsquo;simple-double-<w></w>-three&textmdash;four&textmdash;-&textrsquo;<w></w>&textrsquo;&linebreak;
 </para>
 <cindex index="cp"><indexterm index="cp">&textndash;option</indexterm></cindex>
 <cindex index="cp"><indexterm index="cp">&textldquo;</indexterm></cindex>
@@ -1371,16 +1371,16 @@
 &arobase;&quot;&lbrace;U&rbrace; <accent type="uml">U</accent> 
 &arobase;~n <accent type="tilde">n</accent>
 &arobase;^a <accent type="circ">a</accent>
-&arobase;'e <accent type="acute">e</accent>
+&arobase;&textrsquo;e <accent type="acute">e</accent>
 &arobase;=o <accent type="macr">o</accent>
-&arobase;`i <accent type="grave">i</accent>
-&arobase;'&lbrace;e&rbrace; <accent type="acute">e</accent>
-&arobase;'&lbrace;&arobase;dotless&lbrace;i&rbrace;&rbrace; <accent 
type="acute"><dotless>i</dotless></accent> 
+&arobase;&textlsquo;i <accent type="grave">i</accent>
+&arobase;&textrsquo;&lbrace;e&rbrace; <accent type="acute">e</accent>
+&arobase;&textrsquo;&lbrace;&arobase;dotless&lbrace;i&rbrace;&rbrace; <accent 
type="acute"><dotless>i</dotless></accent> 
 &arobase;dotless&lbrace;i&rbrace; <dotless>i</dotless>
 &arobase;dotless&lbrace;j&rbrace; <dotless>j</dotless>
-&arobase;`&lbrace;&arobase;=E&rbrace; <accent type="grave"><accent 
type="macr">E</accent></accent> 
+&arobase;&textlsquo;&lbrace;&arobase;=E&rbrace; <accent type="grave"><accent 
type="macr">E</accent></accent> 
 &arobase;l&lbrace;&rbrace; &lslash;
-&arobase;,&lbrace;&arobase;'C&rbrace; <accent type="cedil"><accent 
type="acute">C</accent></accent>
+&arobase;,&lbrace;&arobase;&textrsquo;C&rbrace; <accent type="cedil"><accent 
type="acute">C</accent></accent>
 &arobase;,c <accent type="cedil">c</accent>
 &arobase;,c&arobase;&quot;u <accent type="cedil">c</accent><accent 
type="uml">u</accent> &linebreak;
 </para>
@@ -1953,8 +1953,8 @@
 &gt;
 &quot;
 &amp;
-'
-`
+&textrsquo;
+&textlsquo;
 </para>
 
<para>&textldquo;simple-double&textndash;three&textmdash;four&textmdash;-&textrdquo;&linebreak;
 code: <code>``simple-double--three---four----''</code> &linebreak;
@@ -1962,7 +1962,7 @@
 strong: 
<strong>&textldquo;simple-double&textndash;three&textmdash;four&textmdash;-&textrdquo;</strong>
 &linebreak;
 kbd: <kbd>``simple-double--three---four----''</kbd> &linebreak;
 </para>
-<para>`<w></w>`simple-double-<w></w>-three&textmdash;four&textmdash;-'<w></w>'&linebreak;
+<para>&textlsquo;<w></w>&textlsquo;simple-double-<w></w>-three&textmdash;four&textmdash;-&textrsquo;<w></w>&textrsquo;&linebreak;
 </para>
 <cindex index="cp"><indexterm index="cp">&textndash;option</indexterm></cindex>
 <cindex index="cp"><indexterm index="cp">&textldquo;</indexterm></cindex>
@@ -1973,16 +1973,16 @@
 &arobase;&quot;&lbrace;U&rbrace; <accent type="uml">U</accent> 
 &arobase;~n <accent type="tilde">n</accent>
 &arobase;^a <accent type="circ">a</accent>
-&arobase;'e <accent type="acute">e</accent>
+&arobase;&textrsquo;e <accent type="acute">e</accent>
 &arobase;=o <accent type="macr">o</accent>
-&arobase;`i <accent type="grave">i</accent>
-&arobase;'&lbrace;e&rbrace; <accent type="acute">e</accent>
-&arobase;'&lbrace;&arobase;dotless&lbrace;i&rbrace;&rbrace; <accent 
type="acute"><dotless>i</dotless></accent> 
+&arobase;&textlsquo;i <accent type="grave">i</accent>
+&arobase;&textrsquo;&lbrace;e&rbrace; <accent type="acute">e</accent>
+&arobase;&textrsquo;&lbrace;&arobase;dotless&lbrace;i&rbrace;&rbrace; <accent 
type="acute"><dotless>i</dotless></accent> 
 &arobase;dotless&lbrace;i&rbrace; <dotless>i</dotless>
 &arobase;dotless&lbrace;j&rbrace; <dotless>j</dotless>
-&arobase;`&lbrace;&arobase;=E&rbrace; <accent type="grave"><accent 
type="macr">E</accent></accent> 
+&arobase;&textlsquo;&lbrace;&arobase;=E&rbrace; <accent type="grave"><accent 
type="macr">E</accent></accent> 
 &arobase;l&lbrace;&rbrace; &lslash;
-&arobase;,&lbrace;&arobase;'C&rbrace; <accent type="cedil"><accent 
type="acute">C</accent></accent>
+&arobase;,&lbrace;&arobase;&textrsquo;C&rbrace; <accent type="cedil"><accent 
type="acute">C</accent></accent>
 &arobase;,c <accent type="cedil">c</accent>
 &arobase;,c&arobase;&quot;u <accent type="cedil">c</accent><accent 
type="uml">u</accent> &linebreak;
 </para>

Index: util/texinfo.dtd
===================================================================
RCS file: /sources/texinfo/texinfo/util/texinfo.dtd,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- util/texinfo.dtd    5 Jan 2012 23:34:52 -0000       1.29
+++ util/texinfo.dtd    24 Jan 2012 22:17:09 -0000      1.30
@@ -1,4 +1,4 @@
-<!-- $Id: texinfo.dtd,v 1.29 2012/01/05 23:34:52 pertusus Exp $
+<!-- $Id: texinfo.dtd,v 1.30 2012/01/24 22:17:09 pertusus Exp $
   Document Type Definition for Texinfo XML output (the '-'-xml option).
 
   Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
@@ -836,7 +836,9 @@
 <!ENTITY enddots    "<punct end-of-sentence='yes'>&#x2026;</punct>">
 <!ENTITY amp        "&#x26;">
 <!ENTITY lsquo      "&#x2018;">
+<!ENTITY textlsquo      "&#x2018;">
 <!ENTITY rsquo      "&#x2019;">
+<!ENTITY textrsquo      "&#x2019;">
 <!ENTITY sbquo      "&#x201a;">
 <!ENTITY ldquo      "&#x201c;">
 <!ENTITY textldquo      "&#x201c;">



reply via email to

[Prev in Thread] Current Thread [Next in Thread]