]> www.fi.muni.cz Git - evince.git/blobdiff - pdf/ev-poppler.cc
Use an specific lock for FontConfig. Hopefully it fixes some crashes
[evince.git] / pdf / ev-poppler.cc
index 5e95943eda7365be5e1046aa175ee7f20dedbd19..d4372ad6be7cbb1ffa66488676efc127697c6d52 100644 (file)
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <math.h>
 #include <string.h>
 #include <gtk/gtk.h>
 #include <poppler.h>
 #include <poppler-document.h>
 #include <poppler-page.h>
+#include <cairo-pdf.h>
 #include <glib/gi18n.h>
 
 #include "ev-poppler.h"
-#include "ev-ps-exporter.h"
+#include "ev-file-exporter.h"
 #include "ev-document-find.h"
 #include "ev-document-misc.h"
 #include "ev-document-links.h"
@@ -34,6 +37,7 @@
 #include "ev-document-security.h"
 #include "ev-document-thumbnails.h"
 #include "ev-selection.h"
+#include "ev-attachment.h"
 
 typedef struct {
        PdfDocument *document;
@@ -44,6 +48,12 @@ typedef struct {
        int search_page;
 } PdfDocumentSearch;
 
+typedef struct {
+       EvFileExporterFormat format;
+       PopplerPSFile *ps_file;
+       cairo_t *pdf_cairo;
+} PdfPrintContext;
+
 struct _PdfDocumentClass
 {
        GObjectClass parent_class;
@@ -54,7 +64,6 @@ struct _PdfDocument
        GObject parent_instance;
 
        PopplerDocument *document;
-       PopplerPSFile *ps_file;
        gchar *password;
 
        PopplerFontInfo *font_info;
@@ -62,6 +71,7 @@ struct _PdfDocument
        int fonts_scanned_pages;
 
        PdfDocumentSearch *search;
+       PdfPrintContext *print_ctx;
 };
 
 static void pdf_document_document_iface_init            (EvDocumentIface           *iface);
@@ -70,7 +80,7 @@ static void pdf_document_document_thumbnails_iface_init (EvDocumentThumbnailsIfa
 static void pdf_document_document_links_iface_init      (EvDocumentLinksIface      *iface);
 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_document_file_exporter_iface_init       (EvFileExporterIface       *iface);
 static void pdf_selection_iface_init                    (EvSelectionIface          *iface);
 static void pdf_document_thumbnails_get_dimensions      (EvDocumentThumbnails      *document_thumbnails,
                                                         gint                       page,
@@ -79,8 +89,12 @@ static void pdf_document_thumbnails_get_dimensions      (EvDocumentThumbnails
                                                         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);
+static EvLinkDest *ev_link_dest_from_dest   (PdfDocument       *pdf_document,
+                                            PopplerDest       *dest);
+static EvLink     *ev_link_from_action      (PdfDocument       *pdf_document,
+                                            PopplerAction     *action);
+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,
@@ -97,8 +111,8 @@ G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
                                                        pdf_document_document_fonts_iface_init);
                                 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FIND,
                                                        pdf_document_find_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_PS_EXPORTER,
-                                                       pdf_document_ps_exporter_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);
                         });
@@ -132,8 +146,10 @@ pdf_document_search_free (PdfDocumentSearch   *search)
                g_list_foreach (search->pages[i], (GFunc) g_free, NULL);
                g_list_free (search->pages[i]);
        }
+       g_free (search->pages);
        
-        g_free (search->text);
+       g_free (search->text);
+       g_free (search);
 }
 
 static void
