X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=backend%2Fdvi%2Fmdvi-lib%2Fsp-epsf.c;h=1aa9fa553f2f005b0a287c420110212ac983520b;hb=e63cb09538113fa2695bc2877902702109eed303;hp=ca13c8645d80e077f89cd63b42df2d5c68d8bded;hpb=13a06349251874bd35d2f03c3fc93217cee749a2;p=evince.git

diff --git a/backend/dvi/mdvi-lib/sp-epsf.c b/backend/dvi/mdvi-lib/sp-epsf.c
index ca13c864..1aa9fa55 100644
--- a/backend/dvi/mdvi-lib/sp-epsf.c
+++ b/backend/dvi/mdvi-lib/sp-epsf.c
@@ -18,8 +18,11 @@
 
 /* postscript specials */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "mdvi.h"
 #include "private.h"
@@ -146,7 +149,7 @@ static char *parse_epsf_special(EpsfBox *box, char **ret,
 				while(*p && *p != '"')
 					p++;
 				if(*p != '"')
-					warning(
+					mdvi_warning(
 					_("%s: malformed value for key `%s'\n"),
 						filename, keyname);
 			} else
@@ -158,17 +161,17 @@ static char *parse_epsf_special(EpsfBox *box, char **ret,
 			if(STRCEQ(keys[i].name, keyname))
 				break;
 		if(i == NKEYS) {
-			warning(_("%s: unknown key `%s' ignored\n"),
-				filename, keyname);
+			mdvi_warning(_("%s: unknown key `%s' ignored\n"),
+				     filename, keyname);
 			continue;
 		}
 		if(keys[i].has_arg && val == NULL) {
-			warning(_("%s: no argument for key `%s', using defaults\n"),
-				filename, keyname);
+			mdvi_warning(_("%s: no argument for key `%s', using defaults\n"),
+				     filename, keyname);
 			val = keys[i].value;
 		} else if(!keys[i].has_arg && val) {
-			warning(_("%s: argument `%s' ignored for key `%s'\n"),
-				filename, val, keyname);
+			mdvi_warning(_("%s: argument `%s' ignored for key `%s'\n"),
+				     filename, val, keyname);
 			val = NULL;
 		}
 		if(val)
@@ -235,23 +238,74 @@ void	epsf_special(DviContext *dvi, char *prefix, char *arg)
 {
 	char	*file;
 	char	*special;
+	char    *psfile;
+	char    *tmp;
 	EpsfBox	box = {0, 0, 0, 0};
 	int	x, y;
 	int	w, h;
 	double	xf, vf;
+	struct stat buf;
 	
 	file = parse_epsf_special(&box, &special, prefix, arg);
-	if(file != NULL)
-		mdvi_free(special);
-	/* 
-	 * draw the bounding box. Notice that it is in PostScript units,
-	 * so we have to convert it into pixels
-	 */
+	if (file != NULL)
+		mdvi_free (special);
+
 	xf = dvi->params.dpi * dvi->params.mag / (72.0 * dvi->params.hshrink);
 	vf = dvi->params.vdpi * dvi->params.mag / (72.0 * dvi->params.vshrink);
-	x = FROUND(box.ox * xf);
-	y = FROUND(box.oy * vf);
 	w = FROUND(box.bw * xf);
 	h = FROUND(box.bh * vf);
-	dvi->device.draw_rule(dvi, dvi->pos.hh + x, dvi->pos.vv + y - h + 1, w, h, 0);
+	x = FROUND(box.ox * xf) + dvi->pos.hh;
+	y = FROUND(box.oy * vf) + dvi->pos.vv - h + 1;
+
+	if (!file || !dvi->device.draw_ps) {
+		dvi->device.draw_rule (dvi, x, y, w, h, 0);
+		return;
+	}
+
+	if (file[0] == '/') { /* Absolute path */
+		if (stat (file, &buf) == 0)
+			dvi->device.draw_ps (dvi, file, x, y, w, h);
+		else
+			dvi->device.draw_rule (dvi, x, y, w, h, 0);
+		return;
+	}
+
+	tmp = mdvi_strrstr (dvi->filename, "/");
+	if (tmp) { /* Document directory */
+		int path_len = strlen (dvi->filename) - strlen (tmp + 1);
+		int file_len = strlen (file);
+		
+		psfile = mdvi_malloc (path_len + file_len + 1);
+		psfile[0] = '\0';
+		strncat (psfile, dvi->filename, path_len);
+		strncat (psfile, file, file_len);
+
+		if (stat (psfile, &buf) == 0) {
+			dvi->device.draw_ps (dvi, psfile, x, y, w, h);
+			mdvi_free (psfile);
+
+			return;
+		}
+
+		mdvi_free (psfile);
+	}
+			
+	psfile = mdvi_build_path_from_cwd (file);
+	if (stat (psfile, &buf) == 0) { /* Current working dir */
+		dvi->device.draw_ps (dvi, psfile, x, y, w, h);
+		mdvi_free (psfile);
+
+		return;
+	}
+
+	mdvi_free (psfile);
+	
+	psfile = kpse_find_pict (file);
+	if (psfile) { /* kpse */
+		dvi->device.draw_ps (dvi, psfile, x, y, w, h);
+	} else {
+		dvi->device.draw_rule(dvi, x, y, w, h, 0);
+	}
+
+	free (psfile);
 }