On Sat, Mar 22, 2008, Roland Mas wrote:
There's an even newer upstream version now, 0.6.5.1, with even more
non-cosmetic changes (two more letter pairs, R/N and F/J, were
swapped). From a discussion I had with upstream on IRC, it seems the
layout is approaching stabilisation, so it would be a shame to ship an
old version in Lenny.
Is the attached patch OK for you?
Cc-ing Joss as his name is quoted as related to the legacy dvorak
layout.
--
Mohammed Adnène Trojette
--- symbols/fr 2008-05-01 00:20:50.0 +0200
+++ /tmp/fr.new 2008-05-01 03:22:09.0 +0200
@@ -440,22 +440,22 @@
// │ s a│ s = normal, a = AltGr
// └┘
//
-// ┌─┬─┬─┬─┬─┬─┬─┬─┬─┬─┬─┬─┬─┲━┓
-// │ $ │ 1 ¹ │ 2 ² │ 3 ³ │ 4 ° │ 5 ˚ │ 6 │ 7 │ 8 │ 9 │ 0 │ ^ │ µ ┃ ⌫ Retour┃
-// │ @ # │ _ { │ } │ « │ » │ ( [ │ ) ] │ + ± │ - ¬ │ * × │ / ÷ │ = ¯ │ % ┃ arrière┃
-// ┢━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━┫
-// ┃ ┃ B │ É ˊ │ P ¶ │ O Œ │ È ` │ Ç │ V │ D Ð │ L │ F │ J │ Z ┃Entrée ┃
-// ┃Tab ↹ ┃ b | │ é │ p § │ o œ │ è ` │ ç │ v │ d ð │ l £ │ f ª │ j │ z ┃ ⏎ ┃
-// ┣━━━┻┱┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┺┓ ┃
-// ┃┃ A Æ │ U Ù │ I ˇ │ E │ ? │ C ¢ │ T Þ │ S │ N │ R │ M │ ! ┃ ┃
-// ┃Maj ⇬ ┃ a æ │ u ù │ i ̈ │ e € │ , ¿ │ c © │ t þ │ s ß │ n │ r ® │ m º │ ˆ ¡ ┃ ┃
-// ┣━━━┳┹┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┲┷━┻━━┫
-// ┃ ┃ ù │ À ˜ │ H │ Y │ : · │ K │ ; │ Q │ G │ X │ W ┃ ┃
-// ┃Shift ⇧┃ ê / │ à ~ │ h ! │ y ¥ │ . \ │ k │ ' │ q │ g │ x │ w ┃Shift ⇧ ┃
-// ┣━━━╋━┷━┳━━━┷━━━┱─┴─┴─┴─┴─┴─┴───┲━┷━╈━┻━┳━━━┳━━━┛
-// ┃ ┃ ┃ ┃ ⍽ Espace insécable ␣ ┃ ┃ ┃ ┃
-// ┃Ctrl ┃Meta ┃Alt┃ ␣ Espace␣ ┃AltGr ⇮┃Menu ┃Ctrl ┃
-// ┗━━━┻━━━┻━━━┹───┺━━━┻━━━┻━━━┛
+// ┌┬┬┬┬┬┬┬┬┬┬┬┬╔═╗
+// │ # ¶│ 1 │ 2 ≤│ 3 ≥│ 4 “│ 5 ”║ 6 │ 7 °│ 8 ′│ 9 ″│ 0 │ @ │ µ ║ ║
+// │ $ §│ —│ « │ » │ ( [│ ) ]║ _ │ + ±│ - –│ / ÷│ * ×│ = ¬│ % ‰║ -- ║
+// ╔╧══╗─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─╚══╦══╣
+// ║ |- ║ B ¦│ É ˝│ P │ O Œ│ È `║ ! ¡│ V │ D Ð│ L │ J IJ│ Z Ə│ W ║ | ║
+// ║ -| ║ b |│ é ´│ p │ o œ│ è `║ ˆ ˇ│ v │ d ð│ l /│ j ij│ z ə│ w ˘║ -' ║
+// ╠═══╩╗───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───╚╗ ║
+// ║║ A Æ│ U Ù│ I ˙│ E ¤│ ? ¿║ C │ T Þ│ S │ R │ N Ñ│ M º│ Ç ║ ║
+// ║ CAPS ║ a æ│ u ù│ i ¨│ e €│ , ’║ c ©│ t þ│ s ß│ r ®│ n ñ│ m ¯│ ç ¸║ ║
+// ╠══╦═╝──┬─┴──┬─┴──┬─┴─══─┴──┬─┴──┬─┴─══─┴──┬─┴──┬─┴──┬─┴──╔═╧╩═╣
+// ║ ^ ║ Ê │ À ˜│ Y │ H │ : ·│ K ║ ; │ Q │ G │ X ‡│ F ª║ ^ ║
+// ║ | ║ ê /│ à ~│ y \│ h {│ . }│ k …║ ' ‘│ q │ g °│ x †│ f ˛║ | ║
+// ╠══╩╦═══╧══╦═╧═══╦╧╧╧╧╧╧═╦══╧══╦═╧╬═╦══╣
+// ║ ║ ║ ║ NBSPACE FINE-NBSPACE ║ ║ ║ ║ ║
+// ║ Ctrl ║ WinG ║ Alt ║ SPACE ║AltGr║ WinD ║WinM ║ Ctrl ║
+// ╚═══╩══╩═╩═══╩═╩══╩═╩══╝
partial alphanumeric_keys
xkb_symbols bepo {
@@ -463,64 +463,60 @@
name[Group1]= France - Bepo, ergonomic, Dvorak way;
-// First row
-key TLDE { [ at, dollar, numbersign ] }; // @ $ #
-key AE01 { [ underscore,1, braceleft,onesuperior ] }; // _ 1 { ¹
-key AE02 { [quotedbl,2, braceright,twosuperior ] }; // 2 } ²
-key AE03 { [ guillemotleft,3, less, threesuperior ] }; // « 3 ³
-key AE04 { [ guillemotright,4,greater, degree ] }; // » 4 °
-key AE05 { [ parenleft,5,bracketleft, dead_abovering ] }; // ( 5 [ ˚
-key AE06 { [ parenright,6, bracketright ] }; // ) 6 ]
-key AE07 { [plus,7, plusminus ] }; // + 7 ±
-key AE08 { [ minus,8,notsign ] }; // - 8 ¬
-key AE09 { [asterisk,9, multiply ] }; // * 9 ×
-key AE10 { [ slash,0, division ] }; // / 0 ÷
-key AE11 { [ equal, asciicircum, macron ] }; // = ^ ¯
-key AE12 { [ percent, mu ] }; // % µ
-
-// Second row
-key AD01 { [ b,B,bar ] }; // b B |
-key AD02 { [ eacute, Eacute, ampersand,