@@ -141,6 +157,11 @@ pdf_document_dispose (GObject *object)
 {
        PdfDocument *pdf_document = PDF_DOCUMENT(object);
 
+       if (pdf_document->print_ctx) {
+               pdf_print_context_free (pdf_document->print_ctx);
+               pdf_document->print_ctx = NULL;
+       }
+       
        if (pdf_document->search) {
                pdf_document_search_free (pdf_document->search);
                pdf_document->search = NULL;
@@ -275,45 +296,121 @@ pdf_document_get_page_label (EvDocument *document,
        return label;
 }
 
+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_links (EvDocument *document,
-                       int         page)
+pdf_document_get_attachments (EvDocument *document)
 {
        PdfDocument *pdf_document;
-       PopplerPage *poppler_page;
-       GList *retval = NULL;
-       GList *mapping_list;
+       GList *attachments;
        GList *list;
-       double height;
+       GList *retval = NULL;
 
        pdf_document = PDF_DOCUMENT (document);
-       poppler_page = poppler_document_get_page (pdf_document->document,
-                                                 page);
-       mapping_list = poppler_page_get_link_mapping (poppler_page);
-       poppler_page_get_size (poppler_page, NULL, &height);
 
-       for (list = mapping_list; list; list = list->next) {
-               PopplerLinkMapping *link_mapping;
-               EvLinkMapping *ev_link_mapping;
+       if (!pdf_document_has_attachments (document))
+               return NULL;
 
-               link_mapping = (PopplerLinkMapping *)list->data;
-               ev_link_mapping = g_new (EvLinkMapping, 1);
-               ev_link_mapping->link = ev_link_from_action (link_mapping->action);
-               ev_link_mapping->x1 = link_mapping->area.x1;
-               ev_link_mapping->x2 = link_mapping->area.x2;
-               /* Invert this for X-style coordinates */
-               ev_link_mapping->y1 = height - link_mapping->area.y2;
-               ev_link_mapping->y2 = height - link_mapping->area.y1;
+       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);
 
-               retval = g_list_prepend (retval, ev_link_mapping);
-       }
+                               g_free (data);
+                       }
+               }
 
-       poppler_page_free_link_mapping (mapping_list);
-       g_object_unref (poppler_page);
+               g_object_unref (attachment);
+       }
 
        return g_list_reverse (retval);
 }
-                       
 
 static GdkPixbuf *
 pdf_document_render_pixbuf (EvDocument   *document,
@@ -406,8 +503,8 @@ pdf_document_get_info (EvDocument *document)
                            EV_DOCUMENT_INFO_MOD_DATE |
                            EV_DOCUMENT_INFO_LINEARIZED |
                            EV_DOCUMENT_INFO_N_PAGES |
-                           EV_DOCUMENT_INFO_SECURITY;
-
+                           EV_DOCUMENT_INFO_SECURITY | 
+                           EV_DOCUMENT_INFO_PAPER_SIZE;
 
        g_object_get (PDF_DOCUMENT (document)->document,
                      "title", &(info->title),
@@ -426,6 +523,14 @@ pdf_document_get_info (EvDocument *document)
                      "linearized", &(info->linearized),
                      NULL);
 
+       pdf_document_get_page_size(document, 0,
+                                  &(info->paper_width),
+                                  &(info->paper_height));
+
+       // 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:
                        info->layout = EV_DOCUMENT_LAYOUT_SINGLE_PAGE;
@@ -550,7 +655,8 @@ pdf_document_document_iface_init (EvDocumentIface *iface)
        iface->get_n_pages = pdf_document_get_n_pages;
        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;
@@ -608,24 +714,23 @@ pdf_document_fonts_scan (EvDocumentFonts *document_fonts,
 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");
+       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");
        }
 }
 
@@ -702,105 +807,143 @@ pdf_document_links_has_document_links (EvDocumentLinks *document_links)
        return TRUE;
 }
 
