svn path=/trunk/; revision=3469

[evince.git] / backend / pdf / ev-poppler.cc

diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
index 4a783416e4a60ed5beaf743a56fe2c23025b3273..841706ead130de392cbe9b01f7a497f545dcf80d 100644 (file)
--- a/backend/pdf/ev-poppler.cc
+++ b/backend/pdf/ev-poppler.cc
@@ -31,7 +31,7 @@
 #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"


@@ -44,11 +44,13 @@
 #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-selection.h"
 #include "ev-selection.h"

+#include "ev-transition-effect.h"

 #include "ev-attachment.h"
 #include "ev-image.h"
 
 #include "ev-attachment.h"
 #include "ev-image.h"
 

-#if defined (HAVE_CAIRO_PDF) || defined (HAVE_CAIRO_PS)
+#if (defined (HAVE_POPPLER_PAGE_RENDER)) && (defined (HAVE_CAIRO_PDF) || defined (HAVE_CAIRO_PS))

 #define HAVE_CAIRO_PRINT
 #endif
 
 #define HAVE_CAIRO_PRINT
 #endif
 


@@ -97,6 +99,8 @@ 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_document_iface_init            (EvDocumentIface           *iface);


@@ -106,6 +110,7 @@ static void pdf_document_document_links_iface_init      (EvDocumentLinksIface
 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_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);

 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_find_iface_init                (EvDocumentFindIface       *iface);
 static void pdf_document_file_exporter_iface_init       (EvFileExporterIface       *iface);
 static void pdf_selection_iface_init                    (EvSelectionIface          *iface);


@@ -123,45 +128,32 @@ static EvLink     *ev_link_from_action      (PdfDocument       *pdf_document,
 static void        pdf_document_search_free (PdfDocumentSearch *search);
 static void        pdf_print_context_free   (PdfPrintContext   *ctx);
 
 static void        pdf_document_search_free (PdfDocumentSearch *search);
 static void        pdf_print_context_free   (PdfPrintContext   *ctx);
 

-G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
-                         {
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT,
-                                                       pdf_document_document_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_SECURITY,
-                                                       pdf_document_security_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
-                                                       pdf_document_document_thumbnails_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_LINKS,
-                                                       pdf_document_document_links_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_IMAGES,
-                                                       pdf_document_document_images_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FORMS,
-                                                       pdf_document_document_forms_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FONTS,
-                                                       pdf_document_document_fonts_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FIND,
-                                                       pdf_document_find_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER,
-                                                       pdf_document_file_exporter_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_SELECTION,
-                                                       pdf_selection_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_TRANSITION,
-                                                       pdf_document_page_transition_iface_init);
+EV_BACKEND_REGISTER_WITH_CODE (PdfDocument, pdf_document,
+                        {
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_SECURITY,
+                                                                pdf_document_security_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
+                                                                pdf_document_document_thumbnails_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_LINKS,
+                                                                pdf_document_document_links_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_IMAGES,
+                                                                pdf_document_document_images_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FORMS,
+                                                                pdf_document_document_forms_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FONTS,
+                                                                pdf_document_document_fonts_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_LAYERS,
+                                                                pdf_document_document_layers_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FIND,
+                                                                pdf_document_find_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER,
+                                                                pdf_document_file_exporter_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_SELECTION,
+                                                                pdf_selection_iface_init);
+                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_TRANSITION,
+                                                                pdf_document_page_transition_iface_init);

                         });
 
                         });
 

-static void
-set_rc_data (PdfDocument     *pdf_document,
-            EvRenderContext *rc)
-{
-       if (rc->data == NULL) {
-               rc->data = poppler_document_get_page (pdf_document->document,
-                                                     rc->page);
-               rc->destroy = g_object_unref;
-       } else {
-               g_assert (rc->page == poppler_page_get_index (POPPLER_PAGE (rc->data)));
-       }
-}
-

 static void
 pdf_document_search_free (PdfDocumentSearch   *search)
 {
 static void
 pdf_document_search_free (PdfDocumentSearch   *search)
 {


@@ -210,6 +202,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);
 }
 


@@ -231,6 +228,7 @@ static void
 convert_error (GError  *poppler_error,
               GError **error)
 {
 convert_error (GError  *poppler_error,
               GError **error)
 {

+       g_return_if_fail (poppler_error != NULL);

        if (poppler_error == NULL)
                return;
 
        if (poppler_error == NULL)
                return;
 


@@ -242,12 +240,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);
        }


@@ -297,35 +295,45 @@ pdf_document_get_n_pages (EvDocument *document)
        return poppler_document_get_n_pages (PDF_DOCUMENT (document)->document);
 }
 
        return poppler_document_get_n_pages (PDF_DOCUMENT (document)->document);
 }
 

-static void
-pdf_document_get_page_size (EvDocument   *document,
-                           int           page,
-                           double       *width,
-                           double       *height)
+static EvPage *
+pdf_document_get_page (EvDocument *document,
+                      gint        index)

 {
        PdfDocument *pdf_document = PDF_DOCUMENT (document);
        PopplerPage *poppler_page;
 {
        PdfDocument *pdf_document = PDF_DOCUMENT (document);
        PopplerPage *poppler_page;

+       EvPage      *page;

 
 

-       poppler_page = poppler_document_get_page (pdf_document->document, page);
-       poppler_page_get_size (poppler_page, width, height);
+       poppler_page = poppler_document_get_page (pdf_document->document, index);
+       page = ev_page_new (index);
+       page->backend_page = (EvBackendPage)g_object_ref (poppler_page);
+       page->backend_destroy_func = (EvBackendPageDestroyFunc)g_object_unref;

        g_object_unref (poppler_page);
        g_object_unref (poppler_page);

+
+       return page;
+}
+
+static void
+pdf_document_get_page_size (EvDocument *document,
+                           EvPage     *page,
+                           double     *width,
+                           double     *height)
+{
+       g_return_if_fail (POPPLER_IS_PAGE (page->backend_page));
+       
+       poppler_page_get_size (POPPLER_PAGE (page->backend_page), width, height);

 }
 
 static char *
 pdf_document_get_page_label (EvDocument *document,
 }
 
 static char *
 pdf_document_get_page_label (EvDocument *document,

-                            int         page)
+                            EvPage     *page)

 {
 {

-       PopplerPage *poppler_page;

        char *label = NULL;
 
        char *label = NULL;
 

-       poppler_page = poppler_document_get_page (PDF_DOCUMENT (document)->document,
-                                                 page);
+       g_return_val_if_fail (POPPLER_IS_PAGE (page->backend_page), NULL);

 
 

-       g_object_get (G_OBJECT (poppler_page),
+       g_object_get (G_OBJECT (page->backend_page),

                      "label", &label,
                      NULL);
                      "label", &label,
                      NULL);

-       g_object_unref (poppler_page);
-

        return label;
 }
 
        return label;
 }
 


