From da7d6a524da639f58e838be7fc55861d52e27b41 Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Tue, 18 Sep 2018 12:27:48 -0400
Subject: [PATCH] Make fi/fl ligatures discretionary.

These are lovely letterforms, but they break the fixed-pitch
rhythm of the typeface when used in text runs. By making
them discretionary (dlig) they are still accessible,
explicitly, to CSS and other software, but are not part of
the default text rendering.
---
 sources/Italics/Bold Italic/features    | 18 +++++++++---------
 sources/Italics/Regular Italic/features | 18 +++++++++---------
 sources/Roman/Bold/features             | 18 +++++++++---------
 sources/Roman/Regular/features          | 18 +++++++++---------
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/sources/Italics/Bold Italic/features b/sources/Italics/Bold Italic/features
index 18a778e..39011ea 100755
--- a/sources/Italics/Bold Italic/features	
+++ b/sources/Italics/Bold Italic/features	
@@ -246,27 +246,27 @@ lookup frac14;
  language KAZ ; # Kazakh
 } frac;
 
-feature liga { # Standard Ligatures
+feature dlig { # Discretionary Ligatures
  # DEFAULT
-lookup liga15 {
+lookup dlig15 {
     sub f [l l.alt] by fl;
-} liga15;
-lookup liga16 {
+} dlig15;
+lookup dlig16 {
     sub f [i i.alt] by fi;
-} liga16;
+} dlig16;
  script latn; # Latin
-lookup liga15;
-lookup liga16;
+lookup dlig15;
+lookup dlig16;
  language NLD ; # Dutch
  language AZE ; # Azeri
  language TRK ; # Turkish
  language MOL  exclude_dflt; # Moldavian
-lookup liga16;
+lookup dlig16;
  language ROM ; # Romanian
  language CAT ; # Catalan
  language TAT ; # Tatar
  language KAZ ; # Kazakh
-} liga;
+} dlig;
 
 feature locl { # Localized Forms
  script latn; # Latin
diff --git a/sources/Italics/Regular Italic/features b/sources/Italics/Regular Italic/features
index c23c4e1..fff7b3f 100755
--- a/sources/Italics/Regular Italic/features	
+++ b/sources/Italics/Regular Italic/features	
@@ -246,27 +246,27 @@ lookup frac14;
  language KAZ ; # Kazakh
 } frac;
 
-feature liga { # Standard Ligatures
+feature dlig { # Discretionary Ligatures
  # DEFAULT
-lookup liga15 {
+lookup dlig15 {
     sub f [l l.alt] by fl;
-} liga15;
-lookup liga16 {
+} dlig15;
+lookup dlig16 {
     sub f [i i.alt] by fi;
-} liga16;
+} dlig16;
  script latn; # Latin
-lookup liga15;
-lookup liga16;
+lookup dlig15;
+lookup dlig16;
  language NLD ; # Dutch
  language AZE ; # Azeri
  language TRK ; # Turkish
  language MOL  exclude_dflt; # Moldavian
-lookup liga16;
+lookup dlig16;
  language ROM ; # Romanian
  language CAT ; # Catalan
  language TAT ; # Tatar
  language KAZ ; # Kazakh
-} liga;
+} dlig;
 
 feature locl { # Localized Forms
  script latn; # Latin
diff --git a/sources/Roman/Bold/features b/sources/Roman/Bold/features
index 2f41e41..5137160 100755
--- a/sources/Roman/Bold/features
+++ b/sources/Roman/Bold/features
@@ -246,27 +246,27 @@ lookup frac14;
  language KAZ ; # Kazakh
 } frac;
 
-feature liga { # Standard Ligatures
+feature dlig { # Discretionary Ligatures
  # DEFAULT
-lookup liga15 {
+lookup dlig15 {
     sub f [l l.alt] by fl;
-} liga15;
-lookup liga16 {
+} dlig15;
+lookup dlig16 {
     sub f [i i.alt] by fi;
-} liga16;
+} dlig16;
  script latn; # Latin
-lookup liga15;
-lookup liga16;
+lookup dlig15;
+lookup dlig16;
  language NLD ; # Dutch
  language AZE ; # Azeri
  language TRK ; # Turkish
  language MOL  exclude_dflt; # Moldavian
-lookup liga16;
+lookup dlig16;
  language ROM ; # Romanian
  language CAT ; # Catalan
  language TAT ; # Tatar
  language KAZ ; # Kazakh
-} liga;
+} dlig;
 
 feature locl { # Localized Forms
  script latn; # Latin
diff --git a/sources/Roman/Regular/features b/sources/Roman/Regular/features
index 140aa68..b1ecda7 100755
--- a/sources/Roman/Regular/features
+++ b/sources/Roman/Regular/features
@@ -246,27 +246,27 @@ lookup frac14;
  language KAZ ; # Kazakh
 } frac;
 
-feature liga { # Standard Ligatures
+feature dlig { # Discretionary Ligatures
  # DEFAULT
-lookup liga15 {
+lookup dlig15 {
     sub f [l l.alt] by fl;
-} liga15;
-lookup liga16 {
+} dlig15;
+lookup dlig16 {
     sub f [i i.alt] by fi;
-} liga16;
+} dlig16;
  script latn; # Latin
-lookup liga15;
-lookup liga16;
+lookup dlig15;
+lookup dlig16;
  language NLD ; # Dutch
  language AZE ; # Azeri
  language TRK ; # Turkish
  language MOL  exclude_dflt; # Moldavian
-lookup liga16;
+lookup dlig16;
  language ROM ; # Romanian
  language CAT ; # Catalan
  language TAT ; # Tatar
  language KAZ ; # Kazakh
-} liga;
+} dlig;
 
 feature locl { # Localized Forms
  script latn; # Latin