Skip to content

Commit

Permalink
Add SS14, CV89 and CV90. Fixes be5invis#434.
Browse files Browse the repository at this point in the history
  • Loading branch information
be5invis committed Mar 7, 2020
1 parent c5ea68f commit b441dba
Show file tree
Hide file tree
Showing 15 changed files with 94 additions and 30 deletions.
10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ The current available styles for `design`/`upright`/`italic`/`oblique` options a
* `ss11`: Set character variant to “X Window Style”.
* `ss12`: Set character variant to “Ubuntu Mono Style”.
* `ss13`: Set character variant to “Lucida Style”.
* `ss14`: Set character variant to “Jetbrains Mono Style”.
* `ss20`: Set character variant to “Curly Style”.

<!-- END Section-Stylistic-Sets -->
Expand Down Expand Up @@ -280,6 +281,9 @@ The current available styles for `design`/`upright`/`italic`/`oblique` options a
* Styles for `t`:
* `v-t-standard`, `cv40`: Standard `t` shape (default).
* `v-t-cross`, `cv41`: Futura-like `t` shape.
* Styles for `u`:
* `v-u-with-bar`, `cv89`: Normal `u` with right bar (default).
* `v-u-without-bar`, `cv90`: Normal `u` without right bar, like a smaller uppercase `U`.
* Styles for `v`:
* `v-v-straight`, `cv71`: Standard, straight `V` and `v` (default).
* `v-v-curly`, `cv72`:  Slightly curly `V` and `v`, like Iosevka 2.x.
Expand All @@ -293,9 +297,6 @@ The current available styles for `design`/`upright`/`italic`/`oblique` options a
* `v-y-straight`, `cv48`: More-straight letter `y` (default for Upright).
* `v-y-cursive`, `cv49`: Cursive-like `y` (default for Italic).
* `v-y-curly`, `cv79`: More curly letter `y`, like Iosevka 2.x.
* Styles for `ß`:
* `v-eszet-traditional`, `cv34`: Traditional, Fraktur-like Eszet.
* `v-eszet-sulzbacher`, `cv35`: A more modern, beta-like Eszet (default).
* Styles for `0`:
* `v-zero-slashed`, `cv13`: Slashed Zero `0` (default).
* `v-zero-dotted`, `cv14`: Dotted Zero `0`.
Expand Down Expand Up @@ -347,6 +348,9 @@ The current available styles for `design`/`upright`/`italic`/`oblique` options a
* Styles for `<=`, `>=`:
* `v-lig-ltgteq-flat`, `cv66`: The lower bar of `<=` and `>=` ligation is flat (default).
* `v-lig-ltgteq-slanted`, `cv67`: The lower bar of `<=` and `>=` ligation is slanted.
* Styles for `ß`:
* `v-eszet-traditional`, `cv34`: Traditional, Fraktur-like Eszet.
* `v-eszet-sulzbacher`, `cv35`: A more modern, beta-like Eszet (default).

<!-- END Section-Cherry-Picking-Styles -->

Expand Down
17 changes: 17 additions & 0 deletions build-plans.toml
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,19 @@ design = ["sp-fixed", "ss13"]
family = "Iosevka Term SS13"
design = ["sp-term", "ss13"]


[buildPlans.iosevka-ss14]
family = "Iosevka SS14"
design = ["ss14"]

[buildPlans.iosevka-fixed-ss14]
family = "Iosevka Fixed SS14"
design = ["sp-fixed", "ss14"]

[buildPlans.iosevka-term-ss14]
family = "Iosevka Term SS14"
design = ["sp-term", "ss14"]

###################################################################################################
# Proportional families
[buildPlans.iosevka-aile]
Expand Down Expand Up @@ -347,6 +360,10 @@ iosevka-ss13 = "iosevka-ss13"
iosevka-fixed-ss13 = "iosevka-fixed-ss13"
iosevka-term-ss13 = "iosevka-term-ss13"

iosevka-ss14 = "iosevka-ss14"
iosevka-fixed-ss14 = "iosevka-fixed-ss14"
iosevka-term-ss14 = "iosevka-term-ss14"

# Experimental variants
iosevka-aile = "iosevka-aile"
iosevka-etoile = "iosevka-etoile"
Expand Down
3 changes: 3 additions & 0 deletions changes/3.0.0-rc.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@
* Fix broken shape of heavy curly V, etc.
* Improve double-line arrow ligations.
* Add diamond-shaped `<>` ligation, and enabled that for Haskell.
* Added bar-less `u` variants, and JetBrains Mono:
* Assigned `cv90` to this variant.
* Assigned `ss14` to the stylistic set.
6 changes: 5 additions & 1 deletion glyphs/letters-unified-basic.ptl
Original file line number Diff line number Diff line change
Expand Up @@ -3332,7 +3332,7 @@ glyph-block LetterUnified-Basic : begin
include : LeftwardTopSerif (RIGHTSB - STROKE * HVCONTRAST) XH SIDEJUT
include : LeftwardTopSerif SB XH SIDEJUT

