Simplify PDF font creation code.

Don't create a useless pdf_font_desc when writing font resources.
Simplify reference counting by using fewer intermediate variables.

7 files changed, 348 insertions, 456 deletions

diff --git a/include/mupdf/pdf/font.h b/include/mupdf/pdf/font.h
index dae52d3e..323c4ee7 100644
--- a/include/mupdf/pdf/font.h
+++ b/include/mupdf/pdf/font.h
@@ -25,13 +25,13 @@ int pdf_lookup_agl(const char *name);
 const char **pdf_lookup_agl_duplicates(int ucs);
 
 extern const unsigned short pdf_doc_encoding[256];
-extern const char * const pdf_mac_roman[256];
-extern const char * const pdf_mac_expert[256];
-extern const char * const pdf_win_ansi[256];
-extern const char * const pdf_standard[256];
+extern const char *pdf_mac_roman[256];
+extern const char *pdf_mac_expert[256];
+extern const char *pdf_win_ansi[256];
+extern const char *pdf_standard[256];
 
-extern const char * const pdf_glyph_name_from_koi8u[128];
-extern const char * const pdf_glyph_name_from_iso8859_7[128];
+extern const char *pdf_glyph_name_from_koi8u[256];
+extern const char *pdf_glyph_name_from_iso8859_7[256];
 
 int pdf_cyrillic_from_unicode(int u);
 int pdf_greek_from_unicode(int u);
diff --git a/source/fitz/font.c b/source/fitz/font.c
index 5ff25e1a..e822703f 100644
--- a/source/fitz/font.c
+++ b/source/fitz/font.c
@@ -647,11 +647,11 @@ fz_new_base14_font(fz_context *ctx, const char *name)
 }
 
 fz_font *
