From 90c75911906429b9f13f544f3e1d85208eecc31b Mon Sep 17 00:00:00 2001
From: Michael R Sweet <msweet@msweet.org>
Date: Thu, 24 Jun 2021 09:07:03 -0400
Subject: [PATCH] Save work.

---
 pdfio-content.c |  7 +++----
 testpdfio.c     | 19 +++++++++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/pdfio-content.c b/pdfio-content.c
index 6310bfb..7bc2c64 100644
--- a/pdfio-content.c
+++ b/pdfio-content.c
@@ -1233,7 +1233,6 @@ pdfioFileCreateFontObjFromFile(
     bool         unicode)		// I - Force Unicode
 {
   ttf_t		*font;			// TrueType font
-  int		ch;			// Current character
   ttf_rect_t	bounds;			// Font bounds
   pdfio_dict_t	*dict,			// Font dictionary
 		*desc,			// Font descriptor
@@ -1342,7 +1341,7 @@ pdfioFileCreateFontObjFromFile(
   pdfioDictSetNumber(desc, "CapHeight", ttfGetCapHeight(font));
   pdfioDictSetNumber(desc, "XHeight", ttfGetXHeight(font));
   // Note: No TrueType value exists for this but PDF requires it, so we
-  // calculate a value from 50 to 250...
+  // calculate a generic value from 50 to 250 based on the weight...
   pdfioDictSetNumber(desc, "StemV", ttfGetWeight(font) / 4 + 25);
 
   if ((desc_obj = pdfioFileCreateObj(pdf, desc)) == NULL)
@@ -1457,7 +1456,6 @@ pdfioFileCreateFontObjFromFile(
     pdfioDictSetName(type2, "BaseFont", basefont);
     pdfioDictSetDict(type2, "CIDSystemInfo", sidict);
     pdfioDictSetObj(type2, "CIDToGIDMap", cid2gid_obj);
-//    pdfioDictSetName(type2, "CIDToGIDMap", "Identity");
     pdfioDictSetObj(type2, "FontDescriptor", desc_obj);
 
     if ((type2_obj = pdfioFileCreateObj(pdf, type2)) == NULL)
@@ -1487,7 +1485,8 @@ pdfioFileCreateFontObjFromFile(
     pdfioDictSetName(dict, "Subtype", "Type0");
     pdfioDictSetName(dict, "BaseFont", basefont);
     pdfioDictSetArray(dict, "DescendantFonts", descendants);
-    pdfioDictSetName(dict, "Encoding", "Identity-H");
+//    pdfioDictSetName(dict, "Encoding", "Identity-H");
+    pdfioDictSetName(dict, "Encoding", "UniCNS-UCS2-H");
 
     if ((obj = pdfioFileCreateObj(pdf, dict)) == NULL)
       return (NULL);
diff --git a/testpdfio.c b/testpdfio.c
index fb57157..a138669 100644
--- a/testpdfio.c
+++ b/testpdfio.c
@@ -1253,11 +1253,22 @@ write_font_test(pdfio_file_t *pdf,	// I - PDF file
   };
 
 
-  fputs("pdfioFileCreateFontObjFromFile(OpenSans-Regular.ttf): ", stdout);
-  if ((opensans = pdfioFileCreateFontObjFromFile(pdf, "testfiles/OpenSans-Regular.ttf", unicode)) != NULL)
-    puts("PASS");
+  if (unicode)
+  {
+    fputs("pdfioFileCreateFontObjFromFile(NotoSansJP-Regular.otf): ", stdout);
+    if ((opensans = pdfioFileCreateFontObjFromFile(pdf, "testfiles/NotoSansJP-Regular.otf", true)) != NULL)
+      puts("PASS");
+    else
+      return (1);
+  }
   else
-    return (1);
+  {
+    fputs("pdfioFileCreateFontObjFromFile(OpenSans-Regular.ttf): ", stdout);
+    if ((opensans = pdfioFileCreateFontObjFromFile(pdf, "testfiles/OpenSans-Regular.ttf", false)) != NULL)
+      puts("PASS");
+    else
+      return (1);
+  }
 
   fputs("pdfioDictCreate: ", stdout);
   if ((dict = pdfioDictCreate(pdf)) != NULL)