Kleine Änderungen, z.B. ȣ, ♥ eingefügt, belowdot.

git-svn-id: https://svn.neo-layout.org@2087 b9310e46-f624-0410-8ea1-cfbb3a30dc96

2 files changed, 17 insertions, 42 deletions

diff --git a/Compose/src/base.module b/Compose/src/base.module
index 3096912..3b6d63b 100644
--- a/Compose/src/base.module
+++ b/Compose/src/base.module
@@ -127,19 +127,19 @@
 <U02F5> <r>                              : "ȑ"   U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
 <U02F5> <U>                              : "Ȕ"   U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
 <U02F5> <u>                              : "ȕ"   U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
-# double grave as turned double acute
-#<U21BB> <dead_doubleacute> <A>           : "Ȁ"   U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
-#<U21BB> <dead_doubleacute> <a>           : "ȁ"   U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
-#<U21BB> <dead_doubleacute> <E>           : "Ȅ"   U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
-#<U21BB> <dead_doubleacute> <e>           : "ȅ"   U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
-#<U21BB> <dead_doubleacute> <I>           : "Ȉ"   U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
-#<U21BB> <dead_doubleacute> <i>           : "ȉ"   U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
-#<U21BB> <dead_doubleacute> <O>           : "Ȍ"   U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
-#<U21BB> <dead_doubleacute> <o>           : "ȍ"   U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
-#<U21BB> <dead_doubleacute> <R>           : "Ȑ"   U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
-#<U21BB> <dead_doubleacute> <r>           : "ȑ"   U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
-#<U21BB> <dead_doubleacute> <U>           : "Ȕ"   U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
-#<U21BB> <dead_doubleacute> <u>           : "ȕ"   U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
+# double grave as turned double acute (will replace double grave)
+<U21BB> <dead_doubleacute> <A>           : "Ȁ"   U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+<U21BB> <dead_doubleacute> <a>           : "ȁ"   U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
+<U21BB> <dead_doubleacute> <E>           : "Ȅ"   U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+<U21BB> <dead_doubleacute> <e>           : "ȅ"   U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
+<U21BB> <dead_doubleacute> <I>           : "Ȉ"   U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+<U21BB> <dead_doubleacute> <i>           : "ȉ"   U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
+<U21BB> <dead_doubleacute> <O>           : "Ȍ"   U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+<U21BB> <dead_doubleacute> <o>           : "ȍ"   U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
+<U21BB> <dead_doubleacute> <R>           : "Ȑ"   U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+<U21BB> <dead_doubleacute> <r>           : "ȑ"   U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
+<U21BB> <dead_doubleacute> <U>           : "Ȕ"   U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+<U21BB> <dead_doubleacute> <u>           : "ȕ"   U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
 
 # letters with comma below
 <Multi_key> <S> <comma>                  : "Ș"   U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
@@ -354,6 +354,7 @@
 <dead_stroke> <slash>                      : "✘"   U2718 # HEAVY BALLOT X
 <dead_stroke> <KP_Divide>                  : "✘"   U2718 # HEAVY BALLOT X
 <dead_stroke> <backslash>                  : "✘"   U2718 # HEAVY BALLOT X
+<Multi_key> <less> <3>                     : "♥"   U2665 # BLACK HEART SUIT
 <Multi_key> <bracketleft> <bracketright>   : "□"   U25A1 # WHITE SQUARE
 <Multi_key> <U25A1> <U2714>                : "☑"   U2611 # BALLOT BOX WITH CHECK
 <Multi_key> <U2714> <U25A1>                : "☑"   U2611 # BALLOT BOX WITH CHECK
diff --git a/Compose/src/lang.module b/Compose/src/lang.module
index 02892b3..1d2779b 100644
--- a/Compose/src/lang.module
+++ b/Compose/src/lang.module
@@ -346,14 +346,6 @@
 <U1FBF> <dead_circumflex> <e>                     : "ể" U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <U1FBF> <dead_circumflex> <O>                     : "Ổ" U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <U1FBF> <dead_circumflex> <o>                     : "ổ" U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-#<dead_breve> <dead_abovedot> <A>                  : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-#<dead_breve> <dead_abovedot> <a>                  : "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
