From 858cc101b6d58ca07125ef08ff4949a8ae5ad4bb Mon Sep 17 00:00:00 2001
From: Michael R Sweet <msweet@msweet.org>
Date: Mon, 13 Nov 2023 13:39:06 -0500
Subject: [PATCH] Save work.

---
 pdfio-content.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++---
 testpdfio.c     |  2 +-
 ttf.c           |  9 ++++++--
 3 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/pdfio-content.c b/pdfio-content.c
index f78a409..8e2a94c 100644
--- a/pdfio-content.c
+++ b/pdfio-content.c
@@ -1410,6 +1410,7 @@ pdfioFileCreateFontObjFromFile(
     pdfio_dict_t	*cid2gid;	// CIDToGIDMap dictionary
     pdfio_obj_t		*cid2gid_obj;	// CIDToGIDMap object
     size_t		i,		// Looping var
+			start,		// Start character
 			num_cmap;	// Number of CMap entries
     const int		*cmap;		// CMap entries
     unsigned char	*bufptr,	// Pointer into buffer
@@ -1418,6 +1419,9 @@ pdfioFileCreateFontObjFromFile(
     pdfio_obj_t		*type2_obj;	// CIDFontType2 font object
     pdfio_array_t	*descendants;	// Decendant font list
     pdfio_dict_t	*sidict;	// CIDSystemInfo dictionary
+    pdfio_array_t	*w_array,	// Width array
+			*temp_array;	// Temporary width sub-array
+    int			w0, w1;		// Widths
 
     // Create a CIDToGIDMap object for the Unicode font...
     if ((cid2gid = pdfioDictCreate(pdf)) == NULL)
@@ -1462,8 +1466,8 @@ pdfioFileCreateFontObjFromFile(
       else
       {
         // Map to specified glyph...
-        *bufptr++ = (unsigned char)(cmap[i] >> 8);
-        *bufptr++ = (unsigned char)(cmap[i] & 255);
+        *bufptr++ = (unsigned char)((cmap[i] + 1) >> 8);
+        *bufptr++ = (unsigned char)((cmap[i] + 1) & 255);
       }
 
       if (bufptr >= bufend)
@@ -1506,9 +1510,55 @@ pdfioFileCreateFontObjFromFile(
       return (NULL);
     }
 
+    // Width array
+    if ((w_array = pdfioArrayCreate(pdf)) == NULL)
+    {
+      ttfDelete(font);
+      return (NULL);
+    }
+
+    for (start = 0, w0 = ttfGetWidth(font, 0), i = 1; i < 65536; start = i, w0 = w1, i ++)
+    {
+      while (i < 65536 && (w1 = ttfGetWidth(font, i)) == w0)
+        i ++;
+
+      if ((i - start) > 1)
+      {
+        // Encode a repeating sequence...
+        pdfioArrayAppendNumber(w_array, start);
+        pdfioArrayAppendNumber(w_array, i);
+        pdfioArrayAppendNumber(w_array, w0);
+      }
+      else
+      {
+        // Encode a non-repeating sequence...
+        pdfioArrayAppendNumber(w_array, start);
+
+        if ((temp_array = pdfioArrayCreate(pdf)) == NULL)
+        {
+	  ttfDelete(font);
+	  return (NULL);
+        }
+
+        pdfioArrayAppendNumber(temp_array, w0);
+        for (w0 = w1, i ++; i < 65536; w0 = w1, i ++)
+        {
+          if ((w1 = ttfGetWidth(font, i)) == w0 && i < 65535)
+            break;
+
+	  pdfioArrayAppendNumber(temp_array, w0);
+        }
+
+        if (i == 65536)
+	  pdfioArrayAppendNumber(temp_array, w0);
+
+        pdfioArrayAppendArray(w_array, temp_array);
+      }
+    }
+
     // CIDSystemInfo mapping to Adobe UCS2 v0 (Unicode)
     pdfioDictSetString(sidict, "Registry", "Adobe");
-    pdfioDictSetString(sidict, "Ordering", "Identity-H");
+    pdfioDictSetString(sidict, "Ordering", "Identity");
     pdfioDictSetNumber(sidict, "Supplement", 0);
 
     // Then the dictionary for the CID base font...
@@ -1518,6 +1568,7 @@ pdfioFileCreateFontObjFromFile(
     pdfioDictSetDict(type2, "CIDSystemInfo", sidict);
     pdfioDictSetObj(type2, "CIDToGIDMap", cid2gid_obj);
     pdfioDictSetObj(type2, "FontDescriptor", desc_obj);
+    pdfioDictSetArray(type2, "W", w_array);
 
     if ((type2_obj = pdfioFileCreateObj(pdf, type2)) == NULL)
     {
diff --git a/testpdfio.c b/testpdfio.c
index 18ea175..a8653d0 100644
--- a/testpdfio.c
+++ b/testpdfio.c
@@ -455,7 +455,7 @@ do_test_file(const char *filename,	// I - PDF filename
 	      }
 	    }
 
-	    printf("    Page #%d is %gx%g.\n", (int)n + 1, media_box.x2, media_box.y2);
+	    printf("    Page #%d (obj %d) is %gx%g.\n", (int)n + 1, (int)pdfioObjGetNumber(obj), media_box.x2, media_box.y2);
 	  }
 	}
 
diff --git a/ttf.c b/ttf.c
index c954e62..5a3beb8 100644
--- a/ttf.c
+++ b/ttf.c
@@ -855,13 +855,18 @@ int					// O - Width in 1000ths
 ttfGetWidth(ttf_t *font,		// I - Font
             int   ch)			// I - Unicode character
 {
-  int	bin = ch >> 8;			// Bin in widths array
+  int	bin;				// Bin in widths array
 
 
   // Range check input...
   if (!font || ch < ' ' || ch == 0x7f)
     return (0);
-  else if (font->widths[bin])
+
+  // Issue #1: Offset past ".notdef"...
+  ch ++;
+  bin = ch >> 8;
+
+  if (font->widths[bin])
     return ((int)(1000.0f * font->widths[bin][ch & 255].width / font->units));
   else if (font->widths[0])		// .notdef
     return ((int)(1000.0f * font->widths[0][0].width / font->units));