]> www.fi.muni.cz Git - evince.git/blobdiff - pdf/ev-poppler.cc
Translation updated by Wouter Bolsterlee.
[evince.git] / pdf / ev-poppler.cc
index a4033881b314680334ea9c03be6ce426c88eedd4..a4be75ee9b7eb6323039b9e64fbe5fdec46e6c9f 100644 (file)
@@ -33,6 +33,8 @@
 #include "ev-document-fonts.h"
 #include "ev-document-security.h"
 #include "ev-document-thumbnails.h"
+#include "ev-selection.h"
+#include "ev-attachment.h"
 
 typedef struct {
        PdfDocument *document;
@@ -56,6 +58,10 @@ struct _PdfDocument
        PopplerPSFile *ps_file;
        gchar *password;
 
+       PopplerFontInfo *font_info;
+       PopplerFontsIter *fonts_iter;
+       int fonts_scanned_pages;
+
        PdfDocumentSearch *search;
 };
 
@@ -66,12 +72,16 @@ static void pdf_document_document_links_iface_init      (EvDocumentLinksIface
 static void pdf_document_document_fonts_iface_init      (EvDocumentFontsIface      *iface);
 static void pdf_document_find_iface_init                (EvDocumentFindIface       *iface);
 static void pdf_document_ps_exporter_iface_init         (EvPSExporterIface         *iface);
+static void pdf_selection_iface_init                    (EvSelectionIface          *iface);
 static void pdf_document_thumbnails_get_dimensions      (EvDocumentThumbnails      *document_thumbnails,
                                                         gint                       page,
                                                         gint                       size,
                                                         gint                      *width,
                                                         gint                      *height);
+static int  pdf_document_get_n_pages                   (EvDocument                *document);
+
 static EvLink * ev_link_from_action (PopplerAction *action);
+static void pdf_document_search_free (PdfDocumentSearch   *search);
 
 
 G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
@@ -90,16 +100,64 @@ G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
                                                        pdf_document_find_iface_init);
                                 G_IMPLEMENT_INTERFACE (EV_TYPE_PS_EXPORTER,
                                                        pdf_document_ps_exporter_iface_init);
+                                G_IMPLEMENT_INTERFACE (EV_TYPE_SELECTION,
+                                                       pdf_selection_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)
+{
+        PdfDocument *pdf_document = search->document;
+       int n_pages;
+       int i;
+
+        if (search->idle != 0)
+                g_source_remove (search->idle);
+
+       n_pages = pdf_document_get_n_pages (EV_DOCUMENT (pdf_document));
+       for (i = 0; i < n_pages; i++) {
+               g_list_foreach (search->pages[i], (GFunc) g_free, NULL);
+               g_list_free (search->pages[i]);
+       }
+       
+        g_free (search->text);
+}
+
 static void
 pdf_document_dispose (GObject *object)
 {
        PdfDocument *pdf_document = PDF_DOCUMENT(object);
 
+       if (pdf_document->search) {
+               pdf_document_search_free (pdf_document->search);
+               pdf_document->search = NULL;
+       }
+
        if (pdf_document->document) {
                g_object_unref (pdf_document->document);
        }
+
+       if (pdf_document->font_info) { 
+               poppler_font_info_free (pdf_document->font_info);
+       }
+
+       if (pdf_document->fonts_iter) {
+               poppler_fonts_iter_free (pdf_document->fonts_iter);
+       }
 }
 
 static void
@@ -192,12 +250,12 @@ pdf_document_get_page_size (EvDocument   *document,
                            double       *width,
                            double       *height)
 {
+       PdfDocument *pdf_document = PDF_DOCUMENT (document);
        PopplerPage *poppler_page;
 
-       poppler_page = poppler_document_get_page (PDF_DOCUMENT (document)->document,
-                                                 page);
-
+       poppler_page = poppler_document_get_page (pdf_document->document, page);
        poppler_page_get_size (poppler_page, width, height);
+       g_object_unref (poppler_page);
 }
 
 static char *
