updated greek symbols, b.fd.o#13570
authorsvu <svu>
Sat, 8 Dec 2007 21:49:32 +0000 (21:49 +0000)
committersvu <svu>
Sat, 8 Dec 2007 21:49:32 +0000 (21:49 +0000)
ChangeLog
symbols/gr

index 91293fc..f6eead8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
        * symbols/inet, rules/base.xml.in, rules/base.lists.part: added
        fscaa1667g model, thanks to Matthew W. S. Bell
+       * symbols/gr: updated greek symbols,
+       https://bugs.freedesktop.org/show_bug.cgi?id=13570
 
 2007-11-30  Sergey Udaltsov
 
index ed2b3cd..8cd08fa 100644 (file)
@@ -1,14 +1,13 @@
 // $XKeyboardConfig$
 
-// $XFree86: xc/programs/xkbcomp/symbols/el,v 1.2 2002/11/15 02:26:41 dawes Exp $
+// Hellenic keyboard map for X.org
 //
-// Hellenic keyboard map for XFree86
 // Original version:
-//     Kostas Gewrgiou <gewrgiou@imbc.gr>
+//   Kostas Gewrgiou <gewrgiou@imbc.gr>
 // Heavily modified and maintained by:
-//     Vasilis Vasaitis <vvas@hal.csd.auth.gr>
+//   Vasilis Vasaitis <vvas@hal.csd.auth.gr>
 // Originally converted to single group form by:
