From a0dee06fed824abfad658b7f10e6d907b270be0a Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 19 Apr 2016 16:49:30 +0000 Subject: Symbol für Return auf das offizielle vereinheitlicht: U+23CE RETURN SYMBOL ⏎ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.neo-layout.org@2476 b9310e46-f624-0410-8ea1-cfbb3a30dc96 --- A-REFERENZ-A/neo20.txt | 8 +- grafik/aufsteller/neo20-aufsteller-ben.svg | 4 +- .../Druckvorlage_Ebenen_1-6_SW_Einzeln.svg | 10 +-- .../Tastenaufkleber_Ebenen_1-3-Schwarz.svg | 90 +++++++++++----------- .../Tastenaufkleber_Ebenen_1-3-Weiss.svg | 90 +++++++++++----------- .../Tastenaufkleber_Neo2__SW_6erBlock.svg | 6 +- grafik/flat/tastatur_base.svg | 2 +- grafik/flat/tastatur_e4.svg | 2 +- grafik/promotion-material/tippsundtricks.svg | 2 +- grafik/ref2svg/ref2svg.pl | 2 +- .../matrix_ebene_[1]2,3,4,[5]6_[Martin].svg | 4 +- grafik/tastatur2d/neo_Ebene_1.svg | 2 +- grafik/tastatur2d/neo_Ebene_3.svg | 2 +- grafik/tastatur2d/neo_Ebene_4.svg | 4 +- grafik/tastatur2d/neo_Ebenen_1_2_3_4.svg | 4 +- grafik/tastatur3d/tastatur_neo_alle_Ebenen.svg | 34 ++++---- grafik/tastatur3d/tastatur_neo_kyrillisch.svg | 42 +++++----- .../beispielausgabe/beispiel.svg | 2 +- ktouch/keyboards/de.neo2.all.keyboard.xml | 2 +- ktouch/keyboards/kde3/de.neo2.mod4.keyboard | 4 +- linux/xmodmap/neo_de.xmodmap | 16 ++-- windows/keybuddy2/src/main.cpp | 2 +- windows/neo-vars/src/source/compose-gen.ahk | 2 +- windows/neo-vars/src/source/makecompose.ahk | 2 +- 24 files changed, 169 insertions(+), 169 deletions(-) diff --git a/A-REFERENZ-A/neo20.txt b/A-REFERENZ-A/neo20.txt index 30aedaa..4291e8d 100644 --- a/A-REFERENZ-A/neo20.txt +++ b/A-REFERENZ-A/neo20.txt @@ -228,10 +228,10 @@ der Standardtastatur allein mit dem Hauptfeld der Tastatur. │ 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 │ @@ -285,7 +285,7 @@ der Standardtastatur allein mit dem Hauptfeld der Tastatur. ├────┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴─┐ │ │ M3 │⇱│⇠│⇣│⇢│⇲│¿│4│5│6│,│.│M3│ │ ├───┬─┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴──┴───┤ -│Ums│4L│⌧│⇥│⎀│↲│↶│:│1│2│3│;│ Umsch │ +│Ums│4L│⌧│⇥│⎀│⏎│↶│:│1│2│3│;│ Umsch │ ├───┼──┼─┴┬┴─┴─┴─┴─┴─┴┬┴─┼─┴┬──┬───┤ │Str│Fe│Al│ 0 │4L│Fe│Me│Str│ └───┴──┴──┴───────────┴──┴──┴──┴───┘ @@ -324,7 +324,7 @@ der Standardtastatur allein mit dem Hauptfeld der Tastatur. ├────┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴─┐ │ │ M3 │⇱│⇠│⇣│⇢│⇲│ │4│5│6│,│.│M3│ │ ├───┬─┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴──┴───┤ -│Ums│4L│⌧│⇤│⎀│↲│↷│ │1│2│3│ │ Umsch │ +│Ums│4L│⌧│⇤│⎀│⏎│↷│ │1│2│3│ │ Umsch │ ├───┼──┼─┴┬┴─┴─┴─┴─┴─┴┬┴─┼─┴┬──┬───┤ │Str│Fe│Al│ 0 │4L│Fe│Me│Str│ └───┴──┴──┴───────────┴──┴──┴──┴───┘ diff --git a/grafik/aufsteller/neo20-aufsteller-ben.svg b/grafik/aufsteller/neo20-aufsteller-ben.svg index f160dbc..4afed02 100644 --- a/grafik/aufsteller/neo20-aufsteller-ben.svg +++ b/grafik/aufsteller/neo20-aufsteller-ben.svg @@ -5211,7 +5211,7 @@ + id="tspan2719">⏎ ↵ + style="font-weight:normal">⏎ + id="tspan3849">⏎ + x="693.67383">⏎ + id="tspan5651">⏎ @@ -6649,7 +6649,7 @@ x="693.67383"> + x="693.67383">⏎ @@ -7273,7 +7273,7 @@ sodipodi:linespacing="125%"> + id="tspan6373">⏎ + y="445.84537">⏎ + y="647.49371">⏎ + y="445.84537">⏎ + y="647.49371">⏎ + y="162.45421">⏎ + y="364.10257">⏎ + y="162.01889">⏎ + y="364.7294">⏎ + y="446.2225">⏎ + y="649.08374">⏎ + style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans">⏎ + y="445.54553">⏎ + y="647.32111">⏎ + y="445.85123">⏎ + y="647.32111">⏎ + y="444.77573">⏎ + y="647.32111">⏎ + y="445.84537">⏎ + y="647.49371">⏎ + y="162.45421">⏎ + y="364.10257">⏎ + y="445.41003">⏎ + y="648.12054">⏎ + y="162.01889">⏎ + y="364.7294">⏎ + style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans">⏎ + y="445.54553">⏎ + y="647.32111">⏎ + y="445.85123">⏎ + y="647.32111">⏎ + y="444.77573">⏎ + y="647.32111">⏎ + y="445.41003">⏎ + y="648.12054">⏎ + y="162.01889">⏎ + y="364.7294">⏎ + y="446.2225">⏎ + y="649.08374">⏎ + style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans">⏎ + y="445.54553">⏎ + y="647.32111">⏎ + y="445.85123">⏎ + y="647.32111">⏎ + y="444.77573">⏎ + y="647.32111">⏎ + y="445.84537">⏎ + y="647.49371">⏎ + y="445.84537">⏎ + y="647.49371">⏎ + y="162.45421">⏎ + y="364.10257">⏎ + y="162.01889">⏎ + y="364.7294">⏎ + y="446.2225">⏎ + y="649.08374">⏎ + style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans">⏎ + y="445.54553">⏎ + y="647.32111">⏎ + y="445.85123">⏎ + y="647.32111">⏎ + y="444.77573">⏎ + y="647.32111">⏎ + y="445.84537">⏎ + y="647.49371">⏎ + y="162.45421">⏎ + y="364.10257">⏎ + y="445.41003">⏎ + y="648.12054">⏎ + y="162.01889">⏎ + y="364.7294">⏎ + style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans">⏎ + y="445.54553">⏎ + y="647.32111">⏎ + y="445.85123">⏎ + y="647.32111">⏎ + y="444.77573">⏎ + y="647.32111">⏎ + y="445.41003">⏎ + y="648.12054">⏎ + y="162.01889">⏎ + y="364.7294">⏎ + y="446.2225">⏎ + y="649.08374">⏎ + style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans">⏎ + y="445.54553">⏎ + y="647.32111">⏎ + y="445.85123">⏎ + y="647.32111">⏎ + y="444.77573">⏎ + y="647.32111">⏎ + xml:space="preserve">⏎ + x="-695.81915">⏎ + id="tspan8975">⏎ Strg Mod4 - + diff --git a/grafik/flat/tastatur_e4.svg b/grafik/flat/tastatur_e4.svg index beb4e5f..e387908 100644 --- a/grafik/flat/tastatur_e4.svg +++ b/grafik/flat/tastatur_e4.svg @@ -110,7 +110,7 @@ - + : diff --git a/grafik/promotion-material/tippsundtricks.svg b/grafik/promotion-material/tippsundtricks.svg index 736f123..7682966 100644 --- a/grafik/promotion-material/tippsundtricks.svg +++ b/grafik/promotion-material/tippsundtricks.svg @@ -4493,7 +4493,7 @@ style="fill:#333333" x="774.67755" y="461.81461" - id="tspan18000">↵ + id="tspan18000">⏎ '⇟', 'Ins' => '⎀', 'Del' => '⌦', - 'Ent' => '↲', + 'Ent' => '⏎', 'vec' => ' ⃗' ); diff --git a/grafik/tastatur2d/matrix_ebene_[1]2,3,4,[5]6_[Martin].svg b/grafik/tastatur2d/matrix_ebene_[1]2,3,4,[5]6_[Martin].svg index dce9e4b..c277cc7 100644 --- a/grafik/tastatur2d/matrix_ebene_[1]2,3,4,[5]6_[Martin].svg +++ b/grafik/tastatur2d/matrix_ebene_[1]2,3,4,[5]6_[Martin].svg @@ -2619,7 +2619,7 @@ sodipodi:role="line" id="tspan3882" x="725.49158" - y="508.16949">↲ + y="508.16949">⏎ + y="502.60526">⏎ ↵ + id="tspan2719">⏎ ↵ + id="tspan2719">⏎ ↵ + id="tspan2719">⏎ ↵ + style="font-weight:normal">⏎ ↵ + x="26579.559">⏎ ↵ + x="10960.909">⏎ + y="445.84537">⏎ + y="647.49371">⏎ + y="162.45421">⏎ + y="364.10257">⏎ + y="445.41003">⏎ + y="648.12054">⏎ + y="162.01889">⏎ + y="364.7294">⏎ + y="446.2225">⏎ + y="649.08374">⏎ + style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans">⏎ + y="445.54553">⏎ + y="647.32111">⏎ + y="445.85123">⏎ + y="647.32111">⏎ + y="444.77573">⏎ + y="647.32111">⏎ + y="445.84537">⏎ + y="647.49371">⏎ + y="162.45421">⏎ + y="364.10257">⏎ + y="445.41003">⏎ + y="648.12054">⏎ + y="162.01889">⏎ + y="364.7294">⏎ + y="446.2225">⏎ + y="649.08374">⏎ + style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans">⏎ + y="445.54553">⏎ + y="647.32111">⏎ + y="445.85123">⏎ + y="647.32111">⏎ + y="444.77573">⏎ + y="647.32111">⏎ + y="162.32491">⏎ + y="363.97324">⏎ + y="162.52347">⏎ + y="365.23398">⏎ + xml:space="preserve">⏎ P - + p ~ diff --git a/ktouch/keyboards/kde3/de.neo2.mod4.keyboard b/ktouch/keyboards/kde3/de.neo2.mod4.keyboard index f018045..321d29f 100644 --- a/ktouch/keyboards/kde3/de.neo2.mod4.keyboard +++ b/ktouch/keyboards/kde3/de.neo2.mod4.keyboard @@ -81,7 +81,7 @@ NormalKey 115 ¿ 68 20 110 NormalKey 252 ⌧ 23 30 117 NormalKey 246 ⇥ 33 30 105 NormalKey 228 ⇟ 43 30 97 -NormalKey 112 ↲ 53 30 101 +NormalKey 112 ⏎ 53 30 101 #NormalKey 122 Z 63 30 101 #NormalKey 98 B 73 30 110 NormalKey 109 1 83 30 110 @@ -234,7 +234,7 @@ HiddenKey 44 100 100 267 #, redundant #HiddenKey 9999 252 117 264 #⌧ nicht abrufbar #HiddenKey 9999 246 105 264 #⇥ nicht abrufbar #HiddenKey 9999 228 97 264 #⇟ nicht abrufbar -#HiddenKey 9999 112 101 264 #↲ nicht abrufbar +#HiddenKey 9999 112 101 264 #⏎ nicht abrufbar HiddenKey 49 109 110 267 #1 redundant HiddenKey 50 9994 114 267 #2 redundant HiddenKey 51 9995 116 267 #3 redundant diff --git a/linux/xmodmap/neo_de.xmodmap b/linux/xmodmap/neo_de.xmodmap index eeec102..55b20d5 100644 --- a/linux/xmodmap/neo_de.xmodmap +++ b/linux/xmodmap/neo_de.xmodmap @@ -34,7 +34,7 @@ ! Mod4_Lock: Mod4(rechts)+Mod4(links) ! Reihenfolge der Ebenen in der Xmodmap: -! Ebene1 Ebene2 Ebene3 Ebene5 Ebene4 Ebene4+Sh Ebene6 Ebene7 +! Ebene1 Ebene2 Ebene3 Ebene5 Ebene4 Ebene4+Sh Ebene6 Ebene7 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -53,8 +53,8 @@ clear Mod5 ! Shift+Shift ergibt ein ShiftLock (wie Caps, wirkt aber auf alle Zeichen, nicht nur auf Großbuchstaben) ! Der Lock lässt sich durch ein weiteres Shift lösen. ! Eigentlich (siehe Referenz) sollte hier ein CapsLock stehen. -keycode 50 = Shift_L Shift_Lock -keycode 62 = Shift_R Shift_Lock +keycode 50 = Shift_L Shift_Lock +keycode 62 = Shift_R Shift_Lock !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! Mod3 @@ -64,8 +64,8 @@ keycode 62 = Shift_R Shift_Lock ! Make former CapsLock and qwertz-# to Mode_switch or ISO_Group_Shift ! Mod3(links) (=Qwertz-Caps) erlaubt nur 4 Ebenen ! Ohne einen Eintrag in der zweiten Gruppe (=Ebene 3) ergäbe Mod3+Mod3=Group_Shift+Group_Shift=Gruppe 3=Ebene 6. Das ist nicht gewünscht. -keycode 66 = ISO_Group_Shift ISO_Group_Shift ISO_First_Group NoSymbol -keycode 51 = ISO_Group_Shift ISO_Group_Shift ISO_First_Group NoSymbol +keycode 66 = ISO_Group_Shift ISO_Group_Shift ISO_First_Group NoSymbol +keycode 51 = ISO_Group_Shift ISO_Group_Shift ISO_First_Group NoSymbol !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! Mod4 @@ -75,8 +75,8 @@ keycode 51 = ISO_Group_Shift ISO_Group_Shift ISO_First_Group NoSymbol ! Mod4(rechts)+Mod4(links) lässt Mod4 einrasten (Mod4Lock) ! das funktioniert nur in dieser Reihenfolge, da Mod4(rechts) (=Qwertz-AltGr) nur 4 Ebenen hat ! Der Lock lässt sich durch ein weiteres Mod4 lösen. -keysym less = ISO_Level3_Shift ISO_Level3_Shift ISO_Group_Shift ISO_Group_Shift ISO_Level3_Lock NoSymbol -keysym ISO_Level3_Shift = ISO_Level3_Shift ISO_Level3_Shift ISO_Group_Shift ISO_Group_Shift ISO_Level3_Lock NoSymbol +keysym less = ISO_Level3_Shift ISO_Level3_Shift ISO_Group_Shift ISO_Group_Shift ISO_Level3_Lock NoSymbol +keysym ISO_Level3_Shift = ISO_Level3_Shift ISO_Level3_Shift ISO_Group_Shift ISO_Group_Shift ISO_Level3_Lock NoSymbol !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! window keys @@ -91,7 +91,7 @@ keysym ISO_Level3_Shift = ISO_Level3_Shift ISO_Level3_Shift ISO_Group_Shift !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! Einrasten über linke Win-Taste+Modifier, Lösen über nochmaliges Betätigen des Modifiers ! Shift_Lock und Mo4_Lock funktionieren, Mod3_Lock lässt sich aber nicht mehr lösen!!!! -! keycode 115 = ISO_Lock NoSymbol +! keycode 115 = ISO_Lock NoSymbol ! add Lock = ISO_Lock diff --git a/windows/keybuddy2/src/main.cpp b/windows/keybuddy2/src/main.cpp index fa8418f..176936f 100644 --- a/windows/keybuddy2/src/main.cpp +++ b/windows/keybuddy2/src/main.cpp @@ -391,7 +391,7 @@ WString KeyBuddy2::buttonLabel(DWORD vkCode){ case VK_LSHIFT: case VK_RSHIFT: return WString(0x21e7,1); break; case VK_MOD_31: case VK_MOD_32: return WString("Mod3"); break; case VK_MOD_41: case VK_MOD_42: return WString("Mod4"); break; - case VK_RETURN: return WString(0x21b5,1); break; + case VK_RETURN: return WString(0x23cE,1); break; case VK_BACK: return WString(0x232b,1); break; case VK_LCONTROL: case VK_RCONTROL: return WString("Strg"); break; case VK_LMENU: return WString("Alt"); break; diff --git a/windows/neo-vars/src/source/compose-gen.ahk b/windows/neo-vars/src/source/compose-gen.ahk index 8dacc73..e2f9612 100644 --- a/windows/neo-vars/src/source/compose-gen.ahk +++ b/windows/neo-vars/src/source/compose-gen.ahk @@ -194,7 +194,7 @@ DefineXKBSyms() { ; DefineXKBSym("BackSpace","⌫") ; DefineXKBSym("Tab","⇥") -; DefineXKBSym("Return","↲") +; DefineXKBSym("Return","⏎") ; DefineXKBSym("Escape","⌧") ; DefineXKBSym("Delete","⌦") ; DefineXKBSym("Multi_key","♫") diff --git a/windows/neo-vars/src/source/makecompose.ahk b/windows/neo-vars/src/source/makecompose.ahk index a40cfe0..cdadeb5 100644 --- a/windows/neo-vars/src/source/makecompose.ahk +++ b/windows/neo-vars/src/source/makecompose.ahk @@ -194,7 +194,7 @@ DefineXKBSyms() { ; DefineXKBSym("BackSpace","U00232B") ; DefineXKBSym("Tab","U0021E5") -; DefineXKBSym("Return","U0021B2") +; DefineXKBSym("Return","U0023CE") ; DefineXKBSym("Escape","U002327") ; DefineXKBSym("Delete","U002326") ; DefineXKBSym("Multi_key","U00266B") -- cgit v1.2.3