-static EvLink *
-ev_link_from_dest (PopplerAction *action)
+static EvLinkDest *
+ev_link_dest_from_dest (PdfDocument *pdf_document,
+                       PopplerDest *dest)
 {
-       EvLink *link = NULL;
+       EvLinkDest *ev_dest = 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:
-               unimplemented_dest = "POPPLER_DEST_FITR";
-               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;
+       g_assert (dest != NULL);
+
+       switch (dest->type) {
+               case POPPLER_DEST_XYZ: {
+                       PopplerPage *poppler_page;
+                       double height;
+
+                       poppler_page = poppler_document_get_page (pdf_document->document,
+                                                                 MAX (0, dest->page_num - 1));
+                       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);
+                       g_object_unref (poppler_page);
+               }
+                       break;
+               case POPPLER_DEST_FIT:
+                       ev_dest = ev_link_dest_new_fit (dest->page_num - 1);
+                       break;
+               case POPPLER_DEST_FITH: {
+                       PopplerPage *poppler_page;
+                       double height;
+
+                       poppler_page = poppler_document_get_page (pdf_document->document,
+                                                                 MAX (0, dest->page_num - 1));
+                       poppler_page_get_size (poppler_page, NULL, &height);
+                       ev_dest = ev_link_dest_new_fith (dest->page_num - 1,
+                                                        height - dest->top);
+                       g_object_unref (poppler_page);
+               }
+                       break;
+               case POPPLER_DEST_FITV:
+                       ev_dest = ev_link_dest_new_fitv (dest->page_num - 1,
+                                                        dest->left);
+                       break;
+               case POPPLER_DEST_FITR: {
+                       PopplerPage *poppler_page;
+                       double height;
+
+                       poppler_page = poppler_document_get_page (pdf_document->document,
+                                                                 MAX (0, dest->page_num - 1));
+                       poppler_page_get_size (poppler_page, NULL, &height);
+                       ev_dest = ev_link_dest_new_fitr (dest->page_num - 1,
+                                                        dest->left,
+                                                        height - dest->bottom,
+                                                        dest->right,
+                                                        height - dest->top);
+                       g_object_unref (poppler_page);
+               }
+                       break;
+               case POPPLER_DEST_FITB:
+                       unimplemented_dest = "POPPLER_DEST_FITB";
+                       break;
+               case POPPLER_DEST_FITBH:
+                       unimplemented_dest = "POPPLER_DEST_FITBH";
+                       break;
+               case POPPLER_DEST_FITBV:
+                       unimplemented_dest = "POPPLER_DEST_FITBV";
+                       break;
+               case POPPLER_DEST_NAMED:
+                       ev_dest = ev_link_dest_new_named (dest->named_dest);
+                       break;
+               case POPPLER_DEST_UNKNOWN:
+                       unimplemented_dest = "POPPLER_DEST_UNKNOWN";
+                       break;
        }
 
        if (unimplemented_dest) {
-               g_warning ("Unimplemented destination: %s, please post a bug report with a testcase.",
+               g_warning ("Unimplemented named action: %s, please post a "
+                          "bug report in Evince bugzilla "
+                          "(http://bugzilla.gnome.org) 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;
+       if (!ev_dest)
+               ev_dest = ev_link_dest_new_page (dest->page_num - 1);
+       
+       return ev_dest;
 }
 
 static EvLink *
-ev_link_from_action (PopplerAction *action)
+ev_link_from_action (PdfDocument   *pdf_document,
+                    PopplerAction *action)
 {
-       EvLink *link = NULL;
-       const char *title;
-       const char *unimplemented_action = NULL;
-
-       title = action->any.title;
+       EvLink       *link = NULL;
+       EvLinkAction *ev_action = NULL;
+       const char   *unimplemented_action = NULL;
 
        switch (action->type) {
-       case POPPLER_ACTION_UNKNOWN:
-               g_warning ("Unknown action"); 
-               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:
-               unimplemented_action = "POPPLER_ACTION_LAUNCH";
-               break;
-       case POPPLER_ACTION_URI:
-               link = ev_link_new_external (title, action->uri.uri);
-               break;
-       case POPPLER_ACTION_NAMED:
-               unimplemented_action = "POPPLER_ACTION_NAMED";
-               break;
-       case POPPLER_ACTION_MOVIE:
-               unimplemented_action = "POPPLER_ACTION_MOVIE";
-               break;
+               case POPPLER_ACTION_GOTO_DEST: {
+                       EvLinkDest *dest;
+                       
+                       dest = ev_link_dest_from_dest (pdf_document, action->goto_dest.dest);
+                       ev_action = ev_link_action_new_dest (dest);
+               }
+                       break;
+               case POPPLER_ACTION_GOTO_REMOTE: {
+                       EvLinkDest *dest;
+                       
+                       dest = ev_link_dest_from_dest (pdf_document, action->goto_remote.dest);
+                       ev_action = ev_link_action_new_remote (dest, 
+                                                              action->goto_remote.file_name);
+                       
+               }
+                       break;
+               case POPPLER_ACTION_LAUNCH:
+                       ev_action = ev_link_action_new_launch (action->launch.file_name,
+                                                              action->launch.params);
+                       break;
+               case POPPLER_ACTION_URI:
+                       ev_action = ev_link_action_new_external_uri (action->uri.uri);
+                       break;
+               case POPPLER_ACTION_NAMED:
+                       ev_action = ev_link_action_new_named (action->named.named_dest);
+                       break;
+               case POPPLER_ACTION_MOVIE:
+                       unimplemented_action = "POPPLER_ACTION_MOVIE";
+                       break;
+               case POPPLER_ACTION_UNKNOWN:
+                       unimplemented_action = "POPPLER_ACTION_UNKNOWN";
        }
-
+       
        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);
-       }
-
+       
+       link = ev_link_new (action->any.title, ev_action);
+       
        return link;    
 }
 
