From c75723b7058a504421b875a802494edd9eeb2617 Mon Sep 17 00:00:00 2001 From: Laurent Laffont Date: Mon, 24 May 2021 18:02:02 +0200 Subject: [PATCH] =?UTF-8?q?Add=20FR+B=C3=A9po=20layout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/keyboards/fr+bepo.yaml | 206 ++++++++++++++++++++ data/keyboards/fr+bepo_wide.yaml | 89 +++++++++ data/keyboards/terminal/fr+bepo.yaml | 223 +++++++++++++++++++++ data/keyboards/terminal/fr+bepo_wide.yaml | 227 ++++++++++++++++++++++ src/resources.rs | 2 + tests/meson.build | 1 + 6 files changed, 748 insertions(+) create mode 100644 data/keyboards/fr+bepo.yaml create mode 100644 data/keyboards/fr+bepo_wide.yaml create mode 100644 data/keyboards/terminal/fr+bepo.yaml create mode 100644 data/keyboards/terminal/fr+bepo_wide.yaml diff --git a/data/keyboards/fr+bepo.yaml b/data/keyboards/fr+bepo.yaml new file mode 100644 index 00000000..493608d3 --- /dev/null +++ b/data/keyboards/fr+bepo.yaml @@ -0,0 +1,206 @@ +--- +outlines: + small: { width: 50, height: 30 } + default: { width: 35.33, height: 52 } + altline: { width: 35.33, height: 52 } + wide: { width: 50, height: 52 } + spaceline: { width: 150, height: 52 } + special: { width: 35.33, height: 52 } + +views: + base: + - "b é p o w v d l j z" + - "a u i e c t s r n m" + - "Shift_L y x k q g h f period BackSpace" + - "show_numbers preferences space show_eschars Return" + upper: + - "B É P O W V D L J Z" + - "A U I E C T S R N M" + - "Shift_L Y X K Q G H F - BackSpace" + - "show_numbers preferences space colon show_eschars Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ # € % & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? BackSpace" + - "show_letters preferences space show_eschars Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ $ ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences space show_eschars Return" + eschars: + - "à â ç é è ê î ô ù û" + - "À Â Ç É È Ê Î Ô Ù Û" + - "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace" + - "show_letters preferences space show_eschars Return" + +buttons: + F1: + outline: "action" + keysym: "F1" + F2: + outline: "action" + keysym: "F2" + F3: + outline: "action" + keysym: "F3" + F4: + outline: "action" + keysym: "F4" + F5: + outline: "action" + keysym: "F5" + F6: + outline: "action" + keysym: "F6" + F7: + outline: "action" + keysym: "F7" + F8: + outline: "action" + keysym: "F8" + F9: + outline: "action" + keysym: "F9" + F10: + outline: "action" + keysym: "F10" + F11: + outline: "action" + keysym: "F11" + F12: + outline: "action" + keysym: "F12" + Esc: + outline: "action" + keysym: "Escape" + Tab: + outline: "action" + keysym: "Tab" + Del: + outline: "action" + keysym: "Delete" + Insert: + outline: "action" + keysym: "Insert" + Menu: + outline: "action" + keysym: "Menu" + Pause: + outline: "action" + keysym: "Pause" + Break: + outline: "action" + keysym: "Break" + Home: + outline: "small" + keysym: "Home" + End: + outline: "small" + keysym: "End" + PgUp: + outline: "small" + keysym: "Page_Up" + PgDn: + outline: "small" + keysym: "Page_Down" + "↑": + outline: "small" + keysym: "Up" + "↓": + outline: "small" + keysym: "Down" + "←": + outline: "small" + keysym: "Left" + "→": + outline: "small" + keysym: "Right" + Up: + label: "↑" + outline: "action" + keysym: "Up" + Left: + label: "←" + outline: "action" + keysym: "Left" + Down: + label: "↓" + outline: "action" + keysym: "Down" + Right: + label: "→" + outline: "action" + keysym: "Right" + Ctrl: + modifier: "Control" + outline: "small" + label: "Ctrl" + Alt: + modifier: "Alt" + outline: "small" + label: "Alt" + period: + outline: "special" + text: "." + slash: + outline: "special" + text: "/" + show_actions: + action: + set_view: "actions" + outline: "special" + label: ">_" + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + preferences: + action: "show_prefs" + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "wide" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + show_eschars: + action: + locking: + lock_view: "eschars" + unlock_view: "base" + outline: "altline" + label: "âÂ" + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" + "\"": + keysym: "quotedbl" diff --git a/data/keyboards/fr+bepo_wide.yaml b/data/keyboards/fr+bepo_wide.yaml new file mode 100644 index 00000000..6dcfa0da --- /dev/null +++ b/data/keyboards/fr+bepo_wide.yaml @@ -0,0 +1,89 @@ +--- +outlines: + default: { width: 54, height: 42 } + altline: { width: 81, height: 42 } + wide: { width: 100, height: 42 } + spaceline: { width: 205, height: 42 } + special: { width: 54, height: 42 } + +views: + base: + - "b é p o w v d l j z" + - "a u i e c t s r n m" + - "Shift_L y x k q g h f . BackSpace" + - "show_numbers preferences space show_eschars Return" + upper: + - "B É P O W V D L J Z" + - "A U I E C T S R N M" + - "Shift_L Y X K Q G H F - BackSpace" + - "show_numbers preferences space colon show_eschars Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ # € % & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? BackSpace" + - "show_letters preferences space show_eschars Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ $ ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences space show_eschars Return" + eschars: + - "à â ç é è ê î ô ù û" + - "À Â Ç É È Ê Î Ô Ù Û" + - "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace" + - "show_letters preferences space show_eschars Return" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + preferences: + action: "show_prefs" + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "wide" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + show_eschars: + action: + locking: + lock_view: "eschars" + unlock_view: "base" + outline: "altline" + label: "âÂ" + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" + "\"": + keysym: "quotedbl" diff --git a/data/keyboards/terminal/fr+bepo.yaml b/data/keyboards/terminal/fr+bepo.yaml new file mode 100644 index 00000000..93ce2385 --- /dev/null +++ b/data/keyboards/terminal/fr+bepo.yaml @@ -0,0 +1,223 @@ +--- +outlines: + action: { width: 59, height: 46 } + small: { width: 50, height: 22 } + default: { width: 35.33, height: 46 } + altline: { width: 35.33, height: 46 } + wide: { width: 50, height: 46 } + spaceline: { width: 110, height: 46 } + special: { width: 35.33, height: 46 } + +views: + base: + - "Ctrl Alt Tabsmall ↑ ↓ ← →" + - "b é p o w v d l j z" + - "a u i e c t s r n m" + - "Shift_L y x k q g h f period BackSpace" + - "show_numbers preferences slash space show_eschars show_actions Return" + upper: + - "Ctrl Alt Tabsmall PgUp PgDn Home End" + - "B É P O W V D L J Z" + - "A U I E C T S R N M" + - "Shift_L Y X K Q G H F - BackSpace" + - "show_numbers preferences space colon show_eschars show_actions Return" + numbers: + - "Ctrl Alt Tabsmall ↑ ↓ ← →" + - "1 2 3 4 5 6 7 8 9 0" + - "@ # € % & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? BackSpace" + - "show_letters preferences space show_eschars show_actions Return" + symbols: + - "Ctrl Alt Tabsmall ↑ ↓ ← →" + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ $ ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences space show_eschars show_actions Return" + eschars: + - "Ctrl Alt Tabsmall ↑ ↓ ← →" + - "à â ç é è ê î ô ù û" + - "À Â Ç É È Ê Î Ô Ù Û" + - "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace" + - "show_letters preferences space show_eschars show_actions Return" + actions: + - "Ctrl Alt PgUp PgDn Home End" + - "F1 F2 F3 F4 F5 F6" + - "F7 F8 F9 F10 F11 F12" + - "Esc Tab Pause Insert Up Del" + - "show_letters Menu Break Left Down Right" + + +buttons: + F1: + outline: "action" + keysym: "F1" + F2: + outline: "action" + keysym: "F2" + F3: + outline: "action" + keysym: "F3" + F4: + outline: "action" + keysym: "F4" + F5: + outline: "action" + keysym: "F5" + F6: + outline: "action" + keysym: "F6" + F7: + outline: "action" + keysym: "F7" + F8: + outline: "action" + keysym: "F8" + F9: + outline: "action" + keysym: "F9" + F10: + outline: "action" + keysym: "F10" + F11: + outline: "action" + keysym: "F11" + F12: + outline: "action" + keysym: "F12" + Esc: + outline: "action" + keysym: "Escape" + Tab: + outline: "action" + keysym: "Tab" + Tabsmall: + outline: "small" + keysym: "Tab" + label: "Tab" + Del: + outline: "action" + keysym: "Delete" + Insert: + outline: "action" + keysym: "Insert" + Menu: + outline: "action" + keysym: "Menu" + Pause: + outline: "action" + keysym: "Pause" + Break: + outline: "action" + keysym: "Break" + Home: + outline: "small" + keysym: "Home" + End: + outline: "small" + keysym: "End" + PgUp: + outline: "small" + keysym: "Page_Up" + PgDn: + outline: "small" + keysym: "Page_Down" + "↑": + outline: "small" + keysym: "Up" + "↓": + outline: "small" + keysym: "Down" + "←": + outline: "small" + keysym: "Left" + "→": + outline: "small" + keysym: "Right" + Up: + label: "↑" + outline: "action" + keysym: "Up" + Left: + label: "←" + outline: "action" + keysym: "Left" + Down: + label: "↓" + outline: "action" + keysym: "Down" + Right: + label: "→" + outline: "action" + keysym: "Right" + Ctrl: + modifier: "Control" + outline: "small" + label: "Ctrl" + Alt: + modifier: "Alt" + outline: "small" + label: "Alt" + period: + outline: "special" + text: "." + slash: + outline: "special" + text: "/" + show_actions: + action: + set_view: "actions" + outline: "special" + label: ">_" + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + preferences: + action: "show_prefs" + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "wide" + label: "123" + show_letters: + action: + set_view: "base" + outline: "wide" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "wide" + label: "*/=" + show_eschars: + action: + locking: + lock_view: "eschars" + unlock_view: "base" + outline: "altline" + label: "âÂ" + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" + "\"": + keysym: "quotedbl" diff --git a/data/keyboards/terminal/fr+bepo_wide.yaml b/data/keyboards/terminal/fr+bepo_wide.yaml new file mode 100644 index 00000000..ca0278ba --- /dev/null +++ b/data/keyboards/terminal/fr+bepo_wide.yaml @@ -0,0 +1,227 @@ +--- +outlines: + action: { width: 90, height: 37 } + small: { width: 67.4, height: 22 } + default: { width: 54, height: 37 } + altline: { width: 81, height: 37 } + wide: { width: 100, height: 37 } + spaceline: { width: 110, height: 37 } + special: { width: 54, height: 37 } + +views: + base: + - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" + - "b é p o w v d l j z" + - "a u i e c t s r n m" + - "Shift_L y x k q g h f period BackSpace" + - "show_numbers preferences space slash show_eschars show_actions Return" + upper: + - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" + - "B É P O W V D L J Z" + - "A U I E C T S R N M" + - "Shift_L Y X K Q G H F - BackSpace" + - "show_numbers preferences space colon show_eschars show_actions Return" + numbers: + - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" + - "1 2 3 4 5 6 7 8 9 0" + - "@ # € % & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? BackSpace" + - "show_letters preferences space show_eschars show_actions Return" + symbols: + - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ $ ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences space show_eschars show_actions Return" + eschars: + - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" + - "à â ç é è ê î ô ù û" + - "À Â Ç É È Ê Î Ô Ù Û" + - "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace" + - "show_letters preferences space show_eschars show_actions Return" + actions: + - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End" + - "F1 F2 F3 F4 F5 F6" + - "F7 F8 F9 F10 F11 F12" + - "Esc Tab Pause Insert Up Del" + - "show_letters Menu Break Left Down Right" + + +buttons: + F1: + outline: "action" + keysym: "F1" + F2: + outline: "action" + keysym: "F2" + F3: + outline: "action" + keysym: "F3" + F4: + outline: "action" + keysym: "F4" + F5: + outline: "action" + keysym: "F5" + F6: + outline: "action" + keysym: "F6" + F7: + outline: "action" + keysym: "F7" + F8: + outline: "action" + keysym: "F8" + F9: + outline: "action" + keysym: "F9" + F10: + outline: "action" + keysym: "F10" + F11: + outline: "action" + keysym: "F11" + F12: + outline: "action" + keysym: "F12" + Esc: + outline: "action" + keysym: "Escape" + EscSmall: + outline: "small" + keysym: "Escape" + label: "Esc" + Tab: + outline: "action" + keysym: "Tab" + TabSmall: + outline: "small" + keysym: "Tab" + label: "Tab" + Del: + outline: "action" + keysym: "Delete" + Insert: + outline: "action" + keysym: "Insert" + Menu: + outline: "action" + keysym: "Menu" + Pause: + outline: "action" + keysym: "Pause" + Break: + outline: "action" + keysym: "Break" + Home: + outline: "small" + keysym: "Home" + End: + outline: "small" + keysym: "End" + PgUp: + outline: "small" + keysym: "Page_Up" + PgDn: + outline: "small" + keysym: "Page_Down" + "↑": + outline: "small" + keysym: "Up" + "↓": + outline: "small" + keysym: "Down" + "←": + outline: "small" + keysym: "Left" + "→": + outline: "small" + keysym: "Right" + Up: + label: "↑" + outline: "action" + keysym: "Up" + Left: + label: "←" + outline: "action" + keysym: "Left" + Down: + label: "↓" + outline: "action" + keysym: "Down" + Right: + label: "→" + outline: "action" + keysym: "Right" + Ctrl: + modifier: "Control" + outline: "small" + label: "Ctrl" + Alt: + modifier: "Alt" + outline: "small" + label: "Alt" + period: + outline: "special" + text: "." + slash: + outline: "special" + text: "/" + show_actions: + action: + set_view: "actions" + outline: "special" + label: ">_" + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + preferences: + action: "show_prefs" + outline: "special" + icon: "keyboard-mode-symbolic" + show_numbers: + action: + set_view: "numbers" + outline: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "wide" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + show_eschars: + action: + locking: + lock_view: "eschars" + unlock_view: "base" + outline: "altline" + label: "âÂ" + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" + "\"": + keysym: "quotedbl" diff --git a/src/resources.rs b/src/resources.rs index bb20fe8f..56ed19c2 100644 --- a/src/resources.rs +++ b/src/resources.rs @@ -52,6 +52,8 @@ static KEYBOARDS: &[(&'static str, &'static str)] = &[ ("fr", include_str!("../data/keyboards/fr.yaml")), ("fr_wide", include_str!("../data/keyboards/fr_wide.yaml")), + ("fr+bepo", include_str!("../data/keyboards/fr+bepo.yaml")), + ("fr+bepo_wide", include_str!("../data/keyboards/fr+bepo_wide.yaml")), ("gr", include_str!("../data/keyboards/gr.yaml")), ("gr_wide", include_str!("../data/keyboards/gr_wide.yaml")), diff --git a/tests/meson.build b/tests/meson.build index d2a99f0f..a25afdd5 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -78,6 +78,7 @@ foreach layout : [ 'fr', 'fr_wide', 'gr', 'gr_wide', 'gr+polytonic', + 'fr+bepo', 'fr+bepo_wide', 'il', 'ir', 'it',