diff --git a/EurKey-macOS.bundle/Contents/Info.plist b/EurKey-macOS.bundle/Contents/Info.plist index 110d7d9..64dc700 100644 --- a/EurKey-macOS.bundle/Contents/Info.plist +++ b/EurKey-macOS.bundle/Contents/Info.plist @@ -1,23 +1,23 @@ + + CFBundleIdentifier + de.felixfoertsch.keyboardlayout.EurKEY-macOS + CFBundleName + EurKEY-macOS + CFBundleVersion + + KLInfo_EurKEY v2.0 - CFBundleIdentifier - de.felixfoertsch.keyboardlayout.EurKEY-macOS - CFBundleName - EurKEY-macOS - CFBundleVersion - - KLInfo_EurKEY v2.0 - - TICapsLockLanguageSwitchCapable - - TISIconIsTemplate - - TISInputSourceID - de.felixfoertsch.keyboardlayout.EurKEY-macOS.eurkeyv2.0 - TISIntendedLanguage - en - + TICapsLockLanguageSwitchCapable + + TISIconIsTemplate + + TISInputSourceID + de.felixfoertsch.keyboardlayout.EurKEY-macOS.eurkeyv2.0 + TISIntendedLanguage + en + diff --git a/EurKey-macOS.bundle/Contents/Resources/EurKEY v1.3.icns b/EurKey-macOS.bundle/Contents/Resources/EurKEY v1.3.icns new file mode 100644 index 0000000..fe3fb03 Binary files /dev/null and b/EurKey-macOS.bundle/Contents/Resources/EurKEY v1.3.icns differ diff --git a/EurKey-macOS.bundle/Contents/Resources/EurKEY v1.5.keylayout b/EurKey-macOS.bundle/Contents/Resources/EurKEY v1.3.keylayout similarity index 97% rename from EurKey-macOS.bundle/Contents/Resources/EurKEY v1.5.keylayout rename to EurKey-macOS.bundle/Contents/Resources/EurKEY v1.3.keylayout index fb5dfb5..22de1d0 100644 --- a/EurKey-macOS.bundle/Contents/Resources/EurKEY v1.5.keylayout +++ b/EurKey-macOS.bundle/Contents/Resources/EurKEY v1.3.keylayout @@ -1,7 +1,7 @@ - - + + @@ -36,9 +36,9 @@ - - - + + + @@ -80,10 +80,10 @@ - + - + @@ -97,9 +97,6 @@ - - - @@ -155,7 +152,7 @@ - + @@ -280,7 +277,7 @@ - + @@ -392,7 +389,7 @@ - + @@ -409,7 +406,7 @@ - + @@ -424,7 +421,7 @@ - + @@ -436,10 +433,6 @@ - - - - @@ -620,7 +613,7 @@ - + @@ -637,6 +630,7 @@ + @@ -731,7 +725,7 @@ - + @@ -743,7 +737,7 @@ - + @@ -775,10 +769,6 @@ - - - - @@ -891,8 +881,6 @@ - - @@ -1033,13 +1021,9 @@ - - - - - + @@ -1050,20 +1034,20 @@ - + - + - + - + @@ -1073,15 +1057,15 @@ - + - + - + @@ -1101,32 +1085,32 @@ - + - + - + - + - + @@ -1136,29 +1120,29 @@ - + - + - + - + - + - + @@ -1186,7 +1170,7 @@ - + @@ -1211,6 +1195,7 @@ + @@ -1327,6 +1312,7 @@ + @@ -1338,6 +1324,7 @@ + @@ -1346,6 +1333,7 @@ + @@ -1416,7 +1404,7 @@ - + @@ -1461,6 +1449,9 @@ + + + @@ -1517,7 +1508,7 @@ - + @@ -1525,7 +1516,7 @@ - + @@ -1596,7 +1587,7 @@ - + @@ -1682,6 +1673,12 @@ + + + + + + diff --git a/EurKey-macOS.bundle/Contents/Resources/EurKEY v1.4.keylayout b/EurKey-macOS.bundle/Contents/Resources/EurKEY v1.4.keylayout index f8370f9..e4fdce7 100644 --- a/EurKey-macOS.bundle/Contents/Resources/EurKEY v1.4.keylayout +++ b/EurKey-macOS.bundle/Contents/Resources/EurKEY v1.4.keylayout @@ -7,8 +7,8 @@ Generated by kluchrtoxml_64 build 203 --> - - + + @@ -60,7 +60,7 @@ - + @@ -396,7 +396,7 @@ - + @@ -731,7 +731,7 @@ - + diff --git a/EurKey-macOS.bundle/Contents/Resources/EurKEY v1.5.icns b/EurKey-macOS.bundle/Contents/Resources/EurKEY v1.5.icns deleted file mode 100644 index 775edd2..0000000 Binary files a/EurKey-macOS.bundle/Contents/Resources/EurKEY v1.5.icns and /dev/null differ diff --git a/EurKey-macOS.bundle/Contents/Resources/de.lproj/InfoPlist.strings b/EurKey-macOS.bundle/Contents/Resources/de.lproj/InfoPlist.strings index 9396ccb..6e8ba8b 100644 Binary files a/EurKey-macOS.bundle/Contents/Resources/de.lproj/InfoPlist.strings and b/EurKey-macOS.bundle/Contents/Resources/de.lproj/InfoPlist.strings differ diff --git a/EurKey-macOS.bundle/Contents/Resources/en.lproj/InfoPlist.strings b/EurKey-macOS.bundle/Contents/Resources/en.lproj/InfoPlist.strings index 9396ccb..6e8ba8b 100644 Binary files a/EurKey-macOS.bundle/Contents/Resources/en.lproj/InfoPlist.strings and b/EurKey-macOS.bundle/Contents/Resources/en.lproj/InfoPlist.strings differ diff --git a/EurKey-macOS.bundle/Contents/Resources/es.lproj/InfoPlist.strings b/EurKey-macOS.bundle/Contents/Resources/es.lproj/InfoPlist.strings index 9396ccb..6e8ba8b 100644 Binary files a/EurKey-macOS.bundle/Contents/Resources/es.lproj/InfoPlist.strings and b/EurKey-macOS.bundle/Contents/Resources/es.lproj/InfoPlist.strings differ diff --git a/EurKey-macOS.bundle/Contents/version.plist b/EurKey-macOS.bundle/Contents/version.plist index 643e0f7..3cd2431 100644 --- a/EurKey-macOS.bundle/Contents/version.plist +++ b/EurKey-macOS.bundle/Contents/version.plist @@ -1,12 +1,12 @@ - - BuildVersion - - ProjectName - EurKEY-macOS - SourceVersion - - + + BuildVersion + + ProjectName + EurKEY-macOS + SourceVersion + + diff --git a/README.md b/README.md index 32433bf..6cb1561 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,10 @@ # EurKEY-macOS -The Keyboard Layout for Europeans, Coders and Translators. This repo is a fork and contains a **modified verison** of the EurKEY base layout. +The Keyboard Layout for Europeans, Coders and Translators. This repo is a fork and contains a **modified verison** of the EurKEY base layout. It builds on the official layout. You can find version 1.3, the latest official release, in the bundle as well. See the changelog below for my modifications. -I start versioning my customized edition from 2, since the layout is based on my modified EurKEY v1.4 that I have been using the last few years. The version with slight fixes is now available is called v1.5. +EurKEY-macOS is a rework targeted at MacBooks with the with pyhiscal English International keyboard (ISO) instead of the ANSI layout from the official upstream. Since it is an ISO layout, it has one additional key (`) and the big Enter key. -EurKEY-macOS is a rework targeted at MacBooks with the with pyhiscal English International keyboard (ISO). Since it is an ISO layout, it has one additional key (`) and the big Enter key. - -The keyboard layout should be compatible with the other ISO layouts typically available in Europe (e.g. German ISO). I tested the layout on the current tenkeyless MacBook keyboard (MacBook Air 2024). Working numpad keys are therefore not guaranteed. +The keyboard layout should be compatible with the other ISO layouts typically available in Europe (e.g. German ISO). However, the printed keys will obviously be different. I tested the layout on the current tenkeyless MacBook keyboard (MacBook Air 2024). Working numpad keys are therefore not guaranteed. ## Installation @@ -19,7 +17,9 @@ The keyboard layout should be compatible with the other ISO layouts typically av ## Notes on Ukelele and template icons -I have tried to configure a template icon for the bundle and stumbled onto behaviour that I consider a bug in Ukelele. I tried simply setting a template icon from the GUI using the checkbox, but it never saved it correctly. I had to manually edit `*.bundle/Info.plist` file and set the flag. +I have tried to configure a template icon for the bundle and stumbled onto behaviour that I consider a bug in Ukelele. Template icons are the new style of icons that switch color depending on the system theme. + +I tried simply setting a template icon from the GUI using the checkbox, but it never saved it correctly. I had to manually edit `*.bundle/Info.plist` file and set the flag. The structure of the Info.plist file is as follows: @@ -64,33 +64,33 @@ The structure of the Info.plist file is as follows: ### v2.0 (WIP) -| Key Combinations | Dead Key Symbol | -| ---------------- | --------------- | -| ⌥` | ` | -| ⌥⇧` | ~ | -| ⌥' | ´ | -| ⌥⇧' | ¨ | -| ⌥6 | ^ | -| ⌥⇧6 | ˇ | -| ⌥7 | ˚ | -| ⌥⇧7 | ¯ | -| ⌥m | Ω | -| ⌥⇧m | √ | -| ⌥\ | ¬ | - -### v1.5 - -- Configures every key exactly as it is printed on the keyboard (English - International). -- Fixes §-Key. -- Fixes German ẞ-Character ("Großes scharfes S"). Now correctly available via ⌥⇧s. +- Configures every key exactly as it is printed on the MacBook keyboard (ISO, English - International). - Removes distiction between left/right modifier keys. - Uses the `*.bundle` format to group the layout versions. -- Adds new nicer flag icon from upstream. +- Adds new monochrome macOS template icon that switches color with the system theme. +- Renames all dead key states to their initializing key combination for easier identifcation. The following table shows the mappings: + | Key Combinations | Dead Key Symbol | + | ---------------- | --------------- | + | ⌥`|` | + | ⌥⇧` | ~ | + | ⌥' | ´ | + | ⌥⇧' | ¨ | + | ⌥6 | ^ | + | ⌥⇧6 | ˇ | + | ⌥7 | ˚ | + | ⌥⇧7 | ¯ | + | ⌥m | Ω | + | ⌥⇧m | √ | + | ⌥\ | ¬ | ### v1.4 - Switches behaviour of superscript and subscript numbers: The subscript numbers are the default; the superscript numbers are available via `⌥⇧`. +### v1.3 + +- Implements the layout according to [spec](https://eurkey.steffen.bruentjen.eu/changelog.html). The layout is based on [Leonardo Schenkel's version 1.2](https://github.com/lbschenkel/EurKEY-Mac). + ## Attribution You can find the original EurKEY layout on [Steffen Brüntjens Website](https://eurkey.steffen.bruentjen.eu/start.html). My modified versions are originally based on the work of [Leonardo Brondani Schenkel](https://github.com/lbschenkel/EurKEY-Mac).