Improve of component glyph coloring of non-equal ligation (like !=).

changes/4.0.1.md

@@ -0,0 +1 @@
+ * Improve of component glyph coloring of non-equal ligation (like `!=`).

font-src/glyphs/space/index.ptl

@@ -28,7 +28,7 @@ glyph-block Symbol-Mosaic-NotDef : begin
 		set-width df.width
 		include : df.markSet.e
 
-	create-glyph 'ensp' 0x2002 : glyph-proc
+	create-glyph 'sp1' : glyph-proc
 		local df : DivFrame 1
 		set-width df.width
 
@@ -41,9 +41,10 @@ glyph-block Symbol-Mosaic-NotDef : begin
 	alias 'threePerEmsp' 0x2004 'space'
 	alias 'fourPerEmsp' 0x2005 'space'
 	alias 'sixPerEmsp' 0x2006 'space'
-	alias 'enquad' 0x2000 'ensp'
+	alias 'enquad' 0x2000 'sp1'
-	alias 'brailleBlank' 0x2800 'ensp'
+	alias 'ensp' 0x2002 'sp1'
-	alias 'figureSpace' 0x2007 'ensp'
+	alias 'brailleBlank' 0x2800 'sp1'
+	alias 'figureSpace' 0x2007 'sp1'
 
 	for-width-kinds WideWidth1
 		create-glyph [MangleName 'emsp'] [MangleUnicode 0x2003] : glyph-proc

font-src/glyphs/symbol/ligation.ptl

@@ -200,10 +200,26 @@ glyph-block Symbol-Ligation : begin
 		create-glyph 'equal.cc' : glyph-proc
 			include : difference
 				EqualShape joiningOverlap (Width - joiningOverlap)
-				union
 				EqualHole 0
 				EqualHole Width
 
+		create-glyph 'equal.fc+cc' : glyph-proc
+			include : difference
+				EqualShape (SB - Width) (Width - joiningOverlap)
+				EqualHole 0
+				EqualHole Width
+
+		create-glyph 'equal.fc+cf' : glyph-proc
+			include : difference
+				EqualShape (SB - Width) RightSB
+				EqualHole 0
+
+		create-glyph 'equal.cc+cf' : glyph-proc
+			include : difference
+				EqualShape (joiningOverlap - Width) RightSB
+				EqualHole (-Width)
+				EqualHole 0
+
 		create-glyph 'ident.fc' : glyph-proc
 			include : difference
 				IdentShape SB (Width - joiningOverlap)
@@ -222,10 +238,26 @@ glyph-block Symbol-Ligation : begin
 		create-glyph 'ident.cc' : glyph-proc
 			include : difference
 				IdentShape joiningOverlap (Width - joiningOverlap)
-				union
 				IdentHole 0
 				IdentHole Width
 
+		create-glyph 'ident.fc+cc' : glyph-proc
+			include : difference
+				IdentShape (SB - Width) (Width - joiningOverlap)
+				IdentHole 0
+				IdentHole Width
+
+		create-glyph 'ident.fc+cf' : glyph-proc
+			include : difference
+				IdentShape (SB - Width) RightSB
+				IdentHole 0
+
+		create-glyph 'ident.cc+cf' : glyph-proc
+			include : difference
+				IdentShape (joiningOverlap - Width) RightSB
+				IdentHole (-Width)
+				IdentHole 0
+
 		glyph-block-import NotGlyphFn : notGlyph
 
 		define [slash t b l r sw sh] : dispiro
@@ -244,20 +276,15 @@ glyph-block Symbol-Ligation : begin
 						flat (sh + l) b
 						curl (sh + r) t
 
-		notGlyph.generic 'equal.fc.neg'  null 'equal.fc' (shift -- (Width * 0.5)) (F -- slash)
+		notGlyph.generic 'neq.1' null 'sp1' (shift -- (Width * 0.0)) (F -- slash)
-		notGlyph.generic 'equal.fc.neg3' null 'equal.fc' (shift -- (Width * 1.0)) (F -- slash)
+		notGlyph.generic 'neq.2' null 'sp1' (shift -- (Width * 0.5)) (F -- slash)
-		notGlyph.generic 'equal.fc.neg4' null 'equal.fc' (shift -- (Width * 1.5)) (F -- slash)
+		notGlyph.generic 'neq.3' null 'sp1' (shift -- (Width * 1.0)) (F -- slash)
-		notGlyph.generic 'ident.fc.neg'  null 'ident.fc' (shift -- (Width * 0.5)) (F -- slash)
+		notGlyph.generic 'neq.4' null 'sp1' (shift -- (Width * 1.5)) (F -- slash)
-		notGlyph.generic 'ident.fc.neg3' null 'ident.fc' (shift -- (Width * 1.0)) (F -- slash)
-		notGlyph.generic 'ident.fc.neg4' null 'ident.fc' (shift -- (Width * 1.5)) (F -- slash)
 
