From d6f87b06c2cd306a1e4736f9dd74dd36fbedf5fc Mon Sep 17 00:00:00 2001
From: Rasmus Andersson <rasmus@notion.se>
Date: Sat, 18 Nov 2023 18:35:21 -0800
Subject: [PATCH] move fi ligature from liga to dlig

---
 src/Inter-Italic.glyphspackage/fontinfo.plist |  5 -----
 src/Inter-Roman.glyphspackage/fontinfo.plist  |  5 -----
 src/features/dlig.fea                         |  8 ++++++++
 src/features/liga.fea                         | 15 ---------------
 4 files changed, 8 insertions(+), 25 deletions(-)
 delete mode 100644 src/features/liga.fea

diff --git a/src/Inter-Italic.glyphspackage/fontinfo.plist b/src/Inter-Italic.glyphspackage/fontinfo.plist
index e1c10b11e..04243454a 100644
--- a/src/Inter-Italic.glyphspackage/fontinfo.plist
+++ b/src/Inter-Italic.glyphspackage/fontinfo.plist
@@ -2780,11 +2780,6 @@ code = "include(features/dlig.fea);
 tag = dlig;
 },
 {
-code = "include(features/liga.fea);
-";
-tag = liga;
-},
-{
 automatic = 1;
 code = "sub a by a.subs;
 sub b by b.subs;
diff --git a/src/Inter-Roman.glyphspackage/fontinfo.plist b/src/Inter-Roman.glyphspackage/fontinfo.plist
index 698631872..c2a384d87 100644
--- a/src/Inter-Roman.glyphspackage/fontinfo.plist
+++ b/src/Inter-Roman.glyphspackage/fontinfo.plist
@@ -2776,11 +2776,6 @@ code = "include(features/calt.fea);
 tag = calt;
 },
 {
-code = "include(features/liga.fea);
-";
-tag = liga;
-},
-{
 code = "include(features/dlig.fea);
 ";
 tag = dlig;
diff --git a/src/features/dlig.fea b/src/features/dlig.fea
index e1ca58415..836ecca18 100644
--- a/src/features/dlig.fea
+++ b/src/features/dlig.fea
@@ -6,6 +6,14 @@
 # https://learn.microsoft.com/en-us/typography/opentype/spec/chapter2#lookup-table
 lookupflag IgnoreMarks;
 
+# fi
+sub f' [
+  i idotless idotless.double itildebelow ibar igrave iacute iogonek
+  ihookabove idotbelow icyrillic ij i.sc
+
+  j jdotless jdotlessbar uni0249 uni0249.ccmp jcrosstail yotgreek jecyrillic
+] by f.i;
+
 # ff -> ff'
 @DLIG_f_L = [ f fdotaccent feng ];
 @DLIG_f_R = [ f.1 fdotaccent.1 feng.1 ];
diff --git a/src/features/liga.fea b/src/features/liga.fea
deleted file mode 100644
index e4caaaa09..000000000
--- a/src/features/liga.fea
+++ /dev/null
@@ -1,15 +0,0 @@
-# Standard Ligatures
-# https://learn.microsoft.com/en-us/typography/opentype/spec/features_ko#liga
-
-# Set IgnoreMarks to skip over marks in lookups.
-# For example, if we have /f/acutecomb/i, treat lookup as /f/i
-# https://learn.microsoft.com/en-us/typography/opentype/spec/chapter2#lookup-table
-lookupflag IgnoreMarks;
-
-# fi
-sub f' [
-  i idotless idotless.double itildebelow ibar igrave iacute iogonek
-  ihookabove idotbelow icyrillic ij i.sc
-
-  j jdotless jdotlessbar uni0249 uni0249.ccmp jcrosstail yotgreek jecyrillic
-] by f.i;