]> www.fi.muni.cz Git - evince.git/blobdiff - backend/pdf/ev-poppler.cc
help: added Vietnamese manual
[evince.git] / backend / pdf / ev-poppler.cc
index cc6137b11be2d0bef8271aa4fec08084f47de800..6ba82a6dbbb61e40c2e471f5474f386b31d3094a 100644 (file)
 
 #include "config.h"
 
-#ifdef HAVE_POPPLER_FORM_FIELD_BUTTON_GET_BUTTON_TYPE
-#define HAVE_FORMS
-#endif
-
 #include <math.h>
 #include <string.h>
 #include <gtk/gtk.h>
 #ifdef HAVE_CAIRO_PS
 #include <cairo-ps.h>
 #endif
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "ev-poppler.h"
 #include "ev-file-exporter.h"
+#include "ev-mapping.h"
 #include "ev-document-find.h"
 #include "ev-document-misc.h"
 #include "ev-document-links.h"
 #include "ev-document-thumbnails.h"
 #include "ev-document-transition.h"
 #include "ev-document-forms.h"
+#include "ev-document-layers.h"
+#include "ev-document-print.h"
+#include "ev-document-annotations.h"
 #include "ev-selection.h"
+#include "ev-transition-effect.h"
 #include "ev-attachment.h"
 #include "ev-image.h"
 
-#if defined (HAVE_CAIRO_PDF) || defined (HAVE_CAIRO_PS)
+#include <libxml/tree.h>
+#include <libxml/parser.h>
+#include <libxml/xpath.h>
+#include <libxml/xpathInternals.h>
+
+#if (defined (HAVE_POPPLER_PAGE_RENDER)) && (defined (HAVE_CAIRO_PDF) || defined (HAVE_CAIRO_PS))
 #define HAVE_CAIRO_PRINT
 #endif
 
@@ -67,18 +73,19 @@ typedef struct {
 
 typedef struct {
        EvFileExporterFormat format;
-       PopplerPSFile *ps_file;
 
        /* Pages per sheet */
        gint pages_per_sheet;
        gint pages_printed;
        gint pages_x;
        gint pages_y;
-       gdouble page_width;
-       gdouble page_height;
+       gdouble paper_width;
+       gdouble paper_height;
        
 #ifdef HAVE_CAIRO_PRINT
        cairo_t *cr;
+#else
+       PopplerPSFile *ps_file;
 #endif
 } PdfPrintContext;
 
@@ -93,6 +100,7 @@ struct _PdfDocument
 
        PopplerDocument *document;
        gchar *password;
+       gboolean modified;
 
        PopplerFontInfo *font_info;
        PopplerFontsIter *fonts_iter;
@@ -100,24 +108,31 @@ struct _PdfDocument
 
        PdfDocumentSearch *search;
        PdfPrintContext *print_ctx;
+
+       GList *layers;
 };
 
-static void pdf_document_document_iface_init            (EvDocumentIface           *iface);
-static void pdf_document_security_iface_init            (EvDocumentSecurityIface   *iface);
-static void pdf_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface);
-static void pdf_document_document_links_iface_init      (EvDocumentLinksIface      *iface);
-static void pdf_document_document_images_iface_init     (EvDocumentImagesIface     *iface);
-static void pdf_document_document_forms_iface_init      (EvDocumentFormsIface      *iface);
-static void pdf_document_document_fonts_iface_init      (EvDocumentFontsIface      *iface);
-static void pdf_document_find_iface_init                (EvDocumentFindIface       *iface);
-static void pdf_document_file_exporter_iface_init       (EvFileExporterIface       *iface);
-static void pdf_selection_iface_init                    (EvSelectionIface          *iface);
-static void pdf_document_page_transition_iface_init     (EvDocumentTransitionIface *iface);
-static void pdf_document_thumbnails_get_dimensions      (EvDocumentThumbnails      *document_thumbnails,
-                                                        EvRenderContext           *rc,
-                                                        gint                      *width,
-                                                        gint                      *height);
-static int  pdf_document_get_n_pages                   (EvDocument                *document);
+static void pdf_document_document_iface_init             (EvDocumentIface            *iface);
+static void pdf_document_security_iface_init             (EvDocumentSecurityIface    *iface);
+static void pdf_document_document_thumbnails_iface_init  (EvDocumentThumbnailsIface  *iface);
+static void pdf_document_document_links_iface_init       (EvDocumentLinksIface       *iface);
+static void pdf_document_document_images_iface_init      (EvDocumentImagesIface      *iface);
+static void pdf_document_document_forms_iface_init       (EvDocumentFormsIface       *iface);
+static void pdf_document_document_fonts_iface_init       (EvDocumentFontsIface       *iface);
+static void pdf_document_document_layers_iface_init      (EvDocumentLayersIface      *iface);
+#ifdef HAVE_POPPLER_PAGE_RENDER
+static void pdf_document_document_print_iface_init       (EvDocumentPrintIface       *iface);
+#endif
+static void pdf_document_document_annotations_iface_init (EvDocumentAnnotationsIface *iface);
+static void pdf_document_find_iface_init                 (EvDocumentFindIface        *iface);
+static void pdf_document_file_exporter_iface_init        (EvFileExporterIface        *iface);
+static void pdf_selection_iface_init                     (EvSelectionIface           *iface);
+static void pdf_document_page_transition_iface_init      (EvDocumentTransitionIface  *iface);
+static void pdf_document_thumbnails_get_dimensions       (EvDocumentThumbnails       *document_thumbnails,
+                                                         EvRenderContext            *rc,
+                                                         gint                       *width,
+                                                         gint                       *height);
+static int  pdf_document_get_n_pages                    (EvDocument                 *document);
 
 static EvLinkDest *ev_link_dest_from_dest   (PdfDocument       *pdf_document,
                                             PopplerDest       *dest);
@@ -126,70 +141,37 @@ static EvLink     *ev_link_from_action      (PdfDocument       *pdf_document,
 static void        pdf_document_search_free (PdfDocumentSearch *search);
 static void        pdf_print_context_free   (PdfPrintContext   *ctx);
 
-#ifdef HAVE_FORMS
-G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
-                         {
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT,
-                                                       pdf_document_document_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_SECURITY,
-                                                       pdf_document_security_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
-                                                       pdf_document_document_thumbnails_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_LINKS,
-                                                       pdf_document_document_links_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_IMAGES,
-                                                       pdf_document_document_images_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FORMS,
-                                                       pdf_document_document_forms_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FONTS,
-                                                       pdf_document_document_fonts_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FIND,
-                                                       pdf_document_find_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER,
-                                                       pdf_document_file_exporter_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_SELECTION,
-                                                       pdf_selection_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_TRANSITION,
-                                                       pdf_document_page_transition_iface_init);
-                        });
-#else /* !HAVE_FORMS */
-G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
-                         {
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT,
-                                                       pdf_document_document_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_SECURITY,
-                                                       pdf_document_security_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
-                                                       pdf_document_document_thumbnails_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_LINKS,
-                                                       pdf_document_document_links_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_IMAGES,
-                                                       pdf_document_document_images_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FONTS,
-                                                       pdf_document_document_fonts_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FIND,
-                                                       pdf_document_find_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER,
-                                                       pdf_document_file_exporter_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_SELECTION,
-                                                       pdf_selection_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_TRANSITION,
-                                                       pdf_document_page_transition_iface_init);
+EV_BACKEND_REGISTER_WITH_CODE (PdfDocument, pdf_document,
+                        {
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_SECURITY,
+                                                                pdf_document_security_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
+                                                                pdf_document_document_thumbnails_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_LINKS,
+                                                                pdf_document_document_links_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_IMAGES,
+                                                                pdf_document_document_images_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FORMS,
+                                                                pdf_document_document_forms_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FONTS,
+                                                                pdf_document_document_fonts_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_LAYERS,
+                                                                pdf_document_document_layers_iface_init);
+#ifdef HAVE_POPPLER_PAGE_RENDER
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_PRINT,
+                                                                pdf_document_document_print_iface_init);
+#endif
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_ANNOTATIONS,
+                                                                pdf_document_document_annotations_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FIND,
+                                                                pdf_document_find_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER,
+                                                                pdf_document_file_exporter_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_SELECTION,
+                                                                pdf_selection_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_TRANSITION,
+                                                                pdf_document_page_transition_iface_init);
                         });
-#endif /* HAVE_FORMS */
-
-static void
-set_rc_data (PdfDocument     *pdf_document,
-            EvRenderContext *rc)
-{
-       if (rc->data == NULL) {
-               rc->data = poppler_document_get_page (pdf_document->document,
-                                                     rc->page);
-               rc->destroy = g_object_unref;
-       } else {
-               g_assert (rc->page == poppler_page_get_index (POPPLER_PAGE (rc->data)));
-       }
-}
 
 static void
 pdf_document_search_free (PdfDocumentSearch   *search)
@@ -239,6 +221,11 @@ pdf_document_dispose (GObject *object)
                poppler_fonts_iter_free (pdf_document->fonts_iter);
        }
 
+       if (pdf_document->layers) {
+               g_list_foreach (pdf_document->layers, (GFunc)g_object_unref, NULL);
+               g_list_free (pdf_document->layers);
+       }
+
        G_OBJECT_CLASS (pdf_document_parent_class)->dispose (object);
 }
 
@@ -271,12 +258,12 @@ convert_error (GError  *poppler_error,
                else if (poppler_error->code == POPPLER_ERROR_ENCRYPTED)
                        code = EV_DOCUMENT_ERROR_ENCRYPTED;
                        
+               g_set_error_literal (error,
+                                     EV_DOCUMENT_ERROR,
+                                     code,
+                                     poppler_error->message);
 
-               g_set_error (error,
-                            EV_DOCUMENT_ERROR,
-                            code,
-                            poppler_error->message,
-                            NULL);
+               g_error_free (poppler_error);
        } else {
                g_propagate_error (error, poppler_error);
        }
@@ -289,12 +276,18 @@ pdf_document_save (EvDocument  *document,
                   const char  *uri,
                   GError     **error)
 {
+       PdfDocument *pdf_document = PDF_DOCUMENT (document);
        gboolean retval;
        GError *poppler_error = NULL;
 
-       retval = poppler_document_save (PDF_DOCUMENT (document)->document,
-                                       uri,
-                                       &poppler_error);
+       if (pdf_document->modified) {
+               retval = poppler_document_save (pdf_document->document,
+                                               uri, &poppler_error);
+       } else {
+               retval = poppler_document_save_a_copy (pdf_document->document,
+                                                      uri, &poppler_error);
+       }
+                                                      
        if (! retval)
                convert_error (poppler_error, error);
 
@@ -326,35 +319,45 @@ pdf_document_get_n_pages (EvDocument *document)
        return poppler_document_get_n_pages (PDF_DOCUMENT (document)->document);
 }
 
