A couple obscure last-minute fixes + code cleanup. (#2423)

* Fix tailedTopLeftSerifed variants for nHookLeft.

* Make telephone and fax sign slightly wider.

packages/font-glyphs/src/auto-build/composite.ptl

@@ -1645,7 +1645,7 @@ glyph-block Autobuild-Pnonetic-Ligatures : begin
 		list 0xFB03  { 'f/compLigLeft1' 'f/compLigLeft1' 'dotlessi/compLigRight' } null
 		list 0xFB04  { 'f/compLigLeft3' 'f/compLigLeft2' 'l/compLigRight'        } null
 
-	createPhoneticLigatures ToLetter 'phonetic3' [mix 1 para.diversityM (2 * XH / CAP)] 3 1 0.5 : list
+	createPhoneticLigatures ToLetter 'phonetic3' [mix 1 para.diversityM 2] 3 1 0.5 : list
 		list 0x2121  { 'smcpT' 'smcpE' 'smcpL' } 'e'
 		list 0x213B  { 'smcpF' 'smcpA' 'smcpX' } 'e'
 

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

@@ -201,8 +201,8 @@ glyph-block Autobuild-Transformed : begin
 			list 0x1DAB 'smcpL'
 			list 0x1DAC 'meng'
 			list 0x1DAD 'turnmLeg/reduced'
-			list 0x1DAE 'nLTail'
+			list 0x1DAE 'nHookLeft'
-			list 0x1DAF 'nHookBottom'
+			list 0x1DAF 'nRTail'
 			list 0x1DB0 'smcpN'
 			list 0x1DB1 'obar'
 			list 0x1DB2 'latn/phi'

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

@@ -142,7 +142,12 @@ glyph-block Letter-Latin-Lower-N : begin
 			if sLT : include : sLT [DivFrame 1] XH
 			if sLB : include : sLB [DivFrame 1] 0
 
-		if (!tailed) : create-glyph "nHookBottom.\(suffix)" : glyph-proc
+		create-glyph "nHookLeft.\(suffix)" : glyph-proc
+			include [refer-glyph "n.\(suffix)"] AS_BASE ALSO_METRICS
+			eject-contour 'serifLB'
+			include : PalatalHook.lExt SB 0
+
+		if (!tailed) : create-glyph "nRTail.\(suffix)" : glyph-proc
 			include : MarkSet.e
 			include : Body XH SB RightSB 0 Stroke
 			include : RetroflexHook.rExt RightSB 0
@@ -283,19 +288,19 @@ glyph-block Letter-Latin-Lower-N : begin
 	link-reduced-variant 'n/descBase' 'n'
 	select-variant 'cyrl/pe.italic' (shapeFrom -- 'n')
 	select-variant 'cyrl/pe.italic/descBase' (shapeFrom -- 'n')
-	select-variant 'n/lTailBase' (shapeFrom -- 'n')
 	alias 'cyrl/pe.BGR' null 'cyrl/pe.italic'
 
 	select-variant 'eng' 0x14B
 	link-reduced-variant 'eng/phoneticRight' 'eng'
-	select-variant 'nHookBottom' 0x273 (follow -- 'eng')
+	select-variant 'nHookLeft' 0x272
+	select-variant 'nRTail' 0x273 (follow -- 'eng')
 	select-variant 'nCurlyTail' 0x235 (follow -- 'eng')
 	select-variant 'nCrossedTail' 0xAB3B (follow -- 'eng')
 	select-variant 'engCrossedTail' 0xAB3C (follow -- 'eng')
 	select-variant 'engPalatalHook' 0x1DF14 (follow -- 'eng')
 
-	select-variant 'RInsular' 0xA782 (follow -- 'eng/lTailBase')
+	select-variant 'RInsular' 0xA782 (follow -- 'engHookLeft')
-	select-variant 'rInsular' 0xA783 (follow -- 'eng/lTailBase')
+	select-variant 'rInsular' 0xA783 (follow -- 'engHookLeft')
 
 	select-variant 'grek/eta' 0x3B7
 	link-reduced-variant 'grek/eta/sansSerif' 'grek/eta' MathSansSerif
@@ -318,11 +323,6 @@ glyph-block Letter-Latin-Lower-N : begin
 
 		derive-composites 'nApostrophe' 0x149 'n' 'nApostrophe/comma'
 
-	derive-glyphs 'nLTail' 0x272 'n/lTailBase' : lambda [src srl] : glyph-proc
-		include [refer-glyph src] AS_BASE ALSO_METRICS
-		eject-contour 'serifLB'
-		include : PalatalHook.lExt SB 0
-
 	glyph-block-import Letter-Blackboard : BBS BBD BBBarLeft
 	create-glyph 'mathbb/n' 0x1D55F : glyph-proc
 		local df : include : DivFrame 1 2

params/variants.toml

@@ -3076,10 +3076,10 @@ keyAffix = ""
 selectorAffix.n = ""
 selectorAffix."n/sansSerif" = ""
 selectorAffix."n/descBase" = ""
-selectorAffix."n/lTailBase" = ""
+selectorAffix.nHookLeft = ""
 selectorAffix.eng = ""
 selectorAffix."eng/phoneticRight" = ""
-selectorAffix."eng/lTailBase" = ""
+selectorAffix.engHookLeft = ""
 selectorAffix."grek/eta" = ""
 selectorAffix."grek/eta/sansSerif" = ""
 selectorAffix."cyrl/pe.italic" = ""
@@ -3093,10 +3093,10 @@ descriptionAffix = "earless (corner top-left) body shape"
 selectorAffix.n = "earlessCorner"
 selectorAffix."n/sansSerif" = "earlessCorner"
 selectorAffix."n/descBase" = "earlessCorner"
-selectorAffix."n/lTailBase" = "earlessCorner"
+selectorAffix.nHookLeft = "earlessCorner"
 selectorAffix.eng = "earlessCorner"
 selectorAffix."eng/phoneticRight" = "earlessCornerHTB"
-selectorAffix."eng/lTailBase" = "earlessCorner"
+selectorAffix.engHookLeft = "earlessCorner"
 selectorAffix."grek/eta" = "earlessCorner"
 selectorAffix."grek/eta/sansSerif" = "earlessCorner"
 selectorAffix."cyrl/pe.italic" = ""
@@ -3110,10 +3110,10 @@ descriptionAffix = "earless (rounded top-left) body shape"
 selectorAffix.n = "earlessRounded"
 selectorAffix."n/sansSerif" = "earlessRounded"
 selectorAffix."n/descBase" = "earlessRounded"
-selectorAffix."n/lTailBase" = "earlessRounded"
+selectorAffix.nHookLeft = "earlessRounded"
 selectorAffix.eng = "earlessRounded"
 selectorAffix."eng/phoneticRight" = "earlessRoundedHTB"
-selectorAffix."eng/lTailBase" = "earlessRounded"
+selectorAffix.engHookLeft = "earlessRounded"
 selectorAffix."grek/eta" = "earlessRounded"
 selectorAffix."grek/eta/sansSerif" = "earlessRounded"
 selectorAffix."cyrl/pe.italic" = ""
@@ -3130,10 +3130,10 @@ descriptionAffix = "straight terminal"
 selectorAffix.n = "straight"
 selectorAffix."n/sansSerif" = "straight"
 selectorAffix."n/descBase" = "straight"
-selectorAffix."n/lTailBase" = "straight"
+selectorAffix.nHookLeft = "straight"
 selectorAffix.eng = "straight"
 selectorAffix."eng/phoneticRight" = "straight"
-selectorAffix."eng/lTailBase" = "straight"
+selectorAffix.engHookLeft = "straight"
 selectorAffix."grek/eta" = "straight"
 selectorAffix."grek/eta/sansSerif" = "straight"
 selectorAffix."cyrl/pe.italic" = "straight"
@@ -3147,10 +3147,10 @@ descriptionAffix = "tailed terminal"
 selectorAffix.n = "tailed"
 selectorAffix."n/sansSerif" = "tailed"
 selectorAffix."n/descBase" = "straight"
-selectorAffix."n/lTailBase" = "tailed"
+selectorAffix.nHookLeft = "tailed"
 selectorAffix.eng = "straight"
 selectorAffix."eng/phoneticRight" = "straight"
-selectorAffix."eng/lTailBase" = "straight"
+selectorAffix.engHookLeft = "straight"
 selectorAffix."grek/eta" = "straight"
 selectorAffix."grek/eta/sansSerif" = "straight"
 selectorAffix."cyrl/pe.italic" = "tailed"
@@ -3165,10 +3165,10 @@ descriptionAffix = "serifs"
 selectorAffix.n = "serifless"
 selectorAffix."n/sansSerif" = "serifless"
 selectorAffix."n/descBase" = "serifless"
-selectorAffix."n/lTailBase" = "serifless"
+selectorAffix.nHookLeft = "serifless"
 selectorAffix.eng = "serifless"
 selectorAffix."eng/phoneticRight" = "topLeftSerifed"
-selectorAffix."eng/lTailBase" = "serifless"
+selectorAffix.engHookLeft = "serifless"
 selectorAffix."grek/eta" = "serifless"
 selectorAffix."grek/eta/sansSerif" = "serifless"
 selectorAffix."cyrl/pe.italic" = "serifless"
@@ -3183,10 +3183,10 @@ enableIf = [ { body = "eared", terminal = "NOT tailed" } ]
 selectorAffix.n = "topLeftSerifed"
 selectorAffix."n/sansSerif" = "serifless"
 selectorAffix."n/descBase" = "topLeftSerifed"
-selectorAffix."n/lTailBase" = "topLeftSerifed"
+selectorAffix.nHookLeft = "topLeftSerifed"
 selectorAffix.eng = "topLeftSerifed"
 selectorAffix."eng/phoneticRight" = "topLeftSerifed"
-selectorAffix."eng/lTailBase" = "topLeftSerifed"
+selectorAffix.engHookLeft = "topLeftSerifed"
 selectorAffix."grek/eta" = "topLeftSerifed"
 selectorAffix."grek/eta/sansSerif" = "serifless"
 selectorAffix."cyrl/pe.italic" = "topLeftSerifed"
@@ -3201,10 +3201,10 @@ disableIf = [ { body = "NOT eared", terminal = "tailed" } ]
 selectorAffix.n = "motionSerifed"
 selectorAffix."n/sansSerif" = "serifless"
 selectorAffix."n/descBase" = { if = [{ body = "eared" }], then = "topLeftSerifed", else = "serifless" }
-selectorAffix."n/lTailBase" = { if = [{ terminal = "straight" }], then = "motionSerifed", else = { if = [{ body = "normal" }], then = "topLeftSerifed", else = "serifless" } }
+selectorAffix.nHookLeft = { if = [{ terminal = "straight" }], then = "motionSerifed", else = { if = [{ body = "eared" }], then = "topLeftSerifed", else = "serifless" } }
 selectorAffix.eng = { if = [{ body = "eared" }], then = "topLeftSerifed", else = "serifless" }
 selectorAffix."eng/phoneticRight" = "topLeftSerifed"
-selectorAffix."eng/lTailBase" = { if = [{ body = "eared" }], then = "topLeftSerifed", else = "serifless" }
+selectorAffix.engHookLeft = { if = [{ body = "eared" }], then = "topLeftSerifed", else = "serifless" }
 selectorAffix."grek/eta" = { if = [{ body = "eared" }], then = "topLeftSerifed", else = "serifless" }
 selectorAffix."grek/eta/sansSerif" = "serifless"
 selectorAffix."cyrl/pe.italic" = "motionSerifed"
@@ -3218,10 +3218,10 @@ descriptionAffix = "serifs"
 selectorAffix.n = "serifed"
 selectorAffix."n/sansSerif" = "serifless"
 selectorAffix."n/descBase" = "serifed"
-selectorAffix."n/lTailBase" = { if = [{ terminal = "straight" }], then = "serifed", else = { if = [{ body = "normal" }], then = "topLeftSerifed", else = "serifless" } }
+selectorAffix.nHookLeft = { if = [{ terminal = "straight" }], then = "serifed", else = { if = [{ body = "eared" }], then = "topLeftSerifed", else = "serifless" } }
 selectorAffix.eng = "serifed"
 selectorAffix."eng/phoneticRight" = "serifed"
-selectorAffix."eng/lTailBase" = { if = [{ body = "eared" }], then = "topLeftSerifed", else = "serifless" }
+selectorAffix.engHookLeft = { if = [{ body = "eared" }], then = "topLeftSerifed", else = "serifless" }
 selectorAffix."grek/eta" = { if = [{ body = "eared" }], then = "topLeftSerifed", else = "serifless" }
 selectorAffix."grek/eta/sansSerif" = "serifless"
 selectorAffix."cyrl/pe.italic" = "serifed"