Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make Dotless J with Stroke and Hook serifed under slab. #2562

Merged
merged 2 commits into from
Oct 27, 2024
Merged

Make Dotless J with Stroke and Hook serifed under slab. #2562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b4557e
Make Dotless J with Stroke and Hook auto-serifed.
jmcwilliams403 Oct 27, 2024
372f46a
typo.
jmcwilliams403 Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/32.0.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
- ARMENIAN SMALL LETTER TURNED AYB (`U+0560`) ... ARMENIAN HYPHEN (`U+058A`).
- ARMENIAN DRAM SIGN (`U+058F`).
* Optimize `semi-chancery-straight-serifed` and `semi-chancery-curly-serifed` variants for `x` (`cv58`).
* Make Dotless J with Stroke and Hook (`U+0284`) have a serif under slab.
4 changes: 2 additions & 2 deletions packages/font-glyphs/src/letter/armenian/aliases.ptl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ glyph-block Letter-Armenian-Aliases : begin
alias 'armn/aybTurned' 0x560 'm'
alias 'armn/ayb' 0x561 'turnm'
alias 'armn/ho' 0x570 'h'
alias 'armn/yi' 0x575 [if SLAB 'dotlessj.flatHookSerifed' 'dotlessj.flatHookSerifless']
alias 'armn/yi' 0x575 'dotlessj.flatHook'
alias 'armn/vo' 0x578 'n'
alias 'armn/peh' 0x57A 'turnmLeg'
alias 'armn/seh' 0x57D 'u'
alias 'armn/co' 0x581 'cyrl/de.BGR'
alias 'armn/oh' 0x585 'o'
alias 'armn/yiBar' 0x588 [if SLAB 'dotlessjBar.flatHookSerifed' 'dotlessjBar.flatHookSerifless']
alias 'armn/yiBar' 0x588 'dotlessjBar.flatHook'
60 changes: 41 additions & 19 deletions packages/font-glyphs/src/letter/latin/lower-j.ptl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,16 @@ glyph-block Letter-Latin-Lower-J : begin
set-base-anchor 'overlay' barCenter (top / 2)

define XMiddle : namespace
export : define [Straight df] : begin df.middle
export : define [Hooky df] : df.middle + [IBalance2 df]
export : define [Regular df] : df.middle + JBalance
export : define [StraightSerifless df] : begin df.middle
export : define [StraightSerifed df] : df.middle + [IBalance2 df]
export : define [BentHook df] : df.middle + JBalance
export : define [FlatHookSerifless df] : df.middle + 0.25 * JBalance * df.div * [mix 1 df.div 2]
export : define [FlatHookSerifed df] : df.middle + JBalance * df.div
export : define [StraightAutoSerifed df] : if SLAB [StraightSerifed df] [StraightSerifless df]
export : define [FlatHookAutoSerifed df] : if SLAB [FlatHookSerifed df] [FlatHookSerifless df]

define Body : namespace
export : define [Regular df top xMiddle] : glyph-proc
export : define [BentHook df top xMiddle] : glyph-proc
local hookx : Math.min (xMiddle - (Width * 0.5) - [HSwToV HalfStroke] + OXHook) (xMiddle - 1.5 * [HSwToV Stroke] + OXHook)
set-base-anchor "below" [mix hookx xMiddle 0.5] Descender
include : dispiro
Expand Down Expand Up @@ -74,36 +76,56 @@ glyph-block Letter-Latin-Lower-J : begin
set-base-anchor "trailing" (xMiddle - [HSwToV HalfStroke]) Descender

define Serifs : namespace
export : define [None df top xMiddle] : no-shape
export : define [Long df top xMiddle] : HSerif.lt xMiddle top (LongJut * df.div)
export : define [Auto df top xMiddle] : if SLAB [Long df top xMiddle] [no-shape]

define Marks : namespace
export : define [Serifless df top xMiddle] : glyph-proc
set-base-anchor 'above' xMiddle top
set-base-anchor 'overlay' xMiddle (top / 2)

export : define [Serifed df top xMiddle] : glyph-proc
include : Serifless df top xMiddle
include : LeaningAnchor.Above.At [mix df.middle xMiddle (7/8)]