@@ -213,6 +271,7 @@ pdf_document_get_page_label (EvDocument *document,
        g_object_get (G_OBJECT (poppler_page),
                      "label", &label,
                      NULL);
+       g_object_unref (poppler_page);
 
        return label;
 }
@@ -251,41 +310,162 @@ pdf_document_get_links (EvDocument *document,
        }
 
        poppler_page_free_link_mapping (mapping_list);
+       g_object_unref (poppler_page);
 
        return g_list_reverse (retval);
 }
+
+static gboolean
+pdf_document_has_attachments (EvDocument *document)
+{
+       PdfDocument *pdf_document;
+
+       pdf_document = PDF_DOCUMENT (document);
+
+       return poppler_document_has_attachments (pdf_document->document);
+}
+
+struct SaveToBufferData {
+       gchar *buffer;
+       gsize len, max;
+};
+
+static gboolean
+attachment_save_to_buffer_callback (const gchar  *buf,
+                                   gsize         count,
+                                   gpointer      user_data,
+                                   GError      **error)
+{
+       struct SaveToBufferData *sdata = (SaveToBufferData *)user_data;
+       gchar *new_buffer;
+       gsize new_max;
+
+       if (sdata->len + count > sdata->max) {
+               new_max = MAX (sdata->max * 2, sdata->len + count);
+               new_buffer = (gchar *)g_realloc (sdata->buffer, new_max);
+
+               sdata->buffer = new_buffer;
+               sdata->max = new_max;
+       }
+       
+       memcpy (sdata->buffer + sdata->len, buf, count);
+       sdata->len += count;
+       
+       return TRUE;
+}
+
+static gboolean
+attachment_save_to_buffer (PopplerAttachment  *attachment,
+                          gchar             **buffer,
+                          gsize              *buffer_size,
+                          GError            **error)
+{
+       static const gint initial_max = 1024;
+       struct SaveToBufferData sdata;
+
+       *buffer = NULL;
+       *buffer_size = 0;
+
+       sdata.buffer = (gchar *) g_malloc (initial_max);
+       sdata.max = initial_max;
+       sdata.len = 0;
+
+       if (! poppler_attachment_save_to_callback (attachment,
+                                                  attachment_save_to_buffer_callback,
+                                                  &sdata,
+                                                  error)) {
+               g_free (sdata.buffer);
+               return FALSE;
+       }
+
+       *buffer = sdata.buffer;
+       *buffer_size = sdata.len;
+       
+       return TRUE;
+}
+
+static GList *
+pdf_document_get_attachments (EvDocument *document)
+{
+       PdfDocument *pdf_document;
+       GList *attachments;
+       GList *list;
+       GList *retval = NULL;
+
+       pdf_document = PDF_DOCUMENT (document);
+
+       if (!pdf_document_has_attachments (document))
+               return NULL;
+
+       attachments = poppler_document_get_attachments (pdf_document->document);
+       
+       for (list = attachments; list; list = list->next) {
+               PopplerAttachment *attachment;
+               EvAttachment *ev_attachment;
+               gchar *data = NULL;
+               gsize size;
+               GError *error = NULL;
+
+               attachment = (PopplerAttachment *) list->data;
+
+               if (attachment_save_to_buffer (attachment, &data, &size, &error)) {
+                       ev_attachment = ev_attachment_new (attachment->name,
+                                                          attachment->description,
+                                                          attachment->mtime,
+                                                          attachment->ctime,
+                                                          size, data);
                        
+                       retval = g_list_prepend (retval, ev_attachment);
+               } else {
+                       if (error) {
+                               g_warning ("%s", error->message);
+                               g_error_free (error);
+
+                               g_free (data);
+                       }
+               }
+
+               g_object_unref (attachment);
+       }
+
+       return g_list_reverse (retval);
+}
 
 static GdkPixbuf *
 pdf_document_render_pixbuf (EvDocument   *document,
-                           int           page,
-                           double        scale)
+                           EvRenderContext *rc)
 {
        PdfDocument *pdf_document;
-       PopplerPage *poppler_page;
        GdkPixbuf *pixbuf;
        double width_points, height_points;
        gint width, height;
 
        pdf_document = PDF_DOCUMENT (document);
-       poppler_page = poppler_document_get_page (pdf_document->document,
-                                                 page);
 
-       poppler_page_get_size (poppler_page, &width_points, &height_points);
-       width = (int) ((width_points * scale) + 0.5);
-       height = (int) ((height_points * scale) + 0.5);
+       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);
+       }
 
        pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
                                 FALSE, 8,
                                 width, height);
 