-static void
-pdf_document_get_page_size (EvDocument   *document,
-                           int           page,
-                           double       *width,
-                           double       *height)
+static EvPage *
+pdf_document_get_page (EvDocument *document,
+                      gint        index)
 {
        PdfDocument *pdf_document = PDF_DOCUMENT (document);
        PopplerPage *poppler_page;
+       EvPage      *page;
 
-       poppler_page = poppler_document_get_page (pdf_document->document, page);
-       poppler_page_get_size (poppler_page, width, height);
+       poppler_page = poppler_document_get_page (pdf_document->document, index);
+       page = ev_page_new (index);
+       page->backend_page = (EvBackendPage)g_object_ref (poppler_page);
+       page->backend_destroy_func = (EvBackendPageDestroyFunc)g_object_unref;
        g_object_unref (poppler_page);
+
+       return page;
+}
+
+static void
+pdf_document_get_page_size (EvDocument *document,
+                           EvPage     *page,
+                           double     *width,
+                           double     *height)
+{
+       g_return_if_fail (POPPLER_IS_PAGE (page->backend_page));
+       
+       poppler_page_get_size (POPPLER_PAGE (page->backend_page), width, height);
 }
 
 static char *
 pdf_document_get_page_label (EvDocument *document,
-                            int         page)
+                            EvPage     *page)
 {
-       PopplerPage *poppler_page;
        char *label = NULL;
 
-       poppler_page = poppler_document_get_page (PDF_DOCUMENT (document)->document,
-                                                 page);
+       g_return_val_if_fail (POPPLER_IS_PAGE (page->backend_page), NULL);
 
-       g_object_get (G_OBJECT (poppler_page),
+       g_object_get (G_OBJECT (page->backend_page),
                      "label", &label,
                      NULL);
-       g_object_unref (poppler_page);
-
        return label;
 }
 
@@ -475,38 +478,26 @@ pdf_document_get_attachments (EvDocument *document)
 }
 
 static cairo_surface_t *
-pdf_document_render (EvDocument      *document,
-                    EvRenderContext *rc)
+pdf_page_render (PopplerPage     *page,
+                gint             width,
+                gint             height,
+                EvRenderContext *rc)
 {
-       PdfDocument *pdf_document;
        cairo_surface_t *surface;
-       double width_points, height_points;
-       gint width, height;
-
-       pdf_document = PDF_DOCUMENT (document);
-
-       set_rc_data (pdf_document, rc);
-
-       poppler_page_get_size (POPPLER_PAGE (rc->data), &width_points, &height_points);
-
-       if (rc->rotation == 90 || rc->rotation == 270) {
-               width = (int) ((height_points * rc->scale) + 0.5);
-               height = (int) ((width_points * rc->scale) + 0.5);
-       } else {
-               width = (int) ((width_points * rc->scale) + 0.5);
-               height = (int) ((height_points * rc->scale) + 0.5);
-       }
 
 #ifdef HAVE_POPPLER_PAGE_RENDER
        cairo_t *cr;
-       
-       surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24,
+       cairo_pattern_t *pattern;
+
+       surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
                                              width, height);
-       memset (cairo_image_surface_get_data (surface), 0xff,
-               cairo_image_surface_get_height (surface) *
-               cairo_image_surface_get_stride (surface));
-       
        cr = cairo_create (surface);
+
+       cairo_save (cr);
+       cairo_set_source_rgba (cr, 1., 1., 1., 0);
+       cairo_paint (cr);
+       cairo_restore (cr);
+
        switch (rc->rotation) {
                case 90:
                        cairo_translate (cr, width, 0);
@@ -522,7 +513,14 @@ pdf_document_render (EvDocument      *document,
        }
        cairo_scale (cr, rc->scale, rc->scale);
        cairo_rotate (cr, rc->rotation * G_PI / 180.0);
-       poppler_page_render (POPPLER_PAGE (rc->data), cr);
+       poppler_page_render (page, cr);
+
+       pattern = cairo_pattern_create_rgb (1., 1., 1.);
+       cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER);
+       cairo_set_source (cr, pattern);
+       cairo_paint (cr);
+
+       cairo_pattern_destroy (pattern);
        cairo_destroy (cr);
 #else /* HAVE_POPPLER_PAGE_RENDER */
        GdkPixbuf *pixbuf;
@@ -531,7 +529,7 @@ pdf_document_render (EvDocument      *document,
                                 FALSE, 8,
                                 width, height);
 
-       poppler_page_render_to_pixbuf (POPPLER_PAGE (rc->data),
+       poppler_page_render_to_pixbuf (page,
                                       0, 0,
                                       width, height,
                                       rc->scale,
@@ -541,7 +539,33 @@ pdf_document_render (EvDocument      *document,
        g_object_unref (pixbuf);
 #endif /* HAVE_POPPLER_PAGE_RENDER */
 
-       return surface;
+       return surface; 
+}
+
+static cairo_surface_t *
+pdf_document_render (EvDocument      *document,
+                    EvRenderContext *rc)
+{
+       PdfDocument *pdf_document;
+       PopplerPage *poppler_page;
+       double width_points, height_points;
+       gint width, height;
+
+       poppler_page = POPPLER_PAGE (rc->page->backend_page);
+
+       poppler_page_get_size (poppler_page,
+                              &width_points, &height_points);
+       
+       if (rc->rotation == 90 || rc->rotation == 270) {
+               width = (int) ((height_points * rc->scale) + 0.5);
+               height = (int) ((width_points * rc->scale) + 0.5);
+       } else {
+               width = (int) ((width_points * rc->scale) + 0.5);
+               height = (int) ((height_points * rc->scale) + 0.5);
+       }
+       
+       return pdf_page_render (poppler_page,
+                               width, height, rc);
 }
 
 /* EvDocumentSecurity */
@@ -565,12 +589,94 @@ pdf_document_set_password (EvDocumentSecurity *document_security,
        document->password = g_strdup (password);
 }
 
-static gboolean
-pdf_document_can_get_text (EvDocument *document)
-{
-       return TRUE;
+
+/* reference:
+http://www.pdfa.org/lib/exe/fetch.php?id=pdfa%3Aen%3Atechdoc&cache=cache&media=pdfa:techdoc:tn0001_pdfa-1_and_namespaces_2008-03-18.pdf */
+static char *
+pdf_document_get_format_from_metadata (const char *metadata)
+{
+       xmlDocPtr doc;
+       xmlXPathContextPtr xpathCtx;
+       xmlXPathObjectPtr xpathObj;
+       xmlChar *part = NULL;
+       xmlChar *conf = NULL;
+       char *result = NULL;
+       int i;
+
+       doc = xmlParseMemory (metadata, strlen (metadata));
+       if (doc == NULL)
+               return NULL;      /* invalid xml metadata */
+
+       xpathCtx = xmlXPathNewContext (doc);
+       if (xpathCtx == NULL) {
+               xmlFreeDoc (doc);
+               return NULL;      /* invalid xpath context */
+       }
+
+       /* add pdf/a namespaces */
+       xmlXPathRegisterNs (xpathCtx, BAD_CAST "x", BAD_CAST "adobe:ns:meta/");
+       xmlXPathRegisterNs (xpathCtx, BAD_CAST "rdf", BAD_CAST "http://www.w3.org/1999/02/22-rdf-syntax-ns#");
+       xmlXPathRegisterNs (xpathCtx, BAD_CAST "pdfaid", BAD_CAST "http://www.aiim.org/pdfa/ns/id/");
+
+       /* reads pdf/a part */
+       /* first syntax: child node */
+       xpathObj = xmlXPathEvalExpression (BAD_CAST "/x:xmpmeta/rdf:RDF/rdf:Description/pdfaid:part", xpathCtx);
+       if (xpathObj != NULL) {
+               if (xpathObj->nodesetval != NULL && xpathObj->nodesetval->nodeNr != 0)
+                       part = xmlNodeGetContent (xpathObj->nodesetval->nodeTab[0]);
+
+               xmlXPathFreeObject (xpathObj);
+       }
+       if (part == NULL) {
+               /* second syntax: attribute */
+               xpathObj = xmlXPathEvalExpression (BAD_CAST "/x:xmpmeta/rdf:RDF/rdf:Description/@pdfaid:part", xpathCtx);
+               if (xpathObj != NULL) {
+                       if (xpathObj->nodesetval != NULL && xpathObj->nodesetval->nodeNr != 0)
+                               part = xmlNodeGetContent (xpathObj->nodesetval->nodeTab[0]);
+
+                       xmlXPathFreeObject (xpathObj);
+               }
+       }
+
+       /* reads pdf/a conformance */
+       /* first syntax: child node */
+       xpathObj = xmlXPathEvalExpression (BAD_CAST "/x:xmpmeta/rdf:RDF/rdf:Description/pdfaid:conformance", xpathCtx);
+       if (xpathObj != NULL) {
+               if (xpathObj->nodesetval != NULL && xpathObj->nodesetval->nodeNr != 0)
+                       conf = xmlNodeGetContent (xpathObj->nodesetval->nodeTab[0]);
+
+               xmlXPathFreeObject (xpathObj);
+       }
+       if (conf == NULL) {
+               /* second syntax: attribute */
+               xpathObj = xmlXPathEvalExpression (BAD_CAST "/x:xmpmeta/rdf:RDF/rdf:Description/@pdfaid:conformance", xpathCtx);
+               if (xpathObj != NULL) {
+                       if (xpathObj->nodesetval != NULL && xpathObj->nodesetval->nodeNr != 0)
+                               conf = xmlNodeGetContent (xpathObj->nodesetval->nodeTab[0]);
+
+                       xmlXPathFreeObject (xpathObj);
+               }
+       }
+
+       if (part != NULL && conf != NULL) {
+               /* makes conf lowercase */
+               for (i = 0; conf[i]; i++)
+                       conf[i] = g_ascii_tolower (conf[i]);
+
+               /* return buffer */
+               result = g_strdup_printf ("PDF/A - %s%s", part, conf);
+       }
+
+       /* Cleanup */
+       xmlFree (part);
+       xmlFree (conf);
+       xmlXPathFreeContext (xpathCtx);
+       xmlFreeDoc (doc);
+
+       return result;
 }
 
+
 static EvDocumentInfo *
 pdf_document_get_info (EvDocument *document)
 {
@@ -579,6 +685,9 @@ pdf_document_get_info (EvDocument *document)
        PopplerPageMode mode;
        PopplerViewerPreferences view_prefs;
        PopplerPermissions permissions;
+       EvPage *page;
+       char *metadata;
+       char *fmt;
 
        info = g_new0 (EvDocumentInfo, 1);
 
@@ -615,15 +724,32 @@ pdf_document_get_info (EvDocument *document)
                      "creation-date", &(info->creation_date),
                      "mod-date", &(info->modified_date),
                      "linearized", &(info->linearized),
+                     "metadata", &metadata,
                      NULL);
 
-       pdf_document_get_page_size(document, 0,
-                                  &(info->paper_width),
-                                  &(info->paper_height));
+       if (metadata != NULL) {
+               fmt = pdf_document_get_format_from_metadata(metadata);
+               if (fmt != NULL) {
+                       g_free (info->format);
+                       info->format = fmt;
+               }
+               g_free (metadata);
+       }
+
+       info->n_pages = ev_document_get_n_pages (document);
+
+       if (info->n_pages > 0) {
+               page = ev_document_get_page (document, 0);
+               ev_document_get_page_size (document, page,
+                                          &(info->paper_width),
+                                          &(info->paper_height));
+               g_object_unref (page);
+               
 
-       // Convert to mm.
-       info->paper_width = info->paper_width / 72.0f * 25.4f;
-       info->paper_height = info->paper_height / 72.0f * 25.4f;
+               // Convert to mm.
+               info->paper_width = info->paper_width / 72.0f * 25.4f;
+               info->paper_height = info->paper_height / 72.0f * 25.4f;
+       }
 
        switch (layout) {
                case POPPLER_PAGE_LAYOUT_SINGLE_PAGE:
@@ -703,8 +829,6 @@ pdf_document_get_info (EvDocument *document)
                info->permissions |= EV_DOCUMENT_PERMISSIONS_OK_TO_ADD_NOTES;
        }
 
-       info->n_pages = ev_document_get_n_pages (document);
-
        if (ev_document_security_has_document_security (EV_DOCUMENT_SECURITY (document))) {
                /* translators: this is the document security state */
                info->security = g_strdup (_("Yes"));
@@ -716,44 +840,18 @@ pdf_document_get_info (EvDocument *document)
        return info;
 }
 
-static char *
-pdf_document_get_text (EvDocument *document, int page, EvRectangle *rect)
-{
-       PdfDocument *pdf_document = PDF_DOCUMENT (document);
-       PopplerPage *poppler_page;
-       PopplerRectangle r;
-       double height;
-       char *text;
-       
-       poppler_page = poppler_document_get_page (pdf_document->document, page);
-       g_return_val_if_fail (poppler_page != NULL, NULL);
-
-       poppler_page_get_size (poppler_page, NULL, &height);
-       r.x1 = rect->x1;
-       r.y1 = height - rect->y2;
-       r.x2 = rect->x2;
-       r.y2 = height - rect->y1;
-
-       text = poppler_page_get_text (poppler_page, &r);
-
-       g_object_unref (poppler_page);
-
-       return text;
-}
-
 static void
 pdf_document_document_iface_init (EvDocumentIface *iface)
 {
        iface->save = pdf_document_save;
        iface->load = pdf_document_load;
        iface->get_n_pages = pdf_document_get_n_pages;
+       iface->get_page = pdf_document_get_page;
        iface->get_page_size = pdf_document_get_page_size;
        iface->get_page_label = pdf_document_get_page_label;
        iface->has_attachments = pdf_document_has_attachments;
        iface->get_attachments = pdf_document_get_attachments;
        iface->render = pdf_document_render;
-       iface->get_text = pdf_document_get_text;
-       iface->can_get_text = pdf_document_can_get_text;
        iface->get_info = pdf_document_get_info;
 };
 
@@ -920,14 +1018,19 @@ ev_link_dest_from_dest (PdfDocument *pdf_document,
                        poppler_page_get_size (poppler_page, NULL, &height);
                        ev_dest = ev_link_dest_new_xyz (dest->page_num - 1,
                                                        dest->left,
-                                                       height - dest->top,
-                                                       dest->zoom);
+                                                       height - MIN (height, dest->top),
+                                                       dest->zoom,
+                                                       dest->change_left,
+                                                       dest->change_top,
+                                                       dest->change_zoom);
                        g_object_unref (poppler_page);
                }
                        break;
-               case POPPLER_DEST_FIT:
+               case POPPLER_DEST_FITB:
+               case POPPLER_DEST_FIT:
                        ev_dest = ev_link_dest_new_fit (dest->page_num - 1);
                        break;
+               case POPPLER_DEST_FITBH:
                case POPPLER_DEST_FITH: {
                        PopplerPage *poppler_page;
                        double height;
@@ -936,13 +1039,16 @@ ev_link_dest_from_dest (PdfDocument *pdf_document,
                                                                  MAX (0, dest->page_num - 1));
                        poppler_page_get_size (poppler_page, NULL, &height);
                        ev_dest = ev_link_dest_new_fith (dest->page_num - 1,
-                                                        height - dest->top);
+                                                        height - MIN (height, dest->top),
+                                                        dest->change_top);
                        g_object_unref (poppler_page);
                }
                        break;
+               case POPPLER_DEST_FITBV:
                case POPPLER_DEST_FITV:
                        ev_dest = ev_link_dest_new_fitv (dest->page_num - 1,
-                                                        dest->left);
+                                                        dest->left,
+                                                        dest->change_left);
                        break;
                case POPPLER_DEST_FITR: {
                        PopplerPage *poppler_page;
@@ -953,21 +1059,12 @@ ev_link_dest_from_dest (PdfDocument *pdf_document,
                        poppler_page_get_size (poppler_page, NULL, &height);
                        ev_dest = ev_link_dest_new_fitr (dest->page_num - 1,
                                                         dest->left,
-                                                        height - dest->bottom,
+                                                        height - MIN (height, dest->bottom),
                                                         dest->right,
-                                                        height - dest->top);
+                                                        height - MIN (height, dest->top));
                        g_object_unref (poppler_page);
                }
                        break;
