diff --git a/.github/workflows/buildpkg.yml b/.github/workflows/buildpkg.yml index 3901dcf..d9ac764 100644 --- a/.github/workflows/buildpkg.yml +++ b/.github/workflows/buildpkg.yml @@ -55,42 +55,6 @@ jobs: printf '%s\n' "${RUNNER_TEMP}/dist/" ls -lh "${RUNNER_TEMP}/dist/" - - name: copy ttf-iosevka-term-custom-git PKGBUILD into build ctnr - run: | - buildah copy --chown dev ctnr pkgs/ttf-iosevka-term-custom-git /home/dev/ttf-iosevka-term-custom-git - - - name: build and siphon ttf-iosevka-term-custom-git from build ctnr - run: | - buildah config -u dev --workingdir /home/dev/ttf-iosevka-term-custom-git ctnr - buildah run ctnr makepkg --noconfirm -s - - buildah run ctnr ls -lh - - pkg="$(buildah run ctnr sh -c "printf '%s\n' *.pkg.*")" - mkdir -p "${RUNNER_TEMP}/dist" - buildah run ctnr cat "$pkg" >"${RUNNER_TEMP}/dist/${pkg}" - - printf '%s\n' "${RUNNER_TEMP}/dist/" - ls -lh "${RUNNER_TEMP}/dist/" - - - name: copy ttf-iosevka-quasi-proportional-custom-git PKGBUILD into build ctnr - run: | - buildah copy --chown dev ctnr pkgs/ttf-iosevka-quasi-proportional-custom-git /home/dev/ttf-iosevka-quasi-proportional-custom-git - - - name: build and siphon ttf-iosevka-quasi-proportional-custom-git from build ctnr - run: | - buildah config -u dev --workingdir /home/dev/ttf-iosevka-quasi-proportional-custom-git ctnr - buildah run ctnr makepkg --noconfirm -s - - buildah run ctnr ls -lh - - pkg="$(buildah run ctnr sh -c "printf '%s\n' *.pkg.*")" - mkdir -p "${RUNNER_TEMP}/dist" - buildah run ctnr cat "$pkg" >"${RUNNER_TEMP}/dist/${pkg}" - - printf '%s\n' "${RUNNER_TEMP}/dist/" - ls -lh "${RUNNER_TEMP}/dist/" - - name: make release notes run: | printf '%s\n' '`vars.nt`:' '```yaml' >release.md diff --git a/templates/private-build-plans.toml.wz b/templates/private-build-plans.toml.wz index b423374..254cde4 100644 --- a/templates/private-build-plans.toml.wz +++ b/templates/private-build-plans.toml.wz @@ -1,123 +1,138 @@ -@require(charvars, italic_overrides, spacings, custom_weights, use_custom_weights, contextual_widths, extra_widths) -@( - contextual_widths = str(contextual_widths).lower() -)\ -@for spacing in spacings: -@( - if spacing == 'normal': - plan = 'IosevkaCustom' - family = 'Iosevka Custom' - elif spacing == 'quasi-proportional': - plan = 'IosevkaQpCustom' - family = 'Iosevka QP Custom' - elif spacing == 'quasi-proportional-extension-only': - plan = 'IosevkaQpeCustom' - family = 'Iosevka QPE Custom' - elif spacing == 'fontconfig-mono': - plan = 'IosevkaFcmCustom' - family = 'Iosevka FCM Custom' - else: - plan = f"Iosevka{spacing.title()}Custom" - family = f"Iosevka {spacing.title()} Custom" -)\ -[buildPlans.@{plan}] -family = "@family" +[buildPlans.IosevkaCustom] +family = "Iosevka Custom" +spacing = "normal" +serifs = "sans" +noCvSs = true exportGlyphNames = false -buildTextureFeature = @contextual_widths -spacing = "@spacing" -[buildPlans.@{plan}.ligations] -inherits = "dlig" -# disables = [] -# enables = [] - -[buildPlans.@{plan}.widths.Normal] + [buildPlans.IosevkaCustom.variants] + inherits = "ss12" + + [buildPlans.IosevkaCustom.variants.design] + one = "no-base" + six = "closed-contour" + seven = "bend-serifless" + eight = "two-circles" + nine = "closed-contour" + zero = "oval-tall-reverse-slashed" + capital-b = "standard-serifless" + capital-d = "more-rounded-unilateral-serifed" + capital-g = "toothless-corner-serifless-hooked" + capital-h = "top-left-serifed" + capital-i = "serifed" + capital-j = "descending-serifed-both-sides" + capital-k = "symmetric-touching-top-left-serifed" + capital-m = "slanted-sides-flat-bottom-serifless" + capital-n = "standard-motion-serifed" + capital-q = "vertical-crossing" + capital-u = "toothless-corner-serifless" + capital-w = "curly-serifless" + a = "single-storey-earless-corner-serifed" + f = "serifless" + i = "serifed-semi-tailed" + j = "flat-hook-serifed" + k = "symmetric-touching-top-left-serifed" + l = "tailed" + m = "earless-corner-double-arch-serifless" + t = "hookless-short-neck" + w = "straight-motion-serifed" + y = "cursive-serifless" + eszet = "sulzbacher-serifless" + lower-alpha = "barred-earless-corner-serifed" + lower-beta = "cursive" + capital-gamma = "serifless" + lower-delta = "rounded" + cyrl-a = "single-storey-earless-corner-serifed" + cyrl-ve = "standard-serifless" + cyrl-capital-zhe = "curly" + cyrl-zhe = "curly" + cyrl-capital-ka = "symmetric-touching-top-left-serifed" + cyrl-ka = "symmetric-touching-top-left-serifed" + cyrl-em = "slanted-sides-flat-bottom-serifless" + cyrl-capital-en = "top-left-serifed" + cyrl-en = "top-left-serifed" + cyrl-er = "earless-corner-serifless" + cyrl-capital-u = "cursive-serifless" + cyrl-u = "cursive-serifless" + cyrl-ef = "top-serifed" + cyrl-yeri = "round" + cyrl-yery = "round" + cyrl-capital-ya = "straight-serifless" + tittle = "square" + diacritic-dot = "square" + punctuation-dot = "square" + braille-dot = "square" + asterisk = "turn-hex-mid" + ascii-grave = "straight" + ascii-single-quote = "straight" + paren = "flat-arc" + brace = "curly-flat-boundary" + guillemet = "straight" + at = "fourfold-tall" + dollar = "interrupted-cap" + cent = "bar-interrupted" + percent = "dots" + bar = "natural-slope" + question = "smooth" + +[buildPlans.IosevkaCustom.weights.ExtraLight] +shape = 200 +menu = 200 +css = 200 + +[buildPlans.IosevkaCustom.weights.Light] +shape = 300 +menu = 300 +css = 300 + +[buildPlans.IosevkaCustom.weights.Regular] +shape = 400 +menu = 400 +css = 400 + +[buildPlans.IosevkaCustom.weights.Medium] shape = 500 -menu = 5 -css = "normal" +menu = 500 +css = 500 + +[buildPlans.IosevkaCustom.weights.SemiBold] +shape = 600 +menu = 600 +css = 600 -@if 'condensed' in extra_widths: -[buildPlans.@{plan}.widths.Condensed] -shape = 416 -menu = 3 -css = "condensed" +[buildPlans.IosevkaCustom.weights.Bold] +shape = 700 +menu = 700 +css = 700 -@end -@if 'semi-condensed' in extra_widths: -[buildPlans.@{plan}.widths.SemiCondensed] -shape = 456 -menu = 4 -css = "semi-condensed" +[buildPlans.IosevkaCustom.weights.ExtraBold] +shape = 800 +menu = 800 +css = 800 -@end -@if 'semi-extended' in extra_widths: -[buildPlans.@{plan}.widths.SemiExtended] -shape = 548 -menu = 6 -css = "semi-expanded" +[buildPlans.IosevkaCustom.widths.Normal] +shape = 500 +menu = 5 +css = "normal" -@end -@if 'extended' in extra_widths: -[buildPlans.@{plan}.widths.Extended] +[buildPlans.IosevkaCustom.widths.Extended] shape = 600 menu = 7 css = "expanded" -@end -@if 'extra-extended' in extra_widths: -[buildPlans.@{plan}.widths.ExtraExtended] -shape = 658 -menu = 8 -css = "extra-expanded" - -@end -@if 'ultra-extended' in extra_widths: -[buildPlans.@{plan}.widths.UltraExtended] +[buildPlans.IosevkaCustom.widths.UltraExtended] shape = 720 menu = 9 css = "ultra-expanded" -@end -# [buildPlans.@{plan}.variants] -# inherits = "ss16" - -[buildPlans.@{plan}.variants.design] -@for char, style in charvars.items(): -@char = "@style" -@end - -# Override above variants for each slope: -# [buildPlans.@{plan}.variants.upright] -[buildPlans.@{plan}.variants.italic] -@for char, style in italic_overrides.items(): -@char = "@style" -@end - -@if use_custom_weights: -@for name, weight in custom_weights.items(): -[buildPlans.@{plan}.weights.@{name}] -shape = @weight['override'] -menu = @weight['default'] -css = @weight['default'] - -@end -@end -[buildPlans.@{plan}.slopes.Upright] +[buildPlans.IosevkaCustom.slopes.Upright] angle = 0 shape = "upright" -menu = "upright" -css = "normal" - -# [buildPlans.@{plan}.slopes.Oblique] -# angle = 9.4 -# shape = "oblique" -# menu = "oblique" -# css = "oblique" +menu = "upright" +css = "normal" -[buildPlans.@{plan}.slopes.Italic] +[buildPlans.IosevkaCustom.slopes.Italic] angle = 9.4 shape = "italic" -menu = "italic" -css = "italic" - -@end +menu = "italic" +css = "italic" \ No newline at end of file diff --git a/vars.nt b/vars.nt index d56542e..5d43c12 100644 --- a/vars.nt +++ b/vars.nt @@ -1,8 +1,8 @@ build: # Uncomment the ones you wish to build: - ttf-iosevka-custom-git - - ttf-iosevka-term-custom-git - - ttf-iosevka-quasi-proportional-custom-git + # - ttf-iosevka-term-custom-git + # - ttf-iosevka-quasi-proportional-custom-git # - ttf-iosevka-git # - ttf-iosevka-fixed-custom-git # - ttf-iosevka-fontconfig-mono-custom-git