]> www.fi.muni.cz Git - evince.git/blobdiff - backend/pdf/ev-poppler.cc
pdf: Support .pdf.xz files
[evince.git] / backend / pdf / ev-poppler.cc
index df5573bdd0892f4d3ff685acc2b79e293ca3612f..ced3ef79fb9284149dd9eb08726fdda7ed2a378d 100644 (file)
@@ -43,7 +43,6 @@
 #include "ev-document-images.h"
 #include "ev-document-fonts.h"
 #include "ev-document-security.h"
-#include "ev-document-thumbnails.h"
 #include "ev-document-transition.h"
 #include "ev-document-forms.h"
 #include "ev-document-layers.h"
@@ -101,7 +100,8 @@ struct _PdfDocument
 
        PopplerDocument *document;
        gchar *password;
-       gboolean modified;
+       gboolean forms_modified;
+       gboolean annots_modified;
 
        PopplerFontInfo *font_info;
        PopplerFontsIter *fonts_iter;
@@ -109,11 +109,10 @@ struct _PdfDocument
 
        PdfPrintContext *print_ctx;
 
-       GList *layers;
+       GHashTable *annots;
 };
 
 static void pdf_document_security_iface_init             (EvDocumentSecurityInterface    *iface);
-static void pdf_document_document_thumbnails_iface_init  (EvDocumentThumbnailsInterface  *iface);
 static void pdf_document_document_links_iface_init       (EvDocumentLinksInterface       *iface);
 static void pdf_document_document_images_iface_init      (EvDocumentImagesInterface      *iface);
 static void pdf_document_document_forms_iface_init       (EvDocumentFormsInterface       *iface);
@@ -127,10 +126,6 @@ static void pdf_document_file_exporter_iface_init        (EvFileExporterInterfac
 static void pdf_selection_iface_init                     (EvSelectionInterface           *iface);
 static void pdf_document_page_transition_iface_init      (EvDocumentTransitionInterface  *iface);
 static void pdf_document_text_iface_init                 (EvDocumentTextInterface        *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,
@@ -147,8 +142,6 @@ 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,
@@ -187,6 +180,11 @@ pdf_document_dispose (GObject *object)
                pdf_document->print_ctx = NULL;
        }
 
+       if (pdf_document->annots) {
+               g_hash_table_destroy (pdf_document->annots);
+               pdf_document->annots = NULL;
+       }
+
        if (pdf_document->document) {
                g_object_unref (pdf_document->document);
        }
@@ -199,11 +197,6 @@ 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);
 }
 