@@ -446,27 +454,12 @@ pdf_document_get_attachments (EvDocument *document)
 }
 
 static cairo_surface_t *
 }
 
 static cairo_surface_t *

-pdf_document_render (EvDocument      *document,
-                    EvRenderContext *rc)
+pdf_page_render (PopplerPage     *page,
+                gint             width,
+                gint             height,
+                EvRenderContext *rc)

 {
 {

-       PdfDocument *pdf_document;

        cairo_surface_t *surface;
        cairo_surface_t *surface;

-       double width_points, height_points;
-       gint width, height;
-
-       pdf_document = PDF_DOCUMENT (document);
-
-       set_rc_data (pdf_document, rc);
-
-       poppler_page_get_size (POPPLER_PAGE (rc->data), &width_points, &height_points);
-
-       if (rc->rotation == 90 || rc->rotation == 270) {
-               width = (int) ((height_points * rc->scale) + 0.5);
-               height = (int) ((width_points * rc->scale) + 0.5);
-       } else {
-               width = (int) ((width_points * rc->scale) + 0.5);
-               height = (int) ((height_points * rc->scale) + 0.5);
-       }

 
 #ifdef HAVE_POPPLER_PAGE_RENDER
        cairo_t *cr;
 
 #ifdef HAVE_POPPLER_PAGE_RENDER
        cairo_t *cr;


@@ -493,7 +486,7 @@ pdf_document_render (EvDocument      *document,
        }
        cairo_scale (cr, rc->scale, rc->scale);
        cairo_rotate (cr, rc->rotation * G_PI / 180.0);
        }
        cairo_scale (cr, rc->scale, rc->scale);
        cairo_rotate (cr, rc->rotation * G_PI / 180.0);

-       poppler_page_render (POPPLER_PAGE (rc->data), cr);
+       poppler_page_render (page, cr);

        cairo_destroy (cr);
 #else /* HAVE_POPPLER_PAGE_RENDER */
        GdkPixbuf *pixbuf;
        cairo_destroy (cr);
 #else /* HAVE_POPPLER_PAGE_RENDER */
        GdkPixbuf *pixbuf;


@@ -502,7 +495,7 @@ pdf_document_render (EvDocument      *document,
                                 FALSE, 8,
                                 width, height);
 
                                 FALSE, 8,
                                 width, height);
 

-       poppler_page_render_to_pixbuf (POPPLER_PAGE (rc->data),
+       poppler_page_render_to_pixbuf (page,

                                       0, 0,
                                       width, height,
                                       rc->scale,
                                       0, 0,
                                       width, height,
                                       rc->scale,


@@ -512,7 +505,33 @@ pdf_document_render (EvDocument      *document,
        g_object_unref (pixbuf);
 #endif /* HAVE_POPPLER_PAGE_RENDER */
 
        g_object_unref (pixbuf);
 #endif /* HAVE_POPPLER_PAGE_RENDER */
 

-       return surface;
+       return surface; 
+}
+
+static cairo_surface_t *
+pdf_document_render (EvDocument      *document,
+                    EvRenderContext *rc)
+{
+       PdfDocument *pdf_document;
+       PopplerPage *poppler_page;
+       double width_points, height_points;
+       gint width, height;
+
+       poppler_page = POPPLER_PAGE (rc->page->backend_page);
+
+       poppler_page_get_size (poppler_page,
+                              &width_points, &height_points);
+       
+       if (rc->rotation == 90 || rc->rotation == 270) {
+               width = (int) ((height_points * rc->scale) + 0.5);
+               height = (int) ((width_points * rc->scale) + 0.5);
+       } else {
+               width = (int) ((width_points * rc->scale) + 0.5);
+               height = (int) ((height_points * rc->scale) + 0.5);
+       }
+       
+       return pdf_page_render (poppler_page,
+                               width, height, rc);

 }
 
 /* EvDocumentSecurity */
 }
 
 /* EvDocumentSecurity */


@@ -544,6 +563,7 @@ pdf_document_get_info (EvDocument *document)
        PopplerPageMode mode;
        PopplerViewerPreferences view_prefs;
        PopplerPermissions permissions;
        PopplerPageMode mode;
        PopplerViewerPreferences view_prefs;
        PopplerPermissions permissions;

+       EvPage *page;

 
        info = g_new0 (EvDocumentInfo, 1);
 
 
        info = g_new0 (EvDocumentInfo, 1);
 


@@ -582,13 +602,20 @@ pdf_document_get_info (EvDocument *document)
                      "linearized", &(info->linearized),
                      NULL);
 
                      "linearized", &(info->linearized),
                      NULL);
 

-       pdf_document_get_page_size(document, 0,
-                                  &(info->paper_width),
-                                  &(info->paper_height));
+       info->n_pages = ev_document_get_n_pages (document);

 
 

-       // Convert to mm.
-       info->paper_width = info->paper_width / 72.0f * 25.4f;
-       info->paper_height = info->paper_height / 72.0f * 25.4f;
+       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:


@@ -668,8 +695,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"));


@@ -687,6 +712,7 @@ pdf_document_document_iface_init (EvDocumentIface *iface)
        iface->save = pdf_document_save;
        iface->load = pdf_document_load;
        iface->get_n_pages = pdf_document_get_n_pages;
        iface->save = pdf_document_save;
        iface->load = pdf_document_load;
        iface->get_n_pages = pdf_document_get_n_pages;

+       iface->get_page = pdf_document_get_page;

        iface->get_page_size = pdf_document_get_page_size;
        iface->get_page_label = pdf_document_get_page_label;
        iface->has_attachments = pdf_document_has_attachments;
        iface->get_page_size = pdf_document_get_page_size;
        iface->get_page_label = pdf_document_get_page_label;
        iface->has_attachments = pdf_document_has_attachments;


@@ -858,8 +884,11 @@ 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,
-                                                       dest->zoom);
+                                                       height - MIN (height, dest->top),
+                                                       dest->zoom,
+                                                       dest->change_left,
+                                                       dest->change_top,
+                                                       dest->change_zoom);

                        g_object_unref (poppler_page);
                }
                        break;
                        g_object_unref (poppler_page);
                }
                        break;


