From bc490ff118768d00f87a9b3c48771c73fdd048f7 Mon Sep 17 00:00:00 2001 From: Belleve Invis Date: Tue, 29 Oct 2019 22:04:53 -0700 Subject: [PATCH] I choose to do a 3.0 instead of 2.4. --- build-plans.toml | 107 +++++++++++++++++++++++------------------------ package.json | 2 +- parameters.toml | 9 ++-- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/build-plans.toml b/build-plans.toml index 3b4af1078..2cc5509ab 100644 --- a/build-plans.toml +++ b/build-plans.toml @@ -40,47 +40,47 @@ design = ["termlig", "slab"] family = "IosevkaCC Slab" design = ["cc", "slab"] -# Crisp -[buildPlans.iosevka-crisp] -family = "Iosevka Crisp" -design = ["shape-straight-bar", "v-at-fourfold"] +# Curly +[buildPlans.iosevka-curly] +family = "Iosevka Curly" +design = ["shape-curly-bar", "v-at-fourfold"] -[buildPlans.iosevka-term-crisp] -family = "Iosevka Term Crisp" -design = ["term", "shape-straight-bar", "v-at-fourfold"] +[buildPlans.iosevka-term-curly] +family = "Iosevka Term Curly" +design = ["term", "shape-curly-bar", "v-at-fourfold"] -[buildPlans.iosevka-type-crisp] -family = "Iosevka Type Crisp" -design = ["type", "shape-straight-bar", "v-at-fourfold"] +[buildPlans.iosevka-type-curly] +family = "Iosevka Type Curly" +design = ["type", "shape-curly-bar", "v-at-fourfold"] -[buildPlans.iosevka-term-lig-crisp] -family = "Iosevka TermLig Crisp" -design = ["termlig", "shape-straight-bar", "v-at-fourfold"] +[buildPlans.iosevka-term-lig-curly] +family = "Iosevka TermLig Curly" +design = ["termlig", "shape-curly-bar", "v-at-fourfold"] -[buildPlans.iosevka-cc-crisp] -family = "IosevkaCC Crisp" -design = ["cc", "shape-straight-bar", "v-at-fourfold"] +[buildPlans.iosevka-cc-curly] +family = "IosevkaCC Curly" +design = ["cc", "shape-curly-bar", "v-at-fourfold"] -# Crisp Slab -[buildPlans.iosevka-crisp-slab] -family = "Iosevka Crisp Slab" -design = ["slab", "shape-straight-bar", "v-at-fourfold"] +# Curly Slab +[buildPlans.iosevka-curly-slab] +family = "Iosevka Curly Slab" +design = ["slab", "shape-curly-bar", "v-at-fourfold"] -[buildPlans.iosevka-term-crisp-slab] -family = "Iosevka Term Crisp Slab" -design = ["term", "slab", "shape-straight-bar", "v-at-fourfold"] +[buildPlans.iosevka-term-curly-slab] +family = "Iosevka Term Curly Slab" +design = ["term", "slab", "shape-curly-bar", "v-at-fourfold"] -[buildPlans.iosevka-type-crisp-slab] -family = "Iosevka Type Crisp Slab" -design = ["type", "slab", "shape-straight-bar", "v-at-fourfold"] +[buildPlans.iosevka-type-curly-slab] +family = "Iosevka Type Curly Slab" +design = ["type", "slab", "shape-curly-bar", "v-at-fourfold"] -[buildPlans.iosevka-term-lig-crisp-slab] -family = "Iosevka TermLig Crisp Slab" -design = ["termlig", "slab", "shape-straight-bar", "v-at-fourfold"] +[buildPlans.iosevka-term-lig-curly-slab] +family = "Iosevka TermLig Curly Slab" +design = ["termlig", "slab", "shape-curly-bar", "v-at-fourfold"] -[buildPlans.iosevka-cc-crisp-slab] -family = "IosevkaCC Crisp Slab" -design = ["cc", "slab", "shape-straight-bar", "v-at-fourfold"] +[buildPlans.iosevka-cc-curly-slab] +family = "IosevkaCC Curly Slab" +design = ["cc", "slab", "shape-curly-bar", "v-at-fourfold"] # SSxx [buildPlans.iosevka-ss01] @@ -173,7 +173,7 @@ design = ["term", "ss11"] [buildPlans.iosevka-aile] family = "Iosevka Aile" -design = ["type", "shape-straight-bar", "v-at-fourfold", "v-j-narrow", 'v-capital-i-straight', 'v-capital-j-straight', 'v-g-singlestorey', 'v-r-narrow', "no-cv-ss", "no-ligation"] +design = ["type", "v-at-fourfold", "v-j-narrow", 'v-capital-i-straight', 'v-capital-j-straight', 'v-g-singlestorey', 'v-r-narrow', "no-cv-ss", "no-ligation"] upright = ["v-i-line", "v-l-line", 'v-f-narrow', 'v-t-narrow'] italic = ["v-i-line", "v-l-line", 'v-f-narrow', 'v-t-narrow'] oblique = ["v-i-line", "v-l-line", 'v-f-narrow', 'v-t-narrow'] @@ -183,21 +183,20 @@ design = ['wd-extended', "diversity-2"] [buildPlans.iosevka-etoile] family = "Iosevka Etoile" -design = ["type", "slab", "shape-straight-bar", "diversity-1", "v-at-fourfold", 'v-j-serifed', 'no-cv-ss', "no-cv-ss", "no-ligation"] +design = ["type", "slab", "diversity-1", "v-at-fourfold", 'v-j-serifed', 'no-cv-ss', "no-cv-ss", "no-ligation"] upright = ['v-i-serifed', 'v-l-serifed'] italic = ['v-i-italic', 'v-l-italic'] oblique = ['v-i-serifed', 'v-l-serifed'] [buildPlans.iosevka-extended] family = "Iosevka" -design = ["shape-straight-bar"] [buildPlans.iosevka-extended.post] design = ['wd-extended', 'menu-subfamily-extended'] [buildPlans.iosevka-slab-extended] family = "Iosevka Slab" -design = ["slab", "shape-straight-bar"] +design = ["slab"] [buildPlans.iosevka-slab-extended.post] design = ['wd-extended', 'menu-subfamily-extended'] @@ -215,20 +214,20 @@ design = ['wd-extended', 'menu-subfamily-extended'] 06-iosevka-term-slab = "iosevka-term-slab" 07-iosevka-type-slab = "iosevka-type-slab" 08-iosevka-term-lig-slab = "iosevka-term-lig-slab" -09-iosevka-crisp = "iosevka-crisp" -10-iosevka-term-crisp = "iosevka-term-crisp" -11-iosevka-type-crisp = "iosevka-type-crisp" -12-iosevka-term-lig-crisp = "iosevka-term-lig-crisp" -13-iosevka-crisp-slab = "iosevka-crisp-slab" -14-iosevka-term-crisp-slab = "iosevka-term-crisp-slab" -15-iosevka-type-crisp-slab = "iosevka-type-crisp-slab" -16-iosevka-term-lig-crisp-slab = "iosevka-term-lig-crisp-slab" +09-iosevka-curly = "iosevka-curly" +10-iosevka-term-curly = "iosevka-term-curly" +11-iosevka-type-curly = "iosevka-type-curly" +12-iosevka-term-lig-curly = "iosevka-term-lig-curly" +13-iosevka-curly-slab = "iosevka-curly-slab" +14-iosevka-term-curly-slab = "iosevka-term-curly-slab" +15-iosevka-type-curly-slab = "iosevka-type-curly-slab" +16-iosevka-term-lig-curly-slab = "iosevka-term-lig-curly-slab" # "CC" variants (deprecated -- will be removed in next release) iosevka-cc-DEPRECATED = "iosevka-cc" iosevka-cc-slab-DEPRECATED = "iosevka-cc-slab" -iosevka-cc-crisp-DEPRECATED = "iosevka-cc-crisp" -iosevka-cc-slab-crisp-DEPRECATED = "iosevka-cc-slab-crisp" +iosevka-cc-curly-DEPRECATED = "iosevka-cc-curly" +iosevka-cc-slab-curly-DEPRECATED = "iosevka-cc-slab-curly" # Style set variants iosevka-ss01 = "iosevka-ss01" @@ -267,10 +266,10 @@ from = [ "iosevka-term", "iosevka-type", "iosevka-term-lig", - "iosevka-crisp", - "iosevka-term-crisp", - "iosevka-type-crisp", - "iosevka-term-lig-crisp" + "iosevka-curly", + "iosevka-term-curly", + "iosevka-type-curly", + "iosevka-term-lig-curly" ] [collectPlans.iosevka-slab] @@ -279,10 +278,10 @@ from = [ "iosevka-term-slab", "iosevka-type-slab", "iosevka-term-lig-slab", - "iosevka-crisp-slab", - "iosevka-term-crisp-slab", - "iosevka-type-crisp-slab", - "iosevka-term-lig-crisp-slab" + "iosevka-curly-slab", + "iosevka-term-curly-slab", + "iosevka-type-curly-slab", + "iosevka-term-lig-curly-slab" ] # Weight mappings (style => shape weight, CSS weight) diff --git a/package.json b/package.json index 940bf9e9d..9ed41eeb9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iosevka", - "version": "2.3.2", + "version": "3.0.0-alpha.0", "main": "./generate.js", "engines": { "node": ">=8.4.0" diff --git a/parameters.toml b/parameters.toml index 14d9ac8d0..b227183b6 100644 --- a/parameters.toml +++ b/parameters.toml @@ -98,6 +98,9 @@ enableLigation = true # Excluded code points excludedCodePointRanges = [] +# Bar shape +straightBar = 1 + [verbose] verbose = true @@ -268,10 +271,8 @@ inherits = ['wd-condensed'] [menu-subfamily-condensed] menuWidth = 3 -# EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL -# Diversity: Having more width variations -[shape-straight-bar] -straightBar = 1 +[shape-curly-bar] +straightBar = 0 [diversity-1] diversityM = 1.25