-       poppler_page_render_to_pixbuf (poppler_page,
+       poppler_page_render_to_pixbuf (POPPLER_PAGE (rc->data),
                                       0, 0,
                                       width, height,
-                                      scale,
-                                      pixbuf,
-                                      0, 0);
-
+                                      rc->scale,
+                                      rc->rotation,
+                                      pixbuf);
+       
+       
        return pixbuf;
 }
 
@@ -460,6 +640,7 @@ pdf_document_get_text (EvDocument *document, int page, EvRectangle *rect)
        PopplerPage *poppler_page;
        PopplerRectangle r;
        double height;
+       char *text;
        
        poppler_page = poppler_document_get_page (pdf_document->document, page);
        g_return_val_if_fail (poppler_page != NULL, NULL);
@@ -470,7 +651,11 @@ pdf_document_get_text (EvDocument *document, int page, EvRectangle *rect)
        r.x2 = rect->x2;
        r.y2 = height - rect->y1;
 
-       return poppler_page_get_text (poppler_page, &r);
+       text = poppler_page_get_text (poppler_page, &r);
+
+       g_object_unref (poppler_page);
+
+       return text;
 }
 
 static void
@@ -482,6 +667,8 @@ pdf_document_document_iface_init (EvDocumentIface *iface)
        iface->get_page_size = pdf_document_get_page_size;
        iface->get_page_label = pdf_document_get_page_label;
        iface->get_links = pdf_document_get_links;
+       iface->has_attachments = pdf_document_has_attachments;
+       iface->get_attachments = pdf_document_get_attachments;
        iface->render_pixbuf = pdf_document_render_pixbuf;
        iface->get_text = pdf_document_get_text;
        iface->can_get_text = pdf_document_can_get_text;
@@ -495,53 +682,126 @@ pdf_document_security_iface_init (EvDocumentSecurityIface *iface)
        iface->set_password = pdf_document_set_password;
 }
 
+static gdouble
+pdf_document_fonts_get_progress (EvDocumentFonts *document_fonts)
+{
+       PdfDocument *pdf_document = PDF_DOCUMENT (document_fonts);
+       int n_pages;
+
+        n_pages = pdf_document_get_n_pages (EV_DOCUMENT (pdf_document));
+
+       return (double)pdf_document->fonts_scanned_pages / (double)n_pages;
+}
+
+static gboolean
+pdf_document_fonts_scan (EvDocumentFonts *document_fonts,
+                        int              n_pages)
+{
+       PdfDocument *pdf_document = PDF_DOCUMENT (document_fonts);
+       gboolean result;
+
+       g_return_val_if_fail (PDF_IS_DOCUMENT (document_fonts), FALSE);
+
+       if (pdf_document->font_info == NULL) { 
+               pdf_document->font_info = poppler_font_info_new (pdf_document->document);
+       }
+
+       if (pdf_document->fonts_iter) {
+               poppler_fonts_iter_free (pdf_document->fonts_iter);
+       }
+
+       pdf_document->fonts_scanned_pages += n_pages;
+
+       result = poppler_font_info_scan (pdf_document->font_info, n_pages,
+                                        &pdf_document->fonts_iter);
+       if (!result) {
+               pdf_document->fonts_scanned_pages = 0;
+               poppler_font_info_free (pdf_document->font_info);
+               pdf_document->font_info = NULL; 
+       }
+
+       return result;
+}
+
+static const char *
+font_type_to_string (PopplerFontType type)
+{
+       switch (type)
+       {
+       case POPPLER_FONT_TYPE_TYPE1:
+               return _("Type 1");
+       case POPPLER_FONT_TYPE_TYPE1C:
+               return _("Type 1C");
+       case POPPLER_FONT_TYPE_TYPE3:
+               return _("Type 3");
+       case POPPLER_FONT_TYPE_TRUETYPE:
+               return _("TrueType");
+       case POPPLER_FONT_TYPE_CID_TYPE0:
+               return _("Type 1 (CID)");
+       case POPPLER_FONT_TYPE_CID_TYPE0C:
+               return _("Type 1C (CID)");
+       case POPPLER_FONT_TYPE_CID_TYPE2:
+               return _("TrueType (CID)");
+       default:
+               return _("Unknown font type");
+       }
+}
+
 static void
