Merge branch 'dev' into prerelease

CHANGELOG.md

@@ -1,5 +1,16 @@
 ## Modifications since version 2.x
 
+### 24.1.3
+
+* Add Characters:
+  - LATIN CAPITAL LETTER INSULAR F (`U+A77B`) (#1786).
+  - LATIN SMALL LETTER INSULAR F (`U+A77C`) (#1786).
+  - LATIN CAPITAL LETTER INSULAR S (`U+A784`) (#1786).
+  - LATIN SMALL LETTER INSULAR S (`U+A785`) (#1786).
+* Fix missing U+1D7F mapping (#1787).
+* Fix shape of U serifs (#1788).
+
+
 ### 24.1.2
 
 * Add characters

changes/24.1.3.md

@@ -0,0 +1,7 @@
+* Add Characters:
+  - LATIN CAPITAL LETTER INSULAR F (`U+A77B`) (#1786).
+  - LATIN SMALL LETTER INSULAR F (`U+A77C`) (#1786).
+  - LATIN CAPITAL LETTER INSULAR S (`U+A784`) (#1786).
+  - LATIN SMALL LETTER INSULAR S (`U+A785`) (#1786).
+* Fix missing U+1D7F mapping (#1787).
+* Fix shape of U serifs (#1788).

font-src/glyphs/auto-build/transformed.ptl

@@ -270,7 +270,7 @@ glyph-block Autobuild-Transformed : begin
 			list 0x107A1 'turnyBelt'
 			list 0x1079C 'smcpLBelt'
 			list 0x107A0 'turny'
-			list 0x107A6 'turnrlongleg'
+			list 0x107A6 'turnrLongLeg'
 			list 0x107A7 'rTurnLongLetRTail'
 			list 0x10780 'smcpAA'
 			list 0x10785 'bHookTop'

font-src/glyphs/letter/greek/upper-omega.ptl

@@ -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 : SetGrekUpperTonos
+	glyph-block-import Letter-Shared : CreateAccentedComposition SetGrekUpperTonos
 
 	define [UpperOmegaShape top extend ada adb] : glyph-proc
 		local fine : Stroke * CThin
@@ -47,3 +47,4 @@ glyph-block Letter-Greek-Upper-Omega : begin
 		include : FlipAround Middle (CAP / 2)
 
 	turned 'latn/upsilon' 0x28A 'grek/smcpOmega' Middle (XH / 2)
+	CreateAccentedComposition 'latn/upsilonStroke' 0x1D7F 'latn/upsilon' 'longBarOver'

font-src/glyphs/letter/latin/lower-r.ptl

@@ -186,7 +186,7 @@ glyph-block Letter-Latin-Lower-R : begin
 			include : df.markSet.e
 			include : F df mode doTS doBS
 
-		create-glyph "rlongleg.\(suffix)" : glyph-proc
+		create-glyph "rLongLeg.\(suffix)" : glyph-proc
 			set-width df.width
 			include : df.markSet.p
 			define [object xBar rBottomSerif] : RDim df mode
@@ -195,6 +195,25 @@ glyph-block Letter-Latin-Lower-R : begin
 			include : VBar.r xBar Descender 0
 			if doBS : include : rBottomSerif Descender
 
+		create-glyph "rCapLongLeg.\(suffix)" : glyph-proc
+			set-width df.width
+			include : df.markSet.capDesc
+			define [object xBar rBottomSerif] : RDim df mode
+			include : WithTransform [ApparentTranslate 0 (CAP - XH)] : F df mode doTS 0
+			eject-contour 'serifLB'
+			include : VBar.r xBar Descender (CAP - XH)
+			if doBS : include : rBottomSerif Descender
+
+		create-glyph "fInsular.\(suffix)" : glyph-proc
+			include [refer-glyph "rLongLeg.\(suffix)"] AS_BASE ALSO_METRICS
+			define [object xBar rHookX] : RDim df mode
+			include : HBar.b xBar (rHookX - [Math.max (0.15 * (df.rightSB - df.leftSB)) (0.25 * HVContrast * Stroke)]) 0
+
+		create-glyph "FInsular.\(suffix)" : glyph-proc
+			include [refer-glyph "rCapLongLeg.\(suffix)"] AS_BASE ALSO_METRICS
+			define [object xBar rHookX] : RDim df mode
+			include : HBar.b xBar (rHookX - [Math.max (0.15 * (df.rightSB - df.leftSB)) (0.25 * HVContrast * Stroke)]) 0
+
 		create-glyph "rPalatalHook.\(suffix)" : glyph-proc
 			include [refer-glyph "r.\(suffix)"] AS_BASE ALSO_METRICS
 			local attach : currentGlyph.gizmo.unapply currentGlyph.baseAnchors.palatalHookAttach
@@ -219,7 +238,7 @@ glyph-block Letter-Latin-Lower-R : begin
 			include : VerticalHook.r (df.rightSB - xBar + df.leftSB + Stroke * HVContrast) 0 HookX Hook
 
 		create-glyph "rTurnLongLetRTail.\(suffix)" : glyph-proc
-			include [refer-glyph "rlongleg.\(suffix)"] AS_BASE ALSO_METRICS
+			include [refer-glyph "rLongLeg.\(suffix)"] AS_BASE ALSO_METRICS
 			eject-contour 'serifLT'
 			include : FlipAround df.middle (XH / 2)
 			include : df.markSet.if
@@ -237,8 +256,12 @@ glyph-block Letter-Latin-Lower-R : begin
 	CreateAccentedComposition 'rTildeOver' 0x1D72 'r' 'tildeOver'
 	turned 'turnrTildeOver' 0xAB68 'rTildeOver' HalfAdvance (XH / 2) [TurnRMarks 'e']
 
-	select-variant 'rlongleg' 0x27C (follow -- 'r')
-	turned 'turnrlongleg' 0x27A 'rlongleg' HalfAdvance (XH / 2) [TurnRMarks 'b']
+	select-variant 'rLongLeg' 0x27C (follow -- 'r')
+	select-variant 'SInsular' 0xA784 (shapeFrom -- 'rCapLongLeg') (follow -- 'rRTail')
+	select-variant 'sInsular' 0xA785 (shapeFrom -- 'rLongLeg') (follow -- 'rRTail')
+	select-variant 'FInsular' 0xA77B (follow -- 'rRTail')
+	select-variant 'fInsular' 0xA77C (follow -- 'rRTail')
+	turned 'turnrLongLeg' 0x27A 'rLongLeg' HalfAdvance (XH / 2) [TurnRMarks 'b']
 
 	select-variant 'rRTail' 0x27D
 	turned 'smallLetterTurnedRWithTail' 0x2C79 'rRTail' HalfAdvance (XH / 2) : glyph-proc

font-src/glyphs/letter/latin/u.ptl

@@ -127,7 +127,9 @@ glyph-block Letter-Latin-U : begin
 	define [SmallUMotionTailedSlabs df top] : glyph-proc
 		include : UTopLeftSerif df top
 
-	define [ToothlessSlabs df top] : let [sf : SerifFrame.fromDf df top 0] : composite-proc sf.lt.full sf.rt.full
+	define [ToothlessSlabs df top] : begin
+		local sf : SerifFrame.fromDf df top 0
+		return : composite-proc sf.lt.full sf.rt.full
 
 	define CapitalUConfig : SuffixCfg.weave
 		object # body
@@ -144,7 +146,7 @@ glyph-block Letter-Latin-U : begin
 			serifed : match body
 				[Just 'toothed']    { SmallUSlabs                  true  }
 				[Just 'tailed']     { SmallUTailedSlabs            true  }
-				__                  { SmallUToothlessSlabs         true  }
+				__                  { ToothlessSlabs               true  }
 
 	foreach { suffix { Base {Slabs fLTSlab} } } [Object.entries CapitalUConfig] : do
 		create-glyph "U.\(suffix)" : glyph-proc