-               case POPPLER_DEST_FITB:
-                       unimplemented_dest = "POPPLER_DEST_FITB";
-                       break;
-               case POPPLER_DEST_FITBH:
-                       unimplemented_dest = "POPPLER_DEST_FITBH";
-                       break;
-               case POPPLER_DEST_FITBV:
-                       unimplemented_dest = "POPPLER_DEST_FITBV";
-                       break;
                case POPPLER_DEST_NAMED:
                        ev_dest = ev_link_dest_new_named (dest->named_dest);
                        break;
@@ -977,7 +1074,7 @@ ev_link_dest_from_dest (PdfDocument *pdf_document,
        }
 
        if (unimplemented_dest) {
-               g_warning ("Unimplemented named action: %s, please post a "
+               g_warning ("Unimplemented destination: %s, please post a "
                           "bug report in Evince bugzilla "
                           "(http://bugzilla.gnome.org) with a testcase.",
                           unimplemented_dest);
@@ -998,6 +1095,8 @@ ev_link_from_action (PdfDocument   *pdf_document,
        const char   *unimplemented_action = NULL;
 
        switch (action->type) {
+               case POPPLER_ACTION_NONE:
+                       break;
                case POPPLER_ACTION_GOTO_DEST: {
                        EvLinkDest *dest;
                        
@@ -1032,8 +1131,9 @@ ev_link_from_action (PdfDocument   *pdf_document,
        }
        
        if (unimplemented_action) {
-               g_warning ("Unimplemented action: %s, please post a bug report with a testcase.",
-                          unimplemented_action);
+               g_warning ("Unimplemented action: %s, please post a bug report "
+                          "in Evince bugzilla (http://bugzilla.gnome.org) "
+                          "with a testcase.", unimplemented_action);
        }
        
        link = ev_link_new (action->any.title, ev_action);
@@ -1092,8 +1192,11 @@ build_tree (PdfDocument      *pdf_document,
                                break;
                }
                
-               if (!link) {
+               if (!link || strlen (ev_link_get_title (link)) <= 0) {
                        poppler_action_free (action);
+                       if (link)
+                               g_object_unref (link);
+                       
                        continue;
                }
 
@@ -1161,17 +1264,17 @@ pdf_document_links_get_links (EvDocumentLinks *document_links,
 
        for (list = mapping_list; list; list = list->next) {
                PopplerLinkMapping *link_mapping;
-               EvLinkMapping *ev_link_mapping;
+               EvMapping *ev_link_mapping;
 
                link_mapping = (PopplerLinkMapping *)list->data;
-               ev_link_mapping = g_new (EvLinkMapping, 1);
-               ev_link_mapping->link = ev_link_from_action (pdf_document,
+               ev_link_mapping = g_new (EvMapping, 1);
+               ev_link_mapping->data = ev_link_from_action (pdf_document,
                                                             link_mapping->action);
-               ev_link_mapping->x1 = link_mapping->area.x1;
-               ev_link_mapping->x2 = link_mapping->area.x2;
+               ev_link_mapping->area.x1 = link_mapping->area.x1;
+               ev_link_mapping->area.x2 = link_mapping->area.x2;
                /* Invert this for X-style coordinates */
-               ev_link_mapping->y1 = height - link_mapping->area.y2;
-               ev_link_mapping->y2 = height - link_mapping->area.y1;
+               ev_link_mapping->area.y1 = height - link_mapping->area.y2;
+               ev_link_mapping->area.y2 = height - link_mapping->area.y1;
 
                retval = g_list_prepend (retval, ev_link_mapping);
        }
@@ -1211,8 +1314,8 @@ pdf_document_document_links_iface_init (EvDocumentLinksIface *iface)
 }
 
 static GList *
-pdf_document_images_get_images (EvDocumentImages *document_images,
-                               gint              page)
+pdf_document_images_get_image_mapping (EvDocumentImages *document_images,
+                                      gint              page)
 {
        GList *retval = NULL;
        PdfDocument *pdf_document;
@@ -1226,17 +1329,17 @@ pdf_document_images_get_images (EvDocumentImages *document_images,
 
        for (list = mapping_list; list; list = list->next) {
                PopplerImageMapping *image_mapping;
-               EvImageMapping *ev_image_mapping;
+               EvMapping *ev_image_mapping;
 
                image_mapping = (PopplerImageMapping *)list->data;
 
-               ev_image_mapping = g_new (EvImageMapping, 1);
+               ev_image_mapping = g_new (EvMapping, 1);
                
-               ev_image_mapping->image = ev_image_new_from_pixbuf (image_mapping->image);
-               ev_image_mapping->x1 = image_mapping->area.x1;
-               ev_image_mapping->x2 = image_mapping->area.x2;
-               ev_image_mapping->y1 = image_mapping->area.y1;
-               ev_image_mapping->y2 = image_mapping->area.y2;
+               ev_image_mapping->data = ev_image_new (page, image_mapping->image_id);
+               ev_image_mapping->area.x1 = image_mapping->area.x1;
+               ev_image_mapping->area.y1 = image_mapping->area.y1;
+               ev_image_mapping->area.x2 = image_mapping->area.x2;
+               ev_image_mapping->area.y2 = image_mapping->area.y2;
 
                retval = g_list_prepend (retval, ev_image_mapping);
        }
@@ -1244,26 +1347,50 @@ pdf_document_images_get_images (EvDocumentImages *document_images,
        poppler_page_free_image_mapping (mapping_list);
        g_object_unref (poppler_page);
 
+       return g_list_reverse (retval);
+}
+
+GdkPixbuf *
+pdf_document_images_get_image (EvDocumentImages *document_images,
+                              EvImage          *image)
+{
+       GdkPixbuf       *retval = NULL;
+#ifdef HAVE_POPPLER_PAGE_GET_IMAGE
+       PdfDocument     *pdf_document;
+       PopplerPage     *poppler_page;
+       cairo_surface_t *surface;
+
+       pdf_document = PDF_DOCUMENT (document_images);
+       poppler_page = poppler_document_get_page (pdf_document->document,
+                                                 ev_image_get_page (image));
+
+       surface = poppler_page_get_image (poppler_page, ev_image_get_id (image));
+       if (surface) {
+               retval = ev_document_misc_pixbuf_from_surface (surface);
+               cairo_surface_destroy (surface);
+       }
+
+       g_object_unref (poppler_page);
+#endif
        return retval;
 }
 
 static void
 pdf_document_document_images_iface_init (EvDocumentImagesIface *iface)
 {
-       iface->get_images = pdf_document_images_get_images;
+       iface->get_image_mapping = pdf_document_images_get_image_mapping;
+       iface->get_image = pdf_document_images_get_image;
 }
 
 static GdkPixbuf *
-make_thumbnail_for_page (PdfDocument     *pdf_document,
-                        PopplerPage     *poppler_page, 
-                        EvRenderContext *rc)
+make_thumbnail_for_page (PopplerPage     *poppler_page,
+                        EvRenderContext *rc,
+                        gint             width,
+                        gint             height)
 {
        GdkPixbuf *pixbuf;
-       int width, height;
-
-       pdf_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (pdf_document),
-                                               rc, &width, &height);
 
+#ifdef POPPLER_WITH_GDK
        pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
                                 width, height);
        gdk_pixbuf_fill (pixbuf, 0xffffffff);
@@ -1273,6 +1400,16 @@ make_thumbnail_for_page (PdfDocument     *pdf_document,
                                       width, height,
                                       rc->scale, rc->rotation, pixbuf);
        ev_document_fc_mutex_unlock ();
+#else
+       cairo_surface_t *surface;
+
+       ev_document_fc_mutex_lock ();
+       surface = pdf_page_render (poppler_page, width, height, rc);
+       ev_document_fc_mutex_unlock ();
+       
+       pixbuf = ev_document_misc_pixbuf_from_surface (surface);
+       cairo_surface_destroy (surface);
+#endif /* POPPLER_WITH_GDK */
 
        return pixbuf;
 }
@@ -1282,38 +1419,57 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails
                                       EvRenderContext      *rc, 
                                       gboolean              border)
 {
-       PdfDocument *pdf_document;
+       PdfDocument *pdf_document = PDF_DOCUMENT (document_thumbnails);
        PopplerPage *poppler_page;
-       GdkPixbuf *pixbuf;
+       GdkPixbuf *pixbuf = NULL;
        GdkPixbuf *border_pixbuf;
+       gint width, height;
+
+       poppler_page = POPPLER_PAGE (rc->page->backend_page);
 
-       pdf_document = PDF_DOCUMENT (document_thumbnails);
+       pdf_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (pdf_document),
+                                               rc, &width, &height);
+       
+#ifdef POPPLER_WITH_GDK
+       pixbuf = poppler_page_get_thumbnail_pixbuf (poppler_page);
+#else
+       cairo_surface_t *surface;
+       
+       surface = poppler_page_get_thumbnail (poppler_page);
+       if (surface) {
+               pixbuf = ev_document_misc_pixbuf_from_surface (surface);
+               cairo_surface_destroy (surface);
+       }
+#endif /* POPPLER_WITH_GDK */
 
-       poppler_page = poppler_document_get_page (pdf_document->document, rc->page);
-       g_return_val_if_fail (poppler_page != NULL, NULL);
+       if (pixbuf != NULL) {
+               int thumb_width = (rc->rotation == 90 || rc->rotation == 270) ?
+                       gdk_pixbuf_get_height (pixbuf) :
+                       gdk_pixbuf_get_width (pixbuf);
 
-       pixbuf = poppler_page_get_thumbnail (poppler_page);
-       if (pixbuf) {
-               /* Rotate provided thumbnail if needed */
-               GdkPixbuf *rotated_pixbuf;
+               if (thumb_width == width) {
+                       GdkPixbuf *rotated_pixbuf;
 
-               rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf,
-                                                          (GdkPixbufRotation) (360 - rc->rotation));
-               g_object_unref (pixbuf);
-               pixbuf = rotated_pixbuf;
+                       rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf,
+                                                                  (GdkPixbufRotation) (360 - rc->rotation));
+                       g_object_unref (pixbuf);
+                       pixbuf = rotated_pixbuf;
+               } else {
+                       /* The provided thumbnail has a different size */
+                       g_object_unref (pixbuf);
+                       pixbuf = make_thumbnail_for_page (poppler_page, rc, width, height);
+               }
        } else {
-               /* There is no provided thumbnail.  We need to make one. */
-               pixbuf = make_thumbnail_for_page (pdf_document, poppler_page, rc);
+               /* There is no provided thumbnail. We need to make one. */
+               pixbuf = make_thumbnail_for_page (poppler_page, rc, width, height);
        }
 
-        if (border) {          
+        if (border && pixbuf) {
                border_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, pixbuf);
                g_object_unref (pixbuf);
                pixbuf = border_pixbuf;
        }               
 
-       g_object_unref (poppler_page);
-       
        return pixbuf;
 }
 
@@ -1323,26 +1479,14 @@ pdf_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnail
                                        gint                 *width,
                                        gint                 *height)
 {
-       PdfDocument *pdf_document;
-       PopplerPage *poppler_page;
-       gint has_thumb;
+       double page_width, page_height;
        
-       pdf_document = PDF_DOCUMENT (document_thumbnails);
-       poppler_page = poppler_document_get_page (pdf_document->document, rc->page);
-
-       g_return_if_fail (poppler_page != NULL);
-
-       has_thumb = poppler_page_get_thumbnail_size (poppler_page, width, height);
-
-       if (!has_thumb) {
-               double page_width, page_height;
-
-               poppler_page_get_size (poppler_page, &page_width, &page_height);
-
-               *width = (gint) MAX (page_width * rc->scale, 1);
-               *height = (gint) MAX (page_height * rc->scale, 1);
-       }
+       poppler_page_get_size (POPPLER_PAGE (rc->page->backend_page),
+                              &page_width, &page_height);
        
+       *width = MAX ((gint)(page_width * rc->scale + 0.5), 1);
+       *height = MAX ((gint)(page_height * rc->scale + 0.5), 1);
+
        if (rc->rotation == 90 || rc->rotation == 270) {
                gint  temp;
 
@@ -1350,8 +1494,6 @@ pdf_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnail
                *width = *height;
                *height = temp;
        }
-       
-       g_object_unref (poppler_page);
 }
 
 static void
@@ -1362,225 +1504,72 @@ pdf_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface)
 }
 
 
-static gboolean
-pdf_document_search_idle_callback (void *data)
+static GList *
+pdf_document_find_find_text (EvDocumentFind *document_find,
+                            EvPage         *page,
+                            const gchar    *text,
+                            gboolean        case_sensitive)
 {
-        PdfDocumentSearch *search = (PdfDocumentSearch*) data;
-        PdfDocument *pdf_document = search->document;
-        int n_pages;
-       GList *matches;
-       PopplerPage *page;
-
-       page = poppler_document_get_page (search->document->document,
-                                         search->search_page);
-
-       ev_document_doc_mutex_lock ();
-       matches = poppler_page_find_text (page, search->text);
-       ev_document_doc_mutex_unlock ();
-
-       g_object_unref (page);
+       GList *matches, *l;
+       PopplerPage *poppler_page;
+       gdouble height;
+       
+       g_return_val_if_fail (POPPLER_IS_PAGE (page->backend_page), NULL);
+       g_return_val_if_fail (text != NULL, NULL);
 
-       search->pages[search->search_page] = matches;
-       ev_document_find_changed (EV_DOCUMENT_FIND (pdf_document),
-                                 search->search_page);
+       poppler_page = POPPLER_PAGE (page->backend_page);
+       
+       matches = poppler_page_find_text (poppler_page, text);
+       if (!matches)
+               return NULL;
 
-        n_pages = pdf_document_get_n_pages (EV_DOCUMENT (search->document));
-        search->search_page += 1;
-        if (search->search_page == n_pages) {
-                /* wrap around */
-                search->search_page = 0;
-        }
+       poppler_page_get_size (poppler_page, NULL, &height);
+       for (l = matches; l && l->data; l = g_list_next (l)) {
+               PopplerRectangle *rect = (PopplerRectangle *)l->data;
+               gdouble           tmp;
 
-        if (search->search_page != search->start_page) {
-               return TRUE;
+               tmp = rect->y1;
+               rect->y1 = height - rect->y2;
+               rect->y2 = height - tmp;
        }
-
-        /* We're done. */
-        search->idle = 0; /* will return FALSE to remove */
-        return FALSE;
-}
-
-
-static PdfDocumentSearch *
-pdf_document_search_new (PdfDocument *pdf_document,
-                        int          start_page,
-                        const char  *text)
-{
-       PdfDocumentSearch *search;
-       int n_pages;
-       int i;
-
-       n_pages = pdf_document_get_n_pages (EV_DOCUMENT (pdf_document));
-
-        search = g_new0 (PdfDocumentSearch, 1);
-
-       search->text = g_strdup (text);
-        search->pages = g_new0 (GList *, n_pages);
-        search->document = pdf_document;
-
-        /* We add at low priority so the progress bar repaints */
-        search->idle = g_idle_add_full (G_PRIORITY_LOW,
-                                        pdf_document_search_idle_callback,
-                                        search,
-                                        NULL);
-
-        search->start_page = start_page;
-        search->search_page = start_page;
-
-       return search;
+       
+       return matches;
 }
 
 static void
-pdf_document_find_begin (EvDocumentFind   *document,
-                        int               page,
-                         const char       *search_string,
-                         gboolean          case_sensitive)
+pdf_document_find_iface_init (EvDocumentFindIface *iface)
 {
-        PdfDocument *pdf_document = PDF_DOCUMENT (document);
-
-        /* FIXME handle case_sensitive (right now XPDF
-         * code is always case insensitive for ASCII
-         * and case sensitive for all other languaages)
-         */
-
-       if (pdf_document->search &&
-           strcmp (search_string, pdf_document->search->text) == 0)
-                return;
-
-        if (pdf_document->search)
-                pdf_document_search_free (pdf_document->search);
-
-        pdf_document->search = pdf_document_search_new (pdf_document,
-                                                       page,
-                                                       search_string);
+        iface->find_text = pdf_document_find_find_text;
 }
 
-static int
-pdf_document_find_get_n_results (EvDocumentFind *document_find, int page)
+static void
+pdf_print_context_free (PdfPrintContext *ctx)
 {
-       PdfDocumentSearch *search = PDF_DOCUMENT (document_find)->search;
+       if (!ctx)
+               return;
 
-       if (search) {
-               return g_list_length (search->pages[page]);
-       } else {
-               return 0;
+#ifdef HAVE_CAIRO_PRINT
+       if (ctx->cr) {
+               cairo_destroy (ctx->cr);
+               ctx->cr = NULL;
+       }
+#else
+       if (ctx->ps_file) {
+               poppler_ps_file_free (ctx->ps_file);
+               ctx->ps_file = NULL;
        }
+#endif
+       g_free (ctx);
 }
 
-static gboolean
-pdf_document_find_get_result (EvDocumentFind *document_find,
-                             int             page,
-                             int             n_result,
-                             EvRectangle    *rectangle)
-{
-       PdfDocument *pdf_document = PDF_DOCUMENT (document_find);
-       PdfDocumentSearch *search = pdf_document->search;
-       PopplerPage *poppler_page;
-       PopplerRectangle *r;
-       double height;
-
-       if (search == NULL)
-               return FALSE;
-
-       r = (PopplerRectangle *) g_list_nth_data (search->pages[page],
-                                                 n_result);
-       if (r == NULL)
-               return FALSE;
-
-       poppler_page = poppler_document_get_page (pdf_document->document, page);
-       poppler_page_get_size (poppler_page, NULL, &height);
-       rectangle->x1 = r->x1;
-       rectangle->y1 = height - r->y2;
-       rectangle->x2 = r->x2;
-       rectangle->y2 = height - r->y1;
-       g_object_unref (poppler_page);
-               
-       return TRUE;
-}
-
-static int
-pdf_document_find_page_has_results (EvDocumentFind *document_find,
-                                   int             page)
-{
-       PdfDocumentSearch *search = PDF_DOCUMENT (document_find)->search;
-
-       return search && search->pages[page] != NULL;
-}
-
-static double
-pdf_document_find_get_progress (EvDocumentFind *document_find)
-{
-       PdfDocumentSearch *search;
-       int n_pages, pages_done;
-
-       search = PDF_DOCUMENT (document_find)->search;
-
-       if (search == NULL) {
-               return 0;
-       }
-
-       n_pages = pdf_document_get_n_pages (EV_DOCUMENT (document_find));
-       if (search->search_page > search->start_page) {
-               pages_done = search->search_page - search->start_page + 1;
-       } else if (search->search_page == search->start_page) {
-               pages_done = n_pages;
-       } else {
-               pages_done = n_pages - search->start_page + search->search_page;
-       }
-
-       return pages_done / (double) n_pages;
-}
-
-static void
-pdf_document_find_cancel (EvDocumentFind *document)
-{
-        PdfDocument *pdf_document = PDF_DOCUMENT (document);
-
-       if (pdf_document->search) {
-               pdf_document_search_free (pdf_document->search);
-               pdf_document->search = NULL;
-       }
-}
-
-static void
-pdf_document_find_iface_init (EvDocumentFindIface *iface)
-{
-        iface->begin = pdf_document_find_begin;
-       iface->get_n_results = pdf_document_find_get_n_results;
-       iface->get_result = pdf_document_find_get_result;
-       iface->page_has_results = pdf_document_find_page_has_results;
-       iface->get_progress = pdf_document_find_get_progress;
-        iface->cancel = pdf_document_find_cancel;
-}
-
-static void
-pdf_print_context_free (PdfPrintContext *ctx)
-{
-       if (!ctx)
-               return;
-
-       if (ctx->ps_file) {
-               poppler_ps_file_free (ctx->ps_file);
-               ctx->ps_file = NULL;
-       }
-#ifdef HAVE_CAIRO_PRINT
-       if (ctx->cr) {
-               cairo_destroy (ctx->cr);
-               ctx->cr = NULL;
-       }
-#endif
-       g_free (ctx);
-}
-
-static void
-pdf_document_file_exporter_begin (EvFileExporter        *exporter,
-                                 EvFileExporterContext *fc)
+static void
+pdf_document_file_exporter_begin (EvFileExporter        *exporter,
+                                 EvFileExporterContext *fc)
 {
        PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
        PdfPrintContext *ctx;
-       gdouble width, height;
-       gboolean landscape, change_orient = FALSE;
 #ifdef HAVE_CAIRO_PRINT
+       gdouble width, height;
        cairo_surface_t *surface = NULL;
 #endif
        
@@ -1589,9 +1578,12 @@ pdf_document_file_exporter_begin (EvFileExporter        *exporter,
        pdf_document->print_ctx = g_new0 (PdfPrintContext, 1);
        ctx = pdf_document->print_ctx;
        ctx->format = fc->format;
-       ctx->pages_per_sheet = fc->pages_per_sheet;
+       
+#ifdef HAVE_CAIRO_PRINT
+       ctx->pages_per_sheet = CLAMP (fc->pages_per_sheet, 1, 16);
 
-       landscape = (fc->orientation == EV_FILE_EXPORTER_LANDSCAPE);
+       ctx->paper_width = fc->paper_width;
+       ctx->paper_height = fc->paper_height;
        
        switch (fc->pages_per_sheet) {
                default:
@@ -1600,8 +1592,6 @@ pdf_document_file_exporter_begin (EvFileExporter        *exporter,
                        ctx->pages_y = 1;
                        break;
                case 2:
-                       change_orient = TRUE;
-                       landscape = !landscape;
                        ctx->pages_x = 1;
                        ctx->pages_y = 2;
                        break;
@@ -1610,8 +1600,6 @@ pdf_document_file_exporter_begin (EvFileExporter        *exporter,
                        ctx->pages_y = 2;
                        break;
                case 6:
-                       change_orient = TRUE;
-                       landscape = !landscape;
                        ctx->pages_x = 2;
                        ctx->pages_y = 3;
                        break;
@@ -1625,52 +1613,60 @@ pdf_document_file_exporter_begin (EvFileExporter        *exporter,
                        break;
        }
 
-       if (change_orient) {
-               width = fc->paper_height;
-               height = fc->paper_width;
-       } else {
-               width = fc->paper_width;
-               height = fc->paper_height;
-       }
-       
-       if (landscape) {
-               gint tmp;
-
-               tmp = ctx->pages_x;
-               ctx->pages_x = ctx->pages_y;
-               ctx->pages_y = tmp;
-       }
-       
-       ctx->page_width = width / ctx->pages_x;
-       ctx->page_height = height / ctx->pages_y;
-
        ctx->pages_printed = 0;
-
+       
        switch (fc->format) {
                case EV_FILE_FORMAT_PS:
 #ifdef HAVE_CAIRO_PS
-                       surface = cairo_ps_surface_create (fc->filename, width, height);
-#else
-                       ctx->ps_file = poppler_ps_file_new (pdf_document->document,
-                                                           fc->filename, fc->first_page,
-                                                           fc->last_page - fc->first_page + 1);
-                       poppler_ps_file_set_paper_size (ctx->ps_file, fc->paper_width, fc->paper_height);
-                       poppler_ps_file_set_duplex (ctx->ps_file, fc->duplex);
-#endif /* HAVE_CAIRO_PS */
+                       surface = cairo_ps_surface_create (fc->filename, fc->paper_width, fc->paper_height);
+#endif
                        break;
                case EV_FILE_FORMAT_PDF:
 #ifdef HAVE_CAIRO_PDF
-                       surface = cairo_pdf_surface_create (fc->filename, width, height);
+                       surface = cairo_pdf_surface_create (fc->filename, fc->paper_width, fc->paper_height);
 #endif
                        break;
                default:
                        g_assert_not_reached ();
        }
 
-#ifdef HAVE_CAIRO_PRINT
        ctx->cr = cairo_create (surface);
        cairo_surface_destroy (surface);
-#endif
+
+#else /* HAVE_CAIRO_PRINT */
+       if (ctx->format == EV_FILE_FORMAT_PS) {
+               ctx->ps_file = poppler_ps_file_new (pdf_document->document,
+                                                   fc->filename, fc->first_page,
+                                                   fc->last_page - fc->first_page + 1);
+               poppler_ps_file_set_paper_size (ctx->ps_file, fc->paper_width, fc->paper_height);
+               poppler_ps_file_set_duplex (ctx->ps_file, fc->duplex);
+       }
+#endif /* HAVE_CAIRO_PRINT */
+}
+
+static void
+pdf_document_file_exporter_begin_page (EvFileExporter *exporter)
+{
+       PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
+       PdfPrintContext *ctx = pdf_document->print_ctx;
+       
+       g_return_if_fail (pdf_document->print_ctx != NULL);
+
+       ctx->pages_printed = 0;
+       
+#ifdef HAVE_CAIRO_PRINT
+       if (ctx->paper_width > ctx->paper_height) {
+               if (ctx->format == EV_FILE_FORMAT_PS) {
+                       cairo_ps_surface_set_size (cairo_get_target (ctx->cr),
+                                                  ctx->paper_height,
+                                                  ctx->paper_width);
+               } else if (ctx->format == EV_FILE_FORMAT_PDF) {
+                       cairo_pdf_surface_set_size (cairo_get_target (ctx->cr),
+                                                   ctx->paper_height,
+                                                   ctx->paper_width);
+               }
+       }
+#endif /* HAVE_CAIRO_PRINT */
 }
 
 static void
@@ -1681,42 +1677,115 @@ pdf_document_file_exporter_do_page (EvFileExporter  *exporter,
        PdfPrintContext *ctx = pdf_document->print_ctx;
        PopplerPage *poppler_page;
 #ifdef HAVE_CAIRO_PRINT
-       gdouble page_width, page_height;
-       gint    x, y;
+       gdouble  page_width, page_height;
+       gint     x, y;
+       gboolean rotate;
+       gdouble  width, height;
+       gdouble  pwidth, pheight;
+       gdouble  xscale, yscale;
 #endif
 
        g_return_if_fail (pdf_document->print_ctx != NULL);
 
-       poppler_page = poppler_document_get_page (pdf_document->document, rc->page);
+       poppler_page = POPPLER_PAGE (rc->page->backend_page);
        
 #ifdef HAVE_CAIRO_PRINT
        x = (ctx->pages_printed % ctx->pages_per_sheet) % ctx->pages_x;
        y = (ctx->pages_printed % ctx->pages_per_sheet) / ctx->pages_x;
        poppler_page_get_size (poppler_page, &page_width, &page_height);
-       
+
+       if (page_width > page_height && page_width > ctx->paper_width) {
+               rotate = TRUE;
+       } else {
+               rotate = FALSE;
+       }
+
+       /* Use always portrait mode and rotate when necessary */
+       if (ctx->paper_width > ctx->paper_height) {
+               width = ctx->paper_height;
+               height = ctx->paper_width;
+               rotate = !rotate;
+       } else {
+               width = ctx->paper_width;
+               height = ctx->paper_height;
+       }
+
+       if (ctx->pages_per_sheet == 2 || ctx->pages_per_sheet == 6) {
+               rotate = !rotate;
+       }       
+
+       if (rotate) {
+               gint tmp1;
+               gdouble tmp2;
+
+               tmp1 = x;
+               x = y;
+               y = tmp1;
+
+               tmp2 = page_width;
+               page_width = page_height;
+               page_height = tmp2;
+       }
+
+       pwidth = width / ctx->pages_x;
+       pheight = height / ctx->pages_y;
+
+       if ((page_width > pwidth || page_height > pheight) ||
+           (page_width < pwidth && page_height < pheight)) {
+               xscale = pwidth / page_width;
+               yscale = pheight / page_height;
+               
+               if (yscale < xscale) {
+                       xscale = yscale;
+               } else {
+                       yscale = xscale;
+               }
+               
+       } else {        
+               xscale = yscale = 1;
+       }
+
+       /* TODO: center */
+
        cairo_save (ctx->cr);
+       if (rotate) {
+               cairo_matrix_t matrix;
+               
+               cairo_translate (ctx->cr, (2 * y + 1) * pwidth, 0);
+               cairo_matrix_init (&matrix,
+                                  0,  1,
+                                  -1,  0,
+                                  0,  0);
+               cairo_transform (ctx->cr, &matrix);
+       }
+       
        cairo_translate (ctx->cr,
-                        x * ctx->page_width,
-                        y * ctx->page_height);
-       cairo_scale (ctx->cr,
-                    ctx->page_width / page_width,
-                    ctx->page_height / page_height);
+                        x * (rotate ? pheight : pwidth),
+                        y * (rotate ? pwidth : pheight));
+       cairo_scale (ctx->cr, xscale, yscale);
+
+       poppler_page_render_for_printing (poppler_page, ctx->cr);
 
-#ifdef HAVE_POPPLER_PAGE_RENDER
-       poppler_page_render (poppler_page, ctx->cr);
-#endif
        ctx->pages_printed++;
                        
-       if (ctx->pages_printed % ctx->pages_per_sheet == 0) {
-               cairo_show_page (ctx->cr);
-       }
        cairo_restore (ctx->cr);
 #else /* HAVE_CAIRO_PRINT */
        if (ctx->format == EV_FILE_FORMAT_PS)
                poppler_page_render_to_ps (poppler_page, ctx->ps_file);
 #endif /* HAVE_CAIRO_PRINT */
+}
+
+static void
+pdf_document_file_exporter_end_page (EvFileExporter *exporter)
+{
+       PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
+       PdfPrintContext *ctx = pdf_document->print_ctx;
        
-       g_object_unref (poppler_page);
+       g_return_if_fail (pdf_document->print_ctx != NULL);
+
+#ifdef HAVE_CAIRO_PRINT
+       cairo_show_page (ctx->cr);
+#endif
 }
 
 static void
@@ -1739,11 +1808,9 @@ pdf_document_file_exporter_get_capabilities (EvFileExporter *exporter)
                EV_FILE_EXPORTER_CAN_SCALE |
 #ifdef HAVE_CAIRO_PRINT
 #ifdef HAVE_POPPLER_PAGE_RENDER
-#if GTK_CHECK_VERSION (2, 11, 1)
                EV_FILE_EXPORTER_CAN_NUMBER_UP |
 #endif
 #endif
-#endif
                
 #ifdef HAVE_CAIRO_PDF
 #ifdef HAVE_POPPLER_PAGE_RENDER
@@ -1757,35 +1824,64 @@ static void
 pdf_document_file_exporter_iface_init (EvFileExporterIface *iface)
 {
         iface->begin = pdf_document_file_exporter_begin;
+       iface->begin_page = pdf_document_file_exporter_begin_page;
         iface->do_page = pdf_document_file_exporter_do_page;
+       iface->end_page = pdf_document_file_exporter_end_page;
         iface->end = pdf_document_file_exporter_end;
        iface->get_capabilities = pdf_document_file_exporter_get_capabilities;
 }
 
+#ifdef HAVE_POPPLER_PAGE_RENDER
+/* EvDocumentPrint */
+static void
+pdf_document_print_print_page (EvDocumentPrint *document,
+                              EvPage          *page,
+                              cairo_t         *cr)
+{
+       PdfDocument *pdf_document = PDF_DOCUMENT (document);
+
+       poppler_page_render_for_printing (POPPLER_PAGE (page->backend_page), cr);
+}
+
+static void
+pdf_document_document_print_iface_init (EvDocumentPrintIface *iface)
+{
+       iface->print_page = pdf_document_print_print_page;
+}
+#endif /* HAVE_POPPLER_PAGE_RENDER */
+
 static void
 pdf_selection_render_selection (EvSelection      *selection,
                                EvRenderContext  *rc,
                                cairo_surface_t **surface,
                                EvRectangle      *points,
                                EvRectangle      *old_points,
+                               EvSelectionStyle  style,
                                GdkColor         *text,
                                GdkColor         *base)
 {
-       PdfDocument *pdf_document;
+       PopplerPage *poppler_page;
        double width_points, height_points;
        gint width, height;
 
-       pdf_document = PDF_DOCUMENT (selection);
-       set_rc_data (pdf_document, rc);
+       poppler_page = POPPLER_PAGE (rc->page->backend_page);
 
-       poppler_page_get_size (POPPLER_PAGE (rc->data),
+       poppler_page_get_size (poppler_page,
                               &width_points, &height_points);
        width = (int) ((width_points * rc->scale) + 0.5);
        height = (int) ((height_points * rc->scale) + 0.5);
 
-
 #ifdef HAVE_POPPLER_PAGE_RENDER
        cairo_t *cr;
+       PopplerColor text_color, base_color;
+       
+       text_color.red = text->red;
+       text_color.green = text->green;
+       text_color.blue = text->blue;
+
+       base_color.red = base->red;
+       base_color.green = base->green;
+       base_color.blue = base->blue;
 
        if (*surface == NULL) {
                *surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
@@ -1799,13 +1895,13 @@ pdf_selection_render_selection (EvSelection      *selection,
        memset (cairo_image_surface_get_data (*surface), 0x00,
                cairo_image_surface_get_height (*surface) *
                cairo_image_surface_get_stride (*surface));
-       poppler_page_render_selection (POPPLER_PAGE (rc->data),
+       poppler_page_render_selection (poppler_page,
                                       cr,
                                       (PopplerRectangle *)points,
                                       (PopplerRectangle *)old_points,
-                                      POPPLER_SELECTION_NORMAL, /* SelectionStyle */
-                                      text,
-                                      base);
+                                      (PopplerSelectionStyle)style,
+                                      &text_color,
+                                      &base_color);
        cairo_destroy (cr);
 #else /* HAVE_POPPLER_PAGE_RENDER */
        GdkPixbuf *pixbuf;
@@ -1814,11 +1910,11 @@ pdf_selection_render_selection (EvSelection      *selection,
                                 TRUE, 8,
                                 width, height);
 
-       poppler_page_render_selection_to_pixbuf (POPPLER_PAGE (rc->data),
+       poppler_page_render_selection_to_pixbuf (poppler_page,
                                                 rc->scale, rc->rotation, pixbuf,
                                                 (PopplerRectangle *)points,
                                                 (PopplerRectangle *)old_points,
-                                                POPPLER_SELECTION_NORMAL, /* SelectionStyle */
+                                                (PopplerSelectionStyle)style,
                                                 text,
                                                 base);
        if (*surface)
@@ -1828,22 +1924,77 @@ pdf_selection_render_selection (EvSelection      *selection,
 #endif /* HAVE_POPPLER_PAGE_RENDER */
 }
 
+static gchar *
+pdf_selection_get_selected_text (EvSelection     *selection,
+                                EvRenderContext *rc,
+                                EvSelectionStyle style,
+                                EvRectangle     *points)
+{
+       PopplerPage *poppler_page;
+       PopplerRectangle r;
+       double height;
+       char *retval;
+       
+       poppler_page = POPPLER_PAGE (rc->page->backend_page);
+
+       poppler_page_get_size (poppler_page, NULL, &height);
+       r.x1 = points->x1;
+       r.y1 = height - points->y2;
+       r.x2 = points->x2;
+       r.y2 = height - points->y1;
+
+       retval = poppler_page_get_text (poppler_page,
+                                       (PopplerSelectionStyle)style,
+                                       &r);
+
+       return retval;
+}
 
 static GdkRegion *
-pdf_selection_get_selection_region (EvSelection     *selection,
-                                   EvRenderContext *rc,
-                                   EvRectangle     *points)
+create_gdk_region_from_poppler_region (GList *region)
 {
-       PdfDocument *pdf_document;
+       GList *l;
        GdkRegion *retval;
+       
+       retval = gdk_region_new ();
+       
+       for (l = region; l; l = g_list_next (l)) {
+               PopplerRectangle *rectangle;
+               GdkRectangle      rect;
+               
+               rectangle = (PopplerRectangle *)l->data;
+               
+               rect.x = (gint) rectangle->x1;
+               rect.y = (gint) rectangle->y1;
+               rect.width  = (gint) (rectangle->x2 - rectangle->x1);
+               rect.height = (gint) (rectangle->y2 - rectangle->y1);
+               gdk_region_union_with_rect (retval, &rect);
+               
+               poppler_rectangle_free (rectangle);
+       }
 
-       pdf_document = PDF_DOCUMENT (selection);
+       return retval;
+}
 
-       set_rc_data (pdf_document, rc);
+static GdkRegion *
+pdf_selection_get_selection_region (EvSelection     *selection,
+                                   EvRenderContext *rc,
+                                   EvSelectionStyle style,
+                                   EvRectangle     *points)
+{
+       PopplerPage *poppler_page;
+       GdkRegion   *retval;
+       GList       *region;
 
-       retval = poppler_page_get_selection_region ((PopplerPage *)rc->data,
+       poppler_page = POPPLER_PAGE (rc->page->backend_page);
+       
+       region = poppler_page_get_selection_region (poppler_page,
                                                    rc->scale,
+                                                   (PopplerSelectionStyle)style,
                                                    (PopplerRectangle *) points);
+       retval = create_gdk_region_from_poppler_region (region);
+       g_list_free (region);
+       
        return retval;
 }
 
@@ -1851,20 +2002,22 @@ static GdkRegion *
 pdf_selection_get_selection_map (EvSelection     *selection,
                                 EvRenderContext *rc)
 {
-       PdfDocument *pdf_document;
        PopplerPage *poppler_page;
        PopplerRectangle points;
+       GList *region;
        GdkRegion *retval;
 
-       pdf_document = PDF_DOCUMENT (selection);
-       poppler_page = poppler_document_get_page (pdf_document->document,
-                                                 rc->page);
+       poppler_page = POPPLER_PAGE (rc->page->backend_page);
 
        points.x1 = 0.0;
        points.y1 = 0.0;
        poppler_page_get_size (poppler_page, &(points.x2), &(points.y2));
-       retval = poppler_page_get_selection_region (poppler_page, 1.0, &points);
-       g_object_unref (poppler_page);
+       
+       region = poppler_page_get_selection_region (poppler_page, 1.0,
+                                                   POPPLER_SELECTION_GLYPH,
+                                                   &points);
+       retval = create_gdk_region_from_poppler_region (region);
+       g_list_free (region);
 
        return retval;
 }
@@ -1873,6 +2026,7 @@ static void
 pdf_selection_iface_init (EvSelectionIface *iface)
 {
         iface->render_selection = pdf_selection_render_selection;
+       iface->get_selected_text = pdf_selection_get_selected_text;
         iface->get_selection_region = pdf_selection_get_selection_region;
         iface->get_selection_map = pdf_selection_get_selection_map;
 }
@@ -1897,16 +2051,49 @@ pdf_document_get_page_duration (EvDocumentTransition *trans,
        return duration;
 }
 
-static void
-pdf_document_page_transition_iface_init (EvDocumentTransitionIface *iface)
+static EvTransitionEffect *
+pdf_document_get_effect (EvDocumentTransition *trans,
+                        gint                  page)
 {
-       iface->get_page_duration = pdf_document_get_page_duration;
+       PdfDocument            *pdf_document;
+       PopplerPage            *poppler_page;
+       PopplerPageTransition  *page_transition;
+       EvTransitionEffect     *effect;
+
+       pdf_document = PDF_DOCUMENT (trans);
+       poppler_page = poppler_document_get_page (pdf_document->document, page);
+
+       if (!poppler_page)
+               return NULL;
+
+       page_transition = poppler_page_get_transition (poppler_page);
+
+       if (!page_transition) {
+               g_object_unref (poppler_page);
+               return NULL;
+       }
+
+       /* enums in PopplerPageTransition match the EvTransitionEffect ones */
+       effect = ev_transition_effect_new ((EvTransitionEffectType) page_transition->type,
+                                          "alignment", page_transition->alignment,
+                                          "direction", page_transition->direction,
+                                          "duration", page_transition->duration,
+                                          "angle", page_transition->angle,
+                                          "scale", page_transition->scale,
+                                          "rectangular", page_transition->rectangular,
+                                          NULL);
+
+       poppler_page_transition_free (page_transition);
+       g_object_unref (poppler_page);
+
+       return effect;
 }
 
-PdfDocument *
-pdf_document_new (void)
+static void
+pdf_document_page_transition_iface_init (EvDocumentTransitionIface *iface)
 {
-       return PDF_DOCUMENT (g_object_new (PDF_TYPE_DOCUMENT, NULL));
+       iface->get_page_duration = pdf_document_get_page_duration;
+       iface->get_effect = pdf_document_get_effect;
 }
 
 /* Forms */
@@ -1928,7 +2115,6 @@ pdf_document_get_crop_box (EvDocument  *document,
        rect->y2 = poppler_rect.y2;
 }
 
-#ifdef HAVE_FORMS
 static EvFormField *
 ev_form_field_from_poppler_field (PopplerFormField *poppler_field)
 {
@@ -1965,10 +2151,7 @@ ev_form_field_from_poppler_field (PopplerFormField *poppler_field)
                        field_text->do_scroll = poppler_form_field_text_do_scroll (poppler_field);
                        field_text->is_rich_text = poppler_form_field_text_is_rich_text (poppler_field);
                        field_text->is_password = poppler_form_field_text_is_password (poppler_field);
-                       
-#ifdef HAVE_POPPLER_FORM_FIELD_TEXT_GET_MAX_LEN
                        field_text->max_len = poppler_form_field_text_get_max_len (poppler_field);
-#endif
                        field_text->text = poppler_form_field_text_get_text (poppler_field);
 
                }
@@ -2027,7 +2210,7 @@ ev_form_field_from_poppler_field (PopplerFormField *poppler_field)
                        ev_field = ev_form_field_signature_new (id);
                        break;
                case POPPLER_FORM_FIELD_UNKNOWN:
-                       break;
+                       return NULL;
        }
 
        ev_field->font_size = font_size;
@@ -2038,39 +2221,48 @@ ev_form_field_from_poppler_field (PopplerFormField *poppler_field)
 
 static GList *
 pdf_document_forms_get_form_fields (EvDocumentForms *document, 
-                                   gint             page)
+                                   EvPage          *page)
 {
-       PdfDocument *pdf_document;
        PopplerPage *poppler_page;
        GList *retval = NULL;
        GList *fields;
        GList *list;
        double height;
-       
 
-       pdf_document = PDF_DOCUMENT (document);
-       poppler_page = poppler_document_get_page (pdf_document->document, page);
+       g_return_val_if_fail (POPPLER_IS_PAGE (page->backend_page), NULL);
+       
+       poppler_page = POPPLER_PAGE (page->backend_page);
        fields = poppler_page_get_form_field_mapping (poppler_page);
        poppler_page_get_size (poppler_page, NULL, &height);
 
        for (list = fields; list; list = list->next) {
                PopplerFormFieldMapping *mapping;
-               EvFormFieldMapping *field_mapping;
-               
+               EvMapping *field_mapping;
+               EvFormField *ev_field;
+
                mapping = (PopplerFormFieldMapping *)list->data;
 
-               field_mapping = g_new0 (EvFormFieldMapping, 1);
-               field_mapping->x1 = mapping->area.x1;
-               field_mapping->x2 = mapping->area.x2;
-               field_mapping->y1 = height - mapping->area.y2;
-               field_mapping->y2 = height - mapping->area.y1;
-               field_mapping->field = ev_form_field_from_poppler_field (mapping->field);
-               field_mapping->field->page = page;
+               ev_field = ev_form_field_from_poppler_field (mapping->field);
+               if (!ev_field)
+                       continue;
+
+               field_mapping = g_new0 (EvMapping, 1);
+               field_mapping->area.x1 = mapping->area.x1;
+               field_mapping->area.x2 = mapping->area.x2;
+               field_mapping->area.y1 = height - mapping->area.y2;
+               field_mapping->area.y2 = height - mapping->area.y1;
+               field_mapping->data = ev_field;
+               ev_field->page = EV_PAGE (g_object_ref (page));
+
+               g_object_set_data_full (G_OBJECT (ev_field),
+                                       "poppler-field",
+                                       g_object_ref (mapping->field),
+                                       (GDestroyNotify) g_object_unref);
                
                retval = g_list_prepend (retval, field_mapping);
        }
+       
        poppler_page_free_form_field_mapping (fields);
-       g_object_unref (poppler_page);
 
        return g_list_reverse (retval);
 }
@@ -2080,16 +2272,14 @@ pdf_document_forms_form_field_text_get_text (EvDocumentForms *document,
                                             EvFormField     *field)
        
 {
-       PdfDocument *pdf_document = PDF_DOCUMENT (document);
        PopplerFormField *poppler_field;
        gchar *text;
 
-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));
        if (!poppler_field)
                return NULL;
        
        text = poppler_form_field_text_get_text (poppler_field);
-       g_object_unref (poppler_field);
 
        return text;
 }
@@ -2099,14 +2289,14 @@ pdf_document_forms_form_field_text_set_text (EvDocumentForms *document,
                                             EvFormField     *field,
                                             const gchar     *text)
 {
-       PdfDocument *pdf_document = PDF_DOCUMENT (document);
        PopplerFormField *poppler_field;
 
-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));
        if (!poppler_field)
                return;
+       
        poppler_form_field_text_set_text (poppler_field, text);
-       g_object_unref (poppler_field);
+       PDF_DOCUMENT (document)->modified = TRUE;
 }
 
 static void
@@ -2114,31 +2304,28 @@ pdf_document_forms_form_field_button_set_state (EvDocumentForms *document,
                                                EvFormField     *field,
                                                gboolean         state)
 {
-       PdfDocument *pdf_document = PDF_DOCUMENT (document);
        PopplerFormField *poppler_field;
 
-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));
        if (!poppler_field)
                return;
        
        poppler_form_field_button_set_state (poppler_field, state);
-       g_object_unref (poppler_field);
+       PDF_DOCUMENT (document)->modified = TRUE;
 }
 
 static gboolean
 pdf_document_forms_form_field_button_get_state (EvDocumentForms *document, 
                                                EvFormField     *field)
 {
-       PdfDocument *pdf_document = PDF_DOCUMENT (document);
        PopplerFormField *poppler_field;
        gboolean state;
 
-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));
        if (!poppler_field)
                return FALSE;
 
        state = poppler_form_field_button_get_state (poppler_field);
-       g_object_unref (poppler_field);
 
        return state;
 }
@@ -2148,16 +2335,14 @@ pdf_document_forms_form_field_choice_get_item (EvDocumentForms *document,
                                               EvFormField     *field,
                                               gint             index)
 {
-       PdfDocument *pdf_document = PDF_DOCUMENT (document);
        PopplerFormField *poppler_field;
        gchar *text;
 
-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));
        if (!poppler_field)
                return NULL;
 
        text = poppler_form_field_choice_get_item (poppler_field, index);
-       g_object_unref (poppler_field);
 
        return text;
 }