-build_fonts_list (PdfDocument      *pdf_document,
-                 GtkTreeModel     *model,
-                 GtkTreeIter      *parent,
-                 PopplerFontsIter *iter)
+pdf_document_fonts_fill_model (EvDocumentFonts *document_fonts,
+                              GtkTreeModel    *model)
 {
-#ifdef POPPLER_FONT_INFO
+       PdfDocument *pdf_document = PDF_DOCUMENT (document_fonts);
+       PopplerFontsIter *iter = pdf_document->fonts_iter;
+
+       g_return_if_fail (PDF_IS_DOCUMENT (document_fonts));
+
+       if (!iter)
+               return;
+
        do {
                GtkTreeIter list_iter;
-               PopplerIndexIter *child;
-               char *name;
+               const char *name;
+               const char *type;
+               const char *embedded;
+               char *details;
                
                name = poppler_fonts_iter_get_name (iter);
+
+               if (name == NULL) {
+                       name = _("No name");
+               }
+
+               type = font_type_to_string (
+                       poppler_fonts_iter_get_font_type (iter));
+
+               if (poppler_fonts_iter_is_embedded (iter)) {
+                       if (poppler_fonts_iter_is_subset (iter))
+                               embedded = _("Embedded subset");
+                       else
+                               embedded = _("Embedded");
+               } else {
+                       embedded = _("Not embedded");
+               }
+
+               details = g_markup_printf_escaped ("%s\n%s", type, embedded);
+
                gtk_list_store_append (GTK_LIST_STORE (model), &list_iter);
                gtk_list_store_set (GTK_LIST_STORE (model), &list_iter,
                                    EV_DOCUMENT_FONTS_COLUMN_NAME, name,
+                                   EV_DOCUMENT_FONTS_COLUMN_DETAILS, details,
                                    -1);
-               g_free (name);
-       } while (poppler_fonts_iter_next (iter));
-#endif
-}
-
-static GtkTreeModel *
-pdf_document_fonts_get_fonts_model (EvDocumentFonts *document_fonts)
-{
-       PdfDocument *pdf_document = PDF_DOCUMENT (document_fonts);
-       GtkTreeModel *model = NULL;
-       PopplerFontsIter *iter;
-
-       g_return_val_if_fail (PDF_IS_DOCUMENT (document_fonts), NULL);
-
-       iter = poppler_fonts_iter_new (pdf_document->document);
-       /* Create the model iff we have items*/
-       if (iter != NULL) {
-               model = (GtkTreeModel *) gtk_list_store_new (EV_DOCUMENT_FONTS_COLUMN_NUM_COLUMNS,
-                                                            G_TYPE_STRING);
-               build_fonts_list (pdf_document, model, NULL, iter);
-               poppler_fonts_iter_free (iter);
-       }
 
-       return model;
+               g_free (details);
+       } while (poppler_fonts_iter_next (iter));
 }
 
 static void
 pdf_document_document_fonts_iface_init (EvDocumentFontsIface *iface)
 {
-       iface->get_fonts_model = pdf_document_fonts_get_fonts_model;
+       iface->fill_model = pdf_document_fonts_fill_model;
+       iface->scan = pdf_document_fonts_scan;
+       iface->get_progress = pdf_document_fonts_get_progress;
 }
 
 static gboolean
@@ -560,19 +820,108 @@ pdf_document_links_has_document_links (EvDocumentLinks *document_links)
        return TRUE;
 }
 
