diff --git a/README.md b/README.md index 2a3d94e75..44065c047 100644 --- a/README.md +++ b/README.md @@ -195,7 +195,7 @@ Since version 2.0, Iosevka would no longer support building via `makefile`. To i - + 3. Run `npm run build -- contents::` and the built fonts would be avaliable in `dist/`. Aside from `contents::`, other options are: @@ -314,11 +314,6 @@ The current available styles for `design`/`upright`/`italic`/`oblique` options a * Styles for `a`: * `v-a-doublestorey`, `cv01`: Double-storey `a` (default for Upright). * `v-a-singlestorey`, `cv02`: Single-storey `a` (default for Italic). - * Styles for `f`: - * `v-f-straight`, `cv52`: `f` without bottom hook (default for Sans Upright). - * `v-f-tailed`, `cv53`: `f` with a leftward bottom hook (default for Italic). - * `v-f-serifed`, `cv84`: `f` with bottom serif (default for Slab Upright). - * `v-f-straight-tailed`, `VXAD`: `f` with straight tail. * Styles for `b`: * `v-b-toothed`, `VXBK`: `b` with bottom-left tooth (default). * `v-b-toothless-corner`, `VXBL`: `b` without botton-left tooth, with a corner transition. @@ -328,6 +323,11 @@ The current available styles for `design`/`upright`/`italic`/`oblique` options a * `v-d-toothless-corner`, `VXBO`: `d` without botton-right tooth, with a corner transition. * `v-d-toothless-rounded`, `VXBP`: `d` without botton-right tooth, with a rounded transition. * `v-d-tailed`, `VXBQ`: `d` with a slightly tail botton-right tail. + * Styles for `f`: + * `v-f-straight`, `cv52`: `f` without bottom hook (default for Sans Upright). + * `v-f-tailed`, `cv53`: `f` with a leftward bottom hook (default for Italic). + * `v-f-serifed`, `cv84`: `f` with bottom serif (default for Slab Upright). + * `v-f-straight-tailed`, `VXAD`: `f` with straight tail. * Styles for `g`: * `v-g-doublestorey`, `cv11`: Double-storey `g`. * `v-g-singlestorey`, `cv12`: Single-storey `g` (default). diff --git a/images/charvars.png b/images/charvars.png index aed19f50c..7cd4166bf 100644 Binary files a/images/charvars.png and b/images/charvars.png differ diff --git a/images/iosevka-aile.png b/images/iosevka-aile.png index 3b2de8109..d91b54eb3 100644 Binary files a/images/iosevka-aile.png and b/images/iosevka-aile.png differ diff --git a/images/iosevka-curly-slab.png b/images/iosevka-curly-slab.png index e3ba6f68f..ac656d7c8 100644 Binary files a/images/iosevka-curly-slab.png and b/images/iosevka-curly-slab.png differ diff --git a/images/iosevka-curly.png b/images/iosevka-curly.png index d0d1d586b..d269d3205 100644 Binary files a/images/iosevka-curly.png and b/images/iosevka-curly.png differ diff --git a/images/iosevka-etoile.png b/images/iosevka-etoile.png index aa9d80c5c..3b4968ba1 100644 Binary files a/images/iosevka-etoile.png and b/images/iosevka-etoile.png differ diff --git a/images/iosevka-fixed-curly-slab.png b/images/iosevka-fixed-curly-slab.png index 230eb3674..349fd7564 100644 Binary files a/images/iosevka-fixed-curly-slab.png and b/images/iosevka-fixed-curly-slab.png differ diff --git a/images/iosevka-fixed-curly.png b/images/iosevka-fixed-curly.png index f109ff2b2..19ba4d78e 100644 Binary files a/images/iosevka-fixed-curly.png and b/images/iosevka-fixed-curly.png differ diff --git a/images/iosevka-fixed-slab.png b/images/iosevka-fixed-slab.png index 34b137ae1..2ac329979 100644 Binary files a/images/iosevka-fixed-slab.png and b/images/iosevka-fixed-slab.png differ diff --git a/images/iosevka-fixed-ss01.png b/images/iosevka-fixed-ss01.png index 85b237b24..ab9d63e3e 100644 Binary files a/images/iosevka-fixed-ss01.png and b/images/iosevka-fixed-ss01.png differ diff --git a/images/iosevka-fixed-ss02.png b/images/iosevka-fixed-ss02.png index e4bd9a940..dc47f0a01 100644 Binary files a/images/iosevka-fixed-ss02.png and b/images/iosevka-fixed-ss02.png differ diff --git a/images/iosevka-fixed-ss03.png b/images/iosevka-fixed-ss03.png index 81d06ac4b..6c07502e0 100644 Binary files a/images/iosevka-fixed-ss03.png and b/images/iosevka-fixed-ss03.png differ diff --git a/images/iosevka-fixed-ss04.png b/images/iosevka-fixed-ss04.png index 13934108c..d02cc26c4 100644 Binary files a/images/iosevka-fixed-ss04.png and b/images/iosevka-fixed-ss04.png differ diff --git a/images/iosevka-fixed-ss05.png b/images/iosevka-fixed-ss05.png index 0be66dab4..968355356 100644 Binary files a/images/iosevka-fixed-ss05.png and b/images/iosevka-fixed-ss05.png differ diff --git a/images/iosevka-fixed-ss06.png b/images/iosevka-fixed-ss06.png index b87c80154..e381c9025 100644 Binary files a/images/iosevka-fixed-ss06.png and b/images/iosevka-fixed-ss06.png differ diff --git a/images/iosevka-fixed-ss07.png b/images/iosevka-fixed-ss07.png index 1da0b9584..29e86c1c5 100644 Binary files a/images/iosevka-fixed-ss07.png and b/images/iosevka-fixed-ss07.png differ diff --git a/images/iosevka-fixed-ss08.png b/images/iosevka-fixed-ss08.png index 32ec5b708..770e3b120 100644 Binary files a/images/iosevka-fixed-ss08.png and b/images/iosevka-fixed-ss08.png differ diff --git a/images/iosevka-fixed-ss09.png b/images/iosevka-fixed-ss09.png index af878b55d..6311868e4 100644 Binary files a/images/iosevka-fixed-ss09.png and b/images/iosevka-fixed-ss09.png differ diff --git a/images/iosevka-fixed-ss10.png b/images/iosevka-fixed-ss10.png index fedc4946d..d16f64d7d 100644 Binary files a/images/iosevka-fixed-ss10.png and b/images/iosevka-fixed-ss10.png differ diff --git a/images/iosevka-fixed-ss11.png b/images/iosevka-fixed-ss11.png index 34dab3b94..ba2348ac1 100644 Binary files a/images/iosevka-fixed-ss11.png and b/images/iosevka-fixed-ss11.png differ diff --git a/images/iosevka-fixed-ss12.png b/images/iosevka-fixed-ss12.png index 4c14a5ab9..a52bb3a3a 100644 Binary files a/images/iosevka-fixed-ss12.png and b/images/iosevka-fixed-ss12.png differ diff --git a/images/iosevka-fixed-ss13.png b/images/iosevka-fixed-ss13.png index b3f91259f..928b5126a 100644 Binary files a/images/iosevka-fixed-ss13.png and b/images/iosevka-fixed-ss13.png differ diff --git a/images/iosevka-fixed-ss14.png b/images/iosevka-fixed-ss14.png index 600d47987..212acc185 100644 Binary files a/images/iosevka-fixed-ss14.png and b/images/iosevka-fixed-ss14.png differ diff --git a/images/iosevka-fixed.png b/images/iosevka-fixed.png index ef046e7d9..df3cf6377 100644 Binary files a/images/iosevka-fixed.png and b/images/iosevka-fixed.png differ diff --git a/images/iosevka-slab.png b/images/iosevka-slab.png index 476b8b7fd..a8dc150fc 100644 Binary files a/images/iosevka-slab.png and b/images/iosevka-slab.png differ diff --git a/images/iosevka-sparkle.png b/images/iosevka-sparkle.png index 284a35360..01df94e7a 100644 Binary files a/images/iosevka-sparkle.png and b/images/iosevka-sparkle.png differ diff --git a/images/iosevka-ss01.png b/images/iosevka-ss01.png index 47c4c5455..cae7f74a7 100644 Binary files a/images/iosevka-ss01.png and b/images/iosevka-ss01.png differ diff --git a/images/iosevka-ss02.png b/images/iosevka-ss02.png index bf6c97693..8c3de0b3a 100644 Binary files a/images/iosevka-ss02.png and b/images/iosevka-ss02.png differ diff --git a/images/iosevka-ss03.png b/images/iosevka-ss03.png index 68436b606..3547cd16a 100644 Binary files a/images/iosevka-ss03.png and b/images/iosevka-ss03.png differ diff --git a/images/iosevka-ss04.png b/images/iosevka-ss04.png index ebd873fbc..9d47d79bd 100644 Binary files a/images/iosevka-ss04.png and b/images/iosevka-ss04.png differ diff --git a/images/iosevka-ss05.png b/images/iosevka-ss05.png index cca3468af..d9c2aaf24 100644 Binary files a/images/iosevka-ss05.png and b/images/iosevka-ss05.png differ diff --git a/images/iosevka-ss06.png b/images/iosevka-ss06.png index d71aaa96b..1f04421b3 100644 Binary files a/images/iosevka-ss06.png and b/images/iosevka-ss06.png differ diff --git a/images/iosevka-ss07.png b/images/iosevka-ss07.png index 2902b8ae6..57b080e7c 100644 Binary files a/images/iosevka-ss07.png and b/images/iosevka-ss07.png differ diff --git a/images/iosevka-ss08.png b/images/iosevka-ss08.png index a13487cdc..a49af8362 100644 Binary files a/images/iosevka-ss08.png and b/images/iosevka-ss08.png differ diff --git a/images/iosevka-ss09.png b/images/iosevka-ss09.png index 4f74240db..690f07f46 100644 Binary files a/images/iosevka-ss09.png and b/images/iosevka-ss09.png differ diff --git a/images/iosevka-ss10.png b/images/iosevka-ss10.png index f6fcb3cbf..24acf45b1 100644 Binary files a/images/iosevka-ss10.png and b/images/iosevka-ss10.png differ diff --git a/images/iosevka-ss11.png b/images/iosevka-ss11.png index 11e5659a4..1d21f6d24 100644 Binary files a/images/iosevka-ss11.png and b/images/iosevka-ss11.png differ diff --git a/images/iosevka-ss12.png b/images/iosevka-ss12.png index c192d0e79..960a63d86 100644 Binary files a/images/iosevka-ss12.png and b/images/iosevka-ss12.png differ diff --git a/images/iosevka-ss13.png b/images/iosevka-ss13.png index 3405ec073..1bdad4fd1 100644 Binary files a/images/iosevka-ss13.png and b/images/iosevka-ss13.png differ diff --git a/images/iosevka-ss14.png b/images/iosevka-ss14.png index bfe82ec7c..e8e6104a0 100644 Binary files a/images/iosevka-ss14.png and b/images/iosevka-ss14.png differ diff --git a/images/iosevka-term-curly-slab.png b/images/iosevka-term-curly-slab.png index 0270608a9..0a51c42bc 100644 Binary files a/images/iosevka-term-curly-slab.png and b/images/iosevka-term-curly-slab.png differ diff --git a/images/iosevka-term-curly.png b/images/iosevka-term-curly.png index 0a5df17e4..f88268334 100644 Binary files a/images/iosevka-term-curly.png and b/images/iosevka-term-curly.png differ diff --git a/images/iosevka-term-slab.png b/images/iosevka-term-slab.png index 79227a83a..c3023e96d 100644 Binary files a/images/iosevka-term-slab.png and b/images/iosevka-term-slab.png differ diff --git a/images/iosevka-term-ss01.png b/images/iosevka-term-ss01.png index 373a3ed2d..e1250d36c 100644 Binary files a/images/iosevka-term-ss01.png and b/images/iosevka-term-ss01.png differ diff --git a/images/iosevka-term-ss02.png b/images/iosevka-term-ss02.png index acd99c0e5..12c78a111 100644 Binary files a/images/iosevka-term-ss02.png and b/images/iosevka-term-ss02.png differ diff --git a/images/iosevka-term-ss03.png b/images/iosevka-term-ss03.png index 0053f9a96..8df94e5db 100644 Binary files a/images/iosevka-term-ss03.png and b/images/iosevka-term-ss03.png differ diff --git a/images/iosevka-term-ss04.png b/images/iosevka-term-ss04.png index bd5c4ff69..e1320a429 100644 Binary files a/images/iosevka-term-ss04.png and b/images/iosevka-term-ss04.png differ diff --git a/images/iosevka-term-ss05.png b/images/iosevka-term-ss05.png index d717ed752..f366d4068 100644 Binary files a/images/iosevka-term-ss05.png and b/images/iosevka-term-ss05.png differ diff --git a/images/iosevka-term-ss06.png b/images/iosevka-term-ss06.png index 1be6c39b3..e8094e0d1 100644 Binary files a/images/iosevka-term-ss06.png and b/images/iosevka-term-ss06.png differ diff --git a/images/iosevka-term-ss07.png b/images/iosevka-term-ss07.png index 8cf33b812..0b4a91c56 100644 Binary files a/images/iosevka-term-ss07.png and b/images/iosevka-term-ss07.png differ diff --git a/images/iosevka-term-ss08.png b/images/iosevka-term-ss08.png index 5cf343c2d..d176d2a45 100644 Binary files a/images/iosevka-term-ss08.png and b/images/iosevka-term-ss08.png differ diff --git a/images/iosevka-term-ss09.png b/images/iosevka-term-ss09.png index 200344dd6..c8b101d25 100644 Binary files a/images/iosevka-term-ss09.png and b/images/iosevka-term-ss09.png differ diff --git a/images/iosevka-term-ss10.png b/images/iosevka-term-ss10.png index de62f1e92..d508aa315 100644 Binary files a/images/iosevka-term-ss10.png and b/images/iosevka-term-ss10.png differ diff --git a/images/iosevka-term-ss11.png b/images/iosevka-term-ss11.png index 3a38333b2..b2cce4ba1 100644 Binary files a/images/iosevka-term-ss11.png and b/images/iosevka-term-ss11.png differ diff --git a/images/iosevka-term-ss12.png b/images/iosevka-term-ss12.png index 1c5530b46..ee8d1912f 100644 Binary files a/images/iosevka-term-ss12.png and b/images/iosevka-term-ss12.png differ diff --git a/images/iosevka-term-ss13.png b/images/iosevka-term-ss13.png index 3391273a8..f57c41c96 100644 Binary files a/images/iosevka-term-ss13.png and b/images/iosevka-term-ss13.png differ diff --git a/images/iosevka-term-ss14.png b/images/iosevka-term-ss14.png index 29b325572..88a049d76 100644 Binary files a/images/iosevka-term-ss14.png and b/images/iosevka-term-ss14.png differ diff --git a/images/iosevka-term.png b/images/iosevka-term.png index 9dfce34a3..30f516c34 100644 Binary files a/images/iosevka-term.png and b/images/iosevka-term.png differ diff --git a/images/iosevka.png b/images/iosevka.png index 2b0af3e87..1bacd460c 100644 Binary files a/images/iosevka.png and b/images/iosevka.png differ diff --git a/images/languages.png b/images/languages.png index a2df6774d..89d227ae7 100644 Binary files a/images/languages.png and b/images/languages.png differ diff --git a/images/ligations.png b/images/ligations.png index 52d3400a4..aa52b93c3 100644 Binary files a/images/ligations.png and b/images/ligations.png differ diff --git a/images/matrix.png b/images/matrix.png index 13c57c7c7..f0f001fcd 100644 Binary files a/images/matrix.png and b/images/matrix.png differ diff --git a/images/preview-all.png b/images/preview-all.png index 996b17739..b385a93f8 100644 Binary files a/images/preview-all.png and b/images/preview-all.png differ diff --git a/images/stylesets.png b/images/stylesets.png index 7ed1fe631..17e81aebf 100644 Binary files a/images/stylesets.png and b/images/stylesets.png differ diff --git a/images/weights.png b/images/weights.png index cafbe285e..85b647ad4 100644 Binary files a/images/weights.png and b/images/weights.png differ diff --git a/snapshot/index.html b/snapshot/index.html index d591629eb..e16ee778a 100644 --- a/snapshot/index.html +++ b/snapshot/index.html @@ -84,29 +84,6 @@
a
-
  • -
    -
    f
    -
    ▶
    -
    -
      -
    1. -
      cv52
      -
      f
      -
      2. -
    2. -
      cv53
      -
      f
      -
      3. -
    3. -
      cv84
      -
      f
      -
      4. -
    4. -
      VXAD
      -
      f
      -
      5. -
  • b
    @@ -149,6 +126,29 @@
    d
    • +
  • +
    +
    f
    +
    ▶
    +
    +
      +
    1. +
      cv52
      +
      f
      +
      2. +
    2. +
      cv53
      +
      f
      +
      3. +
    3. +
      cv84
      +
      f
      +
      4. +
    4. +
      VXAD
      +
      f
      +
      5. +
  • g
    diff --git a/utility/export-data/parse-variants-data.js b/utility/export-data/parse-variants-data.js index e59843e13..041fbe361 100644 --- a/utility/export-data/parse-variants-data.js +++ b/utility/export-data/parse-variants-data.js @@ -54,7 +54,7 @@ function getCvData(variants) { }); gr.rank = rankOf(gr.descSampleText[0][0]); } - return [...samplerGroups.values()].sort((a, b) => b.rank - a.rank); + return [...samplerGroups.values()].sort(compareSamplerGr); } function rankOf(initialChar) { @@ -63,6 +63,14 @@ function rankOf(initialChar) { if ("0" <= initialChar && initialChar <= "9") return 1; return 0; } +function compareSamplerGr(a, b) { + if (b.rank !== a.rank) return b.rank - a.rank; + if (a.rank) { + if (a.descSampleText[0][0] < b.descSampleText[0][0]) return -1; + if (a.descSampleText[0][0] > b.descSampleText[0][0]) return +1; + } + return 0; +} function getSsData(variants, cvData) { const result = [