diff --git a/data/keyboards/terminal/fr+bepo.yaml b/data/keyboards/terminal/fr+bepo.yaml index f23923f0..d524d388 100644 --- a/data/keyboards/terminal/fr+bepo.yaml +++ b/data/keyboards/terminal/fr+bepo.yaml @@ -2,47 +2,47 @@ --- outlines: default: { width: 35.33, height: 45.5 } - halfwidth: { width: 17.665, height: 45.5 } - narrow: { width: 22.5, height: 45.5 } - special: { width: 35.33, height: 45.5 } - change-view: { width: 42, height: 45.5 } - change-view-2: { width: 50, height: 45.5 } action: { width: 59, height: 45.5 } - wide: { width: 50, height: 45.5 } - spaceline: { width: 119.47, height: 45.5 } small: { width: 50.471, height: 24 } + altline: { width: 52.67, height: 45.5 } + change-view: { width: 52.67, height: 45.5 } + large: { width: 52.67, height: 45.5 } + wide: { width: 59, height: 45.5 } + change-view-2: { width: 59, height: 45.5 } + spaceline: { width: 100.96, height: 45.5 } + special: { width: 35.33, height: 45.5 } views: base: - "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 show_eschars preferences space SlashSmall show_actions Return" + - "Shift_L y x k q g h f BackSpace" + - "show_numbers show_eschars preferences space show_actions Return" upper: - "TabSmall Ctrl Alt PageUp PageDown 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 MinusSmall BackSpace" - - "show_numbers show_eschars preferences space ColonSmall show_actions Return" + - "Shift_L Y X K Q G H F BackSpace" + - "show_numbers show_eschars preferences space show_actions Return" numbers: - "TabSmall Ctrl Alt ↑ ↓ ← →" - "1 2 3 4 5 6 7 8 9 0" - "@ # € % & - _ + ( )" - - "show_symbols , \" ' : ; ! ? . BackSpace" - - "show_letters show_eschars preferences space SlashSmall show_actions Return" + - "show_symbols , \" ' : ; ! ? BackSpace" + - "show_letters show_eschars preferences space . Return" symbols: - "TabSmall Ctrl Alt ↑ ↓ ← →" - "~ ` | · √ π τ ÷ × ¶" - "© ® £ $ ¥ ^ ° * { }" - - "show_numbers \\ / < > = [ ] . BackSpace" - - "show_letters show_eschars preferences space SlashSmall show_actions Return" + - "show_numbers \\ / < > = [ ] BackSpace" + - "show_letters show_eschars preferences space . Return" eschars: - "TabSmall Ctrl Alt ↑ ↓ ← →" - "à â ç é è ê î ô ù û" - "À Â Ç É È Ê Î Ô Ù Û" - - "show_numbers æ œ ä ë ï ö ü . BackSpace" - - "show_letters show_eschars preferences space SlashSmall show_actions Return" + - "show_numbers æ œ ä ë ï ö ü BackSpace" + - "show_letters show_eschars preferences space . Return" actions: - "TabSmall Ctrl Alt PageUp PageDown Home End" - "F1 F2 F3 F4 F5 F6" @@ -50,7 +50,7 @@ views: - "Esc Tab Pause Insert Up Del" - "show_letters_actions Menu Break Left Down Right" - + buttons: F1: outline: "action" @@ -223,14 +223,5 @@ buttons: outline: "wide" icon: "key-enter" keysym: "Return" - ColonSmall: - outline: "narrow" - text: ":" - MinusSmall: - outline: "narrow" - text: "-" - SlashSmall: - outline: "narrow" - text: "/" .: - outline: "narrow" + outline: "large" \ No newline at end of file diff --git a/data/keyboards/terminal/fr+bepo_wide.yaml b/data/keyboards/terminal/fr+bepo_wide.yaml index ec3108ee..08c75f82 100644 --- a/data/keyboards/terminal/fr+bepo_wide.yaml +++ b/data/keyboards/terminal/fr+bepo_wide.yaml @@ -2,55 +2,53 @@ --- outlines: default: { width: 54, height: 37 } - halfwidth: { width: 27, height: 37 } - narrow: { width: 40.5, height: 37 } - special: { width: 54, height: 37 } + action: { width: 90, height: 37 } + small: { width: 67.4, height: 22 } + altline: { width: 81, height: 37 } change-view: { width: 81, height: 37 } large: { width: 81, height: 37 } - action: { width: 90, height: 37 } wide: { width: 90, height: 37 } change-view-2: { width: 90, height: 37 } spaceline: { width: 153, height: 37 } - small: { width: 67.4, height: 22 } + 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 . BackSpace" - - "show_numbers show_eschars preferences space SlashSmall show_actions Return" + - "Shift_L y x k q g h f BackSpace" + - "show_numbers show_eschars preferences space show_actions Return" upper: - - "EscSmall TabSmall Ctrl Alt PageUp PageDown ← →" + - "EscSmall TabSmall Ctrl Alt PageUp PageDown 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 MinusSmall BackSpace" - - "show_numbers show_eschars preferences space ColonSmall show_actions Return" + - "Shift_L Y X K Q G H F BackSpace" + - "show_numbers show_eschars preferences space show_actions Return" numbers: - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "1 2 3 4 5 6 7 8 9 0" - "@ # € % & - _ + ( )" - "show_symbols , \" ' : ; ! ? BackSpace" - - "show_letters show_eschars preferences space show_actions Return" + - "show_letters show_eschars preferences space . Return" symbols: - - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" + - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "~ ` | · √ π τ ÷ × ¶" - "© ® £ $ ¥ ^ ° * { }" - "show_numbers \\ / < > = [ ] BackSpace" - - "show_letters show_eschars preferences space show_actions Return" + - "show_letters show_eschars preferences space . Return" eschars: - - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" + - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "à â ç é è ê î ô ù û" - "À Â Ç É È Ê Î Ô Ù Û" - "show_numbers æ œ ä ë ï ö ü BackSpace" - - "show_letters show_eschars preferences space show_actions Return" + - "show_letters show_eschars preferences space . Return" actions: - "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End" - "F1 F2 F3 F4 F5 F6" - "F7 F8 F9 F10 F11 F12" - "Esc Tab Pause Insert Up Del" - "show_letters_actions Menu Break Left Down Right" - buttons: F1: @@ -228,14 +226,5 @@ buttons: outline: "wide" icon: "key-enter" keysym: "Return" - ColonSmall: - outline: "halfwidth" - text: ":" - MinusSmall: - outline: "halfwidth" - text: "-" - SlashSmall: - outline: "halfwidth" - text: "/" .: - outline: "halfwidth" + outline: "large" diff --git a/src/resources.rs b/src/resources.rs index dfea9807..e074ecda 100644 --- a/src/resources.rs +++ b/src/resources.rs @@ -173,6 +173,8 @@ static KEYBOARDS: &[(&'static str, &'static str)] = &[ ("terminal/fr", include_str!("../data/keyboards/terminal/fr.yaml")), ("terminal/fr_wide", include_str!("../data/keyboards/terminal/fr_wide.yaml")), + ("terminal/fr+bepo", include_str!("../data/keyboards/terminal/fr+bepo.yaml")), + ("terminal/fr+bepo_wide", include_str!("../data/keyboards/terminal/fr+bepo_wide.yaml")), ("terminal/us", include_str!("../data/keyboards/terminal/us.yaml")), ("terminal/us_wide", include_str!("../data/keyboards/terminal/us_wide.yaml")), diff --git a/tests/meson.build b/tests/meson.build index 9f8ab47c..23d50b20 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -114,6 +114,7 @@ foreach layout : [ 'terminal/de', 'terminal/de_wide', 'terminal/es', 'terminal/es_wide', 'terminal/fr', 'terminal/fr_wide', + 'terminal/fr+bepo', 'terminal/fr+bepo_wide', 'terminal/us', 'terminal/us_wide', 'terminal/us+dvorak', 'terminal/us+dvorak_wide',