@@ -2166,16 +2351,14 @@ static int
 pdf_document_forms_form_field_choice_get_n_items (EvDocumentForms *document, 
                                                  EvFormField     *field)
 {
-       PdfDocument *pdf_document = PDF_DOCUMENT (document);
        PopplerFormField *poppler_field;
        gint n_items;
 
-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));
        if (!poppler_field)
                return -1;
        
        n_items = poppler_form_field_choice_get_n_items (poppler_field);
-       g_object_unref (poppler_field);
 
        return n_items;
 }
@@ -2185,16 +2368,14 @@ pdf_document_forms_form_field_choice_is_item_selected (EvDocumentForms *document
                                                       EvFormField     *field,
                                                       gint             index)
 {
-       PdfDocument *pdf_document = PDF_DOCUMENT (document);
        PopplerFormField *poppler_field;
        gboolean selected;
 
-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));
        if (!poppler_field)
                return FALSE;
 
        selected = poppler_form_field_choice_is_item_selected (poppler_field, index);
-       g_object_unref (poppler_field);
 
        return selected;
 }
@@ -2204,15 +2385,14 @@ pdf_document_forms_form_field_choice_select_item (EvDocumentForms *document,
                                                  EvFormField     *field,
                                                  gint             index)
 {
-       PdfDocument *pdf_document = PDF_DOCUMENT (document);
        PopplerFormField *poppler_field;
 
-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));
        if (!poppler_field)
                return;
 
        poppler_form_field_choice_select_item (poppler_field, index);