+static EvLink *
+ev_link_from_dest (PopplerAction *action)
+{
+       EvLink *link = NULL;
+       const char *unimplemented_dest = NULL;
+
+       switch (action->goto_dest.dest->type) {
+       case POPPLER_DEST_UNKNOWN:
+               unimplemented_dest = "POPPLER_DEST_UNKNOWN";
+               break;
+       case POPPLER_DEST_XYZ:
+               link = ev_link_new_page_xyz (action->any.title,
+                                            action->goto_dest.dest->page_num - 1,
+                                            action->goto_dest.dest->left,
+                                            action->goto_dest.dest->top,
+                                            action->goto_dest.dest->zoom);
+               break;
+       case POPPLER_DEST_FIT:
+               link = ev_link_new_page_fit (action->any.title,
+                                            action->goto_dest.dest->page_num - 1);
+               break;
+       case POPPLER_DEST_FITH:
+               link = ev_link_new_page_fith (action->any.title,
+                                             action->goto_dest.dest->page_num - 1,
+                                             action->goto_dest.dest->top);
+               break;
+       case POPPLER_DEST_FITV:
+               link = ev_link_new_page_fitv (action->any.title,
+                                             action->goto_dest.dest->page_num - 1,
+                                             action->goto_dest.dest->left);
+               break;
+       case POPPLER_DEST_FITR:
+               link = ev_link_new_page_fitr (action->any.title,
+                                             action->goto_dest.dest->page_num - 1,
+                                             action->goto_dest.dest->left,
+                                             action->goto_dest.dest->bottom,
+                                             action->goto_dest.dest->right,
+                                             action->goto_dest.dest->top);
+               break;
+       case POPPLER_DEST_FITB:
+               unimplemented_dest = "POPPLER_DEST_FITB";
+               break;
+       case POPPLER_DEST_FITBH:
+               unimplemented_dest = "POPPLER_DEST_FITBH";
+               break;
+       case POPPLER_DEST_FITBV:
+               unimplemented_dest = "POPPLER_DEST_FITBV";
+               break;
+       }
+
+       if (unimplemented_dest) {
+               g_warning ("Unimplemented destination: %s, please post a bug report with a testcase.",
+                          unimplemented_dest);
+       }
+
+       if (link == NULL) {
+               link = ev_link_new_page (action->any.title, action->goto_dest.dest->page_num - 1);
+       }
+
+       return link;
+}
+
 static EvLink *
 ev_link_from_action (PopplerAction *action)
 {
-       EvLink *link;
+       EvLink *link = NULL;
        const char *title;
+       const char *unimplemented_action = NULL;
 
        title = action->any.title;
-       
-       if (action->type == POPPLER_ACTION_GOTO_DEST) {
-               link = ev_link_new_page (title, action->goto_dest.dest->page_num - 1);
-       } else if (action->type == POPPLER_ACTION_URI) {
+
+       switch (action->type) {
+       case POPPLER_ACTION_UNKNOWN:
+               link = ev_link_new_title (title);
+               break;
+       case POPPLER_ACTION_GOTO_DEST:
+               link = ev_link_from_dest (action);
+               break;
+       case POPPLER_ACTION_GOTO_REMOTE:
+               unimplemented_action = "POPPLER_ACTION_GOTO_REMOTE";
+               break;
+       case POPPLER_ACTION_LAUNCH:
+               link = ev_link_new_launch (title, action->launch.file_name,
+                                          action->launch.params);
+               break;
+       case POPPLER_ACTION_URI:
                link = ev_link_new_external (title, action->uri.uri);
-       } else {
+               break;
+       case POPPLER_ACTION_NAMED:
+               unimplemented_action = "POPPLER_ACTION_NAMED";
+               break;
+       case POPPLER_ACTION_MOVIE:
+               unimplemented_action = "POPPLER_ACTION_MOVIE";
+               break;
+       }
+
+       if (unimplemented_action) {
+               g_warning ("Unimplemented action: %s, please post a bug report with a testcase.",
+                          unimplemented_action);
+       }
+
+       if (link == NULL) {
                link = ev_link_new_title (title);
        }
 
@@ -591,17 +940,27 @@ build_tree (PdfDocument      *pdf_document,
                PopplerIndexIter *child;
                PopplerAction *action;
                EvLink *link;
+               gboolean expand;
                
                action = poppler_index_iter_get_action (iter);
+               expand = poppler_index_iter_is_open (iter);
                if (action) {
+                       char *title_markup;
+
                        gtk_tree_store_append (GTK_TREE_STORE (model), &tree_iter, parent);
                        link = ev_link_from_action (action);
                        poppler_action_free (action);
+                       title_markup = g_markup_escape_text (ev_link_get_title (link), -1);
 
                        gtk_tree_store_set (GTK_TREE_STORE (model), &tree_iter,
-                                           EV_DOCUMENT_LINKS_COLUMN_MARKUP, ev_link_get_title (link),
+                                           EV_DOCUMENT_LINKS_COLUMN_MARKUP, title_markup,
                                            EV_DOCUMENT_LINKS_COLUMN_LINK, link,
+                                           EV_DOCUMENT_LINKS_COLUMN_EXPAND, expand,
                                            -1);
+
+                       g_free (title_markup);
+                       g_object_unref (link);
+
                        child = poppler_index_iter_get_child (iter);
                        if (child)
                                build_tree (pdf_document, model, &tree_iter, child);
@@ -621,16 +980,16 @@ pdf_document_links_get_links_model (EvDocumentLinks *document_links)
        g_return_val_if_fail (PDF_IS_DOCUMENT (document_links), NULL);
 
        iter = poppler_index_iter_new (pdf_document->document);
-       /* Create the model iff we have items*/
+       /* Create the model if we have items*/
        if (iter != NULL) {
                model = (GtkTreeModel *) gtk_tree_store_new (EV_DOCUMENT_LINKS_COLUMN_NUM_COLUMNS,
                                                             G_TYPE_STRING,
-                                                            G_TYPE_POINTER);
+                                                            G_TYPE_OBJECT,
+                                                            G_TYPE_BOOLEAN);
                build_tree (pdf_document, model, NULL, iter);
                poppler_index_iter_free (iter);
        }
        
-
        return model;
 }
 
@@ -642,42 +1001,43 @@ pdf_document_document_links_iface_init (EvDocumentLinksIface *iface)
 }
 
 static GdkPixbuf *
-make_thumbnail_for_size (PdfDocument *pdf_document,
-                        gint         page,
-                        gint         size,
-                        gboolean     border)
+make_thumbnail_for_size (PdfDocument   *pdf_document,
+                        gint           page,
+                        int            rotation,
+                        gint           size)
 {
        PopplerPage *poppler_page;
        GdkPixbuf *pixbuf;
        int width, height;
-       int x_offset, y_offset;
        double scale;
        gdouble unscaled_width, unscaled_height;
 
        poppler_page = poppler_document_get_page (pdf_document->document, page);
-
        g_return_val_if_fail (poppler_page != NULL, NULL);
 
-       pdf_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (pdf_document), page, size, &width, &height);
+       pdf_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (pdf_document), page,
+                                               size, &width, &height);
        poppler_page_get_size (poppler_page, &unscaled_width, &unscaled_height);
        scale = width / unscaled_width;
 