@@ -874,13 +903,15 @@ 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;
                case POPPLER_DEST_FITV:
                        ev_dest = ev_link_dest_new_fitv (dest->page_num - 1,
                        g_object_unref (poppler_page);
                }
                        break;
                case POPPLER_DEST_FITV:
                        ev_dest = ev_link_dest_new_fitv (dest->page_num - 1,

-                                                        dest->left);
+                                                        dest->left,
+                                                        dest->change_left);

                        break;
                case POPPLER_DEST_FITR: {
                        PopplerPage *poppler_page;
                        break;
                case POPPLER_DEST_FITR: {
                        PopplerPage *poppler_page;


@@ -891,9 +922,9 @@ 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;


@@ -915,7 +946,7 @@ ev_link_dest_from_dest (PdfDocument *pdf_document,
        }
 
        if (unimplemented_dest) {
        }
 
        if (unimplemented_dest) {

-               g_warning ("Unimplemented named action: %s, please post a "
+               g_warning ("Unimplemented destination: %s, please post a "

                           "bug report in Evince bugzilla "
                           "(http://bugzilla.gnome.org) with a testcase.",
                           unimplemented_dest);
                           "bug report in Evince bugzilla "
                           "(http://bugzilla.gnome.org) with a testcase.",
                           unimplemented_dest);


@@ -936,6 +967,8 @@ ev_link_from_action (PdfDocument   *pdf_document,
        const char   *unimplemented_action = NULL;
 
        switch (action->type) {
        const char   *unimplemented_action = NULL;
 
        switch (action->type) {

+               case POPPLER_ACTION_NONE:
+                       break;

                case POPPLER_ACTION_GOTO_DEST: {
                        EvLinkDest *dest;
                        
                case POPPLER_ACTION_GOTO_DEST: {
                        EvLinkDest *dest;
                        


@@ -970,8 +1003,9 @@ ev_link_from_action (PdfDocument   *pdf_document,
        }
        
        if (unimplemented_action) {
        }
        
        if (unimplemented_action) {

-               g_warning ("Unimplemented action: %s, please post a bug report with a testcase.",
-                          unimplemented_action);
+               g_warning ("Unimplemented action: %s, please post a bug report "
+                          "in Evince bugzilla (http://bugzilla.gnome.org) "
+                          "with a testcase.", unimplemented_action);

        }
        
        link = ev_link_new (action->any.title, ev_action);
        }
        
        link = ev_link_new (action->any.title, ev_action);


@@ -1152,8 +1186,8 @@ pdf_document_document_links_iface_init (EvDocumentLinksIface *iface)
 }
 
 static GList *
 }
 
 static GList *

-pdf_document_images_get_images (EvDocumentImages *document_images,
-                               gint              page)
+pdf_document_images_get_image_mapping (EvDocumentImages *document_images,
+                                      gint              page)

 {
        GList *retval = NULL;
        PdfDocument *pdf_document;
 {
        GList *retval = NULL;
        PdfDocument *pdf_document;


@@ -1173,7 +1207,7 @@ pdf_document_images_get_images (EvDocumentImages *document_images,
 
                ev_image_mapping = g_new (EvImageMapping, 1);
                
 
                ev_image_mapping = g_new (EvImageMapping, 1);
                

-               ev_image_mapping->image = ev_image_new_from_pixbuf (image_mapping->image);
+               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->x1 = image_mapping->area.x1;
                ev_image_mapping->x2 = image_mapping->area.x2;
                ev_image_mapping->y1 = image_mapping->area.y1;


@@ -1185,13 +1219,38 @@ pdf_document_images_get_images (EvDocumentImages *document_images,
        poppler_page_free_image_mapping (mapping_list);
        g_object_unref (poppler_page);
 
        poppler_page_free_image_mapping (mapping_list);
        g_object_unref (poppler_page);
 

+       return g_list_reverse (retval);
+}
+
+GdkPixbuf *
+pdf_document_images_get_image (EvDocumentImages *document_images,
+                              EvImage          *image)
+{
+       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,
+                                                 ev_image_get_page (image));
+
+       surface = poppler_page_get_image (poppler_page, ev_image_get_id (image));
+       if (surface) {
+               retval = ev_document_misc_pixbuf_from_surface (surface);
+               cairo_surface_destroy (surface);
+       }
+
+       g_object_unref (poppler_page);
+

        return retval;
 }
 
 static void
 pdf_document_document_images_iface_init (EvDocumentImagesIface *iface)
 {
        return retval;
 }
 
 static void
 pdf_document_document_images_iface_init (EvDocumentImagesIface *iface)
 {

-       iface->get_images = pdf_document_images_get_images;
+       iface->get_image_mapping = pdf_document_images_get_image_mapping;
+       iface->get_image = pdf_document_images_get_image;

 }
 
 static GdkPixbuf *
 }
 
 static GdkPixbuf *


@@ -1204,7 +1263,7 @@ make_thumbnail_for_page (PdfDocument     *pdf_document,
 
        pdf_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (pdf_document),
                                                rc, &width, &height);
 
        pdf_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (pdf_document),
                                                rc, &width, &height);

-
+#ifdef POPPLER_WITH_GDK

        pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
                                 width, height);
        gdk_pixbuf_fill (pixbuf, 0xffffffff);
        pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
                                 width, height);
        gdk_pixbuf_fill (pixbuf, 0xffffffff);


@@ -1214,6 +1273,16 @@ make_thumbnail_for_page (PdfDocument     *pdf_document,
                                       width, height,
                                       rc->scale, rc->rotation, pixbuf);
        ev_document_fc_mutex_unlock ();
                                       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;
 }
 
        return pixbuf;
 }


@@ -1223,17 +1292,25 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails
                                       EvRenderContext      *rc, 
                                       gboolean              border)
 {
                                       EvRenderContext      *rc, 
                                       gboolean              border)
 {

-       PdfDocument *pdf_document;
+       PdfDocument *pdf_document = PDF_DOCUMENT (document_thumbnails);

        PopplerPage *poppler_page;
        PopplerPage *poppler_page;

-       GdkPixbuf *pixbuf;
+       GdkPixbuf *pixbuf = NULL;

        GdkPixbuf *border_pixbuf;
 
        GdkPixbuf *border_pixbuf;
 

-       pdf_document = PDF_DOCUMENT (document_thumbnails);
+       poppler_page = POPPLER_PAGE (rc->page->backend_page);

 
 

-       poppler_page = poppler_document_get_page (pdf_document->document, rc->page);
-       g_return_val_if_fail (poppler_page != NULL, NULL);
+#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 */

 
 

-       pixbuf = poppler_page_get_thumbnail (poppler_page);

        if (pixbuf) {
                /* Rotate provided thumbnail if needed */
                GdkPixbuf *rotated_pixbuf;
        if (pixbuf) {
                /* Rotate provided thumbnail if needed */
                GdkPixbuf *rotated_pixbuf;


@@ -1253,8 +1330,6 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails
                pixbuf = border_pixbuf;
        }               
 
                pixbuf = border_pixbuf;
        }               
 

-       g_object_unref (poppler_page);
-       

        return pixbuf;
 }
 
        return pixbuf;
 }
 


