Rename pdf_xref type to pdf_document.

21 files changed, 180 insertions, 180 deletions

diff --git a/pdf/mupdf.h b/pdf/mupdf.h
index f1b29e14..f0951976 100644
--- a/pdf/mupdf.h
+++ b/pdf/mupdf.h
@@ -5,7 +5,7 @@
 #error "fitz.h must be included before mupdf.h"
 #endif
 
-typedef struct pdf_xref_s pdf_xref;
+typedef struct pdf_document_s pdf_document;
 
 /*
  * tokenizer and low-level object parser
@@ -27,10 +27,10 @@ enum
 
 int pdf_lex(fz_stream *f, char *buf, int n, int *len);
 
-fz_obj *pdf_parse_array(pdf_xref *xref, fz_stream *f, char *buf, int cap);
-fz_obj *pdf_parse_dict(pdf_xref *xref, fz_stream *f, char *buf, int cap);
-fz_obj *pdf_parse_stm_obj(pdf_xref *xref, fz_stream *f, char *buf, int cap);
-fz_obj * pdf_parse_ind_obj(pdf_xref *xref, fz_stream *f, char *buf, int cap, int *num, int *gen, int *stm_ofs);
+fz_obj *pdf_parse_array(pdf_document *doc, fz_stream *f, char *buf, int cap);
+fz_obj *pdf_parse_dict(pdf_document *doc, fz_stream *f, char *buf, int cap);
+fz_obj *pdf_parse_stm_obj(pdf_document *doc, fz_stream *f, char *buf, int cap);
+fz_obj * pdf_parse_ind_obj(pdf_document *doc, fz_stream *f, char *buf, int cap, int *num, int *gen, int *stm_ofs);
 
 fz_rect pdf_to_rect(fz_context *ctx, fz_obj *array);
 fz_matrix pdf_to_matrix(fz_context *ctx, fz_obj *array);
@@ -71,7 +71,7 @@ struct pdf_ocg_descriptor_s
 	fz_obj *intent;
 };
 
-struct pdf_xref_s
+struct pdf_document_s
 {
 	fz_context *ctx;
 	fz_stream *file;
@@ -94,27 +94,27 @@ struct pdf_xref_s
 };
 
 fz_obj *pdf_resolve_indirect(fz_obj *ref);
-void pdf_cache_object(pdf_xref *, int num, int gen);
-fz_obj *pdf_load_object(pdf_xref *, int num, int gen);
-void pdf_update_object( pdf_xref *xref, int num, int gen, fz_obj *newobj);
-
-int pdf_is_stream(pdf_xref *xref, int num, int gen);
-fz_stream *pdf_open_inline_stream(fz_stream *chain, pdf_xref *xref, fz_obj *stmobj, int length);
-fz_buffer *pdf_load_raw_stream(pdf_xref *xref, int num, int gen);
-fz_buffer *pdf_load_stream(pdf_xref *xref, int num, int gen);
-fz_stream *pdf_open_raw_stream(pdf_xref *, int num, int gen);
-fz_stream *pdf_open_stream(pdf_xref *, int num, int gen);
-fz_stream *pdf_open_stream_at(pdf_xref *xref, int num, int gen, fz_obj *dict, int stm_ofs);
-
-pdf_xref *pdf_open_xref_with_stream(fz_stream *file);
-pdf_xref *pdf_open_xref(fz_context *ctx, const char *filename);
-void pdf_free_xref(pdf_xref *);
+void pdf_cache_object(pdf_document *doc, int num, int gen);
+fz_obj *pdf_load_object(pdf_document *doc, int num, int gen);
+void pdf_update_object( pdf_document *doc, int num, int gen, fz_obj *newobj);
+
+int pdf_is_stream(pdf_document *doc, int num, int gen);
+fz_stream *pdf_open_inline_stream(fz_stream *chain, pdf_document *doc, fz_obj *stmobj, int length);
+fz_buffer *pdf_load_raw_stream(pdf_document *doc, int num, int gen);
+fz_buffer *pdf_load_stream(pdf_document *doc, int num, int gen);
+fz_stream *pdf_open_raw_stream(pdf_document *doc, int num, int gen);
+fz_stream *pdf_open_stream(pdf_document *doc, int num, int gen);
+fz_stream *pdf_open_stream_at(pdf_document *doc, int num, int gen, fz_obj *dict, int stm_ofs);
+
+pdf_document *pdf_open_document_with_stream(fz_stream *file);
+pdf_document *pdf_open_document(fz_context *ctx, const char *filename);
+void pdf_close_document(pdf_document *doc);
 
 /* private */
