From 79360a30bf017740f6bff1a8cc64a81275822da9 Mon Sep 17 00:00:00 2001 From: Olli Meier Date: Wed, 9 Feb 2022 17:34:40 +0100 Subject: [PATCH] Refactor based on feedback. --- Lib/fontTools/ttLib/tables/_n_a_m_e.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/Lib/fontTools/ttLib/tables/_n_a_m_e.py b/Lib/fontTools/ttLib/tables/_n_a_m_e.py index b9a87e579..68e03b56a 100644 --- a/Lib/fontTools/ttLib/tables/_n_a_m_e.py +++ b/Lib/fontTools/ttLib/tables/_n_a_m_e.py @@ -120,19 +120,22 @@ class table__n_a_m_e(DefaultTable.DefaultTable): else: return None - def getFamilyName(self): - for nameID in (21, 16, 1): - name = self.getDebugName(nameID) - if name is not None: - return name + def getBestDebugName(self, nameID): + for group in ((21, 16, 1), (22, 17, 2), (25, 4, 6)): + if nameID not in group: + continue + + for fallback_id in group: + name = self.getDebugName(fallback_id) + if name: + return name return None + def getFamilyName(self): + return self.getBestDebugName(21) + def getSubFamilyName(self): - for nameID in (22, 17, 2): - name = self.getDebugName(nameID) - if name is not None: - return name - return None + return self.getBestDebugName(22) def getNiceFullName(self): for nameIDs in ((21, 22), (16, 17), (1, 2), (4, ), (6, )):