diff --git a/README.md b/README.md index ff47f2552..19b395c70 100644 --- a/README.md +++ b/README.md @@ -189,7 +189,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: @@ -320,10 +320,15 @@ The current available styles for `design`/`upright`/`italic`/`oblique` options a * `v-i-zshaped`, `cv06`: Z-shaped `i`. * `v-i-line`, `cv56`: `i` like a straight line. * `v-i-tailed`, `cv88`: Tailed `i`. + * `v-i-hookybottom`, `CVAA`: `i` with a straight tail. * Styles for `j`: * `v-j-line`, `cv57`: `j` like a straight line. * `v-j-serifed`, `cv58`: `j` with top serif (default). * `v-j-straight`, `cv98`: `j` without serif. + * Styles for `k`, `K`: + * `v-k-straight`, `cv68`: `k` with standard shape (default for Upright). + * `v-k-curly`, `cv69`: Slightly curly `k`, like Iosevka 2.x. + * `v-k-cursive`, `cv70`: `k` with a cursive loop (default for Italic). * Styles for `l`: * `v-l-serifed`, `cv07`: Serifed `l` (default for Upright). * `v-l-italic`, `cv08`: Italic, cursive `l` (default for Italic). @@ -332,10 +337,6 @@ The current available styles for `design`/`upright`/`italic`/`oblique` options a * `v-l-tailed`, `cv27`: `l` with a curved tail. * `v-l-hookybottom`, `cv28`: `l` with a straight tail. * `v-l-line`, `cv59`: `l` like a straight line. - * Styles for `k`, `K`: - * `v-k-straight`, `cv68`: `k` with standard shape (default for Upright). - * `v-k-curly`, `cv69`: Slightly curly `k`, like Iosevka 2.x. - * `v-k-cursive`, `cv70`: `k` with a cursive loop (default for Italic). * Styles for `m`: * `v-m-normal`, `cv25`: `m` with normal middle leg, touching the baseline (default). * `v-m-shortleg`, `cv26`: `m` with shorter middle leg, like Ubuntu Mono. @@ -409,8 +410,9 @@ The current available styles for `design`/`upright`/`italic`/`oblique` options a * `v-asterisk-hexhigh`, `cv60`: Higher six-pointed asterisk `*`. * `v-asterisk-hexlow`, `cv61`: Lower six-pointed asterisk `*`. * Styles for `_`: - * `v-underscore-high`, `cv20`: Higher underscore `_`, at baseline (default). - * `v-underscore-low`, `cv21`: Lower underscore `_`, below baseline. + * `v-underscore-high`, `cv20`: Higher underscore `_`, placed right below baseline (default). + * `v-underscore-low`, `cv21`: Lower underscore `_`, placed right above descender line. + * `v-underscore-above-baseline`, `cv99`: Extra-high `_`, placed right below baseline. * Styles for `¶`: * `v-paragraph-high`, `cv22`: Higher paragraph symbol `¶` (default). * `v-paragraph-low`, `cv23`: Lower paragraph symbol `¶`. diff --git a/changes/3.1.0.md b/changes/3.1.0.md index bd9bc1f1f..ab4f4327e 100644 --- a/changes/3.1.0.md +++ b/changes/3.1.0.md @@ -4,4 +4,6 @@ * Add support for WHITE SUN WITH RAYS (U+263C, ☼, #521). * Add preview image building in release notes. * Added `v-underscore-above-baseline` (`cv99`) and redefined the `v-underscore-high` to the right-below-baseline variant (#515). - * Match styles of `1` and `7` in `ss##` variants (#539). \ No newline at end of file + * Match styles of `1` and `7` in `ss##` variants (#539). + * Refine the width of `A` and `V`. + * Changed the layout of character variants sample image for better clarity. \ No newline at end of file diff --git a/glyphs/letters-unified-basic.ptl b/glyphs/letters-unified-basic.ptl index 80464f276..40b945860 100644 --- a/glyphs/letters-unified-basic.ptl +++ b/glyphs/letters-unified-basic.ptl @@ -187,10 +187,18 @@ glyph-block LetterUnified-Basic : begin sketch # dotlessi.tailed local df : DivFrame para.diversityI set-width df.width - include df.markSet.b + include df.markSet.e include : TailedIShape df XH save 'dotlessi.tailed' + sketch # dotlessi.tailed + local df : DivFrame para.diversityI + set-width df.width + include df.markSet.e + include : VBar (df.middle) 0 XH + include : RightwardBottomSerif df.middle 0 (LONGJUT * df.div) + save 'dotlessi.hookybottom' + select-variant 'dotlessi' 0x131 sketch # iogonek.dotless include [refer-glyph 'dotlessi'] AS_BASE @@ -636,17 +644,18 @@ glyph-block LetterUnified-Basic : begin define VShapeMiddleWidth : adviceBlackness 3 define pInktrap 0.5 + define StraightSbShrink : mix 1 designParameters.straightVShapeSbShrink : if SLAB 0.75 1 + define [VShapeOutline] : params [top [sw STROKE] barStraight div] : glyph-construction local df : DivFrame div local fine : [if barStraight VShapeFineStraight VShapeFine] * sw / STROKE - local sbCor : (CAP / top) * OX local dgCor : diagCor top (WIDTH / 2) 0 (sw * 2) local clearance : 0 - OX if barStraight : begin - local vxStartL : df.leftSB + sbCor + clearance + local vxStartL : df.leftSB * StraightSbShrink + clearance local vxEndL : df.middle - cornerdist + clearance - local vxStartR : df.rightSB - sbCor - clearance + local vxStartR : df.width - df.leftSB * StraightSbShrink - clearance local vxEndR : df.middle + cornerdist - clearance include : spiro-outline flat [mix vxStartL vxEndL 0] [mix top 0 0] @@ -658,7 +667,7 @@ glyph-block LetterUnified-Basic : begin : else : begin local vxStartL : df.leftSB + clearance local vxEndL : df.middle - cornerdist + clearance - local vxStartR : df.rightSB - clearance + local vxStartR : df.width - df.leftSB - clearance local vxEndR : df.middle + cornerdist - clearance include : spiro-outline flat vxStartL top @@ -673,12 +682,11 @@ glyph-block LetterUnified-Basic : begin define [VShape] : params [top [sw STROKE] barStraight div] : glyph-construction local df : DivFrame div local fine : Math.min sw : if barStraight VShapeFineStraight VShapeFine - local sbCor : (CAP / top) * OX local dgCor : diagCor (2 * top) WIDTH 0 (2 * sw) if barStraight : begin - local vxStartL : SB + sbCor + local vxStartL : df.leftSB * StraightSbShrink local vxEndL : df.middle - cornerdist - local vxStartR : df.rightSB - sbCor + local vxStartR : df.width - df.leftSB * StraightSbShrink local vxEndR : df.middle + cornerdist local midSW : VShapeMiddleWidth / STROKE * sw include : dispiro @@ -1363,9 +1371,7 @@ glyph-block LetterUnified-Basic : begin local dpy2 : (1 - [linreg (1 - px1) (1 - py1) px2 py2 1]) / (1 - py2) local yrstrokel0 : MIDDLE - WIDTH * 0.1 local yrstrokel : MIDDLE - WIDTH * 0.1 + (STROKE * HVCONTRAST * [if (useStraightBottom || useCurlyBottom) (2 / 3) (1 / 3)]) - local ySbCor : (XH / CAP) * (OX * [if slab 1 4]) - local sbScalar : if (straightBar && SLAB && !slab) 1.5 1 - local yrstroker : WIDTH - SB * sbScalar - [if straightBar ySbCor 0] + local yrstroker : WIDTH - SB * [if (straightBar && SLAB && !slab) 1.5 1] * [if (straightBar && !slab) designParameters.straightSmallYShapeSbShrink 1] local yshrink : [linreg 18 1 126 0.85 STROKE] * [if straightBar ([adviceBlackness 3.25] / STROKE) 1] local yBottomJut : JUT * 1.25 local slabysize : JUT * 1.0625 * (WIDTH / UPM) + STROKE diff --git a/images/charvars.png b/images/charvars.png index a72bfb879..0051c3f81 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 ef7f13a27..fa82ed567 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 ffacb3122..83beeb8ce 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 fc0760536..e534e7796 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 a1d2373aa..15bd59284 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 faf1a5183..c6d4aab08 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 aed042b5b..97710579f 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 d27654de0..ea078dd30 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 c1c21b20f..fa109edf8 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 a79f19e26..042ef4403 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 771216d3f..1684c7b08 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 4cb867553..820e95538 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 5eb905fbf..c69249982 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 f9369cf0f..c074db129 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 e63beacf9..5709939cb 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 bedd56082..eef566caa 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 87d341f89..fd5597bcc 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 a56eff4c4..c8a929e86 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 8d8e54b7b..0f111c977 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 f6a133ff5..4b18d2244 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 041c2a5d0..1dac89043 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 77fae60bd..6d24c223f 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 4791898a6..b7ec545e3 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 412c2172d..d35bb0642 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 5fc92da37..11a3dcfef 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 6b7647345..c977c3064 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 e14fdf0de..fd1ba3de2 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 74ed55875..83aa087f0 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 869482e68..657260725 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 b48d52e49..178a538b2 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 28d91b6a6..a3d9114cb 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 5209cb52c..02cea6908 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 bfe647ec9..8a7104186 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 034d10eb6..e09331411 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 e9ca84b26..eae68727c 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 ec3e8cd31..353d9267d 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 f7eed468c..d1a05c3de 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 52afe8e29..dcd8228af 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 268a09e70..d67fe67ab 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 0c9c5a7c4..9aaa291c4 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 630e50aba..8e290ba1e 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 d64bc65f8..77d37cca3 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 593e152cc..2c147645f 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 edeaefd61..05b482266 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 be5765d0a..274a3fcbb 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 06b811b2e..21d209aaa 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 45f938158..ecdc909a5 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 58f95647e..2e19fca3a 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 2b5eaf6a7..f7fb6b921 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 f649d6605..5396aa7f5 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 5550fd930..d3279e76e 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 547d4b8f8..4831b57ff 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 02f825811..2ac97529b 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 d30ff7cbd..544a48d96 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 46499640e..efd664f1d 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 ea46585bd..a4c025ae4 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 b267d6453..abf6b6b60 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 988cd1ba2..993059b0c 100644 Binary files a/images/iosevka.png and b/images/iosevka.png differ diff --git a/images/languages.png b/images/languages.png index 835a1183a..36c365980 100644 Binary files a/images/languages.png and b/images/languages.png differ diff --git a/images/ligations.png b/images/ligations.png index ff103d32b..20958f928 100644 Binary files a/images/ligations.png and b/images/ligations.png differ diff --git a/images/matrix.png b/images/matrix.png index e686c38cb..756e4fa22 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 4028f98fa..96d4633e9 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 6297ac621..7ad52c3fa 100644 Binary files a/images/stylesets.png and b/images/stylesets.png differ diff --git a/images/weights.png b/images/weights.png index 5afa5f2a0..02c8afade 100644 Binary files a/images/weights.png and b/images/weights.png differ diff --git a/meta/aesthetics.ptl b/meta/aesthetics.ptl index 9fd9e55bc..fdfcbaf5d 100644 --- a/meta/aesthetics.ptl +++ b/meta/aesthetics.ptl @@ -261,6 +261,10 @@ export : define [MarksetDiv p me] : begin if : buildStandardMarkSet markAboveCap markBelowLower markToprightCap markBottomrightLower export : define designParameters : object + # V shape + straightVShapeSbShrink 0.8 + straightSmallYShapeSbShrink 0.7 + # equal_wideness 0.075 logic_narrow_shrink 0.75 GeometricLargeX : lambda [mw uw] : (mw + uw / 2) / mw diff --git a/snapshot/index.html b/snapshot/index.html index ea140fce1..1fae12351 100644 --- a/snapshot/index.html +++ b/snapshot/index.html @@ -69,569 +69,676 @@
Character Variants
    -
    1. -
    2. - cv01 - a - a +
    3. +
      +
      a
      +
      +
      +
        +
      1. +
        cv01
        +
        a
      2. -
      3. - cv02 - a - a +
      4. +
        cv02
        +
        a
    4. -
      1. -
      2. - cv52 - f - f +
      3. +
        +
        f
        +
        +
        +
          +
        1. +
          cv52
          +
          f
        2. -
        3. - cv53 - f - f +
        4. +
          cv53
          +
          f
        5. -
        6. - cv84 - f - f +
        7. +
          cv84
          +
          f
      4. -
        1. -
        2. - cv11 - g - g +
        3. +
          +
          g
          +
          +
          +
            +
          1. +
            cv11
            +
            g
          2. -
          3. - cv12 - g - g +
          4. +
            cv12
            +
            g
          5. -
          6. - cv24 - g - g +
          7. +
            cv24
            +
            g
        4. -
          1. -
          2. - cv03 - i - i +
          3. +
            +
            i
            +
            +
            +
              +
            1. +
              cv03
              +
              i
            2. -
            3. - cv04 - i - i +
            4. +
              cv04
              +
              i
            5. -
            6. - cv05 - i - i +
            7. +
              cv05
              +
              i
            8. -
            9. - cv06 - i - i +
            10. +
              cv06
              +
              i
            11. -
            12. - cv56 - i - i +
            13. +
              cv56
              +
              i
            14. -
            15. - cv88 - i - i +
            16. +
              cv88
              +
              i
              +
            17. +
            18. +
              CVAA
              +
              i
          4. -
            1. -
            2. - cv57 - j - j +
            3. +
              +
              j
              +
              +
              +
                +
              1. +
                cv57
                +
                j
              2. -
              3. - cv58 - j - j +
              4. +
                cv58
                +
                j
              5. -
              6. - cv98 - j - j +
              7. +
                cv98
                +
                j
            4. -
              1. -
              2. - cv07 - l - l +
              3. +
                +
                k
                +
                +
                +
                  +
                1. +
                  cv68
                  +
                  k
                2. -
                3. - cv08 - l - l +
                4. +
                  cv69
                  +
                  k
                5. -
                6. - cv09 - l - l -
                7. -
                8. - cv10 - l - l -
                9. -
                10. - cv27 - l - l -
                11. -
                12. - cv28 - l - l -
                13. -
                14. - cv59 - l - l +
                15. +
                  cv70
                  +
                  k
              4. -
                1. -
                2. - cv68 - k - k +
                3. +
                  +
                  l
                  +
                  +
                  +
                    +
                  1. +
                    cv07
                    +
                    l
                  2. -
                  3. - cv69 - k - k +
                  4. +
                    cv08
                    +
                    l
                  5. -
                  6. - cv70 - k +
                  7. +
                    cv09
                    +
                    l
                    +
                  8. +
                  9. +
                    cv10
                    +
                    l
                    +
                  10. +
                  11. +
                    cv27
                    +
                    l
                    +
                  12. +
                  13. +
                    cv28
                    +
                    l
                    +
                  14. +
                  15. +
                    cv59
                    +
                    l
                4. -
                  1. -
                  2. - cv25 - m - m +
                  3. +
                    +
                    m
                    +
                    +
                    +
                      +
                    1. +
                      cv25
                      +
                      m
                    2. -
                    3. - cv26 - m - m +
                    4. +
                      cv26
                      +
                      m
                  4. -
                    1. -
                    2. - cv85 - r - r +
                    3. +
                      +
                      r
                      +
                      +
                      +
                        +
                      1. +
                        cv85
                        +
                        r
                      2. -
                      3. - cv86 - r - r +
                      4. +
                        cv86
                        +
                        r
                      5. -
                      6. - cv87 - r - r +
                      7. +
                        cv87
                        +
                        r
                    4. -
                      1. -
                      2. - cv40 - t - t +
                      3. +
                        +
                        t
                        +
                        +
                        +
                          +
                        1. +
                          cv40
                          +
                          t
                        2. -
                        3. - cv41 - t - t +
                        4. +
                          cv41
                          +
                          t
                      4. -
                        1. -
                        2. - cv89 - u - u +
                        3. +
                          +
                          u
                          +
                          +
                          +
                            +
                          1. +
                            cv89
                            +
                            u
                          2. -
                          3. - cv90 - u - u +
                          4. +
                            cv90
                            +
                            u
                        4. -
                          1. -
                          2. - cv71 - v - v +
                          3. +
                            +
                            v
                            +
                            +
                            +
                              +
                            1. +
                              cv71
                              +
                              v
                            2. -
                            3. - cv72 - v - v +
                            4. +
                              cv72
                              +
                              v
                          4. -
                            1. -
                            2. - cv75 - w - w +
                            3. +
                              +
                              w
                              +
                              +
                              +
                                +
                              1. +
                                cv75
                                +
                                w
                              2. -
                              3. - cv76 - w - w +
                              4. +
                                cv76
                                +
                                w
                            4. -
                              1. -
                              2. - cv77 - x - x +
                              3. +
                                +
                                x
                                +
                                +
                                +
                                  +
                                1. +
                                  cv77
                                  +
                                  x
                                2. -
                                3. - cv78 - x - x +
                                4. +
                                  cv78
                                  +
                                  x
                              4. -
                                1. -
                                2. - cv48 - y - y +
                                3. +
                                  +
                                  y
                                  +
                                  +
                                  +
                                    +
                                  1. +
                                    cv48
                                    +
                                    y
                                  2. -
                                  3. - cv49 - y - y +
                                  4. +
                                    cv49
                                    +
                                    y
                                  5. -
                                  6. - cv79 - y - y +
                                  7. +
                                    cv79
                                    +
                                    y
                                4. -
                                  1. -
                                  2. - cv73 - A - A +
                                  3. +
                                    +
                                    A
                                    +
                                    +
                                    +
                                      +
                                    1. +
                                      cv73
                                      +
                                      A
                                    2. -
                                    3. - cv74 - A - A +
                                    4. +
                                      cv74
                                      +
                                      A
                                  4. -
                                    1. -
                                    2. - cv91 - G - G +
                                    3. +
                                      +
                                      G
                                      +
                                      +
                                      +
                                        +
                                      1. +
                                        cv91
                                        +
                                        G
                                      2. -
                                      3. - cv92 - G - G +
                                      4. +
                                        cv92
                                        +
                                        G
                                    4. -
                                      1. -
                                      2. - cv42 - Q - Q +
                                      3. +
                                        +
                                        Q
                                        +
                                        +
                                        +
                                          +
                                        1. +
                                          cv42
                                          +
                                          Q
                                        2. -
                                        3. - cv43 - Q - Q +
                                        4. +
                                          cv43
                                          +
                                          Q
                                      4. -
                                        1. -
                                        2. - cv82 - R - R +
                                        3. +
                                          +
                                          R
                                          +
                                          +
                                          +
                                            +
                                          1. +
                                            cv82
                                            +
                                            R
                                          2. -
                                          3. - cv83 - R - R +
                                          4. +
                                            cv83
                                            +
                                            R
                                        4. -
                                          1. -
                                          2. - cv80 - Y - Y +
                                          3. +
                                            +
                                            Y
                                            +
                                            +
                                            +
                                              +
                                            1. +
                                              cv80
                                              +
                                              Y
                                            2. -
                                            3. - cv81 - Y - Y +
                                            4. +
                                              cv81
                                              +
                                              Y
                                          4. -
                                            1. -
                                            2. - cv13 - 0 - 0 +
                                            3. +
                                              +
                                              0
                                              +
                                              +
                                              +
                                                +
                                              1. +
                                                cv13
                                                +
                                                0
                                              2. -
                                              3. - cv14 - 0 - 0 +
                                              4. +
                                                cv14
                                                +
                                                0
                                              5. -
                                              6. - cv15 - 0 - 0 +
                                              7. +
                                                cv15
                                                +
                                                0
                                              8. -
                                              9. - cv93 - 0 - 0 +
                                              10. +
                                                cv93
                                                +
                                                0
                                            4. -
                                              1. -
                                              2. - cv50 - 1 - 1 +
                                              3. +
                                                +
                                                1
                                                +
                                                +
                                                +
                                                  +
                                                1. +
                                                  cv50
                                                  +
                                                  1
                                                2. -
                                                3. - cv51 - 1 - 1 +
                                                4. +
                                                  cv51
                                                  +
                                                  1
                                              4. -
                                                1. -
                                                2. - cv46 - 3 - 3 +
                                                3. +
                                                  +
                                                  3
                                                  +
                                                  +
                                                  +
                                                    +
                                                  1. +
                                                    cv46
                                                    +
                                                    3
                                                  2. -
                                                  3. - cv47 - 3 - 3 +
                                                  4. +
                                                    cv47
                                                    +
                                                    3
                                                4. -
                                                  1. -
                                                  2. - cv64 - 7 - 7 +
                                                  3. +
                                                    +
                                                    7
                                                    +
                                                    +
                                                    +
                                                      +
                                                    1. +
                                                      cv64
                                                      +
                                                      7
                                                    2. -
                                                    3. - cv65 - 7 - 7 +
                                                    4. +
                                                      cv65
                                                      +
                                                      7
                                                  4. -
                                                    1. -
                                                    2. - cv96 - 9 - 9 +
                                                    3. +
                                                      +
                                                      9
                                                      +
                                                      +
                                                      +
                                                        +
                                                      1. +
                                                        cv96
                                                        +
                                                        9
                                                      2. -
                                                      3. - cv97 - 9 - 9 +
                                                      4. +
                                                        cv97
                                                        +
                                                        9
                                                    4. -
                                                      1. -
                                                      2. - cv34 - ß - ß +
                                                      3. +
                                                        +
                                                        ß
                                                        +
                                                        +
                                                        +
                                                          +
                                                        1. +
                                                          cv34
                                                          +
                                                          ß
                                                        2. -
                                                        3. - cv35 - ß - ß +
                                                        4. +
                                                          cv35
                                                          +
                                                          ß
                                                      4. -
                                                        1. -
                                                        2. - cv94 - λ - λ +
                                                        3. +
                                                          +
                                                          λ
                                                          +
                                                          +
                                                          +
                                                            +
                                                          1. +
                                                            cv94
                                                            +
                                                            λ
                                                          2. -
                                                          3. - cv95 - λ - λ +
                                                          4. +
                                                            cv95
                                                            +
                                                            λ
                                                        4. -
                                                          1. -
                                                          2. - cv16 - ~ - ~ +
                                                          3. +
                                                            +
                                                            ~
                                                            +
                                                            +
                                                            +
                                                              +
                                                            1. +
                                                              cv16
                                                              +
                                                              ~
                                                            2. -
                                                            3. - cv17 - ~ - ~ +
                                                            4. +
                                                              cv17
                                                              +
                                                              ~
                                                          4. -
                                                            1. -
                                                            2. - cv18 - * - * +
                                                            3. +
                                                              +
                                                              *
                                                              +
                                                              +
                                                              +
                                                                +
                                                              1. +
                                                                cv18
                                                                +
                                                                *
                                                              2. -
                                                              3. - cv19 - * - * +
                                                              4. +
                                                                cv19
                                                                +
                                                                *
                                                              5. -
                                                              6. - cv60 - * - * +
                                                              7. +
                                                                cv60
                                                                +
                                                                *
                                                              8. -
                                                              9. - cv61 - * - * +
                                                              10. +
                                                                cv61
                                                                +
                                                                *
                                                            4. -
                                                              1. -
                                                              2. - cv20 - _ - _ +
                                                              3. +
                                                                +
                                                                _
                                                                +
                                                                +
                                                                +
                                                                  +
                                                                1. +
                                                                  cv20
                                                                  +
                                                                  _
                                                                2. -
                                                                3. - cv21 - _ - _ +
                                                                4. +
                                                                  cv21
                                                                  +
                                                                  _
                                                                  +
                                                                5. +
                                                                6. +
                                                                  cv99
                                                                  +
                                                                  _
                                                              4. -
                                                                1. -
                                                                2. - cv22 - - +
                                                                3. +
                                                                  +
                                                                  +
                                                                  +
                                                                  +
                                                                    +
                                                                  1. +
                                                                    cv22
                                                                    +
                                                                  2. -
                                                                  3. - cv23 - - +
                                                                  4. +
                                                                    cv23
                                                                    +
                                                                4. -
                                                                  1. -
                                                                  2. - cv29 - ^ - ^ +
                                                                  3. +
                                                                    +
                                                                    ^
                                                                    +
                                                                    +
                                                                    +
                                                                      +
                                                                    1. +
                                                                      cv29
                                                                      +
                                                                      ^
                                                                    2. -
                                                                    3. - cv30 - ^ - ^ +
                                                                    4. +
                                                                      cv30
                                                                      +
                                                                      ^
                                                                  4. -
                                                                    1. -
                                                                    2. - cv36 - { - } +
                                                                    3. +
                                                                      +
                                                                      {
                                                                      +
                                                                      }
                                                                      +
                                                                      +
                                                                      +
                                                                        +
                                                                      1. +
                                                                        cv36
                                                                        +
                                                                        {
                                                                        +
                                                                        }
                                                                      2. -
                                                                      3. - cv37 - { - } +
                                                                      4. +
                                                                        cv37
                                                                        +
                                                                        {
                                                                        +
                                                                        }
                                                                    4. -
                                                                      1. -
                                                                      2. - cv44 - # - # +
                                                                      3. +
                                                                        +
                                                                        #
                                                                        +
                                                                        +
                                                                        +
                                                                          +
                                                                        1. +
                                                                          cv44
                                                                          +
                                                                          #
                                                                        2. -
                                                                        3. - cv45 - # - # +
                                                                        4. +
                                                                          cv45
                                                                          +
                                                                          #
                                                                      4. -
                                                                        1. -
                                                                        2. - cv31 - @ - @ +
                                                                        3. +
                                                                          +
                                                                          @
                                                                          +
                                                                          +
                                                                          +
                                                                            +
                                                                          1. +
                                                                            cv31
                                                                            +
                                                                            @
                                                                          2. -
                                                                          3. - cv32 - @ - @ +
                                                                          4. +
                                                                            cv32
                                                                            +
                                                                            @
                                                                          5. -
                                                                          6. - cv33 - @ - @ +
                                                                          7. +
                                                                            cv33
                                                                            +
                                                                            @
                                                                        4. -
                                                                          1. -
                                                                          2. - cv38 - $ - $ +
                                                                          3. +
                                                                            +
                                                                            $
                                                                            +
                                                                            +
                                                                            +
                                                                              +
                                                                            1. +
                                                                              cv38
                                                                              +
                                                                              $
                                                                            2. -
                                                                            3. - cv39 - $ - $ +
                                                                            4. +
                                                                              cv39
                                                                              +
                                                                              $
                                                                            5. -
                                                                            6. - cv54 - $ - $ +
                                                                            7. +
                                                                              cv54
                                                                              +
                                                                              $
                                                                            8. -
                                                                            9. - cv55 - $ - $ +
                                                                            10. +
                                                                              cv55
                                                                              +
                                                                              $
                                                                          4. -
                                                                            1. -
                                                                            2. - cv62 - % - % +
                                                                            3. +
                                                                              +
                                                                              %
                                                                              +
                                                                              +
                                                                              +
                                                                                +
                                                                              1. +
                                                                                cv62
                                                                                +
                                                                                %
                                                                              2. -
                                                                              3. - cv63 - % - % +
                                                                              4. +
                                                                                cv63
                                                                                +
                                                                                %
                                                                            4. -
                                                                              1. -
                                                                              2. - cv66 - <= - >= +
                                                                              3. +
                                                                                +
                                                                                <=
                                                                                +
                                                                                >=
                                                                                +
                                                                                +
                                                                                +
                                                                                  +
                                                                                1. +
                                                                                  cv66
                                                                                  +
                                                                                  <=
                                                                                  +
                                                                                  >=
                                                                                2. -
                                                                                3. - cv67 - <= - >= +
                                                                                4. +
                                                                                  cv67
                                                                                  +
                                                                                  <=
                                                                                  +
                                                                                  >=
                                                                              @@ -646,38 +753,38 @@
                                                                            5. ss01Andale Mono Style - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ
                                                                            6. ss02Anonymous Pro Style - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ
                                                                            7. ss03Consolas Style - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ
                                                                            8. ss04Menlo Style - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ
                                                                            9. ss05Fira Mono Style - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ
                                                                            10. ss06Liberation Mono Style - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ
                                                                            11. ss07Monaco Style - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ
                                                                            12. ss08Pragmata Pro Style @@ -686,23 +793,23 @@
                                                                            13. ss09Source Code Pro Style - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ
                                                                            14. ss10Envy Code R Style - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ
                                                                            15. ss11X Window Style - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ
                                                                            16. ss12Ubuntu Mono Style - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ
                                                                            17. ss13Lucida Style @@ -711,8 +818,8 @@
                                                                            18. ss14JetBrains Mono Style - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ - @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ + @real fox.quick(h){ *is_brown && it_jumps_over(dogs.lazy) } 0123456789 ABCKRWXYZ
                                                                            19. ss20Curly Style diff --git a/snapshot/index.styl b/snapshot/index.styl index 8658578c7..d3be45417 100644 --- a/snapshot/index.styl +++ b/snapshot/index.styl @@ -169,9 +169,11 @@ section.opentype > div.hr font-size: 80%; + font-stretch: expanded; + font-weight: 400; text-transform: uppercase; letter-spacing: 0.2em; - margin: 3rem auto; + margin: 0 auto 3rem; text-align: center; display: block; @@ -184,7 +186,8 @@ section.opentype vertical-align: 0.3em; > ol.narrow - width: 40em; + font-size: 0.75em; + width: 48em; list-style: none; margin: 0 -5em; padding: 0; @@ -195,57 +198,85 @@ section.opentype > li flex: none; - border-left: 1px solid #ddd; - margin-left: -1px; - margin-bottom: 1em; - - ol.group - list-style: none; - margin: 0; - padding: 0; display: flex; + width: 24em; + box-sizing: border-box; - ol.group > li - margin: 0 0.5em; - padding: 0; - border: none; - width: 4em; - flex: none; - display: flex; - justify-content: center; - position: relative; + > div.desc-group + flex: none; + width: 5em; + padding: 0 1em 0 0; + justify-content: flex-end; - > .tag - font-size: 0.75em; - display: block; - position: absolute; - width: auto; - left: 50%; - top: 0; - margin-left: calc(-1em); - - &:before, &:after + > .triangle + font-feature-settings: 'NWID' on; + display: inline-block; + font-weight: 300; + font-size: 2em; + margin-top: 0.5em; + width: 0.5em; + text-align: center; position: absolute; - content: ''; + right: 0; + margin-right: -0.125em; + opacity: 0.75; + + > ol.group + list-style: none; + margin: 0; + padding: 0; + flex: none; + display: flex; + + .desc-group + border: none; + margin: 0; + padding: 0 0.5em; + width: 2.5em; + box-sizing: border-box; + flex: none; + display: flex; + justify-content: center; + position: relative; + + &.ligature + width: 5em; + + > .label + font-size: 0.75em; display: block; - width: 0.75em; - border-bottom: 1px solid #ddd; - top: 0.6em; + position: absolute; + width: auto; + left: 50%; + top: 0.4375em; + margin-left: -1em; + font-weight: 400; + opacity: 0.75; - &:before - right: 100%; - margin-right: 0.25em; + &.ligature > .label.tag + &:before, &:after + position: absolute; + content: ''; + display: block; + width: 0.75em; + border-bottom: 1px solid #ddd; + top: 0.6em; - &:after - left: 100%; - margin-left: 0.25em; + &:before + right: 100%; + margin-right: 0.25em; - > .sample - display: inline-block; - font-size: 2em; - margin-top: 0.5em; - width: 1em; - text-align: center; + &:after + left: 100%; + margin-left: 0.25em; + + > .sample + display: inline-block; + font-weight: 300; + font-size: 2em; + margin-top: 0.5em; + width: 1em; + text-align: center; > ol.wide list-style: none; diff --git a/utility/export-data/parse-variants-data.js b/utility/export-data/parse-variants-data.js index 2824c0fcc..79f68bc63 100644 --- a/utility/export-data/parse-variants-data.js +++ b/utility/export-data/parse-variants-data.js @@ -41,7 +41,13 @@ function getCvData(variants) { for (const [sampler, gr] of samplerGroups) { gr.ligatureSampler = / /.test(sampler); gr.descSampleText = gr.ligatureSampler ? sampler.split(" ") : [...sampler]; - gr.configs.sort((a, b) => (a.tag < b.tag ? -1 : a.tag > b.tag ? 1 : 0)); + gr.configs.sort((a, b) => { + const ta = (a.tag || a.tagUpright || a.tagItalic || "").toLowerCase(); + const tb = (b.tag || b.tagUpright || b.tagItalic || "").toLowerCase(); + if (ta < tb) return -1; + if (ta > tb) return 1; + return 0; + }); gr.rank = rankOf(gr.descSampleText[0][0]); } return [...samplerGroups.values()].sort((a, b) => b.rank - a.rank); diff --git a/utility/generate-snapshot-page/templates/partial/cv-sample.ejs b/utility/generate-snapshot-page/templates/partial/cv-sample.ejs index b6832aad0..a1cf8f235 100644 --- a/utility/generate-snapshot-page/templates/partial/cv-sample.ejs +++ b/utility/generate-snapshot-page/templates/partial/cv-sample.ejs @@ -2,20 +2,30 @@
                                                                              Character Variants
                                                                                <%_ for(const group of cvData) { _%> -
                                                                                1. - <%_ for(const config of group.configs) { _%> -
                                                                                2. - <%= config.tag || config.tagItalic %> +
                                                                                3. +
                                                                                  <%_ if(group.ligatureSampler) { _%> <%_ for(const text of group.descSampleText) { _%> - <%= text %> +
                                                                                  <%= text %>
                                                                                  + <%_ } _%> + <%_ } else { _%> +
                                                                                  <%= group.descSampleText[0] %>
                                                                                  + <%_ } _%> +
                                                                                  +
                                                                                  +
                                                                                    + <%_ for(const config of group.configs) { _%> +
                                                                                  1. +
                                                                                    <%= config.tag || config.tagItalic %>
                                                                                    + <%_ if(group.ligatureSampler) { _%> + <%_ for(const text of group.descSampleText) { _%> +
                                                                                    <%= text %>
                                                                                    <%_ } _%> <%_ } else { _%> <%_ if(config.tag) { _%> - <%= group.descSampleText[0] %> - <%= group.descSampleText[0] %> +
                                                                                    <%= group.descSampleText[0] %>
                                                                                    <%_ } else if(config.tagItalic) { _%> - <%= group.descSampleText[0] %> +
                                                                                    <%= group.descSampleText[0] %>
                                                                                    <%_ } _%> <%_ } _%>
                                                                                  2. diff --git a/variants.toml b/variants.toml index cf64e6aa0..c5ed4c80b 100644 --- a/variants.toml +++ b/variants.toml @@ -147,6 +147,12 @@ sampler = 'i' description = "Tailed `i`" dotlessi = 'tailed' +[simple.v-i-hookybottom] +tag = "CVAA" +sampler = 'i' +description = "`i` with a straight tail" +dotlessi = 'hookybottom' + [simple.v-j-line] tag = "cv57" sampler = 'j' @@ -165,6 +171,27 @@ sampler = 'j' description = '`j` without serif' dotlessj = "straight" +[simple.v-k-straight] +tag = "cv68" +sampler = 'kK' +description = '`k` with standard shape' +k = 'straight' +K = 'straight' + +[simple.v-k-curly] +tag = "cv69" +sampler = 'kK' +description = 'Slightly curly `k`, like Iosevka 2.x' +k = 'curly' +K = 'curly' + +[simple.v-k-cursive] +tagItalic = "cv70" +sampler = 'kK' +description = '`k` with a cursive loop' +k = 'cursive' +K = 'straight' + [simple.v-l-hooky] tag = 'cv09' sampler = 'l' @@ -207,27 +234,6 @@ sampler = 'l' description = '`l` with a straight tail' l = 'hookybottom' -[simple.v-k-straight] -tag = "cv68" -sampler = 'kK' -description = '`k` with standard shape' -k = 'straight' -K = 'straight' - -[simple.v-k-curly] -tag = "cv69" -sampler = 'kK' -description = 'Slightly curly `k`, like Iosevka 2.x' -k = 'curly' -K = 'curly' - -[simple.v-k-cursive] -tagItalic = "cv70" -sampler = 'kK' -description = '`k` with a cursive loop' -k = 'cursive' -K = 'straight' - [simple.v-m-normal] tag = 'cv25' sampler = 'm'