-fz_new_cjk_font(fz_context *ctx, int registry, int serif, int wmode)
+fz_new_cjk_font(fz_context *ctx, int ordering, int serif, int wmode)
 {
 	const unsigned char *data;
 	int size, index;
-	data = fz_lookup_cjk_font(ctx, registry, serif, wmode, &size, &index);
+	data = fz_lookup_cjk_font(ctx, ordering, serif, wmode, &size, &index);
 	if (!data)
 		fz_throw(ctx, FZ_ERROR_GENERIC, "cannot find builtin CJK font");
 	return fz_new_font_from_memory(ctx, NULL, data, size, index, 0);
diff --git a/source/fitz/noto.c b/source/fitz/noto.c
index f6951ba2..d16e800e 100644
--- a/source/fitz/noto.c
+++ b/source/fitz/noto.c
@@ -138,13 +138,13 @@ fz_lookup_builtin_font(fz_context *ctx, const char *name, int is_bold, int is_it
 }
 
 const unsigned char *
-fz_lookup_cjk_font(fz_context *ctx, int registry, int serif, int wmode, int *size, int *index)
+fz_lookup_cjk_font(fz_context *ctx, int ordering, int serif, int wmode, int *size, int *index)
 {
 	if (index) *index = 0;
 #ifndef TOFU_CJK
 #ifndef TOFU_CJK_EXT
 #ifndef TOFU_CJK_LANG
-	switch (registry) {
+	switch (ordering) {
 	case FZ_ADOBE_JAPAN_1: RETURN(han_SourceHanSansJP_Regular_otf);
 	case FZ_ADOBE_KOREA_1: RETURN(han_SourceHanSansKR_Regular_otf);
 	default:
diff --git a/source/pdf/pdf-encodings.h b/source/pdf/pdf-encodings.h
index a5d2e7ec..3c5bedfd 100644
--- a/source/pdf/pdf-encodings.h
+++ b/source/pdf/pdf-encodings.h
@@ -37,94 +37,89 @@ const unsigned short pdf_doc_encoding[256] =
 	0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff
 };
 
-const char * const pdf_standard[256] = { _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+const char *pdf_standard[256] = {
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
 	"space", "exclam", "quotedbl", "numbersign", "dollar", "percent",
 	"ampersand", "quoteright", "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",
-	"quoteleft", "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", _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, "exclamdown", "cent", "sterling",
-	"fraction", "yen", "florin", "section", "currency", "quotesingle",
-	"quotedblleft", "guillemotleft", "guilsinglleft", "guilsinglright",
-	"fi", "fl", _notdef, "endash", "dagger", "daggerdbl", "periodcentered",
-	_notdef, "paragraph", "bullet", "quotesinglbase", "quotedblbase",
-	"quotedblright", "guillemotright", "ellipsis", "perthousand",
-	_notdef, "questiondown", _notdef, "grave", "acute", "circumflex",
-	"tilde", "macron", "breve", "dotaccent", "dieresis", _notdef,
-	"ring", "cedilla", _notdef, "hungarumlaut", "ogonek", "caron",
-	"emdash", _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, "AE",
-	_notdef, "ordfeminine", _notdef, _notdef, _notdef, _notdef,
-	"Lslash", "Oslash", "OE", "ordmasculine", _notdef, _notdef,
-	_notdef, _notdef, _notdef, "ae", _notdef, _notdef,
-	_notdef, "dotlessi", _notdef, _notdef, "lslash", "oslash",
-	"oe", "germandbls", _notdef, _notdef, _notdef, _notdef
+	"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", "quoteleft",
+	"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", _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	"exclamdown", "cent", "sterling", "fraction", "yen", "florin",
+	"section", "currency", "quotesingle", "quotedblleft", "guillemotleft",
+	"guilsinglleft", "guilsinglright", "fi", "fl", _notdef, "endash",
+	"dagger", "daggerdbl", "periodcentered", _notdef, "paragraph",
+	"bullet", "quotesinglbase", "quotedblbase", "quotedblright",
+	"guillemotright", "ellipsis", "perthousand", _notdef, "questiondown",
+	_notdef, "grave", "acute", "circumflex", "tilde", "macron", "breve",
+	"dotaccent", "dieresis", _notdef, "ring", "cedilla", _notdef,
+	"hungarumlaut", "ogonek", "caron", "emdash", _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, "AE", _notdef,
+	"ordfeminine", _notdef, _notdef, _notdef, _notdef, "Lslash", "Oslash",
+	"OE", "ordmasculine", _notdef, _notdef, _notdef, _notdef, _notdef,
+	"ae", _notdef, _notdef, _notdef, "dotlessi", _notdef, _notdef,
+	"lslash", "oslash", "oe", "germandbls", _notdef, _notdef, _notdef,
+	_notdef
 };
 
-const char * const pdf_mac_roman[256] = { _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+const char *pdf_mac_roman[256] = {
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
 	"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", _notdef,
-	"Adieresis", "Aring", "Ccedilla", "Eacute", "Ntilde", "Odieresis",
-	"Udieresis", "aacute", "agrave", "acircumflex", "adieresis", "atilde",
-	"aring", "ccedilla", "eacute", "egrave", "ecircumflex", "edieresis",
-	"iacute", "igrave", "icircumflex", "idieresis", "ntilde", "oacute",
-	"ograve", "ocircumflex", "odieresis", "otilde", "uacute", "ugrave",
+	"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", _notdef, "Adieresis", "Aring",
+	"Ccedilla", "Eacute", "Ntilde", "Odieresis", "Udieresis", "aacute",
+	"agrave", "acircumflex", "adieresis", "atilde", "aring", "ccedilla",
+	"eacute", "egrave", "ecircumflex", "edieresis", "iacute", "igrave",
+	"icircumflex", "idieresis", "ntilde", "oacute", "ograve",
+	"ocircumflex", "odieresis", "otilde", "uacute", "ugrave",
 	"ucircumflex", "udieresis", "dagger", "degree", "cent", "sterling",
 	"section", "bullet", "paragraph", "germandbls", "registered",
-	"copyright", "trademark", "acute", "dieresis", _notdef, "AE",
-	"Oslash", _notdef, "plusminus", _notdef, _notdef, "yen", "mu",
-	_notdef, _notdef, _notdef, _notdef, _notdef, "ordfeminine",
-	"ordmasculine", _notdef, "ae", "oslash", "questiondown", "exclamdown",
-	"logicalnot", _notdef, "florin", _notdef, _notdef, "guillemotleft",
-	"guillemotright", "ellipsis", "space", "Agrave", "Atilde", "Otilde",
-	"OE", "oe", "endash", "emdash", "quotedblleft", "quotedblright",
-	"quoteleft", "quoteright", "divide", _notdef, "ydieresis",
-	"Ydieresis", "fraction", "currency", "guilsinglleft", "guilsinglright",
-	"fi", "fl", "daggerdbl", "periodcentered", "quotesinglbase",
-	"quotedblbase", "perthousand", "Acircumflex", "Ecircumflex", "Aacute",
-	"Edieresis", "Egrave", "Iacute", "Icircumflex", "Idieresis", "Igrave",
-	"Oacute", "Ocircumflex", _notdef, "Ograve", "Uacute", "Ucircumflex",
-	"Ugrave", "dotlessi", "circumflex", "tilde", "macron", "breve",
-	"dotaccent", "ring", "cedilla", "hungarumlaut", "ogonek", "caron"
+	"copyright", "trademark", "acute", "dieresis", _notdef, "AE", "Oslash",
+	_notdef, "plusminus", _notdef, _notdef, "yen", "mu", _notdef, _notdef,
+	_notdef, _notdef, _notdef, "ordfeminine", "ordmasculine", _notdef,
+	"ae", "oslash", "questiondown", "exclamdown", "logicalnot", _notdef,
+	"florin", _notdef, _notdef, "guillemotleft", "guillemotright",
+	"ellipsis", "space", "Agrave", "Atilde", "Otilde", "OE", "oe",
+	"endash", "emdash", "quotedblleft", "quotedblright", "quoteleft",
+	"quoteright", "divide", _notdef, "ydieresis", "Ydieresis", "fraction",
+	"currency", "guilsinglleft", "guilsinglright", "fi", "fl", "daggerdbl",
+	"periodcentered", "quotesinglbase", "quotedblbase", "perthousand",
+	"Acircumflex", "Ecircumflex", "Aacute", "Edieresis", "Egrave",
+	"Iacute", "Icircumflex", "Idieresis", "Igrave", "Oacute",
+	"Ocircumflex", _notdef, "Ograve", "Uacute", "Ucircumflex", "Ugrave",
+	"dotlessi", "circumflex", "tilde", "macron", "breve", "dotaccent",
+	"ring", "cedilla", "hungarumlaut", "ogonek", "caron"
 };
 
-const char * const pdf_mac_expert[256] = { _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+const char *pdf_mac_expert[256] = {
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
 	"space", "exclamsmall", "Hungarumlautsmall", "centoldstyle",
 	"dollaroldstyle", "dollarsuperior", "ampersandsmall", "Acutesmall",
 	"parenleftsuperior", "parenrightsuperior", "twodotenleader",
@@ -132,69 +127,68 @@ const char * const pdf_mac_expert[256] = { _notdef, _notdef,
 	"zerooldstyle", "oneoldstyle", "twooldstyle", "threeoldstyle",
 	"fouroldstyle", "fiveoldstyle", "sixoldstyle", "sevenoldstyle",
 	"eightoldstyle", "nineoldstyle", "colon", "semicolon", _notdef,
-	"threequartersemdash", _notdef, "questionsmall", _notdef,
-	_notdef, _notdef, _notdef, "Ethsmall", _notdef, _notdef,
-	"onequarter", "onehalf", "threequarters", "oneeighth", "threeeighths",
-	"fiveeighths", "seveneighths", "onethird", "twothirds", _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, "ff", "fi",
-	"fl", "ffi", "ffl", "parenleftinferior", _notdef, "parenrightinferior",
-	"Circumflexsmall", "hypheninferior", "Gravesmall", "Asmall", "Bsmall",
-	"Csmall", "Dsmall", "Esmall", "Fsmall", "Gsmall", "Hsmall", "Ismall",
-	"Jsmall", "Ksmall", "Lsmall", "Msmall", "Nsmall", "Osmall", "Psmall",
-	"Qsmall", "Rsmall", "Ssmall", "Tsmall", "Usmall", "Vsmall", "Wsmall",
-	"Xsmall", "Ysmall", "Zsmall", "colonmonetary", "onefitted", "rupiah",
-	"Tildesmall", _notdef, _notdef, "asuperior", "centsuperior",
-	_notdef, _notdef, _notdef, _notdef, "Aacutesmall",
-	"Agravesmall", "Acircumflexsmall", "Adieresissmall", "Atildesmall",
-	"Aringsmall", "Ccedillasmall", "Eacutesmall", "Egravesmall",
-	"Ecircumflexsmall", "Edieresissmall", "Iacutesmall", "Igravesmall",
-	"Icircumflexsmall", "Idieresissmall", "Ntildesmall", "Oacutesmall",
-	"Ogravesmall", "Ocircumflexsmall", "Odieresissmall", "Otildesmall",
-	"Uacutesmall", "Ugravesmall", "Ucircumflexsmall", "Udieresissmall",
-	_notdef, "eightsuperior", "fourinferior", "threeinferior",
-	"sixinferior", "eightinferior", "seveninferior", "Scaronsmall",
-	_notdef, "centinferior", "twoinferior", _notdef, "Dieresissmall",
-	_notdef, "Caronsmall", "osuperior", "fiveinferior", _notdef,
-	"commainferior", "periodinferior", "Yacutesmall", _notdef,
-	"dollarinferior", _notdef, _notdef, "Thornsmall", _notdef,
-	"nineinferior", "zeroinferior", "Zcaronsmall", "AEsmall", "Oslashsmall",
-	"questiondownsmall", "oneinferior", "Lslashsmall", _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, "Cedillasmall",
-	_notdef, _notdef, _notdef, _notdef, _notdef, "OEsmall",
-	"figuredash", "hyphensuperior", _notdef, _notdef, _notdef,
-	_notdef, "exclamdownsmall", _notdef, "Ydieresissmall", _notdef,
-	"onesuperior", "twosuperior", "threesuperior", "foursuperior",
-	"fivesuperior", "sixsuperior", "sevensuperior", "ninesuperior",
-	"zerosuperior", _notdef, "esuperior", "rsuperior", "tsuperior",
-	_notdef, _notdef, "isuperior", "ssuperior", "dsuperior",
-	_notdef, _notdef, _notdef, _notdef, _notdef, "lsuperior",
-	"Ogoneksmall", "Brevesmall", "Macronsmall", "bsuperior", "nsuperior",
-	"msuperior", "commasuperior", "periodsuperior", "Dotaccentsmall",
-	"Ringsmall", _notdef, _notdef, _notdef, _notdef };
+	"threequartersemdash", _notdef, "questionsmall", _notdef, _notdef,
+	_notdef, _notdef, "Ethsmall", _notdef, _notdef, "onequarter",
+	"onehalf", "threequarters", "oneeighth", "threeeighths", "fiveeighths",
+	"seveneighths", "onethird", "twothirds", _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, "ff", "fi", "fl", "ffi", "ffl",
+	"parenleftinferior", _notdef, "parenrightinferior", "Circumflexsmall",
+	"hypheninferior", "Gravesmall", "Asmall", "Bsmall", "Csmall", "Dsmall",
+	"Esmall", "Fsmall", "Gsmall", "Hsmall", "Ismall", "Jsmall", "Ksmall",
+	"Lsmall", "Msmall", "Nsmall", "Osmall", "Psmall", "Qsmall", "Rsmall",
+	"Ssmall", "Tsmall", "Usmall", "Vsmall", "Wsmall", "Xsmall", "Ysmall",
+	"Zsmall", "colonmonetary", "onefitted", "rupiah", "Tildesmall",
+	_notdef, _notdef, "asuperior", "centsuperior", _notdef, _notdef,
+	_notdef, _notdef, "Aacutesmall", "Agravesmall", "Acircumflexsmall",
+	"Adieresissmall", "Atildesmall", "Aringsmall", "Ccedillasmall",
+	"Eacutesmall", "Egravesmall", "Ecircumflexsmall", "Edieresissmall",
+	"Iacutesmall", "Igravesmall", "Icircumflexsmall", "Idieresissmall",
+	"Ntildesmall", "Oacutesmall", "Ogravesmall", "Ocircumflexsmall",
+	"Odieresissmall", "Otildesmall", "Uacutesmall", "Ugravesmall",
+	"Ucircumflexsmall", "Udieresissmall", _notdef, "eightsuperior",
+	"fourinferior", "threeinferior", "sixinferior", "eightinferior",
+	"seveninferior", "Scaronsmall", _notdef, "centinferior", "twoinferior",
+	_notdef, "Dieresissmall", _notdef, "Caronsmall", "osuperior",
+	"fiveinferior", _notdef, "commainferior", "periodinferior",
+	"Yacutesmall", _notdef, "dollarinferior", _notdef, _notdef,
+	"Thornsmall", _notdef, "nineinferior", "zeroinferior", "Zcaronsmall",
+	"AEsmall", "Oslashsmall", "questiondownsmall", "oneinferior",
+	"Lslashsmall", _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	"Cedillasmall", _notdef, _notdef, _notdef, _notdef, _notdef, "OEsmall",
+	"figuredash", "hyphensuperior", _notdef, _notdef, _notdef, _notdef,
+	"exclamdownsmall", _notdef, "Ydieresissmall", _notdef, "onesuperior",
+	"twosuperior", "threesuperior", "foursuperior", "fivesuperior",
+	"sixsuperior", "sevensuperior", "ninesuperior", "zerosuperior",
+	_notdef, "esuperior", "rsuperior", "tsuperior", _notdef, _notdef,
+	"isuperior", "ssuperior", "dsuperior", _notdef, _notdef, _notdef,
+	_notdef, _notdef, "lsuperior", "Ogoneksmall", "Brevesmall",
+	"Macronsmall", "bsuperior", "nsuperior", "msuperior", "commasuperior",
+	"periodsuperior", "Dotaccentsmall", "Ringsmall", _notdef, _notdef,
+	_notdef, _notdef
+};
 
-const char * const pdf_win_ansi[256] = { _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
-	_notdef, _notdef, _notdef, _notdef, _notdef, "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", "bullet", "Euro",
-	"bullet", "quotesinglbase", "florin", "quotedblbase", "ellipsis",
-	"dagger", "daggerdbl", "circumflex", "perthousand", "Scaron",
-	"guilsinglleft", "OE", "bullet", "Zcaron", "bullet", "bullet",
-	"quoteleft", "quoteright", "quotedblleft", "quotedblright", "bullet",
-	"endash", "emdash", "tilde", "trademark", "scaron", "guilsinglright",
-	"oe", "bullet", "zcaron", "Ydieresis", "space", "exclamdown", "cent",
+const char *pdf_win_ansi[256] = {
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	"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", "bullet", "Euro", "bullet",
+	"quotesinglbase", "florin", "quotedblbase", "ellipsis", "dagger",
+	"daggerdbl", "circumflex", "perthousand", "Scaron", "guilsinglleft",
+	"OE", "bullet", "Zcaron", "bullet", "bullet", "quoteleft",
+	"quoteright", "quotedblleft", "quotedblright", "bullet", "endash",
+	"emdash", "tilde", "trademark", "scaron", "guilsinglright", "oe",
+	"bullet", "zcaron", "Ydieresis", "space", "exclamdown", "cent",
 	"sterling", "currency", "yen", "brokenbar", "section", "dieresis",
 	"copyright", "ordfeminine", "guillemotleft", "logicalnot", "hyphen",
 	"registered", "macron", "degree", "plusminus", "twosuperior",
@@ -214,7 +208,22 @@ const char * const pdf_win_ansi[256] = { _notdef, _notdef, _notdef,
 	"yacute", "thorn", "ydieresis"
 };
 
-const char * const pdf_glyph_name_from_koi8u[128] = {
+const char *pdf_glyph_name_from_koi8u[256] = {
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	"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", _notdef,
 	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
 	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
 	_notdef, _notdef, _notdef, "integraltp", _notdef, "bulletoperator",
@@ -271,7 +280,22 @@ static const struct { unsigned short u, c; } koi8u_from_unicode[] = {
 	{0x2592,145}, {0x2593,146}, {0x25a0,148}
 };
 
-const char * const pdf_glyph_name_from_iso8859_7[128] = {
+const char *pdf_glyph_name_from_iso8859_7[256] = {
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
+	"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", _notdef,
 	/* the block drawing characters have been omitted */
 	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
 	_notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef, _notdef,
diff --git a/source/pdf/pdf-font.c b/source/pdf/pdf-font.c
index 69044c53..7caf9e3a 100644
--- a/source/pdf/pdf-font.c
+++ b/source/pdf/pdf-font.c
@@ -1485,6 +1485,8 @@ pdf_print_font(fz_context *ctx, fz_output *out, pdf_font_desc *fontdesc)
 	}
 }
 
+/* Font creation */
+
 fz_rect *pdf_measure_text(fz_context *ctx, pdf_font_desc *fontdesc, unsigned char *buf, size_t len, fz_rect *acc)
 {
 	size_t i;
@@ -1578,133 +1580,110 @@ pdf_add_font_file(fz_context *ctx, pdf_document *doc, fz_font *font)
 	return ref;
 }
 
-static pdf_obj*
-pdf_add_font_descriptor(fz_context *ctx, pdf_document *doc, pdf_font_desc *fontdesc, pdf_obj *fileref)
+static void
+pdf_add_font_descriptor(fz_context *ctx, pdf_document *doc, pdf_obj *fobj, fz_font *font)
 {
-	pdf_obj *ref = NULL;
-	pdf_obj *fdobj = NULL;
-	pdf_obj *bbox = NULL;
-
-	fz_font *font = fontdesc->font;
 	FT_Face face = font->ft_face;
+	pdf_obj *fdobj = NULL;
+	pdf_obj *fileref;
+	fz_rect bbox;
 
-	fz_var(fdobj);
-	fz_var(bbox);
-	fz_var(ref);
-
+	fdobj = pdf_new_dict(ctx, doc, 10);
 	fz_try(ctx)
 	{
-		fdobj = pdf_new_dict(ctx, doc, 10);
 		pdf_dict_put(ctx, fdobj, PDF_NAME_Type, PDF_NAME_FontDescriptor);
 		pdf_dict_put_name(ctx, fdobj, PDF_NAME_FontName, font->name);
 
-		bbox = pdf_new_array(ctx, doc, 4);
-		pdf_array_push_real(ctx, bbox, 1000.0f * font->bbox.x0);
-		pdf_array_push_real(ctx, bbox, 1000.0f * font->bbox.y0);
-		pdf_array_push_real(ctx, bbox, 1000.0f * font->bbox.x1);
-		pdf_array_push_real(ctx, bbox, 1000.0f * font->bbox.y1);
-		pdf_dict_put(ctx, fdobj, PDF_NAME_FontBBox, bbox);
+		bbox.x0 = font->bbox.x0 * 1000;
+		bbox.y0 = font->bbox.y0 * 1000;
+		bbox.x1 = font->bbox.x1 * 1000;
+		bbox.y1 = font->bbox.y1 * 1000;
+		pdf_dict_put_rect(ctx, fdobj, PDF_NAME_FontBBox, &bbox);
 
-		pdf_dict_put_real(ctx, fdobj, PDF_NAME_ItalicAngle, fontdesc->italic_angle);
-		pdf_dict_put_real(ctx, fdobj, PDF_NAME_Ascent, fontdesc->ascent);
-		pdf_dict_put_real(ctx, fdobj, PDF_NAME_Descent, fontdesc->descent);
-		pdf_dict_put_real(ctx, fdobj, PDF_NAME_CapHeight, fontdesc->cap_height);
-		pdf_dict_put_real(ctx, fdobj, PDF_NAME_StemV, 80);
-		pdf_dict_put_real(ctx, fdobj, PDF_NAME_Flags, fontdesc->flags);
+		pdf_dict_put_int(ctx, fdobj, PDF_NAME_ItalicAngle, 0);
+		pdf_dict_put_int(ctx, fdobj, PDF_NAME_Ascent, face->ascender * 1000.0f / face->units_per_EM);
+		pdf_dict_put_int(ctx, fdobj, PDF_NAME_Descent, face->descender * 1000.0f / face->units_per_EM);
+		pdf_dict_put_int(ctx, fdobj, PDF_NAME_StemV, 80);
+		pdf_dict_put_int(ctx, fdobj, PDF_NAME_Flags, PDF_FD_NONSYMBOLIC);
 
+		fileref = pdf_add_font_file(ctx, doc, font);
 		if (fileref)
 		{
 			switch (ft_font_file_kind(face))
 			{
-			case 1: pdf_dict_put(ctx, fdobj, PDF_NAME_FontFile, fileref); break;
-			case 2: pdf_dict_put(ctx, fdobj, PDF_NAME_FontFile2, fileref); break;
-			case 3: pdf_dict_put(ctx, fdobj, PDF_NAME_FontFile3, fileref); break;
+			default:
+			case 1: pdf_dict_put_drop(ctx, fdobj, PDF_NAME_FontFile, fileref); break;
+			case 2: pdf_dict_put_drop(ctx, fdobj, PDF_NAME_FontFile2, fileref); break;
+			case 3: pdf_dict_put_drop(ctx, fdobj, PDF_NAME_FontFile3, fileref); break;
 			}
 		}
 
-		ref = pdf_add_object(ctx, doc, fdobj);
+		pdf_dict_put_drop(ctx, fobj, PDF_NAME_FontDescriptor, pdf_add_object(ctx, doc, fdobj));
 	}
 	fz_always(ctx)
-	{
 		pdf_drop_obj(ctx, fdobj);
-		pdf_drop_obj(ctx, bbox);
-	}
 	fz_catch(ctx)
-	{
-		pdf_drop_obj(ctx, ref);
 		fz_rethrow(ctx);
-	}
-	return ref;
 }
 
-static pdf_obj*
-pdf_add_simple_font_widths(fz_context *ctx, pdf_document *doc, pdf_font_desc *fontdesc,
-	int *first_char, int *last_char)
+static void
+pdf_add_simple_font_widths(fz_context *ctx, pdf_document *doc, pdf_obj *fobj, fz_font *font, const char * const encoding[])
 {
 	int width_table[256];
-	pdf_obj *arr;
-	int i;
+	pdf_obj *widths;
+	int i, first, last;
 
-	*first_char = 0;
-	*last_char = 0;
+	first = 0;
+	last = 0;
 
 	for (i = 0; i < 256; ++i)
 	{
-		int glyph = fz_encode_character(ctx, fontdesc->font, i);
+		int glyph = 0;
+		if (encoding[i])
+		{
+			glyph = ft_name_index(font->ft_face, encoding[i]);
+			if (glyph == 0)
+				glyph = ft_char_index(font->ft_face, pdf_lookup_agl(encoding[i]));
+		}
 		if (glyph > 0)
 		{
-			if (!*first_char)
-				*first_char = i;
-			*last_char = i;
-			width_table[i] = fz_advance_glyph(ctx, fontdesc->font, glyph, 0) * 1000;
+			if (!first)
+				first = i;
+			last = i;
+			width_table[i] = fz_advance_glyph(ctx, font, glyph, 0) * 1000;
 		}
 		else
 			width_table[i] = 0;
 	}
 
-	arr = pdf_new_array(ctx, doc, *last_char - *first_char + 1);
-	fz_try(ctx)
-	{
-		for (i = *first_char; i <= *last_char; i++)
-			pdf_array_push_int(ctx, arr, width_table[i]);
-	}
-	fz_catch(ctx)
-	{
-		pdf_drop_obj(ctx, arr);
-		fz_rethrow(ctx);
-	}
-
-	return pdf_add_object_drop(ctx, doc, arr);
+	widths = pdf_new_array(ctx, doc, last - first + 1);
+	pdf_dict_put_drop(ctx, fobj, PDF_NAME_Widths, widths);
+	for (i = first; i <= last; ++i)
+		pdf_array_push_int(ctx, widths, width_table[i]);
+	pdf_dict_put_int(ctx, fobj, PDF_NAME_FirstChar, first);
+	pdf_dict_put_int(ctx, fobj, PDF_NAME_LastChar, last);
 }
 
-static pdf_obj*
-pdf_add_cid_system_info(fz_context *ctx, pdf_document *doc)
+static void
+pdf_add_cid_system_info(fz_context *ctx, pdf_document *doc, pdf_obj *fobj, const char *reg, const char *ord, int supp)
 {
-	pdf_obj *fobj = pdf_new_dict(ctx, doc, 3);
-	fz_try(ctx)
-	{
-		pdf_dict_put_string(ctx, fobj, PDF_NAME_Ordering, "Identity", strlen("Identity"));
-		pdf_dict_put_string(ctx, fobj, PDF_NAME_Registry, "Adobe", strlen("Adobe"));
-		pdf_dict_put_int(ctx, fobj, PDF_NAME_Supplement, 0);
-	}
-	fz_catch(ctx)
-	{
-		pdf_drop_obj(ctx, fobj);
-		fz_rethrow(ctx);
-	}
-	return fobj;
+	pdf_obj *csi;
+	pdf_dict_put_drop(ctx, fobj, PDF_NAME_CIDSystemInfo, csi = pdf_new_dict(ctx, doc, 3));
+	pdf_dict_put_string(ctx, csi, PDF_NAME_Registry, reg, strlen(reg));
+	pdf_dict_put_string(ctx, csi, PDF_NAME_Ordering, ord, strlen(ord));
+	pdf_dict_put_int(ctx, csi, PDF_NAME_Supplement, supp);
 }
 
 /* Different states of starting, same width as last, or consecutive glyph */
 enum { FW_START, FW_SAME, FW_RUN };
 
 /* ToDo: Ignore the default sized characters */
-static pdf_obj*
-pdf_add_cid_font_widths(fz_context *ctx, pdf_document *doc, pdf_font_desc *fontdesc, fz_font *font)
+static void
+pdf_add_cid_font_widths(fz_context *ctx, pdf_document *doc, pdf_obj *fobj, fz_font *font)
 {
 	FT_Face face = font->ft_face;
 	pdf_obj *run_obj = NULL;
-	pdf_obj *fwobj;
+	pdf_obj *fw;
 	int curr_code;
 	int prev_code;
 	int curr_size;
@@ -1717,7 +1696,7 @@ pdf_add_cid_font_widths(fz_context *ctx, pdf_document *doc, pdf_font_desc *fontd
 
 	fz_var(run_obj);
 
-	fwobj = pdf_new_array(ctx, doc, 10);
+	fw = pdf_add_object_drop(ctx, doc, pdf_new_array(ctx, doc, 10));
 	fz_try(ctx)
 	{
 		prev_code = 0;
@@ -1782,24 +1761,24 @@ pdf_add_cid_font_widths(fz_context *ctx, pdf_document *doc, pdf_font_desc *fontd
 				{
 				case FW_SAME:
 					/* Add three entries. First cid, last cid and width */
-					pdf_array_push_int(ctx, fwobj, first_code);
-					pdf_array_push_int(ctx, fwobj, prev_code);
-					pdf_array_push_int(ctx, fwobj, prev_size);
+					pdf_array_push_int(ctx, fw, first_code);
+					pdf_array_push_int(ctx, fw, prev_code);
+					pdf_array_push_int(ctx, fw, prev_size);
 					break;
 				case FW_RUN:
 					if (pdf_array_len(ctx, run_obj) > 0)
 					{
-						pdf_array_push_int(ctx, fwobj, first_code);
-						pdf_array_push(ctx, fwobj, run_obj);
+						pdf_array_push_int(ctx, fw, first_code);
+						pdf_array_push(ctx, fw, run_obj);
 					}
 					pdf_drop_obj(ctx, run_obj);
 					run_obj = NULL;
 					break;
 				case FW_START:
 					/* Lone wolf. Not part of a consecutive run */
-					pdf_array_push_int(ctx, fwobj, prev_code);
-					pdf_array_push_int(ctx, fwobj, prev_code);
-					pdf_array_push_int(ctx, fwobj, prev_size);
+					pdf_array_push_int(ctx, fw, prev_code);
+					pdf_array_push_int(ctx, fw, prev_code);
+					pdf_array_push_int(ctx, fw, prev_size);
 					break;
 				}
 
@@ -1814,82 +1793,55 @@ pdf_add_cid_font_widths(fz_context *ctx, pdf_document *doc, pdf_font_desc *fontd
 			prev_size = curr_size;
 			prev_code = curr_code;
 		}
+
+		if (font->width_table != NULL)
+			pdf_dict_put_int(ctx, fobj, PDF_NAME_DW, font->width_default);
+		if (pdf_array_len(ctx, fw) > 0)
+			pdf_dict_put(ctx, fobj, PDF_NAME_W, fw);
 	}
+	fz_always(ctx)
+		pdf_drop_obj(ctx, fw);
 	fz_catch(ctx)
-	{
-		pdf_drop_obj(ctx, fwobj);
-		pdf_drop_obj(ctx, run_obj);
 		fz_rethrow(ctx);
-	}
-	return pdf_add_object_drop(ctx, doc, fwobj);
 }
 
 /* Descendant font construction used for CID font creation from ttf or Adobe type1 */
 static pdf_obj*
-pdf_add_descendant_font(fz_context *ctx, pdf_document *doc, pdf_font_desc *fontdesc)
+pdf_add_descendant_cid_font(fz_context *ctx, pdf_document *doc, fz_font *font)
 {
-	pdf_obj *fobj = NULL;
-	pdf_obj *fref = NULL;
-	pdf_obj *fstr_ref = NULL;
-	pdf_obj *fsys_ref = NULL;
-	pdf_obj *fdes_ref = NULL;
-	pdf_obj *fw = NULL;
-
-	const char *ps_name;
-	fz_font *font = fontdesc->font;
 	FT_Face face = font->ft_face;
+	pdf_obj *fobj, *fref;
+	const char *ps_name;
 
-	fz_var(fobj);
-	fz_var(fref);
-	fz_var(fstr_ref);
-	fz_var(fsys_ref);
-	fz_var(fw);
-
+	fobj = pdf_new_dict(ctx, doc, 3);
 	fz_try(ctx)
 	{
-		/* refs */
-		fstr_ref = pdf_add_font_file(ctx, doc, fontdesc->font);
-		fdes_ref = pdf_add_font_descriptor(ctx, doc, fontdesc, fstr_ref);
-		fsys_ref = pdf_add_cid_system_info(ctx, doc);
-
-		/* We may have a cid font already with width info in source font and no cmap in the ft face */
-		fw = pdf_add_cid_font_widths(ctx, doc, fontdesc, font);
-
-		/* And now the font */
-		fobj = pdf_new_dict(ctx, doc, 3);
 		pdf_dict_put(ctx, fobj, PDF_NAME_Type, PDF_NAME_Font);
 		switch (ft_kind(face))
 		{
 		case TYPE1: pdf_dict_put(ctx, fobj, PDF_NAME_Subtype, PDF_NAME_CIDFontType0); break;
 		case TRUETYPE: pdf_dict_put(ctx, fobj, PDF_NAME_Subtype, PDF_NAME_CIDFontType2); break;
 		}
+
+		pdf_add_cid_system_info(ctx, doc, fobj, "Adobe", "Identity", 0);
+
 		ps_name = FT_Get_Postscript_Name(face);
 		if (ps_name)
 			pdf_dict_put_name(ctx, fobj, PDF_NAME_BaseFont, ps_name);
 		else
 			pdf_dict_put_name(ctx, fobj, PDF_NAME_BaseFont, font->name);
-		pdf_dict_put(ctx, fobj, PDF_NAME_CIDSystemInfo, fsys_ref);
-		pdf_dict_put(ctx, fobj, PDF_NAME_FontDescriptor, fdes_ref);
-		if (font->width_table != NULL)
-			pdf_dict_put_int(ctx, fobj, PDF_NAME_DW, font->width_default);
-		if (fw != NULL)
-			pdf_dict_put(ctx, fobj, PDF_NAME_W, fw);
+
+		pdf_add_font_descriptor(ctx, doc, fobj, font);
+
+		/* We may have a cid font already with width info in source font and no cmap in the ft face */
+		pdf_add_cid_font_widths(ctx, doc, fobj, font);
 
 		fref = pdf_add_object(ctx, doc, fobj);
 	}
 	fz_always(ctx)
-	{
 		pdf_drop_obj(ctx, fobj);
-		pdf_drop_obj(ctx, fstr_ref);
-		pdf_drop_obj(ctx, fsys_ref);
-		pdf_drop_obj(ctx, fdes_ref);
-		pdf_drop_obj(ctx, fw);
-	}
 	fz_catch(ctx)
-	{
-		pdf_drop_obj(ctx, fref);
 		fz_rethrow(ctx);
-	}
 	return fref;
 }
 
@@ -1907,12 +1859,10 @@ static int next_range(int *table, int size, int k)
 }
 
 /* Create the ToUnicode CMap. */
-static pdf_obj*
-pdf_add_to_unicode(fz_context *ctx, pdf_document *doc, fz_font *font)
+static void
+pdf_add_to_unicode(fz_context *ctx, pdf_document *doc, pdf_obj *fobj, fz_font *font)
 {
 	FT_Face face = font->ft_face;
-	pdf_obj *fref = NULL;
-	pdf_obj *fobj = NULL;
 	fz_buffer *buf;
 
 	int *table;
@@ -1920,9 +1870,6 @@ pdf_add_to_unicode(fz_context *ctx, pdf_document *doc, fz_font *font)
 	int num_chr = 0;
 	int n, k;
 
-	fz_var(fref);
-	fz_var(fobj);
-
 	/* Populate reverse cmap table */
 	{
 		FT_ULong ucs;
@@ -1954,7 +1901,7 @@ pdf_add_to_unicode(fz_context *ctx, pdf_document *doc, fz_font *font)
 	{
 		fz_warn(ctx, "cannot create ToUnicode mapping for %s", font->name);
 		fz_free(ctx, table);
-		return NULL;
+		return;
 	}
 
 	buf = fz_new_buffer(ctx, 0);
@@ -2052,22 +1999,15 @@ pdf_add_to_unicode(fz_context *ctx, pdf_document *doc, fz_font *font)
 		fz_append_string(ctx, buf, "CMapName currentdict /CMap defineresource pop\n");
 		fz_append_string(ctx, buf, "end\nend\n");
 
-		fobj = pdf_new_dict(ctx, doc, 3);
-		fref = pdf_add_object(ctx, doc, fobj);
-		pdf_update_stream(ctx, doc, fref, buf, 0);
+		pdf_dict_put_drop(ctx, fobj, PDF_NAME_ToUnicode, pdf_add_stream(ctx, doc, buf, NULL, 0));
 	}
 	fz_always(ctx)
 	{
 		fz_free(ctx, table);
 		fz_drop_buffer(ctx, buf);
-		pdf_drop_obj(ctx, fobj);
 	}
 	fz_catch(ctx)
-	{
-		pdf_drop_obj(ctx, fref);
 		fz_rethrow(ctx);
-	}
-	return fref;
 }
 
 /* Creates CID font with Identity-H CMap and a ToUnicode CMap that is created by
@@ -2079,78 +2019,38 @@ pdf_add_cid_font(fz_context *ctx, pdf_document *doc, fz_font *font)
 {
 	pdf_obj *fobj = NULL;
 	pdf_obj *fref = NULL;
-	pdf_obj *obj_desc_ref = NULL;
-	pdf_obj *obj_tounicode_ref = NULL;
-	pdf_obj *obj_array = NULL;
-	pdf_font_desc *fontdesc = NULL;
-
-	FT_Face face = font->ft_face;
+	pdf_obj *dfonts = NULL;
 	unsigned char digest[16];
 
-	fz_var(fobj);
-	fz_var(fref);
-	fz_var(obj_desc_ref);
-	fz_var(obj_tounicode_ref);
-	fz_var(fontdesc);
-	fz_var(obj_array);
+	fref = pdf_find_font_resource(ctx, doc, PDF_CID_FONT_RESOURCE, 0, font->buffer, digest);
+	if (fref)
+		return fref;
 
+	fobj = pdf_add_object_drop(ctx, doc, pdf_new_dict(ctx, doc, 10));
 	fz_try(ctx)
 	{
-		/* Before we add this font as a resource check if the same font
-		 * already exists in our resources for this doc. If yes, then
-		 * hand back that reference */
-		fref = pdf_find_font_resource(ctx, doc, PDF_CID_FONT_RESOURCE, 0, font->buffer, digest);
-		if (fref == NULL)
-		{
-			/* Set up desc, width, and font file */
-			fontdesc = pdf_new_font_desc(ctx);
-			fontdesc->font = fz_keep_font(ctx, font);
-			fontdesc->flags = PDF_FD_NONSYMBOLIC; /* ToDo: FixMe. Set non-symbolic always for now */
-			fontdesc->ascent = face->ascender * 1000.0f / face->units_per_EM;
-			fontdesc->descent = face->descender * 1000.0f / face->units_per_EM;
-
-			/* Get the descendant font and the tounicode references */
-			obj_desc_ref = pdf_add_descendant_font(ctx, doc, fontdesc);
-			obj_tounicode_ref = pdf_add_to_unicode(ctx, doc, font);
-
-			/* And now the font */
-			fobj = pdf_new_dict(ctx, doc, 10);
-			pdf_dict_put(ctx, fobj, PDF_NAME_Type, PDF_NAME_Font);
-			pdf_dict_put(ctx, fobj, PDF_NAME_Subtype, PDF_NAME_Type0);
-			pdf_dict_put_name(ctx, fobj, PDF_NAME_BaseFont, font->name);
-			pdf_dict_put(ctx, fobj, PDF_NAME_Encoding, PDF_NAME_Identity_H);
+		pdf_dict_put(ctx, fobj, PDF_NAME_Type, PDF_NAME_Font);
+		pdf_dict_put(ctx, fobj, PDF_NAME_Subtype, PDF_NAME_Type0);
+		pdf_dict_put_name(ctx, fobj, PDF_NAME_BaseFont, font->name);
+		pdf_dict_put(ctx, fobj, PDF_NAME_Encoding, PDF_NAME_Identity_H);
+		pdf_add_to_unicode(ctx, doc, fobj, font);
 
-			obj_array = pdf_new_array(ctx, doc, 3);
-			pdf_array_insert(ctx, obj_array, obj_desc_ref, 0);
-			pdf_dict_put(ctx, fobj, PDF_NAME_DescendantFonts, obj_array);
-			if (obj_tounicode_ref)
-				pdf_dict_put(ctx, fobj, PDF_NAME_ToUnicode, obj_tounicode_ref);
-			fref = pdf_add_object(ctx, doc, fobj);
+		pdf_dict_put_drop(ctx, fobj, PDF_NAME_DescendantFonts, dfonts = pdf_new_array(ctx, doc, 1));
+		pdf_array_push_drop(ctx, dfonts, pdf_add_descendant_cid_font(ctx, doc, font));
 
-			/* Add ref to our font resource hash table. */
-			fref = pdf_insert_font_resource(ctx, doc, digest, fref);
-		}
+		fref = pdf_insert_font_resource(ctx, doc, digest, fobj);
 	}
 	fz_always(ctx)
-	{
-		pdf_drop_font(ctx, fontdesc);
 		pdf_drop_obj(ctx, fobj);
-		pdf_drop_obj(ctx, obj_desc_ref);
-		pdf_drop_obj(ctx, obj_array);
-		pdf_drop_obj(ctx, obj_tounicode_ref);
-	}
 	fz_catch(ctx)
-	{
-		pdf_drop_obj(ctx, fref);
 		fz_rethrow(ctx);
-	}
 	return fref;
 }
 
 /* Create simple (8-bit encoding) fonts */
 
 static void
-pdf_add_simple_font_encoding_imp(fz_context *ctx, pdf_document *doc, pdf_obj *font, const char * const glyph_names[])
+pdf_add_simple_font_encoding_imp(fz_context *ctx, pdf_document *doc, pdf_obj *font, const char *glyph_names[])
 {
 	pdf_obj *enc, *diff;
 	int i, last;
@@ -2161,7 +2061,7 @@ pdf_add_simple_font_encoding_imp(fz_context *ctx, pdf_document *doc, pdf_obj *fo
 	last = 0;
 	for (i = 128; i < 256; ++i)
 	{
-		const char *glyph = glyph_names[i-128];
+		const char *glyph = glyph_names[i];
 		if (glyph)
 		{
 			if (last != i-1)
@@ -2193,88 +2093,60 @@ pdf_add_simple_font_encoding(fz_context *ctx, pdf_document *doc, pdf_obj *fobj,
 pdf_obj *
 pdf_add_simple_font(fz_context *ctx, pdf_document *doc, fz_font *font, int encoding)
 {
+	FT_Face face = font->ft_face;
 	pdf_obj *fobj = NULL;
 	pdf_obj *fref = NULL;
-	pdf_obj *fstr_ref = NULL;
-	pdf_obj *fdes_ref = NULL;
-	pdf_obj *fwidth_ref = NULL;
-	pdf_font_desc *fontdesc = NULL;
-
-	FT_Face face = font->ft_face;
+	const char **enc;
 	unsigned char digest[16];
-	int first_char, last_char;
 
-	fz_var(fobj);
-	fz_var(fref);
-	fz_var(fstr_ref);
-	fz_var(fdes_ref);
-	fz_var(fwidth_ref);
-	fz_var(fontdesc);
+	fref = pdf_find_font_resource(ctx, doc, PDF_SIMPLE_FONT_RESOURCE, encoding, font->buffer, digest);
+	if (fref)
+		return fref;
 
+	switch (encoding)
+	{
+	default: enc = pdf_win_ansi; break;
+	case PDF_SIMPLE_ENCODING_LATIN: enc = pdf_win_ansi; break;
+	case PDF_SIMPLE_ENCODING_GREEK: enc = pdf_glyph_name_from_iso8859_7; break;
+	case PDF_SIMPLE_ENCODING_CYRILLIC: enc = pdf_glyph_name_from_koi8u; break;
+	}
+
+	fobj = pdf_add_object_drop(ctx, doc, pdf_new_dict(ctx, doc, 10));
 	fz_try(ctx)
 	{
-		/* Before we add this font as a resource check if the same font
-		 * already exists in our resources for this doc. If yes, then
-		 * hand back that reference */
-		fref = pdf_find_font_resource(ctx, doc, PDF_SIMPLE_FONT_RESOURCE, encoding, font->buffer, digest);
-		if (fref == NULL)
+		pdf_dict_put(ctx, fobj, PDF_NAME_Type, PDF_NAME_Font);
+		switch (ft_kind(face))
 		{
-			fobj = pdf_new_dict(ctx, doc, 10);
-			pdf_dict_put(ctx, fobj, PDF_NAME_Type, PDF_NAME_Font);
-			switch (ft_kind(face))
-			{
-			case TYPE1: pdf_dict_put(ctx, fobj, PDF_NAME_Subtype, PDF_NAME_Type1); break;
-			case TRUETYPE: pdf_dict_put(ctx, fobj, PDF_NAME_Subtype, PDF_NAME_TrueType); break;
-			}
-
-			if (!is_builtin_font(ctx, font))
-			{
-				const char *ps_name = FT_Get_Postscript_Name(face);
-				if (!ps_name)
-					ps_name = font->name;
-				pdf_dict_put_name(ctx, fobj, PDF_NAME_BaseFont, ps_name);
-
-				fontdesc = pdf_new_font_desc(ctx);
-				fontdesc->font = fz_keep_font(ctx, font);
-				fontdesc->flags = PDF_FD_NONSYMBOLIC; /* ToDo: FixMe. Set non-symbolic always for now */
-				fontdesc->ascent = face->ascender * 1000.0f / face->units_per_EM;
-				fontdesc->descent = face->descender * 1000.0f / face->units_per_EM;
-
-				fstr_ref = pdf_add_font_file(ctx, doc, font);
-				fdes_ref = pdf_add_font_descriptor(ctx, doc, fontdesc, fstr_ref);
-				fwidth_ref = pdf_add_simple_font_widths(ctx, doc, fontdesc, &first_char, &last_char);
-
-				pdf_dict_put_int(ctx, fobj, PDF_NAME_FirstChar, first_char);
-				pdf_dict_put_int(ctx, fobj, PDF_NAME_LastChar, last_char);
-				pdf_dict_put(ctx, fobj, PDF_NAME_Widths, fwidth_ref);
-				pdf_dict_put(ctx, fobj, PDF_NAME_FontDescriptor, fdes_ref);
-			}
-			else
-			{
-				pdf_dict_put_name(ctx, fobj, PDF_NAME_BaseFont, clean_font_name(font->name));
-			}
+		case TYPE1: pdf_dict_put(ctx, fobj, PDF_NAME_Subtype, PDF_NAME_Type1); break;
+		case TRUETYPE: pdf_dict_put(ctx, fobj, PDF_NAME_Subtype, PDF_NAME_TrueType); break;
+		}
 
+		if (!is_builtin_font(ctx, font))
+		{
+			const char *ps_name = FT_Get_Postscript_Name(face);
+			if (!ps_name)
+				ps_name = font->name;
+			pdf_dict_put_name(ctx, fobj, PDF_NAME_BaseFont, ps_name);
 			pdf_add_simple_font_encoding(ctx, doc, fobj, encoding);
-
-			fref = pdf_add_object(ctx, doc, fobj);
-
-			/* Add ref to our font resource hash table. */
-			fref = pdf_insert_font_resource(ctx, doc, digest, fref);
+			pdf_add_simple_font_widths(ctx, doc, fobj, font, enc);
+			pdf_add_font_descriptor(ctx, doc, fobj, font);
 		}
+		else
+		{
+			pdf_dict_put_name(ctx, fobj, PDF_NAME_BaseFont, clean_font_name(font->name));
+			pdf_add_simple_font_encoding(ctx, doc, fobj, encoding);
+			if (encoding != PDF_SIMPLE_ENCODING_LATIN)
+				pdf_add_simple_font_widths(ctx, doc, fobj, font, enc);
+		}
+
+		fref = pdf_insert_font_resource(ctx, doc, digest, fobj);
 	}
 	fz_always(ctx)
 	{
-		pdf_drop_font(ctx, fontdesc);
 		pdf_drop_obj(ctx, fobj);
-		pdf_drop_obj(ctx, fstr_ref);
-		pdf_drop_obj(ctx, fdes_ref);
-		pdf_drop_obj(ctx, fwidth_ref);
 	}
 	fz_catch(ctx)
-	{
-		pdf_drop_obj(ctx, fref);
 		fz_rethrow(ctx);
-	}
 	return fref;
 }
 
@@ -2296,7 +2168,7 @@ pdf_obj *
 pdf_add_cjk_font(fz_context *ctx, pdf_document *doc, fz_font *fzfont, int script)
 {
 	pdf_obj *fref, *font, *subfont, *fontdesc;
-	pdf_obj *dfonts, *ros;
+	pdf_obj *dfonts;
 	fz_rect bbox = { -200, -200, 1200, 1200 };
 	unsigned char digest[16];
 
@@ -2338,40 +2210,40 @@ pdf_add_cjk_font(fz_context *ctx, pdf_document *doc, fz_font *fzfont, int script
 	if (fref)
 		return fref;
 
-	font = pdf_new_dict(ctx, doc, 5);
-	pdf_dict_put(ctx, font, PDF_NAME_Type, PDF_NAME_Font);
-	pdf_dict_put(ctx, font, PDF_NAME_Subtype, PDF_NAME_Type0);
-	pdf_dict_put_name(ctx, font, PDF_NAME_BaseFont, basefont);
-	pdf_dict_put_name(ctx, font, PDF_NAME_Encoding, encoding);
-	pdf_dict_put_drop(ctx, font, PDF_NAME_DescendantFonts, dfonts = pdf_new_array(ctx, doc, 1));
-	subfont = pdf_new_dict(ctx, doc, 5);
+	font = pdf_add_object_drop(ctx, doc, pdf_new_dict(ctx, doc, 5));
+	fz_try(ctx)
 	{
-		pdf_dict_put(ctx, subfont, PDF_NAME_Type, PDF_NAME_Font);
-		pdf_dict_put(ctx, subfont, PDF_NAME_Subtype, PDF_NAME_CIDFontType0);
-		pdf_dict_put_name(ctx, subfont, PDF_NAME_BaseFont, basefont);
-		pdf_dict_put_drop(ctx, subfont, PDF_NAME_CIDSystemInfo, ros = pdf_new_dict(ctx, doc, 3));
-		pdf_dict_put_text_string(ctx, ros, PDF_NAME_Registry, "Adobe");
-		pdf_dict_put_text_string(ctx, ros, PDF_NAME_Ordering, ordering);
-		pdf_dict_put_int(ctx, ros, PDF_NAME_Supplement, supplement);
-		fontdesc = pdf_new_dict(ctx, doc, 8);
+		pdf_dict_put(ctx, font, PDF_NAME_Type, PDF_NAME_Font);
+		pdf_dict_put(ctx, font, PDF_NAME_Subtype, PDF_NAME_Type0);
+		pdf_dict_put_name(ctx, font, PDF_NAME_BaseFont, basefont);
+		pdf_dict_put_name(ctx, font, PDF_NAME_Encoding, encoding);
+		pdf_dict_put_drop(ctx, font, PDF_NAME_DescendantFonts, dfonts = pdf_new_array(ctx, doc, 1));
+		pdf_array_push_drop(ctx, dfonts, pdf_add_object_drop(ctx, doc, subfont = pdf_new_dict(ctx, doc, 5)));
 		{
-			pdf_dict_put(ctx, fontdesc, PDF_NAME_Type, PDF_NAME_FontDescriptor);
-			pdf_dict_put_text_string(ctx, fontdesc, PDF_NAME_FontName, basefont);
-			pdf_dict_put_int(ctx, fontdesc, PDF_NAME_Flags, 0);
-			pdf_dict_put_rect(ctx, fontdesc, PDF_NAME_FontBBox, &bbox);
-			pdf_dict_put_int(ctx, fontdesc, PDF_NAME_ItalicAngle, 0);
-			pdf_dict_put_int(ctx, fontdesc, PDF_NAME_Ascent, 1000);
-			pdf_dict_put_int(ctx, fontdesc, PDF_NAME_Descent, -200);
-			pdf_dict_put_int(ctx, fontdesc, PDF_NAME_StemV, 80);
+			pdf_dict_put(ctx, subfont, PDF_NAME_Type, PDF_NAME_Font);
+			pdf_dict_put(ctx, subfont, PDF_NAME_Subtype, PDF_NAME_CIDFontType0);
+			pdf_dict_put_name(ctx, subfont, PDF_NAME_BaseFont, basefont);
+			pdf_add_cid_system_info(ctx, doc, subfont, "Adobe", ordering, supplement);
+			fontdesc = pdf_add_object_drop(ctx, doc, pdf_new_dict(ctx, doc, 8));
+			pdf_dict_put_drop(ctx, subfont, PDF_NAME_FontDescriptor, fontdesc);
+			{
+				pdf_dict_put(ctx, fontdesc, PDF_NAME_Type, PDF_NAME_FontDescriptor);
+				pdf_dict_put_text_string(ctx, fontdesc, PDF_NAME_FontName, basefont);
+				pdf_dict_put_int(ctx, fontdesc, PDF_NAME_Flags, 0);
+				pdf_dict_put_rect(ctx, fontdesc, PDF_NAME_FontBBox, &bbox);
+				pdf_dict_put_int(ctx, fontdesc, PDF_NAME_ItalicAngle, 0);
+				pdf_dict_put_int(ctx, fontdesc, PDF_NAME_Ascent, 1000);
+				pdf_dict_put_int(ctx, fontdesc, PDF_NAME_Descent, -200);
+				pdf_dict_put_int(ctx, fontdesc, PDF_NAME_StemV, 80);
+			}
 		}
-		pdf_dict_put_drop(ctx, subfont, PDF_NAME_FontDescriptor, pdf_add_object_drop(ctx, doc, fontdesc));
-	}
-	pdf_array_push_drop(ctx, dfonts, pdf_add_object_drop(ctx, doc, subfont));
-
-	fref = pdf_add_object_drop(ctx, doc, font);
 
-	/* Add ref to our font resource hash table. */
-	fref = pdf_insert_font_resource(ctx, doc, digest, fref);
+		fref = pdf_insert_font_resource(ctx, doc, digest, font);
+	}
+	fz_always(ctx)
+		pdf_drop_obj(ctx, font);
+	fz_catch(ctx)
+		fz_rethrow(ctx);
 
 	return fref;
 }
diff --git a/source/pdf/pdf-image.c b/source/pdf/pdf-image.c
index c5c0f3ad..2b274e62 100644
--- a/source/pdf/pdf-image.c
+++ b/source/pdf/pdf-image.c
@@ -323,9 +323,9 @@ pdf_add_image(fz_context *ctx, pdf_document *doc, fz_image *image, int mask)
 	if (imref)
 		return imref;
 
+	imobj = pdf_add_object_drop(ctx, doc, pdf_new_dict(ctx, doc, 3));
 	fz_try(ctx)
 	{
-		imobj = pdf_new_dict(ctx, doc, 3);
 		pdf_dict_put_drop(ctx, imobj, PDF_NAME_DecodeParms, dp = pdf_new_dict(ctx, doc, 3));
 		pdf_dict_put(ctx, imobj, PDF_NAME_Type, PDF_NAME_XObject);
 		pdf_dict_put(ctx, imobj, PDF_NAME_Subtype, PDF_NAME_Image);
@@ -527,11 +527,10 @@ raw_or_unknown_compression:
 			pdf_dict_put_drop(ctx, imobj, PDF_NAME_SMask, pdf_add_image(ctx, doc, image->mask, 0));
 		}
 
-		imref = pdf_add_object(ctx, doc, imobj);
-		pdf_update_stream(ctx, doc, imref, buffer, 1);
+		pdf_update_stream(ctx, doc, imobj, buffer, 1);
 
 		/* Add ref to our image resource hash table. */
-		imref = pdf_insert_image_resource(ctx, doc, digest, imref);
+		imref = pdf_insert_image_resource(ctx, doc, digest, imobj);
 	}
 	fz_always(ctx)
 	{
@@ -540,9 +539,6 @@ raw_or_unknown_compression:
 		pdf_drop_obj(ctx, imobj);
 	}
 	fz_catch(ctx)
-	{
-		pdf_drop_obj(ctx, imref);
 		fz_rethrow(ctx);
-	}
 	return imref;
 }
diff --git a/source/pdf/pdf-resources.c b/source/pdf/pdf-resources.c
index 720ee2b1..be97a0ba 100644
--- a/source/pdf/pdf-resources.c
+++ b/source/pdf/pdf-resources.c
@@ -100,7 +100,7 @@ pdf_insert_image_resource(fz_context *ctx, pdf_document *doc, unsigned char dige
 		fz_warn(ctx, "warning: image resource already present");
 	else
 		res = pdf_keep_obj(ctx, obj);
-	return res;
+	return pdf_keep_obj(ctx, res);
 }
 
 /* We do need to come up with an effective way to see what is already in the
@@ -142,7 +142,7 @@ pdf_insert_font_resource(fz_context *ctx, pdf_document *doc, unsigned char diges
 		fz_warn(ctx, "warning: font resource already present");
 	else
 		res = pdf_keep_obj(ctx, obj);
-	return res;
+	return pdf_keep_obj(ctx, res);
 }
 
 void