Add italic form for Combining Cyrillic Letter Es-Te (U+2DF5) (#2187).

changes/28.1.0.md

@@ -6,3 +6,4 @@
   - OVERLAPPING WHITE AND BLACK SQUARES (`U+2BBB`).
   - OVERLAPPING BLACK SQUARES (`U+2BBC`).
 * Fix metrics of Cyrillic Yery (#2182).
+* Add italic form for Combining Cyrillic Letter Es-Te (U+2DF5) (#2187).

packages/font-glyphs/src/common/shapes.ptl

@@ -436,7 +436,7 @@ glyph-block CommonShapes : begin
 		# Adjust terminal's position if necessary
 		toFinish.x = toFinish.x + OXHook * [if ltr (-1) 1] * [if isStart (-1) 1]
 		if (doSwash) : begin
-			toFinish.x = toFinish.x + TailAdjX * TanSlope
+			toFinish.x = toFinish.x + [Math.min TailAdjX (0.25 * (toFinish.x - toStraight.x))] * TanSlope
 			toFinish.y = toFinish.y - TailAdjY * [Math.abs TanSlope]
 
 		# Compute key middle knot

packages/font-glyphs/src/letter/latin-ext/lower-ae-oe.ptl

@@ -179,16 +179,15 @@ glyph-block Letter-Latin-Lower-AE-OE : begin
 			include : lf.full
 			include : FlipAround (subDf.width / 2) (XH / 2)
 
-		define SLAB-FLAT 3
+		define FLAT-CONNECTION 3
-		define [EsTeLeftShape df styBot] : new-glyph : glyph-proc
+		define [EsTeLeftShape subDf styBot] : new-glyph : glyph-proc
-			local subDf : df.sliceFine 3 2 (1/3)
+			local ada : subDf.archDepthA SmallArchDepth subDf.mvs
-			local ada : subDf.archDepthA SmallArchDepth df.mvs
+			local adb : subDf.archDepthB SmallArchDepth subDf.mvs
-			local adb : subDf.archDepthB SmallArchDepth df.mvs
 
-			local lf : CLetterForm subDf SLAB-FLAT styBot XH 0
+			local lf : CLetterForm subDf FLAT-CONNECTION styBot XH 0
-				ada -- [subDf.archDepthA SmallArchDepth df.mvs]
+				ada -- [subDf.archDepthA SmallArchDepth subDf.mvs]
-				adb -- [subDf.archDepthB SmallArchDepth df.mvs]
+				adb -- [subDf.archDepthB SmallArchDepth subDf.mvs]
-				sw  -- df.mvs
+				sw  -- subDf.mvs
 			include : lf.full
 
 		foreach { suffix { sty styBot } } [Object.entries CConfig] : do
@@ -198,11 +197,19 @@ glyph-block Letter-Latin-Lower-AE-OE : begin
 				set-base-anchor 'cvDecompose' 0 0
 				include : openOShape df sty styBot
 
-			create-glyph "cyrl/este/left.\(suffix)" : glyph-proc
+			create-glyph "cyrl/este.upright/left.\(suffix)" : glyph-proc
-				local df : include : DivFrame para.diversityM 3
+				local df : include : DivFrame para.diversityM 3.5
+				local subDfLeft : df.slice 3.25 1.875
 				include : df.markSet.e
 				set-base-anchor 'cvDecompose' 0 0
-				include : EsTeLeftShape df styBot
+				include : EsTeLeftShape subDfLeft styBot
+
+			create-glyph "cyrl/este.italic/left.\(suffix)" : glyph-proc
+				local df : include : DivFrame para.diversityM 4.75
+				local subDfLeft : df.slice 4.5 2
+				include : df.markSet.e
+				set-base-anchor 'cvDecompose' 0 0
+				include : EsTeLeftShape subDfLeft styBot
 
 	do "P/R subglyphs"
 		glyph-block-import Letter-Latin-Upper-P : PShape PBarPosY
@@ -296,24 +303,17 @@ glyph-block Letter-Latin-Lower-AE-OE : begin
 				local { subDf shift } : SubDfAndShiftEx 6 4 1 df
 				include : with-transform [ApparentTranslate shift 0] : LhaRightLetterShape subDf CAP 0 0.1 0.28
 
-	do "other subglyphs"
+	do "Te (upright) subglyphs"
-		# Te
+		define [EsTeRightShape subDf doTopSerifs doBottomSerifs] : new-glyph : glyph-proc
-		define [EsTeRightShape df doTopSerifs doBottomSerifs] : new-glyph : glyph-proc
+			include : VBar.m subDf.middle 0 XH subDf.mvs
-			local subDf : df.sliceFine 3 2 (1/3)
+			include : HBar.t subDf.leftSB subDf.rightSB XH subDf.mvs
-			# local shift : df.rightSB - subDf.rightSB
-			local l subDf.rightSB
-			local m : mix df.rightSB subDf.rightSB 0.5
-			local r : df.rightSB - 0.75 * OX
-
-			include : VBar.m m 0 XH df.mvs
-			include : HBar.t l r XH df.mvs
 
 			if doTopSerifs : begin
-				local swVJut : Math.min df.mvs (0.625 * (r - m - [HSwToV : 0.5 * df.mvs]))
+				local swVJut : Math.min subDf.mvs (0.625 * (subDf.rightSB - subDf.middle - [HSwToV : 0.5 * subDf.mvs]))
-				include : VSerif.dr r XH VJut swVJut
+				include : VSerif.dr subDf.rightSB XH VJut swVJut
 			if doBottomSerifs : begin
-				local midJutCenter : [Math.max Jut : mix [HSwToV : 0.5 * df.mvs] LongJut 0.6] * (subDf.width / df.width)
+				local midJutCenter : MidJutCenter * (subDf.width / Width)
-				include : tagged 'serifMB' : HSerif.rb m 0 midJutCenter df.mvs
+				include : tagged 'serifMB' : HSerif.mb subDf.middle 0 midJutCenter subDf.mvs
 
 		define TConfig : object
 			serifless     { false false }
@@ -321,13 +321,29 @@ glyph-block Letter-Latin-Lower-AE-OE : begin
 			serifed       { true  true  }
 
 		foreach { suffix { doST doSB } } [Object.entries TConfig] : do
-			create-glyph "cyrl/este/right.\(suffix)" : glyph-proc
+			create-glyph "cyrl/este.upright/right.\(suffix)" : glyph-proc
-				local df : DivFrame para.diversityM 3
+				local df : include : DivFrame para.diversityM 3.5
+				local subDfLeft : df.slice 3.25 1.875
+				local subdfRight : df.restCompact 1 subDfLeft 2
+
 				set-width 0
 				set-mark-anchor 'cvDecompose' 0 0
-				include : EsTeRightShape df doST doSB
+				include : EsTeRightShape subdfRight doST doSB
+				include : ApparentTranslate (df.width - subdfRight.width) 0
 
-		# El
+	do "Te (italic) subglyphs"
+		glyph-block-import Letter-Latin-Lower-M : mShapeBodyImpl SmallMConfig
+		foreach { suffix { {Body earless} {shortLeg} {tailed} {Serifs} } } [pairs-of SmallMConfig] : do
+			create-glyph "cyrl/este.italic/right.\(suffix)" : glyph-proc
+				local df : DivFrame para.diversityM 4.75
+				local subDfLeft : df.slice 4.5 2
+				local subdfRight : df.restCompact 0.5 subDfLeft 3
+				set-width 0
+				set-mark-anchor 'cvDecompose' 0 0
+				include : mShapeBodyImpl subdfRight XH Body earless shortLeg tailed Serifs
+				include : ApparentTranslate (df.width - subdfRight.width) 0
+
+	do "El subglyphs"
 		glyph-block-import Letter-Cyrillic-El : CyrElShape
 		create-glyph 'cyrl/Lha/left' : glyph-proc
 			local df : include : DivFrame para.diversityM 3.2
@@ -423,9 +439,13 @@ glyph-block Letter-Latin-Lower-AE-OE : begin
 	derive-composites 'cyrl/OOBinocular' 0xA66C 'cyrl/OO' 'OODots'
 	derive-composites 'cyrl/ooBinocular' 0xA66D 'cyrl/oo' 'ooDots'
 
-	select-variant 'cyrl/este/left' (follow -- 'cBottomSerifOnly')
+	select-variant 'cyrl/este.upright/left' (follow -- 'cBottomSerifOnly')
-	select-variant 'cyrl/este/right' (follow -- 'T')
+	select-variant 'cyrl/este.upright/right' (follow -- 'T')
-	derive-composites 'cyrl/este' null 'cyrl/este/left' 'cyrl/este/right'
+	derive-composites 'cyrl/este.upright' null 'cyrl/este.upright/left' 'cyrl/este.upright/right'
+
+	select-variant 'cyrl/este.italic/left' (follow -- 'cBottomSerifOnly')
+	select-variant 'cyrl/este.italic/right' (follow -- 'cyrl/este.italic/right')
+	derive-composites 'cyrl/este.italic' null 'cyrl/este.italic/left' 'cyrl/este.italic/right'
 
 	glyph-block-export BuildRha
 	define [BuildRha srcs] : glyph-proc

packages/font-glyphs/src/letter/latin-ext/orthography.ptl

@@ -5,5 +5,4 @@ glyph-module
 glyph-block Letter-Latin-Orthography : begin
 	glyph-block-import Common-Derivatives
 
-	# orthographic-italic 'f_i'      0xFB01
+	orthographic-italic "cyrl/este"
-	# orthographic-italic 'f_l'      0xFB02

packages/font-glyphs/src/letter/latin/c.ptl

@@ -33,7 +33,7 @@ glyph-block Letter-Latin-C : begin
 				g4 (df.middle - CorrectionOMidX * sw) (top - O - offset)
 				archv
 			[Just FLAT-CONNECTION] : list
-				flat (df.rightSB - offset) (top - offset)
+				flat (df.width - offset) (top - offset)
 				curl (df.middle - CorrectionOMidX * sw) (top - offset)
 				archv
 			_ : list
@@ -52,7 +52,7 @@ glyph-block Letter-Latin-C : begin
 			[Just FLAT-CONNECTION] : list
 				arcvh
 				flat (df.middle + CorrectionOMidX * sw) (bot + O + offset)
-				curl (df.rightSB - offset) (bot + O + offset)
+				curl (df.width - offset) (bot + O + offset)
 			_ : list
 				hookend (bot + O + offset)
 				g4 (df.rightSB - offset) (bot + [fallback hook Hook])
@@ -66,7 +66,7 @@ glyph-block Letter-Latin-C : begin
 				g4 (df.middle - CorrectionOMidX * sw) (top - O - offset)
 				archv
 			[Just FLAT-CONNECTION] : list
-				flat (df.leftSB + offset) (top - offset)
+				flat (0 + offset) (top - offset)
 				curl (df.middle - CorrectionOMidX * sw) (top - offset)
 				archv
 			_ : list
@@ -85,7 +85,7 @@ glyph-block Letter-Latin-C : begin
 			[Just FLAT-CONNECTION] : list
 				arcvh
 				flat (df.middle + CorrectionOMidX * sw) (bot + O + offset)
-				curl (df.leftSB + offset) (bot + O + offset)
+				curl (0 + offset) (bot + O + offset)
 			_ : list
 				hookend (bot + O + offset)
 				g4 (df.leftSB + offset) (bot + [fallback hook Hook])

packages/font-glyphs/src/letter/latin/lower-m.ptl

@@ -203,6 +203,13 @@ glyph-block Letter-Latin-Lower-M : begin
 			flat df.rightSB [Math.max (top - [SmallMSmooth df]) (rbot + 0.1)]
 			curl df.rightSB rbot [heading Downward]
 
+	glyph-block-export mShapeBodyImpl
+	define [mShapeBodyImpl df height body earless shortLeg tailed serifs] : glyph-proc
+		include : body df height 0 [if shortLeg [SmallMShortLegHeight height df] 0] [if tailed ([SmallMSmoothHeight height df] + O) 0]
+		if tailed : include : RightwardTailedBar df.rightSB 0 [SmallMSmoothHeight height df] (sw -- df.mvs)
+		include : serifs df height 0 [if shortLeg [SmallMShortLegHeight height df] 0] 0 tailed earless
+
+	glyph-block-export SmallMConfig
 	define SmallMConfig : SuffixCfg.weave
 		object
 			""                             { SmallMArches                        0 }
@@ -223,10 +230,8 @@ glyph-block Letter-Latin-Lower-M : begin
 			"topLeftAndBottomRightSerifed" { LtRbSerifs }
 
 	foreach { suffix { {Body earless} {shortLeg} {tailed} {Serifs} } } [pairs-of SmallMConfig] : do
-		define [mShapeBody df height] : glyph-proc
+		define [mShapeBody df height] : begin
-			include : Body df height 0 [if shortLeg [SmallMShortLegHeight height df] 0] [if tailed ([SmallMSmoothHeight height df] + O) 0]
+			return : mShapeBodyImpl df height Body earless shortLeg tailed Serifs
-			if tailed : include : RightwardTailedBar df.rightSB 0 [SmallMSmoothHeight height df] (sw -- df.mvs)
-			include : Serifs df height 0 [if shortLeg [SmallMShortLegHeight height df] 0] 0 tailed earless
 
 		create-glyph "m.\(suffix)" : glyph-proc
 			local df : include : dfM
@@ -280,7 +285,7 @@ glyph-block Letter-Latin-Lower-M : begin
 			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	
+				local subDf : df.slice 4 3 0
 				include : mShapeBody subDf XH
 				include : MidHook.general
 					left   -- subDf.rightSB

packages/font-glyphs/src/meta/aesthetics.ptl

@@ -471,6 +471,12 @@ export : define [GenDivFrame metrics] : begin
 
 			return : new CDivFrame subDfDiv keeps (this.leftSB / metrics.SB) this.mvs o
 
+		public [rest sub _hPack] : begin
+			return : new CDivFrame ((this.width - sub.width) / metrics.Width) [fallback _hPack (this.hPack - sub.hPack + 1)] (this.leftSB / metrics.SB) this.mvs this.ox
+		public [restCompact kKern sub _hPack] : begin
+			local kern : kKern * ((this.width - this.rightSB) + sub.leftSB)
+			return : new CDivFrame ((this.width - sub.width + kern) / metrics.Width) [fallback _hPack (this.hPack - sub.hPack + 1)] (this.leftSB / metrics.SB) this.mvs this.ox
+
 		public [applyToGlyph g] : begin
 			g.setWidth this.width
 			set g.divFrameParams this.params

params/variants.toml

@@ -2875,6 +2875,7 @@ selectorAffix.m = ""
 selectorAffix."m/descBase" = ""
 selectorAffix."m/sansSerif" = ""
 selectorAffix."cyrl/te.italic" = ""
+selectorAffix."cyrl/este.italic/right" = ""
 selectorAffix."cyrl/tjeKomi.italic" = ""
 selectorAffix.meng = ""
 
@@ -2886,6 +2887,7 @@ selectorAffix.m = "earlessCornerDoubleArch"
 selectorAffix."m/descBase" = "earlessCornerDoubleArch"
 selectorAffix."m/sansSerif" = "earlessCornerDoubleArch"
 selectorAffix."cyrl/te.italic" = ""
+selectorAffix."cyrl/este.italic/right" = ""
 selectorAffix."cyrl/tjeKomi.italic" = ""
 selectorAffix.meng = "earlessCornerDoubleArch"
 
@@ -2897,6 +2899,7 @@ selectorAffix.m = "earlessRoundedDoubleArch"
 selectorAffix."m/descBase" = "earlessRoundedDoubleArch"
 selectorAffix."m/sansSerif" = "earlessRoundedDoubleArch"
 selectorAffix."cyrl/te.italic" = ""
+selectorAffix."cyrl/este.italic/right" = ""
 selectorAffix."cyrl/tjeKomi.italic" = ""
 selectorAffix.meng = "earlessRoundedDoubleArch"
 
@@ -2908,6 +2911,7 @@ selectorAffix.m = "earlessSingleArch"
 selectorAffix."m/descBase" = "earlessSingleArch"
 selectorAffix."m/sansSerif" = "earlessSingleArch"
 selectorAffix."cyrl/te.italic" = ""
+selectorAffix."cyrl/este.italic/right" = ""
 selectorAffix."cyrl/tjeKomi.italic" = ""
 selectorAffix.meng = "earlessSingleArch"
 
@@ -2923,6 +2927,7 @@ selectorAffix.m = ""
 selectorAffix."m/descBase" = ""
 selectorAffix."m/sansSerif" = ""
 selectorAffix."cyrl/te.italic" = ""
+selectorAffix."cyrl/este.italic/right" = ""
 selectorAffix."cyrl/te.italic/descBase" = ""
 selectorAffix."cyrl/tjeKomi.italic" = ""
 selectorAffix.meng = ""
@@ -2935,6 +2940,7 @@ selectorAffix.m = "shortLeg"
 selectorAffix."m/descBase" = "shortLeg"
 selectorAffix."m/sansSerif" = "shortLeg"
 selectorAffix."cyrl/te.italic" = ""
+selectorAffix."cyrl/este.italic/right" = ""
 selectorAffix."cyrl/te.italic/descBase" = ""
 selectorAffix."cyrl/tjeKomi.italic" = ""
 selectorAffix.meng = "shortLeg"
@@ -2949,6 +2955,7 @@ selectorAffix.m = ""
 selectorAffix."m/descBase" = ""
 selectorAffix."m/sansSerif" = ""
 selectorAffix."cyrl/te.italic" = ""
+selectorAffix."cyrl/este.italic/right" = ""
 selectorAffix."cyrl/te.italic/descBase" = ""
 selectorAffix."cyrl/tjeKomi.italic" = ""
 selectorAffix.meng = ""
@@ -2960,6 +2967,7 @@ selectorAffix.m = "tailed"
 selectorAffix."m/descBase" = ""
 selectorAffix."m/sansSerif" = "tailed"
 selectorAffix."cyrl/te.italic" = "tailed"
+selectorAffix."cyrl/este.italic/right" = "tailed"
 selectorAffix."cyrl/te.italic/descBase" = ""
 selectorAffix."cyrl/tjeKomi.italic" = ""
 selectorAffix.meng = ""
@@ -2972,6 +2980,7 @@ selectorAffix.m = "serifless"
 selectorAffix."m/descBase" = "serifless"
 selectorAffix."m/sansSerif" = "serifless"
 selectorAffix."cyrl/te.italic" = "serifless"
+selectorAffix."cyrl/este.italic/right" = "serifless"
 selectorAffix."cyrl/te.italic/descBase" = "serifless"
 selectorAffix."cyrl/tjeKomi.italic" = "serifless"
 selectorAffix.meng = "serifless"
@@ -2984,6 +2993,7 @@ selectorAffix.m = "topLeftSerifed"
 selectorAffix."m/descBase" = "topLeftSerifed"
 selectorAffix."m/sansSerif" = "serifless"
 selectorAffix."cyrl/te.italic" = "topLeftSerifed"
+selectorAffix."cyrl/este.italic/right" = "serifless"
 selectorAffix."cyrl/te.italic/descBase" = "topLeftSerifed"
 selectorAffix."cyrl/tjeKomi.italic" = "topLeftSerifed"
 selectorAffix.meng = "topLeftSerifed"
@@ -2996,6 +3006,7 @@ selectorAffix.m = "topLeftAndBottomRightSerifed"
 selectorAffix."m/descBase" = "topLeftSerifed"
 selectorAffix."m/sansSerif" = "serifless"
 selectorAffix."cyrl/te.italic" = "topLeftAndBottomRightSerifed"
+selectorAffix."cyrl/este.italic/right" = "bottomRightSerifed"
 selectorAffix."cyrl/te.italic/descBase" = "topLeftSerifed"
 selectorAffix."cyrl/tjeKomi.italic" = "topLeftSerifed"
 selectorAffix.meng = "topLeftSerifed"
@@ -3008,6 +3019,7 @@ selectorAffix.m = "bottomRightSerifed"
 selectorAffix."m/descBase" = "serifless"
 selectorAffix."m/sansSerif" = "serifless"
 selectorAffix."cyrl/te.italic" = "topLeftAndBottomRightSerifed"
+selectorAffix."cyrl/este.italic/right" = "bottomRightSerifed"
 selectorAffix."cyrl/te.italic/descBase" = "topLeftSerifed"
 selectorAffix."cyrl/tjeKomi.italic" = "topLeftSerifed"
 selectorAffix.meng = "serifless"
@@ -3019,6 +3031,7 @@ selectorAffix.m = "serifed"
 selectorAffix."m/descBase" = "serifed"
 selectorAffix."m/sansSerif" = "serifless"
 selectorAffix."cyrl/te.italic" = "serifed"
+selectorAffix."cyrl/este.italic/right" = "serifed"
 selectorAffix."cyrl/te.italic/descBase" = "serifed"
 selectorAffix."cyrl/tjeKomi.italic" = "serifed"
 selectorAffix.meng = "serifed"