[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Sun, 29 Sep 2024 17:16:40 -0400 (EDT) |
branch: master
commit 4b847fda34bc4a127c4f68af105ca4892b8224ed
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Jul 11 09:02:43 2024 +0200
* tp/Texinfo/Convert/Unicode.pm (%unicode_map, %extra_unicode_map):
remove commands associated with empty string. Add all the commands in
comment to simplify visual comparison with other similar maps.
---
ChangeLog | 6 ++++
tp/Texinfo/Common.pm | 2 +-
tp/Texinfo/Convert/Unicode.pm | 79 +++++++++++++++++++++++++------------------
3 files changed, 54 insertions(+), 33 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6afe8a5f09..7ee1fa32d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-07-11 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/Unicode.pm (%unicode_map, %extra_unicode_map):
+ remove commands associated with empty string. Add all the commands in
+ comment to simplify visual comparison with other similar maps.
+
2024-07-11 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (%css_no_arg_commands): add error as
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index e47100a5a1..d8cc14d253 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -393,7 +393,7 @@ our %text_brace_no_arg_commands = (
'lbracechar' => '{',
'rbracechar' => '}',
- # symbols
+ # symbols (22)
'arrow' => '->',
'bullet' => '*',
'copyright' => '(C)',
diff --git a/tp/Texinfo/Convert/Unicode.pm b/tp/Texinfo/Convert/Unicode.pm
index 186b32b6a0..f32bad989a 100644
--- a/tp/Texinfo/Convert/Unicode.pm
+++ b/tp/Texinfo/Convert/Unicode.pm
@@ -485,63 +485,69 @@ our %unicode_simple_character_map = (
#http://www.alanwood.net/unicode/general_punctuation.html 20**
#http://www.alanwood.net/unicode/mathematical_operators.html 22**
+# 'today' is not set here.
our %unicode_map = (
- 'today' => '',
- 'aa' => '00E5',
- 'AA' => '00C5',
- 'ae' => '00E6',
- 'oe' => '0153',
- 'AE' => '00C6',
- 'OE' => '0152',
- 'o' => '00F8',
- 'O' => '00D8',
- 'ss' => '00DF',
- 'DH' => '00D0',
- 'dh' => '00F0',
- 'TH' => '00DE',
- 'th' => '00FE',
- 'l' => '0142',
- 'L' => '0141',
- 'exclamdown' => '00A1',
- 'questiondown' => '00BF',
- 'pounds' => '00A3',
- 'ordf' => '00AA',
- 'ordm' => '00BA',
- 'comma' => '002C',
+ # characters
'atchar' => '0040',
'ampchar' => '0026',
- 'lbracechar' => '007B',
- 'rbracechar' => '007D',
'backslashchar' => '005C',
+ 'comma' => '002C',
'hashchar' => '0023',
+ 'lbracechar' => '007B',
+ 'rbracechar' => '007D',
+
+ # symbols (9)
'euro' => '20AC',
+ 'exclamdown' => '00A1',
'geq' => '2265',
'leq' => '2264',
- 'tie' => '',
-# 'tie' => '0020',
+ 'ordf' => '00AA',
+ 'ordm' => '00BA',
+ 'pounds' => '00A3',
+ 'questiondown' => '00BF',
'textdegree' => '00B0',
- 'quotedblbase' => '201E',
- 'quotesinglbase' => '201A',
+
+ # quotes
'guillemetleft' => '00AB',
'guillemetright' => '00BB',
'guillemotleft' => '00AB',
'guillemotright' => '00BB',
'guilsinglleft' => '2039',
'guilsinglright' => '203A',
+ 'quotedblbase' => '201E',
+ 'quotesinglbase' => '201A',
+
+ # letters
+ 'AA' => '00C5',
+ 'aa' => '00E5',
+ 'AE' => '00C6',
+ 'ae' => '00E6',
+ 'DH' => '00D0',
+ 'dh' => '00F0',
+ 'L' => '0141',
+ 'l' => '0142',
+ 'O' => '00D8',
+ 'o' => '00F8',
+ 'OE' => '0152',
+ 'oe' => '0153',
+ 'ss' => '00DF',
+ 'TH' => '00DE',
+ 'th' => '00FE',
+
);
# For commands where ASCII output is acceptable and may be wanted by the users
# as ASCII instead of encoded characters
our %extra_unicode_map = (
+ # symbols (11 + 3)
+ 'arrow' => '2192',
'bullet' => '2022',
'copyright' => '00A9',
- 'registeredsymbol' => '00AE',
'dots' => '2026',
- 'enddots' => '',
+ #'enddots' => '',
'equiv' => '2261',
- 'error' => '',
'expansion' => '21A6',
- 'arrow' => '2192',
+ #'LaTeX'
'minus' => '2212', # in mathematical operators
# 'minus' => '002D', # in latin1
'point' => '22C6', # another candidate is 2605
@@ -550,14 +556,23 @@ our %extra_unicode_map = (
# but less consistent with TeX
# \star
'print' => '22A3',
+ 'registeredsymbol' => '00AE',
'result' => '21D2',
+ #'TeX'
+
+ # quotes
'quotedblleft' => '201C',
'quotedblright' => '201D',
'quoteleft' => '2018',
'quoteright' => '2019',
+
+ # other
# this should only happen if the @clickstyle argument isn't a
# command with braces and no argument.
'click' => '2192',
+ #'error' => '',
+ #'tie' => '',
+# 'tie' => '0020',
);
%unicode_map = (%unicode_map, %extra_unicode_map);