Skip to content

Commit db87bb7

Browse files
committed
2025.05.27 release, –—, readme
1 parent 5ec6640 commit db87bb7

26 files changed

Lines changed: 1138 additions & 1118 deletions

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# releases dir
2-
releases/
2+
releases/
3+
4+
klfc

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center">
2-
<img src="https://wildcard.yiff.church/i/1lksz7b8.png" />
2+
<img src="./us-intl.png" />
33
</p>
44

55
# <p align="center">United States (Reformed International)</p>
@@ -35,9 +35,10 @@ But upon looking at the way US-International tends to be done, I realized some o
3535

3636
## The Standard
3737
This is the way that US-International is usually done in the Linux sphere and such, and will be compared against below:
38-
![US-International](https://wildcard.yiff.church/i/im1h033s.png)
38+
39+
![US-International](./us-intl.png)
3940
## The Reform
40-
![US-Reformed-International](https://wildcard.yiff.church/i/1lksz7b8.png)
41+
![US-Reformed-International](./us-intl.png)
4142

4243
This is my keyboard layout that aims to fix the problems with given US-International implementations. Here is a list of the changes with their justifications:
4344
* `ł` and `Ł` replace `ø` and `Ø` at `AltGr`+`l` and `AltGr`+`Shift`+`l` respectively.
@@ -116,7 +117,7 @@ Pick **one** (1) of the install methods below
116117

117118
**Other locales:** `klc.zip` installs to the `en-US` locale. If you wish to install the layout to a different locale:
118119
1. Download the source code file [`klc/us-refor.klc`](https://github.com/barkloaf/US-Reformed-International/blob/master/klc/us-refor.klc)
119-
2. Open the file you just modified in [Microsoft Keyboard Layout Creator](https://www.microsoft.com/en-us/download/details.aspx?id=102134)
120+
2. Open the source code file [Microsoft Keyboard Layout Creator](https://www.microsoft.com/en-us/download/details.aspx?id=102134)
120121
3. Edit the language in `Project` > `Properties...` > `Language`
121122
* **Note:** MSKLC will not compile the layout if it shares a name with an existing keyboard on your system. The name of the layout can also be changed in this menu if necessary.
122123
4. Create the installer by going to `Project` > `Build DLL and Setup Package`
@@ -141,7 +142,7 @@ Pick **one** (1) of the install methods below
141142

142143
## Linux
143144
### XKB
144-
Download the latest `xkb.tar.gz` from [the releases tab of this repo](https://github.com/barkloaf/US-Reformed-International/releases). Extract it and run `install-system.sh` as root followed by `scripts/install-user.sh` as user from the folder.
145+
Download the latest `xkb.tar.gz` from [the releases tab of this repo](https://github.com/barkloaf/US-Reformed-International/releases). Extract it and run `install-system.sh` as root followed by `scripts/install-user.sh` as user from the folder. The layout might need to be enabled first in order to be used. This may vary per distribution.
145146

146147
# Credits
147148
The auto-generated files and scripts in this repo were created by [`klfc`](https://github.com/39aldo39/klfc)!

ahk/us-refor.ahk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; Generated by KLFC 1.5.6
1+
; Generated by KLFC 1.5.7
22
; https://github.com/39aldo39/klfc
33

44
#MaxHotkeysPerInterval 200
@@ -531,6 +531,8 @@ if (DeadKeys.item("macron") == "") {
531531
DeadKeys.item("macron").item("<") := ""
532532
DeadKeys.item("macron").item(">") := ""
533533
DeadKeys.item("macron").item("+") := "±"
534+
DeadKeys.item("macron").item("-") := ""
535+
DeadKeys.item("macron").item("_") := ""
534536
DeadKeys.item("macron").item(" ") := "̄"
535537
DeadKeys.item("macron").item(" ") := "¯"
536538
DeadKeys.item("macron").item("A") := "Ā"

keylayout/install-system.sh

100644100755
File mode changed.

keylayout/install-user.sh

100644100755
File mode changed.

keylayout/us-refor.keylayout

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE keyboard SYSTEM "file://localhost/System/Library/DTDs/KeyboardLayout.dtd">
33
<!--
4-
Generated by KLFC 1.5.6
4+
Generated by KLFC 1.5.7
55
https://github.com/39aldo39/klfc
66
-->
77
<keyboard group="126" id="-1337" name="United States (Reformed International)">
@@ -144,7 +144,7 @@
144144
<key code="28" output="*" />
145145
<key code="25" output="(" />
146146
<key code="29" output=")" />
147-
<key code="27" output="_" />
147+
<key code="27" action="_" />
148148
<key code="24" action="+" />
149149
<key code="12" output="Q" />
150150
<key code="13" action="W" />
@@ -532,7 +532,7 @@
532532
<key code="28" output="*" />
533533
<key code="25" output="(" />
534534
<key code="29" output=")" />
535-
<key code="27" output="_" />
535+
<key code="27" action="_" />
536536
<key code="24" action="+" />
537537
<key code="12" output="q" />
538538
<key code="13" action="w" />
@@ -887,6 +887,7 @@
887887
<action id="-">
888888
<when state="none" output="-" />
889889
<when state="dead:tilde" output="" />
890+
<when state="dead:macron" output="" />
890891
</action>
891892
<action id="&#60;">
892893
<when state="none" output="&#60;" />
@@ -1163,6 +1164,10 @@
11631164
<when state="dead:underdot" output="" />
11641165
<when state="dead:overdot" output="Ż" />
11651166
</action>
1167+
<action id="_">
1168+
<when state="none" output="_" />
1169+
<when state="dead:macron" output="" />
1170+
</action>
11661171
<action id="a">
11671172
<when state="none" output="a" />
11681173
<when state="dead:grave" output="à" />

0 commit comments

Comments
 (0)