@@ -1264,18 +1339,14 @@ pdf_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnail
                                        gint                 *width,
                                        gint                 *height)
 {
                                        gint                 *width,
                                        gint                 *height)
 {

-       PdfDocument *pdf_document;

        PopplerPage *poppler_page;
        gint has_thumb;
        
        PopplerPage *poppler_page;
        gint has_thumb;
        

-       pdf_document = PDF_DOCUMENT (document_thumbnails);
-       poppler_page = poppler_document_get_page (pdf_document->document, rc->page);
-
-       g_return_if_fail (poppler_page != NULL);
+       poppler_page = POPPLER_PAGE (rc->page->backend_page);

 
        has_thumb = poppler_page_get_thumbnail_size (poppler_page, width, height);
 
 
        has_thumb = poppler_page_get_thumbnail_size (poppler_page, width, height);
 

-       if (!has_thumb) {
+       if (!has_thumb || *width <= 0 || *height <= 0) {

                double page_width, page_height;
 
                poppler_page_get_size (poppler_page, &page_width, &page_height);
                double page_width, page_height;
 
                poppler_page_get_size (poppler_page, &page_width, &page_height);


@@ -1291,8 +1362,6 @@ pdf_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnail
                *width = *height;
                *height = temp;
        }
                *width = *height;
                *height = temp;
        }

-       
-       g_object_unref (poppler_page);

 }
 
 static void
 }
 
 static void


