From b76d6a889e620db54e4b2cb53c588d6c9947afb1 Mon Sep 17 00:00:00 2001
From: juandelperal <juandelperal@gmail.com>
Date: Thu, 27 Aug 2020 14:14:03 +0200
Subject: [PATCH] name 25

---
 build.sh           | 3 +++
 tools/buildStat.py | 9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index 5eec8a1..267fbec 100755
--- a/build.sh
+++ b/build.sh
@@ -47,6 +47,7 @@ done
 echo
 echo Fixing fonts
 for VF in fonts/Piazzolla/variable/ttf/*.ttf; do
+    python tools/fixNameTable.py $VF
     python tools/buildStat.py $VF
     gftools fix-dsig -f $VF
     gftools fix-nonhinting $VF "$VF.fix"
@@ -62,6 +63,7 @@ done
 
 if $static; then
     for ttf in fonts/Piazzolla/static/*.ttf; do
+        python tools/fixNameTable.py $ttf
         gftools fix-dsig -f $ttf
         gftools fix-nonhinting $ttf "$ttf.fix"
         mv "$ttf.fix" $ttf
@@ -75,6 +77,7 @@ if $static; then
     done
 
     for otf in fonts/Piazzolla/static/*.otf; do
+        python tools/fixNameTable.py $VF
         gftools fix-weightclass $otf
         gftools fix-dsig -f $otf
         gftools fix-nonhinting $otf "$otf.fix"
diff --git a/tools/buildStat.py b/tools/buildStat.py
index c498f49..ad15d6a 100644
--- a/tools/buildStat.py
+++ b/tools/buildStat.py
@@ -59,11 +59,16 @@ def updateFvar(ttFont):
     nametable = ttFont['name']
     family_name = nametable.getName(16, 3, 1, 1033) or nametable.getName(1, 3, 1, 1033)
     family_name = family_name.toUnicode().replace(" ", "")
-    nametable.setName(family_name, 25, 3, 1, 1033)
+    font_style = "Italic" if "Italic" in nametable.getName(2, 3, 1, 1033).toUnicode() else "Roman"
+    ps_family_name = f"{family_name.replace(' ', '')}{font_style}"
+    nametable.setName(ps_family_name, 25, 3, 1, 1033)
 
     for instance in fvar.instances:
         instance_style = nametable.getName(instance.subfamilyNameID, 3, 1, 1033).toUnicode()
-        ps_name = f"{family_name}-{instance_style.replace(' ', '')}"
+        instance_style = instance_style.replace("Italic", "").strip().replace(" ", "")
+        if instance_style == "":
+            instance_style = "Regular"
+        ps_name = f"{ps_family_name}-{instance_style}"
         instance.postscriptNameID = _addName(nametable, ps_name, 256)