@@ -810,49 +953,84 @@ build_tree (PdfDocument      *pdf_document,
            GtkTreeIter      *parent,
            PopplerIndexIter *iter)
 {
-
+       
        do {
                GtkTreeIter tree_iter;
                PopplerIndexIter *child;
                PopplerAction *action;
-               EvLink *link;
+               EvLink *link = NULL;
                gboolean expand;
+               char *title_markup;
                
                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);
+               if (!action)
+                       continue;
+
+               switch (action->type) {
+                       case POPPLER_ACTION_GOTO_DEST: {
+                               /* For bookmarks, solve named destinations */
+                               if (action->goto_dest.dest->type == POPPLER_DEST_NAMED) {
+                                       PopplerDest *dest;
+                                       EvLinkDest *ev_dest = NULL;
+                                       EvLinkAction *ev_action;
+                                       
+                                       dest = poppler_document_find_dest (pdf_document->document,
+                                                                          action->goto_dest.dest->named_dest);
+                                       if (!dest) {
+                                               link = ev_link_from_action (pdf_document, action);
+                                               break;
+                                       }
+                                       
+                                       ev_dest = ev_link_dest_from_dest (pdf_document, dest);
+                                       poppler_dest_free (dest);
+                                       
+                                       ev_action = ev_link_action_new_dest (ev_dest);
+                                       link = ev_link_new (action->any.title, ev_action);
+                               } else {
+                                       link = ev_link_from_action (pdf_document, action);
+                               }
+                       }
+                               break;
+                       default:
+                               link = ev_link_from_action (pdf_document, action);
+                               break;
+               }
+               
+               if (!link) {
                        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, 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);
-                       poppler_index_iter_free (child);
+                       continue;
                }
+
+               gtk_tree_store_append (GTK_TREE_STORE (model), &tree_iter, parent);
+               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, 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);
+               poppler_index_iter_free (child);
+               poppler_action_free (action);
+               
        } while (poppler_index_iter_next (iter));
 }
 
