dany/pdfio
1
0
Fork 0
mirror of https://github.com/michaelrsweet/pdfio.git synced 2025-02-20 19:02:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Test both CP1252 and Unicode font rendering.

Browse Source 
Add cached CP1252 and Unicode font encoding objects.

Clean up CP1252 ("simple") TrueType font embedding.
This commit is contained in:
Michael R Sweet 2021-06-23 21:26:01 -04:00
parent 060e7cdbd5
commit 10c8d222cf
No known key found for this signature in database
GPG Key ID: BE67C75EC81F3244
3 changed files with 283 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

316
pdfio-content.c
View File

@ -1225,9 +1225,7 @@ pdfioFileCreateFontObjFromFile(
bool unicode) // I - Force Unicode bool unicode) // I - Force Unicode
{ {
ttf_t *font; // TrueType font ttf_t *font; // TrueType font
int ch, // Current character int ch; // Current character
firstch, // First character
lastch; // Last character
ttf_rect_t bounds; // Font bounds ttf_rect_t bounds; // Font bounds
pdfio_dict_t *dict, // Font dictionary pdfio_dict_t *dict, // Font dictionary
*desc, // Font descriptor *desc, // Font descriptor
@ -1241,6 +1239,233 @@ pdfioFileCreateFontObjFromFile(
int fd; // File int fd; // File
unsigned char buffer[16384]; // Read buffer unsigned char buffer[16384]; // Read buffer
ssize_t bytes; // Bytes read ssize_t bytes; // Bytes read
static const char * const cp1252[] = // Glyphs for CP1252 encoding
{
"space",
"exclam",
"quotedbl",
"numbersign",
"dollar",
"percent",
"ampersand",
"quotesingle",
"parenleft",
"parenright",
"asterisk",
"plus",
"comma",
"hyphen",
"period",
"slash",
"zero",
"one",
"two",
"three",
"four",
"five",
"six",
"seven",
"eight",
"nine",
"colon",
"semicolon",
"less",
"equal",
"greater",
"question",
"at",
"A",
"B",
"C",
"D",
"E",
"F",
"G",
"H",
"I",
"J",
"K",
"L",
"M",
"N",
"O",
"P",
"Q",
"R",
"S",
"T",
"U",
"V",
"W",
"X",
"Y",
"Z",
"bracketleft",
"backslash",
"bracketright",
"asciicircum",
"underscore",
"grave",
"a",
"b",
"c",
"d",
"e",
"f",
"g",
"h",
"i",
"j",
"k",
"l",
"m",
"n",
"o",
"p",
"q",
"r",
"s",
"t",
"u",
"v",
"w",
"x",
"y",
"z",
"braceleft",
"bar",
"braceright",
"asciitilde",
"",
"Euro",
"",
"quotesinglbase",
"florin",
"quotedblbase",
"ellipsis",
"dagger",
"daggerdbl",
"circumflex",
"perthousand",
"Scaron",
"guilsinglleft",
"OE",
"",
"Zcaron",
"",
"",
"quoteleft",
"quoteright",
"quotedblleft",
"quotedblright",
"bullet",
"endash",
"emdash",
"tilde",
"trademark",
"scaron",
"guilsinglright",
"oe",
"",
"zcaron",
"Ydieresis",
"space",
"exclamdown",
"cent",
"sterling",
"currency",
"yen",
"brokenbar",
"section",
"dieresis",
"copyright",
"ordfeminine",
"guillemotleft",
"logicalnot",
"minus",
"registered",
"macron",
"degree",
"plusminus",
"twosuperior",
"threesuperior",
"acute",
"mu",
"paragraph",
"periodcentered",
"cedilla",
"onesuperior",
"ordmasculine",
"guillemotright",
"onequarter",
"onehalf",
"threequarters",
"questiondown",
"Agrave",
"Aacute",
"Acircumflex",
"Atilde",
"Adieresis",
"Aring",
"AE",
"Ccedilla",
"Egrave",
"Eacute",
"Ecircumflex",
"Edieresis",
"Igrave",
"Iacute",
"Icircumflex",
"Idieresis",
"Eth",
"Ntilde",
"Ograve",
"Oacute",
"Ocircumflex",
"Otilde",
"Odieresis",
"multiply",
"Oslash",
"Ugrave",
"Uacute",
"Ucircumflex",
"Udieresis",
"Yacute",
"Thorn",
"germandbls",
"agrave",
"aacute",
"acircumflex",
"atilde",
"adieresis",
"aring",
"ae",
"ccedilla",
"egrave",
"eacute",
"ecircumflex",
"edieresis",
"igrave",
"iacute",
"icircumflex",
"idieresis",
"eth",
"ntilde",
"ograve",
"oacute",
"ocircumflex",
"otilde",
"odieresis",
"divide",
"oslash",
"ugrave",
"uacute",
"ucircumflex",
"udieresis",
"yacute",
"thorn",
"ydieresis"
};
// Range check input... // Range check input...
@ -1491,46 +1716,51 @@ pdfioFileCreateFontObjFromFile(
else else
{ {
// Simple (CP1282 or custom encoding) 8-bit font... // Simple (CP1282 or custom encoding) 8-bit font...
pdfio_array_t *widths; // Font widths array if (ttfGetMaxChar(font) >= 255 && !pdf->cp1252_obj)
pdfio_obj_t *widths_obj; // Font widths object
// Create the widths array and object...
if ((widths = pdfioArrayCreate(pdf)) == NULL)
{ {
ttfDelete(font); bool chindex; // Need character index?
return (NULL); pdfio_dict_t *cp1252_dict; // Encoding dictionary
pdfio_array_t *cp1252_array; // Differences array
if ((cp1252_dict = pdfioDictCreate(pdf)) == NULL || (cp1252_array = pdfioArrayCreate(pdf)) == NULL)
{
ttfDelete(font);
return (NULL);
}
for (ch = 0, chindex = true; ch < (int)(sizeof(cp1252) / sizeof(cp1252[0])); ch ++)
{
if (cp1252[ch][0])
{
// Add this character...
if (chindex)
{
// Add the initial index...
pdfioArrayAppendNumber(cp1252_array, ch + 32);
chindex = false;
}
pdfioArrayAppendName(cp1252_array, cp1252[ch]);
}
else
{
// Flag that we need a new index...
chindex = true;
}
}
pdfioDictSetName(cp1252_dict, "Type", "Encoding");
pdfioDictSetArray(cp1252_dict, "Differences", cp1252_array);
if ((pdf->cp1252_obj = pdfioFileCreateObj(pdf, cp1252_dict)) == NULL)
{
ttfDelete(font);
return (NULL);
}
pdfioObjClose(pdf->cp1252_obj);
} }
firstch = ttfGetMinChar(font);
lastch = ttfGetMaxChar(font);
if (lastch < 255)
{
// Provide widths for all characters...
for (ch = firstch; ch <= lastch; ch ++)
pdfioArrayAppendNumber(widths, ttfGetWidth(font, ch));
}
else
{
// Provide widths only for CP1252 characters...
lastch = 255;
for (ch = firstch; ch < 128; ch ++)
pdfioArrayAppendNumber(widths, ttfGetWidth(font, ch));
for (; ch < 160; ch ++)
pdfioArrayAppendNumber(widths, ttfGetWidth(font, _pdfio_cp1252[ch - 128]));
for (; ch <= lastch && ch < 128; ch ++)
pdfioArrayAppendNumber(widths, ttfGetWidth(font, ch));
}
if ((widths_obj = pdfioFileCreateArrayObj(pdf, widths)) == NULL)
{
ttfDelete(font);
return (NULL);
}
pdfioObjClose(widths_obj);
// Create a TrueType font object... // Create a TrueType font object...
if ((dict = pdfioDictCreate(pdf)) == NULL) if ((dict = pdfioDictCreate(pdf)) == NULL)
{ {
@ -1541,12 +1771,10 @@ pdfioFileCreateFontObjFromFile(
pdfioDictSetName(dict, "Type", "Font"); pdfioDictSetName(dict, "Type", "Font");
pdfioDictSetName(dict, "Subtype", "TrueType"); pdfioDictSetName(dict, "Subtype", "TrueType");
pdfioDictSetName(dict, "BaseFont", basefont); pdfioDictSetName(dict, "BaseFont", basefont);
pdfioDictSetName(dict, "Encoding", "WinAnsi"); if (ttfGetMaxChar(font) >= 255)
pdfioDictSetObj(dict, "Encoding", pdf->cp1252_obj);
pdfioDictSetObj(dict, "FontDescriptor", desc_obj); pdfioDictSetObj(dict, "FontDescriptor", desc_obj);
pdfioDictSetNumber(dict, "FirstChar", firstch);
pdfioDictSetNumber(dict, "LastChar", lastch);
pdfioDictSetObj(dict, "Widths", widths_obj);
if ((obj = pdfioFileCreateObj(pdf, dict)) == NULL) if ((obj = pdfioFileCreateObj(pdf, dict)) == NULL)
{ {

2
pdfio-private.h
View File

@ -224,6 +224,8 @@ struct _pdfio_file_s // PDF file structure
pdfio_obj_t *info; // Information object/dictionary pdfio_obj_t *info; // Information object/dictionary
pdfio_obj_t *pages_root; // Root pages object pdfio_obj_t *pages_root; // Root pages object
pdfio_obj_t *encrypt; // Encryption object/dictionary pdfio_obj_t *encrypt; // Encryption object/dictionary
pdfio_obj_t *cp1252_obj, // CP1252 font encoding object
*unicode_obj; // Unicode font encoding object
pdfio_array_t *id_array; // ID array pdfio_array_t *id_array; // ID array
// Allocated data elements // Allocated data elements

26
testpdfio.c
View File

@ -35,7 +35,7 @@ static ssize_t token_peek_cb(const char **s, char *buffer, size_t bytes);
static int verify_image(pdfio_file_t *pdf, size_t number); static int verify_image(pdfio_file_t *pdf, size_t number);
static int write_color_patch(pdfio_stream_t *st, bool device); static int write_color_patch(pdfio_stream_t *st, bool device);
static int write_color_test(pdfio_file_t *pdf, int number, pdfio_obj_t *font); static int write_color_test(pdfio_file_t *pdf, int number, pdfio_obj_t *font);
static int write_font_test(pdfio_file_t *pdf, int number, pdfio_obj_t *font); static int write_font_test(pdfio_file_t *pdf, int number, pdfio_obj_t *font, bool unicode);
static int write_header_footer(pdfio_stream_t *st, const char *title, int number); static int write_header_footer(pdfio_stream_t *st, const char *title, int number);
static pdfio_obj_t *write_image_object(pdfio_file_t *pdf, _pdfio_predictor_t predictor); static pdfio_obj_t *write_image_object(pdfio_file_t *pdf, _pdfio_predictor_t predictor);
static int write_images_test(pdfio_file_t *pdf, int number, pdfio_obj_t *font); static int write_images_test(pdfio_file_t *pdf, int number, pdfio_obj_t *font);
@ -332,11 +332,14 @@ do_unit_tests(void)
return (1); return (1);
// Test TrueType fonts... // Test TrueType fonts...
if (write_font_test(outpdf, 8, helvetica)) if (write_font_test(outpdf, 8, helvetica, false))
return (1);
if (write_font_test(outpdf, 9, helvetica, true))
return (1); return (1);
// Print this text file... // Print this text file...
if (write_text_test(outpdf, 9, helvetica, "README.md")) if (write_text_test(outpdf, 10, helvetica, "README.md"))
return (1); return (1);
// Close the test PDF file... // Close the test PDF file...
@ -1090,12 +1093,12 @@ write_color_test(pdfio_file_t *pdf, // I - PDF file
static int // O - 1 on failure, 0 on success static int // O - 1 on failure, 0 on success
write_font_test(pdfio_file_t *pdf, // I - PDF file write_font_test(pdfio_file_t *pdf, // I - PDF file
int number, // I - Page number int number, // I - Page number
pdfio_obj_t *font) // I - Page number font pdfio_obj_t *font, // I - Page number font
bool unicode) // I - Use Unicode font?
{ {
pdfio_dict_t *dict; // Page dictionary pdfio_dict_t *dict; // Page dictionary
pdfio_stream_t *st; // Page contents stream pdfio_stream_t *st; // Page contents stream
pdfio_obj_t *opensans; // OpenSans-Regular font pdfio_obj_t *opensans; // OpenSans-Regular font
bool unicode; // Unicode?
int i; // Looping var int i; // Looping var
static const char * const welcomes[] =// "Welcome" in many languages static const char * const welcomes[] =// "Welcome" in many languages
{ {
@ -1250,23 +1253,12 @@ write_font_test(pdfio_file_t *pdf, // I - PDF file
}; };
unicode = true;
#if 1
fputs("pdfioFileCreateFontObjFromFile(OpenSans-Regular.ttf): ", stdout); fputs("pdfioFileCreateFontObjFromFile(OpenSans-Regular.ttf): ", stdout);
if ((opensans = pdfioFileCreateFontObjFromFile(pdf, "testfiles/OpenSans-Regular.ttf", unicode)) != NULL) if ((opensans = pdfioFileCreateFontObjFromFile(pdf, "testfiles/OpenSans-Regular.ttf", unicode)) != NULL)
puts("PASS"); puts("PASS");
else else
return (1); return (1);
#else
fputs("pdfioFileCreateFontObjFromFile(NotoSansJP-Regular.otf): ", stdout);
if ((opensans = pdfioFileCreateFontObjFromFile(pdf, "testfiles/NotoSansJP-Regular.otf", unicode)) != NULL)
puts("PASS");
else
return (1);
#endif // 1
fputs("pdfioDictCreate: ", stdout); fputs("pdfioDictCreate: ", stdout);
if ((dict = pdfioDictCreate(pdf)) != NULL) if ((dict = pdfioDictCreate(pdf)) != NULL)
puts("PASS"); puts("PASS");
@ -1292,7 +1284,7 @@ write_font_test(pdfio_file_t *pdf, // I - PDF file
else else
return (1); return (1);
if (write_header_footer(st, "TrueType Font Test", number)) if (write_header_footer(st, unicode ? "Unicode TrueType Font Test" : "CP1252 TrueType Font Test", number))
goto error; goto error;
fputs("pdfioContentTextBegin(): ", stdout); fputs("pdfioContentTextBegin(): ", stdout);