Skip to content

Commit

Permalink
Version 38 (2024-10-05)
Browse files Browse the repository at this point in the history
  • Loading branch information
sunaku committed Oct 5, 2024
1 parent a7d793b commit 04300e2
Show file tree
Hide file tree
Showing 38 changed files with 873 additions and 212 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ RUN apt-get install -y locales \
&& sed -i "s/^# $LANG/$LANG/" /etc/locale.gen \
&& locale-gen

# NOTE: rake provides ruby(1)
RUN apt-get install -y rake graphviz graphicsmagick poppler-utils
RUN apt-get install -y ruby rake graphviz graphicsmagick poppler-utils

WORKDIR /opt
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ also provided as "training wheels" to aid your transition to the full glory.

## Keymap

Version 37 (2024-09-15)
- Changes: https://github.com/sunaku/glove80-keymaps/releases/v37
- Release: https://my.glove80.com/#/layout/user/13c16910-9689-4408-a392-39a6e0e15162
Version 38 (2024-10-05)
- Changes: https://github.com/sunaku/glove80-keymaps/releases/v38
- Release: https://my.glove80.com/#/layout/user/56b3ddfa-0299-4983-b66d-5101c8958452

### Legend

Expand Down Expand Up @@ -54,7 +54,7 @@ See [release notes][rel] for a visual overview of recent updates.
* [Reordering home row mods](#reordering-home-row-mods)
* [Fine-tuning the timing](#fine-tuning-the-timing)
* [Compiling from source](#compiling-from-source)
* [Unicode/Emoji characters](#unicodeemoji-characters)
* [World and Emoji characters](#world-and-emoji-characters)
* [Adding a new World character](#adding-a-new-world-character)
* [Shift key for World characters](#shift-key-for-world-characters)
* [Modifiers for World characters](#modifiers-for-world-characters)
Expand Down Expand Up @@ -451,9 +451,9 @@ adjust the `#define` time thresholds in the "Custom Defined Behaviors" snippet.

[Ubuntu in WSL]: https://ubuntu.com/desktop/wsl

#### Unicode/Emoji characters
#### World and Emoji characters

You can customize the preset characters in the Emoji and World layers by
You can customize the predefined characters in the Emoji and World layers by
editing their respective YAML source files in this repository. Afterwards,
run the `rake` command and then copy the new `keymap.dtsi` contents back into
the "Custom Defined Behaviors" text box in the Layout Editor for your keymap.
Expand Down
Binary file modified README/all-layer-diagrams.pdf
Binary file not shown.
71 changes: 61 additions & 10 deletions README/base-layer-diagram.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"css": "/* front legend */\n.keylabel10 div { \n font-size: xx-small;\n font-style: italic;\n text-shadow: 1px 1px 2px #FFD600;\n}\n/* description */\ncenter h2 {\n margin-top: 1em;\n}\ncenter ul {\n padding-left: 0;\n margin-top: 1em;\n padding-top: 1em;\n font-size: smaller;\n}\ncenter ul li {\n margin-top: 1ex;\n list-style-type: none;\n}\ncenter ul li a {\n font-weight: bold;\n}\ncenter .permalink {\n font-size: x-small;\n}\ncenter em {\n font-weight: normal;\n font-style: normal;\n}"
"css": "/* front legend */\n.keylabel10 div { \n font-size: xx-small;\n font-style: italic;\n text-shadow: 1px 1px 2px #FFD600;\n}\n/* description */\ncenter h2 {\n margin-top: 1em;\n}\ncenter ul {\n padding-left: 0;\n margin-top: 1em;\n padding-top: 1em;\n font-size: smaller;\n}\ncenter ul li {\n margin-top: 1ex;\n list-style-type: none;\n}\ncenter ul li a {\n font-weight: bold;\n}\ncenter .permalink {\n font-size: x-small;\n}\ncenter em {\n font-weight: normal;\n font-style: normal;\n}\nspan.left {\n display: block;\n text-align: center;\n transform: rotate(-90deg);\n padding-left: 8em;\n padding-bottom: 11em;\n}\nspan.right {\n display: block;\n text-align: center;\n transform: rotate(90deg);\n margin-left: -1.25em;\n padding-right: 9.5em;\n padding-bottom: 12em;\n}"
},
[
{
Expand Down Expand Up @@ -122,18 +122,16 @@
"A\n\n\n\nShift",
{
"c": "#cccccc",
"p": "CHICKLET",
"a": 5,
"f": 4
},
"<\n,",
"<\n,\n\n\nRaw",
{
"x": 5
},
">\n.",
">\n.\n\n\nRaw",
{
"c": "#DCEDC8",
"p": "SPACE",
"a": 7,
"f": 3,
"n": true
Expand All @@ -158,7 +156,7 @@
"Q"
],
[
"Shift",
"Shift <small>(sticky)</small>",
"G",
"X",
"J",
Expand All @@ -180,17 +178,49 @@
"M",
"F",
"P",
"Shift"
"Shift <small>(sticky)</small>"
],
[
{
"y": -0.04999999999999982,
"x": 4.95,
"c": "#FFD180",
"p": "FLAT",
"a": 5,
"f": 2,
"w": 1.1,
"h": 2.7
},
"\nAlt+Tab <small>cursor layer</small>",
{
"x": 0.9000000000000004,
"c": "#FFFF8D",
"w": 1.1,
"h": 2.7
},
"\nToggle <small>game layer</small>",
{
"x": 2.9000000000000004,
"c": "#FFD180",
"w": 1.1,
"h": 2.7
},
"\nHyper <small>(sticky)</small>"
],
[
{
"y": -0.9500000000000002,
"c": "#757575",
"t": "#EEEEEE"
"t": "#EEEEEE",
"p": "SPACE",
"a": 7,
"f": 3
},
"Magic",
{
"c": "#cccccc",
"t": "#000000"
"t": "#000000",
"p": "CHICKLET"
},
"Home",
"Page up",
Expand Down Expand Up @@ -244,17 +274,38 @@
{
"c": "#757575",
"t": "#EEEEEE",
"p": "SPACE",
"a": 7,
"f": 3
},
"Magic"
],
[
{
"y": -0.040000000000000036,
"x": 4.45,
"c": "#B9F6CA",
"t": "#000000",
"p": "FLAT",
"f": 2,
"w": 2.625,
"h": 1.11
},
"<span class=\"left\">Ctrl+Tab<small><br>cursor layer</small></span>",
{
"x": 2.874999999999999,
"w": 2.625,
"h": 1.11
},
"<span class=\"right\">Meh<small><br>(sticky)</small></span>"
],
[
{
"y": -0.96,
"x": 5,
"c": "#D1C4E9",
"t": "#000000",
"p": "SPACE",
"f": 3,
"n": true
},
"Back space\n\n\n\nCursor",
Expand Down
Binary file modified README/base-layer-diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 17 additions & 1 deletion README/cursor-layer-diagram.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,23 @@
],
[
{
"c": "#e1bee7"
"y": -0.04999999999999982,
"x": 6.95,
"c": "#FFFF8D",
"p": "FLAT",
"f": 2,
"w": 1.1,
"h": 2.7,
"d": true
},
""
],
[
{
"y": -0.9500000000000002,
"c": "#e1bee7",
"p": "CHICKLET",
"f": 3
},
"Find & replace\n\n\n\nMouse",
"Find prev",
Expand Down
Binary file modified README/cursor-layer-diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions README/emoji-layer-diagram.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,25 @@
"🤷\n\n\n\nAltGr"
],
[
{
"y": -0.04999999999999982,
"x": 6.95,
"c": "#FFFF8D",
"p": "FLAT",
"f": 2,
"w": 1.1,
"h": 2.7,
"d": true
},
""
],
[
{
"y": -0.9500000000000002,
"c": "#cccccc",
"p": "CHICKLET",
"f": 9
},
"🌄",
"🌅",
"👶",
Expand Down
Binary file modified README/emoji-layer-diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 30 additions & 20 deletions README/factory-layer-diagram.json
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,32 @@
],
[
{
"y": -0.04999999999999982,
"x": 6.95,
"c": "#FFFF8D",
"g": true,
"p": "FLAT",
"f": 2,
"w": 1.1,
"h": 2.7,
"d": true
},
""
],
[
{
"y": -0.9500000000000002,
"c": "#757575",
"t": "#EEEEEE"
"t": "#EEEEEE",
"g": false,
"p": "SPACE",
"f": 3
},
"Magic",
{
"c": "#dcedc8",
"t": "#000000"
"t": "#000000",
"p": "CHICKLET"
},
"Home",
"End",
Expand All @@ -189,13 +208,15 @@
{
"c": "#757575",
"t": "#EEEEEE",
"p": "SPACE",
"f": 3
},
"Lower layer",
"Lower",
{
"x": 1,
"c": "#bbdefb",
"t": "#000000",
"p": "CHICKLET",
"f": 3
},
"Left GUI",
Expand All @@ -208,7 +229,8 @@
},
"Right Shift",
{
"c": "#dcedc8"
"c": "#dcedc8",
"f": 9
},
"&uarr;",
"&darr;",
Expand All @@ -218,46 +240,34 @@
"f": 3
},
"{\n[",
{
"f": 3
},
"}\n]",
{
"c": "#dcedc8",
"a": 7,
"f": 3
"a": 7
},
"Page down"
],
[
{
"x": 5,
"c": "#e1bee7",
"f": 3,
"n": true
},
"Back space\n\n\n\nCursor",
{
"f": 3
},
"Delete\n\n\n\nNumber",
{
"c": "#bbdefb",
"f": 3
"c": "#bbdefb"
},
"Left Alt",
{
"x": 1,
"f": 3
"x": 1
},
"Right Alt",
{
"c": "#e1bee7",
"f": 3
"c": "#e1bee7"
},
"Enter\n\n\n\nSystem",
{
"f": 3,
"n": true
},
"Space\n\n\n\nSymbol"
Expand Down
Binary file modified README/factory-layer-diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 17 additions & 10 deletions README/function-layer-diagram.json
Original file line number Diff line number Diff line change
Expand Up @@ -235,29 +235,36 @@
],
[
{
"y": -0.04999999999999982,
"x": 6.95,
"c": "#FFFF8D",
"p": "FLAT",
"f": 2,
"w": 1.1,
"h": 2.7,
"d": true
},
""
],
[
{
"y": -0.9500000000000002,
"c": "#cccccc",
"g": true,
"p": "CHICKLET",
"f": 3
},
"F5",
{
"f": 3
},
"Home",
{
"c": "#bbdefb",
"g": false,
"f": 3
"g": false
},
"Extend line",
{
"f": 3
},
"Extend word",
{
"c": "#cccccc",
"g": true,
"f": 3
"g": true
},
"End",
{
Expand Down
Binary file modified README/function-layer-diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 04300e2

Please sign in to comment.