-		notGlyph.generic 'equal.fc.neg-dotted'  null 'equal.fc' (shift -- (Width * 0.5)) (F -- exSlash2)
+		notGlyph.generic 'neq.1-dotted' null 'sp1' (shift -- (Width * 0.0)) (F -- exSlash2)
-		notGlyph.generic 'equal.fc.neg3-dotted' null 'equal.fc' (shift -- (Width * 1.0)) (F -- exSlash2)
+		notGlyph.generic 'neq.2-dotted' null 'sp1' (shift -- (Width * 0.5)) (F -- exSlash2)
-		notGlyph.generic 'equal.fc.neg4-dotted' null 'equal.fc' (shift -- (Width * 1.5)) (F -- exSlash2)
+		notGlyph.generic 'neq.3-dotted' null 'sp1' (shift -- (Width * 1.0)) (F -- exSlash2)
-
+		notGlyph.generic 'neq.4-dotted' null 'sp1' (shift -- (Width * 1.5)) (F -- exSlash2)
-		notGlyph.generic 'ident.fc.neg-dotted'  null 'ident.fc' (shift -- (Width * 0.5)) (F -- exSlash2)
-		notGlyph.generic 'ident.fc.neg3-dotted' null 'ident.fc' (shift -- (Width * 1.0)) (F -- exSlash2)
-		notGlyph.generic 'ident.fc.neg4-dotted' null 'ident.fc' (shift -- (Width * 1.5)) (F -- exSlash2)
 
 	do "<| , |> and <>"
 		glyph-block-import Symbol-Math-Relation : LessShape GreaterShape

font-src/otl/gsub-ligation.ptl

@@ -759,39 +759,43 @@ define [buildLigationsImpl sink para featureName mappedFeature rankedLookups] :
 			bar           ~> look-around
 
 	# == and !=, and other related
-	do "equals" : CreateLigationLookup : list
+	do "equals" : begin
-		# Disable regular expression lookaheads
+		define AnyEqualEnding {'equal' 'equal.cf' 'equal.jf' 'equal.fc+cf' 'ident.cf' 'ident.cc+cf'}
-		chain-rule
+		CreateLigationLookup : list
-			{'parenLeft'} ~> look-around
-			{'question'}  ~> look-around
-			regexLookAround ~> advance
-			regexLookAround ~> advance
-			regexLookAround ~> advance
-			regexLookAround ~> advance
-		chain-rule
-			{'parenLeft'} ~> look-around
-			{'question'}  ~> look-around
-			regexLookAround ~> advance
-			regexLookAround ~> advance
-			regexLookAround ~> advance
-		chain-rule
-			{'parenLeft'} ~> look-around
-			{'question'}  ~> look-around
-			regexLookAround ~> advance
-			regexLookAround ~> advance
 			piecewise
 				[hasLG 'eqeq'] : chain-rule
 					{'equal.cf' 'equal.jf'} ~> look-around
 					equal                   ~> {'equal.jf'}
+			piecewise
+				[hasLG 'eqexeq-dotted'] : chain-rule
+					equal       ~> {'ident.fc'}
+					exclam      ~> {'neq.1-dotted'}
+					equal       ~> {'ident.cc+cf'}
+				[hasLG 'eqexeq'] : chain-rule
+					equal       ~> {'ident.fc'}
+					exclam      ~> {'neq.1'}
+					equal       ~> {'ident.cc+cf'}
+				[hasLG 'eqexeq-dl-dotted'] : chain-rule
+					equal       ~> {'equal.fc'}
+					exclam      ~> {'neq.1-dotted'}
+					equal       ~> {'equal.cc+cf'}
+				[hasLG 'eqexeq-dl'] : chain-rule
+					equal       ~> {'equal.fc'}
+					exclam      ~> {'neq.1'}
+					equal       ~> {'equal.cc+cf'}
+				true : chain-rule
+					AnyEqualEnding ~> look-around
+					exclam         ~> advance
+					equal          ~> look-around
 			piecewise
 				[hasLG 'exeq-dotted'] : chain-rule
-				exclam      ~> {'equal.fc.neg4-dotted'}
+					exclam      ~> {'neq.4-dotted'}
-				equal       ~> {'equal.cc'}
+					equal       ~> {'equal.fc+cc'}
 					equal       ~> {'equal.cc'}
 					equal       ~> {'equal.cf'}
 				[hasLG 'exeq'] : chain-rule
-				exclam      ~> {'equal.fc.neg4'}
+					exclam      ~> {'neq.4'}
-				equal       ~> {'equal.cc'}
+					equal       ~> {'equal.fc+cc'}
 					equal       ~> {'equal.cc'}
 					equal       ~> {'equal.cf'}
 			piecewise
@@ -802,46 +806,30 @@ define [buildLigationsImpl sink para featureName mappedFeature rankedLookups] :
 					equal       ~> {'equal.cf'}
 			piecewise
 				[hasLG 'exeqeq-dotted'] : chain-rule
