From 846d37a29620310ef2fabc54b7844c0151250df4 Mon Sep 17 00:00:00 2001
From: pascal <pascal@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Thu, 26 Mar 2009 23:03:12 +0000
Subject: weitere Verbesserung der Ebene 6, wiederum nach Anregung von Alex
git-svn-id: https://svn.neo-layout.org@1772 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
A-REFERENZ-A/neo20-test.txt | 12 ++++++------
Compose/Compose.neo | 43 ++++++++++++++++++++++++++++++++++---------
2 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/A-REFERENZ-A/neo20-test.txt b/A-REFERENZ-A/neo20-test.txt
index 1e71c35..458eee9 100644
--- a/A-REFERENZ-A/neo20-test.txt
+++ b/A-REFERENZ-A/neo20-test.txt
@@ -175,16 +175,16 @@ Für die Ziffern auf der ersten Ebene wird nicht die KP_-Variante verwendet.
=== Alle Ebenen – Haupttastatur ===
┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────────┐
-│˜ ˇ ¯│° ª ¬│§ º ∨│ℓ № ∧│» ⇞ ⊥│« · ∡│$ £ ∥│€ ¤ →│„ ∞│“ / ↦│” * ∅│— - ╌│ ̏ │Backspace│
+│˜ ˇ ¯│° ª ¬│§ º ∨│ℓ № ∧│» ⇞ ⊥│« · ∡│$ £ ∥│€ ¤ →│„ ∞│“ / ∝│” * ∅│— - ╌│ ̏ │Backspace│
│ˆ ˚ ˘│1 ¹ ₁│2 ² ₂│3 ³ ₃│4 › ♀│5 ‹ ♂│6 ¢ ⚥│7 ¥ κ│8 ‚ ⟨│9 ‘ ⟩│0 ’ ₀│- ‑│` ¨ ῾│ ⌫ │
├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──────┤
│ Tab⇤ │X ⋮ Ξ│V ⌫ √│L ⇡ Λ│C ⌦ ℂ│W ⎀ Ω│K ¡ ×│H 7 Ψ│G 8 Γ│F 9 Φ│Q + ℚ│ẞ − ∘│¸ ˝ ˙│ │
│ Tab⇥ ♫ │x … ξ│v _ │l [ λ│c ] χ│w ^ ω│k ! ϰ│h < ψ│g > γ│f = φ│q & ϕ│ß ſ ς│´ / ᾿│Return│
├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┐ │
-│ Mod │U ⇱ ∮│I ⇠ ∫│A ⇣ ∀│E ⇢ ∃│O ⇲ ∈│S ¿ Σ│N 4 ℕ│R 5 ℝ│T 6 ∂│D , Δ│Y . ∇│ Mod │ ↲ │
+│ Mod │U ⇱ ⊂│I ⇠ ∫│A ⇣ ∀│E ⇢ ∃│O ⇲ ∈│S ¿ Σ│N 4 ℕ│R 5 ℝ│T 6 ∂│D , Δ│Y . ∇│ Mod │ ↲ │
│ 3 │u \ │i / ι│a { α│e } ε│o * ο│s ? σ│n ( ν│r ) ϱ│t - τ│d : δ│y @ υ│ 3 │ │
├──────┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴─────┴─────┤
-│CapsLk│ Lock│Ü ⌧ ∪│Ö ⇥ ∩│Ä ⇟ ⊂│P ↲ Π│Z ↶ ℤ│B : ⇐│M 1 ⇔│– 2 ⇒│• 3 Θ│J ; ∝│ CapsLock │
+│CapsLk│ Lock│Ü ⌧ ∪│Ö ⇥ ∩│Ä ⇟ ℵ│P ↲ Π│Z ↶ ℤ│B : ⇐│M 1 ⇔│– 2 ⇒│• 3 Θ│J ; ↦│ CapsLock │
│Umsch │Mod4 │ü # │ö $ ϵ│ä | η│p ~ π│z ` ζ│b + β│m % μ│, " ρ│. ' ϑ│j ; θ│ Umschalt │
├──────┼─────┴┬────┴─┬───┴─────┴─────┴─────┴─────┴─────┴────┬┴─────┼─────┴┬──────┬──────┤
│ Strg │ │ Alt │Leerzeichen␣ 0 schmal ¦ │ Lock │ │ Menü │ Strg │
@@ -258,13 +258,13 @@ Für die Ziffern auf der ersten Ebene wird nicht die KP_-Variante verwendet.
=== Sechste Ebene – Miniatur ===
┌───┬─┬─┬─┬─┬─┬─┬─┬─┬─┬─┬─┬─┬──────┐
-│ ¯ │¬│∨│∧│⊥│∡│∥│→│∞│↦│∅│╌│ ̦│ Back │
+│ ¯ │¬│∨│∧│⊥│∡│∥│→│∞│∝│∅│╌│ ̦│ Back │
├───┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬─────┤
│ │Ξ│√│Λ│ℂ│Ω│×│Ψ│Γ│Φ│ℚ│∘│˙│ Ret │
├────┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴─┐ │
-│ M3 │∮│∫│∀│∃│∈│Σ│ℕ│ℝ│∂│Δ│∇│M3│ │
+│ M3 │⊂│∫│∀│∃│∈│Σ│ℕ│ℝ│∂│Δ│∇│M3│ │
├───┬─┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴──┴───┤
-│Ums│M4│∪│∩│⊂│Π│ℤ│⇐│⇔│⇒│Θ│∝│ Umsch │
+│Ums│M4│∪│∩│ℵ│Π│ℤ│⇐│⇔│⇒│Θ│↦│ Umsch │
├───┼──┼─┴┬┴─┴─┴─┴─┴─┴┬┴─┼─┴┬──┬───┤
│Str│Fe│Al│ schmal ¦ │M4│Fe│Me│Str│
└───┴──┴──┴───────────┴──┴──┴──┴───┘
diff --git a/Compose/Compose.neo b/Compose/Compose.neo
index d7590c2..d8ef285 100644
--- a/Compose/Compose.neo
+++ b/Compose/Compose.neo
@@ -1149,15 +1149,25 @@
<Multi_key> <4> <integral> : "⨌" U2A0C # QUADRUPLE INTEGRAL OPERATOR
<Multi_key> <integral> <KP_4> : "⨌" U2A0C # QUADRUPLE INTEGRAL OPERATOR
<Multi_key> <KP_4> <integral> : "⨌" U2A0C # QUADRUPLE INTEGRAL OPERATOR
-<Multi_key> <U222E> <2> : "∯" U222F # SURFACE INTEGRAL
-<Multi_key> <2> <U222E> : "∯" U222F # SURFACE INTEGRAL
-<Multi_key> <U222E> <U222E> : "∯" U222F # SURFACE INTEGRAL
-<Multi_key> <U222E> <KP_2> : "∯" U222F # SURFACE U222E
-<Multi_key> <KP_2> <U222E> : "∯" U222F # SURFACE U222E
-<Multi_key> <U222E> <3> : "∰" U2230 # VOLUME U222E
-<Multi_key> <3> <U222E> : "∰" U2230 # VOLUME U222E
-<Multi_key> <U222E> <KP_3> : "∰" U2230 # VOLUME U222E
-<Multi_key> <KP_3> <U222E> : "∰" U2230 # VOLUME U222E
+<dead_abovering> <integral> : "∮" U222E # CONTOUR INTEGRAL
+<Multi_key> <o> <integral> : "∮" U222E # CONTOUR INTEGRAL
+<Multi_key> <jot> <integral> : "∮" U222E # CONTOUR INTEGRAL
+<dead_abovering> <o> <2> <integral> : "∯" U222F # SURFACE INTEGRAL
+<dead_abovering> <o> <KP_2> <integral> : "∯" U222F # SURFACE INTEGRAL
+<dead_abovering> <jot> <2> <integral> : "∯" U222F # SURFACE INTEGRAL
+<dead_abovering> <jot> <KP_2> <integral> : "∯" U222F # SURFACE INTEGRAL
+<Multi_key> <o> <2> <integral> : "∯" U222F # SURFACE INTEGRAL
+<Multi_key> <o> <KP_2> <integral> : "∯" U222F # SURFACE INTEGRAL
+<Multi_key> <jot> <2> <integral> : "∯" U222F # SURFACE INTEGRAL
+<Multi_key> <jot> <KP_2> <integral> : "∯" U222F # SURFACE INTEGRAL
+<dead_abovering> <o> <3> <integral> : "∰" U2230 # VOLUME U222E
+<dead_abovering> <o> <KP_3> <integral> : "∰" U2230 # VOLUME U222E
+<dead_abovering> <jot> <3> <integral> : "∰" U2230 # VOLUME U222E
+<dead_abovering> <jot> <KP_3> <integral> : "∰" U2230 # VOLUME U222E
+<Multi_key> <o> <3> <integral> : "∰" U2230 # VOLUME U222E
+<Multi_key> <o> <KP_3> <integral> : "∰" U2230 # VOLUME U222E
+<Multi_key> <jot> <3> <integral> : "∰" U2230 # VOLUME U222E
+<Multi_key> <jot> <KP_3> <integral> : "∰" U2230 # VOLUME U222E
<Multi_key> <l> <n> : "㏑" U33D1 # SQUARE LN
<Multi_key> <l> <o> <g> : "㏒" U33D2 # SQUARE LOG
<Multi_key> <asciicircum> <bracketleft> : "⌈" U2308 # LEFT CEILING
@@ -1196,6 +1206,21 @@
<Multi_key> <elementof> <elementof> : "∋" U220B # CONTAINS AS MEMBER
<Multi_key> <a> <l> <e> <p> <h> : "ℵ" U2135 # ALEF SYMBOL
<Multi_key> <h> <a> : "ℵ" U2135 # ALEF SYMBOL
+<Multi_key> <logicalor> <logicalor> : "⋁" U22C1 # N-ARY LOGICAL OR
+<Multi_key> <logicaland> <logicaland> : "⋀" U22C0 # N-ARY LOGICAL AND
+<Multi_key> <union> <union> : "⋃" U22C3 # N-ARY UNION
+<Multi_key> <intersection> <intersection> : "⋂" U22C2 # N-ARY INTERSECTION
+<Multi_key> <Greek_SIGMA> <Greek_SIGMA> : "∑" U2211 # N-ARY SUMMATION
+<Multi_key> <Greek_PI> <Greek_PI> : "∏" U220F # N-ARY PRODUCT
+<Multe_key> <U2299> <U2299> : "⨀" U2A00 # N-ARY CIRCLED DOT OPERATOR
+<Multe_key> <U2295> <U2295> : "⨁" U2A01 # N-ARY CIRCLED PLUS OPERATOR
+<Multe_key> <U2297> <U2297> : "⨂" U2A02 # N-ARY CIRCLED TIMES OPERATOR
+<Multe_key> <equal> <equal> : "≡" U2261 # IDENTICAL TO
+<Multe_key> <colon> <equal> : "≔" U2254 # COLON EQUALS
+<dead_macron> <less> : "≤" U2264 # LESS-THAN OR EQUAL TO
+<dead_macron> <greater> : "≥" U2265 # GREATER-THAN OR EQUAL TO
+<dead_macron> <includedin> : "⊆" U2286 # SUBSET OF OR EQUAL TO
+<dead_macron> <includes> : "⊇" U2287 # SUPERSET OF OR EQUAL TO
# mathematical negations
<Multi_key> <slash> <equal> : "≠" U2260 # NOT EQUAL TO
--
cgit v1.2.3