From 23d6eb0fdf68e917f5c9f8e6714860f161b77943 Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaled@aliftype.com>
Date: Sat, 3 Dec 2022 20:45:54 +0200
Subject: [PATCH] Use the same winAscent and winDescent across the family

---
 fonts/Amiri-Bold.ttf        | Bin 601420 -> 601420 bytes
 fonts/Amiri-BoldItalic.ttf  | Bin 598964 -> 598964 bytes
 fonts/Amiri-Italic.ttf      | Bin 625368 -> 625368 bytes
 fonts/Amiri-Regular.ttf     | Bin 627112 -> 627112 bytes
 fonts/AmiriQuran.ttf        | Bin 171416 -> 171416 bytes
 fonts/AmiriQuranColored.ttf | Bin 205048 -> 205048 bytes
 scripts/build.py            |   4 ++--
 sources/Amiri.glyphs        |  26 +++++++++-----------------
 8 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/fonts/Amiri-Bold.ttf b/fonts/Amiri-Bold.ttf
index 3034afc601e76181062526c935ebcf08bd2fa4f5..19ff92049873625355d6f93985c3a665ef4e7bb1 100644
GIT binary patch
delta 68
zcmX?eOXbWhl?jf_tBb29x*TMFb7J3Q4#wTgR?L0P#~9m>F@i7?5HkZY3lOscF&hxG
N12M<;V~m__+5qM<8b<&C

delta 68
zcmX?eOXbWhl?jf_%ZuYCx*TNwa^l-$4#wTga?D-L#~9m>F@i7?5HkZY3lOscF&hxG
N12M<;V~m__+5qMv8b<&C

diff --git a/fonts/Amiri-BoldItalic.ttf b/fonts/Amiri-BoldItalic.ttf
index 11e8b8194d5cc9eae4e5bb45c1410b658ae7c98b..3ec8784086d2debaf4b54ac73680938f9d0e2823 100644
GIT binary patch
delta 68
zcmdmTTxH8~l?jf_Yl__`x*TMFQLa9jgK;;r6?0$nF~;^|j3CSe#LPg<0>rF9%m&2l
NK+LiI7$fI9MF5vJ88H9=

delta 68
zcmdmTTxH8~l?jf_D~h!zx*TNwP#!;-gK;;r9CKImF~;^|j3CSe#LPg<0>rF9%m&2l
NK+LiI7$fI9MF5v388H9=

diff --git a/fonts/Amiri-Italic.ttf b/fonts/Amiri-Italic.ttf
index 9581909e7ddc5ee85a60ed47c1bd685ee9eaf436..d38bc555f15208e0038b74aebe94a1be5d15183d 100644
GIT binary patch
delta 68
zcmcaHRqe)9wF!>Q4P`nLT@Erwr5jG>VBF1Y#oX6?jIsR~BM37AF*6Xe05K~NvjH(X
N5OZul#>gqu2>@bw7tH_w

delta 68
zcmcaHRqe)9wF!>QC1o5FT@ErArB_boVBF0t#@y6=jIsR~BM37AF*6Xe05K~NvjH(X
N5OZul#>gqu2>@bw7tH_w

diff --git a/fonts/Amiri-Regular.ttf b/fonts/Amiri-Regular.ttf
index e1ad87271659a74ae744a5986f055f63bf13170a..313bd7c8ef1e077f3d852b71d1055fd43d86563b 100644
GIT binary patch
delta 68
zcmZ3nSZ&2(wF!>Q^=0!Wx*TL?%95ST!MK~*in*`(7-Rb}Mi6EKVrC#_0b*7lW&>h&
NAm-S9jFIzEKLA!y7-s+g

delta 68
zcmZ3nSZ&2(wF!>Q#bs3!T@Er!Wu;E$VBF0t#@y6=jIsR~BM37AF*6Xe05K~NvjH(X
N5OZul#>n}o9{^TS7-s+g

diff --git a/fonts/AmiriQuran.ttf b/fonts/AmiriQuran.ttf
index 2bbd370f6ef1ca9e31b4a12fb1bf3208501b4be3..c9ce9d874f7e376f53968bd41333da9d6b6669c5 100644
GIT binary patch
delta 34
scmV+-0NwwXy9$`Q3Xnko{gFb$0aB9&0lxu`gT?`e#sLAh#sLD-oA)mb;Q#;t

delta 34
scmV+-0NwwXy9$`Q3Xnko>ybjk0d|uH0lxu!gT?`e#sLAh#sLD-oA*Ht;Q#;t

diff --git a/fonts/AmiriQuranColored.ttf b/fonts/AmiriQuranColored.ttf
index 4e7998bfbc5d67c610a723606a643c4c246eef1d..6b454beac8a941891f791205d0497ac14d5e6633 100644
GIT binary patch
delta 38
scmexykmtuio(YMJe<vm#X5^Tx#<-uculX5c`!hxmX4?LYky%I{08?uZTmS$7

delta 38
scmexykmtuio(YMJuO}uQX4ILi#<-ucrui9T`!hxmX4?LYky%I{08@PrTmS$7

diff --git a/scripts/build.py b/scripts/build.py
index 2f2de51e55..732c690dbe 100644
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -383,8 +383,8 @@ def makeQuran(options):
     # bigger font bbox that the regular fonts.
     head = otf["head"]
     os_2 = otf["OS/2"]
-    os_2.usWinAscent = head.yMax
-    os_2.usWinDescent = abs(head.yMin)
+    os_2.usWinAscent = max(head.yMax, os_2.usWinAscent)
+    os_2.usWinDescent = max(abs(head.yMin), os_2.usWinDescent)
 
     otf.save(options.output)
 
diff --git a/sources/Amiri.glyphs b/sources/Amiri.glyphs
index e068aa9695..f5699521e8 100644
--- a/sources/Amiri.glyphs
+++ b/sources/Amiri.glyphs
@@ -1,5 +1,5 @@
 {
-.appVersion = "3139";
+.appVersion = "3148";
 customParameters = (
 {
 name = hheaAscender;
@@ -26,6 +26,14 @@ name = typoLineGap;
 value = 0;
 },
 {
+name = winAscent;
+value = 1850;
+},
+{
+name = winDescent;
+value = 910;
+},
+{
 name = underlinePosition;
 value = -512;
 },
@@ -6389,14 +6397,6 @@ ascender = 1124;
 capHeight = 646;
 customParameters = (
 {
-name = winAscent;
-value = 1814;
-},
-{
-name = winDescent;
-value = 898;
-},
-{
 name = postscriptFullName;
 value = Amiri;
 },
@@ -6419,14 +6419,6 @@ ascender = 1124;
 capHeight = 646;
 customParameters = (
 {
-name = winAscent;
-value = 1822;
-},
-{
-name = winDescent;
-value = 906;
-},
-{
 name = postscriptFullName;
 value = "Amiri Bold";
 },