export : define [Serifless df top xMiddle] : glyph-proc
set-base-anchor 'above' xMiddle top
set-base-anchor 'overlay' xMiddle (top / 2)
export : define [AutoSerifed df top xMiddle] : glyph-proc
include : if SLAB
Serifed df top xMiddle
Serifless df top xMiddle

define Div : namespace
export : define BentHook 1
export : define StraightSerifless para.diversityII
export : define StraightSerifed para.diversityI
export : define FlatHookSerifless para.diversityII
export : define FlatHookSerifed para.diversityI
export : define StraightAutoSerifed : if SLAB para.diversityI para.diversityII
export : define FlatHookAutoSerifed : if SLAB para.diversityI para.diversityII

define JConfig : object
'serifless' { "Regular" null XMiddle.Regular Marks.Serifless 1 }
'serifed' { "Regular" Serifs.Long XMiddle.Regular Marks.Serifed 1 }
'straightLine' { "Straight" null XMiddle.Straight Marks.Serifless para.diversityII }
'hooky' { "Straight" Serifs.Long XMiddle.Hooky Marks.Serifed para.diversityI }
'flatHookSerifless' { "FlatHook" null XMiddle.FlatHookSerifless Marks.Serifless para.diversityII }
'flatHookSerifed' { "FlatHook" Serifs.Long XMiddle.FlatHookSerifed Marks.Serifed para.diversityI }
'diagonalTailedSerifless' { "DiagonalTailed" null XMiddle.FlatHookSerifless Marks.Serifless para.diversityII }
'diagonalTailedSerifed' { "DiagonalTailed" Serifs.Long XMiddle.FlatHookSerifed Marks.Serifed para.diversityI }

foreach {suffix { shapeId Serif xMiddleT Marks div } } [Object.entries JConfig] : do
'bentHook' { "BentHook" Serifs.Auto XMiddle.BentHook Marks.AutoSerifed Div.BentHook }
'bentHookSerifless' { "BentHook" Serifs.None XMiddle.BentHook Marks.Serifless Div.BentHook }
'bentHookSerifed' { "BentHook" Serifs.Long XMiddle.BentHook Marks.Serifed Div.BentHook }
'straight' { "Straight" Serifs.Auto XMiddle.StraightAutoSerifed Marks.AutoSerifed Div.StraightAutoSerifed }
'straightSerifless' { "Straight" Serifs.None XMiddle.StraightSerifless Marks.Serifless Div.StraightSerifless }
'straightSerifed' { "Straight" Serifs.Long XMiddle.StraightSerifed Marks.Serifed Div.StraightSerifed }
'flatHook' { "FlatHook" Serifs.Auto XMiddle.FlatHookAutoSerifed Marks.AutoSerifed Div.FlatHookAutoSerifed }
'flatHookSerifless' { "FlatHook" Serifs.None XMiddle.FlatHookSerifless Marks.Serifless Div.FlatHookSerifless }
'flatHookSerifed' { "FlatHook" Serifs.Long XMiddle.FlatHookSerifed Marks.Serifed Div.FlatHookSerifed }
'diagonalTailed' { "DiagonalTailed" Serifs.Auto XMiddle.FlatHookAutoSerifed Marks.AutoSerifed Div.FlatHookAutoSerifed }
'diagonalTailedSerifless' { "DiagonalTailed" Serifs.None XMiddle.FlatHookSerifless Marks.Serifless Div.FlatHookSerifless }
'diagonalTailedSerifed' { "DiagonalTailed" Serifs.Long XMiddle.FlatHookSerifed Marks.Serifed Div.FlatHookSerifed }

foreach { suffix { shapeId Serif xMiddleT Marks div } } [Object.entries JConfig] : do
local df : DivFrame div
local xMiddle : xMiddleT df

create-glyph "dotlessj.\(suffix)" : glyph-proc
set-width df.width
include : df.markSet.p
include : Body.(shapeId) df XH xMiddle
if Serif : include : tagged 'serifLT' : Serif df XH xMiddle
include : tagged 'serifLT' : Serif df XH xMiddle
include : Marks df XH xMiddle