-       g_object_unref (poppler_field);
+       PDF_DOCUMENT (document)->modified = TRUE;
 }
 
 static void
@@ -2220,30 +2400,28 @@ pdf_document_forms_form_field_choice_toggle_item (EvDocumentForms *document,
                                                  EvFormField     *field,
                                                  gint             index)
 {
-       PdfDocument *pdf_document = PDF_DOCUMENT (document);
        PopplerFormField *poppler_field;
 
-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));
        if (!poppler_field)
                return;
 
        poppler_form_field_choice_toggle_item (poppler_field, index);
-       g_object_unref (poppler_field);
+       PDF_DOCUMENT (document)->modified = TRUE;
 }
 
 static void
 pdf_document_forms_form_field_choice_unselect_all (EvDocumentForms *document, 
                                                   EvFormField     *field)
 {
-       PdfDocument *pdf_document = PDF_DOCUMENT (document);
        PopplerFormField *poppler_field;
 
-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));
        if (!poppler_field)
                return;
        
        poppler_form_field_choice_unselect_all (poppler_field);
-       g_object_unref (poppler_field);
+       PDF_DOCUMENT (document)->modified = TRUE;
 }
 
 static void
@@ -2251,31 +2429,28 @@ pdf_document_forms_form_field_choice_set_text (EvDocumentForms *document,
                                               EvFormField     *field,
                                               const gchar     *text)
 {
-       PdfDocument *pdf_document = PDF_DOCUMENT (document);
        PopplerFormField *poppler_field;
 
-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));
        if (!poppler_field)
                return;
        
        poppler_form_field_choice_set_text (poppler_field, text);
