diff -ruN luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/image/epdf.h luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/image/epdf.h --- luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/image/epdf.h 2011-05-19 07:38:37.000000000 +0200 +++ luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/image/epdf.h 2014-10-11 12:17:00.028331243 +0200 @@ -33,6 +33,7 @@ # include # include # include +# include # include # include # include diff -ruN luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/lua/lepdflib.cc luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/lua/lepdflib.cc --- luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/lua/lepdflib.cc 2014-10-11 12:24:52.509357663 +0200 +++ luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/lua/lepdflib.cc 2014-10-11 12:42:03.665415321 +0200 @@ -48,23 +48,24 @@ //********************************************************************** -#define M_Annot "Annot" -#define M_Annots "Annots" -#define M_Array "Array" -#define M_Catalog "Catalog" -#define M_Dict "Dict" -#define M_GooString "GooString" -#define M_LinkDest "LinkDest" -#define M_Link "Link" -#define M_Links "Links" -#define M_Object "Object" -#define M_Page "Page" -#define M_PDFDoc "PDFDoc" -#define M_PDFRectangle "PDFRectangle" -#define M_Ref "Ref" -#define M_Stream "Stream" -#define M_XRefEntry "XRefEntry" -#define M_XRef "XRef" +#define M_Annot "epdf.Annot" /* ls-hh: epdf.* gives better protection in registry */ +#define M_Annots "epdf.Annots" +#define M_Array "epdf.Array" +#define M_Catalog "epdf.Catalog" +#define M_Dict "epdf.Dict" +#define M_GooString "epdf.GooString" +#define M_LinkDest "epdf.LinkDest" +#define M_Link "epdf.Link" +#define M_Links "epdf.Links" +#define M_Object "epdf.Object" +#define M_Page "epdf.Page" +#define M_PDFDoc "epdf.PDFDoc" +#define M_PDFRectangle "epdf.PDFRectangle" +#define M_Ref "epdf.Ref" +#define M_Stream "epdf.Stream" +#define M_StructTreeRoot "epdf.StructTreeRoot" +#define M_XRef "epdf.XRef" +#define M_XRefEntry "epdf.XRefEntry" //********************************************************************** @@ -92,6 +93,7 @@ new_poppler_userdata(PDFRectangle); new_poppler_userdata(Ref); new_poppler_userdata(Stream); +new_poppler_userdata(StructTreeRoot); new_poppler_userdata(XRef); //********************************************************************** @@ -565,7 +567,11 @@ m_poppler_get_GOOSTRING(Catalog, getBaseURI); m_poppler_get_GOOSTRING(Catalog, readMetadata); +#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT m_poppler_get_poppler(Catalog, Object, getStructTreeRoot); +#else +m_poppler_get_poppler(Catalog, StructTreeRoot, getStructTreeRoot); +#endif static int m_Catalog_findPage(lua_State * L) { @@ -2048,14 +2054,22 @@ static int m_PDFDoc_getStructTreeRoot(lua_State * L) { +#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT Object *obj; +#else + StructTreeRoot *obj; +#endif udstruct *uin, *uout; uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc); if (uin->pd != NULL && uin->pd->pc != uin->pc) pdfdoc_changed_error(L); if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) { obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot(); +#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT uout = new_Object_userdata(L); +#else + uout = new_StructTreeRoot_userdata(L); +#endif uout->d = obj; uout->pc = uin->pc; uout->pd = uin->pd;