-       if (border) {
-               pixbuf = ev_document_misc_get_thumbnail_frame (width, height, NULL);
-               x_offset = 1;
-               y_offset = 1;
-       } else {
-               pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
-                                        width, height);
-               gdk_pixbuf_fill (pixbuf, 0xffffffff);
-               x_offset = 0;
-               y_offset = 0;
+       /* rotate */
+       if (rotation == 90 || rotation == 270) {
+               int temp;
+               temp = width;
+               width = height;
+               height = temp;
        }
 
+       pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
+                                width, height);
+       gdk_pixbuf_fill (pixbuf, 0xffffffff);
+
        poppler_page_render_to_pixbuf (poppler_page, 0, 0,
                                       width, height,
-                                      scale, pixbuf,
-                                      x_offset, y_offset);
+                                      scale, rotation, pixbuf);
+       
+
+       g_object_unref (poppler_page);
 
        return pixbuf;
 }
@@ -685,12 +1045,14 @@ make_thumbnail_for_size (PdfDocument *pdf_document,
 static GdkPixbuf *
 pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails,
                                       gint                  page,
+                                      gint                  rotation,
                                       gint                  size,
-                                      gboolean              border)
+                                      gboolean              border)
 {
        PdfDocument *pdf_document;
        PopplerPage *poppler_page;
        GdkPixbuf *pixbuf;
+       GdkPixbuf *border_pixbuf;
 
        pdf_document = PDF_DOCUMENT (document_thumbnails);
 
@@ -698,19 +1060,20 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails
        g_return_val_if_fail (poppler_page != NULL, NULL);
 
        pixbuf = poppler_page_get_thumbnail (poppler_page);
-       if (pixbuf != NULL) {
-               /* The document provides its own thumbnails. */
-               if (border) {
-                       GdkPixbuf *real_pixbuf;
-
-                       real_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, pixbuf);
-                       g_object_unref (pixbuf);
-                       pixbuf = real_pixbuf;
-               }
-       } else {
+       
+       if (pixbuf == NULL) {
                /* There is no provided thumbnail.  We need to make one. */
-               pixbuf = make_thumbnail_for_size (pdf_document, page, size, border);
+               pixbuf = make_thumbnail_for_size (pdf_document, page, rotation, size);
        }
+
+        if (border) {          
+               border_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, rotation, pixbuf);
+               g_object_unref (pixbuf);
+               pixbuf = border_pixbuf;
+       }               
+
+       g_object_unref (poppler_page);
+       
        return pixbuf;
 }
 