-       g_object_unref (poppler_field);
+       PDF_DOCUMENT (document)->modified = TRUE;
 }
 
 static gchar *
 pdf_document_forms_form_field_choice_get_text (EvDocumentForms *document,
                                               EvFormField     *field)
 {
-       PdfDocument *pdf_document = PDF_DOCUMENT (document);
        PopplerFormField *poppler_field;
        gchar *text;
 
-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));
        if (!poppler_field)
                return NULL;
 
        text = poppler_form_field_choice_get_text (poppler_field);
-       g_object_unref (poppler_field);
 
        return text;
 }
@@ -2297,4 +2472,326 @@ pdf_document_document_forms_iface_init (EvDocumentFormsIface *iface)
        iface->form_field_choice_set_text = pdf_document_forms_form_field_choice_set_text;
        iface->form_field_choice_get_text = pdf_document_forms_form_field_choice_get_text;
 }
-#endif /* HAVE_FORMS */
+
+/* Annotations */
+static void
+poppler_annot_color_to_gdk_color (PopplerAnnot *poppler_annot,
+                                 GdkColor     *color)
+{
+       PopplerColor *poppler_color;
+
+       poppler_color = poppler_annot_get_color (poppler_annot);
+       if (poppler_color) {
+               color->red = poppler_color->red;
+               color->green = poppler_color->green;
+               color->blue = poppler_color->blue;
+
+               g_free (poppler_color);
+       } /* TODO: else use a default color */
+}
+
+static EvAnnotation *
+ev_annot_from_poppler_annot (PopplerAnnot *poppler_annot,
+                            EvPage       *page)
+{
+       EvAnnotation *ev_annot = NULL;
+       const gchar  *unimplemented_annot = NULL;
+
+       switch (poppler_annot_get_annot_type (poppler_annot)) {
+               case POPPLER_ANNOT_TEXT:
+                       PopplerAnnotText *poppler_text;
+                       EvAnnotationText *ev_annot_text;
+
+                       poppler_text = POPPLER_ANNOT_TEXT (poppler_annot);
+
+                       ev_annot = ev_annotation_text_new (page);
+
+                       ev_annot_text = EV_ANNOTATION_TEXT (ev_annot);
+                       ev_annot_text->is_open = poppler_annot_text_get_is_open (poppler_text);
+
+                       break;
+               case POPPLER_ANNOT_LINK:
+               case POPPLER_ANNOT_WIDGET:
+                       /* Ignore link and widgets annots since they are already handled */
+                       break;
+               default: {
+                       GEnumValue *enum_value;
+
+                       enum_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (POPPLER_TYPE_ANNOT_TYPE),
+                                                      poppler_annot_get_annot_type (poppler_annot));
+                       unimplemented_annot = enum_value ? enum_value->value_name : "Unknown annotation";
+               }
+       }
+
+       if (unimplemented_annot) {
+               g_warning ("Unimplemented annotation: %s, please post a "
+                          "bug report in Evince bugzilla "
+                          "(http://bugzilla.gnome.org) with a testcase.",
+                          unimplemented_annot);
+       }
+
+       if (ev_annot) {
+               ev_annot->contents = poppler_annot_get_contents (poppler_annot);
+               ev_annot->name = poppler_annot_get_name (poppler_annot);
+               ev_annot->modified = poppler_annot_get_modified (poppler_annot);
+               poppler_annot_color_to_gdk_color (poppler_annot, &ev_annot->color);
+
+               if (POPPLER_IS_ANNOT_MARKUP (poppler_annot)) {
+                       PopplerAnnotMarkup *markup;
+                       gchar *label;
+                       gdouble opacity;
+                       PopplerRectangle poppler_rect;
+
+                       markup = POPPLER_ANNOT_MARKUP (poppler_annot);
+
+                       if (poppler_annot_markup_get_popup_rectangle (markup, &poppler_rect)) {
+                               EvRectangle ev_rect;
+                               gboolean is_open;
+                               gdouble height;
+
+                               poppler_page_get_size (POPPLER_PAGE (page->backend_page),
+                                                      NULL, &height);
+                               ev_rect.x1 = poppler_rect.x1;
+                               ev_rect.x2 = poppler_rect.x2;
+                               ev_rect.y1 = height - poppler_rect.y2;
+                               ev_rect.y2 = height - poppler_rect.y1;
+
+                               is_open = poppler_annot_markup_get_popup_is_open (markup);
+
+                               g_object_set (ev_annot,
+                                             "rectangle", &ev_rect,
+                                             "is_open", is_open,
+                                             "has_popup", TRUE,
+                                             NULL);
+                       } else {
+                               /* FIXME: Use poppler_annot_markup_has_popup() when
+                                * new poppler is released.
+                                */
+                               g_object_set (ev_annot,
+                                             "has_popup", FALSE,
+                                             NULL);
+                       }
+
+                       label = poppler_annot_markup_get_label (markup);
+                       opacity = poppler_annot_markup_get_opacity (markup);
+
+                       g_object_set (ev_annot,
+                                     "label", label,
+                                     "opacity", opacity,
+                                     NULL);
+
+                       g_free (label);
+               }
+       }
+
+       return ev_annot;
+}
+
+static GList *
+pdf_document_annotations_get_annotations (EvDocumentAnnotations *document_annotations,
+                                         EvPage                *page)
+{
+       GList *retval = NULL;
+       PdfDocument *pdf_document;
+       PopplerPage *poppler_page;
+       GList *annots;
+       GList *list;
+       gdouble height;
+       gint i = 0;
+
+       pdf_document = PDF_DOCUMENT (document_annotations);
+       poppler_page = POPPLER_PAGE (page->backend_page);
+       annots = poppler_page_get_annot_mapping (poppler_page);
+       poppler_page_get_size (poppler_page, NULL, &height);
+
+       for (list = annots; list; list = list->next) {
+               PopplerAnnotMapping *mapping;
+               EvMapping *annot_mapping;
+               EvAnnotation        *ev_annot;
+
+               mapping = (PopplerAnnotMapping *)list->data;
+
+               ev_annot = ev_annot_from_poppler_annot (mapping->annot, page);
+               if (!ev_annot)
+                       continue;
+
+               i++;
+
+               /* Make sure annot has a unique name */
+               if (!ev_annot->name)
+                       ev_annot->name = g_strdup_printf ("annot-%d-%d", page->index, i);
+
+               annot_mapping = g_new (EvMapping, 1);
+               annot_mapping->area.x1 = mapping->area.x1;
+               annot_mapping->area.x2 = mapping->area.x2;
+               annot_mapping->area.y1 = height - mapping->area.y2;
+               annot_mapping->area.y2 = height - mapping->area.y1;
+               annot_mapping->data = ev_annot;
+
+               g_object_set_data_full (G_OBJECT (ev_annot),
+                                       "poppler-annot",
+                                       g_object_ref (mapping->annot),
+                                       (GDestroyNotify) g_object_unref);
+
+               retval = g_list_prepend (retval, annot_mapping);
+       }
+
+       poppler_page_free_annot_mapping (annots);
+
+       return g_list_reverse (retval);
+}
+
+static void
+pdf_document_annotations_annotation_set_contents (EvDocumentAnnotations *document,
+                                                 EvAnnotation          *annot,
+                                                 const gchar           *contents)
+{
+       PopplerAnnot *poppler_annot;
+
+       poppler_annot = POPPLER_ANNOT (g_object_get_data (G_OBJECT (annot), "poppler-annot"));
+       if (!poppler_annot)
+               return;
+
+       poppler_annot_set_contents (poppler_annot, contents);
+       PDF_DOCUMENT (document)->modified = TRUE;
+}
+
+static void
+pdf_document_document_annotations_iface_init (EvDocumentAnnotationsIface *iface)
+{
+       iface->get_annotations = pdf_document_annotations_get_annotations;
+       iface->annotation_set_contents = pdf_document_annotations_annotation_set_contents;
+}
+
+/* Layers */
+static gboolean
+pdf_document_layers_has_layers (EvDocumentLayers *document)
+{
+       PdfDocument *pdf_document = PDF_DOCUMENT (document);
+       PopplerLayersIter *iter;
+
+       iter = poppler_layers_iter_new (pdf_document->document);
+       if (!iter)
+               return FALSE;
+       poppler_layers_iter_free (iter);
+
+       return TRUE;
+}
+
+static void
+build_layers_tree (PdfDocument       *pdf_document,
+                  GtkTreeModel      *model,
+                  GtkTreeIter       *parent,
+                  PopplerLayersIter *iter)
+{
+       do {
+               GtkTreeIter        tree_iter;
+               PopplerLayersIter *child;
+               PopplerLayer      *layer;
+               EvLayer           *ev_layer = NULL;
+               gboolean           visible;
+               gchar             *markup;
+               gint               rb_group = 0;
+
+               layer = poppler_layers_iter_get_layer (iter);
+               if (layer) {
+                       markup = g_markup_escape_text (poppler_layer_get_title (layer), -1);
+                       visible = poppler_layer_is_visible (layer);
+                       rb_group = poppler_layer_get_radio_button_group_id (layer);
+                       pdf_document->layers = g_list_append (pdf_document->layers,
+                                                             g_object_ref (layer));
+                       ev_layer = ev_layer_new (g_list_length (pdf_document->layers) - 1,
+                                                poppler_layer_is_parent (layer),
+                                                rb_group);
+               } else {
+                       gchar *title;
+
+                       title = poppler_layers_iter_get_title (iter);
+                       markup = g_markup_escape_text (title, -1);
+                       g_free (title);
+
+                       visible = FALSE;
+                       layer = NULL;
+               }
+
+               gtk_tree_store_append (GTK_TREE_STORE (model), &tree_iter, parent);
+               gtk_tree_store_set (GTK_TREE_STORE (model), &tree_iter,
+                                   EV_DOCUMENT_LAYERS_COLUMN_TITLE, markup,
+                                   EV_DOCUMENT_LAYERS_COLUMN_VISIBLE, visible,
+                                   EV_DOCUMENT_LAYERS_COLUMN_ENABLED, TRUE, /* FIXME */
+                                   EV_DOCUMENT_LAYERS_COLUMN_SHOWTOGGLE, (layer != NULL),
+                                   EV_DOCUMENT_LAYERS_COLUMN_RBGROUP, rb_group,
+                                   EV_DOCUMENT_LAYERS_COLUMN_LAYER, ev_layer,
+                                   -1);
+               if (ev_layer)
+                       g_object_unref (ev_layer);
+               g_free (markup);
+
+               child = poppler_layers_iter_get_child (iter);
+               if (child)
+                       build_layers_tree (pdf_document, model, &tree_iter, child);
+               poppler_layers_iter_free (child);
+       } while (poppler_layers_iter_next (iter));
+}
+
+static GtkTreeModel *
+pdf_document_layers_get_layers (EvDocumentLayers *document)
+{
+       GtkTreeModel *model = NULL;
+       PdfDocument *pdf_document = PDF_DOCUMENT (document);
+       PopplerLayersIter *iter;
+
+       iter = poppler_layers_iter_new (pdf_document->document);
+       if (iter) {
+               model = (GtkTreeModel *) gtk_tree_store_new (EV_DOCUMENT_LAYERS_N_COLUMNS,
+                                                            G_TYPE_STRING,  /* TITLE */
+                                                            G_TYPE_OBJECT,  /* LAYER */
+                                                            G_TYPE_BOOLEAN, /* VISIBLE */
+                                                            G_TYPE_BOOLEAN, /* ENABLED */
+                                                            G_TYPE_BOOLEAN, /* SHOWTOGGLE */
+                                                            G_TYPE_INT);    /* RBGROUP */
+               build_layers_tree (pdf_document, model, NULL, iter);
+               poppler_layers_iter_free (iter);
+       }
+       return model;
+}
+
+static void
+pdf_document_layers_show_layer (EvDocumentLayers *document,
+                               EvLayer          *layer)
+{
+       PdfDocument *pdf_document = PDF_DOCUMENT (document);
+       guint        layer_id = ev_layer_get_id (layer);
+
+       poppler_layer_show (POPPLER_LAYER (g_list_nth_data (pdf_document->layers, layer_id)));
+}
+
+static void
+pdf_document_layers_hide_layer (EvDocumentLayers *document,
+                               EvLayer          *layer)
+{
+       PdfDocument *pdf_document = PDF_DOCUMENT (document);
+       guint        layer_id = ev_layer_get_id (layer);
+
+       poppler_layer_hide (POPPLER_LAYER (g_list_nth_data (pdf_document->layers, layer_id)));
+}
+
+static gboolean
+pdf_document_layers_layer_is_visible (EvDocumentLayers *document,
+                                     EvLayer          *layer)
+{
+       PdfDocument *pdf_document = PDF_DOCUMENT (document);
+       guint        layer_id = ev_layer_get_id (layer);
+
+       return poppler_layer_is_visible (POPPLER_LAYER (g_list_nth_data (pdf_document->layers, layer_id)));
+}
+
+static void
+pdf_document_document_layers_iface_init (EvDocumentLayersIface *iface)
+{
+       iface->has_layers = pdf_document_layers_has_layers;
+       iface->get_layers = pdf_document_layers_get_layers;
+       iface->show_layer = pdf_document_layers_show_layer;
+       iface->hide_layer = pdf_document_layers_hide_layer;
+       iface->layer_is_visible = pdf_document_layers_layer_is_visible;
+}