From 3f1bb1e34638de3d900a92df2613529a0ef43e9a Mon Sep 17 00:00:00 2001
From: Rasmus Andersson <rasmus@notion.se>
Date: Wed, 8 Apr 2020 18:58:36 -0700
Subject: fixes features breaking in Glyphs because of include() issues. Now
 code is copy-pasted across ss02 and ss04

---
 src/features/_disambiguation.fea     | 53 --------------------------------
 src/features/cpsp.fea                |  4 +++
 src/features/ss02-disambiguation.fea | 59 +++++++++++++++++++++++++++++++++++-
 src/features/ss04-disambiguation.fea | 55 ++++++++++++++++++++++++++++++++-
 4 files changed, 116 insertions(+), 55 deletions(-)
 delete mode 100644 src/features/_disambiguation.fea

(limited to 'src')

diff --git a/src/features/_disambiguation.fea b/src/features/_disambiguation.fea
deleted file mode 100644
index 19fce6951..000000000
--- a/src/features/_disambiguation.fea
+++ /dev/null
@@ -1,53 +0,0 @@
-# Included by other files. Not used directly.
-
-# l
-sub l by l.ss02;
-sub lslash by lslash.ss02;
-sub lbar by lbar.ss02;
-sub lmidtilde by lmidtilde.ss02;
-sub lbelt by lbelt.ss02;
-sub ldot by ldot.ss02;
-sub lacute by lacute.ss02;
-sub lcommaaccent by lcommaaccent.ss02;
-sub lcaron by lcaron.ss02;
-sub ldotbelow by ldotbelow.ss02;
-sub ldotbelowmacron by ldotbelowmacron.ss02;
-sub llinebelow by llinebelow.ss02;
-sub lcircumflexbelow by lcircumflexbelow.ss02;
-
-# germandbls
-sub germandbls by germandbls.1;
-
-# I
-sub I by I.1;
-sub Idieresis by Idieresis.1;
-sub Idieresisacute by Idieresisacute.1;
-sub Istroke by Istroke.1;
-sub Itildebelow by Itildebelow.1;
-sub Igrave by Igrave.1;
-sub Iacute by Iacute.1;
-sub Icircumflex by Icircumflex.1;
-sub Itilde by Itilde.1;
-sub Imacron by Imacron.1;
-sub Ibreve by Ibreve.1;
-sub Iogonek by Iogonek.1;
-sub Idotaccent by Idotaccent.1;
-sub Icaron by Icaron.1;
-sub Idblgrave by Idblgrave.1;
-sub Iinvertedbreve by Iinvertedbreve.1;
-sub Ihookabove by Ihookabove.1;
-sub Idotbelow by Idotbelow.1;
-sub uni1F38 by uni1F38.1;
-sub uni1F39 by uni1F39.1;
-sub uni1F3A by uni1F3A.1;
-sub uni1F3B by uni1F3B.1;
-sub uni1F3C by uni1F3C.1;
-sub uni1F3D by uni1F3D.1;
-sub uni1F3E by uni1F3E.1;
-sub uni1F3F by uni1F3F.1;
-sub uni1FD8 by uni1FD8.1;
-sub uni1FD9 by uni1FD9.1;
-sub uni1FDA by uni1FDA.1;
-sub uni1FDB by uni1FDB.1;
-sub afii10055 by afii10055.1;
-sub afii10056 by afii10056.1;
diff --git a/src/features/cpsp.fea b/src/features/cpsp.fea
index 588933627..dfdbfb401 100644
--- a/src/features/cpsp.fea
+++ b/src/features/cpsp.fea
@@ -1 +1,5 @@
+# The first two numbers (16 and 0) are the x and y amounts by which a glyph is moved.
+# The second pair of numbers (32 and 0) is the advance, meaning that the cursor will
+# be placed 32 units further in this case. Effectively, this adds 16 units on each side
+# (or 32 between all uppercase letters)
 pos @Uppercase <16 0 32 0>;
diff --git a/src/features/ss02-disambiguation.fea b/src/features/ss02-disambiguation.fea
index 1f5e8abbe..6eeccbe3b 100644
--- a/src/features/ss02-disambiguation.fea
+++ b/src/features/ss02-disambiguation.fea
@@ -1,5 +1,62 @@
 featureNames { name "Disambiguation"; };