-
 static GtkTreeModel *
 pdf_document_links_get_links_model (EvDocumentLinks *document_links)
 {
        PdfDocument *pdf_document = PDF_DOCUMENT (document_links);
        GtkTreeModel *model = NULL;
        PopplerIndexIter *iter;
-
+       
        g_return_val_if_fail (PDF_IS_DOCUMENT (document_links), NULL);
 
        iter = poppler_index_iter_new (pdf_document->document);
@@ -869,22 +1047,82 @@ pdf_document_links_get_links_model (EvDocumentLinks *document_links)
        return model;
 }
 
+static GList *
+pdf_document_links_get_links (EvDocumentLinks *document_links,
+                             gint             page)
+{
+       PdfDocument *pdf_document;
+       PopplerPage *poppler_page;
+       GList *retval = NULL;
+       GList *mapping_list;
+       GList *list;
+       double height;
+
+       pdf_document = PDF_DOCUMENT (document_links);
+       poppler_page = poppler_document_get_page (pdf_document->document,
+                                                 page);
+       mapping_list = poppler_page_get_link_mapping (poppler_page);
+       poppler_page_get_size (poppler_page, NULL, &height);
+
+       for (list = mapping_list; list; list = list->next) {
+               PopplerLinkMapping *link_mapping;
+               EvLinkMapping *ev_link_mapping;
+
+               link_mapping = (PopplerLinkMapping *)list->data;
+               ev_link_mapping = g_new (EvLinkMapping, 1);
+               ev_link_mapping->link = ev_link_from_action (pdf_document,
+                                                            link_mapping->action);
+               ev_link_mapping->x1 = link_mapping->area.x1;
+               ev_link_mapping->x2 = link_mapping->area.x2;
+               /* Invert this for X-style coordinates */
+               ev_link_mapping->y1 = height - link_mapping->area.y2;
+               ev_link_mapping->y2 = height - link_mapping->area.y1;
+
+               retval = g_list_prepend (retval, ev_link_mapping);
+       }
+
+       poppler_page_free_link_mapping (mapping_list);
+       g_object_unref (poppler_page);
+
+       return g_list_reverse (retval);
+}
+
+static EvLinkDest *
+pdf_document_links_find_link_dest (EvDocumentLinks  *document_links,
+                                  const gchar      *link_name)
+{
+       PdfDocument *pdf_document;
+       PopplerDest *dest;
+       EvLinkDest *ev_dest = NULL;
+
+       pdf_document = PDF_DOCUMENT (document_links);
+       dest = poppler_document_find_dest (pdf_document->document,
+                                          link_name);
+       if (dest) {
+               ev_dest = ev_link_dest_from_dest (pdf_document, dest);
+               poppler_dest_free (dest);
+       }
+
+       return ev_dest;
+}
+
 static void
 pdf_document_document_links_iface_init (EvDocumentLinksIface *iface)
 {
        iface->has_document_links = pdf_document_links_has_document_links;
        iface->get_links_model = pdf_document_links_get_links_model;
+       iface->get_links = pdf_document_links_get_links;
+       iface->find_link_dest = pdf_document_links_find_link_dest;
 }
 
 static GdkPixbuf *
 make_thumbnail_for_size (PdfDocument   *pdf_document,
                         gint           page,
                         int            rotation,
-                        gint           size,
-                        gboolean       border)
+                        gint           size)
 {
        PopplerPage *poppler_page;
-       GdkPixbuf *pixbuf, *border_pixbuf;
+       GdkPixbuf *pixbuf;
        int width, height;
        double scale;
        gdouble unscaled_width, unscaled_height;
@@ -905,19 +1143,16 @@ make_thumbnail_for_size (PdfDocument   *pdf_document,
                height = temp;
        }
 
-       pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
+       pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
                                 width, height);
        gdk_pixbuf_fill (pixbuf, 0xffffffff);
 
+       ev_document_fc_mutex_lock ();
        poppler_page_render_to_pixbuf (poppler_page, 0, 0,
                                       width, height,
                                       scale, rotation, pixbuf);
