Skip to content

Commit

Permalink
Merge branch 'develop' into colorcodebot
Browse files Browse the repository at this point in the history
  • Loading branch information
AndydeCleyre committed Oct 26, 2023
2 parents 17cb34f + 5d9a022 commit ee7277e
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 15 deletions.
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
python-dateutil==2.8.2 # via yamlpath
ruamel-yaml==0.17.21 # via yamlpath
ruamel-yaml-clib==0.2.7 # via ruamel-yaml
ruamel-yaml-clib==0.2.8 # via ruamel-yaml
six==1.16.0 # via python-dateutil
wheezy-template==3.1.0 # via -r requirements.in
yamlpath==3.8.0 # via -r requirements.in
wheezy-template==3.2.1 # via -r requirements.in
yamlpath==3.8.1 # via -r requirements.in
32 changes: 20 additions & 12 deletions vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use_custom_weights: yes
custom_weights:
regular:
default: "400"
override: "500"
override: "600"
bold:
default: "700"
override: "800"
Expand Down Expand Up @@ -69,23 +69,29 @@ charvars:
q: earless-corner-diagonal-tailed-serifless
r: corner-hooked-serifless
s: serifless
t: standard
t: bent-hook
u: toothless-rounded-serifless
v: curly-serifless
w: cursive-serifless
x: curly-serifless
y: curly-serifless
z: straight-serifless-with-crossbar
long-s: flat-hook-tailed
eszet: longs-s-lig-tailed
turn-v: curly
eszet: longs-s-lig-tailed-serifless
lower-eth: straight-bar
lower-thorn: serifed
lower-alpha: crossing
lower-delta: rounded
capital-gamma: bottom-serifed
capital-delta: curly
lower-delta: rounded
lower-iota: tailed-serifed
lower-lambda: curly
capital-lambda: curly-top-serifed
lower-lambda: tailed-turn
lower-mu: tailed-serifless
lower-xi: flat-top
lower-pi: tailed
lower-tau: flat-tailed
lower-chi: semi-chancery-straight
cyrl-capital-zhe: curly
cyrl-zhe: curly
cyrl-capital-ze: unilateral-serifed
Expand All @@ -95,19 +101,21 @@ charvars:
cyrl-el: straight
cyrl-em: slanted-sides-hanging-serifed
cyrl-en: tailed-top-left-serifed
cyrl-er: earless-rounded-serifless
cyrl-capital-u: cursive-flat-hook-serifless
cyrl-u: cursive-flat-hook-serifless
cyrl-ef: cursive
cyrl-che: tailed
cyrl-capital-u: curly-turn-serifless
cyrl-capital-ya: straight-serifless
cyrl-ya: straight-tailed-serifless
cyrl-yeri: round
cyrl-yery: round
cyrl-capital-ya: straight-motion-serifed
cyrl-ya: straight-tailed-motion-serifed
zero: diamond-unslashed
one: no-base
two: curly-neck
three: flat-top
four: semi-open
five: oblique-upper-left-bar
five: oblique-arched
six: open-contour
seven: curly-serifless
eight: crossing-asymmetric
Expand All @@ -130,10 +138,10 @@ charvars:
ascii-grave: straight
question: smooth
pilcrow: low
cent: open
cent: open-cap
partial-derivative: curly-bar
lower-eth: straight-bar
micro-sign: toothed-serifless
guillemet: curly
lig-ltgteq: flat
lig-neq: slightly-slanted
lig-equal-chain: with-notch
Expand Down

0 comments on commit ee7277e

Please sign in to comment.