Skip to content

Commit

Permalink
Bump version to 0.7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
devnoname120 committed Dec 10, 2023
1 parent 21cbf06 commit fbd02ea
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 26 deletions.
2 changes: 1 addition & 1 deletion linux/debian/DEBIAN/control
@@ -1,5 +1,5 @@
Package: xkb-qwerty-fr
Version: 0.7.2
Version: 0.7.3
Section: x11
Priority: optional
Architecture: all
Expand Down
2 changes: 1 addition & 1 deletion linux/debian/Makefile
Expand Up @@ -7,7 +7,7 @@ MV=mv -f
MKD=mkdir -p

PKG=xkb-qwerty-fr
VER=0.7.2
VER=0.7.3
ARCH=all

PKG_NAME=$(PKG)_$(VER)_$(ARCH)
Expand Down
13 changes: 13 additions & 0 deletions linux/debian/changelog
@@ -1,3 +1,16 @@
xkb-qwerty-fr (0.7.3) unstable; urgency=low

* Layout: Replaced 〉 with ⟩ in the math mode. i.e. “Right Angle
Bracket” was replaced with “Mathematical Right Angle Bracket”.
〉 is the “Right Angle Bracket” but we actually want ⟩ which is the
“Mathematical Right Angle Bracket”.
* Linux: Removed parasitic .DS_Store/__MACOSX/DEBIAN files from the Linux
package.
* Linux: Changed the separator characters used in keymap.txt to improve
readability. Credits go to https://github.com/eclipseo

-- Paul <devnoname120@gmail.com> Sun, 10 Dec 2023 12:12:00 +0100

xkb-qwerty-fr (0.7.2) unstable; urgency=low