+       ev_document_fc_mutex_unlock ();
        
-        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);
 
@@ -929,11 +1164,12 @@ 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);
 
@@ -942,20 +1178,17 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails
 
        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, rotation, 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, rotation, 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;
@@ -985,13 +1218,8 @@ 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);
 }
@@ -1058,10 +1286,6 @@ pdf_document_search_new (PdfDocument *pdf_document,
 
        search->text = g_strdup (text);
         search->pages = g_new0 (GList *, n_pages);
-       for (i = 0; i < n_pages; i++) {
-               search->pages[i] = NULL;
-       }
-
         search->document = pdf_document;
 
         /* We add at low priority so the progress bar repaints */
@@ -1101,7 +1325,7 @@ pdf_document_find_begin (EvDocumentFind   *document,
                                                        search_string);
 }
 
-int
+static int
 pdf_document_find_get_n_results (EvDocumentFind *document_find, int page)
 {
        PdfDocumentSearch *search = PDF_DOCUMENT (document_find)->search;
@@ -1113,7 +1337,7 @@ pdf_document_find_get_n_results (EvDocumentFind *document_find, int page)
        }
 }
 
-gboolean
+static gboolean
 pdf_document_find_get_result (EvDocumentFind *document_find,
                              int             page,
                              int             n_result,
@@ -1144,7 +1368,7 @@ pdf_document_find_get_result (EvDocumentFind *document_find,
        return TRUE;
 }
 
-int
+static int
 pdf_document_find_page_has_results (EvDocumentFind *document_find,
                                    int             page)
 {
@@ -1153,7 +1377,7 @@ pdf_document_find_page_has_results (EvDocumentFind *document_find,
        return search && search->pages[page] != NULL;
 }
 
-double
+static double
 pdf_document_find_get_progress (EvDocumentFind *document_find)
 {
        PdfDocumentSearch *search;
@@ -1199,52 +1423,129 @@ pdf_document_find_iface_init (EvDocumentFindIface *iface)
         iface->cancel = pdf_document_find_cancel;
 }
 
+static const gboolean supported_formats[] = {
+       TRUE, /* EV_FILE_FORMAT_PS */
+#ifdef HAVE_POPPLER_PAGE_RENDER
+       TRUE, /* EV_FILE_FORMAT_PDF */
+#else
+       FALSE, /* EV_FILE_FORMAT_PDF */
+#endif
+};
+
+static void
+pdf_print_context_free (PdfPrintContext *ctx)
+{
+       if (!ctx)
+               return;
+
+       if (ctx->ps_file) {
+               poppler_ps_file_free (ctx->ps_file);
+               ctx->ps_file = NULL;
+       }
+
+       if (ctx->pdf_cairo) {
+               cairo_destroy (ctx->pdf_cairo);
+               ctx->pdf_cairo = NULL;
+       }
+
+       g_free (ctx);
+}
+
+static gboolean
+pdf_document_file_exporter_format_supported (EvFileExporter      *exporter,
+                                            EvFileExporterFormat format)
+{
+       return supported_formats[format];
+}
+
 static void
-pdf_document_ps_exporter_begin (EvPSExporter *exporter, const char *filename,
-                               int first_page, int last_page,
-                               double width, double height, gboolean duplex)
+pdf_document_file_exporter_begin (EvFileExporter      *exporter,
+                                 EvFileExporterFormat format,
+                                 const char          *filename,
+                                 int                  first_page,
+                                 int                  last_page,
+                                 double               width,
+                                 double               height,
+                                 gboolean             duplex)
 {
        PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
+       PdfPrintContext *ctx;
+
+       if (pdf_document->print_ctx)
+               pdf_print_context_free (pdf_document->print_ctx);
+       pdf_document->print_ctx = g_new0 (PdfPrintContext, 1);
+       ctx = pdf_document->print_ctx;
+       ctx->format = format;
        
-       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);
+       switch (format) {
+               case EV_FILE_FORMAT_PS:
+                       ctx->ps_file = poppler_ps_file_new (pdf_document->document,
+                                                           filename, first_page,
+                                                           last_page - first_page + 1);
+                       poppler_ps_file_set_paper_size (ctx->ps_file, width, height);
+                       poppler_ps_file_set_duplex (ctx->ps_file, duplex);
+
+                       break;
+               case EV_FILE_FORMAT_PDF: {
+                       cairo_surface_t *surface;
+                       
+                       surface = cairo_pdf_surface_create (filename, width, height);
+                       ctx->pdf_cairo = cairo_create (surface);
+                       cairo_surface_destroy (surface);
+               }
+                       break;
+               default:
+                       g_assert_not_reached ();
+       }
 }
 
 static void
-pdf_document_ps_exporter_do_page (EvPSExporter *exporter, EvRenderContext *rc)
+pdf_document_file_exporter_do_page (EvFileExporter *exporter, EvRenderContext *rc)
 {
        PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
+       PdfPrintContext *ctx = pdf_document->print_ctx;
        PopplerPage *poppler_page;
 
-       g_return_if_fail (pdf_document->ps_file != NULL);
+       g_return_if_fail (pdf_document->print_ctx != NULL);
 
        poppler_page = poppler_document_get_page (pdf_document->document, rc->page);
-       poppler_page_render_to_ps (poppler_page, pdf_document->ps_file);
+
+       switch (ctx->format) {
+               case EV_FILE_FORMAT_PS:
+                       poppler_page_render_to_ps (poppler_page, ctx->ps_file);
+                       break;
+               case EV_FILE_FORMAT_PDF:
+#ifdef HAVE_POPPLER_PAGE_RENDER
+                       poppler_page_render (poppler_page, ctx->pdf_cairo);
+#endif
+                       cairo_show_page (ctx->pdf_cairo);
+                       break;
+               default:
+                       g_assert_not_reached ();
+       }
+       
        g_object_unref (poppler_page);
 }
 
 static void
-pdf_document_ps_exporter_end (EvPSExporter *exporter)
+pdf_document_file_exporter_end (EvFileExporter *exporter)
 {
        PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
 
-       poppler_ps_file_free (pdf_document->ps_file);
-       pdf_document->ps_file = NULL;
+       pdf_print_context_free (pdf_document->print_ctx);
+       pdf_document->print_ctx = NULL;
 }
 
 static void
-pdf_document_ps_exporter_iface_init (EvPSExporterIface *iface)
+pdf_document_file_exporter_iface_init (EvFileExporterIface *iface)
 {
-        iface->begin = pdf_document_ps_exporter_begin;
-        iface->do_page = pdf_document_ps_exporter_do_page;
-        iface->end = pdf_document_ps_exporter_end;
+       iface->format_supported = pdf_document_file_exporter_format_supported;
+        iface->begin = pdf_document_file_exporter_begin;
+        iface->do_page = pdf_document_file_exporter_do_page;
+        iface->end = pdf_document_file_exporter_end;
 }
 
-
-void
+static void
 pdf_selection_render_selection (EvSelection      *selection,
                                EvRenderContext  *rc,
                                GdkPixbuf       **pixbuf,
@@ -1279,7 +1580,7 @@ pdf_selection_render_selection (EvSelection      *selection,
 }
 
 
-GdkRegion *
+static GdkRegion *
 pdf_selection_get_selection_region (EvSelection     *selection,
                                    EvRenderContext *rc,
                                    EvRectangle     *points)
@@ -1296,7 +1597,7 @@ pdf_selection_get_selection_region (EvSelection     *selection,
        return retval;
 }
 
-GdkRegion *
+static GdkRegion *
 pdf_selection_get_selection_map (EvSelection     *selection,
                                 EvRenderContext *rc)
 {