italic temidhook (be5invis#2119)

Logo121 · Dec 16, 2023 · c038fcd · c038fcd
1 parent 31a1926
commit c038fcd
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 21 deletions.
diff --git a/changes/28.0.1.md b/changes/28.0.1.md
@@ -0,0 +1 @@
+* Add italic form of CYRILLIC SMALL LETTER TE WITH MIDDLE HOOK (`U+A68A`) (#2119).
diff --git a/packages/font-glyphs/src/letter/cyrillic/orthography.ptl b/packages/font-glyphs/src/letter/cyrillic/orthography.ptl
@@ -8,6 +8,7 @@ glyph-block Letter-Cyrillic-Orthography : begin
 
 	orthographic-italic 'cyrl/de'             0x434
 	orthographic-italic 'cyrl/dzhe'           0x45F
+	orthographic-italic 'cyrl/dzze'           0xA689
 	orthographic-italic 'cyrl/dzzhe'          0x52B
 	orthographic-italic 'cyrl/i'              0x438
 	orthographic-italic 'cyrl/iShortTail'     0x48B
@@ -16,6 +17,8 @@ glyph-block Letter-Cyrillic-Orthography : begin
 	orthographic-italic 'cyrl/te'             0x442
 	orthographic-italic 'cyrl/teDescender'    0x4AD
 	orthographic-italic 'cyrl/tse'            0x446
+	orthographic-italic 'cyrl/teMidHook'      0xA68B
+	orthographic-italic 'cyrl/teThreeLeg'     0x1C85
 	orthographic-italic 'cyrl/tetse'          0x4B5
 	orthographic-italic 'cyrl/tjeKomi'        0x50F
 	orthographic-italic 'cyrl/yat'            0x463
@@ -29,8 +32,6 @@ glyph-block Letter-Cyrillic-Orthography : begin
 	orthographic-italic 'cyrl/gheDescender'   0x4F7
 	orthographic-italic 'cyrl/ve'             0x432
 	orthographic-italic 'cyrl/gheStrokeHook'  0x4FB
-	orthographic-italic 'cyrl/teThreeLeg'     0x1C85
-	orthographic-italic 'cyrl/dzze'           0xA689
 	orthographic-italic 'latn/yatSakha'       0xAB60
 
 	# Accented forms

diff --git a/packages/font-glyphs/src/letter/cyrillic/te-midhook.ptl b/packages/font-glyphs/src/letter/cyrillic/te-midhook.ptl
@@ -26,9 +26,10 @@ glyph-block Letter-Cyrillic-Te-MidHook : begin
 		include : MidHook.general
 			left   -- (left + [HSwToV sw])
 			right  -- RightSB
-			top    -- top * HBarPos + Stroke / 4
+			top    -- top * HBarPos + sw / 4
 			ada    -- ArchDepthA * pArc
 			adb    -- ArchDepthB * pArc
+			sw     -- sw
 
 		if slabTop : begin
 			local swVJut : Math.min [AdviceStroke 4.5] (0.625 * (left - xTopBarLeft))
@@ -49,9 +50,9 @@ glyph-block Letter-Cyrillic-Te-MidHook : begin
 			include : MarkSet.capDesc
 			include : Shape CAP 1 doST doSB
 
-		create-glyph "cyrl/teMidHook.\(suffix)" : glyph-proc
+		create-glyph "cyrl/teMidHook.upright.\(suffix)" : glyph-proc
 			include : MarkSet.p
 			include : Shape XH [Math.pow HBarPos 0.3] doST doSB
 
 	select-variant 'cyrl/TeMidHook' 0xA68A (follow -- 'T')
-	select-variant 'cyrl/teMidHook' 0xA68B (follow -- 'T')
+	select-variant 'cyrl/teMidHook.upright' (follow -- 'T')
diff --git a/packages/font-glyphs/src/letter/latin/lower-m.ptl b/packages/font-glyphs/src/letter/latin/lower-m.ptl
@@ -11,7 +11,7 @@ glyph-block Letter-Latin-Lower-M : begin
 	glyph-block-import Mark-Adjustment : LeaningAnchor
 	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
+	glyph-block-import Letter-Shared-Shapes : CyrDescender PalatalHook MidHook CurlyTail UpwardHookShape
 
 	define [SmallMSmooth df] : df.div * (0.5 * SmallArchDepth + 0.375 * Stroke)
 	define [SmallMShoulderSpiro] : with-params [left right top bottom width fine df coBottom] : glyph-proc
@@ -259,23 +259,37 @@ glyph-block Letter-Latin-Lower-M : begin
 
 			include : Serifs df XH 0 [if shortLeg [SmallMShortLegHeight XH df] 0] 0 true earless
 
-		if (Body === SmallMArches && shortLeg == 0 && tailed == 0) : begin
-			create-glyph "cyrl/tjeKomi.italic.\(suffix)" : glyph-proc
+		if (Body === SmallMArches && shortLeg == 0) : begin
+			if (tailed == 0) : begin
+				create-glyph "cyrl/tjeKomi.italic.\(suffix)" : glyph-proc
+					local df : include : DivFrame para.diversityM 4
+					include : df.markSet.e
+					local subDf : df.slice 4 3 0
+					include : Body subDf XH 0 0 (XH / 2)
+					include : UpwardHookShape
+						left -- subDf.rightSB - [HSwToV subDf.mvs]
+						right -- df.rightSB
+						ybegin -- (XH / 2)
+						yend -- (XH / 2)
+						ada -- (SmallArchDepthA * 0.6 * df.div)
+						adb -- (SmallArchDepthB * 0.6 * df.div)
+						sw -- subDf.mvs
+					include : Serifs subDf XH 0 0 (XH / 2) true false
+					local sf2 : [SerifFrame.fromDf df (XH / 2) 0].slice 2 3
+					if SLAB : include sf2.rt.full
+
+			create-glyph "cyrl/teMidHook.italic.\(suffix)" : glyph-proc
 				local df : include : DivFrame para.diversityM 4
 				include : df.markSet.e
-				local subDf : df.slice 4 3 0
-				include : Body subDf XH 0 0 (XH / 2)
-				include : UpwardHookShape
-					left -- subDf.rightSB - [HSwToV subDf.mvs]
-					right -- df.rightSB
-					ybegin -- (XH / 2)
-					yend -- (XH / 2)
-					ada -- (SmallArchDepthA * 0.6 * df.div)
-					adb -- (SmallArchDepthB * 0.6 * df.div)
-					sw -- subDf.mvs
-				include : Serifs subDf XH 0 0 (XH / 2) true false
-				local sf2 : [SerifFrame.fromDf df (XH / 2) 0].slice 2 3
-				if SLAB : include sf2.rt.full
+				local subDf : df.slice 4 3 0	
+				include : mShapeBody subDf XH
+				include : MidHook.general
+					left   -- subDf.rightSB
+					right  -- df.rightSB
+					top    -- XH * 0.625 + df.mvs / 4
+					ada    -- ArchDepthA
+					adb    -- ArchDepthB
+					sw     -- subDf.mvs
 
 	select-variant 'm' 'm'
 	select-variant 'm/descBase' (shapeFrom -- 'm')
@@ -284,6 +298,7 @@ glyph-block Letter-Latin-Lower-M : begin
 	select-variant 'cyrl/te.italic' (shapeFrom -- 'm')
 	select-variant 'cyrl/te.italic/descBase' (shapeFrom -- 'm')
 	select-variant 'cyrl/tjeKomi.italic'
+	select-variant 'cyrl/teMidHook.italic' (follow -- 'cyrl/te.italic')
 	alias 'cyrl/te.BGR' null 'cyrl/te.italic'
 	alias 'cyrl/teThreeLeg.italic' null 'cyrl/te.italic'
 	derive-composites 'cyrl/teDescender.italic' null 'cyrl/te.italic/descBase' : do