create-glyph "dotlessjBar.\(suffix)" : glyph-proc
Expand All @@ -122,7 +144,7 @@ glyph-block Letter-Latin-Lower-J : begin
link-reduced-variant 'j/sansSerif' 'j' MathSansSerif

select-variant 'dotlessjBar' 0x25F (follow -- 'dotlessj')
select-variant 'dotlessjBarHookTop' 0x284 (follow -- 'dotlessj/sansSerif')
select-variant 'dotlessjBarHookTop' 0x284 (follow -- 'dotlessjHookTop')
CreateAccentedComposition 'jBar' 0x249 'dotlessjBar' 'tittleAbove'

alias 'grek/yot' 0x3F3 'j'
Expand Down
12 changes: 6 additions & 6 deletions packages/font-glyphs/src/letter/latin/upper-j.ptl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ glyph-block Letter-Latin-Upper-J : begin
glyph-block-import Letter-Blackboard : BBS BBD
glyph-block-import Letter-Latin-Lower-J : FlatHookDotlessJShape

define [JFullHookBase df dfHook top] : glyph-proc
define [JBentHookBase df dfHook top] : glyph-proc
set-width df.width
include : df.markSet.[if (top > XH) 'capital' 'e']

Expand Down Expand Up @@ -51,7 +51,7 @@ glyph-block Letter-Latin-Upper-J : begin
flat (df.rightSB - JBalance2 - [Math.min (0.625 * (df.rightSB - df.leftSB)) (1.375 * hd.x)]) 0 [widths.rhs Stroke]
curl df.leftSB 0

define [JDescendingBase df dfHook top] : glyph-proc
define [JDescendingBentHookBase df dfHook top] : glyph-proc
set-width df.width
include : df.markSet.[if (top > XH) 'capDesc' 'p']

Expand All @@ -69,8 +69,8 @@ glyph-block Letter-Latin-Upper-J : begin
hookend Descender
g4 hookx (Descender + JHook)

set JFullHookBase.WithCurlyTail : function [df top] : JCurlyTailBaseT df (df.rightSB - [HSwToV HalfStroke] - JBalance2) (df.leftSB) top 0 'capital'
set JDescendingBase.WithCurlyTail : function [df top] : JCurlyTailBaseT df (df.middle + JBalance) (df.middle + JBalance - LongJut - [HSwToV HalfStroke]) top Descender 'capDesc'
set JBentHookBase.WithCurlyTail : function [df top] : JCurlyTailBaseT df (df.rightSB - [HSwToV HalfStroke] - JBalance2) (df.leftSB) top 0 'capital'
set JDescendingBentHookBase.WithCurlyTail : function [df top] : JCurlyTailBaseT df (df.middle + JBalance) (df.middle + JBalance - LongJut - [HSwToV HalfStroke]) top Descender 'capDesc'
define [JCurlyTailBaseT df xc xCo top bottom markClass] : glyph-proc
set-width df.width
include : df.markSet.(markClass)
Expand Down Expand Up @@ -112,9 +112,9 @@ glyph-block Letter-Latin-Upper-J : begin

define JConfig : SuffixCfg.weave
object # height and hook
"" { JFullHookBase [DivFrame 1] [DivFrame 1] }
bentHook { JBentHookBase [DivFrame 1] [DivFrame 1] }
flatHook { JFlatHookBase [DivFrame 1] [DivFrame 1] }
descending { JDescendingBase [DivFrame 1] [DivFrame 1] }
descendingBentHook { JDescendingBentHookBase [DivFrame 1] [DivFrame 1] }
descendingFlatHookSerifless { JDescendingFlatHookBase [DivFrame para.diversityI] [DivFrame para.diversityI] }
descendingFlatHookSerifed { JDescendingFlatHookSerifedBase [DivFrame para.diversityI] [DivFrame para.diversityI] }
function [body] : if (body == 'descendingFlatHookSerifless' || body == 'descendingFlatHookSerifed') {."" null} : object
Expand Down
36 changes: 22 additions & 14 deletions params/variants.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,21 +1059,21 @@ selectorAffix.JCurlyTail = "descending"
[prime.capital-j.variants-buildup.stages.hook."*"]
next = "serifs"

