Skip to content

Commit

Permalink
Mac version
Browse files Browse the repository at this point in the history
  • Loading branch information
pascal committed Jul 4, 2020
1 parent 1faed48 commit a842602
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 254 deletions.
4 changes: 2 additions & 2 deletions mac/DeveloperDvorak.bundle/Contents/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleIdentifier</key>
<string>org.sil.ukelele.keyboardlayout.DeveloperDvorak</string>
<string>org.sil.ukelele.keyboardlayout.Developer Dvorak</string>
<key>CFBundleName</key>
<string>Dev</string>
<key>CFBundleVersion</key>
Expand All @@ -13,7 +13,7 @@
<key>TICapsLockLanguageSwitchCapable</key>
<false/>
<key>TISInputSourceID</key>
<string>org.sil.ukelele.keyboardlayout.DeveloperDvorak</string>
<string>org.sil.ukelele.keyboardlayout.Developer Dvorak</string>
<key>TISIntendedLanguage</key>
<string>en</string>
</dict>
Expand Down
134 changes: 9 additions & 125 deletions mac/DeveloperDvorak.bundle/Contents/Resources/DeveloperDvorak.keylayout
View file
Original file line number Diff line number Diff line change
@@ -1,80 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "file://localhost/System/Library/DTDs/KeyboardLayout.dtd">
<keyboard group="126" id="-8888" name="Developer Dvorak" maxout="15">
<keyboard group="126" id="-8888" name="DeveloperDvorak" maxout="15">
<layouts>
<layout first="0" last="6" modifiers="modifiers" mapSet="ANSI" />
<layout first="7" last="9" modifiers="modifiers" mapSet="ISO" />
<layout first="10" last="10" modifiers="modifiers" mapSet="ANSI" />
<layout first="11" last="11" modifiers="modifiers" mapSet="ISO" />
<layout first="12" last="12" modifiers="modifiers" mapSet="ANSI" />
<layout first="13" last="13" modifiers="modifiers" mapSet="ISO" />
<layout first="14" last="15" modifiers="modifiers" mapSet="ANSI" />
<layout first="16" last="16" modifiers="modifiers" mapSet="ISO" />
<layout first="17" last="17" modifiers="modifiers" mapSet="JIS" />
<layout first="18" last="19" modifiers="modifiers" mapSet="ANSI" />
<layout first="20" last="20" modifiers="modifiers" mapSet="ISO" />
<layout first="21" last="21" modifiers="modifiers" mapSet="JIS" />
<layout first="22" last="28" modifiers="modifiers" mapSet="ANSI" />
<layout first="29" last="29" modifiers="modifiers" mapSet="ISO" />
<layout first="30" last="30" modifiers="modifiers" mapSet="JIS" />
<layout first="31" last="31" modifiers="modifiers" mapSet="ANSI" />
<layout first="32" last="32" modifiers="modifiers" mapSet="ISO" />
<layout first="33" last="33" modifiers="modifiers" mapSet="JIS" />
<layout first="34" last="34" modifiers="modifiers" mapSet="ANSI" />
<layout first="35" last="35" modifiers="modifiers" mapSet="ISO" />
<layout first="36" last="36" modifiers="modifiers" mapSet="JIS" />
<layout first="37" last="37" modifiers="modifiers" mapSet="ANSI" />
<layout first="38" last="38" modifiers="modifiers" mapSet="ISO" />
<layout first="39" last="39" modifiers="modifiers" mapSet="JIS" />
<layout first="40" last="40" modifiers="modifiers" mapSet="ANSI" />
<layout first="41" last="41" modifiers="modifiers" mapSet="ISO" />
<layout first="42" last="42" modifiers="modifiers" mapSet="JIS" />
<layout first="43" last="44" modifiers="modifiers" mapSet="ISO" />
<layout first="194" last="194" modifiers="modifiers" mapSet="JIS" />
<layout first="195" last="195" modifiers="modifiers" mapSet="ANSI" />
<layout first="196" last="196" modifiers="modifiers" mapSet="ISO" />
<layout first="197" last="197" modifiers="modifiers" mapSet="JIS" />
<layout first="198" last="198" modifiers="modifiers" mapSet="ANSI" />
<layout first="199" last="199" modifiers="modifiers" mapSet="ISO" />
<layout first="200" last="201" modifiers="modifiers" mapSet="JIS" />
<layout first="202" last="202" modifiers="modifiers" mapSet="ANSI" />
<layout first="203" last="203" modifiers="modifiers" mapSet="ISO" />
<layout first="204" last="204" modifiers="modifiers" mapSet="ANSI" />
<layout first="205" last="205" modifiers="modifiers" mapSet="ISO" />
<layout first="206" last="207" modifiers="modifiers" mapSet="JIS" />
<layout first="0" last="0" modifiers="modifiers" mapSet="DeveloperDvorak" />
</layouts>
<modifierMap id="modifiers" defaultIndex="0">
<!-- no modifiers -->
<keyMapSelect mapIndex="0">
<modifier keys="" />
<modifier keys="command anyShift? caps?" />
</keyMapSelect>
<!-- shift -->
<keyMapSelect mapIndex="1">
<modifier keys="anyShift" />
</keyMapSelect>
<keyMapSelect mapIndex="2">
<modifier keys="caps" />
<modifier keys="anyOption" />
</keyMapSelect>
<keyMapSelect mapIndex="3">
<modifier keys="anyShift caps" />
<modifier keys="anyOption anyShift" />
</keyMapSelect>
<!-- option -->
<keyMapSelect mapIndex="4">
<modifier keys="anyOption" />
<modifier keys="anyOption anyShift caps" />
<modifier keys="anyOption command anyShift? caps?" />
<modifier keys="caps" />
</keyMapSelect>
<!-- option + shift -->
<keyMapSelect mapIndex="5">
<modifier keys="anyOption anyShift" />
<modifier keys="caps anyShift" />
</keyMapSelect>
<keyMapSelect mapIndex="6">
<modifier keys="anyOption caps" />
<modifier keys="caps anyOption" />
</keyMapSelect>
<!-- control + anything but command -->
<keyMapSelect mapIndex="7">
<modifier keys="anyControl anyShift? caps? anyOption?" />
<modifier keys="caps anyOption anyShift" />
</keyMapSelect>
</modifierMap>
<keyMapSet id="static">
Expand Down Expand Up @@ -250,7 +203,6 @@
<key code="126" output="&#x001E;" />
</keyMap>
<keyMap index="3">

