]> 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 2b6d41597bc4a11fe2c2a4513956c9634d06ed91..6ba82a6dbbb61e40c2e471f5474f386b31d3094a 100644 (file)
 #ifdef HAVE_CAIRO_PS
 #include <cairo-ps.h>
 #endif
 #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-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-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-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"
 
 #include "ev-selection.h"
 #include "ev-transition-effect.h"
 #include "ev-attachment.h"
 #include "ev-image.h"
 
+#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
 #if (defined (HAVE_POPPLER_PAGE_RENDER)) && (defined (HAVE_CAIRO_PDF) || defined (HAVE_CAIRO_PS))
 #define HAVE_CAIRO_PRINT
 #endif
@@ -91,6 +100,7 @@ struct _PdfDocument
 
        PopplerDocument *document;
        gchar *password;
 
        PopplerDocument *document;
        gchar *password;
+       gboolean modified;
 
        PopplerFontInfo *font_info;
        PopplerFontsIter *fonts_iter;
 
        PopplerFontInfo *font_info;
        PopplerFontsIter *fonts_iter;
@@ -98,24 +108,31 @@ struct _PdfDocument
 
        PdfDocumentSearch *search;
        PdfPrintContext *print_ctx;
 
        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);
 
 static EvLinkDest *ev_link_dest_from_dest   (PdfDocument       *pdf_document,
                                             PopplerDest       *dest);
@@ -138,6 +155,14 @@ EV_BACKEND_REGISTER_WITH_CODE (PdfDocument, pdf_document,
                                                                 pdf_document_document_forms_iface_init);
                                 EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FONTS,
                                                                 pdf_document_document_fonts_iface_init);
                                                                 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,
                                 EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FIND,
                                                                 pdf_document_find_iface_init);
                                 EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER,
@@ -196,6 +221,11 @@ pdf_document_dispose (GObject *object)
                poppler_fonts_iter_free (pdf_document->fonts_iter);
        }
 
                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);
 }
 
        G_OBJECT_CLASS (pdf_document_parent_class)->dispose (object);
 }
 
@@ -228,12 +258,12 @@ convert_error (GError  *poppler_error,
                else if (poppler_error->code == POPPLER_ERROR_ENCRYPTED)
                        code = EV_DOCUMENT_ERROR_ENCRYPTED;
                        
                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);
        }
        } else {
                g_propagate_error (error, poppler_error);
        }
@@ -246,12 +276,18 @@ pdf_document_save (EvDocument  *document,
                   const char  *uri,
                   GError     **error)
 {
                   const char  *uri,
                   GError     **error)
 {
+       PdfDocument *pdf_document = PDF_DOCUMENT (document);
        gboolean retval;
        GError *poppler_error = NULL;
 
        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);
 
        if (! retval)
                convert_error (poppler_error, error);
 
