[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Split ASCII_GLYPH and ASCII_PUNCTUATION
From: |
Gavin D. Smith |
Subject: |
branch master updated: Split ASCII_GLYPH and ASCII_PUNCTUATION |
Date: |
Wed, 22 Feb 2023 14:16:48 -0500 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 267ecedcbf Split ASCII_GLYPH and ASCII_PUNCTUATION
267ecedcbf is described below
commit 267ecedcbf3a39f06cfba0c86707add844639543
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Wed Feb 22 19:16:38 2023 +0000
Split ASCII_GLYPH and ASCII_PUNCTUATION
* tp/Texinfo/Common.pm (@variable_string_settables):
Add ASCII_GLYPH.
* tp/Texinfo/Convert/Plaintext.pm (converter_initialize):
Ignore ASCII_PUNCTUATION for the output of @quoted_commands.
(_process_text): Reorder conditional.
(%defaults): Set ASCII_PUNCTUATION to 1 and ASCII_GLYPH to 0.
* tp/Texinfo/Convert/Text.pm
(copy_options_for_convert_text): Propagate ASCII_GLYPH.
(brace_no_arg_command): Check ASCII_GLYPH setting rather than
that of ASCII_PUNCTUATION.
---
ChangeLog | 15 +
tp/Texinfo/Common.pm | 1 +
tp/Texinfo/Convert/Plaintext.pm | 24 +-
tp/Texinfo/Convert/Text.pm | 3 +-
.../results/converters_tests/at_commands_in_raw.pl | 2 +-
.../combined_fonts/res_info/combined_fonts.info | 8 +-
.../converters_tests/definition_commands.pl | 26 +-
.../res_info/indices_in_begin_tables_lists.info | Bin 3288 -> 3264 bytes
.../res_info/indices_in_begin_tables_lists.info | Bin 3288 -> 3264 bytes
tp/t/results/converters_tests/inline.pl | 2 +-
tp/t/results/converters_tests/inline_expand_tex.pl | 2 +-
tp/t/results/converters_tests/inlinefmtspaces.pl | 2 +-
.../converters_tests/normal_font_in_monospace.pl | 4 +-
.../printindex_merged_indices_code_style.pl | 6 +-
.../converters_tests/test_deftypefnnewline.pl | 20 +-
tp/t/results/converters_tests/unknown_value.pl | 2 +-
tp/t/results/coverage/commands.pl | 2 +-
tp/t/results/coverage/def.pl | 4 +-
tp/t/results/coverage/exdent_and_formats.pl | 2 +-
tp/t/results/coverage/item_container.pl | 4 +-
tp/t/results/coverage/multitable.pl | 8 +-
tp/t/results/coverage/quotation_author.pl | 4 +-
tp/t/results/coverage/symbol_after_command.pl | 4 +-
tp/t/results/coverage_braces/abbr_acronym.pl | 4 +-
.../results/coverage_braces/email_possibilities.pl | 2 +-
tp/t/results/coverage_braces/recursive_acronym.pl | 2 +-
.../recursive_acronym_definition.pl | 2 +-
tp/t/results/coverage_braces/uref_url.pl | 2 +-
tp/t/results/def/all_commands.pl | 54 +-
tp/t/results/def/all_commands_printindex.pl | 54 +-
.../float/special_characters_in_float_type.pl | 14 +-
tp/t/results/formats_encodings/accent.pl | 18 +-
.../formats_encodings/accent_enable_encoding.pl | 18 +-
.../formats_encodings/at_commands_in_refs.pl | 32 +-
.../res_info/at_commands_in_refs_utf8.info | Bin 8412 -> 8402 bytes
.../documentencoding_utf8_and_insertions.pl | 2 +-
.../res_info/manual_simple_utf8_with_error.info | 2 +-
.../no_documentencoding_and_insertions.pl | 2 +-
.../indices/encoding_index_utf8_enable_encoding.pl | 2 +-
.../res_html/chap.html | 50 +-
.../res_info/encoding_index_utf8.info | Bin 4421 -> 4409 bytes
.../encoding_index_utf8_enable_encoding.txt | 14 +-
tp/t/results/indices/subentries.pl | 16 +-
tp/t/results/indices/syncode_index_print_both.pl | 4 +-
tp/t/results/indices/syncodeindex_to_plain.pl | 4 +-
.../res_info/direntry_dircategory.info | 12 +-
.../res_info/direntry_dircategory.info-1 | 4 +-
.../res_info/direntry_dircategory.info-2 | 4 +-
.../direntry_dircategory_and_commands.pl | 6 +-
.../multitable_anchor_and_index_entry.pl | 12 +-
.../itemize/inter_item_commands_in_enumerate.pl | 2 +-
.../itemize/inter_item_commands_in_itemize.pl | 8 +-
tp/t/results/itemize/itemize_in_example.pl | 4 +-
tp/t/results/menu/dash_in_menu.pl | 4 +-
tp/t/results/menu/submenu_in_example.pl | 4 +-
.../codequoteundirected_codequotebacktick.pl | 18 +-
tp/t/results/misc_commands/test_allowcodebreaks.pl | 8 +-
.../inter_item_commands_in_multitable.pl | 8 +-
.../plaintext_tests/empty_multitable_in_itemize.pl | 2 +-
.../flushright_not_closed_and_format.pl | 2 +-
.../japanese_utf8/res_plaintext/japanese_utf8.txt | 4 +-
.../plaintext_tests/nested_indentedblock.pl | 2 +-
.../plaintext_tests/no_punctuation_commands.pl | 6 +-
.../no_punctuation_commands_frenchspacing.pl | 6 +-
tp/t/results/plaintext_tests/punctuation.pl | 6 +-
.../plaintext_tests/punctuation_commands.pl | 6 +-
.../punctuation_commands_frenchspacing.pl | 6 +-
.../plaintext_tests/punctuation_frenchspacing.pl | 6 +-
.../punctuation_sc_accents_ascii_punct.txt | 6 +-
.../punctuation_sc_accents_ascii_punct_latin1.txt | 2 +-
.../punctuation_sc_accents_default.txt | 4 +-
...ation_sc_accents_to_utf8_ascii_punct_latin1.txt | 6 +-
...tion_sc_accents_to_utf8_ascii_punct_usascii.txt | 6 +-
.../punctuation_sc_accents_to_utf8_latin1.txt | 4 +-
.../punctuation_sc_accents_to_utf8_usascii.txt | 4 +-
tp/t/results/preformatted/quote_dash_in_display.pl | 2 +-
tp/t/results/quotation/quotation_and_author.pl | 10 +-
.../quotation/quotation_author_in_example.pl | 2 +-
tp/t/results/raw/inlinefmt.pl | 2 +-
tp/t/results/transformations/master_menu_fr.pl | 6 +-
.../results/xtable/inter_item_commands_in_table.pl | 16 +-
.../inter_item_commands_in_table_in_example.pl | 2 +-
.../res_parser/formatting_info/formatting.info | 800 +++++------
.../res_parser/formatting_plaintext/formatting.txt | 538 ++++----
.../res_parser/formatting_fr_info/formatting.info | 800 +++++------
.../formatting.info | 1170 ++++++++--------
.../formatting.txt | 788 +++++------
.../nested_cartouche/nested_formats.info | 1316 +++++++++---------
.../res_parser/nested_deffn/nested_formats.info | 1316 +++++++++---------
.../nested_enumerate/nested_formats.info | 1316 +++++++++---------
.../res_parser/nested_example/nested_formats.info | 476 +++----
.../nested_flushright/nested_formats.info | 1316 +++++++++---------
.../res_parser/nested_group/nested_formats.info | 1316 +++++++++---------
.../res_parser/nested_itemize/nested_formats.info | 1316 +++++++++---------
.../res_parser/nested_menu/nested_formats.info | 1418 ++++++++++----------
.../nested_multitable/nested_formats.info | 1316 +++++++++---------
.../nested_quotation/nested_formats.info | 1316 +++++++++---------
.../res_parser/nested_table/nested_formats.info | 1316 +++++++++---------
98 files changed, 9256 insertions(+), 9233 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3248848a82..19af3464cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2023-02-22 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Split ASCII_GLYPH and ASCII_PUNCTUATION
+
+ * tp/Texinfo/Common.pm (@variable_string_settables):
+ Add ASCII_GLYPH.
+ * tp/Texinfo/Convert/Plaintext.pm (converter_initialize):
+ Ignore ASCII_PUNCTUATION for the output of @quoted_commands.
+ (_process_text): Reorder conditional.
+ (%defaults): Set ASCII_PUNCTUATION to 1 and ASCII_GLYPH to 0.
+ * tp/Texinfo/Convert/Text.pm
+ (copy_options_for_convert_text): Propagate ASCII_GLYPH.
+ (brace_no_arg_command): Check ASCII_GLYPH setting rather than
+ that of ASCII_PUNCTUATION.
+
2023-02-22 Patrice Dumas <pertusus@free.fr>
* p/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 291758f0bc..0083839044 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -339,6 +339,7 @@ our @variable_string_settables = (
'AFTER_BODY_OPEN',
'AFTER_SHORT_TOC_LINES',
'AFTER_TOC_LINES',
+'ASCII_GLYPH',
'ASCII_PUNCTUATION',
'AVOID_MENU_REDUNDANCY',
'BEFORE_SHORT_TOC_LINES',
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 3bcabf8771..7d2bde58f2 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -357,7 +357,8 @@ foreach my $command ('var', 'cite', 'dmn',
keys(%brace_code_commands)) {
my %defaults = (
'ENABLE_ENCODING' => 1,
- 'ASCII_PUNCTUATION' => 0,
+ 'ASCII_PUNCTUATION' => 1,
+ 'ASCII_GLYPH' => 0,
'FORMAT_MENU' => 'nomenu',
#'EXTENSION' => 'info',
'EXTENSION' => 'txt',
@@ -433,7 +434,6 @@ sub converter_initialize($)
= {Texinfo::Convert::Text::copy_options_for_convert_text($self)};
if ($self->get_conf('ASCII_PUNCTUATION')) {
- $self->{'convert_text_options'}->{'ascii_punctuation'} = 1;
# cache to avoid calling get_conf
$self->{'ascii_punctuation'} = 1;
} else {
@@ -445,15 +445,13 @@ sub converter_initialize($)
and $self->get_conf('OUTPUT_ENCODING_NAME') eq 'utf-8') {
# cache this to avoid redoing calls to get_conf
$self->{'to_utf8'} = 1;
- if (!$self->{'ascii_punctuation'}) {
- foreach my $quoted_command (@quoted_commands) {
- # Directed single quotes
- $self->{'style_map'}->{$quoted_command} = ["\x{2018}", "\x{2019}"];
- }
- foreach my $quoted_command (@double_quoted_commands) {
- # Directed double quotes
- $self->{'style_map'}->{$quoted_command} = ["\x{201C}", "\x{201D}"];
- }
+ foreach my $quoted_command (@quoted_commands) {
+ # Directed single quotes
+ $self->{'style_map'}->{$quoted_command} = ["\x{2018}", "\x{2019}"];
+ }
+ foreach my $quoted_command (@double_quoted_commands) {
+ # Directed double quotes
+ $self->{'style_map'}->{$quoted_command} = ["\x{201C}", "\x{201D}"];
}
}
if (defined($self->get_conf('OPEN_QUOTE_SYMBOL'))) {
@@ -654,8 +652,8 @@ sub _process_text($$$)
$text = uc($text);
}
- if ($self->{'to_utf8'}
- and !$self->{'ascii_punctuation'}) {
+ if (!$self->{'ascii_punctuation'}
+ and $self->{'to_utf8'}) {
return Texinfo::Convert::Unicode::unicode_text($text,
$context->{'font_type_stack'}->[-1]->{'monospace'});
} elsif (!$context->{'font_type_stack'}->[-1]->{'monospace'}) {
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index 1e697962b5..d11832d1b1 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -254,7 +254,7 @@ sub brace_no_arg_command($;$)
and defined($element->{'extra'}->{'clickstyle'})
and
defined($text_brace_no_arg_commands{$element->{'extra'}->{'clickstyle'}}));
my $result;
- if (!($options and $options->{'ascii_punctuation'})
+ if (!($options and $options->{'ASCII_GLYPH'})
or !exists($Texinfo::Convert::Unicode::extra_unicode_map{$command})) {
$result = Texinfo::Convert::Unicode::brace_no_arg_command($command,
$encoding);
}
@@ -357,6 +357,7 @@ sub copy_options_for_convert_text($;$)
# for error registering
$options{'DEBUG'} = $self->get_conf('DEBUG');
$options{'PROGRAM'} = $self->get_conf('PROGRAM');
+ $options{'ASCII_GLYPH'} = $self->get_conf('ASCII_GLYPH');
return %options;
}
diff --git a/tp/t/results/converters_tests/at_commands_in_raw.pl
b/tp/t/results/converters_tests/at_commands_in_raw.pl
index 25d44d74dd..ffb6c7a1de 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -1502,7 +1502,7 @@ $result_converted{'plaintext'}->{'at_commands_in_raw'} =
'top
<b>in b(1).</b>
‘in kbd before tex’(2).
- {No value for ‘flag’}
+ {No value for \'flag\'}
.
‘in kbd after tex’.
diff --git
a/tp/t/results/converters_tests/combined_fonts/res_info/combined_fonts.info
b/tp/t/results/converters_tests/combined_fonts/res_info/combined_fonts.info
index 1f9382fa9e..80fe09909d 100644
--- a/tp/t/results/converters_tests/combined_fonts/res_info/combined_fonts.info
+++ b/tp/t/results/converters_tests/combined_fonts/res_info/combined_fonts.info
@@ -16,18 +16,18 @@ File: combined_fonts.info, Node: chapter, Prev: Top, Up:
Top
1 chapter
*********
-‘c--ode’, “d–fn”, V–AR, *s–trong*, ‘k--bd’, ‘s--amp’.
+‘c--ode’, “d-fn”, V-AR, *s-trong*, ‘k--bd’, ‘s--amp’.
‘“d--fn in code”’ ‘C--ODE IN VAR’ ‘V--AR IN CODE’ *‘k--bd in strong’*
‘*s--trong in samp*’ *‘s--amp in strong’*
- ‘c–ite’
+ ‘c-ite’
‘‘c--ite in code’’ ‘‘c--ode in cite’’
- ‘c--ode’ s–lanted b– t--
+ ‘c--ode’ s-lanted b- t--
- ‘s--lanted in code’ ‘c--ode in slanted’ s–lanted in b b– in slanted
+ ‘s--lanted in code’ ‘c--ode in slanted’ s-lanted in b b- in slanted
s--lanted in t t-- in slanted V--AR IN T T-- IN VAR
V--AR IN EXAMPLE
diff --git a/tp/t/results/converters_tests/definition_commands.pl
b/tp/t/results/converters_tests/definition_commands.pl
index 58f0c27728..7fc08bacef 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -19334,13 +19334,13 @@
$result_converted{'plaintext'}->{'definition_commands'} = 'top section
*********
-- Func: fname a---rg1 a--rg2
- deffn no var for A—RG1 and A–RG2
+ deffn no var for A--RG1 and A-RG2
-- Func: fname A---RG1 A--RG2
- deffn explict var for A—RG1 and A–RG2
+ deffn explict var for A--RG1 and A-RG2
- -- Func: fname a—rg1 a–rg2
- deffn r slanted for A—RG1 and A–RG2
+ -- Func: fname a--rg1 a-rg2
+ deffn r slanted for A--RG1 and A-RG2
-- Special Form: foobar (var [from to [inc]]) default
-- Special Form: foobar (var [from to [inc]]) r
@@ -19361,13 +19361,13 @@
$result_converted{'plaintext'}->{'definition_commands'} = 'top section
-- Special Form: foobar va---riable default
-- Special Form: foobar VA---RIABLE var
- -- Special Form: foobar va—riable r
+ -- Special Form: foobar va--riable r
-- Special Form: foobar va---riable slanted
-- Special Form: foobar va---riable code
-- Special Form: foobar va---riable t
-- Special Form: foobar va---riable t:b
- -- Special Form: foobar VA—RIABLE r:var
- -- Special Form: foobar va—riable r:slanted
+ -- Special Form: foobar VA--RIABLE r:var
+ -- Special Form: foobar va--riable r:slanted
-- Special Form: foobar va---riable r:code
-- Special Form: foobar va---riable r:t
-- Special Form: foobar VA---RIABLE code:var
@@ -19390,10 +19390,10 @@
$result_converted{'plaintext'}->{'definition_commands'} = 'top section
test formatting of separators
-- Library Function: int foobar (int F---OO, float B--AR)
- ... with var for F—OO and B–AR
+ ... with var for F--OO and B-AR
- -- Library Function: int foobar (int f—oo, float b–ar)
- ... with r slanted for F—OO and B–AR
+ -- Library Function: int foobar (int f--oo, float b-ar)
+ ... with r slanted for F--OO and B-AR
produces:
-- Class Option of Window: border-pattern
@@ -19434,14 +19434,14 @@ produces:
separators
-- Library Function: int foobar (i--nt F---OO[, float B--AR]) default
- -- Library Function: int foobar (i–nt F---OO[, float B--AR]) r
+ -- Library Function: int foobar (i-nt F---OO[, float B--AR]) r
-- Library Function: int foobar (I--NT F---OO[, float B--AR]) var
-- Library Function: int foobar (i--nt F---OO[, float B--AR]) slanted
-- Library Function: int foobar (i--nt F---OO[, float B--AR]) code
-- Library Function: int foobar (i--nt F---OO[, float B--AR]) t
-- Library Function: int foobar (i--nt F---OO[, float B--AR]) t:b
- -- Library Function: int foobar (I–NT F---OO[, float B--AR]) r:var
- -- Library Function: int foobar (i–nt F---OO[, float B--AR]) r:slanted
+ -- Library Function: int foobar (I-NT F---OO[, float B--AR]) r:var
+ -- Library Function: int foobar (i-nt F---OO[, float B--AR]) r:slanted
-- Library Function: int foobar (i--nt F---OO[, float B--AR]) r:code
-- Library Function: int foobar (i--nt F---OO[, float B--AR]) r:t
-- Library Function: int foobar (I--NT F---OO[, float B--AR]) code:var
diff --git
a/tp/t/results/converters_tests/indices_in_begin_tables_lists/res_info/indices_in_begin_tables_lists.info
b/tp/t/results/converters_tests/indices_in_begin_tables_lists/res_info/indices_in_begin_tables_lists.info
index 1d9b1fc89b..792a41ea84 100644
Binary files
a/tp/t/results/converters_tests/indices_in_begin_tables_lists/res_info/indices_in_begin_tables_lists.info
and
b/tp/t/results/converters_tests/indices_in_begin_tables_lists/res_info/indices_in_begin_tables_lists.info
differ
diff --git
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item/res_info/indices_in_begin_tables_lists.info
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item/res_info/indices_in_begin_tables_lists.info
index 1d9b1fc89b..792a41ea84 100644
Binary files
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item/res_info/indices_in_begin_tables_lists.info
and
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item/res_info/indices_in_begin_tables_lists.info
differ
diff --git a/tp/t/results/converters_tests/inline.pl
b/tp/t/results/converters_tests/inline.pl
index 276e53ce95..8f601f709b 100644
--- a/tp/t/results/converters_tests/inline.pl
+++ b/tp/t/results/converters_tests/inline.pl
@@ -676,7 +676,7 @@ $result_floats{'inline'} = {};
-$result_converted{'plaintext'}->{'inline'} = ', plaintext “, , ,
+$result_converted{'plaintext'}->{'inline'} = ', plaintext ", , ,
, raw plaintext ``, , ,
';
diff --git a/tp/t/results/converters_tests/inline_expand_tex.pl
b/tp/t/results/converters_tests/inline_expand_tex.pl
index 8d2a76c956..3de3be5e97 100644
--- a/tp/t/results/converters_tests/inline_expand_tex.pl
+++ b/tp/t/results/converters_tests/inline_expand_tex.pl
@@ -603,7 +603,7 @@ $result_floats{'inline_expand_tex'} = {};
-$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 }’}$ ``
';
diff --git a/tp/t/results/converters_tests/inlinefmtspaces.pl
b/tp/t/results/converters_tests/inlinefmtspaces.pl
index ded8d1bd91..9755a509cc 100644
--- a/tp/t/results/converters_tests/inlinefmtspaces.pl
+++ b/tp/t/results/converters_tests/inlinefmtspaces.pl
@@ -176,7 +176,7 @@ $result_floats{'inlinefmtspaces'} = {};
-$result_converted{'plaintext'}->{'inlinefmtspaces'} = 'A plaintext “ { a. Now
html .
+$result_converted{'plaintext'}->{'inlinefmtspaces'} = 'A plaintext " { a. Now
html .
';
diff --git a/tp/t/results/converters_tests/normal_font_in_monospace.pl
b/tp/t/results/converters_tests/normal_font_in_monospace.pl
index d452795e1e..bca0bd651e 100644
--- a/tp/t/results/converters_tests/normal_font_in_monospace.pl
+++ b/tp/t/results/converters_tests/normal_font_in_monospace.pl
@@ -205,9 +205,9 @@ $result_floats{'normal_font_in_monospace'} = {};
-$result_converted{'plaintext'}->{'normal_font_in_monospace'} = ' in
example in r—now ‘in co---de’
+$result_converted{'plaintext'}->{'normal_font_in_monospace'} = ' in
example in r--now ‘in co---de’
- ‘in command---c in r—r ‘in file---’’.
+ ‘in command---c in r--r ‘in file---’’.
';
diff --git
a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
index 04267b6d34..9b3f6e60f9 100644
--- a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
+++ b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
@@ -923,11 +923,11 @@
$result_converted{'plaintext'}->{'printindex_merged_indices_code_style'} = 'top
* Menu:
-* c“b: chap. (line 6)
-* cdi“h: chap. (line 6)
+* c"b: chap. (line 6)
+* cdi"h: chap. (line 6)
* ddi``g: chap. (line 6)
* f``g: chap. (line 6)
-* v“j: chap. (line 6)
+* v"j: chap. (line 6)
';
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 7d53049e41..6388c95c40 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -2888,23 +2888,23 @@
$result_converted{'plaintext'}->{'test_deftypefnnewline'} = 'top
-- c--ategory:
t--ype
d--eftypefn_name
- d–eftypefn no arg
+ d-eftypefn no arg
-- c--ategory on c--lass:
t--ype
d--eftypeop_name a--rguments...
- d–eftypeop
+ d-eftypeop
-- c--ategory on c--lass:
t--ype
d--eftypeop_name
- d–eftypeop no arg
+ d-eftypeop no arg
-- c--ategory of c--lass: t--ype d--eftypecv_name
- d–eftypecv
+ d-eftypecv
-- c--ategory of c--lass: t--ype d--eftypecv_name a--rguments...
- d–eftypecv with arguments
+ d-eftypecv with arguments
-- fun: arg
fff
@@ -2913,19 +2913,19 @@
$result_converted{'plaintext'}->{'test_deftypefnnewline'} = 'top
aaa2
-- c--ategory2: t--ype2 d--eftypefn_name2
- d–eftypefn no arg2
+ d-eftypefn no arg2
-- c--ategory2 on c--lass2: t--ype2 d--eftypeop_name2 a--rguments2...
- d–eftypeop2
+ d-eftypeop2
-- c--ategory2 on c--lass2: t--ype2 d--eftypeop_name2
- d–eftypeop no arg2
+ d-eftypeop no arg2
-- c--ategory2 of c--lass2: t--ype2 d--eftypecv_name2
- d–eftypecv2
+ d-eftypecv2
-- c--ategory2 of c--lass2: t--ype2 d--eftypecv_name2 a--rguments2...
- d–eftypecv with arguments2
+ d-eftypecv with arguments2
-- fun2: arg2
fff2
diff --git a/tp/t/results/converters_tests/unknown_value.pl
b/tp/t/results/converters_tests/unknown_value.pl
index 65f0157117..f121df93ff 100644
--- a/tp/t/results/converters_tests/unknown_value.pl
+++ b/tp/t/results/converters_tests/unknown_value.pl
@@ -46,7 +46,7 @@ $result_floats{'unknown_value'} = {};
-$result_converted{'plaintext'}->{'unknown_value'} = '{No value for ‘unknown’}
+$result_converted{'plaintext'}->{'unknown_value'} = '{No value for \'unknown\'}
';
diff --git a/tp/t/results/coverage/commands.pl
b/tp/t/results/coverage/commands.pl
index e3610f5652..f24e534387 100644
--- a/tp/t/results/coverage/commands.pl
+++ b/tp/t/results/coverage/commands.pl
@@ -446,7 +446,7 @@ $result_indices_sort_strings{'commands'} = {
$result_converted{'plaintext'}->{'commands'} = '@ TeX ë î ã å
- File → Open. b <a> ‘code --- -- \'\' ``’ — – ” “. SMALL CAPS.
+ File → Open. b <a> ‘code --- -- \'\' ``’ -- - " ". SMALL CAPS.
majorheading in b
*****************
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index d476a0efaa..6da6ebb264 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -1954,11 +1954,11 @@ $result_indices_sort_strings{'def'} = {
$result_converted{'plaintext'}->{'def'} = ' -- c--ategory: d--effn_name
a--rguments...
- d–effn
+ d-effn
-- cate--gory: de--ffn_name ar--guments more args
even more so
- def–fn
+ def-fn
-- fset: I a g
-- cmde: truc
diff --git a/tp/t/results/coverage/exdent_and_formats.pl
b/tp/t/results/coverage/exdent_and_formats.pl
index 46e16e8760..6d33d434e2 100644
--- a/tp/t/results/coverage/exdent_and_formats.pl
+++ b/tp/t/results/coverage/exdent_and_formats.pl
@@ -1626,7 +1626,7 @@ exdented
Nested Other line
exdented nested other line
-exdented quotation line and dash — in quotation
+exdented quotation line and dash -- in quotation
Not exdented followed by exdented
exdented quotation line
diff --git a/tp/t/results/coverage/item_container.pl
b/tp/t/results/coverage/item_container.pl
index e05284e513..020f3c0db1 100644
--- a/tp/t/results/coverage/item_container.pl
+++ b/tp/t/results/coverage/item_container.pl
@@ -344,9 +344,9 @@ $result_floats{'item_container'} = {};
-$result_converted{'plaintext'}->{'item_container'} = ' + i–tem +
+$result_converted{'plaintext'}->{'item_container'} = ' + i-tem +
- • b–ullet
+ • b-ullet
• no itemize argument
';
diff --git a/tp/t/results/coverage/multitable.pl
b/tp/t/results/coverage/multitable.pl
index 06db830c29..f812b6dbfb 100644
--- a/tp/t/results/coverage/multitable.pl
+++ b/tp/t/results/coverage/multitable.pl
@@ -607,11 +607,11 @@ $result_indices_sort_strings{'multitable'} = {
-$result_converted{'plaintext'}->{'multitable'} = 'mu–ltitable headitem
another tab
+$result_converted{'plaintext'}->{'multitable'} = 'mu-ltitable headitem
another tab
--------------------------------------------------------------------------
-mu–ltitable item multitable tab
-mu–ltitable item 2 multitable tab 2
-lone mu–ltitable item
+mu-ltitable item multitable tab
+mu-ltitable item 2 multitable tab 2
+lone mu-ltitable item
truc bidule
';
diff --git a/tp/t/results/coverage/quotation_author.pl
b/tp/t/results/coverage/quotation_author.pl
index 59b4574168..036e79417b 100644
--- a/tp/t/results/coverage/quotation_author.pl
+++ b/tp/t/results/coverage/quotation_author.pl
@@ -215,8 +215,8 @@ $result_floats{'quotation_author'} = {};
$result_converted{'plaintext'}->{'quotation_author'} = ' quotation
quotation continues.
- — _First Author_
- — _Sẽcond author_
+ -- _First Author_
+ -- _Sẽcond author_
';
diff --git a/tp/t/results/coverage/symbol_after_command.pl
b/tp/t/results/coverage/symbol_after_command.pl
index 47e19a1443..0af497b726 100644
--- a/tp/t/results/coverage/symbol_after_command.pl
+++ b/tp/t/results/coverage/symbol_after_command.pl
@@ -441,10 +441,10 @@ $result_converted{'plaintext'}->{'symbol_after_command'}
= '. dot
@ @
{ {
! exclam
-” quotes
+" quotes
: colon
- @. {, @@ ?, !: @{ @” @:
+ @. {, @@ ?, !: @{ @" @:
';
diff --git a/tp/t/results/coverage_braces/abbr_acronym.pl
b/tp/t/results/coverage_braces/abbr_acronym.pl
index 88e50188e8..5d79344cbf 100644
--- a/tp/t/results/coverage_braces/abbr_acronym.pl
+++ b/tp/t/results/coverage_braces/abbr_acronym.pl
@@ -346,9 +346,9 @@ $result_floats{'abbr_acronym'} = {};
-$result_converted{'plaintext'}->{'abbr_acronym'} = '–a (an accronym) –a –a (an
accronym , ...)
+$result_converted{'plaintext'}->{'abbr_acronym'} = '-a (an accronym) -a -a (an
accronym , ...)
- É–a. ,A. (Étude–, Autonome) É–a. ,A.
+ É-a. ,A. (Étude-, Autonome) É-a. ,A.
';
diff --git a/tp/t/results/coverage_braces/email_possibilities.pl
b/tp/t/results/coverage_braces/email_possibilities.pl
index 25a1982adc..4cecd1b027 100644
--- a/tp/t/results/coverage_braces/email_possibilities.pl
+++ b/tp/t/results/coverage_braces/email_possibilities.pl
@@ -116,7 +116,7 @@ $result_floats{'email_possibilities'} = {};
-$result_converted{'plaintext'}->{'email_possibilities'} = '–b <--a> –b <--a>
+$result_converted{'plaintext'}->{'email_possibilities'} = '-b <--a> -b <--a>
';
diff --git a/tp/t/results/coverage_braces/recursive_acronym.pl
b/tp/t/results/coverage_braces/recursive_acronym.pl
index 67b1dabe00..25a9800c65 100644
--- a/tp/t/results/coverage_braces/recursive_acronym.pl
+++ b/tp/t/results/coverage_braces/recursive_acronym.pl
@@ -88,7 +88,7 @@ $result_floats{'recursive_acronym'} = {};
-$result_converted{'plaintext'}->{'recursive_acronym'} = 'GNU (GNU’s Not Unix)
+$result_converted{'plaintext'}->{'recursive_acronym'} = 'GNU (GNU\'s Not Unix)
';
diff --git a/tp/t/results/coverage_braces/recursive_acronym_definition.pl
b/tp/t/results/coverage_braces/recursive_acronym_definition.pl
index f5351b0d3c..732253d9cf 100644
--- a/tp/t/results/coverage_braces/recursive_acronym_definition.pl
+++ b/tp/t/results/coverage_braces/recursive_acronym_definition.pl
@@ -132,7 +132,7 @@ $result_floats{'recursive_acronym_definition'} = {};
-$result_converted{'plaintext'}->{'recursive_acronym_definition'} = 'GNU (GNU
(GNU (is something)’s Not Unix)’s Not Unix)
+$result_converted{'plaintext'}->{'recursive_acronym_definition'} = 'GNU (GNU
(GNU (is something)\'s Not Unix)\'s Not Unix)
';
diff --git a/tp/t/results/coverage_braces/uref_url.pl
b/tp/t/results/coverage_braces/uref_url.pl
index 6cc91a5ec1..4b9b7f3c72 100644
--- a/tp/t/results/coverage_braces/uref_url.pl
+++ b/tp/t/results/coverage_braces/uref_url.pl
@@ -328,7 +328,7 @@ $result_floats{'uref_url'} = {};
-$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
';
diff --git a/tp/t/results/def/all_commands.pl b/tp/t/results/def/all_commands.pl
index 538dcf4ae0..90beb02f0c 100644
--- a/tp/t/results/def/all_commands.pl
+++ b/tp/t/results/def/all_commands.pl
@@ -4677,85 +4677,85 @@ $result_indices_sort_strings{'all_commands'} = {
$result_converted{'plaintext'}->{'all_commands'} = ' -- c--ategory:
d--efvr_name
- d–efvr
+ d-efvr
-- c--ategory: n--ame a--rguments...
- d–effn
+ d-effn
-- c--ategory: n--ame
- d–effn no arg
+ d-effn no arg
-- c--ategory: t--ype d--eftypefn_name a--rguments...
- d–eftypefn
+ d-eftypefn
-- c--ategory: t--ype d--eftypefn_name
- d–eftypefn no arg
+ d-eftypefn no arg
-- c--ategory on c--lass: t--ype d--eftypeop_name a--rguments...
- d–eftypeop
+ d-eftypeop
-- c--ategory on c--lass: t--ype d--eftypeop_name
- d–eftypeop no arg
+ d-eftypeop no arg
-- c--ategory: t--ype d--eftypevr_name
- d–eftypevr
+ d-eftypevr
-- c--ategory of c--lass: d--efcv_name
- d–efcv
+ d-efcv
-- c--ategory of c--lass: d--efcv_name a--rguments...
- d–efcv with arguments
+ d-efcv with arguments
-- c--ategory of c--lass: t--ype d--eftypecv_name
- d–eftypecv
+ d-eftypecv
-- c--ategory of c--lass: t--ype d--eftypecv_name a--rguments...
- d–eftypecv with arguments
+ d-eftypecv with arguments
-- c--ategory on c--lass: d--efop_name a--rguments...
- d–efop
+ d-efop
-- c--ategory on c--lass: d--efop_name
- d–efop no arg
+ d-efop no arg
-- c--ategory: d--eftp_name a--ttributes...
- d–eftp
+ d-eftp
-- Function: d--efun_name a--rguments...
- d–efun
+ d-efun
-- Macro: d--efmac_name a--rguments...
- d–efmac
+ d-efmac
-- Special Form: d--efspec_name a--rguments...
- d–efspec
+ d-efspec
-- Variable: d--efvar_name
- d–efvar
+ d-efvar
-- Variable: d--efvar_name arg--var arg--var1
- d–efvar with args
+ d-efvar with args
-- User Option: d--efopt_name
- d–efopt
+ d-efopt
-- Function: t--ype d--eftypefun_name a--rguments...
- d–eftypefun
+ d-eftypefun
-- Variable: t--ype d--eftypevar_name
- d–eftypevar
+ d-eftypevar
-- Instance Variable of c--lass: d--efivar_name
- d–efivar
+ d-efivar
-- Instance Variable of c--lass: t--ype d--eftypeivar_name
- d–eftypeivar
+ d-eftypeivar
-- Method on c--lass: d--efmethod_name a--rguments...
- d–efmethod
+ d-efmethod
-- Method on c--lass: t--ype d--eftypemethod_name a--rguments...
- d–eftypemethod
+ d-eftypemethod
';
1;
diff --git a/tp/t/results/def/all_commands_printindex.pl
b/tp/t/results/def/all_commands_printindex.pl
index 58191afde4..e79f579586 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -4848,85 +4848,85 @@ File: , Node: Top, Next: chap, Up: (dir)
File: , Node: chap, Prev: Top
-- c--ategory: d--efvr_name
- d–efvr
+ d-efvr
-- c--ategory: n--ame a--rguments...
- d–effn
+ d-effn
-- c--ategory: n--ame
- d–effn no arg
+ d-effn no arg
-- c--ategory: t--ype d--eftypefn_name a--rguments...
- d–eftypefn
+ d-eftypefn
-- c--ategory: t--ype d--eftypefn_name
- d–eftypefn no arg
+ d-eftypefn no arg
-- c--ategory on c--lass: t--ype d--eftypeop_name a--rguments...
- d–eftypeop
+ d-eftypeop
-- c--ategory on c--lass: t--ype d--eftypeop_name
- d–eftypeop no arg
+ d-eftypeop no arg
-- c--ategory: t--ype d--eftypevr_name
- d–eftypevr
+ d-eftypevr
-- c--ategory of c--lass: d--efcv_name
- d–efcv
+ d-efcv
-- c--ategory of c--lass: d--efcv_name a--rguments...
- d–efcv with arguments
+ d-efcv with arguments
-- c--ategory of c--lass: t--ype d--eftypecv_name
- d–eftypecv
+ d-eftypecv
-- c--ategory of c--lass: t--ype d--eftypecv_name a--rguments...
- d–eftypecv with arguments
+ d-eftypecv with arguments
-- c--ategory on c--lass: d--efop_name a--rguments...
- d–efop
+ d-efop
-- c--ategory on c--lass: d--efop_name
- d–efop no arg
+ d-efop no arg
-- c--ategory: d--eftp_name a--ttributes...
- d–eftp
+ d-eftp
-- Function: d--efun_name a--rguments...
- d–efun
+ d-efun
-- Macro: d--efmac_name a--rguments...
- d–efmac
+ d-efmac
-- Special Form: d--efspec_name a--rguments...
- d–efspec
+ d-efspec
-- Variable: d--efvar_name
- d–efvar
+ d-efvar
-- Variable: d--efvar_name arg--var arg--var1
- d–efvar with args
+ d-efvar with args
-- User Option: d--efopt_name
- d–efopt
+ d-efopt
-- Function: t--ype d--eftypefun_name a--rguments...
- d–eftypefun
+ d-eftypefun
-- Variable: t--ype d--eftypevar_name
- d–eftypevar
+ d-eftypevar
-- Instance Variable of c--lass: d--efivar_name
- d–efivar
+ d-efivar
-- Instance Variable of c--lass: t--ype d--eftypeivar_name
- d–eftypeivar
+ d-eftypeivar
-- Method on c--lass: d--efmethod_name a--rguments...
- d–efmethod
+ d-efmethod
-- Method on c--lass: t--ype d--eftypemethod_name a--rguments...
- d–eftypemethod
+ d-eftypemethod
Functions
=========
diff --git a/tp/t/results/float/special_characters_in_float_type.pl
b/tp/t/results/float/special_characters_in_float_type.pl
index e1cb4caedc..755b439d88 100644
--- a/tp/t/results/float/special_characters_in_float_type.pl
+++ b/tp/t/results/float/special_characters_in_float_type.pl
@@ -619,12 +619,13 @@
$result_converted{'plaintext'}->{'special_characters_in_float_type'} = 'top
F
-A < " “ ‘ ’ ’ \\aaa . — IN VAR 1.1: float A < " “ ‘ ’ ’ \\aaa . — IN VAR
+A < " " \' \' \' \\aaa . -- IN VAR 1.1: float A < " " \' \' \' \\aaa . -- IN
+VAR
* Menu:
-* A < " “ ‘ ’ ’ \\aaa . — IN VAR 1.1: L < " `` ` \' \' \\aaa . --- IN VAR.
- float A < " “ ‘ ’ ’ \\aaa . ...
+* A < " " \' \' \' \\aaa . -- IN VAR 1.1: L < " `` ` \' \' \\aaa . --- IN VAR.
+ float A < " " \' \' \' \\aaa . ...
';
@@ -649,12 +650,13 @@ File: , Node: chap, Prev: Top, Up: Top
F
-A < " “ ‘ ’ ’ \\aaa . — IN VAR 1.1: float A < " “ ‘ ’ ’ \\aaa . — IN VAR
+A < " " \' \' \' \\aaa . -- IN VAR 1.1: float A < " " \' \' \' \\aaa . -- IN
+VAR
* Menu:
-* A < " “ ‘ ’ ’ \\aaa . — IN VAR 1.1: L < " `` ` \' \' \\aaa . --- IN VAR.
- float A < " “ ‘ ’ ’ \\aaa . ...
+* A < " " \' \' \' \\aaa . -- IN VAR 1.1: L < " `` ` \' \' \\aaa . --- IN VAR.
+ float A < " " \' \' \' \\aaa . ...
diff --git a/tp/t/results/formats_encodings/accent.pl
b/tp/t/results/formats_encodings/accent.pl
index d3e4af769b..75ded91497 100644
--- a/tp/t/results/formats_encodings/accent.pl
+++ b/tp/t/results/formats_encodings/accent.pl
@@ -2345,17 +2345,17 @@ $result_floats{'accent'} = {};
$result_converted{'plaintext'}->{'accent'} = 'top
***
-should be e‘: è è
+should be e\': è è
- should be e’: é é
+ should be e\': é é
should be e^: ê ê
should be u": ü ü
- should be i‘: ì ì
+ should be i\': ì ì
- should be i’: í í
+ should be i\': í í
should be i^: î î
@@ -2367,7 +2367,7 @@ should be e‘: è è
should be e=: ē ē
- should be e’’: e̋ e̋
+ should be e\'\': e̋ e̋
should be e.: ė ė
@@ -2403,17 +2403,17 @@ should be e‘: è è
pounds sterling: £
- should be dotless i‘: ì
+ should be dotless i\': ì
- should be dotless i’: í
+ should be dotless i\': í
should be dotless i^: î
should be dotless i": ï
- should be dotless j‘: j̀
+ should be dotless j\': j̀
- should be dotless j’: j́
+ should be dotless j\': j́
should be dotless j^: ĵ
diff --git a/tp/t/results/formats_encodings/accent_enable_encoding.pl
b/tp/t/results/formats_encodings/accent_enable_encoding.pl
index 9ab3aa4d2f..0cec20ea59 100644
--- a/tp/t/results/formats_encodings/accent_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accent_enable_encoding.pl
@@ -2345,17 +2345,17 @@ $result_floats{'accent_enable_encoding'} = {};
$result_converted{'plaintext'}->{'accent_enable_encoding'} = 'top
***
-should be e‘: è è
+should be e\': è è
- should be e’: é é
+ should be e\': é é
should be e^: ê ê
should be u": ü ü
- should be i‘: ì ì
+ should be i\': ì ì
- should be i’: í í
+ should be i\': í í
should be i^: î î
@@ -2367,7 +2367,7 @@ should be e‘: è è
should be e=: ē ē
- should be e’’: e̋ e̋
+ should be e\'\': e̋ e̋
should be e.: ė ė
@@ -2403,17 +2403,17 @@ should be e‘: è è
pounds sterling: £
- should be dotless i‘: ì
+ should be dotless i\': ì
- should be dotless i’: í
+ should be dotless i\': í
should be dotless i^: î
should be dotless i": ï
- should be dotless j‘: j̀
+ should be dotless j\': j̀
- should be dotless j’: j́
+ should be dotless j\': j́
should be dotless j^: ĵ
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs.pl
b/tp/t/results/formats_encodings/at_commands_in_refs.pl
index 0d00b1f9c9..6d8ee3efe6 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -18172,8 +18172,8 @@ $result_converted{'plaintext'}->{'at_commands_in_refs'}
= 'Top
14 « » « » ‹ ›
**************
-15 “ ” — – ‘ ’
-**************
+15 " " -- - \' \'
+***************
16 AAA (fff) AAA BBB
********************
@@ -19390,8 +19390,8 @@ File: , Node: « » « » ‹ ›, Next: `` \'\' --- -- ` \',
Prev: “ ”
File: , Node: `` \'\' --- -- ` \', Next: AAA (fff) AAA BBB, Prev: « » « » ‹
›, Up: Top
-15 “ ” — – ‘ ’
-**************
+15 " " -- - \' \'
+***************
File: , Node: AAA (fff) AAA BBB, Next: CCC (rrr) CCC DDD, Prev: `` \'\' ---
-- ` \', Up: Top
@@ -19540,18 +19540,18 @@ Node: ı Ḕ Ḉ2574
Node: “ ” ‘ ’ „ ‚2702
Node: « » « » ‹ ›2844
Node: `` \'\' --- -- ` \'2988
-Node: AAA (fff) AAA BBB3130
-Node: CCC (rrr) CCC DDD3270
-Node: the someone <someone@somewher> <no_explain@there>3443
-Node: [f--ile1] [image src="f--ile.png" alt="alt" text="Image
description\\"\\"\\\\."