summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralex <alex@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2010-01-04 22:56:22 +0000
committeralex <alex@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2010-01-04 22:56:22 +0000
commit51d5d02d25b6a7fb6d567df86faf0a0b46aea62e (patch)
tree7fc58da0b0a6d589579a091311ff3886264e8b65
parentf6261c8cc7d29c5a66e95ecc3545f1985ef47b34 (diff)
†, ☮ in base, ʼn in lang, Umsortierungen/Formatänderungen in math
git-svn-id: https://svn.neo-layout.org@2133 b9310e46-f624-0410-8ea1-cfbb3a30dc96
-rw-r--r--Compose/src/base.module4
-rw-r--r--Compose/src/lang.module4
-rw-r--r--Compose/src/math.module99
3 files changed, 58 insertions, 49 deletions
diff --git a/Compose/src/base.module b/Compose/src/base.module
index 989caa4..ed51f95 100644
--- a/Compose/src/base.module
+++ b/Compose/src/base.module
@@ -285,7 +285,7 @@
<Multi_key> <r> <KP_1> <KP_1> : "ⅺ" U217A # SMALL ROMAN NUMERAL ELEVEN
<Multi_key> <r> <KP_1> <KP_2> : "ⅻ" U217B # SMALL ROMAN NUMERAL TWELVE
-# ordinal numbers english and french
+# ordinal numbers in English and French
<Multi_key> <1> <s> <t> : "1ˢᵗ"
<Multi_key> <KP_1> <s> <t> : "1ˢᵗ"
<Multi_key> <2> <n> <d> : "2ⁿᵈ"
@@ -357,6 +357,7 @@
<dead_stroke> <backslash> : "✘" U2718 # HEAVY BALLOT X
<Multi_key> <less> <3> : "♥" U2665 # BLACK HEART SUIT
<Multi_key> <less> <KP_3> : "♥" U2665 # BLACK HEART SUIT
+<Multi_key> <C> <N> <D> : "☮" U262E # PEACE SYMBOL
<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
@@ -371,6 +372,7 @@
<Multi_key> <minus> <sterling> : "₤" U20A4 # LIRA SIGN
<Multi_key> <p> <o> <i> : "⌘" U2318 # PLACE OF INTEREST SIGN
<Multi_key> <o> <p> <t> : "⌥" U2325 # OPTION KEY
+<Multi_key> <d> <a> <g> : "†" U2020 # DAGGER
<U21BB> <U21CC> : "⇋" U21CB # LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON
<Multi_key> <period> <slash> <period> : "⁒" U2052 # COMMERCIAL MINUS SIGN
<Multi_key> <period> <KP_Divide> <period> : "⁒" U2052 # COMMERCIAL MINUS SIGN
diff --git a/Compose/src/lang.module b/Compose/src/lang.module
index 7381cb1..813a4fe 100644
--- a/Compose/src/lang.module
+++ b/Compose/src/lang.module
@@ -397,6 +397,7 @@
<U21BB> <dead_tilde> <u> : "ṵ" U1E75 # LATIN SMALL LETTER U WITH TILDE BELOW
# other letters
+<Multi_key> <rightsinglequotemark> <n> : "ʼn" U0149 # LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
<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
@@ -443,5 +444,8 @@
<Multi_key> <Y> <G> : "Ȝ" U021C # LATIN CAPITAL LETTER YOGH
<Multi_key> <Y> <g> : "Ȝ" U021C # LATIN CAPITAL LETTER YOGH
<Multi_key> <y> <g> : "ȝ" U021D # LATIN SMALL LETTER YOGH
+#<U21BB> <Greek_delta> : "ƍ" U018D # LATIN SMALL LETTER TURNED DELTA
+#<U21BB> <g> : "ᵷ" U1D77 # LATIN SMALL LETTER TURNED G
+#<Multi_key> <y> <r> : "Ʀ" U01A6 # LATIN LETTER YR
# End of additional Definitions (languages) by Neo keyboard layout
diff --git a/Compose/src/math.module b/Compose/src/math.module
index 04b2ec6..a26cbc4 100644
--- a/Compose/src/math.module
+++ b/Compose/src/math.module
@@ -159,33 +159,9 @@
<dead_abovering> <emptyset> : "⦲" U29B2 # EMPTY SET WITH SMALL CIRCLE ABOVE
<U21BB> <emptyset> : "⦰" U29B0 # REVERSED EMPTY SET
<dead_macron> <emptyset> : "⦱" U29B1 # EMPTY SET WITH OVERBAR
-<Multi_key> <o> <plus> : "⊕" U2295 # CIRCLED PLUS
-<Multi_key> <o> <KP_Add> : "⊕" U2295 # CIRCLED PLUS
-<Multi_key> <o> <minus> : "⊖" U2296 # CIRCLED MINUS
-<Multi_key> <o> <KP_Subtract> : "⊖" U2296 # CIRCLED MINUS
-<Multi_key> <o> <multiply> : "⊗" U2297 # CIRCLED TIMES
-<Multi_key> <o> <slash> : "⊘" U2298 # CIRCLED DIVISION SLASH
-<Multi_key> <o> <KP_Divide> : "⊘" U2298 # CIRCLED DIVISION SLASH
-<Multi_key> <o> <period> : "⊙" U2299 # CIRCLED DOT OPERATOR
-<Multi_key> <o> <jot> : "⊚" U229A # CIRCLED RING OPERATOR
-<Multi_key> <o> <degree> : "⊚" U229A # CIRCLED RING OPERATOR
-<Multi_key> <o> <asterisk> : "⊛" U229B # CIRCLED ASTERISK OPERATOR
-<Multi_key> <o> <equal> : "⊜" U229C # CIRCLED EQUALS
-<Multi_key> <o> <KP_Equal> : "⊜" U229C # CIRCLED EQUALS
-<Multi_key> <o> <U22A5> : "⦹" U29B9 # CIRCLED PERPENDICULAR
-<Multi_key> <o> <U2225> : "⦷" U29B7 # CIRCLED PARALLEL
-<Multi_key> <o> <less> : "⧀" U29C0 # CIRCLED LESS-THAN
-<Multi_key> <o> <greater> : "⧁" U29C1 # CIRCLED GREATER-THAN
+
<Multi_key> <asterisk> <asterisk> : "∗" U2217 # ASTERISK OPERATOR
<Multi_key> <KP_Multiply> <KP_Multiply> : "∗" U2217 # ASTERISK OPERATOR
-<Multi_key> <bar> <multiply> <bar> : "⋈" U22C8 # BOWTIE
-<Multi_key> <bar> <multiply> <space> : "⋉" U22C9 # LEFT NORMAL FACTOR SEMIDIRECT PRODUCT
-<Multi_key> <multiply> <bar> : "⋊" U22CA # RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT
-<U21BB> <asciitilde> : "≀" U2240 # WREATH PRODUCT
-<U21BB> <U2221> : "∢" U2222 # SPHERICAL ANGLE
-<U21BB> <ampersand> : "⅋" U214B # TURNED AMPERSAND
-<Multi_key> <d> <a> <g> : "†" U2020 # DAGGER
-<Multi_key> <minus> <colon> : "∹" U2239 # EXCESS
<Multi_key> <2> <greater> : "≫" U226B # MUCH GREATER-THAN
<Multi_key> <KP_2> <greater> : "≫" U226B # MUCH GREATER-THAN
<Multi_key> <2> <less> : "≪" U226A # MUCH LESS-THAN
@@ -202,10 +178,33 @@
<Multi_key> <3> <equal> : "⩶" U2A76 # THREE CONSECUTIVE EQUALS SIGNS
<Multi_key> <KP_3> <equal> : "⩶" U2A76 # THREE CONSECUTIVE EQUALS SIGNS
+# enclosed symbols
+<Multi_key> <o> <plus> : "⊕" U2295 # CIRCLED PLUS
+<Multi_key> <o> <KP_Add> : "⊕" U2295 # CIRCLED PLUS
+<Multi_key> <o> <minus> : "⊖" U2296 # CIRCLED MINUS
+<Multi_key> <o> <KP_Subtract> : "⊖" U2296 # CIRCLED MINUS
+<Multi_key> <o> <multiply> : "⊗" U2297 # CIRCLED TIMES
+<Multi_key> <o> <slash> : "⊘" U2298 # CIRCLED DIVISION SLASH
+<Multi_key> <o> <KP_Divide> : "⊘" U2298 # CIRCLED DIVISION SLASH
+<Multi_key> <o> <period> : "⊙" U2299 # CIRCLED DOT OPERATOR
+<Multi_key> <o> <jot> : "⊚" U229A # CIRCLED RING OPERATOR
+<Multi_key> <o> <degree> : "⊚" U229A # CIRCLED RING OPERATOR
+<Multi_key> <o> <asterisk> : "⊛" U229B # CIRCLED ASTERISK OPERATOR
+<Multi_key> <o> <equal> : "⊜" U229C # CIRCLED EQUALS
+<Multi_key> <o> <KP_Equal> : "⊜" U229C # CIRCLED EQUALS
+<Multi_key> <o> <U22A5> : "⦹" U29B9 # CIRCLED PERPENDICULAR
+<Multi_key> <o> <U2225> : "⦷" U29B7 # CIRCLED PARALLEL
+<Multi_key> <o> <less> : "⧀" U29C0 # CIRCLED LESS-THAN
+<Multi_key> <o> <greater> : "⧁" U29C1 # CIRCLED GREATER-THAN
+<Multi_key> <Greek_DELTA> <plus> : "⨹" U2A39 # PLUS SIGN IN TRIANGLE
+<Multi_key> <plus> <Greek_DELTA> : "⨹" U2A39 # PLUS SIGN IN TRIANGLE
+<Multi_key> <Greek_DELTA> <minus> : "⨺" U2A3A # MINUS SIGN IN TRIANGLE
+<Multi_key> <minus> <Greek_DELTA> : "⨺" U2A3A # MINUS SIGN IN TRIANGLE
+<Multi_key> <Greek_DELTA> <multiply> : "⨻" U2A3B # MULTIPLICATION SIGN IN TRIANGLE
+<Multi_key> <multiply> <Greek_DELTA> : "⨻" U2A3B # MULTIPLICATION SIGN IN TRIANGLE
+
# new ideas (to be discussed)
<dead_belowdot> <logicaland> : "⟑" U27D1 # AND WITH DOT
-<dead_abovedot> <Greek_DELTA> : "⧊" U29CA # TRIANGLE WITH DOT ABOVE
-<Multi_key> <colon> <rightarrow> : "⧴" U29F4 # RULE-DELAYED
<Multi_key> <minus> <integral> : "⨍" U2A0D # FINITE PART INTEGRAL
<Multi_key> <equal> <integral> : "⨎" U2A0E # INTEGRAL WITH DOUBLE STROKE
<Multi_key> <integral> <equal> : "⨎" U2A0E # INTEGRAL WITH DOUBLE STROKE
@@ -226,19 +225,23 @@
<dead_macron> <intersection> : "⩃" U2A43 # INTERSECTION WITH OVERBAR
<Multi_key> <less> <parenright> : "⪦" U2AA6 # LESS-THAN CLOSED BY CURVE
<Multi_key> <parenleft> <greater> : "⪧" U2AA7 # GREATER-THAN CLOSED BY CURVE
-<U21BB> <numbersign> : "⨳" U2A33 # SMASH PRODUCT
-#<Multi_key> <multiply> <multiply> : "⨯" U2A2F # VECTOR OR CROSS PRODUCT
-<Multi_key> <Greek_DELTA> <plus> : "⨹" U2A39 # PLUS SIGN IN TRIANGLE
-<Multi_key> <plus> <Greek_DELTA> : "⨹" U2A39 # PLUS SIGN IN TRIANGLE
-<Multi_key> <Greek_DELTA> <minus> : "⨺" U2A3A # MINUS SIGN IN TRIANGLE
-<Multi_key> <minus> <Greek_DELTA> : "⨺" U2A3A # MINUS SIGN IN TRIANGLE
-<Multi_key> <Greek_DELTA> <multiply> : "⨻" U2A3B # MULTIPLICATION SIGN IN TRIANGLE
-<Multi_key> <multiply> <Greek_DELTA> : "⨻" U2A3B # MULTIPLICATION SIGN IN TRIANGLE
+<Multi_key> <multiply> <multiply> : "⨯" U2A2F # VECTOR OR CROSS PRODUCT
<Multi_key> <question> <less> : "⩻" U2A7B # LESS-THAN WITH QUESTION MARK ABOVE
<Multi_key> <less> <question> : "⩻" U2A7B # LESS-THAN WITH QUESTION MARK ABOVE
<Multi_key> <question> <greater> : "⩼" U2A7C # GREATER-THAN WITH QUESTION MARK ABOVE
<Multi_key> <greater> <question> : "⩼" U2A7C # GREATER-THAN WITH QUESTION MARK ABOVE
+# misc. symbols
+<Multi_key> <bar> <multiply> <bar> : "⋈" U22C8 # BOWTIE
+<Multi_key> <bar> <multiply> <space> : "⋉" U22C9 # LEFT NORMAL FACTOR SEMIDIRECT PRODUCT
+<Multi_key> <multiply> <bar> : "⋊" U22CA # RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT
+<U21BB> <asciitilde> : "≀" U2240 # WREATH PRODUCT
+<U21BB> <U2221> : "∢" U2222 # SPHERICAL ANGLE
+<U21BB> <ampersand> : "⅋" U214B # TURNED AMPERSAND
+<Multi_key> <minus> <colon> : "∹" U2239 # EXCESS
+<U21BB> <numbersign> : "⨳" U2A33 # SMASH PRODUCT
+<dead_abovedot> <Greek_DELTA> : "⧊" U29CA # TRIANGLE WITH DOT ABOVE
+
# mathematical negations
<Multi_key> <slash> <equal> : "≠" U2260 # NOT EQUAL TO
<dead_stroke> <equal> : "≠" U2260 # NOT EQUAL TO
@@ -306,19 +309,6 @@
<dead_stroke> <Multi_key> <bar> <minus> : "⊬" U22AC # DOES NOT PROVE
<dead_stroke> <Multi_key> <bar> <equal> : "⊭" U22AD # NOT TRUE
<dead_stroke> <Multi_key> <bar> <KP_Equal> : "⊭" U22AD # NOT TRUE
-
-# Vector
-<dead_circumflex> <rightarrow> : "⃗" U20D7 # COMBINING RIGHT ARROW ABOVE
-<dead_circumflex> <greater> : "⃗" U20D7 # COMBINING RIGHT ARROW ABOVE
-<Multi_key> <asciicircum> <greater> : "⃗" U20D7 # COMBINING RIGHT ARROW ABOVE
-<Multi_key> <asciicircum> <rightarrow> : "⃗" U20D7 # COMBINING RIGHT ARROW ABOVE
-<U21BB> <U20D7> : "⃖" U20D6 # COMBINING LEFT ARROW ABOVE
-<dead_circumflex> <leftarrow> : "⃖" U20D6 # COMBINING LEFT ARROW ABOVE
-<dead_circumflex> <U21BB> <rightarrow> : "⃖" U20D6 # COMBINING LEFT ARROW ABOVE
-<dead_circumflex> <less> : "⃖" U20D6 # COMBINING LEFT ARROW ABOVE
-<Multi_key> <asciicircum> <less> : "⃖" U20D6 # COMBINING LEFT ARROW ABOVE
-<Multi_key> <asciicircum> <leftarrow> : "⃖" U20D6 # COMBINING LEFT ARROW ABOVE
-<Multi_key> <asciicircum> <U21BB> <rightarrow> : "⃖" U20D6 # COMBINING LEFT ARROW ABOVE
# arrows
<Multi_key> <less> <minus> : "←" U2190 # LEFTWARDS ARROW
@@ -423,6 +413,18 @@
<dead_ring> <leftarrow> : "↫" U21AB # LEFTWARDS ARROW WITH LOOP
<dead_ring> <U21BB> <rightarrow> : "↫" U21AB # LEFTWARDS ARROW WITH LOOP
<dead_ring> <rightarrow> : "↬" U21AC # RIGHTWARDS ARROW WITH LOOP
+<Multi_key> <colon> <rightarrow> : "⧴" U29F4 # RULE-DELAYED
+<dead_circumflex> <rightarrow> : "⃗" U20D7 # COMBINING RIGHT ARROW ABOVE
+<dead_circumflex> <greater> : "⃗" U20D7 # COMBINING RIGHT ARROW ABOVE
+<Multi_key> <asciicircum> <greater> : "⃗" U20D7 # COMBINING RIGHT ARROW ABOVE
+<Multi_key> <asciicircum> <rightarrow> : "⃗" U20D7 # COMBINING RIGHT ARROW ABOVE
+<U21BB> <U20D7> : "⃖" U20D6 # COMBINING LEFT ARROW ABOVE
+<dead_circumflex> <leftarrow> : "⃖" U20D6 # COMBINING LEFT ARROW ABOVE
+<dead_circumflex> <U21BB> <rightarrow> : "⃖" U20D6 # COMBINING LEFT ARROW ABOVE
+<dead_circumflex> <less> : "⃖" U20D6 # COMBINING LEFT ARROW ABOVE
+<Multi_key> <asciicircum> <less> : "⃖" U20D6 # COMBINING LEFT ARROW ABOVE
+<Multi_key> <asciicircum> <leftarrow> : "⃖" U20D6 # COMBINING LEFT ARROW ABOVE
+<Multi_key> <asciicircum> <U21BB> <rightarrow> : "⃖" U20D6 # COMBINING LEFT ARROW ABOVE
# possible additions:
# ˙: ⇠⇡⇢⇣
# ¯: ↤↥↦↧↨
@@ -533,6 +535,7 @@
<Multi_key> <s> <c> <l> : "ℓ" U2113 # SCRIPT SMALL L
<Multi_key> <e> <l> <l> : "ℓ" U2113 # SCRIPT SMALL L
<Multi_key> <s> <c> <P> : "℘" U2118 # SCRIPT CAPITAL P
+<Multi_key> <w> <p> : "℘" U2118 # SCRIPT CAPITAL P
<Multi_key> <s> <c> <R> : "ℛ" U211B # SCRIPT CAPITAL R
<Multi_key> <s> <c> <B> : "ℬ" U212C # SCRIPT CAPITAL B
<Multi_key> <s> <c> <e> : "ℯ" U212F # SCRIPT SMALL E