@@ -1303,195 +1372,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;
-
-       search = PDF_DOCUMENT (document_find)->search;
+       for (l = matches; l && l->data; l = g_list_next (l)) {
+               PopplerRectangle *rect = (PopplerRectangle *)l->data;
+               gdouble           tmp;

 
 

-       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


@@ -1520,8 +1436,8 @@ pdf_document_file_exporter_begin (EvFileExporter        *exporter,
 {
        PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
        PdfPrintContext *ctx;
 {
        PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
        PdfPrintContext *ctx;

-       gdouble width, height;

 #ifdef HAVE_CAIRO_PRINT
 #ifdef HAVE_CAIRO_PRINT

+       gdouble width, height;

        cairo_surface_t *surface = NULL;
 #endif
        
        cairo_surface_t *surface = NULL;
 #endif
        


@@ -1530,7 +1446,9 @@ pdf_document_file_exporter_begin (EvFileExporter        *exporter,
        pdf_document->print_ctx = g_new0 (PdfPrintContext, 1);
        ctx = pdf_document->print_ctx;
        ctx->format = fc->format;
        pdf_document->print_ctx = g_new0 (PdfPrintContext, 1);
        ctx = pdf_document->print_ctx;
        ctx->format = fc->format;

-       ctx->pages_per_sheet = fc->pages_per_sheet;
+       
+#ifdef HAVE_CAIRO_PRINT
+       ctx->pages_per_sheet = CLAMP (fc->pages_per_sheet, 1, 16);

 
        ctx->paper_width = fc->paper_width;
        ctx->paper_height = fc->paper_height;
 
        ctx->paper_width = fc->paper_width;
        ctx->paper_height = fc->paper_height;


@@ -1564,18 +1482,12 @@ pdf_document_file_exporter_begin (EvFileExporter        *exporter,
        }
 
        ctx->pages_printed = 0;
        }
 
        ctx->pages_printed = 0;

-
+       

        switch (fc->format) {
                case EV_FILE_FORMAT_PS:
 #ifdef HAVE_CAIRO_PS
                        surface = cairo_ps_surface_create (fc->filename, fc->paper_width, fc->paper_height);
        switch (fc->format) {
                case EV_FILE_FORMAT_PS:
 #ifdef HAVE_CAIRO_PS
                        surface = cairo_ps_surface_create (fc->filename, fc->paper_width, fc->paper_height);

-#else
-                       ctx->ps_file = poppler_ps_file_new (pdf_document->document,
-                                                           fc->filename, fc->first_page,
-                                                           fc->last_page - fc->first_page + 1);
-                       poppler_ps_file_set_paper_size (ctx->ps_file, fc->paper_width, fc->paper_height);
-                       poppler_ps_file_set_duplex (ctx->ps_file, fc->duplex);
-#endif /* HAVE_CAIRO_PS */
+#endif

                        break;
                case EV_FILE_FORMAT_PDF:
 #ifdef HAVE_CAIRO_PDF
                        break;
                case EV_FILE_FORMAT_PDF:
 #ifdef HAVE_CAIRO_PDF


@@ -1586,10 +1498,18 @@ pdf_document_file_exporter_begin (EvFileExporter        *exporter,
                        g_assert_not_reached ();
        }
 
                        g_assert_not_reached ();
        }
 

-#ifdef HAVE_CAIRO_PRINT

        ctx->cr = cairo_create (surface);
        cairo_surface_destroy (surface);
        ctx->cr = cairo_create (surface);
        cairo_surface_destroy (surface);

-#endif
+
+#else /* HAVE_CAIRO_PRINT */
+       if (ctx->format == EV_FILE_FORMAT_PS) {
+               ctx->ps_file = poppler_ps_file_new (pdf_document->document,
+                                                   fc->filename, fc->first_page,
+                                                   fc->last_page - fc->first_page + 1);
+               poppler_ps_file_set_paper_size (ctx->ps_file, fc->paper_width, fc->paper_height);
+               poppler_ps_file_set_duplex (ctx->ps_file, fc->duplex);
+       }
+#endif /* HAVE_CAIRO_PRINT */

 }
 
 static void
 }
 
 static void


@@ -1601,7 +1521,8 @@ pdf_document_file_exporter_begin_page (EvFileExporter *exporter)
        g_return_if_fail (pdf_document->print_ctx != NULL);
 
        ctx->pages_printed = 0;
        g_return_if_fail (pdf_document->print_ctx != NULL);
 
        ctx->pages_printed = 0;

-
+       
+#ifdef HAVE_CAIRO_PRINT

        if (ctx->paper_width > ctx->paper_height) {
                if (ctx->format == EV_FILE_FORMAT_PS) {
                        cairo_ps_surface_set_size (cairo_get_target (ctx->cr),
        if (ctx->paper_width > ctx->paper_height) {
                if (ctx->format == EV_FILE_FORMAT_PS) {
                        cairo_ps_surface_set_size (cairo_get_target (ctx->cr),


@@ -1613,6 +1534,7 @@ pdf_document_file_exporter_begin_page (EvFileExporter *exporter)
                                                    ctx->paper_width);
                }
        }
                                                    ctx->paper_width);
                }
        }

+#endif /* HAVE_CAIRO_PRINT */

 }
 
 static void
 }
 
 static void


@@ -1625,7 +1547,7 @@ pdf_document_file_exporter_do_page (EvFileExporter  *exporter,
 #ifdef HAVE_CAIRO_PRINT
        gdouble  page_width, page_height;
        gint     x, y;
 #ifdef HAVE_CAIRO_PRINT
        gdouble  page_width, page_height;
        gint     x, y;

-       gboolean rotate, landscape;
+       gboolean rotate;

        gdouble  width, height;
        gdouble  pwidth, pheight;
        gdouble  xscale, yscale;
        gdouble  width, height;
        gdouble  pwidth, pheight;
        gdouble  xscale, yscale;


@@ -1633,7 +1555,7 @@ pdf_document_file_exporter_do_page (EvFileExporter  *exporter,
 
        g_return_if_fail (pdf_document->print_ctx != NULL);
 
 
        g_return_if_fail (pdf_document->print_ctx != NULL);
 

-       poppler_page = poppler_document_get_page (pdf_document->document, rc->page);
+       poppler_page = POPPLER_PAGE (rc->page->backend_page);

        
 #ifdef HAVE_CAIRO_PRINT
        x = (ctx->pages_printed % ctx->pages_per_sheet) % ctx->pages_x;
        
 #ifdef HAVE_CAIRO_PRINT
        x = (ctx->pages_printed % ctx->pages_per_sheet) % ctx->pages_x;


@@ -1646,8 +1568,6 @@ pdf_document_file_exporter_do_page (EvFileExporter  *exporter,
                rotate = FALSE;
        }
 
                rotate = FALSE;
        }
 

-       landscape = (ctx->paper_width > ctx->paper_height);
-

        /* Use always portrait mode and rotate when necessary */
        if (ctx->paper_width > ctx->paper_height) {
                width = ctx->paper_height;
        /* Use always portrait mode and rotate when necessary */
        if (ctx->paper_width > ctx->paper_height) {
                width = ctx->paper_height;


@@ -1699,7 +1619,7 @@ pdf_document_file_exporter_do_page (EvFileExporter  *exporter,
        if (rotate) {
                cairo_matrix_t matrix;
                
        if (rotate) {
                cairo_matrix_t matrix;
                

-               cairo_translate (ctx->cr, width, 0);
+               cairo_translate (ctx->cr, (2 * y + 1) * pwidth, 0);

                cairo_matrix_init (&matrix,
                                   0,  1,
                                   -1,  0,
                cairo_matrix_init (&matrix,
                                   0,  1,
                                   -1,  0,


@@ -1712,13 +1632,7 @@ pdf_document_file_exporter_do_page (EvFileExporter  *exporter,
                         y * (rotate ? pwidth : pheight));
        cairo_scale (ctx->cr, xscale, yscale);
 
                         y * (rotate ? pwidth : pheight));
        cairo_scale (ctx->cr, xscale, yscale);
 

-#ifdef HAVE_POPPLER_PAGE_RENDER_FOR_PRINTING

        poppler_page_render_for_printing (poppler_page, ctx->cr);
        poppler_page_render_for_printing (poppler_page, ctx->cr);

-#else
-#ifdef HAVE_POPPLER_PAGE_RENDER
-       poppler_page_render (poppler_page, ctx->cr);
-#endif
-#endif

 
        ctx->pages_printed++;
                        
 
        ctx->pages_printed++;
                        


@@ -1727,8 +1641,6 @@ pdf_document_file_exporter_do_page (EvFileExporter  *exporter,
        if (ctx->format == EV_FILE_FORMAT_PS)
                poppler_page_render_to_ps (poppler_page, ctx->ps_file);
 #endif /* HAVE_CAIRO_PRINT */
        if (ctx->format == EV_FILE_FORMAT_PS)
                poppler_page_render_to_ps (poppler_page, ctx->ps_file);
 #endif /* HAVE_CAIRO_PRINT */

-       
-       g_object_unref (poppler_page);

 }
 
 static void
 }
 
 static void


@@ -1739,7 +1651,9 @@ pdf_document_file_exporter_end_page (EvFileExporter *exporter)
        
        g_return_if_fail (pdf_document->print_ctx != NULL);
 
        
        g_return_if_fail (pdf_document->print_ctx != NULL);
 

+#ifdef HAVE_CAIRO_PRINT

        cairo_show_page (ctx->cr);
        cairo_show_page (ctx->cr);

+#endif

 }
 
 static void
 }
 
 static void


@@ -1762,11 +1676,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


@@ -1797,20 +1709,28 @@ pdf_selection_render_selection (EvSelection      *selection,
                                GdkColor         *text,
                                GdkColor         *base)
 {
                                GdkColor         *text,
                                GdkColor         *base)
 {

-       PdfDocument *pdf_document;
+       PopplerPage *poppler_page;

        double width_points, height_points;
        gint width, height;
 
        double width_points, height_points;
        gint width, height;
 

-       pdf_document = PDF_DOCUMENT (selection);
-       set_rc_data (pdf_document, rc);
+       poppler_page = POPPLER_PAGE (rc->page->backend_page);

 
 

-       poppler_page_get_size (POPPLER_PAGE (rc->data),
+       poppler_page_get_size (poppler_page,

                               &width_points, &height_points);
        width = (int) ((width_points * rc->scale) + 0.5);
        height = (int) ((height_points * rc->scale) + 0.5);
 
 #ifdef HAVE_POPPLER_PAGE_RENDER
        cairo_t *cr;
                               &width_points, &height_points);
        width = (int) ((width_points * rc->scale) + 0.5);
        height = (int) ((height_points * rc->scale) + 0.5);
 
 #ifdef HAVE_POPPLER_PAGE_RENDER
        cairo_t *cr;

+       PopplerColor text_color, base_color;
+       
+       text_color.red = text->red;
+       text_color.green = text->green;
+       text_color.blue = text->blue;
+
+       base_color.red = base->red;
+       base_color.green = base->green;
+       base_color.blue = base->blue;

 
        if (*surface == NULL) {
                *surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
 
        if (*surface == NULL) {
                *surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,


@@ -1824,13 +1744,13 @@ pdf_selection_render_selection (EvSelection      *selection,
        memset (cairo_image_surface_get_data (*surface), 0x00,
                cairo_image_surface_get_height (*surface) *
                cairo_image_surface_get_stride (*surface));
        memset (cairo_image_surface_get_data (*surface), 0x00,
                cairo_image_surface_get_height (*surface) *
                cairo_image_surface_get_stride (*surface));

-       poppler_page_render_selection (POPPLER_PAGE (rc->data),
+       poppler_page_render_selection (poppler_page,

                                       cr,
                                       (PopplerRectangle *)points,
                                       (PopplerRectangle *)old_points,
                                       (PopplerSelectionStyle)style,
                                       cr,
                                       (PopplerRectangle *)points,
                                       (PopplerRectangle *)old_points,
                                       (PopplerSelectionStyle)style,

-                                      text,
-                                      base);
+                                      &text_color,
+                                      &base_color);

        cairo_destroy (cr);
 #else /* HAVE_POPPLER_PAGE_RENDER */
        GdkPixbuf *pixbuf;
        cairo_destroy (cr);
 #else /* HAVE_POPPLER_PAGE_RENDER */
        GdkPixbuf *pixbuf;


@@ -1839,7 +1759,7 @@ pdf_selection_render_selection (EvSelection      *selection,
                                 TRUE, 8,
                                 width, height);
 
                                 TRUE, 8,
                                 width, height);
 

-       poppler_page_render_selection_to_pixbuf (POPPLER_PAGE (rc->data),
+       poppler_page_render_selection_to_pixbuf (poppler_page,

                                                 rc->scale, rc->rotation, pixbuf,
                                                 (PopplerRectangle *)points,
                                                 (PopplerRectangle *)old_points,
                                                 rc->scale, rc->rotation, pixbuf,
                                                 (PopplerRectangle *)points,
                                                 (PopplerRectangle *)old_points,


@@ -1859,14 +1779,12 @@ pdf_selection_get_selected_text (EvSelection     *selection,
                                 EvSelectionStyle style,
                                 EvRectangle     *points)
 {
                                 EvSelectionStyle style,
                                 EvRectangle     *points)
 {

-       PdfDocument *pdf_document = PDF_DOCUMENT (selection);

        PopplerPage *poppler_page;
        PopplerRectangle r;
        double height;
        char *retval;
        
        PopplerPage *poppler_page;
        PopplerRectangle r;
        double height;
        char *retval;
        

-       poppler_page = poppler_document_get_page (pdf_document->document, rc->page);
-       g_return_val_if_fail (poppler_page != NULL, NULL);
+       poppler_page = POPPLER_PAGE (rc->page->backend_page);

 
        poppler_page_get_size (poppler_page, NULL, &height);
        r.x1 = points->x1;
 
        poppler_page_get_size (poppler_page, NULL, &height);
        r.x1 = points->x1;


@@ -1878,7 +1796,31 @@ pdf_selection_get_selected_text (EvSelection     *selection,
                                        (PopplerSelectionStyle)style,
                                        &r);
 
                                        (PopplerSelectionStyle)style,
                                        &r);
 

-       g_object_unref (poppler_page);
+       return retval;
+}
+
+static GdkRegion *
+create_gdk_region_from_poppler_region (GList *region)
+{
+       GList *l;
+       GdkRegion *retval;
+       
+       retval = gdk_region_new ();
+       
+       for (l = region; l; l = g_list_next (l)) {
+               PopplerRectangle *rectangle;
+               GdkRectangle      rect;
+               
+               rectangle = (PopplerRectangle *)l->data;
+               
+               rect.x = (gint) rectangle->x1;
+               rect.y = (gint) rectangle->y1;
+               rect.width  = (gint) (rectangle->x2 - rectangle->x1);
+               rect.height = (gint) (rectangle->y2 - rectangle->y1);
+               gdk_region_union_with_rect (retval, &rect);
+               
+               poppler_rectangle_free (rectangle);
+       }

 
        return retval;
 }
 
        return retval;
 }


@@ -1889,17 +1831,19 @@ pdf_selection_get_selection_region (EvSelection     *selection,
                                    EvSelectionStyle style,
                                    EvRectangle     *points)
 {
                                    EvSelectionStyle style,
                                    EvRectangle     *points)
 {

-       PdfDocument *pdf_document;
-       GdkRegion *retval;
-
-       pdf_document = PDF_DOCUMENT (selection);
-
-       set_rc_data (pdf_document, rc);
+       PopplerPage *poppler_page;
+       GdkRegion   *retval;
+       GList       *region;

 
 

-       retval = poppler_page_get_selection_region ((PopplerPage *)rc->data,
+       poppler_page = POPPLER_PAGE (rc->page->backend_page);
+       
+       region = poppler_page_get_selection_region (poppler_page,

                                                    rc->scale,
                                                    (PopplerSelectionStyle)style,
                                                    (PopplerRectangle *) points);
                                                    rc->scale,
                                                    (PopplerSelectionStyle)style,
                                                    (PopplerRectangle *) points);

+       retval = create_gdk_region_from_poppler_region (region);
+       g_list_free (region);
+       

        return retval;
 }
 
        return retval;
 }
 


@@ -1907,22 +1851,22 @@ static GdkRegion *
 pdf_selection_get_selection_map (EvSelection     *selection,
                                 EvRenderContext *rc)
 {
 pdf_selection_get_selection_map (EvSelection     *selection,
                                 EvRenderContext *rc)
 {

-       PdfDocument *pdf_document;

        PopplerPage *poppler_page;
        PopplerRectangle points;
        PopplerPage *poppler_page;
        PopplerRectangle points;

+       GList *region;

        GdkRegion *retval;
 
        GdkRegion *retval;
 

-       pdf_document = PDF_DOCUMENT (selection);
-       poppler_page = poppler_document_get_page (pdf_document->document,
-                                                 rc->page);
+       poppler_page = POPPLER_PAGE (rc->page->backend_page);

 
        points.x1 = 0.0;
        points.y1 = 0.0;
        poppler_page_get_size (poppler_page, &(points.x2), &(points.y2));
 
        points.x1 = 0.0;
        points.y1 = 0.0;
        poppler_page_get_size (poppler_page, &(points.x2), &(points.y2));

-       retval = poppler_page_get_selection_region (poppler_page, 1.0,
+       
+       region = poppler_page_get_selection_region (poppler_page, 1.0,

                                                    POPPLER_SELECTION_GLYPH,
                                                    &points);
                                                    POPPLER_SELECTION_GLYPH,
                                                    &points);

-       g_object_unref (poppler_page);
+       retval = create_gdk_region_from_poppler_region (region);
+       g_list_free (region);

 
        return retval;
 }
 
        return retval;
 }


@@ -1956,16 +1900,49 @@ pdf_document_get_page_duration (EvDocumentTransition *trans,
        return duration;
 }
 
        return duration;
 }
 

-static void
-pdf_document_page_transition_iface_init (EvDocumentTransitionIface *iface)
+static EvTransitionEffect *
+pdf_document_get_effect (EvDocumentTransition *trans,
+                        gint                  page)

 {
 {

-       iface->get_page_duration = pdf_document_get_page_duration;
+       PdfDocument            *pdf_document;
+       PopplerPage            *poppler_page;
+       PopplerPageTransition  *page_transition;
+       EvTransitionEffect     *effect;
+
+       pdf_document = PDF_DOCUMENT (trans);
+       poppler_page = poppler_document_get_page (pdf_document->document, page);
+
+       if (!poppler_page)
+               return NULL;
+
+       page_transition = poppler_page_get_transition (poppler_page);
+
+       if (!page_transition) {
+               g_object_unref (poppler_page);
+               return NULL;
+       }
+
+       /* enums in PopplerPageTransition match the EvTransitionEffect ones */
+       effect = ev_transition_effect_new ((EvTransitionEffectType) page_transition->type,
+                                          "alignment", page_transition->alignment,
+                                          "direction", page_transition->direction,
+                                          "duration", page_transition->duration,
+                                          "angle", page_transition->angle,
+                                          "scale", page_transition->scale,
+                                          "rectangular", page_transition->rectangular,
+                                          NULL);
+
+       poppler_page_transition_free (page_transition);
+       g_object_unref (poppler_page);
+
+       return effect;

 }
 
 }
 

-PdfDocument *
-pdf_document_new (void)
+static void
+pdf_document_page_transition_iface_init (EvDocumentTransitionIface *iface)

 {
 {

-       return PDF_DOCUMENT (g_object_new (PDF_TYPE_DOCUMENT, NULL));
+       iface->get_page_duration = pdf_document_get_page_duration;
+       iface->get_effect = pdf_document_get_effect;

 }
 
 /* Forms */
 }
 
 /* Forms */


@@ -2093,17 +2070,17 @@ ev_form_field_from_poppler_field (PopplerFormField *poppler_field)
 
 static GList *
 pdf_document_forms_get_form_fields (EvDocumentForms *document, 
 
 static GList *
 pdf_document_forms_get_form_fields (EvDocumentForms *document, 

-                                   gint             page)
+                                   EvPage          *page)

 {
 {

-       PdfDocument *pdf_document;

        PopplerPage *poppler_page;
        GList *retval = NULL;
        GList *fields;
        GList *list;
        double height;
 
        PopplerPage *poppler_page;
        GList *retval = NULL;
        GList *fields;
        GList *list;
        double height;
 

-       pdf_document = PDF_DOCUMENT (document);
-       poppler_page = poppler_document_get_page (pdf_document->document, page);
+       g_return_val_if_fail (POPPLER_IS_PAGE (page->backend_page), NULL);
+       
+       poppler_page = POPPLER_PAGE (page->backend_page);

        fields = poppler_page_get_form_field_mapping (poppler_page);
        poppler_page_get_size (poppler_page, NULL, &height);
 
        fields = poppler_page_get_form_field_mapping (poppler_page);
        poppler_page_get_size (poppler_page, NULL, &height);
 


@@ -2124,13 +2101,17 @@ pdf_document_forms_get_form_fields (EvDocumentForms *document,
                field_mapping->y1 = height - mapping->area.y2;
                field_mapping->y2 = height - mapping->area.y1;
                field_mapping->field = ev_field;
                field_mapping->y1 = height - mapping->area.y2;
                field_mapping->y2 = height - mapping->area.y1;
                field_mapping->field = ev_field;

-               field_mapping->field->page = page;
+               field_mapping->field->page = EV_PAGE (g_object_ref (page));
+
+               g_object_set_data_full (G_OBJECT (ev_field),
+                                       "poppler-field",
+                                       g_object_ref (mapping->field),
+                                       (GDestroyNotify) g_object_unref);

                
                retval = g_list_prepend (retval, field_mapping);
        }
        
        poppler_page_free_form_field_mapping (fields);
                
                retval = g_list_prepend (retval, field_mapping);
        }
        
        poppler_page_free_form_field_mapping (fields);

-       g_object_unref (poppler_page);

 
        return g_list_reverse (retval);
 }
 
        return g_list_reverse (retval);
 }


@@ -2140,16 +2121,14 @@ pdf_document_forms_form_field_text_get_text (EvDocumentForms *document,
                                             EvFormField     *field)
        
 {
                                             EvFormField     *field)
        
 {

-       PdfDocument *pdf_document = PDF_DOCUMENT (document);

        PopplerFormField *poppler_field;
        gchar *text;
 
        PopplerFormField *poppler_field;
        gchar *text;
 

-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));

        if (!poppler_field)
                return NULL;
        
        text = poppler_form_field_text_get_text (poppler_field);
        if (!poppler_field)
                return NULL;
        
        text = poppler_form_field_text_get_text (poppler_field);

-       g_object_unref (poppler_field);

 
        return text;
 }
 
        return text;
 }


@@ -2159,14 +2138,12 @@ pdf_document_forms_form_field_text_set_text (EvDocumentForms *document,
                                             EvFormField     *field,
                                             const gchar     *text)
 {
                                             EvFormField     *field,
                                             const gchar     *text)
 {

-       PdfDocument *pdf_document = PDF_DOCUMENT (document);

        PopplerFormField *poppler_field;
 
        PopplerFormField *poppler_field;
 

-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));

        if (!poppler_field)
                return;
        poppler_form_field_text_set_text (poppler_field, text);
        if (!poppler_field)
                return;
        poppler_form_field_text_set_text (poppler_field, text);

-       g_object_unref (poppler_field);

 }
 
 static void
 }
 
 static void


