summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/dvipsk/ChangeLog5
-rw-r--r--Build/source/texk/dvipsk/download.c17
-rw-r--r--Build/source/texk/dvipsk/emspecial.c15
-rw-r--r--Build/source/texk/dvipsk/output.c11
-rwxr-xr-xMaster/bin/i386-linux/dvipsbin197320 -> 623466 bytes
5 files changed, 36 insertions, 12 deletions
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index c18a72c0030..d404c720f47 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-20 Karl Berry <karl@tug.org>
+
+ * download.c, output.c, emspecial.c: report full pathnames,
+ to help debugging and for consistency with TeX.
+
2007-03-19 Karl Berry <karl@tug.org>
* config.ps (screen): add this, 8.25x11, for powerdot. (From Akira.)
diff --git a/Build/source/texk/dvipsk/download.c b/Build/source/texk/dvipsk/download.c
index c7d6c0eab9f..ae8b3aece8e 100644
--- a/Build/source/texk/dvipsk/download.c
+++ b/Build/source/texk/dvipsk/download.c
@@ -444,6 +444,7 @@ void downpsfont P2C(charusetype *, p, charusetype *, all)
register chardesctype *c ;
struct resfont *rf ;
int cc;
+ extern char *realnameoffile ;
curfnt = p->fd ;
rf = curfnt->resfont ;
@@ -514,14 +515,6 @@ void downpsfont P2C(charusetype *, p, charusetype *, all)
}
}
if(GridCount!=0 || extraGlyphs) {
- if (!quiet) {
- if (strlen(rf->Fontfile) + prettycolumn > STDOUTSIZE) {
- fprintf(stderr, "\n") ;
- prettycolumn = 0 ;
- }
- (void)fprintf(stderr, "<%s>", rf->Fontfile);
- prettycolumn += strlen(rf->Fontfile) + 2 ;
- }
newline() ;
if (! disablecomments)
(void)fprintf(bitfile, "%%%%BeginFont: %s\n", rf->PSname);
@@ -531,6 +524,14 @@ void downpsfont P2C(charusetype *, p, charusetype *, all)
if(FontPart(bitfile, rf->Fontfile, rf->Vectfile) < 0)
#endif
exit(1);
+ if (!quiet) {
+ if (strlen(realnameoffile) + prettycolumn > STDOUTSIZE) {
+ fprintf(stderr, "\n") ;
+ prettycolumn = 0 ;
+ }
+ (void)fprintf(stderr, "<%s>", realnameoffile);
+ prettycolumn += strlen(realnameoffile) + 2 ;
+ }
if (! disablecomments)
(void)fprintf(bitfile, "%%%%EndFont \n");
}
diff --git a/Build/source/texk/dvipsk/emspecial.c b/Build/source/texk/dvipsk/emspecial.c
index a0e616f065e..9f6861c07c4 100644
--- a/Build/source/texk/dvipsk/emspecial.c
+++ b/Build/source/texk/dvipsk/emspecial.c
@@ -659,14 +659,23 @@ void PCXshowpicture P9C(FILE *, pcxf, int, wide, int, high, int, bytes,
void imagehead P5C(char *, filename, int, wide, int, high,
float, emwidth, float, emheight)
{
+ char *fullname = NULL, *name ;
if (!quiet) {
- if (strlen(filename) + prettycolumn > STDOUTSIZE) {
+#ifdef KPATHSEA
+ fullname = (char *)kpse_find_file (filename, pictpath, 0) ;
+#endif
+ if (!fullname)
+ name = filename ;
+ else
+ name = fullname ;
+ if (strlen(name) + prettycolumn > STDOUTSIZE) {
fprintf(stderr,"\n");
prettycolumn = 0;
}
- (void)fprintf(stderr,"<%s",filename);
+ (void)fprintf(stderr,"<%s",name);
(void)fflush(stderr);
- prettycolumn += 2+strlen(filename);
+ prettycolumn += 2+strlen(name);
+ if (fullname) free (fullname);
}
hvpos();
nlcmdout("@beginspecial @setspecial") ;
diff --git a/Build/source/texk/dvipsk/output.c b/Build/source/texk/dvipsk/output.c
index 10203bed7de..f9700381f32 100644
--- a/Build/source/texk/dvipsk/output.c
+++ b/Build/source/texk/dvipsk/output.c
@@ -113,6 +113,7 @@ static char possibleDSCLine[81],
void
copyfile_general P2C(char *, s, struct header_list *, cur_header)
{
+ extern char *realnameoffile ;
FILE *f = NULL ;
int c, prevc = '\n' ;
long len ;
@@ -205,7 +206,11 @@ copyfile_general P2C(char *, s, struct header_list *, cur_header)
error(errbuf) ;
else {
if (! quiet) {
+#if defined(VMCMS) || defined (MVSXA)
if (strlen(s) + prettycolumn > STDOUTSIZE) {
+#else
+ if (strlen(realnameoffile) + prettycolumn > STDOUTSIZE) {
+#endif
fprintf(stderr, "\n") ;
prettycolumn = 0 ;
}
@@ -215,11 +220,15 @@ copyfile_general P2C(char *, s, struct header_list *, cur_header)
#ifdef MVSXA
(void)fprintf(stderr, "<%s>", trunc_s) ;
#else
- (void)fprintf(stderr, "<%s>", s) ;
+ (void)fprintf(stderr, "<%s>", realnameoffile) ;
#endif
#endif
(void)fflush(stderr) ;
+#if defined(VMCMS) || defined (MVSXA)
prettycolumn += 2 + strlen(s) ;
+#else
+ prettycolumn += 2 + strlen(realnameoffile) ;
+#endif
}
if (linepos != 0)
(void)putc('\n', bitfile) ;
diff --git a/Master/bin/i386-linux/dvips b/Master/bin/i386-linux/dvips
index f7d64504758..386b4ca17c3 100755
--- a/Master/bin/i386-linux/dvips
+++ b/Master/bin/i386-linux/dvips
Binary files differ