add paper_width, paper_height, and duplex parameters to ::begin.

* backend/ev-ps-exporter.h: add paper_width, paper_height, and
duplex parameters to ::begin.

* tiff/tiff-document.c (tiff_document_ps_export_begin):
* shell/ev-print-job.c (idle_print_handler):
* ps/ps-document.c (ps_document_ps_export_begin):
* pdf/ev-poppler.cc (pdf_document_ps_exporter_begin):
* backend/ev-ps-exporter.c (ev_ps_exporter_begin): update
implementations. Poppler backend needs poppler cvs. Rest has
unchanged behavior.

diff --git a/ChangeLog b/ChangeLog
index dd939138f0e1469c6f0481ce80a133177a00d9ff..be3d5ca2253158c8347dc65186c307842c551883 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-07-27  Martin Kretzschmar  <martink@gnome.org>
+
+       * backend/ev-ps-exporter.h: add paper_width, paper_height, and
+       duplex parameters to ::begin.
+
+       * tiff/tiff-document.c (tiff_document_ps_export_begin): 
+       * shell/ev-print-job.c (idle_print_handler): 
+       * ps/ps-document.c (ps_document_ps_export_begin): 
+       * pdf/ev-poppler.cc (pdf_document_ps_exporter_begin): 
+       * backend/ev-ps-exporter.c (ev_ps_exporter_begin): update
+       implementations. Poppler backend needs poppler cvs. Rest has
+       unchanged behavior.
+
 2005-07-25  Martin Kretzschmar  <martink@gnome.org>
 
        * shell/ev-window.c (using_pdf_printer): new function.

diff --git a/backend/ev-ps-exporter.c b/backend/ev-ps-exporter.c
index 54a2dd4f102820a0f8faedd4a6c958d9c4ad5e14..09ed17c681d14e04df74195863521b9b76b9b814 100644 (file)
--- a/backend/ev-ps-exporter.c
+++ b/backend/ev-ps-exporter.c
@@ -48,11 +48,13 @@ ev_ps_exporter_get_type (void)
 
 void
 ev_ps_exporter_begin (EvPSExporter *exporter, const char *filename,
-                     int first_page, int last_page)
+                     int first_page, int last_page,
+                      double paper_width, double paper_height, gboolean duplex)
 {
        EvPSExporterIface *iface = EV_PS_EXPORTER_GET_IFACE (exporter);
 
-       iface->begin (exporter, filename, first_page, last_page);
+       iface->begin (exporter, filename, first_page, last_page,
+                      paper_width, paper_height, duplex);
 }
 
 void

diff --git a/backend/ev-ps-exporter.h b/backend/ev-ps-exporter.h
index ae746a1b9e1e3d82fc37ef8a73f43af275609043..36d2613ac0c6d242da66d525f91afb02df561fd8 100644 (file)
--- a/backend/ev-ps-exporter.h
+++ b/backend/ev-ps-exporter.h
@@ -44,7 +44,10 @@ struct _EvPSExporterIface {
        void            (* begin)       (EvPSExporter *exporter,
                                         const char   *filename,
                                         int           first_page,
-                                        int           last_page);
+                                        int           last_page,
+                                         double        paper_width,
+                                         double        paper_height,
+                                         gboolean      duplex);
        void            (* do_page)     (EvPSExporter *exporter,
                                         int           page);
        void            (* end)         (EvPSExporter *exporter);
@@ -52,7 +55,9 @@ struct _EvPSExporterIface {
 
 GType  ev_ps_exporter_get_type (void);
 void   ev_ps_exporter_begin    (EvPSExporter *exporter, const char *filename,
-                                int first_page, int last_page);
+                                int first_page, int last_page,
+                                 double paper_width, double paper_height,
+                                 gboolean duplex);
 void   ev_ps_exporter_do_page  (EvPSExporter *exporter, int page);
 void   ev_ps_exporter_end      (EvPSExporter *exporter);
 

diff --git a/pdf/ev-poppler.cc b/pdf/ev-poppler.cc
index 29f18cf0c34f9224c47bb64410ed14cd28ee73f7..2695e863a76ee63a6f2dd87b2b710e08c2818f25 100644 (file)
--- a/pdf/ev-poppler.cc
+++ b/pdf/ev-poppler.cc
@@ -1187,13 +1187,16 @@ 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

diff --git a/ps/ps-document.c b/ps/ps-document.c
index 8dca8cf663c0e3a31cabe54dc37ecfaa86a439bb..4f38e6b02763d9121d98d9abf19fc8afc10d8886 100644 (file)
--- a/ps/ps-document.c
+++ b/ps/ps-document.c
@@ -1313,7 +1313,8 @@ ps_async_renderer_iface_init (EvAsyncRendererIface *iface)
 
 static void
 ps_document_ps_export_begin (EvPSExporter *exporter, const char *filename,
-                            int first_page, int last_page)
+                            int first_page, int last_page,
+                             double width, double height, gboolean duplex)
 {
        PSDocument *document = PS_DOCUMENT (exporter);
 

diff --git a/shell/ev-print-job.c b/shell/ev-print-job.c
index f79c1fc3a1a9d3297b0165e10a8bc15ae384e169..1f215c77c817b4b235c0a55a1e52ce03a529e9fd 100644 (file)
--- a/shell/ev-print-job.c
+++ b/shell/ev-print-job.c
@@ -258,9 +258,10 @@ idle_print_handler (EvPrintJob *job)
 {
        if (!job->printing) {
                ev_document_doc_mutex_lock ();
-               ev_ps_exporter_begin (EV_PS_EXPORTER (job->document),
-                                     job->temp_file, job->first_page,
-                                     job->last_page);
+               ev_ps_exporter_begin (
+                        EV_PS_EXPORTER (job->document),
+                        job->temp_file, job->first_page, job->last_page,
+                        job->width, job->height, job->duplex);
                ev_document_doc_mutex_unlock ();
                job->next_page = job->first_page;
                job->printing = TRUE;

diff --git a/tiff/tiff-document.c b/tiff/tiff-document.c
index 36847aa45f3173cdd2fd79bf6cafdf016654336a..aef7aaac3bf82b6fb9f9bfc70d2ac697c40c3574 100644 (file)
--- a/tiff/tiff-document.c
+++ b/tiff/tiff-document.c
@@ -411,7 +411,8 @@ tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface)
 
 static void
 tiff_document_ps_export_begin (EvPSExporter *exporter, const char *filename,
-                              int first_page, int last_page)
+                              int first_page, int last_page,
+                              double width, double height, gboolean duplex)
 {
        TiffDocument *document = TIFF_DOCUMENT (exporter);