@@ -2174,31 +2151,27 @@ pdf_document_forms_form_field_button_set_state (EvDocumentForms *document,
                                                EvFormField     *field,
                                                gboolean         state)
 {
                                                EvFormField     *field,
                                                gboolean         state)
 {

-       PdfDocument *pdf_document = PDF_DOCUMENT (document);

        PopplerFormField *poppler_field;
 
        PopplerFormField *poppler_field;
 

-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));

        if (!poppler_field)
                return;
        
        poppler_form_field_button_set_state (poppler_field, state);
        if (!poppler_field)
                return;
        
        poppler_form_field_button_set_state (poppler_field, state);

-       g_object_unref (poppler_field);

 }
 
 static gboolean
 pdf_document_forms_form_field_button_get_state (EvDocumentForms *document, 
                                                EvFormField     *field)
 {
 }
 
 static gboolean
 pdf_document_forms_form_field_button_get_state (EvDocumentForms *document, 
                                                EvFormField     *field)
 {

-       PdfDocument *pdf_document = PDF_DOCUMENT (document);

        PopplerFormField *poppler_field;
        gboolean state;
 
        PopplerFormField *poppler_field;
        gboolean state;
 

-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));

        if (!poppler_field)
                return FALSE;
 
        state = poppler_form_field_button_get_state (poppler_field);
        if (!poppler_field)
                return FALSE;
 
        state = poppler_form_field_button_get_state (poppler_field);

