From 2f5fdded62fc4e0d127c6db203ab1c0cf819f69a Mon Sep 17 00:00:00 2001 From: Jack Bates Date: Wed, 6 Sep 2023 14:48:01 -0700 Subject: [PATCH] Un-swap apostrophe and semicolon https://github.com/manna-harbour/miryoku/issues/35 --- readme.org | 28 +++---- tangled/kmonad/miryoku_layer_alternatives.h | 88 ++++++++++----------- tangled/qmk/miryoku_layer_alternatives.h | 88 ++++++++++----------- tangled/zmk/miryoku_layer_alternatives.h | 88 ++++++++++----------- 4 files changed, 146 insertions(+), 146 deletions(-) diff --git a/readme.org b/readme.org index 6a1283c..1b04471 100644 --- a/readme.org +++ b/readme.org @@ -88,7 +88,7 @@ The base layer is maintained as separate tables for tap alphas, tap thumbs, and ***** Alphas #+NAME: colemakdh -| Q | W | F | P | B | J | L | U | Y | ' | +| Q | W | F | P | B | J | L | U | Y | ; | | A | R | S | T | G | M | N | E | I | O | | Z | X | C | D | V | K | H | , | DOT | / | @@ -150,7 +150,7 @@ The base layer is maintained as separate tables for tap alphas, tap thumbs, and #+NAME: num-l | [ | 7 | 8 | 9 | ] | -| ; | 4 | 5 | 6 | = | +| ' | 4 | 5 | 6 | = | | ` | 1 | 2 | 3 | \ | | U_NP | U_NP | DOT | 0 | MINS | @@ -159,7 +159,7 @@ The base layer is maintained as separate tables for tap alphas, tap thumbs, and #+NAME: sym-l | { | & | * | ( | } | -| : | $ | % | ^ | + | +| DQUO | $ | % | ^ | + | | ~ | ! | @ | # | PIPE | | U_NP | U_NP | ( | ) | _ | @@ -186,7 +186,7 @@ The base layer is maintained as separate tables for tap alphas, tap thumbs, and #+NAME: azerty | A | Z | E | R | T | Y | U | I | O | P | | Q | S | D | F | G | H | J | K | L | M | -| W | X | C | V | B | N | , | DOT | / | ' | +| W | X | C | V | B | N | , | DOT | / | ; | ***** BEAKL-15 @@ -196,7 +196,7 @@ The base layer is maintained as separate tables for tap alphas, tap thumbs, and #+NAME: beakl15 | Q | H | O | U | X | G | C | R | F | Z | | Y | I | E | A | DOT | D | S | T | N | B | -| J | / | , | K | ' | W | M | L | P | V | +| J | / | , | K | ; | W | M | L | P | V | ***** Colemak @@ -204,7 +204,7 @@ The base layer is maintained as separate tables for tap alphas, tap thumbs, and ~MIRYOKU_ALPHAS=COLEMAK~ #+NAME: colemak -| Q | W | F | P | G | J | L | U | Y | ' | +| Q | W | F | P | G | J | L | U | Y | ; | | A | R | S | T | D | H | N | E | I | O | | Z | X | C | V | B | K | M | , | DOT | / | @@ -214,7 +214,7 @@ The base layer is maintained as separate tables for tap alphas, tap thumbs, and ~MIRYOKU_ALPHAS=COLEMAKDHK~ #+NAME: colemakdhk -| Q | W | F | P | B | J | L | U | Y | ' | +| Q | W | F | P | B | J | L | U | Y | ; | | A | R | S | T | G | K | N | E | I | O | | Z | X | C | D | V | M | H | , | DOT | / | @@ -224,7 +224,7 @@ The base layer is maintained as separate tables for tap alphas, tap thumbs, and ~MIRYOKU_ALPHAS=DVORAK~ #+NAME: dvorak -| ' | , | DOT | P | Y | F | G | C | R | L | +| ; | , | DOT | P | Y | F | G | C | R | L | | A | O | E | U | I | D | H | T | N | S | | / | Q | J | K | X | B | M | W | V | Z | @@ -234,7 +234,7 @@ The base layer is maintained as separate tables for tap alphas, tap thumbs, and ~MIRYOKU_ALPHAS=HALMAK~ #+NAME: halmak -| W | L | R | B | Z | ' | Q | U | D | J | +| W | L | R | B | Z | ; | Q | U | D | J | | S | H | N | T | , | DOT | A | E | O | I | | F | M | V | C | / | G | P | X | K | Y | @@ -244,7 +244,7 @@ The base layer is maintained as separate tables for tap alphas, tap thumbs, and ~MIRYOKU_ALPHAS=WORKMAN~ #+NAME: workman -| Q | D | R | W | B | J | F | U | P | ' | +| Q | D | R | W | B | J | F | U | P | ; | | A | S | H | T | G | Y | N | E | O | I | | Z | X | M | C | V | K | L | , | DOT | / | @@ -255,7 +255,7 @@ The base layer is maintained as separate tables for tap alphas, tap thumbs, and #+NAME: qwerty | Q | W | E | R | T | Y | U | I | O | P | -| A | S | D | F | G | H | J | K | L | ' | +| A | S | D | F | G | H | J | K | L | ; | | Z | X | C | V | B | N | M | , | DOT | / | @@ -265,7 +265,7 @@ The base layer is maintained as separate tables for tap alphas, tap thumbs, and #+NAME: qwertz | Q | W | E | R | T | Z | U | I | O | P | -| A | S | D | F | G | H | J | K | L | ' | +| A | S | D | F | G | H | J | K | L | ; | | Y | X | C | V | B | N | M | , | DOT | / | @@ -365,7 +365,7 @@ Not available with ~MIRYOKU_LAYERS=FLIP~. #+NAME: num-r | [ | 7 | 8 | 9 | ] | -| = | 4 | 5 | 6 | ; | +| = | 4 | 5 | 6 | ' | | \ | 1 | 2 | 3 | ` | | MINS | 0 | DOT | U_NP | U_NP | @@ -374,7 +374,7 @@ Not available with ~MIRYOKU_LAYERS=FLIP~. #+NAME: sym-r | { | & | * | ( | } | -| + | $ | % | ^ | : | +| + | $ | % | ^ | DQUO | | PIPE | ! | @ | # | ~ | | _ | ( | ) | U_NP | U_NP | diff --git a/tangled/kmonad/miryoku_layer_alternatives.h b/tangled/kmonad/miryoku_layer_alternatives.h index 5ec9b4d..79dc578 100644 --- a/tangled/kmonad/miryoku_layer_alternatives.h +++ b/tangled/kmonad/miryoku_layer_alternatives.h @@ -9,120 +9,120 @@ #define MIRYOKU_ALTERNATIVES_BASE_AZERTY_FLIP \ a, z, e, r, t, y, u, i, o, p, \ U_MT(q, met), U_MT(s, alt), U_MT(d, ctl), U_MT(f, sft), g, h, U_MT(j, sft), U_MT(k, ctl), U_MT(l, alt), U_MT(m, met), \ -U_LT(w, U_BUTTON), U_MT(x, ralt), c, v, b, n, U_COMM, ., U_MT(/, ralt), U_LT(U_QUOT, U_BUTTON),\ +U_LT(w, U_BUTTON), U_MT(x, ralt), c, v, b, n, U_COMM, ., U_MT(/, ralt), U_LT(;, U_BUTTON), \ U_NP, U_NP, U_LT(del, U_FUN), U_LT(bspc, U_NUM), U_LT(ent, U_SYM), U_LT(tab, U_MOUSE),U_LT(spc, U_NAV), U_LT(esc, U_MEDIA),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_BEAKL15_FLIP \ q, h, o, u, x, g, c, r, f, z, \ U_MT(y, met), U_MT(i, alt), U_MT(e, ctl), U_MT(a, sft), ., d, U_MT(s, sft), U_MT(t, ctl), U_MT(n, alt), U_MT(b, met), \ -U_LT(j, U_BUTTON), U_MT(/, ralt), U_COMM, k, U_QUOT, w, m, l, U_MT(p, ralt), U_LT(v, U_BUTTON), \ +U_LT(j, U_BUTTON), U_MT(/, ralt), U_COMM, k, ;, w, m, l, U_MT(p, ralt), U_LT(v, U_BUTTON), \ U_NP, U_NP, U_LT(del, U_FUN), U_LT(bspc, U_NUM), U_LT(ent, U_SYM), U_LT(tab, U_MOUSE),U_LT(spc, U_NAV), U_LT(esc, U_MEDIA),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAK_FLIP \ -q, w, f, p, g, j, l, u, y, U_QUOT, \ +q, w, f, p, g, j, l, u, y, ;, \ U_MT(a, met), U_MT(r, alt), U_MT(s, ctl), U_MT(t, sft), d, h, U_MT(n, sft), U_MT(e, ctl), U_MT(i, alt), U_MT(o, met), \ U_LT(z, U_BUTTON), U_MT(x, ralt), c, v, b, k, m, U_COMM, U_MT(., ralt), U_LT(/, U_BUTTON), \ U_NP, U_NP, U_LT(del, U_FUN), U_LT(bspc, U_NUM), U_LT(ent, U_SYM), U_LT(tab, U_MOUSE),U_LT(spc, U_NAV), U_LT(esc, U_MEDIA),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH_FLIP \ -q, w, f, p, b, j, l, u, y, U_QUOT, \ +q, w, f, p, b, j, l, u, y, ;, \ U_MT(a, met), U_MT(r, alt), U_MT(s, ctl), U_MT(t, sft), g, m, U_MT(n, sft), U_MT(e, ctl), U_MT(i, alt), U_MT(o, met), \ U_LT(z, U_BUTTON), U_MT(x, ralt), c, d, v, k, h, U_COMM, U_MT(., ralt), U_LT(/, U_BUTTON), \ U_NP, U_NP, U_LT(del, U_FUN), U_LT(bspc, U_NUM), U_LT(ent, U_SYM), U_LT(tab, U_MOUSE),U_LT(spc, U_NAV), U_LT(esc, U_MEDIA),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK_FLIP \ -q, w, f, p, b, j, l, u, y, U_QUOT, \ +q, w, f, p, b, j, l, u, y, ;, \ U_MT(a, met), U_MT(r, alt), U_MT(s, ctl), U_MT(t, sft), g, k, U_MT(n, sft), U_MT(e, ctl), U_MT(i, alt), U_MT(o, met), \ U_LT(z, U_BUTTON), U_MT(x, ralt), c, d, v, m, h, U_COMM, U_MT(., ralt), U_LT(/, U_BUTTON), \ U_NP, U_NP, U_LT(del, U_FUN), U_LT(bspc, U_NUM), U_LT(ent, U_SYM), U_LT(tab, U_MOUSE),U_LT(spc, U_NAV), U_LT(esc, U_MEDIA),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_DVORAK_FLIP \ -U_QUOT, U_COMM, ., p, y, f, g, c, r, l, \ +;, U_COMM, ., p, y, f, g, c, r, l, \ U_MT(a, met), U_MT(o, alt), U_MT(e, ctl), U_MT(u, sft), i, d, U_MT(h, sft), U_MT(t, ctl), U_MT(n, alt), U_MT(s, met), \ U_LT(/, U_BUTTON), U_MT(q, ralt), j, k, x, b, m, w, U_MT(v, ralt), U_LT(z, U_BUTTON), \ U_NP, U_NP, U_LT(del, U_FUN), U_LT(bspc, U_NUM), U_LT(ent, U_SYM), U_LT(tab, U_MOUSE),U_LT(spc, U_NAV), U_LT(esc, U_MEDIA),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_HALMAK_FLIP \ -w, l, r, b, z, U_QUOT, q, u, d, j, \ +w, l, r, b, z, ;, q, u, d, j, \ U_MT(s, met), U_MT(h, alt), U_MT(n, ctl), U_MT(t, sft), U_COMM, ., U_MT(a, sft), U_MT(e, ctl), U_MT(o, alt), U_MT(i, met), \ U_LT(f, U_BUTTON), U_MT(m, ralt), v, c, /, g, p, x, U_MT(k, ralt), U_LT(y, U_BUTTON), \ U_NP, U_NP, U_LT(del, U_FUN), U_LT(bspc, U_NUM), U_LT(ent, U_SYM), U_LT(tab, U_MOUSE),U_LT(spc, U_NAV), U_LT(esc, U_MEDIA),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_WORKMAN_FLIP \ -q, d, r, w, b, j, f, u, p, U_QUOT, \ +q, d, r, w, b, j, f, u, p, ;, \ U_MT(a, met), U_MT(s, alt), U_MT(h, ctl), U_MT(t, sft), g, y, U_MT(n, sft), U_MT(e, ctl), U_MT(o, alt), U_MT(i, met), \ U_LT(z, U_BUTTON), U_MT(x, ralt), m, c, v, k, l, U_COMM, U_MT(., ralt), U_LT(/, U_BUTTON), \ U_NP, U_NP, U_LT(del, U_FUN), U_LT(bspc, U_NUM), U_LT(ent, U_SYM), U_LT(tab, U_MOUSE),U_LT(spc, U_NAV), U_LT(esc, U_MEDIA),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_QWERTY_FLIP \ q, w, e, r, t, y, u, i, o, p, \ -U_MT(a, met), U_MT(s, alt), U_MT(d, ctl), U_MT(f, sft), g, h, U_MT(j, sft), U_MT(k, ctl), U_MT(l, alt), U_MT(U_QUOT, met), \ +U_MT(a, met), U_MT(s, alt), U_MT(d, ctl), U_MT(f, sft), g, h, U_MT(j, sft), U_MT(k, ctl), U_MT(l, alt), U_MT(;, met), \ U_LT(z, U_BUTTON), U_MT(x, ralt), c, v, b, n, m, U_COMM, U_MT(., ralt), U_LT(/, U_BUTTON), \ U_NP, U_NP, U_LT(del, U_FUN), U_LT(bspc, U_NUM), U_LT(ent, U_SYM), U_LT(tab, U_MOUSE),U_LT(spc, U_NAV), U_LT(esc, U_MEDIA),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_QWERTZ_FLIP \ q, w, e, r, t, z, u, i, o, p, \ -U_MT(a, met), U_MT(s, alt), U_MT(d, ctl), U_MT(f, sft), g, h, U_MT(j, sft), U_MT(k, ctl), U_MT(l, alt), U_MT(U_QUOT, met), \ +U_MT(a, met), U_MT(s, alt), U_MT(d, ctl), U_MT(f, sft), g, h, U_MT(j, sft), U_MT(k, ctl), U_MT(l, alt), U_MT(;, met), \ U_LT(y, U_BUTTON), U_MT(x, ralt), c, v, b, n, m, U_COMM, U_MT(., ralt), U_LT(/, U_BUTTON), \ U_NP, U_NP, U_LT(del, U_FUN), U_LT(bspc, U_NUM), U_LT(ent, U_SYM), U_LT(tab, U_MOUSE),U_LT(spc, U_NAV), U_LT(esc, U_MEDIA),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_AZERTY \ a, z, e, r, t, y, u, i, o, p, \ U_MT(q, met), U_MT(s, alt), U_MT(d, ctl), U_MT(f, sft), g, h, U_MT(j, sft), U_MT(k, ctl), U_MT(l, alt), U_MT(m, met), \ -U_LT(w, U_BUTTON), U_MT(x, ralt), c, v, b, n, U_COMM, ., U_MT(/, ralt), U_LT(U_QUOT, U_BUTTON),\ +U_LT(w, U_BUTTON), U_MT(x, ralt), c, v, b, n, U_COMM, ., U_MT(/, ralt), U_LT(;, U_BUTTON), \ U_NP, U_NP, U_LT(esc, U_MEDIA),U_LT(ent, U_NAV), U_LT(tab, U_MOUSE),U_LT(bspc, U_SYM), U_LT(spc, U_NUM), U_LT(del, U_FUN), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_BEAKL15 \ q, h, o, u, x, g, c, r, f, z, \ U_MT(y, met), U_MT(i, alt), U_MT(e, ctl), U_MT(a, sft), ., d, U_MT(s, sft), U_MT(t, ctl), U_MT(n, alt), U_MT(b, met), \ -U_LT(j, U_BUTTON), U_MT(/, ralt), U_COMM, k, U_QUOT, w, m, l, U_MT(p, ralt), U_LT(v, U_BUTTON), \ +U_LT(j, U_BUTTON), U_MT(/, ralt), U_COMM, k, ;, w, m, l, U_MT(p, ralt), U_LT(v, U_BUTTON), \ U_NP, U_NP, U_LT(esc, U_MEDIA),U_LT(ent, U_NAV), U_LT(tab, U_MOUSE),U_LT(bspc, U_SYM), U_LT(spc, U_NUM), U_LT(del, U_FUN), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAK \ -q, w, f, p, g, j, l, u, y, U_QUOT, \ +q, w, f, p, g, j, l, u, y, ;, \ U_MT(a, met), U_MT(r, alt), U_MT(s, ctl), U_MT(t, sft), d, h, U_MT(n, sft), U_MT(e, ctl), U_MT(i, alt), U_MT(o, met), \ U_LT(z, U_BUTTON), U_MT(x, ralt), c, v, b, k, m, U_COMM, U_MT(., ralt), U_LT(/, U_BUTTON), \ U_NP, U_NP, U_LT(esc, U_MEDIA),U_LT(ent, U_NAV), U_LT(tab, U_MOUSE),U_LT(bspc, U_SYM), U_LT(spc, U_NUM), U_LT(del, U_FUN), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH \ -q, w, f, p, b, j, l, u, y, U_QUOT, \ +q, w, f, p, b, j, l, u, y, ;, \ U_MT(a, met), U_MT(r, alt), U_MT(s, ctl), U_MT(t, sft), g, m, U_MT(n, sft), U_MT(e, ctl), U_MT(i, alt), U_MT(o, met), \ U_LT(z, U_BUTTON), U_MT(x, ralt), c, d, v, k, h, U_COMM, U_MT(., ralt), U_LT(/, U_BUTTON), \ U_NP, U_NP, U_LT(esc, U_MEDIA),U_LT(ent, U_NAV), U_LT(tab, U_MOUSE),U_LT(bspc, U_SYM), U_LT(spc, U_NUM), U_LT(del, U_FUN), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK \ -q, w, f, p, b, j, l, u, y, U_QUOT, \ +q, w, f, p, b, j, l, u, y, ;, \ U_MT(a, met), U_MT(r, alt), U_MT(s, ctl), U_MT(t, sft), g, k, U_MT(n, sft), U_MT(e, ctl), U_MT(i, alt), U_MT(o, met), \ U_LT(z, U_BUTTON), U_MT(x, ralt), c, d, v, m, h, U_COMM, U_MT(., ralt), U_LT(/, U_BUTTON), \ U_NP, U_NP, U_LT(esc, U_MEDIA),U_LT(ent, U_NAV), U_LT(tab, U_MOUSE),U_LT(bspc, U_SYM), U_LT(spc, U_NUM), U_LT(del, U_FUN), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_DVORAK \ -U_QUOT, U_COMM, ., p, y, f, g, c, r, l, \ +;, U_COMM, ., p, y, f, g, c, r, l, \ U_MT(a, met), U_MT(o, alt), U_MT(e, ctl), U_MT(u, sft), i, d, U_MT(h, sft), U_MT(t, ctl), U_MT(n, alt), U_MT(s, met), \ U_LT(/, U_BUTTON), U_MT(q, ralt), j, k, x, b, m, w, U_MT(v, ralt), U_LT(z, U_BUTTON), \ U_NP, U_NP, U_LT(esc, U_MEDIA),U_LT(ent, U_NAV), U_LT(tab, U_MOUSE),U_LT(bspc, U_SYM), U_LT(spc, U_NUM), U_LT(del, U_FUN), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_HALMAK \ -w, l, r, b, z, U_QUOT, q, u, d, j, \ +w, l, r, b, z, ;, q, u, d, j, \ U_MT(s, met), U_MT(h, alt), U_MT(n, ctl), U_MT(t, sft), U_COMM, ., U_MT(a, sft), U_MT(e, ctl), U_MT(o, alt), U_MT(i, met), \ U_LT(f, U_BUTTON), U_MT(m, ralt), v, c, /, g, p, x, U_MT(k, ralt), U_LT(y, U_BUTTON), \ U_NP, U_NP, U_LT(esc, U_MEDIA),U_LT(ent, U_NAV), U_LT(tab, U_MOUSE),U_LT(bspc, U_SYM), U_LT(spc, U_NUM), U_LT(del, U_FUN), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_WORKMAN \ -q, d, r, w, b, j, f, u, p, U_QUOT, \ +q, d, r, w, b, j, f, u, p, ;, \ U_MT(a, met), U_MT(s, alt), U_MT(h, ctl), U_MT(t, sft), g, y, U_MT(n, sft), U_MT(e, ctl), U_MT(o, alt), U_MT(i, met), \ U_LT(z, U_BUTTON), U_MT(x, ralt), m, c, v, k, l, U_COMM, U_MT(., ralt), U_LT(/, U_BUTTON), \ U_NP, U_NP, U_LT(esc, U_MEDIA),U_LT(ent, U_NAV), U_LT(tab, U_MOUSE),U_LT(bspc, U_SYM), U_LT(spc, U_NUM), U_LT(del, U_FUN), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_QWERTY \ q, w, e, r, t, y, u, i, o, p, \ -U_MT(a, met), U_MT(s, alt), U_MT(d, ctl), U_MT(f, sft), g, h, U_MT(j, sft), U_MT(k, ctl), U_MT(l, alt), U_MT(U_QUOT, met), \ +U_MT(a, met), U_MT(s, alt), U_MT(d, ctl), U_MT(f, sft), g, h, U_MT(j, sft), U_MT(k, ctl), U_MT(l, alt), U_MT(;, met), \ U_LT(z, U_BUTTON), U_MT(x, ralt), c, v, b, n, m, U_COMM, U_MT(., ralt), U_LT(/, U_BUTTON), \ U_NP, U_NP, U_LT(esc, U_MEDIA),U_LT(ent, U_NAV), U_LT(tab, U_MOUSE),U_LT(bspc, U_SYM), U_LT(spc, U_NUM), U_LT(del, U_FUN), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_QWERTZ \ q, w, e, r, t, z, u, i, o, p, \ -U_MT(a, met), U_MT(s, alt), U_MT(d, ctl), U_MT(f, sft), g, h, U_MT(j, sft), U_MT(k, ctl), U_MT(l, alt), U_MT(U_QUOT, met), \ +U_MT(a, met), U_MT(s, alt), U_MT(d, ctl), U_MT(f, sft), g, h, U_MT(j, sft), U_MT(k, ctl), U_MT(l, alt), U_MT(;, met), \ U_LT(y, U_BUTTON), U_MT(x, ralt), c, v, b, n, m, U_COMM, U_MT(., ralt), U_LT(/, U_BUTTON), \ U_NP, U_NP, U_LT(esc, U_MEDIA),U_LT(ent, U_NAV), U_LT(tab, U_MOUSE),U_LT(bspc, U_SYM), U_LT(spc, U_NUM), U_LT(del, U_FUN), U_NP, U_NP @@ -130,120 +130,120 @@ U_NP, U_NP, U_LT(esc, U_MEDIA),U_LT(ent, U_NAV), U_LT #define MIRYOKU_ALTERNATIVES_TAP_AZERTY_FLIP \ a, z, e, r, t, y, u, i, o, p, \ q, s, d, f, g, h, j, k, l, m, \ -w, x, c, v, b, n, U_COMM, ., /, U_QUOT, \ +w, x, c, v, b, n, U_COMM, ., /, ;, \ U_NP, U_NP, del, bspc, ent, tab, spc, esc, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_BEAKL15_FLIP \ q, h, o, u, x, g, c, r, f, z, \ y, i, e, a, ., d, s, t, n, b, \ -j, /, U_COMM, k, U_QUOT, w, m, l, p, v, \ +j, /, U_COMM, k, ;, w, m, l, p, v, \ U_NP, U_NP, del, bspc, ent, tab, spc, esc, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAK_FLIP \ -q, w, f, p, g, j, l, u, y, U_QUOT, \ +q, w, f, p, g, j, l, u, y, ;, \ a, r, s, t, d, h, n, e, i, o, \ z, x, c, v, b, k, m, U_COMM, ., /, \ U_NP, U_NP, del, bspc, ent, tab, spc, esc, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDH_FLIP \ -q, w, f, p, b, j, l, u, y, U_QUOT, \ +q, w, f, p, b, j, l, u, y, ;, \ a, r, s, t, g, m, n, e, i, o, \ z, x, c, d, v, k, h, U_COMM, ., /, \ U_NP, U_NP, del, bspc, ent, tab, spc, esc, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDHK_FLIP \ -q, w, f, p, b, j, l, u, y, U_QUOT, \ +q, w, f, p, b, j, l, u, y, ;, \ a, r, s, t, g, k, n, e, i, o, \ z, x, c, d, v, m, h, U_COMM, ., /, \ U_NP, U_NP, del, bspc, ent, tab, spc, esc, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_DVORAK_FLIP \ -U_QUOT, U_COMM, ., p, y, f, g, c, r, l, \ +;, U_COMM, ., p, y, f, g, c, r, l, \ a, o, e, u, i, d, h, t, n, s, \ /, q, j, k, x, b, m, w, v, z, \ U_NP, U_NP, del, bspc, ent, tab, spc, esc, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_HALMAK_FLIP \ -w, l, r, b, z, U_QUOT, q, u, d, j, \ +w, l, r, b, z, ;, q, u, d, j, \ s, h, n, t, U_COMM, ., a, e, o, i, \ f, m, v, c, /, g, p, x, k, y, \ U_NP, U_NP, del, bspc, ent, tab, spc, esc, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_WORKMAN_FLIP \ -q, d, r, w, b, j, f, u, p, U_QUOT, \ +q, d, r, w, b, j, f, u, p, ;, \ a, s, h, t, g, y, n, e, o, i, \ z, x, m, c, v, k, l, U_COMM, ., /, \ U_NP, U_NP, del, bspc, ent, tab, spc, esc, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_QWERTY_FLIP \ q, w, e, r, t, y, u, i, o, p, \ -a, s, d, f, g, h, j, k, l, U_QUOT, \ +a, s, d, f, g, h, j, k, l, ;, \ z, x, c, v, b, n, m, U_COMM, ., /, \ U_NP, U_NP, del, bspc, ent, tab, spc, esc, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_QWERTZ_FLIP \ q, w, e, r, t, z, u, i, o, p, \ -a, s, d, f, g, h, j, k, l, U_QUOT, \ +a, s, d, f, g, h, j, k, l, ;, \ y, x, c, v, b, n, m, U_COMM, ., /, \ U_NP, U_NP, del, bspc, ent, tab, spc, esc, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_AZERTY \ a, z, e, r, t, y, u, i, o, p, \ q, s, d, f, g, h, j, k, l, m, \ -w, x, c, v, b, n, U_COMM, ., /, U_QUOT, \ +w, x, c, v, b, n, U_COMM, ., /, ;, \ U_NP, U_NP, esc, ent, tab, bspc, spc, del, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_BEAKL15 \ q, h, o, u, x, g, c, r, f, z, \ y, i, e, a, ., d, s, t, n, b, \ -j, /, U_COMM, k, U_QUOT, w, m, l, p, v, \ +j, /, U_COMM, k, ;, w, m, l, p, v, \ U_NP, U_NP, esc, ent, tab, bspc, spc, del, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAK \ -q, w, f, p, g, j, l, u, y, U_QUOT, \ +q, w, f, p, g, j, l, u, y, ;, \ a, r, s, t, d, h, n, e, i, o, \ z, x, c, v, b, k, m, U_COMM, ., /, \ U_NP, U_NP, esc, ent, tab, bspc, spc, del, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDH \ -q, w, f, p, b, j, l, u, y, U_QUOT, \ +q, w, f, p, b, j, l, u, y, ;, \ a, r, s, t, g, m, n, e, i, o, \ z, x, c, d, v, k, h, U_COMM, ., /, \ U_NP, U_NP, esc, ent, tab, bspc, spc, del, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDHK \ -q, w, f, p, b, j, l, u, y, U_QUOT, \ +q, w, f, p, b, j, l, u, y, ;, \ a, r, s, t, g, k, n, e, i, o, \ z, x, c, d, v, m, h, U_COMM, ., /, \ U_NP, U_NP, esc, ent, tab, bspc, spc, del, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_DVORAK \ -U_QUOT, U_COMM, ., p, y, f, g, c, r, l, \ +;, U_COMM, ., p, y, f, g, c, r, l, \ a, o, e, u, i, d, h, t, n, s, \ /, q, j, k, x, b, m, w, v, z, \ U_NP, U_NP, esc, ent, tab, bspc, spc, del, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_HALMAK \ -w, l, r, b, z, U_QUOT, q, u, d, j, \ +w, l, r, b, z, ;, q, u, d, j, \ s, h, n, t, U_COMM, ., a, e, o, i, \ f, m, v, c, /, g, p, x, k, y, \ U_NP, U_NP, esc, ent, tab, bspc, spc, del, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_WORKMAN \ -q, d, r, w, b, j, f, u, p, U_QUOT, \ +q, d, r, w, b, j, f, u, p, ;, \ a, s, h, t, g, y, n, e, o, i, \ z, x, m, c, v, k, l, U_COMM, ., /, \ U_NP, U_NP, esc, ent, tab, bspc, spc, del, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_QWERTY \ q, w, e, r, t, y, u, i, o, p, \ -a, s, d, f, g, h, j, k, l, U_QUOT, \ +a, s, d, f, g, h, j, k, l, ;, \ z, x, c, v, b, n, m, U_COMM, ., /, \ U_NP, U_NP, esc, ent, tab, bspc, spc, del, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_QWERTZ \ q, w, e, r, t, z, u, i, o, p, \ -a, s, d, f, g, h, j, k, l, U_QUOT, \ +a, s, d, f, g, h, j, k, l, ;, \ y, x, c, v, b, n, m, U_COMM, ., /, \ U_NP, U_NP, esc, ent, tab, bspc, spc, del, U_NP, U_NP @@ -343,26 +343,26 @@ U_NP, U_NP, U_NA, U_NA, U_NA #define MIRYOKU_ALTERNATIVES_NUM_FLIP \ U_NA, U_DF(U_TAP), U_DF(U_EXTRA), U_DF(U_BASE), U_NA, [, 7, 8, 9, ], \ -met, alt, ctl, sft, U_NA, =, 4, 5, 6, ;, \ +met, alt, ctl, sft, U_NA, =, 4, 5, 6, U_QUOT, \ U_NA, ralt, U_DF(U_NAV), U_DF(U_NUM), U_NA, \\, 1, 2, 3, `, \ U_NP, U_NP, U_NA, U_NA, U_NA, -, 0, ., U_NP, U_NP #define MIRYOKU_ALTERNATIVES_NUM \ [, 7, 8, 9, ], U_NA, U_DF(U_BASE), U_DF(U_EXTRA), U_DF(U_TAP), U_NA, \ -;, 4, 5, 6, =, U_NA, sft, ctl, alt, met, \ +U_QUOT, 4, 5, 6, =, U_NA, sft, ctl, alt, met, \ `, 1, 2, 3, \\, U_NA, U_DF(U_NUM), U_DF(U_NAV), ralt, U_NA, \ U_NP, U_NP, ., 0, -, U_NA, U_NA, U_NA, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_SYM_FLIP \ U_NA, U_DF(U_TAP), U_DF(U_EXTRA), U_DF(U_BASE), U_NA, {, &, *, U_LPRN, }, \ -met, alt, ctl, sft, U_NA, +, $, %, ^, :, \ +met, alt, ctl, sft, U_NA, +, $, %, ^, U_DQUO, \ U_NA, ralt, U_DF(U_MOUSE), U_DF(U_SYM), U_NA, U_PIPE, !, @, #, ~, \ U_NP, U_NP, U_NA, U_NA, U_NA, \_, U_LPRN, U_RPRN, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_SYM \ {, &, *, U_LPRN, }, U_NA, U_DF(U_BASE), U_DF(U_EXTRA), U_DF(U_TAP), U_NA, \ -:, $, %, ^, +, U_NA, sft, ctl, alt, met, \ +U_DQUO, $, %, ^, +, U_NA, sft, ctl, alt, met, \ ~, !, @, #, U_PIPE, U_NA, U_DF(U_SYM), U_DF(U_MOUSE), ralt, U_NA, \ U_NP, U_NP, U_LPRN, U_RPRN, \_, U_NA, U_NA, U_NA, U_NP, U_NP diff --git a/tangled/qmk/miryoku_layer_alternatives.h b/tangled/qmk/miryoku_layer_alternatives.h index eb8a09c..044ca7e 100644 --- a/tangled/qmk/miryoku_layer_alternatives.h +++ b/tangled/qmk/miryoku_layer_alternatives.h @@ -11,120 +11,120 @@ #define MIRYOKU_ALTERNATIVES_BASE_AZERTY_FLIP \ KC_A, KC_Z, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ LGUI_T(KC_Q), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_M), \ -LT(U_BUTTON,KC_W), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_COMM, KC_DOT, ALGR_T(KC_SLSH), LT(U_BUTTON,KC_QUOT),\ +LT(U_BUTTON,KC_W), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_COMM, KC_DOT, ALGR_T(KC_SLSH), LT(U_BUTTON,KC_SCLN),\ U_NP, U_NP, LT(U_FUN,KC_DEL), LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC), LT(U_MEDIA,KC_ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_BEAKL15_FLIP \ KC_Q, KC_H, KC_O, KC_U, KC_X, KC_G, KC_C, KC_R, KC_F, KC_Z, \ LGUI_T(KC_Y), LALT_T(KC_I), LCTL_T(KC_E), LSFT_T(KC_A), KC_DOT, KC_D, LSFT_T(KC_S), LCTL_T(KC_T), LALT_T(KC_N), LGUI_T(KC_B), \ -LT(U_BUTTON,KC_J), ALGR_T(KC_SLSH), KC_COMM, KC_K, KC_QUOT, KC_W, KC_M, KC_L, ALGR_T(KC_P), LT(U_BUTTON,KC_V), \ +LT(U_BUTTON,KC_J), ALGR_T(KC_SLSH), KC_COMM, KC_K, KC_SCLN, KC_W, KC_M, KC_L, ALGR_T(KC_P), LT(U_BUTTON,KC_V), \ U_NP, U_NP, LT(U_FUN,KC_DEL), LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC), LT(U_MEDIA,KC_ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAK_FLIP \ -KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ +KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, \ LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_D, KC_H, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O), \ LT(U_BUTTON,KC_Z), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, ALGR_T(KC_DOT), LT(U_BUTTON,KC_SLSH),\ U_NP, U_NP, LT(U_FUN,KC_DEL), LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC), LT(U_MEDIA,KC_ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH_FLIP \ -KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ +KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, \ LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O), \ LT(U_BUTTON,KC_Z), ALGR_T(KC_X), KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, ALGR_T(KC_DOT), LT(U_BUTTON,KC_SLSH),\ U_NP, U_NP, LT(U_FUN,KC_DEL), LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC), LT(U_MEDIA,KC_ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK_FLIP \ -KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ +KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, \ LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_K, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O), \ LT(U_BUTTON,KC_Z), ALGR_T(KC_X), KC_C, KC_D, KC_V, KC_M, KC_H, KC_COMM, ALGR_T(KC_DOT), LT(U_BUTTON,KC_SLSH),\ U_NP, U_NP, LT(U_FUN,KC_DEL), LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC), LT(U_MEDIA,KC_ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_DVORAK_FLIP \ -KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, \ +KC_SCLN, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, \ LGUI_T(KC_A), LALT_T(KC_O), LCTL_T(KC_E), LSFT_T(KC_U), KC_I, KC_D, LSFT_T(KC_H), LCTL_T(KC_T), LALT_T(KC_N), LGUI_T(KC_S), \ LT(U_BUTTON,KC_SLSH),ALGR_T(KC_Q), KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, ALGR_T(KC_V), LT(U_BUTTON,KC_Z), \ U_NP, U_NP, LT(U_FUN,KC_DEL), LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC), LT(U_MEDIA,KC_ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_HALMAK_FLIP \ -KC_W, KC_L, KC_R, KC_B, KC_Z, KC_QUOT, KC_Q, KC_U, KC_D, KC_J, \ +KC_W, KC_L, KC_R, KC_B, KC_Z, KC_SCLN, KC_Q, KC_U, KC_D, KC_J, \ LGUI_T(KC_S), LALT_T(KC_H), LCTL_T(KC_N), LSFT_T(KC_T), KC_COMM, KC_DOT, LSFT_T(KC_A), LCTL_T(KC_E), LALT_T(KC_O), LGUI_T(KC_I), \ LT(U_BUTTON,KC_F), ALGR_T(KC_M), KC_V, KC_C, KC_SLSH, KC_G, KC_P, KC_X, ALGR_T(KC_K), LT(U_BUTTON,KC_Y), \ U_NP, U_NP, LT(U_FUN,KC_DEL), LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC), LT(U_MEDIA,KC_ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_WORKMAN_FLIP \ -KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_QUOT, \ +KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_SCLN, \ LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_H), LSFT_T(KC_T), KC_G, KC_Y, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_O), LGUI_T(KC_I), \ LT(U_BUTTON,KC_Z), ALGR_T(KC_X), KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, ALGR_T(KC_DOT), LT(U_BUTTON,KC_SLSH),\ U_NP, U_NP, LT(U_FUN,KC_DEL), LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC), LT(U_MEDIA,KC_ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_QWERTY_FLIP \ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ -LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_QUOT), \ +LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_SCLN), \ LT(U_BUTTON,KC_Z), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, ALGR_T(KC_DOT), LT(U_BUTTON,KC_SLSH),\ U_NP, U_NP, LT(U_FUN,KC_DEL), LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC), LT(U_MEDIA,KC_ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_QWERTZ_FLIP \ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, \ -LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_QUOT), \ +LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_SCLN), \ LT(U_BUTTON,KC_Y), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, ALGR_T(KC_DOT), LT(U_BUTTON,KC_SLSH),\ U_NP, U_NP, LT(U_FUN,KC_DEL), LT(U_NUM,KC_BSPC), LT(U_SYM,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_NAV,KC_SPC), LT(U_MEDIA,KC_ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_AZERTY \ KC_A, KC_Z, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ LGUI_T(KC_Q), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_M), \ -LT(U_BUTTON,KC_W), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_COMM, KC_DOT, ALGR_T(KC_SLSH), LT(U_BUTTON,KC_QUOT),\ +LT(U_BUTTON,KC_W), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_COMM, KC_DOT, ALGR_T(KC_SLSH), LT(U_BUTTON,KC_SCLN),\ U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_BSPC), LT(U_NUM,KC_SPC), LT(U_FUN,KC_DEL), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_BEAKL15 \ KC_Q, KC_H, KC_O, KC_U, KC_X, KC_G, KC_C, KC_R, KC_F, KC_Z, \ LGUI_T(KC_Y), LALT_T(KC_I), LCTL_T(KC_E), LSFT_T(KC_A), KC_DOT, KC_D, LSFT_T(KC_S), LCTL_T(KC_T), LALT_T(KC_N), LGUI_T(KC_B), \ -LT(U_BUTTON,KC_J), ALGR_T(KC_SLSH), KC_COMM, KC_K, KC_QUOT, KC_W, KC_M, KC_L, ALGR_T(KC_P), LT(U_BUTTON,KC_V), \ +LT(U_BUTTON,KC_J), ALGR_T(KC_SLSH), KC_COMM, KC_K, KC_SCLN, KC_W, KC_M, KC_L, ALGR_T(KC_P), LT(U_BUTTON,KC_V), \ U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_BSPC), LT(U_NUM,KC_SPC), LT(U_FUN,KC_DEL), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAK \ -KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ +KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, \ LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_D, KC_H, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O), \ LT(U_BUTTON,KC_Z), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, ALGR_T(KC_DOT), LT(U_BUTTON,KC_SLSH),\ U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_BSPC), LT(U_NUM,KC_SPC), LT(U_FUN,KC_DEL), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH \ -KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ +KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, \ LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O), \ LT(U_BUTTON,KC_Z), ALGR_T(KC_X), KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, ALGR_T(KC_DOT), LT(U_BUTTON,KC_SLSH),\ U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_BSPC), LT(U_NUM,KC_SPC), LT(U_FUN,KC_DEL), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK \ -KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ +KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, \ LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_K, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O), \ LT(U_BUTTON,KC_Z), ALGR_T(KC_X), KC_C, KC_D, KC_V, KC_M, KC_H, KC_COMM, ALGR_T(KC_DOT), LT(U_BUTTON,KC_SLSH),\ U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_BSPC), LT(U_NUM,KC_SPC), LT(U_FUN,KC_DEL), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_DVORAK \ -KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, \ +KC_SCLN, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, \ LGUI_T(KC_A), LALT_T(KC_O), LCTL_T(KC_E), LSFT_T(KC_U), KC_I, KC_D, LSFT_T(KC_H), LCTL_T(KC_T), LALT_T(KC_N), LGUI_T(KC_S), \ LT(U_BUTTON,KC_SLSH),ALGR_T(KC_Q), KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, ALGR_T(KC_V), LT(U_BUTTON,KC_Z), \ U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_BSPC), LT(U_NUM,KC_SPC), LT(U_FUN,KC_DEL), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_HALMAK \ -KC_W, KC_L, KC_R, KC_B, KC_Z, KC_QUOT, KC_Q, KC_U, KC_D, KC_J, \ +KC_W, KC_L, KC_R, KC_B, KC_Z, KC_SCLN, KC_Q, KC_U, KC_D, KC_J, \ LGUI_T(KC_S), LALT_T(KC_H), LCTL_T(KC_N), LSFT_T(KC_T), KC_COMM, KC_DOT, LSFT_T(KC_A), LCTL_T(KC_E), LALT_T(KC_O), LGUI_T(KC_I), \ LT(U_BUTTON,KC_F), ALGR_T(KC_M), KC_V, KC_C, KC_SLSH, KC_G, KC_P, KC_X, ALGR_T(KC_K), LT(U_BUTTON,KC_Y), \ U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_BSPC), LT(U_NUM,KC_SPC), LT(U_FUN,KC_DEL), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_WORKMAN \ -KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_QUOT, \ +KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_SCLN, \ LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_H), LSFT_T(KC_T), KC_G, KC_Y, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_O), LGUI_T(KC_I), \ LT(U_BUTTON,KC_Z), ALGR_T(KC_X), KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, ALGR_T(KC_DOT), LT(U_BUTTON,KC_SLSH),\ U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_BSPC), LT(U_NUM,KC_SPC), LT(U_FUN,KC_DEL), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_QWERTY \ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ -LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_QUOT), \ +LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_SCLN), \ LT(U_BUTTON,KC_Z), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, ALGR_T(KC_DOT), LT(U_BUTTON,KC_SLSH),\ U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_BSPC), LT(U_NUM,KC_SPC), LT(U_FUN,KC_DEL), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_QWERTZ \ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, \ -LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_QUOT), \ +LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_SCLN), \ LT(U_BUTTON,KC_Y), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, ALGR_T(KC_DOT), LT(U_BUTTON,KC_SLSH),\ U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_ENT), LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_BSPC), LT(U_NUM,KC_SPC), LT(U_FUN,KC_DEL), U_NP, U_NP @@ -132,120 +132,120 @@ U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_ENT), LT(U #define MIRYOKU_ALTERNATIVES_TAP_AZERTY_FLIP \ KC_A, KC_Z, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ KC_Q, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_M, \ -KC_W, KC_X, KC_C, KC_V, KC_B, KC_N, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT, \ +KC_W, KC_X, KC_C, KC_V, KC_B, KC_N, KC_COMM, KC_DOT, KC_SLSH, KC_SCLN, \ U_NP, U_NP, KC_DEL, KC_BSPC, KC_ENT, KC_TAB, KC_SPC, KC_ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_BEAKL15_FLIP \ KC_Q, KC_H, KC_O, KC_U, KC_X, KC_G, KC_C, KC_R, KC_F, KC_Z, \ KC_Y, KC_I, KC_E, KC_A, KC_DOT, KC_D, KC_S, KC_T, KC_N, KC_B, \ -KC_J, KC_SLSH, KC_COMM, KC_K, KC_QUOT, KC_W, KC_M, KC_L, KC_P, KC_V, \ +KC_J, KC_SLSH, KC_COMM, KC_K, KC_SCLN, KC_W, KC_M, KC_L, KC_P, KC_V, \ U_NP, U_NP, KC_DEL, KC_BSPC, KC_ENT, KC_TAB, KC_SPC, KC_ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAK_FLIP \ -KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ +KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, \ KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, \ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ U_NP, U_NP, KC_DEL, KC_BSPC, KC_ENT, KC_TAB, KC_SPC, KC_ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDH_FLIP \ -KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ +KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, \ KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, \ KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, \ U_NP, U_NP, KC_DEL, KC_BSPC, KC_ENT, KC_TAB, KC_SPC, KC_ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDHK_FLIP \ -KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ +KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, \ KC_A, KC_R, KC_S, KC_T, KC_G, KC_K, KC_N, KC_E, KC_I, KC_O, \ KC_Z, KC_X, KC_C, KC_D, KC_V, KC_M, KC_H, KC_COMM, KC_DOT, KC_SLSH, \ U_NP, U_NP, KC_DEL, KC_BSPC, KC_ENT, KC_TAB, KC_SPC, KC_ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_DVORAK_FLIP \ -KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, \ +KC_SCLN, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, \ KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, \ KC_SLSH, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, \ U_NP, U_NP, KC_DEL, KC_BSPC, KC_ENT, KC_TAB, KC_SPC, KC_ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_HALMAK_FLIP \ -KC_W, KC_L, KC_R, KC_B, KC_Z, KC_QUOT, KC_Q, KC_U, KC_D, KC_J, \ +KC_W, KC_L, KC_R, KC_B, KC_Z, KC_SCLN, KC_Q, KC_U, KC_D, KC_J, \ KC_S, KC_H, KC_N, KC_T, KC_COMM, KC_DOT, KC_A, KC_E, KC_O, KC_I, \ KC_F, KC_M, KC_V, KC_C, KC_SLSH, KC_G, KC_P, KC_X, KC_K, KC_Y, \ U_NP, U_NP, KC_DEL, KC_BSPC, KC_ENT, KC_TAB, KC_SPC, KC_ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_WORKMAN_FLIP \ -KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_QUOT, \ +KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_SCLN, \ KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, KC_I, \ KC_Z, KC_X, KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLSH, \ U_NP, U_NP, KC_DEL, KC_BSPC, KC_ENT, KC_TAB, KC_SPC, KC_ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_QWERTY_FLIP \ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ -KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \ +KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, \ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ U_NP, U_NP, KC_DEL, KC_BSPC, KC_ENT, KC_TAB, KC_SPC, KC_ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_QWERTZ_FLIP \ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, \ -KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \ +KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, \ KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ U_NP, U_NP, KC_DEL, KC_BSPC, KC_ENT, KC_TAB, KC_SPC, KC_ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_AZERTY \ KC_A, KC_Z, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ KC_Q, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_M, \ -KC_W, KC_X, KC_C, KC_V, KC_B, KC_N, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT, \ +KC_W, KC_X, KC_C, KC_V, KC_B, KC_N, KC_COMM, KC_DOT, KC_SLSH, KC_SCLN, \ U_NP, U_NP, KC_ESC, KC_ENT, KC_TAB, KC_BSPC, KC_SPC, KC_DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_BEAKL15 \ KC_Q, KC_H, KC_O, KC_U, KC_X, KC_G, KC_C, KC_R, KC_F, KC_Z, \ KC_Y, KC_I, KC_E, KC_A, KC_DOT, KC_D, KC_S, KC_T, KC_N, KC_B, \ -KC_J, KC_SLSH, KC_COMM, KC_K, KC_QUOT, KC_W, KC_M, KC_L, KC_P, KC_V, \ +KC_J, KC_SLSH, KC_COMM, KC_K, KC_SCLN, KC_W, KC_M, KC_L, KC_P, KC_V, \ U_NP, U_NP, KC_ESC, KC_ENT, KC_TAB, KC_BSPC, KC_SPC, KC_DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAK \ -KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ +KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, \ KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, \ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ U_NP, U_NP, KC_ESC, KC_ENT, KC_TAB, KC_BSPC, KC_SPC, KC_DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDH \ -KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ +KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, \ KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, \ KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, \ U_NP, U_NP, KC_ESC, KC_ENT, KC_TAB, KC_BSPC, KC_SPC, KC_DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDHK \ -KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ +KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, \ KC_A, KC_R, KC_S, KC_T, KC_G, KC_K, KC_N, KC_E, KC_I, KC_O, \ KC_Z, KC_X, KC_C, KC_D, KC_V, KC_M, KC_H, KC_COMM, KC_DOT, KC_SLSH, \ U_NP, U_NP, KC_ESC, KC_ENT, KC_TAB, KC_BSPC, KC_SPC, KC_DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_DVORAK \ -KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, \ +KC_SCLN, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, \ KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, \ KC_SLSH, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, \ U_NP, U_NP, KC_ESC, KC_ENT, KC_TAB, KC_BSPC, KC_SPC, KC_DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_HALMAK \ -KC_W, KC_L, KC_R, KC_B, KC_Z, KC_QUOT, KC_Q, KC_U, KC_D, KC_J, \ +KC_W, KC_L, KC_R, KC_B, KC_Z, KC_SCLN, KC_Q, KC_U, KC_D, KC_J, \ KC_S, KC_H, KC_N, KC_T, KC_COMM, KC_DOT, KC_A, KC_E, KC_O, KC_I, \ KC_F, KC_M, KC_V, KC_C, KC_SLSH, KC_G, KC_P, KC_X, KC_K, KC_Y, \ U_NP, U_NP, KC_ESC, KC_ENT, KC_TAB, KC_BSPC, KC_SPC, KC_DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_WORKMAN \ -KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_QUOT, \ +KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_SCLN, \ KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, KC_I, \ KC_Z, KC_X, KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLSH, \ U_NP, U_NP, KC_ESC, KC_ENT, KC_TAB, KC_BSPC, KC_SPC, KC_DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_QWERTY \ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ -KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \ +KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, \ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ U_NP, U_NP, KC_ESC, KC_ENT, KC_TAB, KC_BSPC, KC_SPC, KC_DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_QWERTZ \ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, \ -KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \ +KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, \ KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ U_NP, U_NP, KC_ESC, KC_ENT, KC_TAB, KC_BSPC, KC_SPC, KC_DEL, U_NP, U_NP @@ -345,26 +345,26 @@ U_NP, U_NP, U_NA, U_NA, U_NA #define MIRYOKU_ALTERNATIVES_NUM_FLIP \ TD(U_TD_BOOT), TD(U_TD_U_TAP), TD(U_TD_U_EXTRA), TD(U_TD_U_BASE), U_NA, KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, \ -KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, U_NA, KC_EQL, KC_4, KC_5, KC_6, KC_SCLN, \ +KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, U_NA, KC_EQL, KC_4, KC_5, KC_6, KC_QUOT, \ U_NA, KC_ALGR, TD(U_TD_U_NAV), TD(U_TD_U_NUM), U_NA, KC_BSLS, KC_1, KC_2, KC_3, KC_GRV, \ U_NP, U_NP, U_NA, U_NA, U_NA, KC_MINS, KC_0, KC_DOT, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_NUM \ KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, U_NA, TD(U_TD_U_BASE), TD(U_TD_U_EXTRA), TD(U_TD_U_TAP), TD(U_TD_BOOT), \ -KC_SCLN, KC_4, KC_5, KC_6, KC_EQL, U_NA, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, \ +KC_QUOT, KC_4, KC_5, KC_6, KC_EQL, U_NA, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, \ KC_GRV, KC_1, KC_2, KC_3, KC_BSLS, U_NA, TD(U_TD_U_NUM), TD(U_TD_U_NAV), KC_ALGR, U_NA, \ U_NP, U_NP, KC_DOT, KC_0, KC_MINS, U_NA, U_NA, U_NA, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_SYM_FLIP \ TD(U_TD_BOOT), TD(U_TD_U_TAP), TD(U_TD_U_EXTRA), TD(U_TD_U_BASE), U_NA, KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, \ -KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, U_NA, KC_PLUS, KC_DLR, KC_PERC, KC_CIRC, KC_COLN, \ +KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, U_NA, KC_PLUS, KC_DLR, KC_PERC, KC_CIRC, KC_DQUO, \ U_NA, KC_ALGR, TD(U_TD_U_MOUSE), TD(U_TD_U_SYM), U_NA, KC_PIPE, KC_EXLM, KC_AT, KC_HASH, KC_TILD, \ U_NP, U_NP, U_NA, U_NA, U_NA, KC_UNDS, KC_LPRN, KC_RPRN, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_SYM \ KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, U_NA, TD(U_TD_U_BASE), TD(U_TD_U_EXTRA), TD(U_TD_U_TAP), TD(U_TD_BOOT), \ -KC_COLN, KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, U_NA, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, \ +KC_DQUO, KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, U_NA, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, \ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_PIPE, U_NA, TD(U_TD_U_SYM), TD(U_TD_U_MOUSE), KC_ALGR, U_NA, \ U_NP, U_NP, KC_LPRN, KC_RPRN, KC_UNDS, U_NA, U_NA, U_NA, U_NP, U_NP diff --git a/tangled/zmk/miryoku_layer_alternatives.h b/tangled/zmk/miryoku_layer_alternatives.h index 3316b4e..33ea140 100644 --- a/tangled/zmk/miryoku_layer_alternatives.h +++ b/tangled/zmk/miryoku_layer_alternatives.h @@ -9,120 +9,120 @@ #define MIRYOKU_ALTERNATIVES_BASE_AZERTY_FLIP \ &kp A, &kp Z, &kp E, &kp R, &kp T, &kp Y, &kp U, &kp I, &kp O, &kp P, \ U_MT(LGUI, Q), U_MT(LALT, S), U_MT(LCTRL, D), U_MT(LSHFT, F), &kp G, &kp H, U_MT(LSHFT, J), U_MT(LCTRL, K), U_MT(LALT, L), U_MT(LGUI, M), \ -U_LT(U_BUTTON, W), U_MT(RALT, X), &kp C, &kp V, &kp B, &kp N, &kp COMMA, &kp DOT, U_MT(RALT, SLASH), U_LT(U_BUTTON, SQT),\ +U_LT(U_BUTTON, W), U_MT(RALT, X), &kp C, &kp V, &kp B, &kp N, &kp COMMA, &kp DOT, U_MT(RALT, SLASH), U_LT(U_BUTTON, SEMI),\ U_NP, U_NP, U_LT(U_FUN, DEL), U_LT(U_NUM, BSPC), U_LT(U_SYM, RET), U_LT(U_MOUSE, TAB),U_LT(U_NAV, SPACE),U_LT(U_MEDIA, ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_BEAKL15_FLIP \ &kp Q, &kp H, &kp O, &kp U, &kp X, &kp G, &kp C, &kp R, &kp F, &kp Z, \ U_MT(LGUI, Y), U_MT(LALT, I), U_MT(LCTRL, E), U_MT(LSHFT, A), &kp DOT, &kp D, U_MT(LSHFT, S), U_MT(LCTRL, T), U_MT(LALT, N), U_MT(LGUI, B), \ -U_LT(U_BUTTON, J), U_MT(RALT, SLASH), &kp COMMA, &kp K, &kp SQT, &kp W, &kp M, &kp L, U_MT(RALT, P), U_LT(U_BUTTON, V), \ +U_LT(U_BUTTON, J), U_MT(RALT, SLASH), &kp COMMA, &kp K, &kp SEMI, &kp W, &kp M, &kp L, U_MT(RALT, P), U_LT(U_BUTTON, V), \ U_NP, U_NP, U_LT(U_FUN, DEL), U_LT(U_NUM, BSPC), U_LT(U_SYM, RET), U_LT(U_MOUSE, TAB),U_LT(U_NAV, SPACE),U_LT(U_MEDIA, ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAK_FLIP \ -&kp Q, &kp W, &kp F, &kp P, &kp G, &kp J, &kp L, &kp U, &kp Y, &kp SQT, \ +&kp Q, &kp W, &kp F, &kp P, &kp G, &kp J, &kp L, &kp U, &kp Y, &kp SEMI, \ U_MT(LGUI, A), U_MT(LALT, R), U_MT(LCTRL, S), U_MT(LSHFT, T), &kp D, &kp H, U_MT(LSHFT, N), U_MT(LCTRL, E), U_MT(LALT, I), U_MT(LGUI, O), \ U_LT(U_BUTTON, Z), U_MT(RALT, X), &kp C, &kp V, &kp B, &kp K, &kp M, &kp COMMA, U_MT(RALT, DOT), U_LT(U_BUTTON, SLASH),\ U_NP, U_NP, U_LT(U_FUN, DEL), U_LT(U_NUM, BSPC), U_LT(U_SYM, RET), U_LT(U_MOUSE, TAB),U_LT(U_NAV, SPACE),U_LT(U_MEDIA, ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH_FLIP \ -&kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SQT, \ +&kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SEMI, \ U_MT(LGUI, A), U_MT(LALT, R), U_MT(LCTRL, S), U_MT(LSHFT, T), &kp G, &kp M, U_MT(LSHFT, N), U_MT(LCTRL, E), U_MT(LALT, I), U_MT(LGUI, O), \ U_LT(U_BUTTON, Z), U_MT(RALT, X), &kp C, &kp D, &kp V, &kp K, &kp H, &kp COMMA, U_MT(RALT, DOT), U_LT(U_BUTTON, SLASH),\ U_NP, U_NP, U_LT(U_FUN, DEL), U_LT(U_NUM, BSPC), U_LT(U_SYM, RET), U_LT(U_MOUSE, TAB),U_LT(U_NAV, SPACE),U_LT(U_MEDIA, ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK_FLIP \ -&kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SQT, \ +&kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SEMI, \ U_MT(LGUI, A), U_MT(LALT, R), U_MT(LCTRL, S), U_MT(LSHFT, T), &kp G, &kp K, U_MT(LSHFT, N), U_MT(LCTRL, E), U_MT(LALT, I), U_MT(LGUI, O), \ U_LT(U_BUTTON, Z), U_MT(RALT, X), &kp C, &kp D, &kp V, &kp M, &kp H, &kp COMMA, U_MT(RALT, DOT), U_LT(U_BUTTON, SLASH),\ U_NP, U_NP, U_LT(U_FUN, DEL), U_LT(U_NUM, BSPC), U_LT(U_SYM, RET), U_LT(U_MOUSE, TAB),U_LT(U_NAV, SPACE),U_LT(U_MEDIA, ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_DVORAK_FLIP \ -&kp SQT, &kp COMMA, &kp DOT, &kp P, &kp Y, &kp F, &kp G, &kp C, &kp R, &kp L, \ +&kp SEMI, &kp COMMA, &kp DOT, &kp P, &kp Y, &kp F, &kp G, &kp C, &kp R, &kp L, \ U_MT(LGUI, A), U_MT(LALT, O), U_MT(LCTRL, E), U_MT(LSHFT, U), &kp I, &kp D, U_MT(LSHFT, H), U_MT(LCTRL, T), U_MT(LALT, N), U_MT(LGUI, S), \ U_LT(U_BUTTON, SLASH),U_MT(RALT, Q), &kp J, &kp K, &kp X, &kp B, &kp M, &kp W, U_MT(RALT, V), U_LT(U_BUTTON, Z), \ U_NP, U_NP, U_LT(U_FUN, DEL), U_LT(U_NUM, BSPC), U_LT(U_SYM, RET), U_LT(U_MOUSE, TAB),U_LT(U_NAV, SPACE),U_LT(U_MEDIA, ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_HALMAK_FLIP \ -&kp W, &kp L, &kp R, &kp B, &kp Z, &kp SQT, &kp Q, &kp U, &kp D, &kp J, \ +&kp W, &kp L, &kp R, &kp B, &kp Z, &kp SEMI, &kp Q, &kp U, &kp D, &kp J, \ U_MT(LGUI, S), U_MT(LALT, H), U_MT(LCTRL, N), U_MT(LSHFT, T), &kp COMMA, &kp DOT, U_MT(LSHFT, A), U_MT(LCTRL, E), U_MT(LALT, O), U_MT(LGUI, I), \ U_LT(U_BUTTON, F), U_MT(RALT, M), &kp V, &kp C, &kp SLASH, &kp G, &kp P, &kp X, U_MT(RALT, K), U_LT(U_BUTTON, Y), \ U_NP, U_NP, U_LT(U_FUN, DEL), U_LT(U_NUM, BSPC), U_LT(U_SYM, RET), U_LT(U_MOUSE, TAB),U_LT(U_NAV, SPACE),U_LT(U_MEDIA, ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_WORKMAN_FLIP \ -&kp Q, &kp D, &kp R, &kp W, &kp B, &kp J, &kp F, &kp U, &kp P, &kp SQT, \ +&kp Q, &kp D, &kp R, &kp W, &kp B, &kp J, &kp F, &kp U, &kp P, &kp SEMI, \ U_MT(LGUI, A), U_MT(LALT, S), U_MT(LCTRL, H), U_MT(LSHFT, T), &kp G, &kp Y, U_MT(LSHFT, N), U_MT(LCTRL, E), U_MT(LALT, O), U_MT(LGUI, I), \ U_LT(U_BUTTON, Z), U_MT(RALT, X), &kp M, &kp C, &kp V, &kp K, &kp L, &kp COMMA, U_MT(RALT, DOT), U_LT(U_BUTTON, SLASH),\ U_NP, U_NP, U_LT(U_FUN, DEL), U_LT(U_NUM, BSPC), U_LT(U_SYM, RET), U_LT(U_MOUSE, TAB),U_LT(U_NAV, SPACE),U_LT(U_MEDIA, ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_QWERTY_FLIP \ &kp Q, &kp W, &kp E, &kp R, &kp T, &kp Y, &kp U, &kp I, &kp O, &kp P, \ -U_MT(LGUI, A), U_MT(LALT, S), U_MT(LCTRL, D), U_MT(LSHFT, F), &kp G, &kp H, U_MT(LSHFT, J), U_MT(LCTRL, K), U_MT(LALT, L), U_MT(LGUI, SQT), \ +U_MT(LGUI, A), U_MT(LALT, S), U_MT(LCTRL, D), U_MT(LSHFT, F), &kp G, &kp H, U_MT(LSHFT, J), U_MT(LCTRL, K), U_MT(LALT, L), U_MT(LGUI, SEMI), \ U_LT(U_BUTTON, Z), U_MT(RALT, X), &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, U_MT(RALT, DOT), U_LT(U_BUTTON, SLASH),\ U_NP, U_NP, U_LT(U_FUN, DEL), U_LT(U_NUM, BSPC), U_LT(U_SYM, RET), U_LT(U_MOUSE, TAB),U_LT(U_NAV, SPACE),U_LT(U_MEDIA, ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_QWERTZ_FLIP \ &kp Q, &kp W, &kp E, &kp R, &kp T, &kp Z, &kp U, &kp I, &kp O, &kp P, \ -U_MT(LGUI, A), U_MT(LALT, S), U_MT(LCTRL, D), U_MT(LSHFT, F), &kp G, &kp H, U_MT(LSHFT, J), U_MT(LCTRL, K), U_MT(LALT, L), U_MT(LGUI, SQT), \ +U_MT(LGUI, A), U_MT(LALT, S), U_MT(LCTRL, D), U_MT(LSHFT, F), &kp G, &kp H, U_MT(LSHFT, J), U_MT(LCTRL, K), U_MT(LALT, L), U_MT(LGUI, SEMI), \ U_LT(U_BUTTON, Y), U_MT(RALT, X), &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, U_MT(RALT, DOT), U_LT(U_BUTTON, SLASH),\ U_NP, U_NP, U_LT(U_FUN, DEL), U_LT(U_NUM, BSPC), U_LT(U_SYM, RET), U_LT(U_MOUSE, TAB),U_LT(U_NAV, SPACE),U_LT(U_MEDIA, ESC),U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_AZERTY \ &kp A, &kp Z, &kp E, &kp R, &kp T, &kp Y, &kp U, &kp I, &kp O, &kp P, \ U_MT(LGUI, Q), U_MT(LALT, S), U_MT(LCTRL, D), U_MT(LSHFT, F), &kp G, &kp H, U_MT(LSHFT, J), U_MT(LCTRL, K), U_MT(LALT, L), U_MT(LGUI, M), \ -U_LT(U_BUTTON, W), U_MT(RALT, X), &kp C, &kp V, &kp B, &kp N, &kp COMMA, &kp DOT, U_MT(RALT, SLASH), U_LT(U_BUTTON, SQT),\ +U_LT(U_BUTTON, W), U_MT(RALT, X), &kp C, &kp V, &kp B, &kp N, &kp COMMA, &kp DOT, U_MT(RALT, SLASH), U_LT(U_BUTTON, SEMI),\ U_NP, U_NP, U_LT(U_MEDIA, ESC),U_LT(U_NAV, RET), U_LT(U_MOUSE, TAB),U_LT(U_SYM, BSPC), U_LT(U_NUM, SPACE),U_LT(U_FUN, DEL), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_BEAKL15 \ &kp Q, &kp H, &kp O, &kp U, &kp X, &kp G, &kp C, &kp R, &kp F, &kp Z, \ U_MT(LGUI, Y), U_MT(LALT, I), U_MT(LCTRL, E), U_MT(LSHFT, A), &kp DOT, &kp D, U_MT(LSHFT, S), U_MT(LCTRL, T), U_MT(LALT, N), U_MT(LGUI, B), \ -U_LT(U_BUTTON, J), U_MT(RALT, SLASH), &kp COMMA, &kp K, &kp SQT, &kp W, &kp M, &kp L, U_MT(RALT, P), U_LT(U_BUTTON, V), \ +U_LT(U_BUTTON, J), U_MT(RALT, SLASH), &kp COMMA, &kp K, &kp SEMI, &kp W, &kp M, &kp L, U_MT(RALT, P), U_LT(U_BUTTON, V), \ U_NP, U_NP, U_LT(U_MEDIA, ESC),U_LT(U_NAV, RET), U_LT(U_MOUSE, TAB),U_LT(U_SYM, BSPC), U_LT(U_NUM, SPACE),U_LT(U_FUN, DEL), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAK \ -&kp Q, &kp W, &kp F, &kp P, &kp G, &kp J, &kp L, &kp U, &kp Y, &kp SQT, \ +&kp Q, &kp W, &kp F, &kp P, &kp G, &kp J, &kp L, &kp U, &kp Y, &kp SEMI, \ U_MT(LGUI, A), U_MT(LALT, R), U_MT(LCTRL, S), U_MT(LSHFT, T), &kp D, &kp H, U_MT(LSHFT, N), U_MT(LCTRL, E), U_MT(LALT, I), U_MT(LGUI, O), \ U_LT(U_BUTTON, Z), U_MT(RALT, X), &kp C, &kp V, &kp B, &kp K, &kp M, &kp COMMA, U_MT(RALT, DOT), U_LT(U_BUTTON, SLASH),\ U_NP, U_NP, U_LT(U_MEDIA, ESC),U_LT(U_NAV, RET), U_LT(U_MOUSE, TAB),U_LT(U_SYM, BSPC), U_LT(U_NUM, SPACE),U_LT(U_FUN, DEL), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH \ -&kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SQT, \ +&kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SEMI, \ U_MT(LGUI, A), U_MT(LALT, R), U_MT(LCTRL, S), U_MT(LSHFT, T), &kp G, &kp M, U_MT(LSHFT, N), U_MT(LCTRL, E), U_MT(LALT, I), U_MT(LGUI, O), \ U_LT(U_BUTTON, Z), U_MT(RALT, X), &kp C, &kp D, &kp V, &kp K, &kp H, &kp COMMA, U_MT(RALT, DOT), U_LT(U_BUTTON, SLASH),\ U_NP, U_NP, U_LT(U_MEDIA, ESC),U_LT(U_NAV, RET), U_LT(U_MOUSE, TAB),U_LT(U_SYM, BSPC), U_LT(U_NUM, SPACE),U_LT(U_FUN, DEL), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK \ -&kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SQT, \ +&kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SEMI, \ U_MT(LGUI, A), U_MT(LALT, R), U_MT(LCTRL, S), U_MT(LSHFT, T), &kp G, &kp K, U_MT(LSHFT, N), U_MT(LCTRL, E), U_MT(LALT, I), U_MT(LGUI, O), \ U_LT(U_BUTTON, Z), U_MT(RALT, X), &kp C, &kp D, &kp V, &kp M, &kp H, &kp COMMA, U_MT(RALT, DOT), U_LT(U_BUTTON, SLASH),\ U_NP, U_NP, U_LT(U_MEDIA, ESC),U_LT(U_NAV, RET), U_LT(U_MOUSE, TAB),U_LT(U_SYM, BSPC), U_LT(U_NUM, SPACE),U_LT(U_FUN, DEL), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_DVORAK \ -&kp SQT, &kp COMMA, &kp DOT, &kp P, &kp Y, &kp F, &kp G, &kp C, &kp R, &kp L, \ +&kp SEMI, &kp COMMA, &kp DOT, &kp P, &kp Y, &kp F, &kp G, &kp C, &kp R, &kp L, \ U_MT(LGUI, A), U_MT(LALT, O), U_MT(LCTRL, E), U_MT(LSHFT, U), &kp I, &kp D, U_MT(LSHFT, H), U_MT(LCTRL, T), U_MT(LALT, N), U_MT(LGUI, S), \ U_LT(U_BUTTON, SLASH),U_MT(RALT, Q), &kp J, &kp K, &kp X, &kp B, &kp M, &kp W, U_MT(RALT, V), U_LT(U_BUTTON, Z), \ U_NP, U_NP, U_LT(U_MEDIA, ESC),U_LT(U_NAV, RET), U_LT(U_MOUSE, TAB),U_LT(U_SYM, BSPC), U_LT(U_NUM, SPACE),U_LT(U_FUN, DEL), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_HALMAK \ -&kp W, &kp L, &kp R, &kp B, &kp Z, &kp SQT, &kp Q, &kp U, &kp D, &kp J, \ +&kp W, &kp L, &kp R, &kp B, &kp Z, &kp SEMI, &kp Q, &kp U, &kp D, &kp J, \ U_MT(LGUI, S), U_MT(LALT, H), U_MT(LCTRL, N), U_MT(LSHFT, T), &kp COMMA, &kp DOT, U_MT(LSHFT, A), U_MT(LCTRL, E), U_MT(LALT, O), U_MT(LGUI, I), \ U_LT(U_BUTTON, F), U_MT(RALT, M), &kp V, &kp C, &kp SLASH, &kp G, &kp P, &kp X, U_MT(RALT, K), U_LT(U_BUTTON, Y), \ U_NP, U_NP, U_LT(U_MEDIA, ESC),U_LT(U_NAV, RET), U_LT(U_MOUSE, TAB),U_LT(U_SYM, BSPC), U_LT(U_NUM, SPACE),U_LT(U_FUN, DEL), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_WORKMAN \ -&kp Q, &kp D, &kp R, &kp W, &kp B, &kp J, &kp F, &kp U, &kp P, &kp SQT, \ +&kp Q, &kp D, &kp R, &kp W, &kp B, &kp J, &kp F, &kp U, &kp P, &kp SEMI, \ U_MT(LGUI, A), U_MT(LALT, S), U_MT(LCTRL, H), U_MT(LSHFT, T), &kp G, &kp Y, U_MT(LSHFT, N), U_MT(LCTRL, E), U_MT(LALT, O), U_MT(LGUI, I), \ U_LT(U_BUTTON, Z), U_MT(RALT, X), &kp M, &kp C, &kp V, &kp K, &kp L, &kp COMMA, U_MT(RALT, DOT), U_LT(U_BUTTON, SLASH),\ U_NP, U_NP, U_LT(U_MEDIA, ESC),U_LT(U_NAV, RET), U_LT(U_MOUSE, TAB),U_LT(U_SYM, BSPC), U_LT(U_NUM, SPACE),U_LT(U_FUN, DEL), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_QWERTY \ &kp Q, &kp W, &kp E, &kp R, &kp T, &kp Y, &kp U, &kp I, &kp O, &kp P, \ -U_MT(LGUI, A), U_MT(LALT, S), U_MT(LCTRL, D), U_MT(LSHFT, F), &kp G, &kp H, U_MT(LSHFT, J), U_MT(LCTRL, K), U_MT(LALT, L), U_MT(LGUI, SQT), \ +U_MT(LGUI, A), U_MT(LALT, S), U_MT(LCTRL, D), U_MT(LSHFT, F), &kp G, &kp H, U_MT(LSHFT, J), U_MT(LCTRL, K), U_MT(LALT, L), U_MT(LGUI, SEMI), \ U_LT(U_BUTTON, Z), U_MT(RALT, X), &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, U_MT(RALT, DOT), U_LT(U_BUTTON, SLASH),\ U_NP, U_NP, U_LT(U_MEDIA, ESC),U_LT(U_NAV, RET), U_LT(U_MOUSE, TAB),U_LT(U_SYM, BSPC), U_LT(U_NUM, SPACE),U_LT(U_FUN, DEL), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_QWERTZ \ &kp Q, &kp W, &kp E, &kp R, &kp T, &kp Z, &kp U, &kp I, &kp O, &kp P, \ -U_MT(LGUI, A), U_MT(LALT, S), U_MT(LCTRL, D), U_MT(LSHFT, F), &kp G, &kp H, U_MT(LSHFT, J), U_MT(LCTRL, K), U_MT(LALT, L), U_MT(LGUI, SQT), \ +U_MT(LGUI, A), U_MT(LALT, S), U_MT(LCTRL, D), U_MT(LSHFT, F), &kp G, &kp H, U_MT(LSHFT, J), U_MT(LCTRL, K), U_MT(LALT, L), U_MT(LGUI, SEMI), \ U_LT(U_BUTTON, Y), U_MT(RALT, X), &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, U_MT(RALT, DOT), U_LT(U_BUTTON, SLASH),\ U_NP, U_NP, U_LT(U_MEDIA, ESC),U_LT(U_NAV, RET), U_LT(U_MOUSE, TAB),U_LT(U_SYM, BSPC), U_LT(U_NUM, SPACE),U_LT(U_FUN, DEL), U_NP, U_NP @@ -130,120 +130,120 @@ U_NP, U_NP, U_LT(U_MEDIA, ESC),U_LT(U_NAV, RET), U_LT #define MIRYOKU_ALTERNATIVES_TAP_AZERTY_FLIP \ &kp A, &kp Z, &kp E, &kp R, &kp T, &kp Y, &kp U, &kp I, &kp O, &kp P, \ &kp Q, &kp S, &kp D, &kp F, &kp G, &kp H, &kp J, &kp K, &kp L, &kp M, \ -&kp W, &kp X, &kp C, &kp V, &kp B, &kp N, &kp COMMA, &kp DOT, &kp SLASH, &kp SQT, \ +&kp W, &kp X, &kp C, &kp V, &kp B, &kp N, &kp COMMA, &kp DOT, &kp SLASH, &kp SEMI, \ U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPACE, &kp ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_BEAKL15_FLIP \ &kp Q, &kp H, &kp O, &kp U, &kp X, &kp G, &kp C, &kp R, &kp F, &kp Z, \ &kp Y, &kp I, &kp E, &kp A, &kp DOT, &kp D, &kp S, &kp T, &kp N, &kp B, \ -&kp J, &kp SLASH, &kp COMMA, &kp K, &kp SQT, &kp W, &kp M, &kp L, &kp P, &kp V, \ +&kp J, &kp SLASH, &kp COMMA, &kp K, &kp SEMI, &kp W, &kp M, &kp L, &kp P, &kp V, \ U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPACE, &kp ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAK_FLIP \ -&kp Q, &kp W, &kp F, &kp P, &kp G, &kp J, &kp L, &kp U, &kp Y, &kp SQT, \ +&kp Q, &kp W, &kp F, &kp P, &kp G, &kp J, &kp L, &kp U, &kp Y, &kp SEMI, \ &kp A, &kp R, &kp S, &kp T, &kp D, &kp H, &kp N, &kp E, &kp I, &kp O, \ &kp Z, &kp X, &kp C, &kp V, &kp B, &kp K, &kp M, &kp COMMA, &kp DOT, &kp SLASH, \ U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPACE, &kp ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDH_FLIP \ -&kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SQT, \ +&kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SEMI, \ &kp A, &kp R, &kp S, &kp T, &kp G, &kp M, &kp N, &kp E, &kp I, &kp O, \ &kp Z, &kp X, &kp C, &kp D, &kp V, &kp K, &kp H, &kp COMMA, &kp DOT, &kp SLASH, \ U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPACE, &kp ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDHK_FLIP \ -&kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SQT, \ +&kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SEMI, \ &kp A, &kp R, &kp S, &kp T, &kp G, &kp K, &kp N, &kp E, &kp I, &kp O, \ &kp Z, &kp X, &kp C, &kp D, &kp V, &kp M, &kp H, &kp COMMA, &kp DOT, &kp SLASH, \ U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPACE, &kp ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_DVORAK_FLIP \ -&kp SQT, &kp COMMA, &kp DOT, &kp P, &kp Y, &kp F, &kp G, &kp C, &kp R, &kp L, \ +&kp SEMI, &kp COMMA, &kp DOT, &kp P, &kp Y, &kp F, &kp G, &kp C, &kp R, &kp L, \ &kp A, &kp O, &kp E, &kp U, &kp I, &kp D, &kp H, &kp T, &kp N, &kp S, \ &kp SLASH, &kp Q, &kp J, &kp K, &kp X, &kp B, &kp M, &kp W, &kp V, &kp Z, \ U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPACE, &kp ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_HALMAK_FLIP \ -&kp W, &kp L, &kp R, &kp B, &kp Z, &kp SQT, &kp Q, &kp U, &kp D, &kp J, \ +&kp W, &kp L, &kp R, &kp B, &kp Z, &kp SEMI, &kp Q, &kp U, &kp D, &kp J, \ &kp S, &kp H, &kp N, &kp T, &kp COMMA, &kp DOT, &kp A, &kp E, &kp O, &kp I, \ &kp F, &kp M, &kp V, &kp C, &kp SLASH, &kp G, &kp P, &kp X, &kp K, &kp Y, \ U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPACE, &kp ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_WORKMAN_FLIP \ -&kp Q, &kp D, &kp R, &kp W, &kp B, &kp J, &kp F, &kp U, &kp P, &kp SQT, \ +&kp Q, &kp D, &kp R, &kp W, &kp B, &kp J, &kp F, &kp U, &kp P, &kp SEMI, \ &kp A, &kp S, &kp H, &kp T, &kp G, &kp Y, &kp N, &kp E, &kp O, &kp I, \ &kp Z, &kp X, &kp M, &kp C, &kp V, &kp K, &kp L, &kp COMMA, &kp DOT, &kp SLASH, \ U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPACE, &kp ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_QWERTY_FLIP \ &kp Q, &kp W, &kp E, &kp R, &kp T, &kp Y, &kp U, &kp I, &kp O, &kp P, \ -&kp A, &kp S, &kp D, &kp F, &kp G, &kp H, &kp J, &kp K, &kp L, &kp SQT, \ +&kp A, &kp S, &kp D, &kp F, &kp G, &kp H, &kp J, &kp K, &kp L, &kp SEMI, \ &kp Z, &kp X, &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, &kp DOT, &kp SLASH, \ U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPACE, &kp ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_QWERTZ_FLIP \ &kp Q, &kp W, &kp E, &kp R, &kp T, &kp Z, &kp U, &kp I, &kp O, &kp P, \ -&kp A, &kp S, &kp D, &kp F, &kp G, &kp H, &kp J, &kp K, &kp L, &kp SQT, \ +&kp A, &kp S, &kp D, &kp F, &kp G, &kp H, &kp J, &kp K, &kp L, &kp SEMI, \ &kp Y, &kp X, &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, &kp DOT, &kp SLASH, \ U_NP, U_NP, &kp DEL, &kp BSPC, &kp RET, &kp TAB, &kp SPACE, &kp ESC, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_AZERTY \ &kp A, &kp Z, &kp E, &kp R, &kp T, &kp Y, &kp U, &kp I, &kp O, &kp P, \ &kp Q, &kp S, &kp D, &kp F, &kp G, &kp H, &kp J, &kp K, &kp L, &kp M, \ -&kp W, &kp X, &kp C, &kp V, &kp B, &kp N, &kp COMMA, &kp DOT, &kp SLASH, &kp SQT, \ +&kp W, &kp X, &kp C, &kp V, &kp B, &kp N, &kp COMMA, &kp DOT, &kp SLASH, &kp SEMI, \ U_NP, U_NP, &kp ESC, &kp RET, &kp TAB, &kp BSPC, &kp SPACE, &kp DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_BEAKL15 \ &kp Q, &kp H, &kp O, &kp U, &kp X, &kp G, &kp C, &kp R, &kp F, &kp Z, \ &kp Y, &kp I, &kp E, &kp A, &kp DOT, &kp D, &kp S, &kp T, &kp N, &kp B, \ -&kp J, &kp SLASH, &kp COMMA, &kp K, &kp SQT, &kp W, &kp M, &kp L, &kp P, &kp V, \ +&kp J, &kp SLASH, &kp COMMA, &kp K, &kp SEMI, &kp W, &kp M, &kp L, &kp P, &kp V, \ U_NP, U_NP, &kp ESC, &kp RET, &kp TAB, &kp BSPC, &kp SPACE, &kp DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAK \ -&kp Q, &kp W, &kp F, &kp P, &kp G, &kp J, &kp L, &kp U, &kp Y, &kp SQT, \ +&kp Q, &kp W, &kp F, &kp P, &kp G, &kp J, &kp L, &kp U, &kp Y, &kp SEMI, \ &kp A, &kp R, &kp S, &kp T, &kp D, &kp H, &kp N, &kp E, &kp I, &kp O, \ &kp Z, &kp X, &kp C, &kp V, &kp B, &kp K, &kp M, &kp COMMA, &kp DOT, &kp SLASH, \ U_NP, U_NP, &kp ESC, &kp RET, &kp TAB, &kp BSPC, &kp SPACE, &kp DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDH \ -&kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SQT, \ +&kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SEMI, \ &kp A, &kp R, &kp S, &kp T, &kp G, &kp M, &kp N, &kp E, &kp I, &kp O, \ &kp Z, &kp X, &kp C, &kp D, &kp V, &kp K, &kp H, &kp COMMA, &kp DOT, &kp SLASH, \ U_NP, U_NP, &kp ESC, &kp RET, &kp TAB, &kp BSPC, &kp SPACE, &kp DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDHK \ -&kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SQT, \ +&kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SEMI, \ &kp A, &kp R, &kp S, &kp T, &kp G, &kp K, &kp N, &kp E, &kp I, &kp O, \ &kp Z, &kp X, &kp C, &kp D, &kp V, &kp M, &kp H, &kp COMMA, &kp DOT, &kp SLASH, \ U_NP, U_NP, &kp ESC, &kp RET, &kp TAB, &kp BSPC, &kp SPACE, &kp DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_DVORAK \ -&kp SQT, &kp COMMA, &kp DOT, &kp P, &kp Y, &kp F, &kp G, &kp C, &kp R, &kp L, \ +&kp SEMI, &kp COMMA, &kp DOT, &kp P, &kp Y, &kp F, &kp G, &kp C, &kp R, &kp L, \ &kp A, &kp O, &kp E, &kp U, &kp I, &kp D, &kp H, &kp T, &kp N, &kp S, \ &kp SLASH, &kp Q, &kp J, &kp K, &kp X, &kp B, &kp M, &kp W, &kp V, &kp Z, \ U_NP, U_NP, &kp ESC, &kp RET, &kp TAB, &kp BSPC, &kp SPACE, &kp DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_HALMAK \ -&kp W, &kp L, &kp R, &kp B, &kp Z, &kp SQT, &kp Q, &kp U, &kp D, &kp J, \ +&kp W, &kp L, &kp R, &kp B, &kp Z, &kp SEMI, &kp Q, &kp U, &kp D, &kp J, \ &kp S, &kp H, &kp N, &kp T, &kp COMMA, &kp DOT, &kp A, &kp E, &kp O, &kp I, \ &kp F, &kp M, &kp V, &kp C, &kp SLASH, &kp G, &kp P, &kp X, &kp K, &kp Y, \ U_NP, U_NP, &kp ESC, &kp RET, &kp TAB, &kp BSPC, &kp SPACE, &kp DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_WORKMAN \ -&kp Q, &kp D, &kp R, &kp W, &kp B, &kp J, &kp F, &kp U, &kp P, &kp SQT, \ +&kp Q, &kp D, &kp R, &kp W, &kp B, &kp J, &kp F, &kp U, &kp P, &kp SEMI, \ &kp A, &kp S, &kp H, &kp T, &kp G, &kp Y, &kp N, &kp E, &kp O, &kp I, \ &kp Z, &kp X, &kp M, &kp C, &kp V, &kp K, &kp L, &kp COMMA, &kp DOT, &kp SLASH, \ U_NP, U_NP, &kp ESC, &kp RET, &kp TAB, &kp BSPC, &kp SPACE, &kp DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_QWERTY \ &kp Q, &kp W, &kp E, &kp R, &kp T, &kp Y, &kp U, &kp I, &kp O, &kp P, \ -&kp A, &kp S, &kp D, &kp F, &kp G, &kp H, &kp J, &kp K, &kp L, &kp SQT, \ +&kp A, &kp S, &kp D, &kp F, &kp G, &kp H, &kp J, &kp K, &kp L, &kp SEMI, \ &kp Z, &kp X, &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, &kp DOT, &kp SLASH, \ U_NP, U_NP, &kp ESC, &kp RET, &kp TAB, &kp BSPC, &kp SPACE, &kp DEL, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_QWERTZ \ &kp Q, &kp W, &kp E, &kp R, &kp T, &kp Z, &kp U, &kp I, &kp O, &kp P, \ -&kp A, &kp S, &kp D, &kp F, &kp G, &kp H, &kp J, &kp K, &kp L, &kp SQT, \ +&kp A, &kp S, &kp D, &kp F, &kp G, &kp H, &kp J, &kp K, &kp L, &kp SEMI, \ &kp Y, &kp X, &kp C, &kp V, &kp B, &kp N, &kp M, &kp COMMA, &kp DOT, &kp SLASH, \ U_NP, U_NP, &kp ESC, &kp RET, &kp TAB, &kp BSPC, &kp SPACE, &kp DEL, U_NP, U_NP @@ -343,26 +343,26 @@ U_NP, U_NP, U_NA, U_NA, U_NA #define MIRYOKU_ALTERNATIVES_NUM_FLIP \ U_BOOT, &u_to_U_TAP, &u_to_U_EXTRA, &u_to_U_BASE, U_NA, &kp LBKT, &kp N7, &kp N8, &kp N9, &kp RBKT, \ -&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &kp EQUAL, &kp N4, &kp N5, &kp N6, &kp SEMI, \ +&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &kp EQUAL, &kp N4, &kp N5, &kp N6, &kp SQT, \ U_NA, &kp RALT, &u_to_U_NAV, &u_to_U_NUM, U_NA, &kp BSLH, &kp N1, &kp N2, &kp N3, &kp GRAVE, \ U_NP, U_NP, U_NA, U_NA, U_NA, &kp MINUS, &kp N0, &kp DOT, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_NUM \ &kp LBKT, &kp N7, &kp N8, &kp N9, &kp RBKT, U_NA, &u_to_U_BASE, &u_to_U_EXTRA, &u_to_U_TAP, U_BOOT, \ -&kp SEMI, &kp N4, &kp N5, &kp N6, &kp EQUAL, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ +&kp SQT, &kp N4, &kp N5, &kp N6, &kp EQUAL, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ &kp GRAVE, &kp N1, &kp N2, &kp N3, &kp BSLH, U_NA, &u_to_U_NUM, &u_to_U_NAV, &kp RALT, U_NA, \ U_NP, U_NP, &kp DOT, &kp N0, &kp MINUS, U_NA, U_NA, U_NA, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_SYM_FLIP \ U_BOOT, &u_to_U_TAP, &u_to_U_EXTRA, &u_to_U_BASE, U_NA, &kp LBRC, &kp AMPS, &kp ASTRK, &kp LPAR, &kp RBRC, \ -&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &kp PLUS, &kp DLLR, &kp PRCNT, &kp CARET, &kp COLON, \ +&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, &kp PLUS, &kp DLLR, &kp PRCNT, &kp CARET, &kp DQT, \ U_NA, &kp RALT, &u_to_U_MOUSE, &u_to_U_SYM, U_NA, &kp PIPE, &kp EXCL, &kp AT, &kp HASH, &kp TILDE, \ U_NP, U_NP, U_NA, U_NA, U_NA, &kp UNDER, &kp LPAR, &kp RPAR, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_SYM \ &kp LBRC, &kp AMPS, &kp ASTRK, &kp LPAR, &kp RBRC, U_NA, &u_to_U_BASE, &u_to_U_EXTRA, &u_to_U_TAP, U_BOOT, \ -&kp COLON, &kp DLLR, &kp PRCNT, &kp CARET, &kp PLUS, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ +&kp DQT, &kp DLLR, &kp PRCNT, &kp CARET, &kp PLUS, U_NA, &kp LSHFT, &kp LCTRL, &kp LALT, &kp LGUI, \ &kp TILDE, &kp EXCL, &kp AT, &kp HASH, &kp PIPE, U_NA, &u_to_U_SYM, &u_to_U_MOUSE, &kp RALT, U_NA, \ U_NP, U_NP, &kp LPAR, &kp RPAR, &kp UNDER, U_NA, U_NA, U_NA, U_NP, U_NP