-				exclam      ~> {'ident.fc.neg3-dotted'}
+					exclam      ~> {'neq.3-dotted'}
-				equal       ~> {'ident.cc'}
+					equal       ~> {'ident.fc+cc'}
 					equal       ~> {'ident.cf'}
 				[hasLG 'exeqeq'] : chain-rule
-				exclam      ~> {'ident.fc.neg3'}
+					exclam      ~> {'neq.3'}
-				equal       ~> {'ident.cc'}
+					equal       ~> {'ident.fc+cc'}
 					equal       ~> {'ident.cf'}
-			[hasLG 'eqexeq-dotted'] : chain-rule
-				equal       ~> {'ident.fc.neg3-dotted'}
-				exclam      ~> {'ident.cc'}
-				equal       ~> {'ident.cf'}
-			[hasLG 'eqexeq'] : chain-rule
-				equal       ~> {'ident.fc.neg3'}
-				exclam      ~> {'ident.cc'}
-				equal       ~> {'ident.cf'}
-			[hasLG 'eqexeq-dl-dotted'] : chain-rule
-				equal       ~> {'equal.fc.neg3-dotted'}
-				exclam      ~> {'equal.cc'}
-				equal       ~> {'equal.cf'}
-			[hasLG 'eqexeq-dl'] : chain-rule
-				equal       ~> {'equal.fc.neg3'}
-				exclam      ~> {'equal.cc'}
-				equal       ~> {'equal.cf'}
 				[hasLG 'exeq-dotted'] : chain-rule
-				exclam      ~> {'equal.fc.neg3-dotted'}
+					exclam      ~> {'neq.3-dotted'}
-				equal       ~> {'equal.cc'}
+					equal       ~> {'equal.fc+cc'}
 					equal       ~> {'equal.cf'}
 				[hasLG 'exeq'] : chain-rule
-				exclam      ~> {'equal.fc.neg3'}
+					exclam      ~> {'neq.3'}
-				equal       ~> {'equal.cc'}
+					equal       ~> {'equal.fc+cc'}
 					equal       ~> {'equal.cf'}
 			piecewise
 				[hasLG 'eqslasheq'] : chain-rule
-				equal       ~> {'ident.fc.neg3'}
+					equal       ~> {'ident.fc'}
-				slash       ~> {'ident.cc'}
+					slash       ~> {'neq.1'}
-				equal       ~> {'ident.cf'}
+					equal       ~> {'ident.cc+cf'}
 				[hasLG 'slasheq'] : chain-rule
-				equal       ~> {'equal.fc.neg3'}
+					equal       ~> {'equal.fc'}
-				slash       ~> {'equal.cc'}
+					slash       ~> {'neq.1'}
-				equal       ~> {'equal.cf'}
+					equal       ~> {'equal.cc+cf'}
 			piecewise
 				[hasLG 'eqeqeq'] : chain-rule
 					equal       ~> {'ident.fc'}
@@ -849,26 +837,26 @@ define [buildLigationsImpl sink para featureName mappedFeature rankedLookups] :
 					equal       ~> {'ident.cf'}
 			piecewise
 				[hasLG 'tildeeq'] : chain-rule
-				anyWave     ~> [just 'equal.fc.neg']
+					anyWave     ~> [just 'neq.2']
-				equal       ~> {'equal.cf'}
+					equal       ~> {'equal.fc+cf'}
 			piecewise
 				[hasLG 'slasheq'] : chain-rule
-				slash       ~> {'equal.fc.neg'}
+					slash       ~> {'neq.2'}
-				equal       ~> {'equal.cf'}
+					equal       ~> {'equal.fc+cf'}
 			piecewise
 				[hasLG 'exeq-dotted'] : chain-rule
-				exclam      ~> {'equal.fc.neg-dotted'}
+					exclam      ~> {'neq.2-dotted'}
-				equal       ~> {'equal.cf'}
+					equal       ~> {'equal.fc+cf'}
 				[hasLG 'exeq'] : chain-rule
-				exclam      ~> {'equal.fc.neg'}
+					exclam      ~> {'neq.2'}
-				equal       ~> {'equal.cf'}
+					equal       ~> {'equal.fc+cf'}
 			piecewise
 				[hasLG 'ltgt-diamond'] : chain-rule
 					lessAndEquiv ~> [just 'less.lig.diamond']
 					greaterAndEquiv ~> [just 'greater.lig.diamond']
 				[hasLG 'ltgt-ne'] : chain-rule
-				lessAndEquiv ~> [just 'equal.fc.neg']
+					lessAndEquiv ~> [just 'neq.2']
-				greaterAndEquiv ~> [just 'equal.cf']
+					greaterAndEquiv ~> [just 'equal.fc+cf']
 			piecewise
 				[hasLG 'eqeq'] : chain-rule
 					equal       ~> {'equal.fc'}