save 'u' 'u'
save 'u.withBar'
# upsilon
sketch # upsilon
include MarkSet.e
Expand All @@ -3347,6 +3347,10 @@ glyph-block LetterUnified-Basic : begin
curl (RIGHTSB - OX + O) XH [heading UPWARD]

save 'upsilon' 0x3C5
save 'u.withoutBar'

select-variant 'u' 'u'

define [LatinUpsilon2Shape top sma smb] : glyph-construction
include : dispiro
widths.lhs
Expand Down
Binary file modified images/charvars.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/languages.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/ligations.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/matrix.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/preview-all.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/stylesets.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/weights.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 29 additions & 12 deletions snapshot/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,18 @@ <h1>This page is used for taking snapshots of Iosevka only.</h1>
<span class="sample italic" style="font-feature-settings:'cv41'">t</span>
</li>
</ol></li>
<li><ol class="group">
<li>
<span class="tag">cv89</span>
<span class="sample" style="font-feature-settings:'cv89'">u</span>
<span class="sample italic" style="font-feature-settings:'cv89'">u</span>
</li>
<li>
<span class="tag">cv90</span>
<span class="sample" style="font-feature-settings:'cv90'">u</span>
<span class="sample italic" style="font-feature-settings:'cv90'">u</span>
</li>
</ol></li>
<li><ol class="group">
<li>
<span class="tag">cv71</span>
Expand Down Expand Up @@ -354,18 +366,6 @@ <h1>This page is used for taking snapshots of Iosevka only.</h1>
<span class="sample italic" style="font-feature-settings:'cv79'">y</span>
</li>
</ol></li>
<li><ol class="group">
<li>
<span class="tag">cv34</span>
<span class="sample" style="font-feature-settings:'cv34'">ß</span>
<span class="sample italic" style="font-feature-settings:'cv34'">ß</span>
</li>
<li>
<span class="tag">cv35</span>
<span class="sample" style="font-feature-settings:'cv35'">ß</span>
<span class="sample italic" style="font-feature-settings:'cv35'">ß</span>
</li>
</ol></li>
<li><ol class="group">
<li>
<span class="tag">cv13</span>
Expand Down Expand Up @@ -576,6 +576,18 @@ <h1>This page is used for taking snapshots of Iosevka only.</h1>
<span class="sample" style="font-feature-settings:'cv67'">&gt;=</span>
</li>
</ol></li>
<li><ol class="group">
<li>
<span class="tag">cv34</span>
<span class="sample" style="font-feature-settings:'cv34'">ß</span>
<span class="sample italic" style="font-feature-settings:'cv34'">ß</span>
</li>
<li>
<span class="tag">cv35</span>
<span class="sample" style="font-feature-settings:'cv35'">ß</span>
<span class="sample italic" style="font-feature-settings:'cv35'">ß</span>
</li>
</ol></li>
</ol>
</section>
<section id="stylesets" class="opentype">
Expand Down Expand Up @@ -651,6 +663,11 @@ <h1>This page is used for taking snapshots of Iosevka only.</h1>
<span class="sample" style="font-feature-settings:'ss13'">@rea<b>l</b> fox.qu<b>i</b>ck(h){ *<b>i</b>s<b>_</b>brown && <b>i</b>t<b>_</b>jumps<b>_</b>over(dogs.<b>l</b>azy) } <b>0</b><b>1</b>23456789 ABCKRWXYZ</span>
<span class="sample italic" style="font-feature-settings:'ss13'">@rea<b>l</b> fox.qu<b>i</b>ck(h){ *<b>i</b>s<b>_</b>brown && <b>i</b>t<b>_</b>jumps<b>_</b>over(dogs.<b>l</b>azy) } <b>0</b><b>1</b>23456789 ABCKRWXYZ</span>
</li>
<li>
<span class="tag">ss14</span><span class="description">Jetbrains Mono Style</span>
<span class="sample" style="font-feature-settings:'ss14'">@rea<b>l</b> fox.q<b>u</b><b>i</b>ck(h){ <b>*</b><b>i</b>s_brown && <b>i</b>t_j<b>u</b>mps_over(dogs.<b>l</b>azy) } <b>0</b>12<b>3</b>456789 ABCKRWXYZ</span>
<span class="sample italic" style="font-feature-settings:'ss14'">@rea<b>l</b> fox.q<b>u</b><b>i</b>ck(h){ <b>*</b><b>i</b>s_brown && <b>i</b>t_j<b>u</b>mps_over(dogs.<b>l</b>azy) } <b>0</b>12<b>3</b>456789 ABCKRWXYZ</span>
</li>
<li>
<span class="tag">ss20</span><span class="description">Curly Style</span>
<span class="sample" style="font-feature-settings:'ss20'">@real fo<b>x</b>.quic<b>k</b>(h){ *is_bro<b>w</b>n && it_jumps_o<b>v</b>er(dogs.laz<b>y</b>) } 0123456789 <b>A</b>BC<b>K</b><b>R</b><b>W</b><b>X</b><b>Y</b>Z</span>
Expand Down
2 changes: 2 additions & 0 deletions utility/generate-release-note/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ const PackageShapes = {
ss10: ["Envy Code R Style", "SS10"],
ss11: ["X Windows Fixed Style", "SS11"],
ss12: ["Ubuntu Mono Style", "SS12"],
ss13: ["Lucida Style", "SS13"],
ss14: ["JetBrains Mono Style", "SS14"],
aile: ["Quasi-proportional", "Aile", false, false, true],
etoile: ["Quasi-proportional slab-serif", "Etoile", false, false, true],
sparkle: ["Quasi-proportional family — like iA Writer’s Duo.", "Sparkle", false, false, true]
Expand Down
2 changes: 1 addition & 1 deletion utility/generate-snapshot-page/parse-variants-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function getCvData(variants) {

function rankOf(initialChar) {
if ("A" <= initialChar && initialChar <= "Z") return 3;
if (("a" <= initialChar && initialChar <= "z") || initialChar === ") return 2;
if ("a" <= initialChar && initialChar <= "z") return 2;
if ("0" <= initialChar && initialChar <= "9") return 1;
return 0;
}
Expand Down
43 changes: 30 additions & 13 deletions variants.toml
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,18 @@ sampler = 't'
description = 'Futura-like `t` shape'
t = 'cross'

[simple.v-u-with-bar]
tag = "cv89"
sampler = "u"
description = "Normal `u` with right bar"
u = "withBar"

[simple.v-u-without-bar]
tag = "cv90"
sampler = "u"
description = "Normal `u` without right bar, like a smaller uppercase `U`"
u = "withoutBar"

[simple.v-v-straight]
tag = "cv71"
sampler = 'v'
Expand Down Expand Up @@ -316,18 +328,6 @@ description = 'Cursive-like `y`'
y = "cursive"
yhooktop = "straight"

[simple.v-eszet-traditional]
tag = 'cv34'
sampler = 'ß'
description = 'Traditional, Fraktur-like Eszet'
eszet = 'traditional'

[simple.v-eszet-sulzbacher]
tag = 'cv35'
sampler = 'ß'
description = 'A more modern, beta-like Eszet'
eszet = 'sulzbacher'

[simple.v-zero-slashed]
tag = 'cv13'
sampler = '0'
Expand Down Expand Up @@ -554,6 +554,18 @@ description = 'The lower bar of `<=` and `>=` ligation is slanted'
"eq.at-lteq.lig2" = "slanted"
"eq.at-gteq.lig2" = "slanted"

[simple.v-eszet-traditional]
tag = 'cv34'
sampler = 'ß'
description = 'Traditional, Fraktur-like Eszet'
eszet = 'traditional'

[simple.v-eszet-sulzbacher]
tag = 'cv35'
sampler = 'ß'
description = 'A more modern, beta-like Eszet'
eszet = 'sulzbacher'

########## "Untagged" variants, used for Aile, etc.

[simple.v-capital-i-straight]
Expand Down Expand Up @@ -614,7 +626,8 @@ design = [
'v-w-straight',
'v-x-straight',
'v-capital-y-straight',
'v-capital-r-straight'
'v-capital-r-straight',
'v-u-with-bar'
]
upright = [
'v-a-doublestorey',
Expand Down Expand Up @@ -699,6 +712,10 @@ design = ['v-at-threefold', 'v-a-doublestorey', 'v-f-straight', 'v-underscore-lo
description = 'Lucida Style'
design = ['v-i-hooky', 'v-l-hooky', 'v-zero-dotted', 'v-underscore-low', 'v-caret-low', 'v-numbersign-slanted', 'v-one-base']

[composite.ss14]
description = 'JetBrains Mono Style'
design = ['v-i-serifed', 'v-l-italic', 'v-u-without-bar', 'v-zero-dotted', 'v-three-flattop', 'v-capital-q-straight', 'v-asterisk-low']

[composite.ss20]
description = 'Curly Style'
design = ['v-v-curly', 'v-turn-v-curly', 'v-w-curly', 'v-x-curly', 'v-capital-y-curly', 'v-capital-r-curly']
Expand Down

0 comments on commit b441dba

Please sign in to comment.