<key code="52" output="&#x0003;" />
<key code="53" output="&#x001B;" />
<key code="65" output="." />
Expand Down Expand Up @@ -537,7 +489,7 @@
<key code="126" output="&#x001E;" />
</keyMap>
</keyMapSet>
<keyMapSet id="ANSI">
<keyMapSet id="DeveloperDvorak">
<keyMap index="0" baseMapSet="static" baseIndex="0">
<key code="6" output="&#x0027;"/>
<key code="7" action="q"/>
Expand Down Expand Up @@ -812,74 +764,6 @@
<key code="49" output="0"/>
</keyMap>
</keyMapSet>
<keyMapSet id="ISO">
<keyMap index="0" baseMapSet="ANSI" baseIndex="0">
</keyMap>
<keyMap index="1" baseMapSet="ANSI" baseIndex="1">
</keyMap>
<keyMap index="2" baseMapSet="ANSI" baseIndex="2">
</keyMap>
<keyMap index="3" baseMapSet="ANSI" baseIndex="3">
</keyMap>
<keyMap index="4" baseMapSet="ANSI" baseIndex="4">
</keyMap>
<keyMap index="5" baseMapSet="ANSI" baseIndex="5">
</keyMap>
<keyMap index="6" baseMapSet="ANSI" baseIndex="6">
</keyMap>
<keyMap index="7" baseMapSet="ANSI" baseIndex="7">
</keyMap>
</keyMapSet>
<keyMapSet id="JIS">
<keyMap index="0" baseMapSet="ANSI" baseIndex="0">
<key code="94" output="" />
<key code="95" output="" />
<key code="102" output="" />
<key code="104" output="" />
</keyMap>
<keyMap index="1" baseMapSet="ANSI" baseIndex="1">
<key code="94" output="" />
<key code="95" output="" />
<key code="102" output="" />
<key code="104" output="" />
</keyMap>
<keyMap index="2" baseMapSet="ANSI" baseIndex="2">
<key code="94" output="" />
<key code="95" output="" />
<key code="102" output="" />
<key code="104" output="" />
</keyMap>
<keyMap index="3" baseMapSet="ANSI" baseIndex="3">
<key code="94" output="" />
<key code="95" output="" />
<key code="102" output="" />
<key code="104" output="" />
</keyMap>
<keyMap index="4" baseMapSet="ANSI" baseIndex="4">
<key code="94" output="" />
<key code="95" output="" />
<key code="102" output="" />
<key code="104" output="" />
</keyMap>
<keyMap index="5" baseMapSet="ANSI" baseIndex="5">
<key code="94" output="" />
<key code="95" output="" />
<key code="102" output="" />
<key code="104" output="" />
</keyMap>
<keyMap index="6" baseMapSet="ANSI" baseIndex="6">
<key code="94" output="" />
<key code="95" output="" />
<key code="102" output="" />
<key code="104" output="" />
</keyMap>
<keyMap index="7" baseMapSet="ANSI" baseIndex="7">
<key code="94" output="" />
<key code="95" output="" />
<key code="102" output="" />
<key code="104" output="" />
</keyMap>
</keyMapSet>
<actions>
<action id="a">
<when state="none" output="a" />
Expand Down
Binary file modified mac/DeveloperDvorak.bundle/Contents/Resources/en.lproj/InfoPlist.strings
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion mac/DeveloperDvorak.bundle/Contents/version.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>BuildVersion</key>
<string></string>
<key>ProjectName</key>
<string>DeveloperDvorak</string>
<string>Developer Dvorak</string>
<key>SourceVersion</key>
<string></string>
</dict>
Expand Down
134 changes: 9 additions & 125 deletions mac/dvorak-dev.tpl.keylayout
View file
Original file line number Diff line number Diff line change
@@ -1,80 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "file://localhost/System/Library/DTDs/KeyboardLayout.dtd">
<keyboard group="126" id="-8888" name="Developer Dvorak" maxout="15">
<keyboard group="126" id="-8888" name="DeveloperDvorak" maxout="15">
<layouts>
<layout first="0" last="6" modifiers="modifiers" mapSet="ANSI" />
<layout first="7" last="9" modifiers="modifiers" mapSet="ISO" />
<layout first="10" last="10" modifiers="modifiers" mapSet="ANSI" />
<layout first="11" last="11" modifiers="modifiers" mapSet="ISO" />
<layout first="12" last="12" modifiers="modifiers" mapSet="ANSI" />
<layout first="13" last="13" modifiers="modifiers" mapSet="ISO" />
<layout first="14" last="15" modifiers="modifiers" mapSet="ANSI" />
<layout first="16" last="16" modifiers="modifiers" mapSet="ISO" />
<layout first="17" last="17" modifiers="modifiers" mapSet="JIS" />
<layout first="18" last="19" modifiers="modifiers" mapSet="ANSI" />
<layout first="20" last="20" modifiers="modifiers" mapSet="ISO" />
<layout first="21" last="21" modifiers="modifiers" mapSet="JIS" />
<layout first="22" last="28" modifiers="modifiers" mapSet="ANSI" />
<layout first="29" last="29" modifiers="modifiers" mapSet="ISO" />
<layout first="30" last="30" modifiers="modifiers" mapSet="JIS" />
<layout first="31" last="31" modifiers="modifiers" mapSet="ANSI" />
<layout first="32" last="32" modifiers="modifiers" mapSet="ISO" />
<layout first="33" last="33" modifiers="modifiers" mapSet="JIS" />
<layout first="34" last="34" modifiers="modifiers" mapSet="ANSI" />
<layout first="35" last="35" modifiers="modifiers" mapSet="ISO" />
<layout first="36" last="36" modifiers="modifiers" mapSet="JIS" />
<layout first="37" last="37" modifiers="modifiers" mapSet="ANSI" />
<layout first="38" last="38" modifiers="modifiers" mapSet="ISO" />
<layout first="39" last="39" modifiers="modifiers" mapSet="JIS" />
<layout first="40" last="40" modifiers="modifiers" mapSet="ANSI" />
<layout first="41" last="41" modifiers="modifiers" mapSet="ISO" />
<layout first="42" last="42" modifiers="modifiers" mapSet="JIS" />
<layout first="43" last="44" modifiers="modifiers" mapSet="ISO" />
<layout first="194" last="194" modifiers="modifiers" mapSet="JIS" />
<layout first="195" last="195" modifiers="modifiers" mapSet="ANSI" />
<layout first="196" last="196" modifiers="modifiers" mapSet="ISO" />
<layout first="197" last="197" modifiers="modifiers" mapSet="JIS" />
<layout first="198" last="198" modifiers="modifiers" mapSet="ANSI" />
<layout first="199" last="199" modifiers="modifiers" mapSet="ISO" />
<layout first="200" last="201" modifiers="modifiers" mapSet="JIS" />
<layout first="202" last="202" modifiers="modifiers" mapSet="ANSI" />
<layout first="203" last="203" modifiers="modifiers" mapSet="ISO" />
<layout first="204" last="204" modifiers="modifiers" mapSet="ANSI" />
<layout first="205" last="205" modifiers="modifiers" mapSet="ISO" />
<layout first="206" last="207" modifiers="modifiers" mapSet="JIS" />
<layout first="0" last="0" modifiers="modifiers" mapSet="DeveloperDvorak" />
</layouts>
<modifierMap id="modifiers" defaultIndex="0">
<!-- no modifiers -->
<keyMapSelect mapIndex="0">
<modifier keys="" />
<modifier keys="command anyShift? caps?" />
</keyMapSelect>
<!-- shift -->
<keyMapSelect mapIndex="1">
<modifier keys="anyShift" />
</keyMapSelect>
<keyMapSelect mapIndex="2">
<modifier keys="caps" />
<modifier keys="anyOption" />
</keyMapSelect>
<keyMapSelect mapIndex="3">
<modifier keys="anyShift caps" />
<modifier keys="anyOption anyShift" />
</keyMapSelect>
<!-- option -->
<keyMapSelect mapIndex="4">
<modifier keys="anyOption" />
<modifier keys="anyOption anyShift caps" />
<modifier keys="anyOption command anyShift? caps?" />
<modifier keys="caps" />
</keyMapSelect>
<!-- option + shift -->
<keyMapSelect mapIndex="5">
<modifier keys="anyOption anyShift" />
<modifier keys="caps anyShift" />
</keyMapSelect>
<keyMapSelect mapIndex="6">
<modifier keys="anyOption caps" />
<modifier keys="caps anyOption" />
</keyMapSelect>
<!-- control + anything but command -->
<keyMapSelect mapIndex="7">
<modifier keys="anyControl anyShift? caps? anyOption?" />
<modifier keys="caps anyOption anyShift" />
</keyMapSelect>
</modifierMap>
<keyMapSet id="static">
Expand Down Expand Up @@ -250,7 +203,6 @@
<key code="126" output="&#x001E;" />
</keyMap>
<keyMap index="3">