-include(features/_disambiguation.fea);
+
+# Note: All by zero should be synchronized with ss04
+# Note: Glyphs will go crazy if we use include() inside these files,
+# so we instead copy-paste.
+
+# l
+sub l by l.ss02;
+sub lslash by lslash.ss02;
+sub lbar by lbar.ss02;
+sub lmidtilde by lmidtilde.ss02;
+sub lbelt by lbelt.ss02;
+sub ldot by ldot.ss02;
+sub lacute by lacute.ss02;
+sub lcommaaccent by lcommaaccent.ss02;
+sub lcaron by lcaron.ss02;
+sub ldotbelow by ldotbelow.ss02;
+sub ldotbelowmacron by ldotbelowmacron.ss02;
+sub llinebelow by llinebelow.ss02;
+sub lcircumflexbelow by lcircumflexbelow.ss02;
+
+# germandbls
+sub germandbls by germandbls.1;
+
+# I
+sub I by I.1;
+sub Idieresis by Idieresis.1;
+sub Idieresisacute by Idieresisacute.1;
+sub Istroke by Istroke.1;
+sub Itildebelow by Itildebelow.1;
+sub Igrave by Igrave.1;
+sub Iacute by Iacute.1;
+sub Icircumflex by Icircumflex.1;
+sub Itilde by Itilde.1;
+sub Imacron by Imacron.1;
+sub Ibreve by Ibreve.1;
+sub Iogonek by Iogonek.1;
+sub Idotaccent by Idotaccent.1;
+sub Icaron by Icaron.1;
+sub Idblgrave by Idblgrave.1;
+sub Iinvertedbreve by Iinvertedbreve.1;
+sub Ihookabove by Ihookabove.1;
+sub Idotbelow by Idotbelow.1;
+sub uni1F38 by uni1F38.1;
+sub uni1F39 by uni1F39.1;
+sub uni1F3A by uni1F3A.1;
+sub uni1F3B by uni1F3B.1;
+sub uni1F3C by uni1F3C.1;
+sub uni1F3D by uni1F3D.1;
+sub uni1F3E by uni1F3E.1;
+sub uni1F3F by uni1F3F.1;
+sub uni1FD8 by uni1FD8.1;
+sub uni1FD9 by uni1FD9.1;
+sub uni1FDA by uni1FDA.1;
+sub uni1FDB by uni1FDB.1;
+sub afii10055 by afii10055.1;
+sub afii10056 by afii10056.1;
+
+# zero
 sub zero by zero.slash;
 sub zero.tf by zero.tf.slash;
 sub zero.squared by zero.slash.squared;
diff --git a/src/features/ss04-disambiguation.fea b/src/features/ss04-disambiguation.fea
index 577dd7791..a26894402 100644
--- a/src/features/ss04-disambiguation.fea
+++ b/src/features/ss04-disambiguation.fea
@@ -1,2 +1,55 @@
 featureNames { name "Disambiguation without slashed zero"; };
-include(features/_disambiguation.fea);
+
+# Note: Should be synchronized with ss02
+
+# l
+sub l by l.ss02;
+sub lslash by lslash.ss02;
+sub lbar by lbar.ss02;
+sub lmidtilde by lmidtilde.ss02;
+sub lbelt by lbelt.ss02;
+sub ldot by ldot.ss02;
+sub lacute by lacute.ss02;
+sub lcommaaccent by lcommaaccent.ss02;
+sub lcaron by lcaron.ss02;
+sub ldotbelow by ldotbelow.ss02;
+sub ldotbelowmacron by ldotbelowmacron.ss02;
+sub llinebelow by llinebelow.ss02;
+sub lcircumflexbelow by lcircumflexbelow.ss02;
+
+# germandbls
+sub germandbls by germandbls.1;
+
+# I
+sub I by I.1;
+sub Idieresis by Idieresis.1;
+sub Idieresisacute by Idieresisacute.1;
+sub Istroke by Istroke.1;
+sub Itildebelow by Itildebelow.1;
+sub Igrave by Igrave.1;
+sub Iacute by Iacute.1;
+sub Icircumflex by Icircumflex.1;
+sub Itilde by Itilde.1;
+sub Imacron by Imacron.1;
+sub Ibreve by Ibreve.1;
+sub Iogonek by Iogonek.1;
+sub Idotaccent by Idotaccent.1;
+sub Icaron by Icaron.1;
+sub Idblgrave by Idblgrave.1;
+sub Iinvertedbreve by Iinvertedbreve.1;
+sub Ihookabove by Ihookabove.1;
+sub Idotbelow by Idotbelow.1;
+sub uni1F38 by uni1F38.1;
+sub uni1F39 by uni1F39.1;
+sub uni1F3A by uni1F3A.1;
+sub uni1F3B by uni1F3B.1;
+sub uni1F3C by uni1F3C.1;
+sub uni1F3D by uni1F3D.1;
+sub uni1F3E by uni1F3E.1;
+sub uni1F3F by uni1F3F.1;
+sub uni1FD8 by uni1FD8.1;
+sub uni1FD9 by uni1FD9.1;
+sub uni1FDA by uni1FDA.1;
+sub uni1FDB by uni1FDB.1;
+sub afii10055 by afii10055.1;
+sub afii10056 by afii10056.1;
-- 
cgit v1.2.3