From 014a9974873f9725392d06d2c00a02ceba314918 Mon Sep 17 00:00:00 2001
From: hrnz <ulli@hrnz.li>
Date: Wed, 10 Feb 2021 19:58:36 +0100
Subject: [PATCH] Compose: minor adjustments to allow deduplication

Signed-off-by: hrnz <ulli@hrnz.li>
---
 Compose/src/base.module | 65 +++++++++++++++++++++--------------------
 Compose/src/math.module | 14 ++++-----
 2 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/Compose/src/base.module b/Compose/src/base.module
index ecb528a0..f69a685b 100644
--- a/Compose/src/base.module
+++ b/Compose/src/base.module
@@ -61,14 +61,14 @@
 # letters with stroke
 <dead_stroke> <D>                        : "Đ"   Dstroke # LATIN CAPITAL LETTER D WITH STROKE
 <dead_stroke> <d>                        : "đ"   dstroke # LATIN SMALL LETTER D WITH STROKE
-<dead_stroke> <H>                        : "Ħ"   Hstroke # LATIN CAPITAL LETTER H WITH STROKE
+<dead_stroke> <H>                        : "Ħ"   U0126 # LATIN CAPITAL LETTER H WITH STROKE
 <Multi_key> <minus> <H>                  : "Ħ"   U0126 # LATIN CAPITAL LETTER H WITH STROKE
-<dead_stroke> <h>                        : "ħ"   hstroke # LATIN SMALL LETTER H WITH STROKE
+<dead_stroke> <h>                        : "ħ"   U0127 # LATIN SMALL LETTER H WITH STROKE
 <Multi_key> <minus> <h>                  : "ħ"   U0127 # LATIN SMALL LETTER H WITH STROKE
-<dead_stroke> <L>                        : "Ł"   Lstroke # LATIN CAPITAL LETTER L WITH STROKE
-<dead_stroke> <l>                        : "ł"   lstroke # LATIN SMALL LETTER L WITH STROKE
-<dead_stroke> <O>                        : "Ø"   Ooblique # LATIN CAPITAL LETTER O WITH STROKE
-<dead_stroke> <o>                        : "ø"   oslash  # LATIN SMALL LETTER O WITH STROKE
+<dead_stroke> <L>                        : "Ł"   U0141 # LATIN CAPITAL LETTER L WITH STROKE
+<dead_stroke> <l>                        : "ł"   U0142 # LATIN SMALL LETTER L WITH STROKE
+<dead_stroke> <O>                        : "Ø"   Oslash # LATIN CAPITAL LETTER O WITH STROKE
+<dead_stroke> <o>                        : "ø"   oslash # LATIN SMALL LETTER O WITH STROKE
 <dead_acute> <dead_stroke> <O>           : "Ǿ"   U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
 <dead_acute> <dead_stroke> <o>           : "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
 
@@ -144,11 +144,11 @@
 <Multi_key> <z> <z>                      : "ʒ"   U0292 # LATIN SMALL LETTER EZH
 
 # ligatures
-<Multi_key> <f> <f>                      : "ff"   UFB00 # LATIN SMALL LIGATURE FF
-<Multi_key> <f> <i>                      : "fi"   UFB01 # LATIN SMALL LIGATURE FI
-<Multi_key> <f> <l>                      : "fl"   UFB02 # LATIN SMALL LIGATURE FL
-<Multi_key> <F> <i>                      : "ffi"   UFB03 # LATIN SMALL LIGATURE FFI
-<Multi_key> <F> <l>                      : "ffl"   UFB04 # LATIN SMALL LIGATURE FFL
+<Multi_key> <f> <f>                      : "ff"   Ufb00 # LATIN SMALL LIGATURE FF
+<Multi_key> <f> <i>                      : "fi"   Ufb01 # LATIN SMALL LIGATURE FI
+<Multi_key> <f> <l>                      : "fl"   Ufb02 # LATIN SMALL LIGATURE FL
+<Multi_key> <F> <i>                      : "ffi"   Ufb03 # LATIN SMALL LIGATURE FFI
+<Multi_key> <F> <l>                      : "ffl"   Ufb04 # LATIN SMALL LIGATURE FFL
 <Multi_key> <U017F> <t>                  : "ſt"   UFB05 # LATIN SMALL LIGATURE LONG S T
 <Multi_key> <s> <t>                      : "st"   UFB06 # LATIN SMALL LIGATURE ST
 <Multi_key> <I> <J>                      : "IJ"   U0132 # LATIN CAPITAL LIGATURE IJ