@@ -451,14 +487,17 @@ pdf_page_render (PopplerPage     *page,
 
 #ifdef HAVE_POPPLER_PAGE_RENDER
        cairo_t *cr;
 
 #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);
                                              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);
        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);
        switch (rc->rotation) {
                case 90:
                        cairo_translate (cr, width, 0);
@@ -475,6 +514,13 @@ pdf_page_render (PopplerPage     *page,
        cairo_scale (cr, rc->scale, rc->scale);
        cairo_rotate (cr, rc->rotation * G_PI / 180.0);
        poppler_page_render (page, cr);
        cairo_scale (cr, rc->scale, rc->scale);
        cairo_rotate (cr, rc->rotation * G_PI / 180.0);
        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;
        cairo_destroy (cr);
 #else /* HAVE_POPPLER_PAGE_RENDER */
        GdkPixbuf *pixbuf;
@@ -543,6 +589,94 @@ pdf_document_set_password (EvDocumentSecurity *document_security,
        document->password = g_strdup (password);
 }
 
        document->password = g_strdup (password);
 }
 
+
+/* 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)
 {
 static EvDocumentInfo *
 pdf_document_get_info (EvDocument *document)
 {
@@ -552,6 +686,8 @@ pdf_document_get_info (EvDocument *document)
        PopplerViewerPreferences view_prefs;
        PopplerPermissions permissions;
        EvPage *page;
        PopplerViewerPreferences view_prefs;
        PopplerPermissions permissions;
        EvPage *page;
+       char *metadata;
+       char *fmt;
 
        info = g_new0 (EvDocumentInfo, 1);
 
 
        info = g_new0 (EvDocumentInfo, 1);
 
@@ -588,17 +724,32 @@ pdf_document_get_info (EvDocument *document)
                      "creation-date", &(info->creation_date),
                      "mod-date", &(info->modified_date),
                      "linearized", &(info->linearized),
                      "creation-date", &(info->creation_date),
                      "mod-date", &(info->modified_date),
                      "linearized", &(info->linearized),
+                     "metadata", &metadata,
                      NULL);
 
                      NULL);
 
-       page = ev_document_get_page (document, 0);
-       ev_document_get_page_size (document, page,
-                                  &(info->paper_width),
-                                  &(info->paper_height));
-       g_object_unref (page);
+       if (metadata != NULL) {
+               fmt = pdf_document_get_format_from_metadata(metadata);
+               if (fmt != NULL) {
+                       g_free (info->format);
+                       info->format = fmt;
+               }
+               g_free (metadata);
+       }
 
 
-       // Convert to mm.
-       info->paper_width = info->paper_width / 72.0f * 25.4f;
-       info->paper_height = info->paper_height / 72.0f * 25.4f;
+       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;
+       }
 
        switch (layout) {
                case POPPLER_PAGE_LAYOUT_SINGLE_PAGE:
 
        switch (layout) {
                case POPPLER_PAGE_LAYOUT_SINGLE_PAGE:
@@ -678,8 +829,6 @@ pdf_document_get_info (EvDocument *document)
                info->permissions |= EV_DOCUMENT_PERMISSIONS_OK_TO_ADD_NOTES;
        }
 
                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"));
        if (ev_document_security_has_document_security (EV_DOCUMENT_SECURITY (document))) {
                /* translators: this is the document security state */
                info->security = g_strdup (_("Yes"));
@@ -869,7 +1018,7 @@ 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,
                        poppler_page_get_size (poppler_page, NULL, &height);
                        ev_dest = ev_link_dest_new_xyz (dest->page_num - 1,
                                                        dest->left,
-                                                       height - dest->top,
+                                                       height - MIN (height, dest->top),
                                                        dest->zoom,
                                                        dest->change_left,
                                                        dest->change_top,
                                                        dest->zoom,
                                                        dest->change_left,
                                                        dest->change_top,
@@ -877,9 +1026,11 @@ ev_link_dest_from_dest (PdfDocument *pdf_document,
                        g_object_unref (poppler_page);
                }
                        break;
                        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;
                        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;
                case POPPLER_DEST_FITH: {
                        PopplerPage *poppler_page;
                        double height;
@@ -888,11 +1039,12 @@ 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,
                                                                  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;
                                                         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,
                case POPPLER_DEST_FITV:
                        ev_dest = ev_link_dest_new_fitv (dest->page_num - 1,
                                                         dest->left,
@@ -907,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,
                        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,
                                                         dest->right,
-                                                        height - dest->top);
+                                                        height - MIN (height, dest->top));
                        g_object_unref (poppler_page);
                }
                        break;
                        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;
                case POPPLER_DEST_NAMED:
                        ev_dest = ev_link_dest_new_named (dest->named_dest);
                        break;
@@ -1121,17 +1264,17 @@ pdf_document_links_get_links (EvDocumentLinks *document_links,
 
        for (list = mapping_list; list; list = list->next) {
                PopplerLinkMapping *link_mapping;
 
        for (list = mapping_list; list; list = list->next) {
                PopplerLinkMapping *link_mapping;
-               EvLinkMapping *ev_link_mapping;
+               EvMapping *ev_link_mapping;
 
                link_mapping = (PopplerLinkMapping *)list->data;
 
                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);
                                                             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 */
                /* 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);
        }
 
                retval = g_list_prepend (retval, ev_link_mapping);
        }
@@ -1186,17 +1329,17 @@ pdf_document_images_get_image_mapping (EvDocumentImages *document_images,
 
        for (list = mapping_list; list; list = list->next) {
                PopplerImageMapping *image_mapping;
 
        for (list = mapping_list; list; list = list->next) {
                PopplerImageMapping *image_mapping;
-               EvImageMapping *ev_image_mapping;
+               EvMapping *ev_image_mapping;
 
                image_mapping = (PopplerImageMapping *)list->data;
 
 
                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 (page, image_mapping->image_id);
-               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);
        }
 
                retval = g_list_prepend (retval, ev_image_mapping);
        }
@@ -1211,11 +1354,11 @@ GdkPixbuf *
 pdf_document_images_get_image (EvDocumentImages *document_images,
                               EvImage          *image)
 {
 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;
 #ifdef HAVE_POPPLER_PAGE_GET_IMAGE
        PdfDocument     *pdf_document;
        PopplerPage     *poppler_page;
        cairo_surface_t *surface;
-       GdkPixbuf       *retval = NULL;
 
        pdf_document = PDF_DOCUMENT (document_images);
        poppler_page = poppler_document_get_page (pdf_document->document,
 
        pdf_document = PDF_DOCUMENT (document_images);
        poppler_page = poppler_document_get_page (pdf_document->document,
@@ -1228,11 +1371,8 @@ pdf_document_images_get_image (EvDocumentImages *document_images,
        }
 
        g_object_unref (poppler_page);
        }
 
        g_object_unref (poppler_page);
-
+#endif
        return retval;
        return retval;
-#else
-       return GDK_PIXBUF (g_object_ref (ev_image_get_pixbuf (image)));
-#endif /* HAVE_POPPLER_PAGE_GET_IMAGE */
 }
 
 static void
 }
 
 static void
@@ -1243,15 +1383,13 @@ pdf_document_document_images_iface_init (EvDocumentImagesIface *iface)
 }
 
 static GdkPixbuf *
 }
 
 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;
 {
        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);
 #ifdef POPPLER_WITH_GDK
        pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
                                 width, height);
