More cleanup

This commit is contained in:
be5invis 2023-07-01 23:18:58 -07:00
parent 994a46706a
commit 409bffdc8d
8 changed files with 42 additions and 49 deletions

View file

@ -179,9 +179,6 @@ glyph-block Letter-Latin-Lower-F : begin
select-variant 'f/phoneticLeft' (shapeFrom -- 'f')
select-variant 'fPalatalHook' 0x1D82 (follow -- 'f/tailless')
CreateAccentedComposition 'fBar' 0xA799 'f' 'barOver'
CreateAccentedComposition 'fTildeOver' 0x1D6E 'f' 'tildeOver'
glyph-block-import Letter-Blackboard : BBS BBD
create-glyph 'mathbb/f' 0x1D557 : glyph-proc
include : MarkSet.b

View file

@ -285,8 +285,6 @@ glyph-block Letter-Latin-Lower-M : begin
turned 'turnm' 0x26F 'm' HalfAdvance (XH / 2)
turned 'capitalTurnm' 0x19C 'capitalSmallM' HalfAdvance (CAP / 2)
CreateAccentedComposition 'mTildeOver' 0x1D6F 'm' 'tildeOverWideDivM'
derive-composites 'currency/millSign' 0x20A5 'm' 'shortSlash'
glyph-block-import Letter-Blackboard : BBS BBD BBBarLeft

View file

@ -206,8 +206,6 @@ glyph-block Letter-Latin-Lower-N : begin
select-variant 'NExt' 0x220 (follow -- 'n')
select-variant 'nExt' 0x19E (follow -- 'n')
CreateAccentedComposition 'nTildeOver' 0x1D70 'n' 'tildeOverWide'
derive-composites 'nDescender' 0xA791 'n/descBase' [CyrDescender.rSideJut RightSB 0]
derive-composites 'nPalatalHook' 0x1D87 'n/descBase' [PalatalHook.rSideJut RightSB 0]
derive-composites 'cyrl/peDescender.italic' null 'cyrl/peItalicDescBase' [CyrDescender.rSideJut RightSB 0]

View file

@ -322,8 +322,6 @@ glyph-block Letter-Latin-Lower-T : begin
select-variant "tHookTopRTail" 0x1DF09
CreateAccentedComposition 'tTildeOver' 0x1D75 't' 'tildeOver'
# U+01BE is catually "t" and "s" combined together
define SLAB-NONE 0
define SLAB-CLASSICAL 1

View file

@ -401,17 +401,9 @@ glyph-block Letter-Latin-S : begin
flat RightSB Ascender [widths.rhs.heading sw Rightward]
curl (4 * Width) Ascender [widths.rhs.heading sw Rightward]
CreateAccentedComposition 'sTildeOver' 0x1D74 's' 'tildeOverWide'
derive-composites 'SCedilla' 0x15E 'S' 'cedillaExtShapeBelowOArc'
derive-composites 'sCedilla' 0x15F 's' 'cedillaExtShapeBelowSOArc'
derive-composites 'SBar' 0xA7C9 'S'
HBar.m SB RightSB (CAP * 0.5) OverlayStroke
derive-composites 'sBar' 0xA7CA 's'
HBar.m SB RightSB (XH * 0.5) OverlayStroke
create-glyph 'mathbb/S' 0x1D54A : glyph-proc
include : MarkSet.capital
define theta : Math.PI / 4

View file

@ -389,7 +389,6 @@ glyph-block Letter-Latin-Z : begin
CreateAccentedComposition 'ZBar' 0x1B5 'Z/reduced' 'barOver'
CreateAccentedComposition 'zBar' 0x1B6 'z/reduced' 'barOver'
CreateAccentedComposition 'zTildeOver' 0x1D76 'z/reduced' 'tildeOverWide2'
CreateAccentedComposition 'ZCaron' 0x17D 'Z' 'caronAbove' true
CreateAccentedComposition 'zCaron' 0x17E 'z' 'caronAbove' true
CreateAccentedComposition 'cyrl/ZemlyaBar' 0xA642 'cyrl/Zemlya/reduced' 'barOver'

View file