@@ -166,26 +166,27 @@
 <Multi_key> <N> <j>                      : "Nj"   U01CB # LATIN CAPITAL LETTER N WITH SMALL LETTER J
 <Multi_key> <n> <j>                      : "nj"   U01CC # LATIN SMALL LETTER NJ
 
-<dead_caron> <0>                         : "₀"   U2080 # SUBSCRIPT ZERO
-<dead_caron> <KP_0>                      : "₀"   U2080 # SUBSCRIPT ZERO
-<dead_caron> <1>                         : "₁"   U2081 # SUBSCRIPT ONE
-<dead_caron> <KP_1>                      : "₁"   U2081 # SUBSCRIPT ONE
-<dead_caron> <2>                         : "₂"   U2082 # SUBSCRIPT TWO
-<dead_caron> <KP_2>                      : "₂"   U2082 # SUBSCRIPT TWO
-<dead_caron> <3>                         : "₃"   U2083 # SUBSCRIPT THREE
-<dead_caron> <KP_3>                      : "₃"   U2083 # SUBSCRIPT THREE
-<dead_caron> <4>                         : "₄"   U2084 # SUBSCRIPT FOUR
-<dead_caron> <KP_4>                      : "₄"   U2084 # SUBSCRIPT FOUR
-<dead_caron> <5>                         : "₅"   U2085 # SUBSCRIPT FIVE
-<dead_caron> <KP_5>                      : "₅"   U2085 # SUBSCRIPT FIVE
-<dead_caron> <6>                         : "₆"   U2086 # SUBSCRIPT SIX
-<dead_caron> <KP_6>                      : "₆"   U2086 # SUBSCRIPT SIX
-<dead_caron> <7>                         : "₇"   U2087 # SUBSCRIPT SEVEN
-<dead_caron> <KP_7>                      : "₇"   U2087 # SUBSCRIPT SEVEN
-<dead_caron> <8>                         : "₈"   U2088 # SUBSCRIPT EIGHT
-<dead_caron> <KP_8>                      : "₈"   U2088 # SUBSCRIPT EIGHT
-<dead_caron> <9>                         : "₉"   U2089 # SUBSCRIPT NINE
-<dead_caron> <KP_9>                      : "₉"   U2089 # SUBSCRIPT NINE
+<dead_caron> <0>    : "₀" zerosubscript # SUBSCRIPT ZERO
+<dead_caron> <KP_0> : "₀"   U2080 # SUBSCRIPT ZERO
+<dead_caron> <1>    : "₁" onesubscript # SUBSCRIPT ONE
+<dead_caron> <KP_1> : "₁"   U2081 # SUBSCRIPT ONE
+<dead_caron> <2>    : "₂" twosubscript # SUBSCRIPT TWO
+<dead_caron> <KP_2> : "₂"   U2082 # SUBSCRIPT TWO
+<dead_caron> <3>    : "₃" threesubscript # SUBSCRIPT THREE
+<dead_caron> <KP_3> : "₃"   U2083 # SUBSCRIPT THREE
+<dead_caron> <4>    : "₄" foursubscript # SUBSCRIPT FOUR
+<dead_caron> <KP_4> : "₄"   U2084 # SUBSCRIPT FOUR
+<dead_caron> <5>    : "₅" fivesubscript # SUBSCRIPT FIVE
+<dead_caron> <KP_5> : "₅"   U2085 # SUBSCRIPT FIVE
+<dead_caron> <6>    : "₆" sixsubscript # SUBSCRIPT SIX
+<dead_caron> <KP_6> : "₆"   U2086 # SUBSCRIPT SIX
+<dead_caron> <7>    : "₇" sevensubscript # SUBSCRIPT SEVEN
+<dead_caron> <KP_7> : "₇"   U2087 # SUBSCRIPT SEVEN
+<dead_caron> <8>    : "₈" eightsubscript # SUBSCRIPT EIGHT
+<dead_caron> <KP_8> : "₈"   U2088 # SUBSCRIPT EIGHT
+<dead_caron> <9>    : "₉" ninesubscript # SUBSCRIPT NINE
+<dead_caron> <KP_9> : "₉"   U2089 # SUBSCRIPT NINE
+
 
 # interpunctation
 <Multi_key> <2> <exclam>                         : "‼"   U203C # DOUBLE EXCLAMATION MARK
