Skip to content

Commit

Permalink
Merge in updates from develop
Browse files Browse the repository at this point in the history
  • Loading branch information
AndydeCleyre committed Jul 12, 2023
1 parent 677548e commit 17cb34f
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 34 deletions.
1 change: 1 addition & 0 deletions .github/workflows/buildpkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,4 @@ jobs:
with:
files: ${{ runner.temp }}/dist/*
fail_on_unmatched_files: true
body_path: private-build-plans.toml
7 changes: 4 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ fork this repo on GitHub, then:
$ git clone <your-github-fork>
$ cd archbuilder_iosevka
- configure your font, either by editing ``vars.yml``:
- configure your font (see the `character variants`_), either by editing ``vars.yml``:

.. code:: console
Expand All @@ -46,8 +46,8 @@ fork this repo on GitHub, then:

.. code:: console
$ git commit -am "much better now"
$ git tag awesome-build-label
$ git commit -am "whatever change message you want"
$ git tag whatever-label-you-want
$ git push && git push --tags
You can watch the build process in your ``Actions`` tab,
Expand Down Expand Up @@ -88,6 +88,7 @@ To use a configuration thus generated with this builder:
.. _Iosevka: https://github.com/be5invis/Iosevka/
.. _character variants: https://github.com/be5invis/Iosevka/blob/main/doc/custom-build.md
.. _an official web app: https://typeof.net/Iosevka/customizer
.. _CLI: https://github.com/cli/cli

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ ruamel-yaml==0.17.21 # via yamlpath
ruamel-yaml-clib==0.2.7 # via ruamel-yaml
six==1.16.0 # via python-dateutil
wheezy-template==3.1.0 # via -r requirements.in
yamlpath==3.6.9 # via -r requirements.in
yamlpath==3.8.0 # via -r requirements.in
1 change: 1 addition & 0 deletions templates/buildpkg.yml.wz
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,4 @@ jobs:
with:
files: ${{ runner.temp }}/dist/*
fail_on_unmatched_files: true
body_path: private-build-plans.toml
4 changes: 2 additions & 2 deletions templates/private-build-plans.toml.wz
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
)\
@for spacing in spacings:
@(
plan='-'.join(filter(None, ('iosevka', spacing, 'custom')))
family=plan.replace('-', ' ').title()
plan = '-'.join(filter(None, ('iosevka', spacing, 'custom')))
family = plan.replace('-', ' ').title()
)\
@#
[buildPlans.@plan]
Expand Down
65 changes: 37 additions & 28 deletions vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,52 +39,52 @@ charvars:
capital-k: curly-top-left-serifed
capital-l: serifless
capital-m: hanging-motion-serifed
capital-n: standard
capital-n: standard-serifless
capital-p: closed-motion-serifed
capital-q: open-swash
capital-r: straight-open
capital-r: straight-open-serifless
capital-s: serifless
capital-t: serifless
capital-u: toothless-rounded
capital-v: curly
capital-w: straight-asymmetric
capital-u: toothless-rounded-serifless
capital-v: curly-serifless
capital-w: straight-asymmetric-serifless
capital-x: curly-serifless
capital-y: curly-serifless
capital-z: straight-serifless-with-crossbar
a: double-storey-tailed
b: toothless-corner
b: toothless-corner-serifless
c: serifless
d: tailed-serifless
e: rounded
f: flat-hook-tailed
g: double-storey-open
h: straight
h: straight-serifless
i: hooky
j: serifless
k: curly-serifless
l: flat-tailed
m: short-leg
n: earless-corner-tailed
p: motion-serifed
q: earless-corner-diagonal-tailed
r: corner-hooked
m: short-leg-serifless
n: earless-corner-tailed-serifless
p: eared-motion-serifed
q: earless-corner-diagonal-tailed-serifless
r: corner-hooked-serifless
s: serifless
t: standard
u: toothless-rounded
v: curly
w: cursive
u: toothless-rounded-serifless
v: curly-serifless
w: cursive-serifless
x: curly-serifless
y: curly
y: curly-serifless
z: straight-serifless-with-crossbar
long-s: bent-hook-tailed
long-s: flat-hook-tailed
eszet: longs-s-lig-tailed
turn-v: curly
lower-alpha: crossing
lower-delta: rounded
capital-gamma: serifless
lower-iota: serifed-flat-tailed
capital-gamma: bottom-serifed
lower-iota: tailed-serifed
lower-lambda: curly
lower-mu: tailed
lower-mu: tailed-serifless
lower-xi: flat-top
cyrl-capital-zhe: curly
cyrl-zhe: curly
Expand All @@ -93,14 +93,16 @@ charvars:
cyrl-capital-ka: curly-serifless
cyrl-ka: curly-serifless
cyrl-el: straight
cyrl-em: slanted-sides-hanging-serifed
cyrl-en: tailed-top-left-serifed
cyrl-ef: cursive
cyrl-che: tailed
cyrl-capital-u: curly-turn
cyrl-ya: straight-tailed
cyrl-capital-u: curly-turn-serifless
cyrl-capital-ya: straight-serifless
cyrl-ya: straight-tailed-serifless
cyrl-yeri: round
cyrl-yery: round
zero: slashed-split-oval
zero: diamond-unslashed
one: no-base
two: curly-neck
three: flat-top
Expand All @@ -110,24 +112,31 @@ charvars:
seven: curly-serifless
eight: crossing-asymmetric
nine: straight-bar
diacritic-dot: round
punctuation-dot: round
tilde: low
asterisk: turn-hex-high
underscore: high
pilcrow: low
caret: high
paren: normal
brace: curly
number-sign: upright-tall
ampersand: flat-top
at: fourfold-solid-inner-tall
dollar: open-cap
cent: open
percent: rings-segmented-slash
bar: natural-slope
lig-ltgteq: flat
ascii-single-quote: straight
ascii-grave: straight
question: smooth
punctuation-dot: round
diacritic-dot: round
pilcrow: low
cent: open
partial-derivative: curly-bar
lower-eth: straight-bar
micro-sign: toothed-serifless
lig-ltgteq: flat
lig-neq: slightly-slanted
lig-equal-chain: with-notch
lig-hyphen-chain: with-notch
lig-double-arrow-bar: with-notch
lig-single-arrow-bar: with-notch

0 comments on commit 17cb34f

Please sign in to comment.