diff --git a/makefile b/makefile index fbf067cd4..67c7c290f 100644 --- a/makefile +++ b/makefile @@ -30,7 +30,7 @@ fw : $(BUILD)/targets.mk scripts : @$(MAKE) -f utility/scripts.mk scripts -sample-images : +sample-images : $(BUILD)/targets.mk @$(MAKE) -f utility/standard.mk sample-images # Custom diff --git a/maker.js b/maker.js index 12dee8b0a..81aa2021b 100644 --- a/maker.js +++ b/maker.js @@ -9,6 +9,7 @@ const possibleWeights = new Set([ "light", "book", "medium", + "semibold", "bold", "extrabold", "heavy" diff --git a/parameters.toml b/parameters.toml index 3cceada69..c7f333790 100644 --- a/parameters.toml +++ b/parameters.toml @@ -85,17 +85,6 @@ noCJKV = true verbose = true ### Weights - -[w-book] -isBold = false -weight = 400 # "Weight" metadata. -style = '' - -sb = 60 # Side bearing. -stroke = 72 # Stroke width of horizontal strokes. -dotsize = 125 # "Visual" size of dots in /i. -periodsize = 140 # "Visual" size of period. - [w-thin] weight = 100 style = 'Thin' @@ -137,12 +126,32 @@ periodsize = 115 vtipfine = 0.9 pbarpos = 0.51 +[w-book] +isBold = false +weight = 400 # "Weight" metadata. +style = '' + +sb = 60 # Side bearing. +stroke = 72 # Stroke width of horizontal strokes. +dotsize = 125 # "Visual" size of dots in /i. +periodsize = 140 # "Visual" size of period. + [w-medium] weight = 500 style = 'Medium' +sb = 57 +stroke = 81 +dotsize = 133 +periodsize = 158 +smooth = 200 + +[w-semibold] +weight = 600 +style = 'Semibold' + sb = 54 -stroke = 90 +stroke = 92 dotsize = 140 periodsize = 165 essx = 1.07 diff --git a/snapshot/index.html b/snapshot/index.html index ae6f371c1..81d61e90a 100644 --- a/snapshot/index.html +++ b/snapshot/index.html @@ -16,8 +16,12 @@ RegularSlabItalicSlab ItalicObliqueSlab Oblique
MediumSlab MediumMedium ItalicSlab Medium ItalicMedium ObliqueSlab Medium Oblique +
+ SemiboldSlab SemiboldSemibold ItalicSlab Semibold ItalicSemibold ObliqueSlab Semibold Oblique
BoldSlab BoldBold ItalicSlab Bold ItalicBold ObliqueSlab Bold Oblique +
+ ExtraboldSlab ExtraboldExtrabold ItalicSlab Extrabold ItalicExtrabold ObliqueSlab Extrabold Oblique
HeavySlab HeavyHeavy ItalicSlab Heavy ItalicHeavy ObliqueSlab Heavy Oblique
@@ -232,14 +236,14 @@
- MagMagMagMagMagMagMagMag - MagMagMagMagMagMagMagMag - MagMagMagMagMagMagMagMag + MagMagMagMagMagMagMagMagMag + MagMagMagMagMagMagMagMagMag + MagMagMagMagMagMagMagMagMag
- MagMagMagMagMagMagMagMag - MagMagMagMagMagMagMagMag - MagMagMagMagMagMagMagMag + MagMagMagMagMagMagMagMagMag + MagMagMagMagMagMagMagMagMag + MagMagMagMagMagMagMagMagMag
@@ -305,6 +309,7 @@ float Fox.quick(h){ is_brown && it_jumps_over(doges.lazy); } float Fox.quick(h){ is_brown && it_jumps_over(doges.lazy); } float Fox.quick(h){ is_brown && it_jumps_over(doges.lazy); } +float Fox.quick(h){ is_brown && it_jumps_over(doges.lazy); } float Fox.quick(h){ is_brown && it_jumps_over(doges.lazy); } float Fox.quick(h){ is_brown && it_jumps_over(doges.lazy); } float Fox.quick(h){ is_brown && it_jumps_over(doges.lazy); } diff --git a/snapshot/index.styl b/snapshot/index.styl index f1732294a..4e6326420 100644 --- a/snapshot/index.styl +++ b/snapshot/index.styl @@ -5,6 +5,7 @@ .extralight { font-weight: 200 } .light { font-weight: 300 } .medium { font-weight: 500 } +.semibold { font-weight: 600 } .bold { font-weight: 700 } .extrabold { font-weight: 800 } .heavy { font-weight: 900 } @@ -95,7 +96,7 @@ section#matrix position: absolute font-size: 90px left: 50% - margin-left: -3.75em + margin-left: -4.75em top: 50% margin-top: -1.95em > row @@ -106,7 +107,7 @@ section#matrix font-size: 0.4em padding: 0 0.5em &.slab - margin-left: -3.25em + margin-left: -4.25em margin-top: -1.44em section#matrix > div > row > span { diff --git a/snapshot/iosevka-slab.css b/snapshot/iosevka-slab.css index a54fb9c52..bab9938e7 100644 --- a/snapshot/iosevka-slab.css +++ b/snapshot/iosevka-slab.css @@ -80,6 +80,23 @@ font-weight: 500; src: url('assets/iosevka-slab-mediumoblique.woff2') format('woff2'), url('assets/iosevka-slab-mediumoblique.woff') format('woff'), url('assets/iosevka-slab-mediumoblique.ttf') format('truetype'); } +@font-face { + font-family: 'Iosevka Slab'; + font-weight: 600; + src: url('assets/iosevka-slab-semibold.woff2') format('woff2'), url('assets/iosevka-slab-semibold.woff') format('woff'), url('assets/iosevka-slab-semibold.ttf') format('truetype'); +} +@font-face { + font-family: 'Iosevka Slab'; + font-style: italic; + font-weight: 600; + src: url('assets/iosevka-slab-semibolditalic.woff2') format('woff2'), url('assets/iosevka-slab-semibolditalic.woff') format('woff'), url('assets/iosevka-slab-semibolditalic.ttf') format('truetype'); +} +@font-face { + font-family: 'Iosevka Slab'; + font-style: oblique; + font-weight: 600; + src: url('assets/iosevka-slab-semiboldoblique.woff2') format('woff2'), url('assets/iosevka-slab-semiboldoblique.woff') format('woff'), url('assets/iosevka-slab-semiboldoblique.ttf') format('truetype'); +} @font-face { font-family: 'Iosevka Slab'; font-weight: 700; diff --git a/snapshot/iosevka.css b/snapshot/iosevka.css index 982bebe79..3b82d633c 100644 --- a/snapshot/iosevka.css +++ b/snapshot/iosevka.css @@ -80,6 +80,23 @@ font-weight: 500; src: url('assets/iosevka-mediumoblique.woff2') format('woff2'), url('assets/iosevka-mediumoblique.woff') format('woff'), url('assets/iosevka-mediumoblique.ttf') format('truetype'); } +@font-face { + font-family: 'Iosevka'; + font-weight: 600; + src: url('assets/iosevka-semibold.woff2') format('woff2'), url('assets/iosevka-semibold.woff') format('woff'), url('assets/iosevka-semibold.ttf') format('truetype'); +} +@font-face { + font-family: 'Iosevka'; + font-style: italic; + font-weight: 600; + src: url('assets/iosevka-semibolditalic.woff2') format('woff2'), url('assets/iosevka-semibolditalic.woff') format('woff'), url('assets/iosevka-semibolditalic.ttf') format('truetype'); +} +@font-face { + font-family: 'Iosevka'; + font-style: oblique; + font-weight: 600; + src: url('assets/iosevka-semiboldoblique.woff2') format('woff2'), url('assets/iosevka-semiboldoblique.woff') format('woff'), url('assets/iosevka-semiboldoblique.ttf') format('truetype'); +} @font-face { font-family: 'Iosevka'; font-weight: 700; diff --git a/verdafile.js b/verdafile.js index 319926130..2b4e01e8e 100644 --- a/verdafile.js +++ b/verdafile.js @@ -13,7 +13,17 @@ want(...argv._); const PATEL_C = ["node", "./node_modules/patel/bin/patel-c"]; const GENERATE = ["node", "--expose-gc", "generator"]; -const WEIGHTS = ["thin", "extralight", "light", "book", "medium", "bold", "extrabold", "heavy"]; +const WEIGHTS = [ + "thin", + "extralight", + "light", + "book", + "medium", + "semibold", + "bold", + "extrabold", + "heavy" +]; const SLANTS = ["upright", "italic", "oblique"]; const weightSlantMap = (function() {