-//     Ivan Pascal <pascal@info.tsu.ru>
+//   Ivan Pascal <pascal@info.tsu.ru>
 
 default partial alphanumeric_keys alternate_group
 xkb_symbols "basic" {
@@ -17,29 +16,29 @@ xkb_symbols "basic" {
 
     name[Group1] = "Greece";
 
-    key <TLDE> {       [     grave,    asciitilde      ]       };
-    key <AE01> {       [         1,    exclam          ]       };
-    key <AE02> {       [         2,    at              ]       };
-    key <AE03> {       [         3,    numbersign      ]       };
-    key <AE04> {       [         4,    dollar          ]       };
-    key <AE05> {       [         5,    percent         ]       };
-    key <AE06> {       [         6,    asciicircum     ]       };
-    key <AE07> {       [         7,    ampersand       ]       };
-    key <AE08> {       [         8,    asterisk        ]       };
-    key <AE09> {       [         9,    parenleft       ]       };
-    key <AE10> {       [         0,    parenright      ]       };
-    key <AE11> {       [     minus,    underscore      ]       };
-    key <AE12> {       [     equal,    plus            ]       };
-
-    key <AD11> {       [ bracketleft,  braceleft       ]       };
-    key <AD12> {       [ bracketright, braceright      ]       };
-
-    key <AC11> {       [ apostrophe,   quotedbl        ]       };
-
-    key <AB08> {       [     comma,    less            ]       };
-    key <AB09> {       [    period,    greater         ]       };
-    key <AB10> {       [     slash,    question        ]       };
-    key <BKSL> {       [ backslash,    bar             ]       };
+    key <TLDE> { [        grave,  asciitilde ] }; // ` ~
+    key <AE01> { [            1,      exclam ] }; // 1 !
+    key <AE02> { [            2,          at ] }; // 2 @
+    key <AE03> { [            3,  numbersign ] }; // 3 #
+    key <AE04> { [            4,      dollar ] }; // 4 $
+    key <AE05> { [            5,     percent ] }; // 5 %
+    key <AE06> { [            6, asciicircum ] }; // 6 ^
+    key <AE07> { [            7,   ampersand ] }; // 7 &
+    key <AE08> { [            8,    asterisk ] }; // 8 *
+    key <AE09> { [            9,   parenleft ] }; // 9 (
+    key <AE10> { [            0,  parenright ] }; // 0 )
+    key <AE11> { [        minus,  underscore ] }; // - _
+    key <AE12> { [        equal,        plus ] }; // = +
+
+    key <AD11> { [  bracketleft,   braceleft ] }; // [ {
+    key <AD12> { [ bracketright,  braceright ] }; // [ {
+
+    key <AC11> { [   apostrophe,    quotedbl ] }; // ' "
+
+    key <AB08> { [        comma,        less ] }; // , <
+    key <AB09> { [       period,     greater ] }; // . >
+    key <AB10> { [        slash,    question ] }; // / ?
+    key <BKSL> { [    backslash,         bar ] }; // \ |
 
     include "kpdl(comma)"
 };
@@ -47,40 +46,60 @@ xkb_symbols "basic" {
 hidden partial alphanumeric_keys alternate_group
 xkb_symbols "bare" {
 
-    key <AD01> { [     semicolon,              colon           ] };
-    key <AD02> { [     Greek_finalsmallsigma,  Greek_SIGMA     ] };
-    key <AD03> { [     Greek_epsilon,          Greek_EPSILON   ] };
-    key <AD04> { [     Greek_rho,              Greek_RHO       ] };
-    key <AD05> { [     Greek_tau,              Greek_TAU       ] };
-    key <AD06> { [     Greek_upsilon,          Greek_UPSILON   ] };
-    key <AD07> { [     Greek_theta,            Greek_THETA     ] };
-    key <AD08> { [     Greek_iota,             Greek_IOTA      ] };
-    key <AD09> { [     Greek_omicron,          Greek_OMICRON   ] };
-    key <AD10> { [     Greek_pi,               Greek_PI        ] };
-
-    key <AC01> { [     Greek_alpha,            Greek_ALPHA     ] };
-    key <AC02> { [     Greek_sigma,            Greek_SIGMA     ] };
-    key <AC03> { [     Greek_delta,            Greek_DELTA     ] };
-    key <AC04> { [     Greek_phi,              Greek_PHI       ] };
-    key <AC05> { [     Greek_gamma,            Greek_GAMMA     ] };
-    key <AC06> { [     Greek_eta,              Greek_ETA       ] };
-    key <AC07> { [     Greek_xi,               Greek_XI        ] };
-    key <AC08> { [     Greek_kappa,            Greek_KAPPA     ] };
-    key <AC09> { [     Greek_lamda,            Greek_LAMDA     ] };
-    key <AC10> { [     dead_acute,             dead_diaeresis  ] };
-
-    key <AB01> { [     Greek_zeta,             Greek_ZETA      ] };
-    key <AB02> { [     Greek_chi,              Greek_CHI       ] };
-    key <AB03> { [     Greek_psi,              Greek_PSI       ] };
-    key <AB04> { [     Greek_omega,            Greek_OMEGA     ] };
-    key <AB05> { [     Greek_beta,             Greek_BETA      ] };
-    key <AB06> { [     Greek_nu,               Greek_NU        ] };
-    key <AB07> { [     Greek_mu,               Greek_MU        ] };
-
-    key <LSGT> { [     guillemotleft,          guillemotright  ] };
-
+    key <AD01> { [             semicolon,          colon ] }; // ; :
+    key <AD02> { [ Greek_finalsmallsigma,    Greek_SIGMA ] }; // ς Σ
+    key <AD03> { [         Greek_epsilon,  Greek_EPSILON ] }; // ε Ε
+    key <AD04> { [             Greek_rho,      Greek_RHO ] }; // ρ Ρ
+    key <AD05> { [             Greek_tau,      Greek_TAU ] }; // τ Τ
+    key <AD06> { [         Greek_upsilon,  Greek_UPSILON ] }; // υ Υ
+    key <AD07> { [           Greek_theta,    Greek_THETA ] }; // θ Θ
+    key <AD08> { [            Greek_iota,     Greek_IOTA ] }; // ι Ι
+    key <AD09> { [         Greek_omicron,  Greek_OMICRON ] }; // ο Ο
+    key <AD10> { [              Greek_pi,       Greek_PI ] }; // π Π
+
+    key <AC01> { [           Greek_alpha,    Greek_ALPHA ] }; // α Α
+    key <AC02> { [           Greek_sigma,    Greek_SIGMA ] }; // σ Σ
+    key <AC03> { [           Greek_delta,    Greek_DELTA ] }; // δ Δ
+    key <AC04> { [             Greek_phi,      Greek_PHI ] }; // φ Φ
+    key <AC05> { [           Greek_gamma,    Greek_GAMMA ] }; // γ Γ
+    key <AC06> { [             Greek_eta,      Greek_ETA ] }; // η Η
+    key <AC07> { [              Greek_xi,       Greek_XI ] }; // ξ Ξ
+    key <AC08> { [           Greek_kappa,    Greek_KAPPA ] }; // κ Κ
+    key <AC09> { [           Greek_lamda,    Greek_LAMDA ] }; // λ Λ
+    key <AC10> { [            dead_acute, dead_diaeresis ] }; // ´ ¨
+
+    key <AB01> { [            Greek_zeta,     Greek_ZETA ] }; // ζ Ζ
+    key <AB02> { [             Greek_chi,      Greek_CHI ] }; // χ Χ
+    key <AB03> { [             Greek_psi,      Greek_PSI ] }; // ψ Ψ
+    key <AB04> { [           Greek_omega,    Greek_OMEGA ] }; // ω Ω
+    key <AB05> { [            Greek_beta,     Greek_BETA ] }; // β Β
+    key <AB06> { [              Greek_nu,       Greek_NU ] }; // ν Ν
+    key <AB07> { [              Greek_mu,       Greek_MU ] }; // μ Μ
+
+    key <LSGT> { [         guillemotleft, guillemotright ] }; // « »
 };
 
+// ===========================================================================================
+// Greek - Extended                                                                          |
+// ===========================================================================================
+//
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━━━┓
+// │ ~   │ !   │ @   │ #   │ $   │ %   │ ^   │ &   │ *   │ (   │ )   │ _   │ +   ┃Backspace  ┃
+// │ `   │ 1   │ 2   │ 3 £ │ 4   │ 5 € │ 6   │ 7   │ 8   │ 9   │ 0 ° │ - ± │ =   ┃           ┃
+// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━━━┫
+// ┃       ┃ :   │ Σ   │ Ε   │ Ρ   │ Τ   │ Υ   │ Θ   │ Ι   │ Ο   │ Π   │ {   │ }   ┃Enter    ┃
+// ┃Tab    ┃ ; · │ ς   │ ε € │ ρ ® │ τ   │ υ   │ θ   │ ι   │ ο   │ π   │ [   │ ]   ┃         ┃
+// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓        ┃
+// ┃Caps    ┃ Α   │ Σ   │ Δ   │ Φ   │ Γ   │ Η   │ Ξ   │ Κ   │ Λ   │ ¨   │ "   │ |   ┃        ┃
+// ┃Lock    ┃ α   │ σ   │ δ   │ φ   │ γ   │ η   │ ξ   │ κ   │ λ   │ ´   │ '   │ \   ┃        ┃
+// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━━━┫
+// ┃       ┃ »   │ Ζ   │ Χ   │ Ψ   │ Ω   │ Β   │ Ν   │ Μ   │ <   │ >   │ ?   ┃               ┃
+// ┃Shift  ┃ «   │ ζ   │ χ   │ ψ © │ ω   │ β   │ ν   │ μ   │ , « │ . » │ /   ┃Shift          ┃
+// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴──┲━━┷━━━━┳┷━━━━━┻┳━━━━━━━┳━━━━━━┫
+// ┃       ┃       ┃       ┃                                  ┃       ┃       ┃       ┃      ┃
+// ┃Ctrl   ┃Meta   ┃Alt    ┃              Space               ┃AltGr  ┃Meta   ┃Menu   ┃Ctrl  ┃
+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹──────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┻━━━━━━┛
+
 partial alphanumeric_keys alternate_group
 xkb_symbols "extended" {
 
@@ -90,16 +109,20 @@ xkb_symbols "extended" {
 
     key.type[Group1] = "THREE_LEVEL";
 
-    key <AE03> { [     3,              numbersign,     sterling        ] };
+    key <AE03> { [ NoSymbol, NoSymbol,       sterling ] }; // £
+    key <AE10> { [ NoSymbol, NoSymbol,         degree ] }; // °
+    key <AE11> { [ NoSymbol, NoSymbol,      plusminus ] }; // ±
 
-    key <AD01> { [     semicolon,      colon,          periodcentered  ] };
-    key <AD03> { [     Greek_epsilon,  Greek_EPSILON,  EuroSign        ] };
+    key <AD01> { [ NoSymbol, NoSymbol, periodcentered ] }; // ·
+    key <AD04> { [ NoSymbol, NoSymbol,     registered ] }; // ®
 
-    key <AB08> { [     comma,          less,           guillemotleft   ] };
-    key <AB09> { [     period,         greater,        guillemotright  ] };
+    key <AB03> { [ NoSymbol, NoSymbol,      copyright ] }; // ©
+    key <AB08> { [ NoSymbol, NoSymbol,  guillemotleft ] }; // «
+    key <AB09> { [ NoSymbol, NoSymbol, guillemotright ] }; // »
 
     include "level3(ralt_switch)"
     include "eurosign(5)"
+    include "eurosign(e)"
 };
 
 partial alphanumeric_keys alternate_group
@@ -111,12 +134,11 @@ xkb_symbols "polytonic" {
 
     key.type[Group1] = "THREE_LEVEL";
 
-    key <AD11> { [     dead_tilde,     dead_diaeresis, dead_macron     ] };
-    key <AD12> { [     dead_iota,      VoidSymbol,     dead_breve      ] };
-
-    key <AC10> { [     dead_acute,             dead_horn       ] };
-    key <AC11> { [     dead_grave,             dead_ogonek     ] };
+    key <AD11> { [ dead_tilde, dead_diaeresis, dead_macron ] }; // ~ ¨ ¯
+    key <AD12> { [  dead_iota,     VoidSymbol,  dead_breve ] }; // ͺ   ˘
 
+    key <AC10> { [ dead_acute, dead_horn   ] }; // ´ ̓ 
+    key <AC11> { [ dead_grave, dead_ogonek ] }; // ` ̔
 };
 
 partial alphanumeric_keys alternate_group
@@ -126,7 +148,5 @@ xkb_symbols "nodeadkeys" {
 
     name[Group1] = "Greece - Eliminate dead keys";
 
-    key <AC10> { [     semicolon,              colon           ] };
-
+    key <AC10> { [ semicolon, colon ] }; // ; :
 };
-