File u_mkfontscale-fix-handling-of-Type1-fonts-witho... of Package mkfontscale

Overview Repositories Revisions Requests Users Attributes Meta

File u_mkfontscale-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch of Package mkfontscale (Revision 1bdf60e78473efa47fd6551750e30ad1)

Currently displaying revision 1bdf60e78473efa47fd6551750e30ad1 , Show latest

From 0c66831aa4326a5314d381a5c922e4e5a62b82f8 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Wed, 4 Mar 2015 09:01:32 +0100
Subject: [PATCH 1/1] fix handling of Type1 fonts without /FamilyName and/or
 /FullName
Patch-Mainline: To be upstreamed
References: bnc#918466

---
 mkfontscale.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mkfontscale.c b/mkfontscale.c
index da93e0c..e9b9488 100644
--- a/mkfontscale.c
+++ b/mkfontscale.c
@@ -579,11 +579,14 @@ makeXLFD(char *filename, FT_Face face, int isBitmap)
     }
 
     if(t1info) {
-        if(!family)
+        if(!family && t1info->family_name)
             family = strdup(t1info->family_name);
-        if(!family)
+        if(!family && t1info->full_name)
             family = strdup(t1info->full_name);
-        if(!full_name)
+        /* Hershey fonts miss /FamilyName */
+        if(!family && face->family_name)
+            family = strdup(face->family_name);
+        if(!full_name && t1info->full_name)
             full_name = strdup(t1info->full_name);
         if(!foundry)
             foundry = notice_foundry(t1info->notice);
-- 
2.3.0

Places

File u_mkfontscale-fix-handling-of-Type1-fonts-without-FamilyName-and-o.patch of Package mkfontscale (Revision 1bdf60e78473efa47fd6551750e30ad1)

Places