@@ -1285,9 +1423,13 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails
        PopplerPage *poppler_page;
        GdkPixbuf *pixbuf = NULL;
        GdkPixbuf *border_pixbuf;
        PopplerPage *poppler_page;
        GdkPixbuf *pixbuf = NULL;
        GdkPixbuf *border_pixbuf;
+       gint width, height;
 
        poppler_page = POPPLER_PAGE (rc->page->backend_page);
 
 
        poppler_page = POPPLER_PAGE (rc->page->backend_page);
 
+       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
 #ifdef POPPLER_WITH_GDK
        pixbuf = poppler_page_get_thumbnail_pixbuf (poppler_page);
 #else
@@ -1300,20 +1442,29 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails
        }
 #endif /* POPPLER_WITH_GDK */
 
        }
 #endif /* POPPLER_WITH_GDK */
 
-       if (pixbuf) {
-               /* Rotate provided thumbnail if needed */
-               GdkPixbuf *rotated_pixbuf;
+       if (pixbuf != NULL) {
+               int thumb_width = (rc->rotation == 90 || rc->rotation == 270) ?
+                       gdk_pixbuf_get_height (pixbuf) :
+                       gdk_pixbuf_get_width (pixbuf);
 
 
-               rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf,
-                                                          (GdkPixbufRotation) (360 - rc->rotation));
-               g_object_unref (pixbuf);
-               pixbuf = 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;
+               } else {
+                       /* The provided thumbnail has a different size */
+                       g_object_unref (pixbuf);
+                       pixbuf = make_thumbnail_for_page (poppler_page, rc, width, height);
+               }
        } else {
        } 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;
                border_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, pixbuf);
                g_object_unref (pixbuf);
                pixbuf = border_pixbuf;