@@ -738,14 +1101,10 @@ pdf_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnail
                double page_width, page_height;
 
                poppler_page_get_size (poppler_page, &page_width, &page_height);
-               if (page_width > page_height) {
-                       *width = size;
-                       *height = (int) (size * page_height / page_width);
-               } else {
-                       *width = (int) (size * page_width / page_height);
-                       *height = size;
-               }
+               *width = size;
+               *height = (int) (size * page_height / page_width);
        }
+       g_object_unref (poppler_page);
 }
 
 static void
@@ -772,6 +1131,8 @@ pdf_document_search_idle_callback (void *data)
        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);
@@ -826,25 +1187,6 @@ pdf_document_search_new (PdfDocument *pdf_document,
        return search;
 }
 
-static void
-pdf_document_search_free (PdfDocumentSearch   *search)
-{
-        PdfDocument *pdf_document = search->document;
-       int n_pages;
-       int i;
-
-        if (search->idle != 0)
-                g_source_remove (search->idle);
-
-       n_pages = pdf_document_get_n_pages (EV_DOCUMENT (pdf_document));
-       for (i = 0; i < n_pages; i++) {
-               g_list_foreach (search->pages[i], (GFunc) g_free, NULL);
-               g_list_free (search->pages[i]);
-       }
-       
-        g_free (search->text);
-}
-
 static void
 pdf_document_find_begin (EvDocumentFind   *document,
                         int               page,
@@ -908,7 +1250,8 @@ pdf_document_find_get_result (EvDocumentFind *document_find,
        rectangle->y1 = height - r->y2;
        rectangle->x2 = r->x2;
        rectangle->y2 = height - r->y1;
-       
+       g_object_unref (poppler_page);
+               
        return TRUE;
 }
 
@@ -918,9 +1261,7 @@ pdf_document_find_page_has_results (EvDocumentFind *document_find,
 {
        PdfDocumentSearch *search = PDF_DOCUMENT (document_find)->search;
 
-       g_return_val_if_fail (search != NULL, FALSE);
-
-       return search->pages[page] != NULL;
+       return search && search->pages[page] != NULL;
 }
 
 double
@@ -971,25 +1312,29 @@ pdf_document_find_iface_init (EvDocumentFindIface *iface)
 
 static void
 pdf_document_ps_exporter_begin (EvPSExporter *exporter, const char *filename,
-                               int first_page, int last_page)
+                               int first_page, int last_page,
+                               double width, double height, gboolean duplex)
 {
        PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
        
        pdf_document->ps_file = poppler_ps_file_new (pdf_document->document, filename,
                                                     first_page,
                                                     last_page - first_page + 1);
+       poppler_ps_file_set_paper_size (pdf_document->ps_file, width, height);
+       poppler_ps_file_set_duplex (pdf_document->ps_file, duplex);
 }
 
 static void
-pdf_document_ps_exporter_do_page (EvPSExporter *exporter, int page)
+pdf_document_ps_exporter_do_page (EvPSExporter *exporter, EvRenderContext *rc)
 {
        PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
        PopplerPage *poppler_page;
 
        g_return_if_fail (pdf_document->ps_file != NULL);
 
-       poppler_page = poppler_document_get_page (pdf_document->document, page);
+       poppler_page = poppler_document_get_page (pdf_document->document, rc->page);
        poppler_page_render_to_ps (poppler_page, pdf_document->ps_file);
+       g_object_unref (poppler_page);
 }
 
 static void
@@ -1009,6 +1354,89 @@ pdf_document_ps_exporter_iface_init (EvPSExporterIface *iface)
         iface->end = pdf_document_ps_exporter_end;
 }
 