<key code="52" output="&#x0003;" />
<key code="53" output="&#x001B;" />
<key code="65" output="." />
Expand Down Expand Up @@ -537,75 +489,7 @@
<key code="126" output="&#x001E;" />
</keyMap>
</keyMapSet>
<keyMapSet id="ANSI">
</keyMapSet>
<keyMapSet id="ISO">
<keyMap index="0" baseMapSet="ANSI" baseIndex="0">
</keyMap>
<keyMap index="1" baseMapSet="ANSI" baseIndex="1">
</keyMap>
<keyMap index="2" baseMapSet="ANSI" baseIndex="2">
</keyMap>
<keyMap index="3" baseMapSet="ANSI" baseIndex="3">
</keyMap>
<keyMap index="4" baseMapSet="ANSI" baseIndex="4">
</keyMap>
<keyMap index="5" baseMapSet="ANSI" baseIndex="5">
</keyMap>
<keyMap index="6" baseMapSet="ANSI" baseIndex="6">
</keyMap>
<keyMap index="7" baseMapSet="ANSI" baseIndex="7">
</keyMap>
</keyMapSet>
<keyMapSet id="JIS">
<keyMap index="0" baseMapSet="ANSI" baseIndex="0">
<key code="94" output="" />
<key code="95" output="" />
<key code="102" output="" />
<key code="104" output="" />
</keyMap>
<keyMap index="1" baseMapSet="ANSI" baseIndex="1">
<key code="94" output="" />
<key code="95" output="" />
<key code="102" output="" />
<key code="104" output="" />
</keyMap>
<keyMap index="2" baseMapSet="ANSI" baseIndex="2">
<key code="94" output="" />
<key code="95" output="" />
<key code="102" output="" />
<key code="104" output="" />
</keyMap>
<keyMap index="3" baseMapSet="ANSI" baseIndex="3">
<key code="94" output="" />
<key code="95" output="" />
<key code="102" output="" />
<key code="104" output="" />
</keyMap>
<keyMap index="4" baseMapSet="ANSI" baseIndex="4">
<key code="94" output="" />
<key code="95" output="" />
<key code="102" output="" />
<key code="104" output="" />
</keyMap>
<keyMap index="5" baseMapSet="ANSI" baseIndex="5">
<key code="94" output="" />
<key code="95" output="" />
<key code="102" output="" />
<key code="104" output="" />
</keyMap>
<keyMap index="6" baseMapSet="ANSI" baseIndex="6">
<key code="94" output="" />
<key code="95" output="" />
<key code="102" output="" />
<key code="104" output="" />
</keyMap>
<keyMap index="7" baseMapSet="ANSI" baseIndex="7">
<key code="94" output="" />
<key code="95" output="" />
<key code="102" output="" />
<key code="104" output="" />
</keyMap>
<keyMapSet id="DeveloperDvorak">
</keyMapSet>
<actions>
<action id="a">
Expand Down
2 changes: 1 addition & 1 deletion mac/generate.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GIT_DIR=$(pwd -P)
OWN_DIR="$GIT_DIR/mac"

# Markers
DELIMITER=' <keyMapSet id="ANSI">'
DELIMITER=' <keyMapSet id="DeveloperDvorak">'
SRC_FILE="$GIT_DIR/matrix.csv"
# Main layout
TPL_FILE="$OWN_DIR/dvorak-dev.tpl.keylayout"
Expand Down

0 comments on commit a842602

Please sign in to comment.