* Linux: Fixed syntax error that broke the layout. Credits go to https://github.com/SimonGaufreteau.
Expand Down
1 change: 1 addition & 0 deletions linux/export/build-linux-zip
@@ -1,5 +1,6 @@
#!/bin/sh
pushd ../debian
find . -name ".DS_Store" -type f -print -delete
make zip
popd
cp ../debian/*.zip .
2 changes: 1 addition & 1 deletion linux/keymap.txt
@@ -1,5 +1,5 @@

This is the overall view of qwerty-fr 0.7.1 keymap.
This is the overall view of qwerty-fr 0.7.3 keymap.


┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
Expand Down
4 changes: 2 additions & 2 deletions linux/man/qwerty-fr.7
@@ -1,10 +1,10 @@
.TH xkb-qwerty-fr 7 "2022-09-06" 0.7.2 "Qwerty french keyboard"
.TH xkb-qwerty-fr 7 "2023-12-10" 0.7.3 "Qwerty french keyboard"
.SH "NAME"
qwerty-fr - French qwerty keyboard mapping
.SH "DESCRIPTION"
Keymap for french users of qwerty keyboard.
All french characters are directly accessible with AltGr and smartly mapped.
You also can compose french characters using dead keys with AltGr too.
You also can compose french characters using dead keys with AltGr too.
.SH "LINKS"
.SS Source repository
https://github.com/qwerty-fr/qwerty-fr
Expand Down
5 changes: 5 additions & 0 deletions mac/bundle/instructions.md
@@ -0,0 +1,5 @@
Run the following on a Mac (teted on macOS Monterey 12.1):
```shell
find . -name ".DS_Store" -type f -print -delete
zip -r qwerty-fr_0.7.3_mac.zip qwerty-fr.bundle
```
5 changes: 2 additions & 3 deletions mac/homebrew/qwerty-fr.rb
@@ -1,6 +1,6 @@
cask "qwerty-fr" do
version "0.7.1"
sha256 "aa036941b3552df47c58e27fc5641835da3ab3df660c4092086a2ea75d36fa28"
version "0.7.3"
sha256 "7c8213994ae08323ab95837c586bb0863f77a334ec744ce8762332e7af345b70"

url "https://github.com/qwerty-fr/qwerty-fr/releases/download/v#{version}/qwerty-fr_#{version}_mac.zip",
verified: "github.com/qwerty-fr/qwerty-fr/"
Expand All @@ -22,7 +22,6 @@
uninstall delete: [
"/Library/Keyboard Layouts/qwerty-fr.bundle/",
"/System/Library/Caches/com.apple.IntlDataCache.le*",
"/private/var/folders/*/*/*/com.apple.IntlDataCache.le*",
]

caveats do
Expand Down
5 changes: 3 additions & 2 deletions mac/pkg/instructions.md
@@ -1,7 +1,8 @@
Run the following on a Mac (tested on macOS Monterey 12.1):

```
pkgbuild --version 0.71 --root ../bundle --scripts scripts --identifier qwerty-fr.org.pkg --install-location /Library/Keyboard\ Layouts/ qwerty-fr.pkg
```shell
find ../bundle -name ".DS_Store" -type f -print -delete
pkgbuild --version 0.73 --root ../bundle --scripts scripts --identifier qwerty-fr.org.pkg --install-location /Library/Keyboard\ Layouts/ qwerty-fr.pkg
productbuild --distribution distribution.xml qwerty-fr-distribution.pkg
codesign -s - qwerty-fr-distribution.pkg
```
Expand Down
32 changes: 16 additions & 16 deletions qwerty-fr.yaml
@@ -1,7 +1,7 @@
# WIP: Kalamine layout to be able to use https://github.com/fabi1cazenave/x-keyboard
#
# Use this fork due to the custom dead keys: https://github.com/qwerty-fr/kalamine
#
#
# Known issues:
# ~ key doesn't work on Windows (Kalamine has a bug where it puts the wrong key code)
# < key doesn't work on Windows (Kalamine has a bug where it puts the wrong key code)
Expand All @@ -15,7 +15,7 @@ name: qwerty-fr
name8: q-fr
description: QWERTY-fr layout
url: https://github.com/qwerty-fr/qwerty-fr
version: 0.7.1
version: 0.7.3
geometry: ISO

full: |
Expand Down Expand Up @@ -51,49 +51,49 @@ deadkeys:
alt: ÀàÈèÌìǸǹÒòÙùẀẁỲỳЀѐЍѝ
alt_space: '`' # U+0060 GRAVE ACCENT
alt_self: '`' # U+0060 GRAVE ACCENT

- char: '*‟'
name: doublegrave
base: AaEeIiOoRrUuѴѴ
alt: ȀȁȄȅȈȉȌȍȐȑȔȕѶѷ
alt_space: '' # U+201F HIGH REVERSED-9 QUOTATION MARK
alt_self: '' # U+201F HIGH REVERSED-9 QUOTATION MARK

- char: ''
name: acute
base: AaCcEeGgIiKkLlMmNnOoPpRrSsUuWwYyZzΑαΕεΗηΙιΟοΥυΩωГгКк
alt: ÁáĆćÉéǴǵÍíḰḱĹĺḾḿŃńÓóṔṕŔশÚúẂẃÝýŹźΆάΈέΉήΊίΌόΎύΏώЃѓЌќ
alt_space: "´" # U+0027 APOSTROPHE
alt_self: '´' # U+00B4 ACUTE ACCENT

- char: ''
name: doubleacute
base: AaEeIiMmOoUuУу
alt: A̋a̋E̋e̋I̋i̋M̋m̋ŐőŰűӲӳ
alt_space: "˝" # U+201D RIGHT DOUBLE QUOTATION MARK
alt_self: "˝" # U+02DD DOUBLE ACUTE ACCENT

- char: '*^'
name: circumflex
base: AaCcEeGgHhIiJjOoSsUuWwYyZz0123456789()+-=„,
alt: ÂâĈĉÊêĜĝĤĥÎîĴĵÔôŜŝÛûŴŵŶŷẐẑ⁰¹²³⁴⁵⁶⁷⁸⁹⁽⁾⁺⁻⁼“‘
alt_space: '^' # U+005E CIRCUMFLEX ACCENT
alt_self: '^' # U+005E CIRCUMFLEX ACCENT

- char: ''
name: caron
base: AaCcDdEeGgHhIiKkLlNnOoRrSsTtUuZzƷʒ0123456789()+-=
alt: ǍǎČčĎďĚěǦǧȞȟǏǐǨǩĽľŇňǑǒŘřŠšŤťǓǔŽžǮǯ₀₁₂₃₄₅₆₇₈₉₍₎₊₋₌
alt_space: 'ˇ' # U+02C7 CARON
alt_self: 'ˇ' # U+02C7 CARON

- char: '*~'
name: tilde
base: AaEeGgIiJjMmNnOoPpRrUuVvYy<>=
alt: ÃãẼẽG̃g̃ĨĩJ̃j̃M̃m̃ÑñÕõP̃p̃R̃r̃ŨũṼṽỸỹ≲≳≃
alt_space: '~' # U+007E TILDE
alt_self: '~' # U+007E TILDE

# FIXME: due to a bug in kalamine/x-keyboard we can't use *̑ or * ̑ because ` ̑` is a combining diacritic
# Alternatively we could change x-keyboard so that it displays the `alt_self` symbol instead of the `char`
- char: ''
Expand All @@ -102,7 +102,7 @@ deadkeys:
alt: ȂȃȆȇȊȋȎȏȒȓȖȗ
alt_space: ' ̑'
alt_self: ' ̑'

- char: ''
name: breve
base: AaEeGgHhIiOoUu
Expand All @@ -123,42 +123,42 @@ deadkeys:
alt: ĀāǢǣĐđĒēḠḡĪīŁłŌōŦŧŪūȲȳ
alt_space: '¯' # U+00AF MACRON
alt_self: 'ˉ' # U+02C9 MODIFIER LETTER MACRON

- char: ''
name: diaeresis
base: AaEeHhIiOotUuWwXxYyΙιΥυАаЕеӘәЖжЗзИиІіОоӨөУуЧчЫыЭэ
alt: ÄäËëḦḧÏïÖöẗÜüẄẅẌẍŸÿΪϊΫϋӒӓЁёӚӛӜӝӞӟӤӥЇїӦӧӪӫӰӱӴӵӸӹӬӭ
alt_space: '"' # U+0022 QUOTATION MARK
alt_self: '¨' # U+00A8 DIAERESIS

- char: ''
name: abovering
base: AaDdEeGgIiOoQqSsUuVvWwXxYy
alt: ÅåD̊d̊E̊e̊G̊g̊I̊i̊O̊o̊Q̊q̊S̊s̊ŮůV̊v̊W̊ẘX̊x̊Y̊ẙ
alt_space: '°' # U+02DA RING ABOVE
alt_self: '°' # U+02DA RING ABOVE

- char: ''
name: cedilla
base: AaBbCcDdEeGgHhI̧iKkLlMmNnQqRrSsTtUuXxZz
alt: A̧a̧B̧b̧ÇçḐḑȨȩĢģḨḩI̧i̧ĶķĻļM̧m̧ŅņQ̧q̧ŖŗŞşŢţU̧u̧X̧x̧Z̧z̧
alt_space: '¸' # U+00B8 CEDILLA
alt_self: '¸' # U+00B8 CEDILLA

- char: ''
name: ogonek
base: AaEeIiNnOoUu
alt: ĄąĘęĮįŊŋǪǫŲų
alt_space: '˛' # U+02DB OGONEK
alt_self: '˛' # U+02DB OGONEK

- char: ''
name: greek
base: AaBbDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuWwXxYyZz
alt: ΑαΒβΔδΕεΦφΓγΗηΙιΘθΚκΛλΜμΝνΟοΠπΧχΡρΣσΤτΥυΩωΞξΨψΖζ
alt_space: 'Ω' # U+00B5 GREEK SMALL LETTER ALPHA
alt_self: 'Ω' # U+00B5 GREEK SMALL LETTER ALPHA

- char: ''
name: currency
base: bBcdeiIlpPrtswy
Expand Down

0 comments on commit fbd02ea

Please sign in to comment.