@@ -319,7 +320,7 @@
 # other symbols
 <Multi_key> <colon> <parenright>           : "☺"   U263A # WHITE SMILING FACE
 <Multi_key> <colon> <parenleft>            : "☹"   U2639 # WHITE FROWNING FACE
-<Multi_key> <t> <m>                        : "™"   trademark # TRADE MARK SIGN
+<Multi_key> <t> <m>                        : "™"   U2122 # TRADE MARK SIGN
 <Multi_key> <c> <KP_Divide> <o>            : "℅"   U2105 # CARE OF
 <Multi_key> <femalesymbol> <femalesymbol>  : "⚢"   U26A2 # DOUBLED FEMALE SIGN
 <Multi_key> <malesymbol> <malesymbol>      : "⚣"   U26A3 # DOUBLED MALE SIGN
diff --git a/Compose/src/math.module b/Compose/src/math.module
index b27de9aa..20312b81 100644
--- a/Compose/src/math.module
+++ b/Compose/src/math.module
@@ -52,7 +52,7 @@
 <Multi_key> <asciitilde> <equal>           : "≅"   U2245 # APPROXIMATELY EQUAL TO
 <Multi_key> <equal> <asciitilde>           : "≅"   U2245 # APPROXIMATELY EQUAL TO
 <dead_tilde> <equal>                       : "≅"   U2245 # APPROXIMATELY EQUAL TO
-<Multi_key> <asciitilde> <asciitilde>      : "≈"   U2248 # ALMOST EQUAL TO
+<Multi_key> <asciitilde> <asciitilde>      : "≈"   U2248 # ~ ~ ALMOST EQUAL TO
 <dead_tilde> <asciitilde>                  : "≈"   U2248 # ALMOST EQUAL TO
 <dead_macron> <asciitilde>                 : "≃"   U2243 # ASYMPTOTICALLY EQUAL TO
 <dead_tilde> <minus>                       : "≃"   U2243 # ASYMPTOTICALLY EQUAL TO
@@ -244,12 +244,12 @@
 
 # mathematical negations
 <Multi_key> <slash> <equal>                                 : "≠"   U2260 # NOT EQUAL TO
-<dead_stroke> <equal>                                       : "≠"   U2260 # NOT EQUAL TO
-<Multi_key> <equal> <dead_stroke> <dead_stroke>             : "≠"   U2260 # NOT EQUAL TO
-<Multi_key> <KP_Divide> <KP_Equal>                          : "≠"   U2260 # NOT EQUAL TO
-<dead_stroke> <KP_Equal>                                    : "≠"   U2260 # NOT EQUAL TO
-<Multi_key> <KP_Equal> <dead_stroke> <dead_stroke>          : "≠"   U2260 # NOT EQUAL TO
-<Multi_key> <less> <greater>                                : "≠"   U2260 # NOT EQUAL TO
+<dead_stroke> <equal>                                       : "≠"   notequal # NOT EQUAL TO
+<Multi_key> <equal> <dead_stroke> <dead_stroke>             : "≠"   notequal # NOT EQUAL TO
+<Multi_key> <KP_Divide> <KP_Equal>                          : "≠"   notequal # NOT EQUAL TO
+<dead_stroke> <KP_Equal>                                    : "≠"   notequal # NOT EQUAL TO
+<Multi_key> <KP_Equal> <dead_stroke> <dead_stroke>          : "≠"   notequal # NOT EQUAL TO
+<Multi_key> <less> <greater>                                : "≠"   notequal # NOT EQUAL TO
 <dead_stroke> <U21D2>                                       : "⇏"   U21CF # RIGHTWARDS DOUBLE ARROW WITH STROKE
 <Multi_key> <slash> <U21D2>                                 : "⇏"   U21CF # RIGHTWARDS DOUBLE ARROW WITH STROKE
 <dead_stroke> <U21D0>                                       : "⇍"   U21CD # LEFTWARDS DOUBLE ARROW WITH STROKE