File source-bnc856363.dif of Package texlive.14234

--- texk/xdvik/CHANGES	2013/04/05 02:34:34	1.103 xdvik_22_86
+++ texk/xdvik/CHANGES	2013/09/01 05:55:44	1.107
@@ -9,6 +9,13 @@
 may contain undetected bugs. Such versions shouldn't be used
 by distributors.
 
+   * 22.86.01 CVS2 (2013-08-31):
+	+ ft.c: Avoid a compiler warning.
+	+ font-open.c: Add support for .runlibfileifexists in gs Fontmap file;
+	  tweak some messages.
+	+ dvi-draw.c: Fixed bug #388 ("currinf.set_char_p is not a registered
+	  routine!")
+
    * 22.86 (2013-04-04):
 	+ xdvi.h, xdvi.c, x_util.h, x_util.c, dvi-init.c: Fixed bugs in
 	  property handling on 64-bit systems (related to source specials).
--- texk/xdvik/dvi-draw.c	2013/04/05 00:14:54	1.392 xdvik_22_86
+++ texk/xdvik/dvi-draw.c	2013/09/01 05:55:44	1.393
@@ -2962,6 +2962,10 @@
 	}
 	maxchar = currinf.fontp->maxchar;
 	currinf.set_char_p = currinf.fontp->set_char_p;
+#if FREETYPE
+	if (currinf.set_char_p == set_ft_char)
+	    do_load_freetype_font();
+#endif
     }
 
     if (currinf.set_char_p == set_char) {
@@ -3087,6 +3091,10 @@
 	}
 	maxchar = currinf.fontp->maxchar;
 	currinf.set_char_p = currinf.fontp->set_char_p;
+#if FREETYPE
+	if (currinf.set_char_p == set_ft_char)
+	    do_load_freetype_font();
+#endif
     }
 
     if (currinf.set_char_p == set_char) {
--- texk/xdvik/font-open.c	2013/04/04 21:05:48	1.55 xdvik_22_86
+++ texk/xdvik/font-open.c	2013/05/14 05:26:19	1.56
@@ -722,6 +722,7 @@
 	const	char	*str1_end, *str2_end;
 	const char	*p1, *p2;
 	FILE		*f;
+	unsigned int	namelen;
 
 	if (str1 == NULL) {
 	    str1 = str2;
@@ -770,6 +771,11 @@
 	    str1 = p1 + 1;
 	}
 
+	/* leave the file name in ffline[] for error message */
+	namelen = strlen(name) + 1;
+	if (namelen > ffline_len) expandline(namelen);
+	memcpy(ffline, name, namelen);
+
 	return NULL;
 }
 
@@ -1087,6 +1093,7 @@
 	 * Allow entries of the following types:
 	 *
 	 *	(string) .runlibfile
+	 *	(string) .runlibfileifexists
 	 *	/identifier (string) ;
 	 *	/identifier /alias ;
 	 */
@@ -1096,6 +1103,7 @@
 	    if (ttype == GS_EOF || ttype == GS_ERR)
 		break;
 	    if (ttype == LPAREN) {
+		Boolean	quiet = False;
 		FILE	*f1;
 
 		ttype = get_gs_token(&gsf, pos1, &pos2, "Fontmap");
@@ -1106,7 +1114,10 @@
 		      "unexpected end of Fontmap file; giving up."));
 		    break;
 		}
-		if (ttype != '.' || pos2 - pos1 != 11
+		if (ttype == '.' && pos2 - pos1 == 19
+		  && memcmp(ffline + pos1, ".runlibfileifexists", 19) == 0)
+		    quiet = True;
+		else if (ttype != '.' || pos2 - pos1 != 11
 		  || memcmp(ffline + pos1, ".runlibfile", 11) != 0) {
 		    TRACE_FT((stderr, "invalid token following \"(%.*s)\" in Fontmap file; giving up.",
 		      (int) pos1, ffline));
@@ -1125,9 +1136,15 @@
 		    free(q);
 		}
 
-		if (f1 == NULL)
-		    TRACE_FT((stderr, "Fontmap .runlibfile: %s: %s",
-		      ffline, strerror(errno)));
+		if (f1 == NULL) {
+		    if (!quiet)
+			XDVI_WARNING((stderr, "Fontmap .runlibfile: %s: %s",
+			  ffline, strerror(errno)));
+		    else
+			TRACE_FT((stderr,
+			  "Fontmap .runlibfileifexists: %s: %s\n",
+			  ffline, strerror(errno)));
+		}
 		else {
 		    --gs_fontmap_number;
 		    process_gs_fontmap(f1);
@@ -1347,7 +1364,7 @@
 
 	    filename = kpse_find_file(t1p->fontfile, kpse_type1_format, 0);
 	    if (filename == NULL) {
-		XDVI_WARNING((stderr, "cannot find Type 1 font file %s "
+		TRACE_FT((stderr, "cannot find Type 1 font file %s "
 		  "(will try PK version instead).",
 		  t1p->fontfile));
 		return NULL;
--- texk/xdvik/xdvi.c	2013/04/05 00:14:55	1.470 xdvik_22_86
+++ texk/xdvik/xdvi.c	2013/09/01 05:55:44	1.471
@@ -3310,7 +3310,7 @@
 	G_image->byte_order = *((char *)&endian);
     }
 
-    /* Store window id for use by src_client_check().  */
+    /* Store window id for use by get_xdvi_window_id().  */
     {
 	long data = XtWindow(globals.widgets.top_level);