@@ -1328,22 +1479,14 @@ pdf_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnail
                                        gint                 *width,
                                        gint                 *height)
 {
                                        gint                 *width,
                                        gint                 *height)
 {
-       PopplerPage *poppler_page;
-       gint has_thumb;
+       double page_width, page_height;
        
        
-       poppler_page = POPPLER_PAGE (rc->page->backend_page);
-
-       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;
 
        if (rc->rotation == 90 || rc->rotation == 270) {
                gint  temp;
 
@@ -1361,195 +1504,42 @@ pdf_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface)
 }
 
 
 }
 
 
-static gboolean
-pdf_document_search_idle_callback (void *data)
-{
-        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);
-
-       search->pages[search->search_page] = matches;
-       ev_document_find_changed (EV_DOCUMENT_FIND (pdf_document),
-                                 search->search_page);
-
-        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;
-        }
-
-        if (search->search_page != search->start_page) {
-               return TRUE;
-       }
-
-        /* 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;
-}
-
-static void
-pdf_document_find_begin (EvDocumentFind   *document,
-                        int               page,
-                         const char       *search_string,
-                         gboolean          case_sensitive)
-{
-        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);
-}
-
-static int
-pdf_document_find_get_n_results (EvDocumentFind *document_find, int page)
-{
-       PdfDocumentSearch *search = PDF_DOCUMENT (document_find)->search;
-
-       if (search) {
-               return g_list_length (search->pages[page]);
-       } else {
-               return 0;
-       }
-}
-
-static gboolean
-pdf_document_find_get_result (EvDocumentFind *document_find,
-                             int             page,
-                             int             n_result,
-                             EvRectangle    *rectangle)
+static GList *
+pdf_document_find_find_text (EvDocumentFind *document_find,
+                            EvPage         *page,
+                            const gchar    *text,
+                            gboolean        case_sensitive)
 {
 {
-       PdfDocument *pdf_document = PDF_DOCUMENT (document_find);
-       PdfDocumentSearch *search = pdf_document->search;
+       GList *matches, *l;
        PopplerPage *poppler_page;
        PopplerPage *poppler_page;
-       PopplerRectangle *r;
-       double height;
-
-       if (search == NULL)
-               return FALSE;
+       gdouble height;
+       
+       g_return_val_if_fail (POPPLER_IS_PAGE (page->backend_page), NULL);
+       g_return_val_if_fail (text != NULL, NULL);
 
 
-       r = (PopplerRectangle *) g_list_nth_data (search->pages[page],
-                                                 n_result);
-       if (r == NULL)
-               return FALSE;
+       poppler_page = POPPLER_PAGE (page->backend_page);
+       
+       matches = poppler_page_find_text (poppler_page, text);
+       if (!matches)
+               return NULL;
 
 
-       poppler_page = poppler_document_get_page (pdf_document->document, page);
        poppler_page_get_size (poppler_page, NULL, &height);
        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;
+       for (l = matches; l && l->data; l = g_list_next (l)) {
+               PopplerRectangle *rect = (PopplerRectangle *)l->data;
+               gdouble           tmp;
 
 
-       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;
+               tmp = rect->y1;
+               rect->y1 = height - rect->y2;
+               rect->y2 = height - tmp;
        }
        }
+       
+       return matches;
 }
 
 static void
 pdf_document_find_iface_init (EvDocumentFindIface *iface)
 {
 }
 
 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;
+        iface->find_text = pdf_document_find_find_text;
 }
 
 static void
 }
 
 static void
@@ -1818,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
                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
                EV_FILE_EXPORTER_CAN_NUMBER_UP |
 #endif
 #endif
-#endif
                
 #ifdef HAVE_CAIRO_PDF
 #ifdef HAVE_POPPLER_PAGE_RENDER
                
 #ifdef HAVE_CAIRO_PDF
 #ifdef HAVE_POPPLER_PAGE_RENDER
@@ -1843,6 +1831,25 @@ pdf_document_file_exporter_iface_init (EvFileExporterIface *iface)
        iface->get_capabilities = pdf_document_file_exporter_get_capabilities;
 }
 
        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,
 static void
 pdf_selection_render_selection (EvSelection      *selection,
                                EvRenderContext  *rc,
@@ -2230,7 +2237,7 @@ pdf_document_forms_get_form_fields (EvDocumentForms *document,
 
        for (list = fields; list; list = list->next) {
                PopplerFormFieldMapping *mapping;
 
        for (list = fields; list; list = list->next) {
                PopplerFormFieldMapping *mapping;
-               EvFormFieldMapping *field_mapping;
+               EvMapping *field_mapping;
                EvFormField *ev_field;
 
                mapping = (PopplerFormFieldMapping *)list->data;
                EvFormField *ev_field;
 
                mapping = (PopplerFormFieldMapping *)list->data;
@@ -2239,13 +2246,13 @@ pdf_document_forms_get_form_fields (EvDocumentForms *document,
                if (!ev_field)
                        continue;
 
                if (!ev_field)
                        continue;
 
-               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_field;
-               field_mapping->field->page = EV_PAGE (g_object_ref (page));
+               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_set_data_full (G_OBJECT (ev_field),
                                        "poppler-field",
@@ -2287,7 +2294,9 @@ pdf_document_forms_form_field_text_set_text (EvDocumentForms *document,
        poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));
        if (!poppler_field)
                return;
        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);
        poppler_form_field_text_set_text (poppler_field, text);
+       PDF_DOCUMENT (document)->modified = TRUE;
 }
 
 static void
 }
 
 static void
@@ -2302,6 +2311,7 @@ pdf_document_forms_form_field_button_set_state (EvDocumentForms *document,
                return;
        
        poppler_form_field_button_set_state (poppler_field, state);
                return;
        
        poppler_form_field_button_set_state (poppler_field, state);
+       PDF_DOCUMENT (document)->modified = TRUE;
 }
 
 static gboolean
 }
 
 static gboolean
@@ -2382,6 +2392,7 @@ pdf_document_forms_form_field_choice_select_item (EvDocumentForms *document,
                return;
 
        poppler_form_field_choice_select_item (poppler_field, index);
                return;
 
        poppler_form_field_choice_select_item (poppler_field, index);
+       PDF_DOCUMENT (document)->modified = TRUE;
 }
 
 static void
 }
 
 static void
@@ -2396,6 +2407,7 @@ pdf_document_forms_form_field_choice_toggle_item (EvDocumentForms *document,
                return;
 
        poppler_form_field_choice_toggle_item (poppler_field, index);
                return;
 
        poppler_form_field_choice_toggle_item (poppler_field, index);
+       PDF_DOCUMENT (document)->modified = TRUE;
 }
 
 static void
 }
 
 static void
@@ -2409,6 +2421,7 @@ pdf_document_forms_form_field_choice_unselect_all (EvDocumentForms *document,
                return;
        
        poppler_form_field_choice_unselect_all (poppler_field);
                return;
        
        poppler_form_field_choice_unselect_all (poppler_field);
+       PDF_DOCUMENT (document)->modified = TRUE;
 }
 
 static void
 }
 
 static void
@@ -2423,6 +2436,7 @@ pdf_document_forms_form_field_choice_set_text (EvDocumentForms *document,
                return;
        
        poppler_form_field_choice_set_text (poppler_field, text);
                return;
        
        poppler_form_field_choice_set_text (poppler_field, text);
+       PDF_DOCUMENT (document)->modified = TRUE;
 }
 
 static gchar *
 }
 
 static gchar *
@@ -2459,3 +2473,325 @@ pdf_document_document_forms_iface_init (EvDocumentFormsIface *iface)
        iface->form_field_choice_get_text = pdf_document_forms_form_field_choice_get_text;
 }
 
        iface->form_field_choice_get_text = pdf_document_forms_form_field_choice_get_text;
 }
 
+/* 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;
+}