@ -20,6 +20,7 @@ glyph-block Mark-Overlay : begin
local tildeHeight : 0.75 * (aboveMarkTop - aboveMarkBot)
# Overlay on stems
create-glyph 'tildeOver' 0x334 : glyph-proc
set-width 0
set-mark-anchor 'overlay' markMiddle (XH / 2) markMiddle (XH / 2)
@ -68,37 +69,6 @@ glyph-block Mark-Overlay : begin
rightEnd -- markMiddle + (markExtend + 0.4 * Stroke * HVContrast)
hs -- [AdviceStroke 4] / 2
create-glyph 'tildeOverWide' : glyph-proc
set-width 0
set-mark-anchor 'overlay' markMiddle (XH / 2) markMiddle (XH / 2)
include : TildeShape
ttop -- XH / 2 + tildeHeight / 2
tbot -- XH / 2 - tildeHeight / 2
leftEnd -- markMiddle - Width / 2
rightEnd -- markMiddle + Width / 2
hs -- OverlayStroke / 2
create-glyph 'tildeOverWide2' : glyph-proc
set-width 0
set-mark-anchor 'overlay' markMiddle (XH / 2) markMiddle (XH / 2)
include : TildeShape
ttop -- XH / 2 + tildeHeight / 2
tbot -- XH / 2 - tildeHeight / 2
leftEnd -- markMiddle - Width / 2 + SB
rightEnd -- markMiddle + Width / 2 - SB
hs -- OverlayStroke / 2
create-glyph 'tildeOverWideDivM' : glyph-proc
set-width 0
set-mark-anchor 'overlay' markMiddle (XH / 2) markMiddle (XH / 2)
include : TildeShape
ttop -- XH / 2 + tildeHeight / 2
tbot -- XH / 2 - tildeHeight / 2
leftEnd -- markMiddle - Width / 2 * para.diversityM
rightEnd -- markMiddle + Width / 2 * para.diversityM
hs -- OverlayStroke / 2
# Overlay on stems
create-glyph 'barOver' 0x335 : glyph-proc
set-width 0
set-mark-anchor 'overlay' markMiddle (XH / 2) markMiddle (XH / 2)
@ -140,6 +110,37 @@ glyph-block Mark-Overlay : begin
flat ([mix 0 SB 0.5] - Width) (0.4 * XH)
curl ([mix Width RightSB 0.5] - Width) (0.6 * XH)
create-glyph 'tildeStrike' : glyph-proc
set-width 0
set-mark-anchor 'strike' markMiddle (XH / 2) markMiddle (XH / 2)
include : TildeShape
ttop -- XH / 2 + tildeHeight / 2
tbot -- XH / 2 - tildeHeight / 2
leftEnd -- markMiddle - Width / 2
rightEnd -- markMiddle + Width / 2
hs -- OverlayStroke / 2
create-glyph 'tildeStrike2' : glyph-proc
set-width 0
set-mark-anchor 'strike' markMiddle (XH / 2) markMiddle (XH / 2)
include : TildeShape
ttop -- XH / 2 + tildeHeight / 2
tbot -- XH / 2 - tildeHeight / 2
leftEnd -- markMiddle - Width / 2 + SB
rightEnd -- markMiddle + Width / 2 - SB
hs -- OverlayStroke / 2
create-glyph 'tildeStrikeDivM' : glyph-proc
set-width 0
set-mark-anchor 'strike' markMiddle (XH / 2) markMiddle (XH / 2)
include : TildeShape
ttop -- XH / 2 + tildeHeight / 2
tbot -- XH / 2 - tildeHeight / 2
leftEnd -- markMiddle - Width / 2 * para.diversityM
rightEnd -- markMiddle + Width / 2 * para.diversityM
hs -- OverlayStroke / 2
# Slashes
create-glyph 'shortSlash' 0x337 : glyph-proc
set-width 0

View file

@ -147,6 +147,13 @@ export : define decompOverrides : object
0x47C { 'cyrl/BroadOmega' 'cyrlPsiliAbove' 'cyrlPokrytieAbove' }
0x47D { 'cyrl/broadOmega' 'cyrlPsiliAbove' 'cyrlPokrytieAbove' }
0x1D6E { 'f' 'tildeOver' }
0x1D6F { 'm' 'tildeStrikeDivM' }
0x1D70 { 'n' 'tildeStrike' }
0x1D74 { 's' 'tildeStrike' }
0x1D75 { 't' 'tildeOver' }
0x1D76 { 'z/reduced' 'tildeStrike2' }
0x1D7C { 'latn/iota' 'barOver' }
0x1D7D { 'p' 'hStrike' }
0x1D7F { 'latn/upsilon' 'hStrike' }
@ -176,11 +183,14 @@ export : define decompOverrides : object
0xA74A { 'O' 'hStrike' }
0xA74B { 'o' 'hStrike' }
0xA799 { 'f' 'barOver' }
0xA7B8 { 'U' 'longSlash' }
0xA7B9 { 'u' 'shortSlash' }
0xA7BB { 'a' 'EgyptologicalYodAbove' }
0xA7BD { 'i' 'EgyptologicalYodAbove' }
0xA7BF { 'u' 'EgyptologicalYodAbove' }
0xA7C9 { 'S' 'hStrike' }
0xA7CA { 's' 'hStrike' }
0xA7A0 { 'G' 'oblStrike' }
0xA7A1 { 'g' 'oblStrike' }