-#<dead_circumflex> <dead_abovedot> <A>             : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-#<dead_circumflex> <dead_abovedot> <a>             : "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-#<dead_circumflex> <dead_abovedot> <E>             : "Ệ" U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-#<dead_circumflex> <dead_abovedot> <e>             : "ệ" U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-#<dead_circumflex> <dead_abovedot> <O>             : "Ộ" U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-#<dead_circumflex> <dead_abovedot> <o>             : "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <U02DE> <O>                                       : "Ơ" U01A0 # LATIN CAPITAL LETTER O WITH HORN
 <U02DE> <o>                                       : "ơ" U01A1 # LATIN SMALL LETTER O WITH HORN
 <dead_acute> <U02DE> <O>                          : "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
@@ -364,9 +356,7 @@
 <U1FBF> <U02DE> <o>                               : "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
 <dead_tilde> <U02DE> <O>                          : "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <dead_tilde> <U02DE> <o>                          : "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
-#<dead_abovedot> <U02DE> <O>                       : "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <dead_belowdot> <U02DE> <O>                       : "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
-#<dead_abovedot> <U02DE> <o>                       : "ợ" U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <dead_belowdot> <U02DE> <o>                       : "ợ" U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <U02DE> <U>                                       : "Ư" U01AF # LATIN CAPITAL LETTER U WITH HORN
 <U02DE> <u>                                       : "ư" U01B0 # LATIN SMALL LETTER U WITH HORN
@@ -378,31 +368,15 @@
 <U1FBF> <U02DE> <u>                               : "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
 <dead_tilde> <U02DE> <U>                          : "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <dead_tilde> <U02DE> <u>                          : "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
-#<dead_abovedot> <U02DE> <U>                       : "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <dead_belowdot> <U02DE> <U>                       : "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
-#<dead_abovedot> <U02DE> <u>                       : "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
 <dead_belowdot> <U02DE> <u>                       : "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
 
-# Combinations with umlauts
-<dead_macron> <Udiaeresis>                        : "Ǖ" U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
-<dead_macron> <udiaeresis>                        : "ǖ" U01D6 # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
-<dead_acute> <Udiaeresis>                         : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-<dead_acute> <udiaeresis>                         : "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
-<dead_caron> <Udiaeresis>                         : "Ǚ" U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
-<dead_caron> <udiaeresis>                         : "ǚ" U01DA # LATIN SMALL LETTER U WITH DIAERESIS AND CARON
-<dead_grave> <Udiaeresis>                         : "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
-<dead_grave> <udiaeresis>                         : "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
-<dead_macron> <Adiaeresis>                        : "Ǟ" U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
-<dead_macron> <adiaeresis>                        : "ǟ" U01DF # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
-<dead_macron> <Odiaeresis>                        : "Ȫ" U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
-<dead_macron> <odiaeresis>                        : "ȫ" U022B # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
-
 # other letters
 <Multi_key> <n> <bar>                             : "ƞ" U019E # LATIN SMALL LETTER N WITH LONG RIGHT LEG
 <Multi_key> <N> <bar>                             : "Ƞ" U0220 # LATIN CAPITAL LETTER N WITH LONG RIGHT LEG
-#<Multi_key> <g> <U>                               : "Ȣ" U0222 # LATIN CAPITAL LETTER OU
-#<Multi_key> <O> <U>                               : "Ȣ" U0222 # LATIN CAPITAL LETTER OU
-#<Multi_key> <Greek_omicron> <Greek_upsilon>       : "ȣ" U0223 # LATIN SMALL LETTER OU
+<Multi_key> <g> <U>                               : "Ȣ" U0222 # LATIN CAPITAL LETTER OU
+<Multi_key> <O> <U>                               : "Ȣ" U0222 # LATIN CAPITAL LETTER OU
+<Multi_key> <Greek_omicron> <Greek_upsilon>       : "ȣ" U0223 # LATIN SMALL LETTER OU
 #<Multi_key> <g> <u>                               : "ȣ" U0223 # LATIN SMALL LETTER OU
 #<U21BB> <propto>                                  : "ȣ" U0223 # LATIN SMALL LETTER OU