Skip to content

Commit

Permalink
Merge branch 'prerelease'
Browse files Browse the repository at this point in the history
  • Loading branch information
@be5invis
be5invis committed Aug 20, 2023
2 parents 588c1c1 + bb1ea52 commit c51a77d
Show file tree
Hide file tree
Showing 2,629 changed files with 249,384 additions and 3,310 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
## Modifications since version 2.x
## Modifications since last major version

### 26.2.1

* Fix leaning marks of LATIN SMALL LETTER T WITH CEDILLA (`U+0163`) (#1914).
* Fix the dimensions of wide geometric shapes in quasi-proportional (#1941).
* Fix `cv76`'s application on CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE (`U+04B9`) (#1942).


### 26.2.0

Expand Down
3 changes: 3 additions & 0 deletions changes/26.2.1.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
* Fix leaning marks of LATIN SMALL LETTER T WITH CEDILLA (`U+0163`) (#1914).
* Fix the dimensions of wide geometric shapes in quasi-proportional (#1941).
* Fix `cv76`'s application on CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE (`U+04B9`) (#1942).
282 changes: 141 additions & 141 deletions doc/PACKAGE-LIST.md
View file

Large diffs are not rendered by default.

912 changes: 456 additions & 456 deletions doc/packages-sha.txt
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions font-src/glyphs/common/shapes.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,14 +300,14 @@ glyph-block CommonShapes : begin
export : define [mtAsymmetric x y l r _sw] : begin
local sw : fallback _sw Stroke
return : dispiro
flat (x + r - TanSlope * (sw * DesignParameters.serifShiftX)) y [widths sw 0]
flat (x + r - TanSlope * (sw * DesignParameters.serifShiftX)) y [widths.lhs sw]
curl (x - l - TanSlope * (sw * DesignParameters.serifShiftX)) y

export : define [mb x y length _sw] : mbAsymmetric x y length length _sw
export : define [mbAsymmetric x y l r _sw] : begin
local sw : fallback _sw Stroke
return : dispiro
flat (x + r + TanSlope * (sw * DesignParameters.serifShiftX)) y [widths 0 sw]
flat (x + r + TanSlope * (sw * DesignParameters.serifShiftX)) y [widths.rhs sw]
curl (x - l + TanSlope * (sw * DesignParameters.serifShiftX)) y

glyph-block-export VSerif
Expand Down Expand Up @@ -395,7 +395,7 @@ glyph-block CommonShapes : begin
glyph-block-export FlatSlashShape
define [FlatSlashShape middlex middle fine kx ky] : glyph-proc
include : dispiro
flat (middlex - LongJut * [fallback kx 0.8]) (middle - LongJut * [fallback ky 0.4]) [widths fine fine]
flat (middlex - LongJut * [fallback kx 0.8]) (middle - LongJut * [fallback ky 0.4]) [widths.center : 2 * fine]
curl (middlex + LongJut * [fallback kx 0.8]) (middle + LongJut * [fallback ky 0.4])

# Spiro shapes
Expand Down
17 changes: 7 additions & 10 deletions font-src/glyphs/letter/cyrillic/che.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,10 @@ glyph-block Letter-Cyrillic-Che : begin
turned 'cyrl/Shha' 0x4BA 'cyrl/Che' Middle (CAP / 2)
derive-composites 'cyrl/ShhaDescender' 0x526 'cyrl/Shha' [CyrDescender.rSideJut RightSB 0]

define SwCheVBar : Math.min OverlayStroke (0.625 * (RightSB - SB - [HSwToV : 2 * Stroke]) / HVContrast)
create-glyph 'cyrl/CheVBar' 0x4B8 : glyph-proc
include [refer-glyph 'cyrl/Che'] AS_BASE
local yc (CAP * [if SLAB 0.45 0.35] + Stroke * 0.1)
include : VBar.m Middle (yc + LongJut * 0.8) (yc - LongJut * 0.8) SwCheVBar

create-glyph 'cyrl/cheVBar' 0x4B9 : glyph-proc
include [refer-glyph 'cyrl/che'] AS_BASE
local yc (XH * [if SLAB 0.45 0.35] + Stroke * 0.1)
include : VBar.m Middle (yc + LongJut * 0.8) (yc - LongJut * 0.8) SwCheVBar
define [ChrVBar top] : begin
local SwCheVBar : Math.min OverlayStroke (0.625 * (RightSB - SB - [HSwToV : 2 * Stroke]) / HVContrast)
local yc : top * [if SLAB 0.45 0.35] + Stroke * 0.1
return : VBar.m Middle (yc + LongJut * 0.8) (yc - LongJut * 0.8) SwCheVBar

derive-composites 'cyrl/CheVBar' 0x4B8 'cyrl/Che' [ChrVBar CAP]
derive-composites 'cyrl/cheVBar' 0x4B9 'cyrl/che' [ChrVBar XH]
4 changes: 2 additions & 2 deletions font-src/glyphs/letter/greek/lower-alpha.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ glyph-block Letter-Greek-Lower-Alpha : begin
widths.rhs fine
g4 (RightSB - OX * 1.75) XH [heading Downward]
bezControls k1 k2 k3 1 6
g4.left.mid (middle + CorrectionOMidS) O [widths 0 Stroke]
g4.left.mid (middle + CorrectionOMidS) O [widths.rhs Stroke]
archv
flat (SB + OX * 2) SmallArchDepthB
curl (SB + OX * 2) (XH - SmallArchDepthA)
arcvh
g4.right.mid (middle - CorrectionOMidS) (XH - O) [widths 0 Stroke]
g4.right.mid (middle - CorrectionOMidS) (XH - O) [widths.rhs Stroke]
bezControls (1 - k3) 0 (1 - k1) (1 - k2) 6
g4 (RightSB - OX * 2) 0 [widths.heading 0 fine Downward]

Expand Down
2 changes: 1 addition & 1 deletion font-src/glyphs/letter/greek/lower-delta.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ glyph-block Letter-Greek-Lower-Delta : begin
flat (SB + OX) SmallArchDepthB
curl (SB + OX) (yRingTop - SmallArchDepthA)
arcvh
g4 xOTLeft (yRingTop - (Stroke - fine) / 2) [widths 0 fine]
g4 xOTLeft (yRingTop - (Stroke - fine) / 2) [widths.rhs fine]

create-glyph 'grek/delta.flatTop' : glyph-proc
include : MarkSet.b
Expand Down
4 changes: 2 additions & 2 deletions font-src/glyphs/letter/greek/upper-omega.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ glyph-module
glyph-block Letter-Greek-Upper-Omega : begin
glyph-block-import CommonShapes
glyph-block-import Common-Derivatives
glyph-block-import Letter-Shared : CreateAccentedComposition SetGrekUpperTonos
glyph-block-import Letter-Shared : SetGrekUpperTonos

define [UpperOmegaShape top extend ada adb] : glyph-proc
local fine : Stroke * CThin
Expand All @@ -18,7 +18,7 @@ glyph-block Letter-Greek-Upper-Omega : begin
include : dispiro
g4 x1 (yattach - fine) [widths.heading 0 fine Leftward]
archv
flat SB (yattach - Stroke + adb) [widths 0 Stroke]
flat SB (yattach - Stroke + adb) [widths.rhs Stroke]
curl SB (top - ada)
arcvh
g4 (Middle - CorrectionOMidS) (top - O)
Expand Down
2 changes: 1 addition & 1 deletion font-src/glyphs/letter/latin-ext/eszet.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,6 @@ glyph-block Letter-Latin-Upper-Eszet : begin
include : dispiro
widths.rhs
g4 rightTopX (CAP - Stroke)
g4 xMiddle (ymiddleCap + Stroke) [widths Stroke 0]
g4 xMiddle (ymiddleCap + Stroke) [widths.lhs Stroke]

if SLAB : include : HSerif.lb SB 0 SideJut
2 changes: 1 addition & 1 deletion font-src/glyphs/letter/latin-ext/lower-ae-oe.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ glyph-block Letter-Latin-Lower-AE-OE : begin
local fine : 0.375 * OverlayStroke
local { subDf shift } : SubDfAndShift 1 [DivFrame para.diversityM 3] OX
include : dispiro
flat (shift + subDf.leftSB + OX + fine) [mix XH 0 1.05] [widths fine fine]
flat (shift + subDf.leftSB + OX + fine) [mix XH 0 1.05] [widths.center : 2 * fine]
curl (shift + subDf.rightSB - OX - fine) [mix 0 XH 1.05]

create-glyph "rightHalfBarOverlay" : glyph-proc
Expand Down
2 changes: 1 addition & 1 deletion font-src/glyphs/letter/latin-ext/rams-horn.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ glyph-block Letter-Latin-Rams-Horn : begin
widths.center
g4 (SB + [HSwToV HalfStroke] + O) top [heading Downward]
quadControls 1 0.7 16
g4 (Middle + d - hf) (bottom + d * (1 - TanSlope * 0.5)) [widths hf hf]
g4 (Middle + d - hf) (bottom + d * (1 - TanSlope * 0.5)) [widths.center : 2 * hf]
arcvh
g4 (Middle + CorrectionOMidX * hf * 2) (bottom + hf)
archv
Expand Down
1 change: 0 additions & 1 deletion font-src/glyphs/letter/latin/c.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ glyph-block Letter-Latin-C : begin
glyph-block-import Common-Derivatives
glyph-block-import Mark-Adjustment : ExtendAboveBaseAnchors ExtendBelowBaseAnchors
glyph-block-import Mark-Shared-Metrics : markStroke
glyph-block-import Letter-Shared : CreateAccentedComposition
glyph-block-import Letter-Shared-Shapes : SerifFrame CurlyTail DToothlessRise
glyph-block-import Letter-Shared-Shapes : SerifedArcStart SerifedArcEnd InwardSlabArcStart
glyph-block-import Letter-Shared-Shapes : ArcStartSerif ArcEndSerif
Expand Down
2 changes: 1 addition & 1 deletion font-src/glyphs/letter/latin/k.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ glyph-block Letter-Latin-K : begin
dispiro
widths.rhs stroke
flat (kshRightTop - Ok) top
curl (kshLeft + stroke) attach [widths 0 fine]
curl (kshLeft + stroke) attach [widths.rhs fine]


set-base-anchor 'legOverlay' [mix kshLeft kshRightBot : StrokeWidthBlend 0.5 0.65] [mix attach2 0 : StrokeWidthBlend 0.5 0.7]
Expand Down
1 change: 0 additions & 1 deletion font-src/glyphs/letter/latin/lower-f.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ glyph-block Letter-Latin-Lower-F : begin
glyph-block-import CommonShapes
glyph-block-import Common-Derivatives
glyph-block-import Mark-Adjustment : LeaningAnchor
glyph-block-import Letter-Shared : CreateAccentedComposition
glyph-block-import Letter-Shared-Shapes : FlatHookDepth DiagonalTailL DiagonalTailStdDepth
glyph-block-import Letter-Shared-Shapes : LetterBarOverlay PalatalHook

Expand Down
4 changes: 2 additions & 2 deletions font-src/glyphs/letter/latin/lower-g.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ glyph-block Letter-Latin-Lower-G : begin
include : dispiro
g4.left.start [mix SB RightSB 0.4] gtipy [widths 0 (Stroke * CThin)]
g4 ([mix SB RightSB 0.0575] + Stroke * 0.85) [mix groundy gtipy 0.5] [widths.rhs (Stroke * [mix CThin 1 0.5])]
flat [mix SB RightSB 0.435] groundy [widths 0 Stroke]
flat [mix SB RightSB 0.435] groundy [widths.rhs Stroke]
curl [mix RightSB SB 0.435] groundy
archv 4
g4 grightx [mix (Descender + O) groundy (1.06 * SmallArchDepthA / (SmallArchDepthA + SmallArchDepthB))]
Expand Down Expand Up @@ -66,7 +66,7 @@ glyph-block Letter-Latin-Lower-G : begin
include : dispiro
g4.left.start [mix SB RightSB 0.4] gtipy [widths 0 (Stroke * CThin)]
g4 ([mix SB RightSB 0.0575] + Stroke * 0.85) [mix groundy gtipy 0.5] [widths.rhs (Stroke * [mix CThin 1 0.5])]
flat [mix SB RightSB 0.435] groundy [widths 0 Stroke]
flat [mix SB RightSB 0.435] groundy [widths.rhs Stroke]
curl [mix RightSB SB 0.435] groundy
archv 4
g4 grightx [mix (Descender + O) groundy (1.06 * SmallArchDepthA / (SmallArchDepthA + SmallArchDepthB))]
Expand Down
1 change: 0 additions & 1 deletion font-src/glyphs/letter/latin/lower-m.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ glyph-module
glyph-block Letter-Latin-Lower-M : begin
glyph-block-import CommonShapes
glyph-block-import Common-Derivatives
glyph-block-import Letter-Shared : CreateAccentedComposition
glyph-block-import Letter-Shared-Shapes : SerifFrame RightwardTailedBar DToothlessRise DMBlend
glyph-block-import Letter-Shared-Shapes : nShoulder nShoulderMask
glyph-block-import Letter-Shared-Shapes : CyrDescender PalatalHook CurlyTail UpwardHookShape
Expand Down
1 change: 0 additions & 1 deletion font-src/glyphs/letter/latin/lower-n.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ glyph-block Letter-Latin-Lower-N : begin
glyph-block-import CommonShapes
glyph-block-import Common-Derivatives
glyph-block-import Mark-Shared-Metrics : markHalfStroke
glyph-block-import Letter-Shared : CreateAccentedComposition
glyph-block-import Letter-Shared-Shapes : CurlyTail nShoulder nShoulderKnots nShoulderMask
glyph-block-import Letter-Shared-Shapes : RightwardTailedBar DToothlessRise DMBlend
glyph-block-import Letter-Shared-Shapes : CyrDescender PalatalHook RetroflexHook EngHook
Expand Down
2 changes: 1 addition & 1 deletion font-src/glyphs/letter/latin/lower-t.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ glyph-block Letter-Latin-Lower-T : begin
glyph-block-import CommonShapes
glyph-block-import Common-Derivatives
glyph-block-import Mark-Adjustment : LeaningAnchor
glyph-block-import Letter-Shared : CreateAccentedComposition CreateCommaCaronComposition
glyph-block-import Letter-Shared : CreateCommaCaronComposition
glyph-block-import Letter-Shared-Shapes : CurlyTail FlatHookDepth ConnectedCedilla SerifedArcEnd
glyph-block-import Letter-Shared-Shapes : DiagonalTailR DiagonalTailStdDepth DToothlessRise
glyph-block-import Letter-Shared-Shapes : TopHook PalatalHook
Expand Down
6 changes: 3 additions & 3 deletions font-src/glyphs/letter/latin/o.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,14 @@ glyph-block Letter-Latin-O : begin
local fine : 0.5 * OverlayStroke
include [refer-glyph 'O'] AS_BASE
include : dispiro
flat (SB + O + fine) [mix CAP 0 1.05] [widths fine fine]
flat (SB + O + fine) [mix CAP 0 1.05] [widths.center : 2 * fine]
curl (RightSB - O - fine) [mix 0 CAP 1.05]

create-glyph 'oSlash' 0xF8 : glyph-proc
local fine : 0.5 * OverlayStroke
include [refer-glyph 'o'] AS_BASE
include : dispiro
flat (SB + O + fine) [mix XH 0 1.05] [widths fine fine]
flat (SB + O + fine) [mix XH 0 1.05] [widths.center : 2 * fine]
curl (RightSB - O - fine) [mix 0 XH 1.05]

create-glyph 'oSlashSideways' 0x1D13 : glyph-proc
Expand All @@ -126,7 +126,7 @@ glyph-block Letter-Latin-O : begin
local fine : 0.5 * OverlayStroke
include : OShape (Width - SB / 2) (SB / 2) (XH * 0.1) (XH * 0.9) nothing nothing nothing
include : dispiro
flat (SB + O + fine) [mix Width 0 1.05] [widths fine fine]
flat (SB + O + fine) [mix Width 0 1.05] [widths.center : 2 * fine]
curl (XH - SB - O - fine) [mix 0 Width 1.05]

create-glyph 'Obar' 0x19F : glyph-proc
Expand Down
16 changes: 8 additions & 8 deletions font-src/glyphs/letter/latin/s.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ glyph-block Letter-Latin-S : begin

g4 SB (top - archDepth)
alsoThru.g2 0.5 0.5 [widths.center ess]
g4 (RightSB - SOBot) (bot + archDepth) [widths 0 stroke]
g4 (RightSB - SOBot) (bot + archDepth) [widths.rhs stroke]

match sb
[Just SLAB-CLASSICAL] : SerifedArcEnd.RtlRhs SB Middle bot stroke Hook
Expand All @@ -93,7 +93,7 @@ glyph-block Letter-Latin-S : begin
hookstart (CAP - O) (sw -- stroke) (swItalicAdj -- Stroke)
g4 RightSB (CAP - archDepth)
alsoThru.g2 0.5 0.5 [widths.center ess]
g4 (SB + SOBot) archDepth [widths stroke 0]
g4 (SB + SOBot) archDepth [widths.lhs stroke]
match sb
[Just SLAB-CLASSICAL] : SerifedArcEnd.LtrLhs RightSB Middle 0 stroke Hook
[Just SLAB-INWARD] : list
Expand Down Expand Up @@ -121,7 +121,7 @@ glyph-block Letter-Latin-S : begin

g4 (SB - OX) (XH - archDepth)
alsoThru.g2 0.5 0.5 [widths.center ess]
g4 (RightSB + OX - SOBot) (archDepth) [widths 0 stroke]
g4 (RightSB + OX - SOBot) (archDepth) [widths.rhs stroke]

match sb
[Just CURLY-TAIL] : list
Expand Down Expand Up @@ -171,9 +171,9 @@ glyph-block Letter-Latin-S : begin
hookstart (top - O) (sw -- stroke) (swItalicAdj -- Stroke)
g4 SB (top - archDepth)
alsoThru.g2 0.5 0.5 [widths.center ess]
g4 (RightSB - SOBot) (archDepth) [widths 0 stroke]
g4 (RightSB - SOBot) (archDepth) [widths.rhs stroke]
arcvh
flat (Middle - CorrectionOMidS) 0 [widths 0 Stroke]
flat (Middle - CorrectionOMidS) 0 [widths.rhs Stroke]
curl SB 0

define [RevSmallSStroke st sb stroke ess] : begin
Expand All @@ -190,7 +190,7 @@ glyph-block Letter-Latin-S : begin
hookstart (XH - O) (sw -- stroke) (swItalicAdj -- Stroke)
g4 (RightSB + OX) (XH - archDepth)
alsoThru.g2 0.5 0.5 [widths.center ess]
g4 (SB - OX + SOBot) (archDepth) [widths stroke 0]
g4 (SB - OX + SOBot) (archDepth) [widths.lhs stroke]
match sb
[Just SLAB-CLASSICAL] : SerifedArcEnd.LtrLhs RightSB Middle 0 stroke SHook
[Just SLAB-INWARD] : list
Expand Down Expand Up @@ -314,7 +314,7 @@ glyph-block Letter-Latin-S : begin
widths.lhs [AdviceStroke 4.5]
g4 start.x start.y
alsoThru 0.15 0.6 important
flat (RightSB - 1) Descender [widths sw 0]
flat (RightSB - 1) Descender [widths.lhs sw]
curl RightSB Descender

if [not doBS] : create-glyph "sSwash.\(suffix)" : glyph-proc
Expand All @@ -326,7 +326,7 @@ glyph-block Letter-Latin-S : begin
widths.lhs [AdviceStroke 4.5]
g4 start.x start.y
alsoThru 0.15 0.6 important
flat (RightSB - 1) Descender [widths sw 0]
flat (RightSB - 1) Descender [widths.lhs sw]
curl RightSB Descender

create-glyph "sCurlyTail.\(suffix)" : glyph-proc
Expand Down
2 changes: 1 addition & 1 deletion font-src/glyphs/letter/latin/upper-l.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ glyph-block Letter-Latin-Upper-L : begin
local fine : 0.5 * OverlayStroke
local middle : mix Stroke top 0.5
return : dispiro
flat [mix 0 SB 0.5] (middle - LongJut * 0.4) [widths fine fine]
flat [mix 0 SB 0.5] (middle - LongJut * 0.4) [widths.center : 2 * fine]
curl (1.6 * LongJut + [mix 0 SB 0.5]) (middle + LongJut * 0.4)

derive-glyphs 'LSlash' 0x141 'L' : lambda [src gr] : glyph-proc
Expand Down
2 changes: 1 addition & 1 deletion font-src/glyphs/letter/latin/x.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ glyph-block Letter-Latin-X : begin
local leftx2 : _leftx + ([HSwToV hst] + [Math.max (-SideJut) sbCor]) * [if (rightx > _leftx) 1 (-1)]
include : dispiro
corner leftx2 lefty [widths.heading hst hst [if (lefty < righty) Upward Downward]]
corner rightx righty [widths hse hse]
corner rightx righty [widths.center : 2 * hse]

: else : begin
local height : Math.abs (lefty - righty)
Expand Down
25 changes: 13 additions & 12 deletions font-src/glyphs/letter/shared.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,8 @@ glyph-block Letter-Shared-Shapes : begin
arcvh
g4 (mt) (top - O) [widths.heading sw 0 {.y (-1) .x (-skew)}]
archv
flat (left + (sw - fine) * HVContrast) (top - ada) [widths fine 0]
curl (left + (sw - fine) * HVContrast) (top - ada - 0.01) [widths fine 0]
flat (left + (sw - fine) * HVContrast) (top - ada) [widths.lhs fine]
curl (left + (sw - fine) * HVContrast) (top - ada - 0.01) [widths.lhs fine]

export : define [rounded] : with-params [
[top XH] [left SB] [right RightSB] [yTerminal CAP] [sw Stroke] [fine ShoulderFine]
Expand All @@ -333,8 +333,8 @@ glyph-block Letter-Shared-Shapes : begin
arcvh
g4 (mt) (top - O) [widths.heading sw 0 {.y (-1) .x (-skew)}]
archv
flat (left + (sw - fine) * HVContrast) (top - ada + 0.01) [widths fine 0]
curl (left + (sw - fine) * HVContrast) (top - ada) [widths fine 0]
flat (left + (sw - fine) * HVContrast) (top - ada + 0.01) [widths.lhs fine]
curl (left + (sw - fine) * HVContrast) (top - ada) [widths.lhs fine]

export : define [toothlessTop] : with-params [
[top XH] [left SB] [right RightSB] [rise SHook] [sw Stroke]
Expand All @@ -345,8 +345,8 @@ glyph-block Letter-Shared-Shapes : begin
local mt : [mix left right 0.5] - CorrectionOMidX * sw
local mb : [mix left right 0.5] + (skew + kSkewShift * TanSlope) * sw
return : dispiro
flat (left + (sw - fine) * HVContrast) (top - ada - 0.01) [widths fine 0]
curl (left + (sw - fine) * HVContrast) (0 + adb) [widths fine 0]
flat (left + (sw - fine) * HVContrast) (top - ada - 0.01) [widths.lhs fine]
curl (left + (sw - fine) * HVContrast) (0 + adb) [widths.lhs fine]
arcvh
g4 (mb) O [widths.heading sw 0 {.y (1) .x (-skew)}]
archv
Expand All @@ -365,8 +365,8 @@ glyph-block Letter-Shared-Shapes : begin
local mt : [mix left right 0.5] - CorrectionOMidX * sw
local mb : [mix left right 0.5] + (skew + kSkewShift * TanSlope) * sw
return : dispiro
flat (left + (sw - fine) * HVContrast) (top - ada - 0.01) [widths fine 0]
curl (left + (sw - fine) * HVContrast) (0 + adb) [widths fine 0]
flat (left + (sw - fine) * HVContrast) (top - ada - 0.01) [widths.lhs fine]
curl (left + (sw - fine) * HVContrast) (0 + adb) [widths.lhs fine]
arcvh
g4 (mb) O [widths.heading sw 0 {.y (1) .x (-skew)}]
archv
Expand Down Expand Up @@ -467,15 +467,15 @@ glyph-block Letter-Shared-Shapes : begin
kFlathook * sHook * Hook
sStroke * Stroke * 1.625

glyph-block-import Mark-Shared-Metrics : markMiddle
glyph-block-export ConnectedCedilla
define [ConnectedCedilla src sel] : glyph-proc
include [refer-glyph src] AS_BASE ALSO_METRICS
include : add-glyph-dependency 'cedillaExtShapeBelow'
local mk : currentGlyph.baseAnchors.leaningBelow || currentGlyph.baseAnchors.below
local tfm : ApparentTranslate (mk.x - markMiddle) (mk.y - 0)
include : difference
new-glyph : glyph-proc
include [refer-glyph src] AS_BASE ALSO_METRICS
currentGlyph.clearGeometry
include : refer-glyph 'cedillaExtShapeBelow'
with-transform tfm [refer-glyph 'cedillaExtShapeBelow']
with-transform [ApparentTranslate 0 (Stroke * 0.25)] [refer-glyph src]
with-transform [ApparentTranslate 0 (Stroke * 0.50)] [refer-glyph src]
with-transform [ApparentTranslate 0 (Stroke * 0.75)] [refer-glyph src]
Expand All @@ -493,6 +493,7 @@ glyph-block Letter-Shared-Shapes : begin
with-transform [ApparentTranslate 0 (Stroke * 3.75)] [refer-glyph src]
with-transform [ApparentTranslate 0 (Stroke * 4.00)] [refer-glyph src]
include : refer-glyph 'blankBelow'
include : refer-glyph 'blankLeaningBelow'

glyph-block-export SerifedArcStart
define SerifedArcStart : namespace
Expand Down
Loading

0 comments on commit c51a77d

Please sign in to comment.