[prime.capital-j.variants-buildup.stages.hook.standard]
[prime.capital-j.variants-buildup.stages.hook.bent-hook]
rank = 1
keyAffix = ""
selectorAffix.J = ""
selectorAffix."J/noDescend" = ""
selectorAffix."J/sansSerif" = ""
selectorAffix.JCurlyTail = ""
selectorAffix.J = "bentHook"
selectorAffix."J/noDescend" = "bentHook"
selectorAffix."J/sansSerif" = "bentHook"
selectorAffix.JCurlyTail = "bentHook"

[prime.capital-j.variants-buildup.stages.hook.flat-hook]
rank = 2
descriptionAffix = "flat hook"
selectorAffix.J = "flatHook"
selectorAffix."J/noDescend" = "flatHook"
selectorAffix."J/sansSerif" = "flatHook"
selectorAffix.JCurlyTail = ""
selectorAffix.JCurlyTail = "bentHook"

[prime.capital-j.variants-buildup.stages.serifs.serifless]
rank = 1
Expand Down Expand Up @@ -3082,57 +3082,65 @@ tagKind = "letter"
[prime.j.variants.serifless]
rank = 1
description = "`j` without serif"
selector.dotlessj = "serifless"
selector."dotlessj/sansSerif" = "serifless"
selector.dotlessj = "bentHookSerifless"
selector."dotlessj/sansSerif" = "bentHookSerifless"
selector.dotlessjHookTop = "bentHook"
selector.dotlessjCurlyTail = "serifless"

[prime.j.variants.serifed]
rank = 2
description = "`j` with top serif"
selector.dotlessj = "serifed"
selector."dotlessj/sansSerif" = "serifless"
selector.dotlessj = "bentHookSerifed"
selector."dotlessj/sansSerif" = "bentHookSerifless"
selector.dotlessjHookTop = "bentHook"
selector.dotlessjCurlyTail = "serifed"

[prime.j.variants.straight-line]
rank = 3
description = "`j` like a straight line"
selector.dotlessj = "straightLine"
selector."dotlessj/sansSerif" = "straightLine"
selector.dotlessj = "straightSerifless"
selector."dotlessj/sansSerif" = "straightSerifless"
selector.dotlessjHookTop = "straight"
selector.dotlessjCurlyTail = "serifless"

[prime.j.variants.hooky]
rank = 4
description = "`j` like a straight line with top serif"
selector.dotlessj = "hooky"
selector."dotlessj/sansSerif" = "straightLine"
selector.dotlessj = "straightSerifed"
selector."dotlessj/sansSerif" = "straightSerifless"
selector.dotlessjHookTop = "straight"
selector.dotlessjCurlyTail = "serifed"

[prime.j.variants.flat-hook-serifless]
rank = 5
description = "`j` with flat terminal hook"
selector.dotlessj = "flatHookSerifless"
selector."dotlessj/sansSerif" = "flatHookSerifless"
selector.dotlessjHookTop = "flatHook"
selector.dotlessjCurlyTail = "serifless"

[prime.j.variants.flat-hook-serifed]
rank = 6
description = "`j` with flat terminal hook and top serif"
selector.dotlessj = "flatHookSerifed"
selector."dotlessj/sansSerif" = "flatHookSerifless"
selector.dotlessjHookTop = "flatHook"
selector.dotlessjCurlyTail = "serifed"

[prime.j.variants.diagonal-tailed-serifless]
rank = 7
description = "`j` with diagonal tail"
selector.dotlessj = "diagonalTailedSerifless"
selector."dotlessj/sansSerif" = "diagonalTailedSerifless"
selector.dotlessjHookTop = "diagonalTailed"
selector.dotlessjCurlyTail = "serifless"

[prime.j.variants.diagonal-tailed-serifed]
rank = 8
description = "`j` with top serif and diagonal tail"
selector.dotlessj = "diagonalTailedSerifed"
selector."dotlessj/sansSerif" = "diagonalTailedSerifless"
selector.dotlessjHookTop = "diagonalTailed"
selector.dotlessjCurlyTail = "serifed"


Expand Down