-       g_object_unref (poppler_field);

 
        return state;
 }
 
        return state;
 }


@@ -2208,16 +2181,14 @@ pdf_document_forms_form_field_choice_get_item (EvDocumentForms *document,
                                               EvFormField     *field,
                                               gint             index)
 {
                                               EvFormField     *field,
                                               gint             index)
 {

-       PdfDocument *pdf_document = PDF_DOCUMENT (document);

        PopplerFormField *poppler_field;
        gchar *text;
 
        PopplerFormField *poppler_field;
        gchar *text;
 

-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));

        if (!poppler_field)
                return NULL;
 
        text = poppler_form_field_choice_get_item (poppler_field, index);
        if (!poppler_field)
                return NULL;
 
        text = poppler_form_field_choice_get_item (poppler_field, index);

-       g_object_unref (poppler_field);

 
        return text;
 }
 
        return text;
 }


@@ -2226,16 +2197,14 @@ static int
 pdf_document_forms_form_field_choice_get_n_items (EvDocumentForms *document, 
                                                  EvFormField     *field)
 {
 pdf_document_forms_form_field_choice_get_n_items (EvDocumentForms *document, 
                                                  EvFormField     *field)
 {

-       PdfDocument *pdf_document = PDF_DOCUMENT (document);

        PopplerFormField *poppler_field;
        gint n_items;
 
        PopplerFormField *poppler_field;
        gint n_items;
 

-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));

        if (!poppler_field)
                return -1;
        
        n_items = poppler_form_field_choice_get_n_items (poppler_field);
        if (!poppler_field)
                return -1;
        
        n_items = poppler_form_field_choice_get_n_items (poppler_field);