-void pdf_repair_xref(pdf_xref *xref, char *buf, int bufsize);
-void pdf_repair_obj_stms(pdf_xref *xref);
-void pdf_debug_xref(pdf_xref *);
-void pdf_resize_xref(pdf_xref *xref, int newcap);
+void pdf_repair_xref(pdf_document *doc, char *buf, int bufsize);
+void pdf_repair_obj_stms(pdf_document *doc);
+void pdf_debug_xref(pdf_document *);
+void pdf_resize_xref(pdf_document *doc, int newcap);
 
 /*
  * Encryption
@@ -140,14 +140,14 @@ void pdf_crypt_obj(fz_context *ctx, pdf_crypt *crypt, fz_obj *obj, int num, int
 fz_stream *pdf_open_crypt(fz_stream *chain, pdf_crypt *crypt, int num, int gen);
 fz_stream *pdf_open_crypt_with_filter(fz_stream *chain, pdf_crypt *crypt, char *name, int num, int gen);
 
-int pdf_needs_password(pdf_xref *xref);
-int pdf_authenticate_password(pdf_xref *xref, char *pw);
-int pdf_has_permission(pdf_xref *xref, int p);
+int pdf_needs_password(pdf_document *doc);
+int pdf_authenticate_password(pdf_document *doc, char *pw);
+int pdf_has_permission(pdf_document *doc, int p);
 
-int pdf_get_crypt_revision(pdf_xref *xref);
-char *pdf_get_crypt_method(pdf_xref *xref);
-int pdf_get_crypt_length(pdf_xref *xref);
-unsigned char *pdf_get_crypt_key(pdf_xref *xref);
+int pdf_get_crypt_revision(pdf_document *doc);
+char *pdf_get_crypt_method(pdf_document *doc);
+int pdf_get_crypt_length(pdf_document *doc);
+unsigned char *pdf_get_crypt_key(pdf_document *doc);
 
 void pdf_debug_crypt(pdf_crypt *crypt);
 
@@ -157,19 +157,19 @@ void pdf_debug_crypt(pdf_crypt *crypt);
 
 typedef struct pdf_function_s pdf_function;
 
-pdf_function *pdf_load_function(pdf_xref *xref, fz_obj *ref);
+pdf_function *pdf_load_function(pdf_document *doc, fz_obj *ref);
 void pdf_eval_function(fz_context *ctx, pdf_function *func, float *in, int inlen, float *out, int outlen);
 pdf_function *pdf_keep_function(fz_context *ctx, pdf_function *func);
 void pdf_drop_function(fz_context *ctx, pdf_function *func);
 unsigned int pdf_function_size(pdf_function *func);
 
-fz_colorspace *pdf_load_colorspace(pdf_xref *xref, fz_obj *obj);
+fz_colorspace *pdf_load_colorspace(pdf_document *doc, fz_obj *obj);
 fz_pixmap *pdf_expand_indexed_pixmap(fz_context *ctx, fz_pixmap *src);
 
-fz_shade *pdf_load_shading(pdf_xref *xref, fz_obj *obj);
+fz_shade *pdf_load_shading(pdf_document *doc, fz_obj *obj);
 
-fz_pixmap *pdf_load_inline_image(pdf_xref *xref, fz_obj *rdb, fz_obj *dict, fz_stream *file);
-fz_pixmap *pdf_load_image(pdf_xref *xref, fz_obj *obj);
+fz_pixmap *pdf_load_inline_image(pdf_document *doc, fz_obj *rdb, fz_obj *dict, fz_stream *file);
+fz_pixmap *pdf_load_image(pdf_document *doc, fz_obj *obj);
 int pdf_is_jpx_image(fz_context *ctx, fz_obj *dict);
 
 /*
@@ -190,7 +190,7 @@ struct pdf_pattern_s
 	fz_buffer *contents;
 };
 
-pdf_pattern *pdf_load_pattern(pdf_xref *xref, fz_obj *obj);
+pdf_pattern *pdf_load_pattern(pdf_document *doc, fz_obj *obj);
 pdf_pattern *pdf_keep_pattern(fz_context *ctx, pdf_pattern *pat);
 void pdf_drop_pattern(fz_context *ctx, pdf_pattern *pat);
 
@@ -214,7 +214,7 @@ struct pdf_xobject_s
 	fz_obj *me;
 };
 
-pdf_xobject *pdf_load_xobject(pdf_xref *xref, fz_obj *obj);
+pdf_xobject *pdf_load_xobject(pdf_document *doc, fz_obj *obj);
 pdf_xobject *pdf_keep_xobject(fz_context *ctx, pdf_xobject *xobj);
 void pdf_drop_xobject(fz_context *ctx, pdf_xobject *xobj);
 
@@ -285,7 +285,7 @@ unsigned char *pdf_decode_cmap(pdf_cmap *cmap, unsigned char *s, int *cpt);
 
 pdf_cmap *pdf_new_identity_cmap(fz_context *ctx, int wmode, int bytes);
 pdf_cmap *pdf_parse_cmap(fz_stream *file);
-pdf_cmap *pdf_load_embedded_cmap(pdf_xref *xref, fz_obj *ref);
+pdf_cmap *pdf_load_embedded_cmap(pdf_document *doc, fz_obj *ref);
 pdf_cmap *pdf_load_system_cmap(fz_context *ctx, char *name);
 pdf_cmap *pdf_find_builtin_cmap(char *cmap_name);
 
@@ -389,7 +389,7 @@ void pdf_end_vmtx(pdf_font_desc *font);
 pdf_hmtx pdf_get_hmtx(pdf_font_desc *font, int cid);
 pdf_vmtx pdf_get_vmtx(pdf_font_desc *font, int cid);
 
-void pdf_load_to_unicode(pdf_font_desc *font, pdf_xref *xref, char **strings, char *collection, fz_obj *cmapstm);
+void pdf_load_to_unicode(pdf_font_desc *font, pdf_document *doc, char **strings, char *collection, fz_obj *cmapstm);
 
 int pdf_font_cid_to_gid(pdf_font_desc *fontdesc, int cid);
 
@@ -397,8 +397,8 @@ unsigned char *pdf_find_builtin_font(char *name, unsigned int *len);
 unsigned char *pdf_find_substitute_font(int mono, int serif, int bold, int italic, unsigned int *len);
 unsigned char *pdf_find_substitute_cjk_font(int ros, int serif, unsigned int *len);
 
-pdf_font_desc *pdf_load_type3_font(pdf_xref *xref, fz_obj *rdb, fz_obj *obj);
-pdf_font_desc *pdf_load_font(pdf_xref *xref, fz_obj *rdb, fz_obj *obj);
+pdf_font_desc *pdf_load_type3_font(pdf_document *doc, fz_obj *rdb, fz_obj *obj);
+pdf_font_desc *pdf_load_font(pdf_document *doc, fz_obj *rdb, fz_obj *obj);
 
 pdf_font_desc *pdf_new_font_desc(fz_context *ctx);
 pdf_font_desc *pdf_keep_font(fz_context *ctx, pdf_font_desc *fontdesc);
@@ -421,17 +421,17 @@ struct pdf_annot_s
 	pdf_annot *next;
 };
 
-fz_link_dest pdf_parse_link_dest(pdf_xref *xref, fz_obj *dest);
-fz_link_dest pdf_parse_action(pdf_xref *xref, fz_obj *action);
-fz_obj *pdf_lookup_dest(pdf_xref *xref, fz_obj *needle);
-fz_obj *pdf_lookup_name(pdf_xref *xref, char *which, fz_obj *needle);
-fz_obj *pdf_load_name_tree(pdf_xref *xref, char *which);
+fz_link_dest pdf_parse_link_dest(pdf_document *doc, fz_obj *dest);
+fz_link_dest pdf_parse_action(pdf_document *doc, fz_obj *action);
+fz_obj *pdf_lookup_dest(pdf_document *doc, fz_obj *needle);
+fz_obj *pdf_lookup_name(pdf_document *doc, char *which, fz_obj *needle);
+fz_obj *pdf_load_name_tree(pdf_document *doc, char *which);
 
-fz_outline *pdf_load_outline(pdf_xref *xref);
+fz_outline *pdf_load_outline(pdf_document *doc);
 
-fz_link *pdf_load_links(pdf_xref *, fz_obj *annots, fz_matrix page_ctm);
+fz_link *pdf_load_links(pdf_document *, fz_obj *annots, fz_matrix page_ctm);
 
-pdf_annot *pdf_load_annots(pdf_xref *, fz_obj *annots);
+pdf_annot *pdf_load_annots(pdf_document *, fz_obj *annots);
 void pdf_free_annot(fz_context *ctx, pdf_annot *link);
 
 /*
@@ -452,19 +452,19 @@ struct pdf_page_s
 	pdf_annot *annots;
 };
 
-int pdf_find_page_number(pdf_xref *xref, fz_obj *pageobj);
-int pdf_count_pages(pdf_xref *xref);
+int pdf_find_page_number(pdf_document *doc, fz_obj *pageobj);
+int pdf_count_pages(pdf_document *doc);
 
-pdf_page *pdf_load_page(pdf_xref *xref, int number);
-fz_rect pdf_bound_page(pdf_xref *xref, pdf_page *page);
+pdf_page *pdf_load_page(pdf_document *doc, int number);
+fz_rect pdf_bound_page(pdf_document *doc, pdf_page *page);
 void pdf_free_page(fz_context *ctx, pdf_page *page);
 
 /*
  * Content stream parsing
  */
 
-void pdf_run_page_with_usage(pdf_xref *xref, pdf_page *page, fz_device *dev, fz_matrix ctm, char *event, fz_cookie *cookie);
-void pdf_run_page(pdf_xref *xref, pdf_page *page, fz_device *dev, fz_matrix ctm, fz_cookie *cookie);
-void pdf_run_glyph(pdf_xref *xref, fz_obj *resources, fz_buffer *contents, fz_device *dev, fz_matrix ctm, void *gstate);
+void pdf_run_page_with_usage(pdf_document *doc, pdf_page *page, fz_device *dev, fz_matrix ctm, char *event, fz_cookie *cookie);
+void pdf_run_page(pdf_document *doc, pdf_page *page, fz_device *dev, fz_matrix ctm, fz_cookie *cookie);
+void pdf_run_glyph(pdf_document *doc, fz_obj *resources, fz_buffer *contents, fz_device *dev, fz_matrix ctm, void *gstate);
 
 #endif
diff --git a/pdf/pdf_annot.c b/pdf/pdf_annot.c
index 1daf8dbf..12c08bf4 100644
--- a/pdf/pdf_annot.c
+++ b/pdf/pdf_annot.c
@@ -2,7 +2,7 @@
 #include "mupdf.h"
 
 static fz_obj *
-resolve_dest_rec(pdf_xref *xref, fz_obj *dest, int depth)
+resolve_dest_rec(pdf_document *xref, fz_obj *dest, int depth)
 {
 	if (depth > 10) /* Arbitrary to avoid infinite recursion */
 		return NULL;
@@ -31,13 +31,13 @@ resolve_dest_rec(pdf_xref *xref, fz_obj *dest, int depth)
 }
 
 static fz_obj *
-resolve_dest(pdf_xref *xref, fz_obj *dest)
+resolve_dest(pdf_document *xref, fz_obj *dest)
 {
 	return resolve_dest_rec(xref, dest, 0);
 }
 
 fz_link_dest
-pdf_parse_link_dest(pdf_xref *xref, fz_obj *dest)
+pdf_parse_link_dest(pdf_document *xref, fz_obj *dest)
 {
 	fz_link_dest ld;
 	fz_obj *obj;
@@ -192,7 +192,7 @@ pdf_parse_link_dest(pdf_xref *xref, fz_obj *dest)
 }
 
 fz_link_dest