+
+void
+pdf_selection_render_selection (EvSelection      *selection,
+                               EvRenderContext  *rc,
+                               GdkPixbuf       **pixbuf,
+                               EvRectangle      *points,
+                               EvRectangle      *old_points,
+                               GdkColor        *text,
+                               GdkColor        *base)
+{
+       PdfDocument *pdf_document;
+       double width_points, height_points;
+       gint width, height;
+
+       pdf_document = PDF_DOCUMENT (selection);
+       set_rc_data (pdf_document, rc);
+
+       poppler_page_get_size (POPPLER_PAGE (rc->data), &width_points, &height_points);
+       width = (int) ((width_points * rc->scale) + 0.5);
+       height = (int) ((height_points * rc->scale) + 0.5);
+
+       if (*pixbuf == NULL) {
+               * pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+                                          TRUE, 8,
+                                          width, height);
+       }
+       
+       poppler_page_render_selection (POPPLER_PAGE (rc->data),
+                                      rc->scale, rc->rotation, *pixbuf,
+                                      (PopplerRectangle *)points,
+                                      (PopplerRectangle *)old_points,
+                                      text,
+                                      base);
+}
+
+
+GdkRegion *
+pdf_selection_get_selection_region (EvSelection     *selection,
+                                   EvRenderContext *rc,
+                                   EvRectangle     *points)
+{
+       PdfDocument *pdf_document;
+       GdkRegion *retval;
+
+       pdf_document = PDF_DOCUMENT (selection);
+
+       set_rc_data (pdf_document, rc);
+
+       retval = poppler_page_get_selection_region ((PopplerPage *)rc->data, rc->scale, (PopplerRectangle *) points);
+
+       return retval;
+}
+
+GdkRegion *
+pdf_selection_get_selection_map (EvSelection     *selection,
+                                EvRenderContext *rc)
+{
+       PdfDocument *pdf_document;
+       PopplerPage *poppler_page;
+       PopplerRectangle points;
+       GdkRegion *retval;
+
+       pdf_document = PDF_DOCUMENT (selection);
+       poppler_page = poppler_document_get_page (pdf_document->document,
+                                                 rc->page);
+
+       points.x1 = 0.0;
+       points.y1 = 0.0;
+       poppler_page_get_size (poppler_page, &(points.x2), &(points.y2));
+       retval = poppler_page_get_selection_region (poppler_page, 1.0, &points);
+       g_object_unref (poppler_page);
+
+       return retval;
+}
+
+static void
+pdf_selection_iface_init (EvSelectionIface *iface)
+{
+        iface->render_selection = pdf_selection_render_selection;
+        iface->get_selection_region = pdf_selection_get_selection_region;
+        iface->get_selection_map = pdf_selection_get_selection_map;
+}
+
 PdfDocument *
 pdf_document_new (void)
 {