Combine IsoKeyCaps array of strings into a single string

Packs more efficiently in binary, reduces number of calls to output,
gets rid of ~4k array of pointers to each string in data segment to
initialize on program load.

"xkbprint -if IsoKeyCaps" generates identical IsoKeyCaps.pfa files
before & after this change.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 2 insertions, 5 deletions

diff --git a/psgeom.c b/psgeom.c
index fa2d1d9..135f7ec 100644
--- a/psgeom.c
+++ b/psgeom.c
@@ -126,7 +126,7 @@ typedef struct _PSFontDef {
 } PSFontDef;
 
 static PSFontDef internalFonts[] = {
-    { "IsoKeyCaps", IsoKeyCaps }
+    { "IsoKeyCaps", &IsoKeyCaps }
 };
 static int nInternalFonts = (sizeof(internalFonts) / sizeof(PSFontDef));
 
@@ -171,10 +171,7 @@ PSIncludeFont(FILE *out, const char *font)
     }
     if (pstr != NULL) {
         fprintf(out, "%%%%BeginFont: %s\n", font);
-        while (*pstr != NULL) {
-            fprintf(out, "%s\n", *pstr);
-            pstr++;
-        }
+        fprintf(out, "%s", *pstr);
         fprintf(out, "%%%%EndFont\n");
         return True;
     }