X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=backend%2Fdvi%2Fdvi-document.c;h=7a5cca262e386845d7db0f12924794825451fee8;hb=31b40f7679ff2bf455f493e101d5cbf521bb0d12;hp=56a0d9231d3f214f1c40cc2c9dfc13a5044458bd;hpb=31e16bd8f386dc292e60489d4a17227804bdc2e6;p=evince.git

diff --git a/backend/dvi/dvi-document.c b/backend/dvi/dvi-document.c
index 56a0d923..7a5cca26 100644
--- a/backend/dvi/dvi-document.c
+++ b/backend/dvi/dvi-document.c
@@ -23,12 +23,15 @@
 #include "ev-document-thumbnails.h"
 #include "ev-document-misc.h"
 #include "ev-file-exporter.h"
+#include "ev-file-helpers.h"
 
 #include "mdvi.h"
 #include "fonts.h"
+#include "color.h"
 #include "cairo-device.h"
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
+#include <ctype.h>
 
 GMutex *dvi_context_mutex = NULL;
 
@@ -66,18 +69,14 @@ typedef struct _DviDocumentClass DviDocumentClass;
 static void dvi_document_document_iface_init            (EvDocumentIface           *iface);
 static void dvi_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface);
 static void dvi_document_file_exporter_iface_init	(EvFileExporterIface 	   *iface);
-static void dvi_document_get_page_size 			(EvDocument                *document,
-					    		 int                        page,
-							 double                    *width,
-							 double                    *height);
 static void dvi_document_do_color_special               (DviContext                *dvi,
 							 const char                *prefix,
 							 const char                *arg);
 
 EV_BACKEND_REGISTER_WITH_CODE (DviDocument, dvi_document,
      {
-      G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS, dvi_document_document_thumbnails_iface_init);
-      G_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER, dvi_document_file_exporter_iface_init);
+      EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS, dvi_document_document_thumbnails_iface_init);
+      EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER, dvi_document_file_exporter_iface_init);
      });
 
 static gboolean
@@ -89,27 +88,22 @@ dvi_document_load (EvDocument  *document,
 	DviDocument *dvi_document = DVI_DOCUMENT(document);
 	
 	filename = g_filename_from_uri (uri, NULL, error);
-	
-	if (!filename) {
-		g_set_error (error,
-			     EV_DOCUMENT_ERROR,
-			     EV_DOCUMENT_ERROR_INVALID,
-			     _("File not available"));
+	if (!filename)
         	return FALSE;
-	}
 	
 	g_mutex_lock (dvi_context_mutex);
 	if (dvi_document->context)
 		mdvi_destroy_context (dvi_document->context);
-	
+
 	dvi_document->context = mdvi_init_context(dvi_document->params, dvi_document->spec, filename);
 	g_mutex_unlock (dvi_context_mutex);
+	g_free (filename);
 	
 	if (!dvi_document->context) {
-    		g_set_error (error,
-			     EV_DOCUMENT_ERROR,
-			     EV_DOCUMENT_ERROR_INVALID,
-			     _("DVI document has incorrect format"));
+    		g_set_error_literal (error,
+                                     EV_DOCUMENT_ERROR,
+                                     EV_DOCUMENT_ERROR_INVALID,
+                                     _("DVI document has incorrect format"));
         	return FALSE;
 	}
 	
@@ -149,7 +143,7 @@ dvi_document_get_n_pages (EvDocument *document)
 
 static void
 dvi_document_get_page_size (EvDocument *document,
-			    int         page,
+			    EvPage     *page,
 			    double     *width,
 			    double     *height)
 {
@@ -176,7 +170,7 @@ dvi_document_render (EvDocument      *document,
 	 */
 	g_mutex_lock (dvi_context_mutex);
 	
-	mdvi_setpage (dvi_document->context, rc->page);
+	mdvi_setpage (dvi_document->context, rc->page->index);
 	
 	mdvi_set_shrink (dvi_document->context, 
 			 (int)((dvi_document->params->hshrink - 1) / rc->scale) + 1,
@@ -273,8 +267,8 @@ dvi_document_document_iface_init (EvDocumentIface *iface)
 static void
 dvi_document_thumbnails_get_dimensions (EvDocumentThumbnails *document,
 					EvRenderContext      *rc, 
-					gint                  *width,
-					gint                  *height)
+					gint                 *width,
+					gint                 *height)
 {	
 	DviDocument *dvi_document = DVI_DOCUMENT (document);
 	gdouble page_width = dvi_document->base_width;
@@ -306,7 +300,7 @@ dvi_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document,
 
 	g_mutex_lock (dvi_context_mutex);
 	
-	mdvi_setpage (dvi_document->context, rc->page);
+	mdvi_setpage (dvi_document->context, rc->page->index);
 
 	mdvi_set_shrink (dvi_document->context, 
 			  (int)dvi_document->base_width * dvi_document->params->hshrink / thumb_width,
@@ -362,7 +356,7 @@ dvi_document_file_exporter_begin (EvFileExporter        *exporter,
 	
 	if (dvi_document->exporter_filename)
 		g_free (dvi_document->exporter_filename);	
-	dvi_document->exporter_filename = g_strdup(fc->filename);
+	dvi_document->exporter_filename = g_strdup (fc->filename);
 	
 	if (dvi_document->exporter_opts) {
 		g_string_free (dvi_document->exporter_opts, TRUE);
@@ -376,7 +370,7 @@ dvi_document_file_exporter_do_page (EvFileExporter  *exporter,
 {
        DviDocument *dvi_document = DVI_DOCUMENT(exporter);
 
-       g_string_append_printf(dvi_document->exporter_opts, "%d,", (rc->page)+1);
+       g_string_append_printf (dvi_document->exporter_opts, "%d,", (rc->page->index) + 1);
 }
 
 static void
@@ -389,7 +383,7 @@ dvi_document_file_exporter_end (EvFileExporter *exporter)
 	
 	DviDocument *dvi_document = DVI_DOCUMENT(exporter);
 	
-	command_line = g_strdup_printf ("dvipdfm %s -o %s %s", /* dvipdfm -s 1,2,.., -o exporter_filename dvi_filename */
+	command_line = g_strdup_printf ("dvipdfm %s -o %s \"%s\"", /* dvipdfm -s 1,2,.., -o exporter_filename dvi_filename */
 					dvi_document->exporter_opts->str,
 					dvi_document->exporter_filename,
 					dvi_document->context->filename);
@@ -400,7 +394,7 @@ dvi_document_file_exporter_end (EvFileExporter *exporter)
 					     &exit_stat,
 					     &err);
 
-	g_free(command_line);
+	g_free (command_line);
 
 	if (success == FALSE) {
 		g_warning ("Error: %s", err->message);
@@ -409,7 +403,7 @@ dvi_document_file_exporter_end (EvFileExporter *exporter)
 	}
 
 	if (err)
-		g_error_free(err);
+		g_error_free (err);
 }
 
 static EvFileExporterCapabilities