Cleanup of #2684 . (#2685)

This commit is contained in:
John McWilliams 2025-02-20 09:45:31 -05:00 committed by GitHub
parent fa6460d479
commit cd2661d653
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -13,12 +13,12 @@ glyph-block Letter-Latin-Thorn : begin
define xThornLeftStroke : SB * 1.25
define [yThornBowlSymmetricBot top slab] : top * 0.19 + [if slab (Stroke * 0.375) 0]
define [yThornBowlSymmetricTop top slab] : top - [yThornBowlSymmetricBot top slab]
define [yThornBowlAsymmetricBot top slab] : top * 0.25 + [if slab (Stroke * 0.125) 0]
define [yThornBowlAsymmetricTop top slab] : top - 0.7 * [yThornBowlAsymmetricBot top slab] + [if slab (-0.125) 0.25] * Stroke
define [yThornBowlSymmetricBot top slab] : mix [yThornBowlAsymmetricBot top slab] (top - [yThornBowlAsymmetricTop top slab]) 0.5
define [yThornBowlSymmetricTop top slab] : top - [yThornBowlSymmetricBot top slab]
define [ThornShapeImpl top slabTop slabBot yBowlBot yBowlTop] : glyph-proc
local turn : mix yBowlTop yBowlBot (ArchDepthB / (ArchDepthA + ArchDepthB))
local turnRadius : (yBowlTop - yBowlBot) / 2
@ -43,14 +43,14 @@ glyph-block Letter-Latin-Thorn : begin
include : LeaningAnchor.Above.VBar.l xThornLeftStroke
include : LeaningAnchor.Below.VBar.l xThornLeftStroke
define [ThornAsymmetricShape top slabTop slabBot] : ThornShapeImpl top slabTop slabBot
yThornBowlAsymmetricBot top slabBot
yThornBowlAsymmetricTop top slabBot
define [ThornSymmetricShape top slabTop slabBot] : ThornShapeImpl top slabTop slabBot
yThornBowlSymmetricBot top slabBot
yThornBowlSymmetricTop top slabBot
define [ThornAsymmetricShape top slabTop slabBot] : ThornShapeImpl top slabTop slabBot
yThornBowlAsymmetricBot top slabBot
yThornBowlAsymmetricTop top slabBot
define ThornConfig : SuffixCfg.weave
object # symmetry
"" ThornSymmetricShape
@ -81,13 +81,11 @@ glyph-block Letter-Latin-Thorn : begin
include [refer-glyph "Thorn.\(suffix)"] AS_BASE ALSO_METRICS
include : LetterBarOverlay.l.in
x -- xThornLeftStroke
bot -- (0 + [if doSB Stroke 0])
top -- (0 + [yThornBowlAsymmetricBot CAP doSB])
bot -- [if doSB Stroke 0]
top -- [yThornBowlAsymmetricBot CAP doSB]
select-variant 'Thorn' 0xDE
select-variant 'ThornStroke' 0xA764
select-variant 'ThornStrokeBottom' 0xA766
create-glyph 'grek/Sho' 0x3F7 : glyph-proc
include : MarkSet.capital
include : ThornSymmetricShape CAP SLAB SLAB
alias 'grek/Sho' 0x3F7 : if SLAB 'Thorn.serifed' 'Thorn.serifless'