-pdf_parse_action(pdf_xref *xref, fz_obj *action)
+pdf_parse_action(pdf_document *xref, fz_obj *action)
 {
 	fz_link_dest ld;
 	fz_obj *obj, *dest;
@@ -238,7 +238,7 @@ pdf_parse_action(pdf_xref *xref, fz_obj *action)
 }
 
 static fz_link *
-pdf_load_link(pdf_xref *xref, fz_obj *dict, fz_matrix page_ctm)
+pdf_load_link(pdf_document *xref, fz_obj *dict, fz_matrix page_ctm)
 {
 	fz_obj *dest = NULL;
 	fz_obj *action;
@@ -278,7 +278,7 @@ pdf_load_link(pdf_xref *xref, fz_obj *dict, fz_matrix page_ctm)
 }
 
 fz_link *
-pdf_load_links(pdf_xref *xref, fz_obj *annots, fz_matrix page_ctm)
+pdf_load_links(pdf_document *xref, fz_obj *annots, fz_matrix page_ctm)
 {
 	fz_link *link, *head, *tail;
 	fz_obj *obj;
@@ -349,7 +349,7 @@ pdf_transform_annot(pdf_annot *annot)
 }
 
 pdf_annot *
-pdf_load_annots(pdf_xref *xref, fz_obj *annots)
+pdf_load_annots(pdf_document *xref, fz_obj *annots)
 {
 	pdf_annot *annot, *head, *tail;
 	fz_obj *obj, *ap, *as, *n, *rect;
diff --git a/pdf/pdf_cmap_load.c b/pdf/pdf_cmap_load.c
index bcfc61ae..0d56bd03 100644
--- a/pdf/pdf_cmap_load.c
+++ b/pdf/pdf_cmap_load.c
@@ -16,7 +16,7 @@ pdf_cmap_size(pdf_cmap *cmap)
  * Load CMap stream in PDF file
  */
 pdf_cmap *
-pdf_load_embedded_cmap(pdf_xref *xref, fz_obj *stmobj)
+pdf_load_embedded_cmap(pdf_document *xref, fz_obj *stmobj)
 {
 	fz_stream *file = NULL;
 	pdf_cmap *cmap = NULL;
diff --git a/pdf/pdf_colorspace.c b/pdf/pdf_colorspace.c
index b7f9f131..7a410df8 100644
--- a/pdf/pdf_colorspace.c
+++ b/pdf/pdf_colorspace.c
@@ -4,7 +4,7 @@
 /* ICCBased */
 
 static fz_colorspace *
-load_icc_based(pdf_xref *xref, fz_obj *dict)
+load_icc_based(pdf_document *xref, fz_obj *dict)
 {
 	int n;
 
@@ -91,7 +91,7 @@ free_separation(fz_context *ctx, fz_colorspace *cs)
 }
 
 static fz_colorspace *
-load_separation(pdf_xref *xref, fz_obj *array)
+load_separation(pdf_document *xref, fz_obj *array)
 {
 	fz_colorspace *cs;
 	struct separation *sep = NULL;
@@ -218,7 +218,7 @@ pdf_expand_indexed_pixmap(fz_context *ctx, fz_pixmap *src)
 }
 
 static fz_colorspace *
-load_indexed(pdf_xref *xref, fz_obj *array)
+load_indexed(pdf_document *xref, fz_obj *array)
 {
 	struct indexed *idx = NULL;
 	fz_context *ctx = xref->ctx;
@@ -304,7 +304,7 @@ load_indexed(pdf_xref *xref, fz_obj *array)
 /* Parse and create colorspace from PDF object */
 
 static fz_colorspace *
-pdf_load_colorspace_imp(pdf_xref *xref, fz_obj *obj)
+pdf_load_colorspace_imp(pdf_document *xref, fz_obj *obj)
 {
 	if (fz_is_name(obj))
 	{
@@ -390,7 +390,7 @@ pdf_load_colorspace_imp(pdf_xref *xref, fz_obj *obj)
 }
 
 fz_colorspace *
-pdf_load_colorspace(pdf_xref *xref, fz_obj *obj)
+pdf_load_colorspace(pdf_document *xref, fz_obj *obj)
 {
 	fz_context *ctx = xref->ctx;
 	fz_colorspace *cs;
diff --git a/pdf/pdf_crypt.c b/pdf/pdf_crypt.c
index 18b3d554..c3cd5d8c 100644
--- a/pdf/pdf_crypt.c
+++ b/pdf/pdf_crypt.c
@@ -575,7 +575,7 @@ pdf_authenticate_owner_password(pdf_crypt *crypt, unsigned char *ownerpass, int
 }
 
 int
-pdf_authenticate_password(pdf_xref *xref, char *password)
+pdf_authenticate_password(pdf_document *xref, char *password)
 {
 	if (xref->crypt)
 	{
@@ -591,7 +591,7 @@ pdf_authenticate_password(pdf_xref *xref, char *password)
 }
 
 int
-pdf_needs_password(pdf_xref *xref)
+pdf_needs_password(pdf_document *xref)
 {
 	if (!xref->crypt)
 		return 0;
@@ -601,7 +601,7 @@ pdf_needs_password(pdf_xref *xref)
 }
 
 int
-pdf_has_permission(pdf_xref *xref, int p)
+pdf_has_permission(pdf_document *xref, int p)
 {
 	if (!xref->crypt)
 		return 1;
@@ -609,7 +609,7 @@ pdf_has_permission(pdf_xref *xref, int p)
 }
 
 unsigned char *
-pdf_get_crypt_key(pdf_xref *xref)
+pdf_get_crypt_key(pdf_document *xref)
 {
 	if (xref->crypt)
 		return xref->crypt->key;
@@ -617,7 +617,7 @@ pdf_get_crypt_key(pdf_xref *xref)
 }
 
 int
-pdf_get_crypt_revision(pdf_xref *xref)
+pdf_get_crypt_revision(pdf_document *xref)
 {
 	if (xref->crypt)
 		return xref->crypt->v;
@@ -625,7 +625,7 @@ pdf_get_crypt_revision(pdf_xref *xref)
 }
 
 char *
-pdf_get_crypt_method(pdf_xref *xref)
+pdf_get_crypt_method(pdf_document *xref)
 {
 	if (xref->crypt)
 	{
@@ -642,7 +642,7 @@ pdf_get_crypt_method(pdf_xref *xref)
 }
 
 int
-pdf_get_crypt_length(pdf_xref *xref)
+pdf_get_crypt_length(pdf_document *xref)
 {
 	if (xref->crypt)
 		return xref->crypt->length;
diff --git a/pdf/pdf_font.c b/pdf/pdf_font.c
index b6c59153..65309a73 100644
--- a/pdf/pdf_font.c
+++ b/pdf/pdf_font.c
@@ -5,7 +5,7 @@
 #include FT_FREETYPE_H
 #include FT_XFREE86_H
 
-static void pdf_load_font_descriptor(pdf_font_desc *fontdesc, pdf_xref *xref, fz_obj *dict, char *collection, char *basefont);
+static void pdf_load_font_descriptor(pdf_font_desc *fontdesc, pdf_document *xref, fz_obj *dict, char *collection, char *basefont);
 
 static char *base_font_names[14][7] =
 {
@@ -266,7 +266,7 @@ pdf_load_system_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fontname, c
 }
 
 static void
-pdf_load_embedded_font(pdf_font_desc *fontdesc, pdf_xref *xref, fz_obj *stmref)
+pdf_load_embedded_font(pdf_font_desc *fontdesc, pdf_document *xref, fz_obj *stmref)
 {
 	fz_buffer *buf;
 	fz_context *ctx = xref->ctx;
@@ -392,7 +392,7 @@ pdf_new_font_desc(fz_context *ctx)
  */
 
 static pdf_font_desc *
-pdf_load_simple_font(pdf_xref *xref, fz_obj *dict)
+pdf_load_simple_font(pdf_document *xref, fz_obj *dict)
 {
 	fz_obj *descriptor;
 	fz_obj *encoding;
@@ -704,7 +704,7 @@ pdf_load_simple_font(pdf_xref *xref, fz_obj *dict)
  */
 
 static pdf_font_desc *
-load_cid_font(pdf_xref *xref, fz_obj *dict, fz_obj *encoding, fz_obj *to_unicode)
+load_cid_font(pdf_document *xref, fz_obj *dict, fz_obj *encoding, fz_obj *to_unicode)
 {
 	fz_obj *widths;
 	fz_obj *descriptor;
@@ -936,7 +936,7 @@ load_cid_font(pdf_xref *xref, fz_obj *dict, fz_obj *encoding, fz_obj *to_unicode
 }
 
 static pdf_font_desc *
-pdf_load_type0_font(pdf_xref *xref, fz_obj *dict)
+pdf_load_type0_font(pdf_document *xref, fz_obj *dict)
 {
 	fz_obj *dfonts;
 	fz_obj *dfont;
@@ -969,7 +969,7 @@ pdf_load_type0_font(pdf_xref *xref, fz_obj *dict)
  */
 
 static void
-pdf_load_font_descriptor(pdf_font_desc *fontdesc, pdf_xref *xref, fz_obj *dict, char *collection, char *basefont)
+pdf_load_font_descriptor(pdf_font_desc *fontdesc, pdf_document *xref, fz_obj *dict, char *collection, char *basefont)
 {
 	fz_obj *obj1, *obj2, *obj3, *obj;
 	char *fontname;
@@ -1067,7 +1067,7 @@ pdf_make_width_table(fz_context *ctx, pdf_font_desc *fontdesc)
 }
 
 pdf_font_desc *
-pdf_load_font(pdf_xref *xref, fz_obj *rdb, fz_obj *dict)
+pdf_load_font(pdf_document *xref, fz_obj *rdb, fz_obj *dict)
 {
 	char *subtype;
 	fz_obj *dfonts;
diff --git a/pdf/pdf_function.c b/pdf/pdf_function.c
index 7111cae7..34b419e5 100644
--- a/pdf/pdf_function.c
+++ b/pdf/pdf_function.c
@@ -816,7 +816,7 @@ parse_code(pdf_function *func, fz_stream *stream, int *codeptr)
 }
 
 static void
-load_postscript_func(pdf_function *func, pdf_xref *xref, fz_obj *dict, int num, int gen)
+load_postscript_func(pdf_function *func, pdf_document *xref, fz_obj *dict, int num, int gen)
 {
 	fz_stream *stream = NULL;
 	int codeptr;
@@ -884,7 +884,7 @@ eval_postscript_func(fz_context *ctx, pdf_function *func, float *in, float *out)
  */
 
 static void
-load_sample_func(pdf_function *func, pdf_xref *xref, fz_obj *dict, int num, int gen)
+load_sample_func(pdf_function *func, pdf_document *xref, fz_obj *dict, int num, int gen)
 {
 	fz_context *ctx = xref->ctx;
 	fz_stream *stream;
@@ -1169,7 +1169,7 @@ eval_exponential_func(fz_context *ctx, pdf_function *func, float in, float *out)
  */
 
 static void
-load_stitching_func(pdf_function *func, pdf_xref *xref, fz_obj *dict)
+load_stitching_func(pdf_function *func, pdf_document *xref, fz_obj *dict)
 {
 	fz_context *ctx = xref->ctx;
 	pdf_function **funcs;
@@ -1340,7 +1340,7 @@ pdf_function_size(pdf_function *func)
 }
 
 pdf_function *
-pdf_load_function(pdf_xref *xref, fz_obj *dict)
+pdf_load_function(pdf_document *xref, fz_obj *dict)
 {
 	fz_context *ctx = xref->ctx;
 	pdf_function *func;
diff --git a/pdf/pdf_image.c b/pdf/pdf_image.c
index 33e6077d..80cbb062 100644
--- a/pdf/pdf_image.c
+++ b/pdf/pdf_image.c
@@ -4,7 +4,7 @@
 /* TODO: store JPEG compressed samples */
 /* TODO: store flate compressed samples */
 
-static fz_pixmap *pdf_load_jpx_image(pdf_xref *xref, fz_obj *dict);
+static fz_pixmap *pdf_load_jpx_image(pdf_document *xref, fz_obj *dict);
 
 static void
 pdf_mask_color_key(fz_pixmap *pix, int n, int *colorkey)
@@ -26,7 +26,7 @@ pdf_mask_color_key(fz_pixmap *pix, int n, int *colorkey)
 }
 
 static fz_pixmap *
-pdf_load_image_imp(pdf_xref *xref, fz_obj *rdb, fz_obj *dict, fz_stream *cstm, int forcemask)
+pdf_load_image_imp(pdf_document *xref, fz_obj *rdb, fz_obj *dict, fz_stream *cstm, int forcemask)
 {
 	fz_stream *stm = NULL;
 	fz_pixmap *tile = NULL;
@@ -275,7 +275,7 @@ pdf_load_image_imp(pdf_xref *xref, fz_obj *rdb, fz_obj *dict, fz_stream *cstm, i
 }
 
 fz_pixmap *
-pdf_load_inline_image(pdf_xref *xref, fz_obj *rdb, fz_obj *dict, fz_stream *file)
+pdf_load_inline_image(pdf_document *xref, fz_obj *rdb, fz_obj *dict, fz_stream *file)
 {
 	return pdf_load_image_imp(xref, rdb, dict, file, 0);
 	/* RJW: "cannot load inline image" */
@@ -298,7 +298,7 @@ pdf_is_jpx_image(fz_context *ctx, fz_obj *dict)
 }
 
 static fz_pixmap *
-pdf_load_jpx_image(pdf_xref *xref, fz_obj *dict)
+pdf_load_jpx_image(pdf_document *xref, fz_obj *dict)
 {
 	fz_buffer *buf = NULL;
 	fz_colorspace *colorspace = NULL;
@@ -367,7 +367,7 @@ pdf_load_jpx_image(pdf_xref *xref, fz_obj *dict)
 }
 
 fz_pixmap *
-pdf_load_image(pdf_xref *xref, fz_obj *dict)
+pdf_load_image(pdf_document *xref, fz_obj *dict)
 {
 	fz_context *ctx = xref->ctx;
 	fz_pixmap *pix;
diff --git a/pdf/pdf_interpret.c b/pdf/pdf_interpret.c
index ff9a8f2c..3b774d71 100644
--- a/pdf/pdf_interpret.c
+++ b/pdf/pdf_interpret.c
@@ -64,7 +64,7 @@ struct pdf_gstate_s
 struct pdf_csi_s
 {
 	fz_device *dev;
-	pdf_xref *xref;
+	pdf_document *xref;
 
 	/* usage mode for optional content groups */
 	char *event; /* "View", "Print", "Export" */
@@ -942,7 +942,7 @@ copy_state(fz_context *ctx, pdf_gstate *gs, pdf_gstate *old)
 
 
 static pdf_csi *
-pdf_new_csi(pdf_xref *xref, fz_device *dev, fz_matrix ctm, char *event, fz_cookie *cookie, pdf_gstate *gstate)
+pdf_new_csi(pdf_document *xref, fz_device *dev, fz_matrix ctm, char *event, fz_cookie *cookie, pdf_gstate *gstate)
 {
 	pdf_csi *csi;
 	fz_context *ctx = dev->ctx;
@@ -2685,7 +2685,7 @@ pdf_run_buffer(pdf_csi *csi, fz_obj *rdb, fz_buffer *contents)
 }
 
 void
-pdf_run_page_with_usage(pdf_xref *xref, pdf_page *page, fz_device *dev, fz_matrix ctm, char *event, fz_cookie *cookie)
+pdf_run_page_with_usage(pdf_document *xref, pdf_page *page, fz_device *dev, fz_matrix ctm, char *event, fz_cookie *cookie)
 {
 	fz_context *ctx = dev->ctx;
 	pdf_csi *csi;
@@ -2760,13 +2760,13 @@ pdf_run_page_with_usage(pdf_xref *xref, pdf_page *page, fz_device *dev, fz_matri
 }
 
 void
-pdf_run_page(pdf_xref *xref, pdf_page *page, fz_device *dev, fz_matrix ctm, fz_cookie *cookie)
+pdf_run_page(pdf_document *xref, pdf_page *page, fz_device *dev, fz_matrix ctm, fz_cookie *cookie)
 {
 	pdf_run_page_with_usage(xref, page, dev, ctm, "View", cookie);
 }
 
 void
-pdf_run_glyph(pdf_xref *xref, fz_obj *resources, fz_buffer *contents, fz_device *dev, fz_matrix ctm, void *gstate)
+pdf_run_glyph(pdf_document *xref, fz_obj *resources, fz_buffer *contents, fz_device *dev, fz_matrix ctm, void *gstate)
 {
 	pdf_csi *csi = pdf_new_csi(xref, dev, ctm, "View", NULL, gstate);
 	fz_context *ctx = xref->ctx;
diff --git a/pdf/pdf_nametree.c b/pdf/pdf_nametree.c
index bbb956f1..c78e238d 100644
--- a/pdf/pdf_nametree.c
+++ b/pdf/pdf_nametree.c
@@ -71,7 +71,7 @@ pdf_lookup_name_imp(fz_context *ctx, fz_obj *node, fz_obj *needle)
 }
 
 fz_obj *
-pdf_lookup_name(pdf_xref *xref, char *which, fz_obj *needle)
+pdf_lookup_name(pdf_document *xref, char *which, fz_obj *needle)
 {
 	fz_context *ctx = xref->ctx;
 
@@ -82,7 +82,7 @@ pdf_lookup_name(pdf_xref *xref, char *which, fz_obj *needle)
 }
 
 fz_obj *
-pdf_lookup_dest(pdf_xref *xref, fz_obj *needle)
+pdf_lookup_dest(pdf_document *xref, fz_obj *needle)
 {
 	fz_context *ctx = xref->ctx;
 
@@ -111,7 +111,7 @@ pdf_lookup_dest(pdf_xref *xref, fz_obj *needle)
 }
 
 static void
-pdf_load_name_tree_imp(fz_obj *dict, pdf_xref *xref, fz_obj *node)
+pdf_load_name_tree_imp(fz_obj *dict, pdf_document *xref, fz_obj *node)
 {
 	fz_context *ctx = xref->ctx;
 	fz_obj *kids = fz_dict_gets(node, "Kids");
@@ -146,7 +146,7 @@ pdf_load_name_tree_imp(fz_obj *dict, pdf_xref *xref, fz_obj *node)
 }
 
 fz_obj *
-pdf_load_name_tree(pdf_xref *xref, char *which)
+pdf_load_name_tree(pdf_document *xref, char *which)
 {
 	fz_context *ctx = xref->ctx;
 
diff --git a/pdf/pdf_outline.c b/pdf/pdf_outline.c
index 5762be05..2815d918 100644
--- a/pdf/pdf_outline.c
+++ b/pdf/pdf_outline.c
@@ -2,7 +2,7 @@
 #include "mupdf.h"
 
 static fz_outline *
-pdf_load_outline_imp(pdf_xref *xref, fz_obj *dict)
+pdf_load_outline_imp(pdf_document *xref, fz_obj *dict)
 {
 	fz_context *ctx = xref->ctx;
 	fz_outline *node, **prev, *first;
@@ -58,7 +58,7 @@ pdf_load_outline_imp(pdf_xref *xref, fz_obj *dict)
 }
 
 fz_outline *
-pdf_load_outline(pdf_xref *xref)
+pdf_load_outline(pdf_document *xref)
 {
 	fz_obj *root, *obj, *first;
 
diff --git a/pdf/pdf_page.c b/pdf/pdf_page.c
index 8cfadfb7..ed80aa90 100644
--- a/pdf/pdf_page.c
+++ b/pdf/pdf_page.c
@@ -28,7 +28,7 @@ put_marker_bool(fz_context *ctx, fz_obj *rdb, char *marker, int val)
 }
 
 static void
-pdf_load_page_tree_node(pdf_xref *xref, fz_obj *node, struct info info)
+pdf_load_page_tree_node(pdf_document *xref, fz_obj *node, struct info info)
 {
 	fz_obj *dict, *kids, *count;
 	fz_obj *obj;
@@ -99,7 +99,7 @@ pdf_load_page_tree_node(pdf_xref *xref, fz_obj *node, struct info info)
 }
 
 static void
-pdf_load_page_tree(pdf_xref *xref)
+pdf_load_page_tree(pdf_document *xref)
 {
 	fz_context *ctx = xref->ctx;
 	fz_obj *catalog;
@@ -133,14 +133,14 @@ pdf_load_page_tree(pdf_xref *xref)
 }
 
 int
-pdf_count_pages(pdf_xref *xref)
+pdf_count_pages(pdf_document *xref)
 {
 	pdf_load_page_tree(xref);
 	return xref->page_len;
 }
 
 int
-pdf_find_page_number(pdf_xref *xref, fz_obj *page)
+pdf_find_page_number(pdf_document *xref, fz_obj *page)
 {
 	int i, num = fz_to_num(page);
 
@@ -239,7 +239,7 @@ found:
 /* we need to combine all sub-streams into one for the content stream interpreter */
 
 static fz_buffer *
-pdf_load_page_contents_array(pdf_xref *xref, fz_obj *list)
+pdf_load_page_contents_array(pdf_document *xref, fz_obj *list)
 {
 	fz_buffer *big;
 	fz_buffer *one;
@@ -282,7 +282,7 @@ pdf_load_page_contents_array(pdf_xref *xref, fz_obj *list)
 }
 
 static fz_buffer *
-pdf_load_page_contents(pdf_xref *xref, fz_obj *obj)
+pdf_load_page_contents(pdf_document *xref, fz_obj *obj)
 {
 	fz_context *ctx = xref->ctx;
 
@@ -302,7 +302,7 @@ pdf_load_page_contents(pdf_xref *xref, fz_obj *obj)
 }
 
 pdf_page *
-pdf_load_page(pdf_xref *xref, int number)
+pdf_load_page(pdf_document *xref, int number)
 {
 	fz_context *ctx = xref->ctx;
 	pdf_page *page;
@@ -389,7 +389,7 @@ pdf_load_page(pdf_xref *xref, int number)
 }
 
 fz_rect
-pdf_bound_page(pdf_xref *xref, pdf_page *page)
+pdf_bound_page(pdf_document *xref, pdf_page *page)
 {
 	fz_rect bounds, mediabox = fz_transform_rect(fz_rotate(page->rotate), page->mediabox);
 	bounds.x0 = bounds.y0 = 0;
diff --git a/pdf/pdf_parse.c b/pdf/pdf_parse.c
index b2f4fbf7..220eb30c 100644
--- a/pdf/pdf_parse.c
+++ b/pdf/pdf_parse.c
@@ -171,7 +171,7 @@ pdf_to_utf8_name(fz_context *ctx, fz_obj *src)
 }
 
 fz_obj *
-pdf_parse_array(pdf_xref *xref, fz_stream *file, char *buf, int cap)
+pdf_parse_array(pdf_document *xref, fz_stream *file, char *buf, int cap)
 {
 	fz_obj *ary = NULL;
 	fz_obj *obj = NULL;
@@ -312,7 +312,7 @@ end:
 }
 
 fz_obj *
-pdf_parse_dict(pdf_xref *xref, fz_stream *file, char *buf, int cap)
+pdf_parse_dict(pdf_document *xref, fz_stream *file, char *buf, int cap)
 {
 	fz_obj *dict = NULL;
 	fz_obj *key = NULL;
@@ -414,7 +414,7 @@ pdf_parse_dict(pdf_xref *xref, fz_stream *file, char *buf, int cap)
 }
 
 fz_obj *
-pdf_parse_stm_obj(pdf_xref *xref, fz_stream *file, char *buf, int cap)
+pdf_parse_stm_obj(pdf_document *xref, fz_stream *file, char *buf, int cap)
 {
 	int tok;
 	int len;
@@ -444,7 +444,7 @@ pdf_parse_stm_obj(pdf_xref *xref, fz_stream *file, char *buf, int cap)
 }
 
 fz_obj *
-pdf_parse_ind_obj(pdf_xref *xref,
+pdf_parse_ind_obj(pdf_document *xref,
 	fz_stream *file, char *buf, int cap,
 	int *onum, int *ogen, int *ostmofs)
 {
diff --git a/pdf/pdf_pattern.c b/pdf/pdf_pattern.c
index 2b4d32a2..9ffbee02 100644
--- a/pdf/pdf_pattern.c
+++ b/pdf/pdf_pattern.c
@@ -34,7 +34,7 @@ pdf_pattern_size(pdf_pattern *pat)
 }
 
 pdf_pattern *
-pdf_load_pattern(pdf_xref *xref, fz_obj *dict)
+pdf_load_pattern(pdf_document *xref, fz_obj *dict)
 {
 	pdf_pattern *pat;
 	fz_obj *obj;
diff --git a/pdf/pdf_repair.c b/pdf/pdf_repair.c
index cdd8c521..15886a8f 100644
--- a/pdf/pdf_repair.c
+++ b/pdf/pdf_repair.c
@@ -141,7 +141,7 @@ atobjend:
 }
 
 static void
-pdf_repair_obj_stm(pdf_xref *xref, int num, int gen)
+pdf_repair_obj_stm(pdf_document *xref, int num, int gen)
 {
 	fz_obj *obj;
 	fz_stream *stm = NULL;
@@ -193,7 +193,7 @@ pdf_repair_obj_stm(pdf_xref *xref, int num, int gen)
 }
 
 void
-pdf_repair_xref(pdf_xref *xref, char *buf, int bufsize)
+pdf_repair_xref(pdf_document *xref, char *buf, int bufsize)
 {
 	fz_obj *dict, *obj;
 	fz_obj *length;
@@ -475,7 +475,7 @@ pdf_repair_xref(pdf_xref *xref, char *buf, int bufsize)
 }
 
 void
-pdf_repair_obj_stms(pdf_xref *xref)
+pdf_repair_obj_stms(pdf_document *xref)
 {
 	fz_obj *dict;
 	int i;
diff --git a/pdf/pdf_shade.c b/pdf/pdf_shade.c
index 4f43c225..15f5de6b 100644
--- a/pdf/pdf_shade.c
+++ b/pdf/pdf_shade.c
@@ -363,7 +363,7 @@ pdf_sample_shade_function(fz_context *ctx, fz_shade *shade, int funcs, pdf_funct
 /* Type 1-3 -- Function-based, axial and radial shadings */
 
 static void
-pdf_load_function_based_shading(fz_shade *shade, pdf_xref *xref, fz_obj *dict, pdf_function *func)
+pdf_load_function_based_shading(fz_shade *shade, pdf_document *xref, fz_obj *dict, pdf_function *func)
 {
 	fz_obj *obj;
 	float x0, y0, x1, y1;
@@ -428,7 +428,7 @@ pdf_load_function_based_shading(fz_shade *shade, pdf_xref *xref, fz_obj *dict, p
 }
 
 static void
-pdf_load_axial_shading(fz_shade *shade, pdf_xref *xref, fz_obj *dict, int funcs, pdf_function **func)
+pdf_load_axial_shading(fz_shade *shade, pdf_document *xref, fz_obj *dict, int funcs, pdf_function **func)
 {
 	fz_obj *obj;
 	float d0, d1;
@@ -479,7 +479,7 @@ pdf_load_axial_shading(fz_shade *shade, pdf_xref *xref, fz_obj *dict, int funcs,
 }
 
 static void
-pdf_load_radial_shading(fz_shade *shade, pdf_xref *xref, fz_obj *dict, int funcs, pdf_function **func)
+pdf_load_radial_shading(fz_shade *shade, pdf_document *xref, fz_obj *dict, int funcs, pdf_function **func)
 {
 	fz_obj *obj;
 	float d0, d1;
@@ -553,7 +553,7 @@ struct mesh_params
 };
 
 static void
-pdf_load_mesh_params(pdf_xref *xref, fz_obj *dict, struct mesh_params *p)
+pdf_load_mesh_params(pdf_document *xref, fz_obj *dict, struct mesh_params *p)
 {
 	fz_obj *obj;
 	int i, n;
@@ -603,7 +603,7 @@ pdf_load_mesh_params(pdf_xref *xref, fz_obj *dict, struct mesh_params *p)
 }
 
 static void
-pdf_load_type4_shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
+pdf_load_type4_shade(fz_shade *shade, pdf_document *xref, fz_obj *dict,
 	int funcs, pdf_function **func, fz_stream *stream)
 {
 	fz_context *ctx = xref->ctx;
@@ -668,7 +668,7 @@ pdf_load_type4_shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
 }
 
 static void
-pdf_load_type5_shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
+pdf_load_type5_shade(fz_shade *shade, pdf_document *xref, fz_obj *dict,
 	int funcs, pdf_function **func, fz_stream *stream)
 {
 	fz_context *ctx = xref->ctx;
@@ -718,7 +718,7 @@ pdf_load_type5_shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
 /* Type 6 & 7 -- Patch mesh shadings */
 
 static void
-pdf_load_type6_shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
+pdf_load_type6_shade(fz_shade *shade, pdf_document *xref, fz_obj *dict,
 	int funcs, pdf_function **func, fz_stream *stream)
 {
 	fz_context *ctx = xref->ctx;
@@ -837,7 +837,7 @@ pdf_load_type6_shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
 }
 
 static void
-pdf_load_type7_shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
+pdf_load_type7_shade(fz_shade *shade, pdf_document *xref, fz_obj *dict,
 	int funcs, pdf_function **func, fz_stream *stream)
 {
 	fz_context *ctx = xref->ctx;
@@ -958,7 +958,7 @@ pdf_load_type7_shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
 /* Load all of the shading dictionary parameters, then switch on the shading type. */
 
 static fz_shade *
-pdf_load_shading_dict(pdf_xref *xref, fz_obj *dict, fz_matrix transform)
+pdf_load_shading_dict(pdf_document *xref, fz_obj *dict, fz_matrix transform)
 {
 	fz_shade *shade = NULL;
 	pdf_function *func[FZ_MAX_COLORS] = { NULL };
@@ -1089,7 +1089,7 @@ fz_shade_size(fz_shade *s)
 }
 
 fz_shade *
-pdf_load_shading(pdf_xref *xref, fz_obj *dict)
+pdf_load_shading(pdf_document *xref, fz_obj *dict)
 {
 	fz_matrix mat;
 	fz_obj *obj;
diff --git a/pdf/pdf_stream.c b/pdf/pdf_stream.c
index bf9ccc70..75c0f59c 100644
--- a/pdf/pdf_stream.c
+++ b/pdf/pdf_stream.c
@@ -5,7 +5,7 @@
  * Check if an object is a stream or not.
  */
 int
-pdf_is_stream(pdf_xref *xref, int num, int gen)
+pdf_is_stream(pdf_document *xref, int num, int gen)
 {
 	if (num < 0 || num >= xref->len)
 		return 0;
@@ -49,7 +49,7 @@ pdf_stream_has_crypt(fz_context *ctx, fz_obj *stm)
  * Create a filter given a name and param dictionary.
  */
 static fz_stream *
-build_filter(fz_stream *chain, pdf_xref * xref, fz_obj * f, fz_obj * p, int num, int gen)
+build_filter(fz_stream *chain, pdf_document * xref, fz_obj * f, fz_obj * p, int num, int gen)
 {
 	char *s;
 	fz_context *ctx = chain->ctx;
@@ -127,7 +127,7 @@ build_filter(fz_stream *chain, pdf_xref * xref, fz_obj * f, fz_obj * p, int num,
  * Assume ownership of head.
  */
 static fz_stream *
-build_filter_chain(fz_stream *chain, pdf_xref *xref, fz_obj *fs, fz_obj *ps, int num, int gen)
+build_filter_chain(fz_stream *chain, pdf_document *xref, fz_obj *fs, fz_obj *ps, int num, int gen)
 {
 	fz_obj *f;
 	fz_obj *p;
@@ -150,7 +150,7 @@ build_filter_chain(fz_stream *chain, pdf_xref *xref, fz_obj *fs, fz_obj *ps, int
  * stream length, followed by a decryption filter.
  */
 static fz_stream *
-pdf_open_raw_filter(fz_stream *chain, pdf_xref *xref, fz_obj *stmobj, int num, int gen)
+pdf_open_raw_filter(fz_stream *chain, pdf_document *xref, fz_obj *stmobj, int num, int gen)
 {
 	int hascrypt;
 	int len;
@@ -182,7 +182,7 @@ pdf_open_raw_filter(fz_stream *chain, pdf_xref *xref, fz_obj *stmobj, int num, i
  * to stream length and decrypting.
  */
 static fz_stream *
-pdf_open_filter(fz_stream *chain, pdf_xref *xref, fz_obj *stmobj, int num, int gen)
+pdf_open_filter(fz_stream *chain, pdf_document *xref, fz_obj *stmobj, int num, int gen)
 {
 	fz_obj *filters;
 	fz_obj *params;
@@ -205,7 +205,7 @@ pdf_open_filter(fz_stream *chain, pdf_xref *xref, fz_obj *stmobj, int num, int g
  * constraining to stream length, and without decryption.
  */
 fz_stream *
-pdf_open_inline_stream(fz_stream *chain, pdf_xref *xref, fz_obj *stmobj, int length)
+pdf_open_inline_stream(fz_stream *chain, pdf_document *xref, fz_obj *stmobj, int length)
 {
 	fz_obj *filters;
 	fz_obj *params;
@@ -229,7 +229,7 @@ pdf_open_inline_stream(fz_stream *chain, pdf_xref *xref, fz_obj *stmobj, int len
  * Using xref->file while this is open is a bad idea.
  */
 fz_stream *
-pdf_open_raw_stream(pdf_xref *xref, int num, int gen)
+pdf_open_raw_stream(pdf_document *xref, int num, int gen)
 {
 	pdf_xref_entry *x;
 	fz_stream *stm;
@@ -258,7 +258,7 @@ pdf_open_raw_stream(pdf_xref *xref, int num, int gen)
  * Using xref->file while a stream is open is a Bad idea.
  */
 fz_stream *
-pdf_open_stream(pdf_xref *xref, int num, int gen)
+pdf_open_stream(pdf_document *xref, int num, int gen)
 {
 	pdf_xref_entry *x;
 	fz_stream *stm;
@@ -280,7 +280,7 @@ pdf_open_stream(pdf_xref *xref, int num, int gen)
 }
 
 fz_stream *
-pdf_open_stream_at(pdf_xref *xref, int num, int gen, fz_obj *dict, int stm_ofs)
+pdf_open_stream_at(pdf_document *xref, int num, int gen, fz_obj *dict, int stm_ofs)
 {
 	fz_stream *stm;
 
@@ -296,7 +296,7 @@ pdf_open_stream_at(pdf_xref *xref, int num, int gen, fz_obj *dict, int stm_ofs)
  * Load raw (compressed but decrypted) contents of a stream into buf.
  */
 fz_buffer *
-pdf_load_raw_stream(pdf_xref *xref, int num, int gen)
+pdf_load_raw_stream(pdf_document *xref, int num, int gen)
 {
 	fz_stream *stm;
 	fz_obj *dict;
@@ -340,7 +340,7 @@ pdf_guess_filter_length(int len, char *filter)
  * Load uncompressed contents of a stream into buf.
  */
 fz_buffer *
-pdf_load_stream(pdf_xref *xref, int num, int gen)
+pdf_load_stream(pdf_document *xref, int num, int gen)
 {
 	fz_context *ctx = xref->ctx;
 	fz_stream *stm = NULL;
diff --git a/pdf/pdf_type3.c b/pdf/pdf_type3.c
index d9bf528e..176bf32a 100644
--- a/pdf/pdf_type3.c
+++ b/pdf/pdf_type3.c
@@ -2,13 +2,13 @@
 #include "mupdf.h"
 
 static void
-pdf_run_glyph_func(void *xref, fz_obj *rdb, fz_buffer *contents, fz_device *dev, fz_matrix ctm, void *gstate)
+pdf_run_glyph_func(void *doc, fz_obj *rdb, fz_buffer *contents, fz_device *dev, fz_matrix ctm, void *gstate)
 {
-	pdf_run_glyph(xref, rdb, contents, dev, ctm, gstate);
+	pdf_run_glyph(doc, rdb, contents, dev, ctm, gstate);
 }
 
 pdf_font_desc *
-pdf_load_type3_font(pdf_xref *xref, fz_obj *rdb, fz_obj *dict)
+pdf_load_type3_font(pdf_document *xref, fz_obj *rdb, fz_obj *dict)
 {
 	char buf[256];
 	char *estrings[256];
@@ -125,7 +125,7 @@ pdf_load_type3_font(pdf_xref *xref, fz_obj *rdb, fz_obj *dict)
 		if (!fontdesc->font->t3resources)
 			fz_warn(ctx, "no resource dictionary for type 3 font!");
 
-		fontdesc->font->t3xref = xref;
+		fontdesc->font->t3doc = xref;
 		fontdesc->font->t3run = pdf_run_glyph_func;
 
 		/* CharProcs */
diff --git a/pdf/pdf_unicode.c b/pdf/pdf_unicode.c
index 95e7fa00..1fed0f63 100644
--- a/pdf/pdf_unicode.c
+++ b/pdf/pdf_unicode.c
@@ -4,7 +4,7 @@
 /* Load or synthesize ToUnicode map for fonts */
 
 void
-pdf_load_to_unicode(pdf_font_desc *font, pdf_xref *xref,
+pdf_load_to_unicode(pdf_font_desc *font, pdf_document *xref,
 	char **strings, char *collection, fz_obj *cmapstm)
 {
 	pdf_cmap *cmap;
diff --git a/pdf/pdf_xobject.c b/pdf/pdf_xobject.c
index e33ac858..91bf4db3 100644
--- a/pdf/pdf_xobject.c
+++ b/pdf/pdf_xobject.c
@@ -37,7 +37,7 @@ pdf_xobject_size(pdf_xobject *xobj)
 }
 
 pdf_xobject *
-pdf_load_xobject(pdf_xref *xref, fz_obj *dict)
+pdf_load_xobject(pdf_document *xref, fz_obj *dict)
 {
 	pdf_xobject *form;
 	fz_obj *obj;
diff --git a/pdf/pdf_xref.c b/pdf/pdf_xref.c
index bfd04acb..7fb247d9 100644
--- a/pdf/pdf_xref.c
+++ b/pdf/pdf_xref.c
@@ -13,7 +13,7 @@ static inline int iswhite(int ch)
  */
 
 static void
-pdf_load_version(pdf_xref *xref)
+pdf_load_version(pdf_document *xref)
 {
 	char buf[20];
 
@@ -26,7 +26,7 @@ pdf_load_version(pdf_xref *xref)
 }
 
 static void
-pdf_read_start_xref(pdf_xref *xref)
+pdf_read_start_xref(pdf_document *xref)
 {
 	unsigned char buf[1024];
 	int t, n;
@@ -63,7 +63,7 @@ pdf_read_start_xref(pdf_xref *xref)
  */
 
 static void
-pdf_read_old_trailer(pdf_xref *xref, char *buf, int cap)
+pdf_read_old_trailer(pdf_document *xref, char *buf, int cap)
 {
 	int len;
 	char *s;
@@ -119,7 +119,7 @@ pdf_read_old_trailer(pdf_xref *xref, char *buf, int cap)
 }
 
 static void
-pdf_read_new_trailer(pdf_xref *xref, char *buf, int cap)
+pdf_read_new_trailer(pdf_document *xref, char *buf, int cap)
 {
 	fz_try(xref->ctx)
 	{
@@ -132,7 +132,7 @@ pdf_read_new_trailer(pdf_xref *xref, char *buf, int cap)
 }
 
 static void
-pdf_read_trailer(pdf_xref *xref, char *buf, int cap)
+pdf_read_trailer(pdf_document *xref, char *buf, int cap)
 {
 	int c;
 
@@ -162,7 +162,7 @@ pdf_read_trailer(pdf_xref *xref, char *buf, int cap)
  */
 
 void
-pdf_resize_xref(pdf_xref *xref, int newlen)
+pdf_resize_xref(pdf_document *xref, int newlen)
 {
 	int i;
 
@@ -179,7 +179,7 @@ pdf_resize_xref(pdf_xref *xref, int newlen)
 }
 
 static fz_obj *
-pdf_read_old_xref(pdf_xref *xref, char *buf, int cap)
+pdf_read_old_xref(pdf_document *xref, char *buf, int cap)
 {
 	int ofs, len;
 	char *s;
@@ -260,7 +260,7 @@ pdf_read_old_xref(pdf_xref *xref, char *buf, int cap)
 }
 
 static void
-pdf_read_new_xref_section(pdf_xref *xref, fz_stream *stm, int i0, int i1, int w0, int w1, int w2)
+pdf_read_new_xref_section(pdf_document *xref, fz_stream *stm, int i0, int i1, int w0, int w1, int w2)
 {
 	int i, n;
 
@@ -294,7 +294,7 @@ pdf_read_new_xref_section(pdf_xref *xref, fz_stream *stm, int i0, int i1, int w0
 }
 
 static fz_obj *
-pdf_read_new_xref(pdf_xref *xref, char *buf, int cap)
+pdf_read_new_xref(pdf_document *xref, char *buf, int cap)
 {
 	fz_stream *stm = NULL;
 	fz_obj *trailer = NULL;
@@ -373,7 +373,7 @@ pdf_read_new_xref(pdf_xref *xref, char *buf, int cap)
 }
 
 static fz_obj *
-pdf_read_xref(pdf_xref *xref, int ofs, char *buf, int cap)
+pdf_read_xref(pdf_document *xref, int ofs, char *buf, int cap)
 {
 	int c;
 	fz_context *ctx = xref->ctx;
@@ -402,7 +402,7 @@ pdf_read_xref(pdf_xref *xref, int ofs, char *buf, int cap)
 }
 
 static void
-pdf_read_xref_sections(pdf_xref *xref, int ofs, char *buf, int cap)
+pdf_read_xref_sections(pdf_document *xref, int ofs, char *buf, int cap)
 {
 	fz_obj *trailer = NULL;
 	fz_obj *xrefstm = NULL;
@@ -436,7 +436,7 @@ pdf_read_xref_sections(pdf_xref *xref, int ofs, char *buf, int cap)
  */
 
 static void
-pdf_load_xref(pdf_xref *xref, char *buf, int bufsize)
+pdf_load_xref(pdf_document *xref, char *buf, int bufsize)
 {
 	fz_obj *size;
 	int i;
@@ -473,7 +473,7 @@ pdf_load_xref(pdf_xref *xref, char *buf, int bufsize)
 }
 
 void
-pdf_ocg_set_config(pdf_xref *xref, int config)
+pdf_ocg_set_config(pdf_document *xref, int config)
 {
 	int i, j, len, len2;
 	pdf_ocg_descriptor *desc = xref->ocg;
@@ -578,7 +578,7 @@ pdf_ocg_set_config(pdf_xref *xref, int config)
 }
 
 static void
-pdf_read_ocg(pdf_xref *xref)
+pdf_read_ocg(pdf_document *xref)
 {
 	fz_obj *obj, *ocg;
 	int len, i;
@@ -638,10 +638,10 @@ pdf_free_ocg(fz_context *ctx, pdf_ocg_descriptor *desc)
  * If password is not null, try to decrypt.
  */
 
-pdf_xref *
-pdf_open_xref_with_stream(fz_stream *file)
+pdf_document *
+pdf_open_document_with_stream(fz_stream *file)
 {
-	pdf_xref *xref;
+	pdf_document *xref;
 	fz_obj *encrypt, *id;
 	fz_obj *dict = NULL;
 	fz_obj *obj;
@@ -655,7 +655,7 @@ pdf_open_xref_with_stream(fz_stream *file)
 	/* install pdf specific callback */
 	fz_resolve_indirect = pdf_resolve_indirect;
 
-	xref = fz_calloc(ctx, 1, sizeof(pdf_xref));
+	xref = fz_calloc(ctx, 1, sizeof(pdf_document));
 	xref->file = fz_keep_stream(file);
 	xref->ctx = ctx;
 
@@ -749,7 +749,7 @@ pdf_open_xref_with_stream(fz_stream *file)
 	{
 		fz_drop_obj(dict);
 		fz_drop_obj(nobj);
-		pdf_free_xref(xref);
+		pdf_close_document(xref);
 		fz_throw(ctx, "cannot open document");
 	}
 
@@ -766,7 +766,7 @@ pdf_open_xref_with_stream(fz_stream *file)
 }
 
 void
-pdf_free_xref(pdf_xref *xref)
+pdf_close_document(pdf_document *xref)
 {
 	int i;
 	fz_context *ctx;
@@ -817,7 +817,7 @@ pdf_free_xref(pdf_xref *xref)
 }
 
 void
-pdf_debug_xref(pdf_xref *xref)
+pdf_debug_xref(pdf_document *xref)
 {
 	int i;
 	printf("xref\n0 %d\n", xref->len);
@@ -836,7 +836,7 @@ pdf_debug_xref(pdf_xref *xref)
  */
 
 static void
-pdf_load_obj_stm(pdf_xref *xref, int num, int gen, char *buf, int cap)
+pdf_load_obj_stm(pdf_document *xref, int num, int gen, char *buf, int cap)
 {
 	fz_stream *stm = NULL;
 	fz_obj *objstm = NULL;
@@ -925,7 +925,7 @@ pdf_load_obj_stm(pdf_xref *xref, int num, int gen, char *buf, int cap)
  */
 
 void
-pdf_cache_object(pdf_xref *xref, int num, int gen)
+pdf_cache_object(pdf_document *xref, int num, int gen)
 {
 	pdf_xref_entry *x;
 	int rnum, rgen;
@@ -991,7 +991,7 @@ pdf_cache_object(pdf_xref *xref, int num, int gen)
 }
 
 fz_obj *
-pdf_load_object(pdf_xref *xref, int num, int gen)
+pdf_load_object(pdf_document *xref, int num, int gen)
 {
 	fz_context *ctx = xref->ctx;
 
@@ -1016,13 +1016,13 @@ pdf_resolve_indirect(fz_obj *ref)
 	int num;
 	int gen;
 	fz_context *ctx = NULL; /* Avoid warning for stupid compilers */
-	pdf_xref *xref;
+	pdf_document *xref;
 
 	while (fz_is_indirect(ref))
 	{
 		if (--sanity == 0)
 			fz_throw(ctx, "Too many indirections (possible indirection cycle involving %d %d R)", num, gen);
-		xref = fz_get_indirect_xref(ref);
+		xref = fz_get_indirect_document(ref);
 		if (!xref)
 			return NULL;
 		ctx = xref->ctx;
@@ -1047,7 +1047,7 @@ pdf_resolve_indirect(fz_obj *ref)
 
 /* Replace numbered object -- for use by pdfclean and similar tools */
 void
-pdf_update_object(pdf_xref *xref, int num, int gen, fz_obj *newobj)
+pdf_update_object(pdf_document *xref, int num, int gen, fz_obj *newobj)
 {
 	pdf_xref_entry *x;
 
@@ -1068,20 +1068,20 @@ pdf_update_object(pdf_xref *xref, int num, int gen, fz_obj *newobj)
 }
 
 /*
- * Convenience function to open a file then call pdf_open_xref_with_stream.
+ * Convenience function to open a file then call pdf_open_document_with_stream.
  */
 
-pdf_xref *
-pdf_open_xref(fz_context *ctx, const char *filename)
+pdf_document *
+pdf_open_document(fz_context *ctx, const char *filename)
 {
 	fz_stream *file = NULL;
-	pdf_xref *xref;
+	pdf_document *xref;
 
 	fz_var(file);
 	fz_try(ctx)
 	{
 		file = fz_open_file(ctx, filename);
-		xref = pdf_open_xref_with_stream(file);
+		xref = pdf_open_document_with_stream(file);
 	}
 	fz_catch(ctx)
 	{