-       g_object_unref (poppler_field);

 
        return n_items;
 }
 
        return n_items;
 }


@@ -2245,16 +2214,14 @@ pdf_document_forms_form_field_choice_is_item_selected (EvDocumentForms *document
                                                       EvFormField     *field,
                                                       gint             index)
 {
                                                       EvFormField     *field,
                                                       gint             index)
 {

-       PdfDocument *pdf_document = PDF_DOCUMENT (document);

        PopplerFormField *poppler_field;
        gboolean selected;
 
        PopplerFormField *poppler_field;
        gboolean selected;
 

-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));

        if (!poppler_field)
                return FALSE;
 
        selected = poppler_form_field_choice_is_item_selected (poppler_field, index);
        if (!poppler_field)
                return FALSE;
 
        selected = poppler_form_field_choice_is_item_selected (poppler_field, index);

-       g_object_unref (poppler_field);

 
        return selected;
 }
 
        return selected;
 }


@@ -2264,15 +2231,13 @@ pdf_document_forms_form_field_choice_select_item (EvDocumentForms *document,
                                                  EvFormField     *field,
                                                  gint             index)
 {
                                                  EvFormField     *field,
                                                  gint             index)
 {

-       PdfDocument *pdf_document = PDF_DOCUMENT (document);

        PopplerFormField *poppler_field;
 
        PopplerFormField *poppler_field;
 

-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));

        if (!poppler_field)
                return;
 
        poppler_form_field_choice_select_item (poppler_field, index);
        if (!poppler_field)
                return;
 
        poppler_form_field_choice_select_item (poppler_field, index);

-       g_object_unref (poppler_field);

 }
 
 static void
 }
 
 static void


@@ -2280,30 +2245,26 @@ pdf_document_forms_form_field_choice_toggle_item (EvDocumentForms *document,
                                                  EvFormField     *field,
                                                  gint             index)
 {
                                                  EvFormField     *field,
                                                  gint             index)
 {

-       PdfDocument *pdf_document = PDF_DOCUMENT (document);

        PopplerFormField *poppler_field;
 
        PopplerFormField *poppler_field;
 

-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));

        if (!poppler_field)
                return;
 
        poppler_form_field_choice_toggle_item (poppler_field, index);
        if (!poppler_field)
                return;
 
        poppler_form_field_choice_toggle_item (poppler_field, index);

-       g_object_unref (poppler_field);

 }
 
 static void
 pdf_document_forms_form_field_choice_unselect_all (EvDocumentForms *document, 
                                                   EvFormField     *field)
 {
 }
 
 static void
 pdf_document_forms_form_field_choice_unselect_all (EvDocumentForms *document, 
                                                   EvFormField     *field)
 {

-       PdfDocument *pdf_document = PDF_DOCUMENT (document);

        PopplerFormField *poppler_field;
 
        PopplerFormField *poppler_field;
 

-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));

        if (!poppler_field)
                return;
        
        poppler_form_field_choice_unselect_all (poppler_field);
        if (!poppler_field)
                return;
        
        poppler_form_field_choice_unselect_all (poppler_field);

-       g_object_unref (poppler_field);

 }
 
 static void
 }
 
 static void


@@ -2311,31 +2272,27 @@ pdf_document_forms_form_field_choice_set_text (EvDocumentForms *document,
                                               EvFormField     *field,
                                               const gchar     *text)
 {
                                               EvFormField     *field,
                                               const gchar     *text)
 {

-       PdfDocument *pdf_document = PDF_DOCUMENT (document);

        PopplerFormField *poppler_field;
 
        PopplerFormField *poppler_field;
 

-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));

        if (!poppler_field)
                return;
        
        poppler_form_field_choice_set_text (poppler_field, text);
        if (!poppler_field)
                return;
        
        poppler_form_field_choice_set_text (poppler_field, text);

-       g_object_unref (poppler_field);

 }
 
 static gchar *
 pdf_document_forms_form_field_choice_get_text (EvDocumentForms *document,
                                               EvFormField     *field)
 {
 }
 
 static gchar *
 pdf_document_forms_form_field_choice_get_text (EvDocumentForms *document,
                                               EvFormField     *field)
 {

-       PdfDocument *pdf_document = PDF_DOCUMENT (document);

        PopplerFormField *poppler_field;
        gchar *text;
 
        PopplerFormField *poppler_field;
        gchar *text;
 

-       poppler_field = poppler_document_get_form_field (pdf_document->document, field->id);
+       poppler_field = POPPLER_FORM_FIELD (g_object_get_data (G_OBJECT (field), "poppler-field"));

        if (!poppler_field)
                return NULL;
 
        text = poppler_form_field_choice_get_text (poppler_field);
        if (!poppler_field)
                return NULL;
 
        text = poppler_form_field_choice_get_text (poppler_field);

-       g_object_unref (poppler_field);

 
        return text;
 }
 
        return text;
 }


@@ -2358,3 +2315,156 @@ 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;
 }
 

+/* Layers */
+static gboolean
+pdf_document_layers_has_layers (EvDocumentLayers *document)
+{
+#ifdef HAVE_POPPLER_LAYERS_ITER_NEW
+       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;
+#else
+       return FALSE;
+#endif /* HAVE_POPPLER_LAYERS_ITER_NEW */
+}
+
+#ifdef HAVE_POPPLER_LAYERS_ITER_NEW
+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));
+}
+#endif /* HAVE_POPPLER_LAYERS_ITER_NEW */
+
+static GtkTreeModel *
+pdf_document_layers_get_layers (EvDocumentLayers *document)
+{
+       GtkTreeModel *model = NULL;
+#ifdef HAVE_POPPLER_LAYERS_ITER_NEW
+       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);
+       }
+       
+#endif
+       return model;
+}
+
+static void
+pdf_document_layers_show_layer (EvDocumentLayers *document,
+                               EvLayer          *layer)
+{
+#ifdef HAVE_POPPLER_LAYERS_ITER_NEW
+       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)));
+#else
+       return;
+#endif /* HAVE_POPPLER_LAYERS_ITER_NEW */
+}
+
+static void
+pdf_document_layers_hide_layer (EvDocumentLayers *document,
+                               EvLayer          *layer)
+{
+#ifdef HAVE_POPPLER_LAYERS_ITER_NEW
+       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)));
+#else
+       return;
+#endif /* HAVE_POPPLER_LAYERS_ITER_NEW */
+}
+
+static gboolean
+pdf_document_layers_layer_is_visible (EvDocumentLayers *document,
+                                     EvLayer          *layer)
+{
+#ifdef HAVE_POPPLER_LAYERS_ITER_NEW
+       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)));
+#else
+       return FALSE;
+#endif /* HAVE_POPPLER_LAYERS_ITER_NEW */
+}
+
+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;
+}