X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=backend%2Fdvi%2Fmdvi-lib%2Ffontmap.c;h=e186bd453945eb06969cbe151d97bf059d5a4bf0;hb=b1afb3adfd0cbad343abe98986e7aef74b280b89;hp=cc610643633556ee8c8300d0d00a1da73ccf42cc;hpb=13a06349251874bd35d2f03c3fc93217cee749a2;p=evince.git

diff --git a/backend/dvi/mdvi-lib/fontmap.c b/backend/dvi/mdvi-lib/fontmap.c
index cc610643..e186bd45 100644
--- a/backend/dvi/mdvi-lib/fontmap.c
+++ b/backend/dvi/mdvi-lib/fontmap.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <config.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -585,9 +586,10 @@ DviFontMapEnt	*mdvi_load_fontmap(const char *file)
 		}
 		if(ent->encfile && enc){ 		
 			if(ent->encoding && !STREQ(ent->encoding, enc->name)) {
-				warning(
+				mdvi_warning(
 	_("%s: %d: [%s] requested encoding `%s' does not match vector `%s'\n"),
-					file, lineno);
+					file, lineno, ent->encfile,
+					ent->encoding, enc->name);
 			} else if(!ent->encoding)
 				ent->encoding = mdvi_strdup(enc->name);
 		}
@@ -747,7 +749,7 @@ static int	mdvi_init_fontmaps(void)
 			DEBUG((DBG_FMAP, "%s: loading fontmap\n", arg));
 			ent = mdvi_load_fontmap(arg);
 			if(ent == NULL)
-				warning(_("%s: could not load fontmap\n"), arg);
+				mdvi_warning(_("%s: could not load fontmap\n"), arg);
 			else {
 				DEBUG((DBG_FMAP, 
 					"%s: installing fontmap\n", arg));
@@ -761,8 +763,8 @@ static int	mdvi_init_fontmaps(void)
 		} else if(STRNEQ(line, "default-encoding", 16)) {
 			arg = getstring(line + 16, " \t", &line); *line = 0;
 			if(mdvi_set_default_encoding(arg) < 0)
-				warning(_("%s: could not set as default encoding\n"),
-					arg);
+				mdvi_warning(_("%s: could not set as default encoding\n"),
+					     arg);
 		} else if(STRNEQ(line, "psfontpath", 10)) {
 			arg = getstring(line + 11, " \t", &line); *line = 0;
 			if(!psinitialized)
@@ -780,8 +782,8 @@ static int	mdvi_init_fontmaps(void)
 		} else if(STRNEQ(line, "psfontmap", 9)) {
 			arg = getstring(line + 9, " \t", &line); *line = 0;
 			if(mdvi_ps_read_fontmap(arg) < 0)
-				warning("%s: %s: could not read PS fontmap\n",
-					config, arg);
+				mdvi_warning("%s: %s: could not read PS fontmap\n",
+					     config, arg);
 		}
 	}
 	fclose(in);
@@ -840,8 +842,8 @@ void	mdvi_flush_encodings(void)
 	for(; (enc = (DviEncoding *)encodings.head); ) {
 		encodings.head = LIST(enc->next);
 		if((enc != tex_text_encoding && enc->links) || enc->links > 1) {
-			warning(_("encoding vector `%s' is in use\n"),
-				enc->name);
+			mdvi_warning(_("encoding vector `%s' is in use\n"),
+				     enc->name);
 		}
 		destroy_encoding(enc);
 	}