luatex 0.25.3

git-svn-id: svn://tug.org/texlive/trunk@7494 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 292 insertions, 291 deletions

diff --git a/Build/source/texk/web2c/luatexdir/image/epdf.h b/Build/source/texk/web2c/luatexdir/image/epdf.h
index 2359d53d3db..93a9e1c45eb 100644
--- a/Build/source/texk/web2c/luatexdir/image/epdf.h
+++ b/Build/source/texk/web2c/luatexdir/image/epdf.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with pdfTeX; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-$Id: epdf.h 1031 2008-02-14 23:03:20Z hhenkel $
+$Id: epdf.h 1125 2008-03-25 19:36:52Z hhenkel $
 */
 
 extern "C" {
@@ -45,6 +45,7 @@ extern "C" {
 #include <web2c/luatexdir/ptexmac.h>
 #include "openbsd-compat.h"
 #include "image.h"
+#include "../avlstuff.h"
 
 /* #-define pdfbufsize      pdfbufmax */
 
@@ -78,7 +79,6 @@ extern "C" {
     extern void read_pdf_info(image_dict *, integer, integer);
     extern void embed_whole_font(struct fd_entry *);
     extern void epdf_check_mem(void);
-    extern void epdf_delete(image_dict *);
     extern void epdf_free(void);
     __attribute__ ((format(printf, 1, 2)))
     extern void pdf_printf(const char *fmt, ...);
@@ -109,9 +109,6 @@ extern "C" {
 /* write_enc.c */
     extern void epdf_write_enc(char **, integer);
 
-/* write_enc.c */
-    extern pdf_img_struct *new_pdf_img_struct(void);
-
 /* utils.c */
     extern char *convertStringToPDFString(char *in, int len);
     extern char *stripzeros(char *a);
diff --git a/Build/source/texk/web2c/luatexdir/image/image.h b/Build/source/texk/web2c/luatexdir/image/image.h
index cf7d4f0dd88..e239e617f37 100644
--- a/Build/source/texk/web2c/luatexdir/image/image.h
+++ b/Build/source/texk/web2c/luatexdir/image/image.h
@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
 along with pdfTeX; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-$Id: image.h 1100 2008-03-09 13:40:48Z hhenkel $
+$Id: image.h 1125 2008-03-25 19:36:52Z hhenkel $
 */
 
 #ifndef IMAGE_H
@@ -43,14 +43,6 @@ extern integer zround(double);  /* from zround.c */
 /**********************************************************************/
 
 typedef struct {
-    float width;
-    float height;
-    float orig_x;
-    float orig_y;
-    void *doc;
-} pdf_img_struct;
-
-typedef struct {
     png_structp png_ptr;
     png_infop info_ptr;
 } png_img_struct;
@@ -89,6 +81,8 @@ typedef struct {
     integer index;              /* /Im1, /Im2, ... */
     integer x_size;             /* dimensions in pixel counts as in JPG/PNG/JBIG2 file */
     integer y_size;
+    integer x_orig;             /* origin in sp for PDF files */
+    integer y_orig;
     integer x_res;              /* pixel resolution as in JPG/PNG/JBIG2 file */
     integer y_res;
     integer colorspace;         /* number of /ColorSpace object */
@@ -105,7 +99,6 @@ typedef struct {
     pdfboxspec_e page_box_spec; /* PDF page box spec.: media/crop/bleed/trim/art */
     dict_state state;
     union {
-        pdf_img_struct *pdf;
         png_img_struct *png;
         jpg_img_struct *jpg;
         jb2_img_struct *jb2;
@@ -116,6 +109,8 @@ typedef struct {
 #  define img_index(N)          ((N)->index)
 #  define img_xsize(N)          ((N)->x_size)
 #  define img_ysize(N)          ((N)->y_size)
+#  define img_xorig(N)          ((N)->x_orig)
+#  define img_yorig(N)          ((N)->y_orig)
 #  define img_xres(N)           ((N)->x_res)
 #  define img_yres(N)           ((N)->y_res)
 #  define img_colorspace(N)     ((N)->colorspace)
@@ -132,13 +127,6 @@ typedef struct {
 #  define img_pagebox(N)        ((N)->page_box_spec)
 #  define img_state(N)          ((N)->state)
 
-#  define img_pdf_ptr(N)        ((N)->img_struct.pdf)
-#  define img_pdf_width(N)      ((N)->img_struct.pdf->width)
-#  define img_pdf_height(N)     ((N)->img_struct.pdf->height)
-#  define img_pdf_orig_x(N)     ((N)->img_struct.pdf->orig_x)
-#  define img_pdf_orig_y(N)     ((N)->img_struct.pdf->orig_y)
-#  define img_pdf_doc(N)        ((N)->img_struct.pdf->doc)
-
 #  define img_png_ptr(N)        ((N)->img_struct.png)
 #  define img_png_png_ptr(N)    ((N)->img_struct.png->png_ptr)
 #  define img_png_info_ptr(N)   ((N)->img_struct.png->info_ptr)
@@ -218,6 +206,6 @@ void write_epdf(image_dict *);
 
 /* pdftoepdf.cc */
 
-void epdf_delete(image_dict * idict);
+void unrefPdfDocument(char *);
 
 #endif
diff --git a/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc b/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc
index c5270eb58bd..21ded8e0b0f 100644
--- a/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc
+++ b/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with pdfTeX; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-$Id: pdftoepdf.cc 1058 2008-02-19 21:13:58Z hhenkel $
+$Id: pdftoepdf.cc 1129 2008-03-27 19:43:44Z hhenkel $
 */
 
 #include <stdlib.h>
@@ -79,7 +79,8 @@ $Id: pdftoepdf.cc 1058 2008-02-19 21:13:58Z hhenkel $
 class PdfObject {
   public:
     PdfObject() {               // nothing
-    } ~PdfObject() {
+    }
+    ~PdfObject() {
         iObject.free();
     }
     Object *operator->() {
@@ -101,20 +102,16 @@ class PdfObject {
 // appended into a linked list. Duplicates are checked and removed from the
 // list of indirect objects during appending.
 
-enum InObjType {
-    objFont,
-    objFontDesc,
-    objOther
-};
+enum InObjType { objFont, objFontDesc, objOther };
 
 struct InObj {
     Ref ref;                    // ref in original PDF
     InObjType type;             // object type
-    InObj *next;                // next entry in list of indirect objects
     integer num;                // new object number in output PDF
     fd_entry *fd;               // pointer to /FontDescriptor object structure
     integer enc_objnum;         // Encoding for objFont
     int written;                // has it been written to output PDF?
+    InObj *next;                // next entry in list of indirect objects
 };
 
 struct UsedEncoding {
@@ -123,89 +120,104 @@ struct UsedEncoding {
     UsedEncoding *next;
 };
 
-static InObj *inObjList;
+static XRef *xref = NULL;
+static InObj *inObjList = NULL;
 static UsedEncoding *encodingList;
 static GBool isInit = gFalse;
 
-// --------------------------------------------------------------------
-// Maintain list of open embedded PDF files
-// --------------------------------------------------------------------
+//**********************************************************************
+// Maintain AVL tree of open embedded PDF files
+
+static avl_table *PdfDocumentTree = NULL;
 
 struct PdfDocument {
-    char *file_name;
+    char *file_path;            // full file name including path
     PDFDoc *doc;
     XRef *xref;
     InObj *inObjList;
-    int occurences;             // number of references to the document; the doc can be
-    // deleted when this is negative
-    PdfDocument *next;
+    int occurences;             // number of references to the PdfDocument; it can be deleted when occurences == 0
 };
 
-static PdfDocument *pdfDocuments = 0;
+/* AVL sort PdfDocument into PdfDocumentTree by file_path */
 
-static XRef *xref = 0;
+static int CompPdfDocument(const void *pa, const void *pb, void *p)
+{
+    return strcmp(((const PdfDocument *) pa)->file_path,
+                  ((const PdfDocument *) pb)->file_path);
+}
 
-// Returns pointer to PdfDocument record for PDF file.
-// Creates a new record if it doesn't exist yet.
-// xref is made current for the document.
+// Returns pointer to PdfDocument structure for PDF file.
 
-static PdfDocument *find_add_document(char *file_name)
+static PdfDocument *findPdfDocument(char *file_path)
 {
-    PdfDocument *p = pdfDocuments;
-    while (p && strcmp(p->file_name, file_name) != 0)
-        p = p->next;
-    if (p) {
-        xref = p->xref;
-        (p->occurences)++;
+    PdfDocument *pdf_doc, tmp;
+    assert(file_path != NULL);
+    if (PdfDocumentTree == NULL)
+        PdfDocumentTree = avl_create(CompPdfDocument, NULL, &avl_xallocator);
+    assert(PdfDocumentTree != NULL);
+    tmp.file_path = file_path;
+    pdf_doc = (PdfDocument *) avl_find(PdfDocumentTree, &tmp);
+    return pdf_doc;
+}
+
+// Returns pointer to PdfDocument structure for PDF file.
+// Creates a new structure if it doesn't exist yet.
+
+static PdfDocument *refPdfDocument(char *file_path)
+{
+    PdfDocument *pdf_doc = findPdfDocument(file_path);
+    if (pdf_doc == NULL) {
+        pdf_doc = new PdfDocument;
+        pdf_doc->file_path = xstrdup(file_path);
+        void **aa = avl_probe(PdfDocumentTree, pdf_doc);
+        assert(aa != NULL);
+        GString *docName = new GString(pdf_doc->file_path);
+        pdf_doc->doc = new PDFDoc(docName);     // takes ownership of docName
+        if (!pdf_doc->doc->isOk() || !pdf_doc->doc->okToPrint())
+            pdftex_fail("xpdf: reading PDF image failed");
+        pdf_doc->xref = NULL;
+        pdf_doc->inObjList = NULL;
+        pdf_doc->occurences = 0;        // 0 = unreferenced
 #ifdef DEBUG
-        fprintf(stderr, "\npdfTeX Debug: Incrementing %s (%d)\n", p->file_name,
-                p->occurences);
+        fprintf(stderr, "\nluatex Debug: Creating %s (%d)\n",
+                pdf_doc->file_path, pdf_doc->occurences);
 #endif
-        return p;
     }
-    p = new PdfDocument;
-    p->file_name = xstrdup(file_name);
-    p->xref = xref = 0;
-    p->occurences = 0;
+    pdf_doc->occurences++;
 #ifdef DEBUG
-    fprintf(stderr, "\npdfTeX Debug: Creating %s (%d)\n", p->file_name,
-            p->occurences);
+    fprintf(stderr, "\nluatex Debug: Incrementing %s (%d)\n",
+            pdf_doc->file_path, pdf_doc->occurences);
 #endif
-    GString *docName = new GString(p->file_name);
-    p->doc = new PDFDoc(docName);       // takes ownership of docName
-    if (!p->doc->isOk() || !p->doc->okToPrint()) {
-        pdftex_fail("xpdf: reading PDF image failed");
-    }
-    p->inObjList = 0;
-    p->next = pdfDocuments;
-    pdfDocuments = p;
-    return p;
+    return pdf_doc;
 }
 
-// Deallocate a PdfDocument with all its resources
+static void deletePdfDocument(PdfDocument *);
 
-static void delete_document(PdfDocument * pdf_doc)
+// Called when an image has been written and its resources in image_tab are
+// freed and it's not referenced anymore.
+
+void unrefPdfDocument(char *file_path)
 {
-    PdfDocument **p = &pdfDocuments;
-    while (*p && *p != pdf_doc)
-        p = &((*p)->next);
-    // should not happen:
-    if (!*p)
-        return;
-    // unlink from list
-    *p = pdf_doc->next;
-    // free pdf_doc's resources
-    InObj *r, *n;
-    for (r = pdf_doc->inObjList; r != 0; r = n) {
-        n = r->next;
-        delete r;
+    PdfDocument *pdf_doc = findPdfDocument(file_path);
+    assert(pdf_doc != NULL);
+    assert(pdf_doc->occurences > 0);    // aim for point landing
+    pdf_doc->occurences--;
+#ifdef DEBUG
+    fprintf(stderr, "\nluatex Debug: Decrementing %s (%d)\n",
+            pdf_doc->file_path, pdf_doc->occurences);
+#endif
+    if (pdf_doc->occurences == 0) {
+#ifdef DEBUG
+        fprintf(stderr, "\nluatex Debug: Deleting %s\n", pdf_doc->file_path);
+#endif
+        void *a = avl_delete(PdfDocumentTree, pdf_doc);
+        assert((PdfDocument *) a == pdf_doc);
+        deletePdfDocument(pdf_doc);
     }
-    xref = pdf_doc->xref;
-    delete pdf_doc->doc;
-    xfree(pdf_doc->file_name);
-    delete pdf_doc;
 }
 
+//**********************************************************************
+
 // Replacement for
 //      Object *initDict(Dict *dict1){ initObj(objDict); dict = dict1; return this; }
 
@@ -218,8 +230,6 @@ static void initDictFromDict(PdfObject & obj, Dict * dict)
     }
 }
 
-// --------------------------------------------------------------------
-
 static int addEncoding(GfxFont * gfont)
 {
     UsedEncoding *n;
@@ -241,7 +251,7 @@ static int addEncoding(GfxFont * gfont)
         addInObj(objFontDesc, ref, fd, 0)
 
 #define addOther(ref) \
-        addInObj(objOther, ref, 0, 0)
+        addInObj(objOther, ref, NULL, 0)
 
 static int addInObj(InObjType type, Ref ref, fd_entry * fd, integer e)
 {
@@ -250,14 +260,14 @@ static int addInObj(InObjType type, Ref ref, fd_entry * fd, integer e)
         pdftex_fail("PDF inclusion: invalid reference");
     n->ref = ref;
     n->type = type;
-    n->next = 0;
+    n->next = NULL;
     n->fd = fd;
     n->enc_objnum = e;
     n->written = 0;
-    if (inObjList == 0)
+    if (inObjList == NULL)
         inObjList = n;
     else {
-        for (p = inObjList; p != 0; p = p->next) {
+        for (p = inObjList; p != NULL; p = p->next) {
             if (p->ref.num == ref.num && p->ref.gen == ref.gen) {
                 delete n;
                 return p->num;
@@ -266,7 +276,7 @@ static int addInObj(InObjType type, Ref ref, fd_entry * fd, integer e)
         }
         // it is important to add new objects at the end of the list,
         // because new objects are being added while the list is being
-        // written out.
+        // written out by writeRefs().
         q->next = n;
     }
     if (type == objFontDesc)
@@ -276,8 +286,6 @@ static int addInObj(InObjType type, Ref ref, fd_entry * fd, integer e)
     return n->num;
 }
 
-static void copyObject(Object *);
-
 static void copyName(char *s)
 {
     pdf_puts("/");
@@ -290,6 +298,8 @@ static void copyName(char *s)
     }
 }
 
+static void copyObject(Object *);
+
 static void copyDictEntry(Object * obj, int i)
 {
     PdfObject obj1;
@@ -502,7 +512,7 @@ static char *convertNumToPDF(double n)
                 fval /= 10;
             }
         } else
-            buf[bindex++] = 0;
+            buf[bindex++] = '\0';
     }
     return (char *) buf;
 }
@@ -591,7 +601,7 @@ static void copyObject(Object * obj)
 static void writeRefs()
 {
     InObj *r;
-    for (r = inObjList; r != 0; r = r->next) {
+    for (r = inObjList; r != NULL; r = r->next) {
         if (!r->written) {
             Object obj1;
             r->written = 1;
@@ -621,20 +631,20 @@ static void writeEncodings()
     UsedEncoding *r, *n;
     char *glyphNames[256], *s;
     int i;
-    for (r = encodingList; r != 0; r = r->next) {
+    for (r = encodingList; r != NULL; r = r->next) {
         for (i = 0; i < 256; i++) {
             if (r->font->isCIDFont()) {
                 pdftex_warn
                     ("PDF inclusion: CID font included, encoding maybe wrong");
             }
-            if ((s = ((Gfx8BitFont *) r->font)->getCharName(i)) != 0)
+            if ((s = ((Gfx8BitFont *) r->font)->getCharName(i)) != NULL)
                 glyphNames[i] = s;
             else
                 glyphNames[i] = notdef;
         }
         epdf_write_enc(glyphNames, r->enc_objnum);
     }
-    for (r = encodingList; r != 0; r = n) {
+    for (r = encodingList; r != NULL; r = n) {
         n = r->next;
         delete r->font;
         delete r;
@@ -661,7 +671,6 @@ static PDFRectangle *get_pagebox(Page * page, integer pagebox_spec)
     return page->getMediaBox(); // to make the compiler happy
 }
 
-
 // Reads various information about the PDF and sets it up for later inclusion.
 // This will fail if the PDF version of the PDF is higher than
 // minor_pdf_version_wanted or page_name is given and can not be found.
@@ -676,28 +685,25 @@ read_pdf_info(image_dict * idict, integer minor_pdf_version_wanted,
     Page *page;
     int rotate;
     PDFRectangle *pagebox;
-    float pdf_version_found, pdf_version_wanted;
+    float pdf_version_found, pdf_version_wanted, pdf_width, pdf_height,
+        pdf_xorig, pdf_yorig;
     assert(idict != NULL);
     assert(img_type(idict) == IMAGE_TYPE_PDF);
-    assert(img_pdf_ptr(idict) == NULL);
-    img_pdf_ptr(idict) = new_pdf_img_struct();
     // initialize
-    if (!isInit) {
+    if (isInit == gFalse) {
         globalParams = new GlobalParams();
         globalParams->setErrQuiet(gFalse);
         isInit = gTrue;
     }
     // open PDF file
-    pdf_doc = find_add_document(img_filepath(idict));
-    img_pdf_doc(idict) = pdf_doc;
-
+    pdf_doc = refPdfDocument(img_filepath(idict));
     // check PDF version
     // this works only for PDF 1.x -- but since any versions of PDF newer
     // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
     // then have to changed drastically anyway.
     pdf_version_found = pdf_doc->doc->getPDFVersion();
     pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
-    if (pdf_version_found > pdf_version_wanted) {
+    if (pdf_version_found > pdf_version_wanted + 0.01) {
         char msg[] =
             "PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed";
         if (pdf_inclusion_errorlevel > 0) {
@@ -711,7 +717,7 @@ read_pdf_info(image_dict * idict, integer minor_pdf_version_wanted,
         // get page by name
         GString name(img_pagename(idict));
         LinkDest *link = pdf_doc->doc->findDest(&name);
-        if (link == 0 || !link->isOk())
+        if (link == NULL || !link->isOk())
             pdftex_fail("PDF inclusion: invalid destination <%s>",
                         img_pagename(idict));
         Ref ref = link->getPageRef();
@@ -734,53 +740,50 @@ read_pdf_info(image_dict * idict, integer minor_pdf_version_wanted,
     // get the pagebox (media, crop...) to use.
     pagebox = get_pagebox(page, img_pagebox(idict));
     if (pagebox->x2 > pagebox->x1) {
-        img_pdf_orig_x(idict) = pagebox->x1;
-        img_pdf_width(idict) = pagebox->x2 - pagebox->x1;
+        pdf_xorig = pagebox->x1;
+        pdf_width = pagebox->x2 - pagebox->x1;
     } else {
-        img_pdf_orig_x(idict) = pagebox->x2;
-        img_pdf_width(idict) = pagebox->x1 - pagebox->x2;
+        pdf_xorig = pagebox->x2;
+        pdf_width = pagebox->x1 - pagebox->x2;
     }
     if (pagebox->y2 > pagebox->y1) {
-        img_pdf_orig_y(idict) = pagebox->y1;
-        img_pdf_height(idict) = pagebox->y2 - pagebox->y1;
+        pdf_yorig = pagebox->y1;
+        pdf_height = pagebox->y2 - pagebox->y1;
     } else {
-        img_pdf_orig_y(idict) = pagebox->y2;
-        img_pdf_height(idict) = pagebox->y1 - pagebox->y2;
+        pdf_yorig = pagebox->y2;
+        pdf_height = pagebox->y1 - pagebox->y2;
     }
 
     rotate = page->getRotate();
     // handle page rotation and adjust dimens as needed
     if (rotate != 0) {
-        if (rotate % 90 == 0) {
-            // handle only the simple case: multiple of 90s.
-            // these are the only values allowed according to the
-            // reference (v1.3, p. 78).
-            // 180 needs no special treatment here
-            register float f;
-            switch (rotate) {
-            case 90:
-                f = img_pdf_height(idict);
-                img_pdf_height(idict) = img_pdf_width(idict);
-                img_pdf_width(idict) = f;
-                break;
-            case 270:
-                f = img_pdf_height(idict);
-                img_pdf_height(idict) = img_pdf_width(idict);
-                img_pdf_width(idict) = f;
-                break;
-            }
+        // handle only the simple case: multiple of 90s.
+        // these are the only values allowed according to the
+        // reference (v1.3, p. 78).
+        // 180 needs no special treatment here
+        register float f;
+        switch (rotate % 360) {
+        case 90:
+        case 270:
+            f = pdf_height;
+            pdf_height = pdf_width;
+            pdf_width = f;
+            break;
+        default:;
         }
     }
     pdf_doc->xref = pdf_doc->doc->getXRef();
-    img_xsize(idict) = bp2int(img_pdf_width(idict));
-    img_ysize(idict) = bp2int(img_pdf_height(idict));
+    img_xsize(idict) = bp2int(pdf_width);
+    img_ysize(idict) = bp2int(pdf_height);
+    img_xorig(idict) = bp2int(pdf_xorig);
+    img_yorig(idict) = bp2int(pdf_yorig);
 }
 
-// writes the current epf_doc.
+// Writes the current epf_doc.
 // Here the included PDF is copied, so most errors that can happen during PDF
 // inclusion will arise here.
 
-void write_epdf(image_dict * idict)
+static void write_epdf1(image_dict * idict)
 {
     Page *page;
     PdfObject contents, obj1, obj2;
@@ -792,15 +795,11 @@ void write_epdf(image_dict * idict)
     int rotate;
     double scale[6] = { 0, 0, 0, 0, 0, 0 };
     bool writematrix = false;
-    PdfDocument *pdf_doc = (PdfDocument *) img_pdf_doc(idict);
-    (pdf_doc->occurences)--;
-#ifdef DEBUG
-    fprintf(stderr, "\npdfTeX Debug: Decrementing %s (%d)\n",
-            pdf_doc->file_name, pdf_doc->occurences);
-#endif
+    PdfDocument *pdf_doc = (PdfDocument *) findPdfDocument(img_filepath(idict));
+    assert(pdf_doc != NULL);
     xref = pdf_doc->xref;
     inObjList = pdf_doc->inObjList;
-    encodingList = 0;
+    encodingList = NULL;
     page = pdf_doc->doc->getCatalog()->getPage(img_pagenum(idict));
     rotate = page->getRotate();
     PDFRectangle *pagebox;
@@ -812,8 +811,8 @@ void write_epdf(image_dict * idict)
 
     // write additional information
     pdf_printf("/%s.FileName (%s)\n", pdfkeyprefix,
-               convertStringToPDFString(pdf_doc->file_name,
-                                        strlen(pdf_doc->file_name)));
+               convertStringToPDFString(pdf_doc->file_path,
+                                        strlen(pdf_doc->file_path)));
     pdf_printf("/%s.PageNumber %i\n", pdfkeyprefix, (int) img_pagenum(idict));
     pdf_doc->doc->getDocInfoNF(&info);
     if (info.isRef()) {
@@ -826,42 +825,40 @@ void write_epdf(image_dict * idict)
 
     // handle page rotation
     if (rotate != 0) {
-        if (rotate % 90 == 0) {
-            // this handles only the simple case: multiple of 90s but these
-            // are the only values allowed according to the reference
-            // (v1.3, p. 78).
-            // the image is rotated around its center.
-            // the /Rotate key is clockwise while the matrix is
-            // counterclockwise :-%
-            tex_printf(", page is rotated %d degrees", rotate);
-            switch (rotate) {
-            case 90:
-                scale[1] = -1;
-                scale[2] = 1;
-                scale[4] = pagebox->x1 - pagebox->y1;
-                scale[5] = pagebox->y1 + pagebox->x2;
-                writematrix = true;
-                break;
-            case 180:
-                scale[0] = scale[3] = -1;
-                scale[4] = pagebox->x1 + pagebox->x2;
-                scale[5] = pagebox->y1 + pagebox->y2;
-                writematrix = true;
-                break;          // width and height are exchanged
-            case 270:
-                scale[1] = 1;
-                scale[2] = -1;
-                scale[4] = pagebox->x1 + pagebox->y2;
-                scale[5] = pagebox->y1 - pagebox->x1;
-                writematrix = true;
-                break;
-            }
-            if (writematrix) {  // The matrix is only written if the image is rotated.
-                sprintf(s, "/Matrix [%.8f %.8f %.8f %.8f %.8f %.8f]\n",
-                        scale[0],
-                        scale[1], scale[2], scale[3], scale[4], scale[5]);
-                pdf_printf(stripzeros(s));
-            }
+        // this handles only the simple case: multiple of 90s but these
+        // are the only values allowed according to the reference
+        // (v1.3, p. 78).
+        // the image is rotated around its center.
+        // the /Rotate key is clockwise while the matrix is
+        // counterclockwise :-%
+        tex_printf(", page is rotated %d degrees", rotate);
+        switch (rotate % 360) {
+        case 90:
+            scale[1] = -1;
+            scale[2] = 1;
+            scale[4] = pagebox->x1 - pagebox->y1;
+            scale[5] = pagebox->y1 + pagebox->x2;
+            writematrix = true;
+            break;
+        case 180:
+            scale[0] = scale[3] = -1;
+            scale[4] = pagebox->x1 + pagebox->x2;
+            scale[5] = pagebox->y1 + pagebox->y2;
+            writematrix = true;
+            break;              // width and height are exchanged
+        case 270:
+            scale[1] = 1;
+            scale[2] = -1;
+            scale[4] = pagebox->x1 + pagebox->y2;
+            scale[5] = pagebox->y1 - pagebox->x1;
+            writematrix = true;
+            break;
+        default:;
+        }
+        if (writematrix) {      // The matrix is only written if the image is rotated.
+            sprintf(s, "/Matrix [%.8f %.8f %.8f %.8f %.8f %.8f]\n",
+                    scale[0], scale[1], scale[2], scale[3], scale[4], scale[5]);
+            pdf_printf(stripzeros(s));
         }
     }
 
@@ -883,12 +880,12 @@ void write_epdf(image_dict * idict)
 #  else
         // FIXME: currently we don't know how to handle Page Groups so we abort gracefully :-(
         pdftex_fail
-            ("PDF inclusion: Page Group detected which pdfTeX can't handle. Sorry.");
+            ("PDF inclusion: Page Group detected which luatex can't handle. Sorry.");
 #  endif
 #else
         // FIXME: currently we don't know how to handle Page Groups so we at least give a warning :-(
         pdftex_warn
-            ("PDF inclusion: Page Group detected which pdfTeX can't handle. Ignoring it.");
+            ("PDF inclusion: Page Group detected which luatex can't handle. Ignoring it.");
 #endif
     }
     // write the page Metadata if it's there
@@ -970,25 +967,39 @@ void write_epdf(image_dict * idict)
     writeRefs();
     // write out all used encodings (and delete list)
     writeEncodings();
-    // save object list, xref
+    // save object list
     pdf_doc->inObjList = inObjList;
-    pdf_doc->xref = xref;
+    assert(xref == pdf_doc->xref);      // xref should be unchanged
 }
 
-// Called when an image has been written and it's resources in image_tab are
-// freed and it's not referenced anymore.
+void write_epdf(image_dict * idict)
+{
+    assert(idict != NULL);
+    write_epdf1(idict);
+    unrefPdfDocument(img_filepath(idict));
+}
 
-void epdf_delete(image_dict * idict)
+//**********************************************************************
+// Deallocate a PdfDocument with all its resources
+
+static void deletePdfDocument(PdfDocument * pdf_doc)
 {
-    PdfDocument *pdf_doc = (PdfDocument *) img_pdf_doc(idict);
-    xref = pdf_doc->xref;
-    if (pdf_doc->occurences < 0) {
-#ifdef DEBUG
-        fprintf(stderr, "\npdfTeX Debug: Deleting %s\n", pdf_doc->file_name);
-#endif
-        delete_document(pdf_doc);
+    assert(pdf_doc != NULL);
+    // free PdfDocument's resources
+    InObj *r, *n;
+    for (r = pdf_doc->inObjList; r != NULL; r = n) {
+        n = r->next;
+        delete r;
     }
-    img_pdf_doc(idict) = NULL;
+    delete pdf_doc->doc;
+    xfree(pdf_doc->file_path);
+    delete pdf_doc;
+}
+
+static void destroyPdfDocument(void *pa, void *pb)
+{
+    PdfDocument *pdf_doc = (PdfDocument *) pa;
+    deletePdfDocument(pdf_doc);
 }
 
 // Called when PDF embedding system is finalized.
@@ -996,13 +1007,10 @@ void epdf_delete(image_dict * idict)
 
 void epdf_check_mem()
 {
-    if (isInit) {
-        PdfDocument *p, *n;
-        for (p = pdfDocuments; p; p = n) {
-            n = p->next;
-            delete_document(p);
-        }
-        // see above for globalParams
+    if (PdfDocumentTree != NULL)
+        avl_destroy(PdfDocumentTree, destroyPdfDocument);
+    PdfDocumentTree = NULL;
+    if (isInit == gTrue)
         delete globalParams;
-    }
+    isInit = gFalse;
 }
diff --git a/Build/source/texk/web2c/luatexdir/image/writeimg.c b/Build/source/texk/web2c/luatexdir/image/writeimg.c
index 66eb459bc0c..c49ef9a28d9 100644
--- a/Build/source/texk/web2c/luatexdir/image/writeimg.c
+++ b/Build/source/texk/web2c/luatexdir/image/writeimg.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with pdfTeX; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-$Id: writeimg.c 1119 2008-03-22 11:27:02Z hhenkel $
+$Id: writeimg.c 1152 2008-04-13 22:29:59Z hhenkel $
 */
 
 #include <assert.h>
@@ -168,18 +168,6 @@ static void check_type_by_extension(image_dict * idict)
 
 /**********************************************************************/
 
-pdf_img_struct *new_pdf_img_struct()
-{
-    pdf_img_struct *p;
-    p = xtalloc(1, pdf_img_struct);
-    p->width = 0;
-    p->height = 0;
-    p->orig_x = 0;
-    p->orig_y = 0;
-    p->doc = NULL;
-    return p;
-}
-
 void init_image(image * p)
 {
     assert(p != NULL);
@@ -208,6 +196,8 @@ void init_image_dict(image_dict * p)
     img_index(p) = 0;
     img_xsize(p) = 0;
     img_ysize(p) = 0;
+    img_xorig(p) = 0;
+    img_yorig(p) = 0;
     img_xres(p) = 0;
     img_yres(p) = 0;
     img_colorspace(p) = 0;
@@ -223,7 +213,7 @@ void init_image_dict(image_dict * p)
     img_colordepth(p) = 0;
     img_pagebox(p) = PDF_BOX_SPEC_MEDIA;
     img_state(p) = DICT_NEW;
-    img_pdf_ptr(p) = NULL;      /* union */
+    img_png_ptr(p) = NULL;      /* union */
 }
 
 image_dict *new_image_dict()
@@ -250,10 +240,26 @@ void free_dict_strings(image_dict * p)
 }
 
 void free_image_dict(image_dict * p)
-{
+{                               /* called from limglib.c */
+    assert(img_state(p) < DICT_REFERED);
+    switch (img_type(p)) {
+    case IMAGE_TYPE_PDF:
+        unrefPdfDocument(img_filepath(p));
+        break;
+    case IMAGE_TYPE_PNG:       /* assuming IMG_CLOSEINBETWEEN */
+        assert(img_png_ptr(p) == NULL);
+        break;
+    case IMAGE_TYPE_JPG:       /* assuming IMG_CLOSEINBETWEEN */
+        assert(img_jpg_ptr(p) == NULL);
+        break;
+    case IMAGE_TYPE_JBIG2:     /* todo: writejbig2.c cleanup */
+        break;
+    case IMAGE_TYPE_NONE:
+        break;
+    default:
+        assert(0);
+    }
     free_dict_strings(p);
-    if (img_type(p) == IMAGE_TYPE_PDF)
-        epdf_delete(p);
     assert(img_file(p) == NULL);
     xfree(p);
 }
@@ -405,7 +411,8 @@ void scale_img(image * img)
 
 void out_img(image * img, scaled hpos, scaled vpos)
 {
-    float a[7];                 /* transformation matrix (todo: indices should be reduced!) */
+    float a[6];                 /* transformation matrix */
+    float xoff, yoff, tmp;
     int r;                      /* number of digits after the decimal point */
     assert(img != 0);
     image_dict *idict = img_dict(img);
@@ -413,92 +420,94 @@ void out_img(image * img, scaled hpos, scaled vpos)
     scaled wd = img_width(img);
     scaled ht = img_height(img);
     scaled dp = img_depth(img);
+    if ((img_transform(img) & 1) == 1) {        /* 90 deg. or 270 deg. rotated */
+        if (ht == -dp)
+            pdftex_fail("image transform: division by zero (height == -depth)");
+        if (wd == 0)
+            pdftex_fail("image transform: division by zero (width == 0)");
+    }
+    a[1] = a[2] = 0;
     if (img_type(idict) == IMAGE_TYPE_PDF) {
-        a[1] = wd * 1.0e6 / img_xsize(idict);
-        a[2] = 0;
-        a[3] = 0;
-        a[4] = (ht + dp) * 1.0e6 / img_ysize(idict);
-        a[5] = hpos -
-            (float) wd *bp2int(img_pdf_orig_x(idict)) / img_xsize(idict);
-        a[6] = vpos -
-            (float) ht *bp2int(img_pdf_orig_y(idict)) / img_ysize(idict);
+        a[0] = 1.0e6 / img_xsize(idict);
+        a[3] = 1.0e6 / img_ysize(idict);
         r = 6;
     } else {
-        a[1] = wd * 1.0e6 / one_hundred_bp;
-        a[2] = 0;
-        a[3] = 0;
-        a[4] = (ht + dp) * 1.0e6 / one_hundred_bp;
-        a[5] = hpos;
-        a[6] = vpos;
+        a[3] = a[0] = 1.0e6 / one_hundred_bp;
         r = 4;
     }
-    if ((img_transform(img) & 1) == 1) {
-        if (ht == -dp)
-            pdftex_fail("image transform: division by zero (height == -depth)");
-        if (wd == 0)
-            pdftex_fail("image transform: division by zero (width == 0)");
+    xoff = (float) img_xorig(idict) / img_xsize(idict);
+    yoff = (float) img_yorig(idict) / img_ysize(idict);
+    if ((img_transform(img) & 7) > 3) { /* mirrored */
+        a[0] *= -1;
+        xoff *= -1;
     }
-    switch (img_transform(img) & 7) {
-    case 0:                    /* unrotated */
+    switch (img_transform(img) & 3) {
+    case 0:                    /* no transform */
         break;
     case 1:                    /* rot. 90 deg. (counterclockwise) */
-        a[2] = a[1] * (ht + dp) / wd;
-        a[1] = 0;
-        a[3] = -a[4] * wd / (ht + dp);
-        a[4] = 0;
-        a[5] += wd;
+        a[1] = a[0];
+        a[2] = -a[3];
+        a[3] = a[0] = 0;
+        tmp = yoff;
+        yoff = xoff;
+        xoff = -tmp;
         break;
-    case 2:                    /* rot. 180 deg. */
-        a[1] = -a[1];
-        a[4] = -a[4];
-        a[5] += wd;
-        a[6] += ht + dp;
+    case 2:                    /* rot. 180 deg. (counterclockwise) */
+        a[0] *= -1;
+        a[3] *= -1;
+        xoff *= -1;
+        yoff *= -1;
         break;
-    case 3:                    /* rot. 270 deg. */
-        a[2] = -a[1] * (ht + dp) / wd;
-        a[1] = 0;
-        a[3] = a[4] * wd / (ht + dp);
-        a[4] = 0;
-        a[6] += ht + dp;
+    case 3:                    /* rot. 270 deg. (counterclockwise) */
+        a[1] = -a[0];
+        a[2] = a[3];
+        a[3] = a[0] = 0;
+        tmp = yoff;
+        yoff = -xoff;
+        xoff = tmp;
         break;
+    default:;
+    }
+    xoff *= wd;
+    yoff *= ht + dp;
+    a[0] *= wd;
+    a[1] *= ht + dp;
+    a[2] *= wd;
+    a[3] *= ht + dp;
+    a[4] = hpos - xoff;
+    a[5] = vpos - yoff;
+    switch (img_transform(img) & 7) {
+    case 0:                    /* no transform */
+    case 7:                    /* mirrored, then rot. 270 deg. */
+        break;
+    case 1:                    /* rot. 90 deg. (counterclockwise) */
     case 4:                    /* mirrored, unrotated */
-        a[1] = -a[1];
-        a[5] += wd;
+        a[4] += wd;
         break;
+    case 2:                    /* rot. 180 deg. */
     case 5:                    /* mirrored, then rot. 90 deg. */
-        a[2] = -a[1] * (ht + dp) / wd;
-        a[1] = 0;
-        a[3] = -a[4] * wd / (ht + dp);
-        a[4] = 0;
-        a[5] += wd;
-        a[6] += ht + dp;
+        a[4] += wd;
+        a[5] += ht + dp;
         break;
+    case 3:                    /* rot. 270 deg. */
     case 6:                    /* mirrored, then rot. 180 deg. */
-        a[4] = -a[4];
-        a[6] += ht + dp;
+        a[5] += ht + dp;
         break;
-    case 7:                    /* mirrored, then rot. 270 deg. */
-        a[2] = a[1] * (ht + dp) / wd;
-        a[1] = 0;
-        a[3] = a[4] * wd / (ht + dp);
-        a[4] = 0;
-        break;
-    default:
-        assert(0);
+    default:;
     }
     pdf_end_text();
     pdf_printf("q\n");
+    pdf_print_real((integer) a[0], r);
+    pdfout(' ');
     pdf_print_real((integer) a[1], r);
     pdfout(' ');
     pdf_print_real((integer) a[2], r);
     pdfout(' ');
     pdf_print_real((integer) a[3], r);
     pdfout(' ');
-    pdf_print_real((integer) a[4], r);
+    pdf_print_bp((integer) a[4]);
     pdfout(' ');
     pdf_print_bp((integer) a[5]);
-    pdfout(' ');
-    pdf_print_bp((integer) a[6]);
     pdf_printf(" cm\n/Im");
     pdf_print_int(img_index(idict));
     pdf_print_resname_prefix();
@@ -621,12 +630,12 @@ integer image_colordepth(integer ref)
 
 integer epdf_orig_x(integer ref)
 {
-    return bp2int(img_pdf_orig_x(img_dict(img_array[ref])));
+    return img_xorig(img_dict(img_array[ref]));
 }
 
 integer epdf_orig_y(integer ref)
 {
-    return bp2int(img_pdf_orig_y(img_dict(img_array[ref])));
+    return img_yorig(img_dict(img_array[ref]));
 }
 
 integer image_objnum(integer ref)
@@ -659,8 +668,6 @@ void update_image_procset(integer ref)
     pdf_image_procset |= img_color(img_dict(img_array[ref]));
 }
 
-/**********************************************************************/
-
 boolean check_image_b(integer procset)
 {
     return procset & IMAGE_COLOR_B;
diff --git a/Build/source/texk/web2c/luatexdir/image/writejbig2.c b/Build/source/texk/web2c/luatexdir/image/writejbig2.c
index d50ed88c485..2d7d4560548 100644
--- a/Build/source/texk/web2c/luatexdir/image/writejbig2.c
+++ b/Build/source/texk/web2c/luatexdir/image/writejbig2.c
@@ -75,7 +75,7 @@ object exists, reference it. Else create fresh one.
 
 09 Dec. 2002: JBIG2 seg. page numbers > 0 are now set to 1, see PDF Ref.
 
-$Id: writejbig2.c 1027 2008-02-14 21:01:03Z hhenkel $
+$Id: writejbig2.c 1127 2008-03-25 21:32:54Z hhenkel $
 ***********************************************************************/
 
 #include "writejbig2.h"
@@ -705,6 +705,7 @@ void read_jbig2_info(image_dict * idict)
     if (pip == NULL)
         pdftex_fail("read_jbig2_info(): page %d not found in JBIG2 image file",
                     (int) img_pagenum(idict));
+    img_totalpages(idict) = fip->numofpages;
     img_xsize(idict) = pip->width;
     img_ysize(idict) = pip->height;
     img_xres(idict) = (int) (pip->xres * 0.0254 + 0.5);