@@ -250,9 +243,13 @@ pdf_document_save (EvDocument  *document,
        gboolean retval;
        GError *poppler_error = NULL;
 
-       if (pdf_document->modified) {
+       if (pdf_document->forms_modified || pdf_document->annots_modified) {
                retval = poppler_document_save (pdf_document->document,
                                                uri, &poppler_error);
+               if (retval) {
+                       pdf_document->forms_modified = FALSE;
+                       pdf_document->annots_modified = FALSE;
+               }
        } else {
                retval = poppler_document_save_a_copy (pdf_document->document,
                                                       uri, &poppler_error);
@@ -396,6 +393,102 @@ pdf_document_render (EvDocument      *document,
                                width, height, rc);
 }
 
+static GdkPixbuf *
+make_thumbnail_for_page (PopplerPage     *poppler_page,
+                        EvRenderContext *rc,
+                        gint             width,
+                        gint             height)
+{
+       GdkPixbuf *pixbuf;
+
+#ifdef POPPLER_WITH_GDK
+       pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
+                                width, height);
+       gdk_pixbuf_fill (pixbuf, 0xffffffff);
+
+       ev_document_fc_mutex_lock ();
+       poppler_page_render_to_pixbuf (poppler_page, 0, 0,
+                                      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;
+}
+
+static GdkPixbuf *
+pdf_document_get_thumbnail (EvDocument      *document,
+                           EvRenderContext *rc)
+{
+       PdfDocument *pdf_document = PDF_DOCUMENT (document);
+       PopplerPage *poppler_page;
+       GdkPixbuf *pixbuf = NULL;
+       GdkPixbuf *border_pixbuf;
+       double page_width, page_height;
+       gint width, height;
+
+       poppler_page = POPPLER_PAGE (rc->page->backend_page);
+
+       poppler_page_get_size (poppler_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;
+
+               temp = width;
+               width = height;
+               height = temp;
+       }
+
+#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 */
+
+       if (pixbuf != NULL) {
+               int thumb_width = (rc->rotation == 90 || rc->rotation == 270) ?
+                       gdk_pixbuf_get_height (pixbuf) :
+                       gdk_pixbuf_get_width (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 {
+               /* There is no provided thumbnail. We need to make one. */
+               pixbuf = make_thumbnail_for_page (poppler_page, rc, width, height);
+       }
+
+       return pixbuf;
+}
+
 /* 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 *
@@ -629,6 +722,9 @@ pdf_document_get_info (EvDocument *document)
        PopplerPermissions permissions;
        EvPage *page;
        char *metadata;
+#ifdef HAVE_POPPLER_DOCUMENT_IS_LINEARIZED
+       gboolean linearized;
+#endif
 
        info = g_new0 (EvDocumentInfo, 1);
 
@@ -665,7 +761,11 @@ pdf_document_get_info (EvDocument *document)
                      "producer", &(info->producer),
                      "creation-date", &(info->creation_date),
                      "mod-date", &(info->modified_date),
+#ifdef HAVE_POPPLER_DOCUMENT_IS_LINEARIZED
+                     "linearized", &linearized,
+#else
                      "linearized", &(info->linearized),
+#endif
                      "metadata", &metadata,
                      NULL);
 
@@ -771,6 +871,10 @@ pdf_document_get_info (EvDocument *document)
                info->security = g_strdup (_("No"));
        }
 
+#ifdef HAVE_POPPLER_DOCUMENT_IS_LINEARIZED
+       info->linearized = linearized ? g_strdup (_("Yes")) : g_strdup (_("No"));
+#endif
+
        return info;
 }
 
@@ -818,6 +922,7 @@ pdf_document_class_init (PdfDocumentClass *klass)
        ev_document_class->get_page_size = pdf_document_get_page_size;
        ev_document_class->get_page_label = pdf_document_get_page_label;
        ev_document_class->render = pdf_document_render;
+       ev_document_class->get_thumbnail = pdf_document_get_thumbnail;
        ev_document_class->get_info = pdf_document_get_info;
        ev_document_class->get_backend_info = pdf_document_get_backend_info;
        ev_document_class->support_synctex = pdf_document_support_synctex;
@@ -1118,8 +1223,47 @@ ev_link_from_action (PdfDocument   *pdf_document,
                case POPPLER_ACTION_RENDITION:
                        unimplemented_action = "POPPLER_ACTION_RENDITION";
                        break;
-               case POPPLER_ACTION_OCG_STATE:
-                       unimplemented_action = "POPPLER_ACTION_OCG_STATE";
+               case POPPLER_ACTION_OCG_STATE: {
+                       GList *on_list = NULL;
+                       GList *off_list = NULL;
+                       GList *toggle_list = NULL;
+                       GList *l, *m;
+
+                       for (l = action->ocg_state.state_list; l; l = g_list_next (l)) {
+                               PopplerActionLayer *action_layer = (PopplerActionLayer *)l->data;
+
+                               for (m = action_layer->layers; m; m = g_list_next (m)) {
+                                       PopplerLayer *layer = (PopplerLayer *)m->data;
+                                       EvLayer      *ev_layer;
+
+                                       ev_layer = ev_layer_new (poppler_layer_is_parent (layer),
+                                                                poppler_layer_get_radio_button_group_id (layer));
+                                       g_object_set_data_full (G_OBJECT (ev_layer),
+                                                               "poppler-layer",
+                                                               g_object_ref (layer),
+                                                               (GDestroyNotify)g_object_unref);
+
+                                       switch (action_layer->action) {
+                                       case POPPLER_ACTION_LAYER_ON:
+                                               on_list = g_list_prepend (on_list, ev_layer);
+                                               break;
+                                       case POPPLER_ACTION_LAYER_OFF:
+                                               off_list = g_list_prepend (off_list, ev_layer);
+                                               break;
+                                       case POPPLER_ACTION_LAYER_TOGGLE:
+                                               toggle_list = g_list_prepend (toggle_list, ev_layer);
+                                               break;
+                                       }
+                               }
+                       }
+
+                       /* The action takes the ownership of the lists */
+                       ev_action = ev_link_action_new_layers_state (g_list_reverse (on_list),
+                                                                    g_list_reverse (off_list),
+                                                                    g_list_reverse (toggle_list));
+
+
+               }
                        break;
 #endif
                case POPPLER_ACTION_UNKNOWN:
@@ -1158,36 +1302,7 @@ build_tree (PdfDocument      *pdf_document,
                if (!action)
                        continue;
 
-               switch (action->type) {
-                       case POPPLER_ACTION_GOTO_DEST: {
-                               /* For bookmarks, solve named destinations */
-                               if (action->goto_dest.dest->type == POPPLER_DEST_NAMED) {
-                                       PopplerDest *dest;
-                                       EvLinkDest *ev_dest = NULL;
-                                       EvLinkAction *ev_action;
-                                       
-                                       dest = poppler_document_find_dest (pdf_document->document,
-                                                                          action->goto_dest.dest->named_dest);
-                                       if (!dest) {
-                                               link = ev_link_from_action (pdf_document, action);
-                                               break;
-                                       }
-                                       
-                                       ev_dest = ev_link_dest_from_dest (pdf_document, dest);
-                                       poppler_dest_free (dest);
-                                       
-                                       ev_action = ev_link_action_new_dest (ev_dest);
-                                       link = ev_link_new (action->any.title, ev_action);
-                               } else {
-                                       link = ev_link_from_action (pdf_document, action);
-                               }
-                       }
-                               break;
-                       default:
-                               link = ev_link_from_action (pdf_document, action);
-                               break;
-               }
-               
+               link = ev_link_from_action (pdf_document, action);
                if (!link || strlen (ev_link_get_title (link)) <= 0) {
                        poppler_action_free (action);
                        if (link)
@@ -1298,6 +1413,25 @@ pdf_document_links_find_link_dest (EvDocumentLinks  *document_links,
        return ev_dest;
 }
 
+static gint
+pdf_document_links_find_link_page (EvDocumentLinks  *document_links,
+                                  const gchar      *link_name)
+{
+       PdfDocument *pdf_document;
+       PopplerDest *dest;
+       gint         retval = -1;
+
+       pdf_document = PDF_DOCUMENT (document_links);
+       dest = poppler_document_find_dest (pdf_document->document,
+                                          link_name);
+       if (dest) {
+               retval = dest->page_num - 1;
+               poppler_dest_free (dest);
+       }
+
+       return retval;
+}
+
 static void
 pdf_document_document_links_iface_init (EvDocumentLinksInterface *iface)
 {
@@ -1305,6 +1439,7 @@ pdf_document_document_links_iface_init (EvDocumentLinksInterface *iface)
        iface->get_links_model = pdf_document_links_get_links_model;
        iface->get_links = pdf_document_links_get_links;
        iface->find_link_dest = pdf_document_links_find_link_dest;
+       iface->find_link_page = pdf_document_links_find_link_page;
 }
 
 static EvMappingList *
@@ -1374,128 +1509,6 @@ pdf_document_document_images_iface_init (EvDocumentImagesInterface *iface)
        iface->get_image = pdf_document_images_get_image;
 }
 
-static GdkPixbuf *
-make_thumbnail_for_page (PopplerPage     *poppler_page,
-                        EvRenderContext *rc,
-                        gint             width,
-                        gint             height)
-{
-       GdkPixbuf *pixbuf;
-
-#ifdef POPPLER_WITH_GDK
-       pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
-                                width, height);
-       gdk_pixbuf_fill (pixbuf, 0xffffffff);
-
-       ev_document_fc_mutex_lock ();
-       poppler_page_render_to_pixbuf (poppler_page, 0, 0,
-                                      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;
-}
-
-static GdkPixbuf *
-pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails,
-                                      EvRenderContext      *rc, 
-                                      gboolean              border)
-{
-       PdfDocument *pdf_document = PDF_DOCUMENT (document_thumbnails);
-       PopplerPage *poppler_page;
-       GdkPixbuf *pixbuf = NULL;
-       GdkPixbuf *border_pixbuf;
-       gint width, height;
-
-       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
-       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 */
-
-       if (pixbuf != NULL) {
-               int thumb_width = (rc->rotation == 90 || rc->rotation == 270) ?
-                       gdk_pixbuf_get_height (pixbuf) :
-                       gdk_pixbuf_get_width (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 {
-               /* There is no provided thumbnail. We need to make one. */
-               pixbuf = make_thumbnail_for_page (poppler_page, rc, width, height);
-       }
-
-        if (border && pixbuf) {
-               border_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, pixbuf);
-               g_object_unref (pixbuf);
-               pixbuf = border_pixbuf;
-       }               
-
-       return pixbuf;
-}
-
-static void
-pdf_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnails,
-                                       EvRenderContext      *rc,
-                                       gint                 *width,
-                                       gint                 *height)
-{
-       double page_width, page_height;
-       
-       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;
-
-               temp = *width;
-               *width = *height;
-               *height = temp;
-       }
-}
-
-static void
-pdf_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface)
-{
-       iface->get_thumbnail = pdf_document_thumbnails_get_thumbnail;
-       iface->get_dimensions = pdf_document_thumbnails_get_dimensions;
-}
-
-
 static GList *
 pdf_document_find_find_text (EvDocumentFind *document_find,
                             EvPage         *page,
@@ -2314,6 +2327,12 @@ pdf_document_forms_get_form_fields (EvDocumentForms *document,
                                             (GDestroyNotify)g_object_unref) : NULL;
 }
 
+static gboolean
+pdf_document_forms_document_is_modified (EvDocumentForms *document)
+{
+       return PDF_DOCUMENT (document)->forms_modified;
+}
+
 static gchar *
 pdf_document_forms_form_field_text_get_text (EvDocumentForms *document,
                                             EvFormField     *field)
@@ -2343,7 +2362,7 @@ pdf_document_forms_form_field_text_set_text (EvDocumentForms *document,
                return;
        
        poppler_form_field_text_set_text (poppler_field, text);
-       PDF_DOCUMENT (document)->modified = TRUE;
+       PDF_DOCUMENT (document)->forms_modified = TRUE;
 }
 
 static void
@@ -2358,7 +2377,7 @@ pdf_document_forms_form_field_button_set_state (EvDocumentForms *document,
                return;
        
        poppler_form_field_button_set_state (poppler_field, state);
-       PDF_DOCUMENT (document)->modified = TRUE;
+       PDF_DOCUMENT (document)->forms_modified = TRUE;
 }
 
 static gboolean
@@ -2439,7 +2458,7 @@ pdf_document_forms_form_field_choice_select_item (EvDocumentForms *document,
                return;
 
        poppler_form_field_choice_select_item (poppler_field, index);
-       PDF_DOCUMENT (document)->modified = TRUE;
+       PDF_DOCUMENT (document)->forms_modified = TRUE;
 }
 
 static void
@@ -2454,7 +2473,7 @@ pdf_document_forms_form_field_choice_toggle_item (EvDocumentForms *document,
                return;
 
        poppler_form_field_choice_toggle_item (poppler_field, index);
-       PDF_DOCUMENT (document)->modified = TRUE;
+       PDF_DOCUMENT (document)->forms_modified = TRUE;
 }
 
 static void
@@ -2468,7 +2487,7 @@ pdf_document_forms_form_field_choice_unselect_all (EvDocumentForms *document,
                return;
        
        poppler_form_field_choice_unselect_all (poppler_field);
-       PDF_DOCUMENT (document)->modified = TRUE;
+       PDF_DOCUMENT (document)->forms_modified = TRUE;
 }
 
 static void
@@ -2483,7 +2502,7 @@ pdf_document_forms_form_field_choice_set_text (EvDocumentForms *document,
                return;
        
        poppler_form_field_choice_set_text (poppler_field, text);
-       PDF_DOCUMENT (document)->modified = TRUE;
+       PDF_DOCUMENT (document)->forms_modified = TRUE;
 }
 
 static gchar *
@@ -2506,6 +2525,7 @@ static void
 pdf_document_document_forms_iface_init (EvDocumentFormsInterface *iface)
 {
        iface->get_form_fields = pdf_document_forms_get_form_fields;
+       iface->document_is_modified = pdf_document_forms_document_is_modified;
        iface->form_field_text_get_text = pdf_document_forms_form_field_text_get_text;
        iface->form_field_text_set_text = pdf_document_forms_form_field_text_set_text;
        iface->form_field_button_set_state = pdf_document_forms_form_field_button_set_state;
@@ -2537,6 +2557,77 @@ poppler_annot_color_to_gdk_color (PopplerAnnot *poppler_annot,
        } /* TODO: else use a default color */
 }
 
+static EvAnnotationTextIcon
+get_annot_text_icon (PopplerAnnotText *poppler_annot)
+{
+#ifdef HAVE_POPPLER_PAGE_ADD_ANNOT
+       gchar *icon = poppler_annot_text_get_icon (poppler_annot);
+       EvAnnotationTextIcon retval;
+
+       if (!icon)
+               return EV_ANNOTATION_TEXT_ICON_UNKNOWN;
+
+       if (strcmp (icon, POPPLER_ANNOT_TEXT_ICON_NOTE) == 0)
+               retval = EV_ANNOTATION_TEXT_ICON_NOTE;
+       else if (strcmp (icon, POPPLER_ANNOT_TEXT_ICON_COMMENT) == 0)
+               retval = EV_ANNOTATION_TEXT_ICON_COMMENT;
+       else if (strcmp (icon, POPPLER_ANNOT_TEXT_ICON_KEY) == 0)
+               retval = EV_ANNOTATION_TEXT_ICON_KEY;
+       else if (strcmp (icon, POPPLER_ANNOT_TEXT_ICON_HELP) == 0)
+               retval = EV_ANNOTATION_TEXT_ICON_HELP;
+       else if (strcmp (icon, POPPLER_ANNOT_TEXT_ICON_NEW_PARAGRAPH) == 0)
+               retval = EV_ANNOTATION_TEXT_ICON_NEW_PARAGRAPH;
+       else if (strcmp (icon, POPPLER_ANNOT_TEXT_ICON_PARAGRAPH) == 0)
+               retval = EV_ANNOTATION_TEXT_ICON_PARAGRAPH;
+       else if (strcmp (icon, POPPLER_ANNOT_TEXT_ICON_INSERT) == 0)
+               retval = EV_ANNOTATION_TEXT_ICON_INSERT;
+       else if (strcmp (icon, POPPLER_ANNOT_TEXT_ICON_CROSS) == 0)
+               retval = EV_ANNOTATION_TEXT_ICON_CROSS;
+       else if (strcmp (icon, POPPLER_ANNOT_TEXT_ICON_CIRCLE) == 0)
+               retval = EV_ANNOTATION_TEXT_ICON_CIRCLE;
+       else
+               retval = EV_ANNOTATION_TEXT_ICON_UNKNOWN;
+
+       g_free (icon);
+
+       return retval;
+#else
+       return EV_ANNOTATION_TEXT_ICON_UNKNOWN;
+#endif
+}
+
+static const gchar *
+get_poppler_annot_text_icon (EvAnnotationTextIcon icon)
+{
+#ifdef HAVE_POPPLER_PAGE_ADD_ANNOT
+       switch (icon) {
+       case EV_ANNOTATION_TEXT_ICON_NOTE:
+               return POPPLER_ANNOT_TEXT_ICON_NOTE;
+       case EV_ANNOTATION_TEXT_ICON_COMMENT:
+               return POPPLER_ANNOT_TEXT_ICON_COMMENT;
+       case EV_ANNOTATION_TEXT_ICON_KEY:
+               return POPPLER_ANNOT_TEXT_ICON_KEY;
+       case EV_ANNOTATION_TEXT_ICON_HELP:
+               return POPPLER_ANNOT_TEXT_ICON_HELP;
+       case EV_ANNOTATION_TEXT_ICON_NEW_PARAGRAPH:
+               return POPPLER_ANNOT_TEXT_ICON_NEW_PARAGRAPH;
+       case EV_ANNOTATION_TEXT_ICON_PARAGRAPH:
+               return POPPLER_ANNOT_TEXT_ICON_PARAGRAPH;
+       case EV_ANNOTATION_TEXT_ICON_INSERT:
+               return POPPLER_ANNOT_TEXT_ICON_INSERT;
+       case EV_ANNOTATION_TEXT_ICON_CROSS:
+               return POPPLER_ANNOT_TEXT_ICON_CROSS;
+       case EV_ANNOTATION_TEXT_ICON_CIRCLE:
+               return POPPLER_ANNOT_TEXT_ICON_CIRCLE;
+       case EV_ANNOTATION_TEXT_ICON_UNKNOWN:
+       default:
+               return POPPLER_ANNOT_TEXT_ICON_NOTE;
+       }
+#else
+       return "Note";
+#endif
+}
+
 static EvAnnotation *
 ev_annot_from_poppler_annot (PopplerAnnot *poppler_annot,
                             EvPage       *page)
@@ -2554,7 +2645,9 @@ ev_annot_from_poppler_annot (PopplerAnnot *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);
+                       ev_annotation_text_set_is_open (ev_annot_text,
+                                                       poppler_annot_text_get_is_open (poppler_text));
+                       ev_annotation_text_set_icon (ev_annot_text, get_annot_text_icon (poppler_text));
                }
                        break;
                case POPPLER_ANNOT_FILE_ATTACHMENT: {
@@ -2609,19 +2702,34 @@ ev_annot_from_poppler_annot (PopplerAnnot *poppler_annot,
        }
 
        if (ev_annot) {
-               time_t utime;
-               gchar *modified;
+               time_t   utime;
+               gchar   *modified;
+               gchar   *contents;
+               gchar   *name;
+               GdkColor color;
+
+               contents = poppler_annot_get_contents (poppler_annot);
+               if (contents) {
+                       ev_annotation_set_contents (ev_annot, contents);
+                       g_free (contents);
+               }
+
+               name = poppler_annot_get_name (poppler_annot);
+               if (name) {
+                       ev_annotation_set_name (ev_annot, name);
+                       g_free (name);
+               }
 
-               ev_annot->contents = poppler_annot_get_contents (poppler_annot);
-               ev_annot->name = poppler_annot_get_name (poppler_annot);
                modified = poppler_annot_get_modified (poppler_annot);
                if (poppler_date_parse (modified, &utime)) {
-                       ev_annot->modified = ev_document_misc_format_date (utime);
-                       g_free (modified);
+                       ev_annotation_set_modified_from_time (ev_annot, utime);
                } else {
-                       ev_annot->modified = modified;
+                       ev_annotation_set_modified (ev_annot, modified);
                }
-               poppler_annot_color_to_gdk_color (poppler_annot, &ev_annot->color);
+               g_free (modified);
+
+               poppler_annot_color_to_gdk_color (poppler_annot, &color);
+               ev_annotation_set_color (ev_annot, &color);
 
                if (POPPLER_IS_ANNOT_MARKUP (poppler_annot)) {
                        PopplerAnnotMarkup *markup;
@@ -2647,13 +2755,10 @@ ev_annot_from_poppler_annot (PopplerAnnot *poppler_annot,
 
                                g_object_set (ev_annot,
                                              "rectangle", &ev_rect,
-                                             "is_open", is_open,
+                                             "popup_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);
@@ -2681,6 +2786,7 @@ pdf_document_annotations_get_annotations (EvDocumentAnnotations *document_annota
        GList *retval = NULL;
        PdfDocument *pdf_document;
        PopplerPage *poppler_page;
+       EvMappingList *mapping_list;
        GList *annots;
        GList *list;
        gdouble height;
@@ -2688,12 +2794,20 @@ pdf_document_annotations_get_annotations (EvDocumentAnnotations *document_annota
 
        pdf_document = PDF_DOCUMENT (document_annotations);
        poppler_page = POPPLER_PAGE (page->backend_page);
+
+       if (pdf_document->annots) {
+               mapping_list = (EvMappingList *)g_hash_table_lookup (pdf_document->annots,
+                                                                    GINT_TO_POINTER (page->index));
+               if (mapping_list)
+                       return ev_mapping_list_ref (mapping_list);
+       }
+
        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;
+               EvMapping           *annot_mapping;
                EvAnnotation        *ev_annot;
 
                mapping = (PopplerAnnotMapping *)list->data;
@@ -2705,8 +2819,12 @@ pdf_document_annotations_get_annotations (EvDocumentAnnotations *document_annota
                i++;
 
                /* Make sure annot has a unique name */
-               if (!ev_annot->name)
-                       ev_annot->name = g_strdup_printf ("annot-%d-%d", page->index, i);
+               if (!ev_annotation_get_name (ev_annot)) {
+                       gchar *name = g_strdup_printf ("annot-%d-%d", page->index, i);
+
+                       ev_annotation_set_name (ev_annot, name);
+                       g_free (name);
+               }
 
                annot_mapping = g_new (EvMapping, 1);
                annot_mapping->area.x1 = mapping->area.x1;
@@ -2725,13 +2843,139 @@ pdf_document_annotations_get_annotations (EvDocumentAnnotations *document_annota
 
        poppler_page_free_annot_mapping (annots);
 
-       return ev_mapping_list_new (page->index, g_list_reverse (retval), (GDestroyNotify)g_object_unref);
+       if (!retval)
+               return NULL;
+
+       if (!pdf_document->annots) {
+               pdf_document->annots = g_hash_table_new_full (g_direct_hash,
+                                                             g_direct_equal,
+                                                             (GDestroyNotify)NULL,
+                                                             (GDestroyNotify)ev_mapping_list_unref);
+       }
+
+       mapping_list = ev_mapping_list_new (page->index, g_list_reverse (retval), (GDestroyNotify)g_object_unref);
+       g_hash_table_insert (pdf_document->annots,
+                            GINT_TO_POINTER (page->index),
+                            ev_mapping_list_ref (mapping_list));
+
+       return mapping_list;
 }
 
+static gboolean
+pdf_document_annotations_document_is_modified (EvDocumentAnnotations *document_annotations)
+{
+       return PDF_DOCUMENT (document_annotations)->annots_modified;
+}
+
+#ifdef HAVE_POPPLER_PAGE_ADD_ANNOT
+static void
+pdf_document_annotations_add_annotation (EvDocumentAnnotations *document_annotations,
+                                        EvAnnotation          *annot,
+                                        EvRectangle           *rect)
+{
+       PopplerAnnot    *poppler_annot;
+       PdfDocument     *pdf_document;
+       EvPage          *page;
+       PopplerPage     *poppler_page;
+       GList           *list = NULL;
+       EvMappingList   *mapping_list;
+       EvMapping       *annot_mapping;
+       PopplerRectangle poppler_rect;
+       gdouble          height;
+       PopplerColor     poppler_color;
+       GdkColor         color;
+       time_t           utime;
+       gchar           *modified;
+       gchar           *name;
+
+       pdf_document = PDF_DOCUMENT (document_annotations);
+       page = ev_annotation_get_page (annot);
+       poppler_page = POPPLER_PAGE (page->backend_page);
+
+       poppler_page_get_size (poppler_page, NULL, &height);
+       poppler_rect.x1 = rect->x1;
+       poppler_rect.x2 = rect->x2;
+       poppler_rect.y1 = height - rect->y2;
+       poppler_rect.y2 = height - rect->y1;
+       poppler_annot = poppler_annot_text_new (pdf_document->document, &poppler_rect);
+
+       ev_annotation_get_color (annot, &color);
+       poppler_color.red = color.red;
+       poppler_color.green = color.green;
+       poppler_color.blue = color.blue;
+       poppler_annot_set_color (poppler_annot, &poppler_color);
+
+       if (EV_IS_ANNOTATION_MARKUP (annot)) {
+               EvAnnotationMarkup *markup = EV_ANNOTATION_MARKUP (annot);
+               const gchar *label;
+
+               if (ev_annotation_markup_has_popup (markup)) {
+                       EvRectangle popup_rect;
+
+                       ev_annotation_markup_get_rectangle (markup, &popup_rect);
+                       poppler_rect.x1 = popup_rect.x1;
+                       poppler_rect.x2 = popup_rect.x2;
+                       poppler_rect.y1 = height - popup_rect.y2;
+                       poppler_rect.y2 = height - popup_rect.y1;
+                       poppler_annot_markup_set_popup (POPPLER_ANNOT_MARKUP (poppler_annot), &poppler_rect);
+                       poppler_annot_markup_set_popup_is_open (POPPLER_ANNOT_MARKUP (poppler_annot),
+                                                               ev_annotation_markup_get_popup_is_open (markup));
+               }
+
+               label = ev_annotation_markup_get_label (markup);
+               if (label)
+                       poppler_annot_markup_set_label (POPPLER_ANNOT_MARKUP (poppler_annot), label);
+       }
+
+       if (EV_IS_ANNOTATION_TEXT (annot)) {
+               EvAnnotationText    *text = EV_ANNOTATION_TEXT (annot);
+               EvAnnotationTextIcon icon;
+
+               icon = ev_annotation_text_get_icon (text);
+               poppler_annot_text_set_icon (POPPLER_ANNOT_TEXT (poppler_annot),
+                                            get_poppler_annot_text_icon (icon));
+       }
+       poppler_page_add_annot (poppler_page, poppler_annot);
+
+       annot_mapping = g_new (EvMapping, 1);
+       annot_mapping->area = *rect;
+       annot_mapping->data = annot;
+       g_object_set_data_full (G_OBJECT (annot),
+                               "poppler-annot",
+                               g_object_ref (poppler_annot),
+                               (GDestroyNotify) g_object_unref);
+
+       if (pdf_document->annots) {
+               mapping_list = (EvMappingList *)g_hash_table_lookup (pdf_document->annots,
+                                                                    GINT_TO_POINTER (page->index));
+               list = ev_mapping_list_get_list (mapping_list);
+               name = g_strdup_printf ("annot-%d-%d", page->index, g_list_length (list) + 1);
+               ev_annotation_set_name (annot, name);
+               g_free (name);
+               list = g_list_append (list, annot_mapping);
+       } else {
+               pdf_document->annots = g_hash_table_new_full (g_direct_hash,
+                                                             g_direct_equal,
+                                                             (GDestroyNotify)NULL,
+                                                             (GDestroyNotify)ev_mapping_list_unref);
+               name = g_strdup_printf ("annot-%d-0", page->index);
+               ev_annotation_set_name (annot, name);
+               g_free (name);
+               list = g_list_append (list, annot_mapping);
+               mapping_list = ev_mapping_list_new (page->index, list, (GDestroyNotify)g_object_unref);
+               g_hash_table_insert (pdf_document->annots,
+                                    GINT_TO_POINTER (page->index),
+                                    ev_mapping_list_ref (mapping_list));
+       }
+
+       pdf_document->annots_modified = TRUE;
+}
+#endif /* HAVE_POPPLER_PAGE_ADD_ANNOT */
+
 static void
-pdf_document_annotations_annotation_set_contents (EvDocumentAnnotations *document,
-                                                 EvAnnotation          *annot,
-                                                 const gchar           *contents)
+pdf_document_annotations_save_annotation (EvDocumentAnnotations *document_annotations,
+                                         EvAnnotation          *annot,
+                                         EvAnnotationsSaveMask  mask)
 {
        PopplerAnnot *poppler_annot;
 
@@ -2739,15 +2983,62 @@ pdf_document_annotations_annotation_set_contents (EvDocumentAnnotations *documen
        if (!poppler_annot)
                return;
 
-       poppler_annot_set_contents (poppler_annot, contents);
-       PDF_DOCUMENT (document)->modified = TRUE;
+       if (mask & EV_ANNOTATIONS_SAVE_CONTENTS)
+               poppler_annot_set_contents (poppler_annot,
+                                           ev_annotation_get_contents (annot));
+
+#ifdef HAVE_POPPLER_PAGE_ADD_ANNOT
+       if (mask & EV_ANNOTATIONS_SAVE_COLOR) {
+               PopplerColor color;
+               GdkColor     ev_color;
+
+               ev_annotation_get_color (annot, &ev_color);
+               color.red = ev_color.red;
+               color.green = ev_color.green;
+               color.blue = ev_color.blue;
+               poppler_annot_set_color (poppler_annot, &color);
+       }
+
+       if (EV_IS_ANNOTATION_MARKUP (annot)) {
+               EvAnnotationMarkup *ev_markup = EV_ANNOTATION_MARKUP (annot);
+               PopplerAnnotMarkup *markup = POPPLER_ANNOT_MARKUP (poppler_annot);
+
+               if (mask & EV_ANNOTATIONS_SAVE_LABEL)
+                       poppler_annot_markup_set_label (markup, ev_annotation_markup_get_label (ev_markup));
+               if (mask & EV_ANNOTATIONS_SAVE_OPACITY)
+                       poppler_annot_markup_set_opacity (markup, ev_annotation_markup_get_opacity (ev_markup));
+               if (mask & EV_ANNOTATIONS_SAVE_POPUP_IS_OPEN)
+                       poppler_annot_markup_set_popup_is_open (markup, ev_annotation_markup_get_popup_is_open (ev_markup));
+       }
+
+       if (EV_IS_ANNOTATION_TEXT (annot)) {
+               EvAnnotationText *ev_text = EV_ANNOTATION_TEXT (annot);
+               PopplerAnnotText *text = POPPLER_ANNOT_TEXT (poppler_annot);
+
+               if (mask & EV_ANNOTATIONS_SAVE_TEXT_IS_OPEN) {
+                       poppler_annot_text_set_is_open (text,
+                                                       ev_annotation_text_get_is_open (ev_text));
+               }
+               if (mask & EV_ANNOTATIONS_SAVE_TEXT_ICON) {
+                       EvAnnotationTextIcon icon;
+
+                       icon = ev_annotation_text_get_icon (ev_text);
+                       poppler_annot_text_set_icon (text, get_poppler_annot_text_icon (icon));
+               }
+       }
+#endif /* HAVE_POPPLER_PAGE_ADD_ANNOT */
+       PDF_DOCUMENT (document_annotations)->annots_modified = TRUE;
 }
 
 static void
 pdf_document_document_annotations_iface_init (EvDocumentAnnotationsInterface *iface)
 {
        iface->get_annotations = pdf_document_annotations_get_annotations;
-       iface->annotation_set_contents = pdf_document_annotations_annotation_set_contents;
+       iface->document_is_modified = pdf_document_annotations_document_is_modified;
+#ifdef HAVE_POPPLER_PAGE_ADD_ANNOT
+       iface->add_annotation = pdf_document_annotations_add_annotation;
+#endif
+       iface->save_annotation = pdf_document_annotations_save_annotation;
 }
 
 /* Attachments */
@@ -2902,11 +3193,12 @@ build_layers_tree (PdfDocument       *pdf_document,
                        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),
+                       ev_layer = ev_layer_new (poppler_layer_is_parent (layer),
                                                 rb_group);
+                       g_object_set_data_full (G_OBJECT (ev_layer),
+                                               "poppler-layer",
+                                               g_object_ref (layer),
+                                               (GDestroyNotify) g_object_unref);
                } else {
                        gchar *title;
 
@@ -2964,30 +3256,33 @@ 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);
+       PdfDocument  *pdf_document = PDF_DOCUMENT (document);
+       PopplerLayer *poppler_layer;
 
-       poppler_layer_show (POPPLER_LAYER (g_list_nth_data (pdf_document->layers, layer_id)));
+       poppler_layer = POPPLER_LAYER (g_object_get_data (G_OBJECT (layer), "poppler-layer"));
+       poppler_layer_show (poppler_layer);
 }
 
 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);
+       PdfDocument  *pdf_document = PDF_DOCUMENT (document);
+       PopplerLayer *poppler_layer;
 
-       poppler_layer_hide (POPPLER_LAYER (g_list_nth_data (pdf_document->layers, layer_id)));
+       poppler_layer = POPPLER_LAYER (g_object_get_data (G_OBJECT (layer), "poppler-layer"));
+       poppler_layer_hide (poppler_layer);
 }
 
 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);
+       PdfDocument  *pdf_document = PDF_DOCUMENT (document);
+       PopplerLayer *poppler_layer;
 
-       return poppler_layer_is_visible (POPPLER_LAYER (g_list_nth_data (pdf_document->layers, layer_id)));
+       poppler_layer = POPPLER_LAYER (g_object_get_data (G_OBJECT (layer), "poppler-layer"));
+       return poppler_layer_is_visible (poppler_layer);
 }
 
 static void