have (x)dvipdfmx accept/ignore << in map file lines as with <[

git-svn-id: svn://tug.org/texlive/trunk@34677 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 38 insertions, 17 deletions

diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 90bfdf34b6d..1207e5d0576 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,13 @@
+2014-07-21  Karl Berry  <karl@tug.org>
+
+	* fontmap.c (fontmap_parse_mapdef_dps): ignore the second <
+	in << in a map file line (just like the [ in <] has always been
+	ignored).
+	* Makefile.am (EXTRA_DIST): add fullmap.tex and .dvi,
+        just for documentation/future purposes, not executed as a new test.
+       Report from Ulrike Fischer, 4 Jun 2014 11:15:06 +0200,
+       http://tug.org/pipermail/tex-live/2014-June/035486.html
+
 2014-07-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* cmap_read.c: Avoid cast from pointer to integer of different
diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am
index b671ce4cd59..039fd51700d 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.am
+++ b/Build/source/texk/dvipdfm-x/Makefile.am
@@ -286,6 +286,7 @@ endif XDVIPDFMX
 EXTRA_DIST = $(dvipdfmx_tests) $(xdvipdfmx_tests)
 ## Test Data
 EXTRA_DIST += tests/dvipdfmx.cfg tests/psfonts.map
+EXTRA_DIST += tests/fullmap.dvi tests/fullmap.tex
 EXTRA_DIST += tests/image.jpeg tests/imgjpeg.bb tests/imgjpeg.xbb tests/picjpeg.bb tests/picjpeg.xbb
 EXTRA_DIST += tests/image.pdf tests/imgpdf.bb tests/imgpdf.xbb tests/picpdf.bb tests/picpdf.xbb
 EXTRA_DIST += tests/image.png tests/imgpng.bb tests/imgpng.xbb tests/picpng.bb tests/picpng.xbb
diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in
index 10f00810487..30e95a8455e 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.in
+++ b/Build/source/texk/dvipdfm-x/Makefile.in
@@ -815,16 +815,16 @@ dvipdfmx_tests = dvipdfmx.test dvipdfm-ann.test dvipdfm-bb.test \
 xdvipdfmx_tests = xdvipdfmx.test xdvipdfm-ann.test xdvipdfm-bb.test \
 	xdvipdfm-bkm.test xdvipdfm-psz.test xdvipdfm-res.test
 EXTRA_DIST = $(dvipdfmx_tests) $(xdvipdfmx_tests) tests/dvipdfmx.cfg \
-	tests/psfonts.map tests/image.jpeg tests/imgjpeg.bb \
-	tests/imgjpeg.xbb tests/picjpeg.bb tests/picjpeg.xbb \
-	tests/image.pdf tests/imgpdf.bb tests/imgpdf.xbb \
-	tests/picpdf.bb tests/picpdf.xbb tests/image.png \
-	tests/imgpng.bb tests/imgpng.xbb tests/picpng.bb \
-	tests/picpng.xbb tests/image.dvi tests/image.tex \
-	tests/cmr10.pfb tests/cmr10.tfm tests/annot.dvi \
-	tests/annot.tex tests/bookm.dvi tests/bookm.tex \
-	tests/paper.dvi tests/paper.tex tests/resrc.dvi \
-	tests/resrc.tex
+	tests/psfonts.map tests/fullmap.dvi tests/fullmap.tex \
+	tests/image.jpeg tests/imgjpeg.bb tests/imgjpeg.xbb \
+	tests/picjpeg.bb tests/picjpeg.xbb tests/image.pdf \
+	tests/imgpdf.bb tests/imgpdf.xbb tests/picpdf.bb \
+	tests/picpdf.xbb tests/image.png tests/imgpng.bb \
+	tests/imgpng.xbb tests/picpng.bb tests/picpng.xbb \
+	tests/image.dvi tests/image.tex tests/cmr10.pfb \
+	tests/cmr10.tfm tests/annot.dvi tests/annot.tex \
+	tests/bookm.dvi tests/bookm.tex tests/paper.dvi \
+	tests/paper.tex tests/resrc.dvi tests/resrc.tex
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
diff --git a/Build/source/texk/dvipdfm-x/fontmap.c b/Build/source/texk/dvipdfm-x/fontmap.c
index c2d82850e5a..acb068efc3c 100644
--- a/Build/source/texk/dvipdfm-x/fontmap.c
+++ b/Build/source/texk/dvipdfm-x/fontmap.c
@@ -597,7 +597,9 @@ fontmap_parse_mapdef_dps (fontmap_rec *mrec,
   while (p < endptr && *p != '\r' && *p != '\n' && (*p == '<' || *p == '"')) {
     switch (*p) {
     case '<': /* encoding or fontfile field */
-      if (++p < endptr && *p == '[') p++; /*skip */
+      /* If we see <[ or <<, just ignore the second char instead
+         of doing as directed (define encoding file, fully embed); sorry.  */
+      if (++p < endptr && (*p == '[' || *p == '<')) p++; /*skip */
       skip_blank(&p, endptr);
       if ((q = parse_string_value(&p, endptr))) {
         int n = strlen(q);
diff --git a/Build/source/texk/dvipdfm-x/man/dvipdfmx.1 b/Build/source/texk/dvipdfm-x/man/dvipdfmx.1
index 2aed4995d54..d88c8f9ab0d 100644
--- a/Build/source/texk/dvipdfm-x/man/dvipdfmx.1
+++ b/Build/source/texk/dvipdfm-x/man/dvipdfmx.1
@@ -10,7 +10,7 @@
 .sp
 .fi
 ..
-.TH "DVIPDFMX" "1" "9 Apr 2014"
+.TH "DVIPDFMX" "1" "15 July 2014"
 .SH NAME
 dvipdfmx, xdvipdfmx, dvipdfm \- produce PDF files directly from DVI files
 .SH SYNOPSIS
@@ -34,9 +34,7 @@ In TeX Live,
 is another incarnation of
 .B dvipdfmx
 rather than a separate program.  Compatibility is attempted as best as
-possible.  Please report problems to the
-.B dvipdfmx
-maintainers at tex-live (at) tug.org.
+possible.  
 
 In addition,
 .B xdvipdfmx
@@ -81,6 +79,9 @@ and
 For issues related to bounding boxes (and hence image sizes), see
 .BR extractbb (1).
 .SH OPTIONS
+Unlike with many other programs, argument values must be separated from
+option names by a space, not an = sign; option names cannot be
+abbreviated; and \- and \-\- cannot be used interchangeably.
 .TP 5
 .B \-\^c
 Ignore (or accept) color
@@ -233,7 +234,7 @@ The dimension may be specified in any units understood by TeX (e.g.,
 .B \-\^z number
 Set the compression level to 
 .IR compression_level .
-Compressions levels range from 0 (no compression) to
+Compression levels range from 0 (no compression) to
 9 (maximum compression) and correspond to the values understood by zlib;
 default is 9.
 .TP 5
@@ -331,5 +332,5 @@ Primarily Mark A. Wicks; dvipdfmx extensions primarily by Jin-Hwan Cho,
 Shunsaku Hirata, and Matthias Franz.  For the version in TeX Live, all
 bugs and other reports should go to the
 .B dvipdfmx
-maintainers at tex-live (at) tug.org.  This man page edited for TeX Live
+maintainers at tex-k (at) tug.org.  This man page edited for TeX Live
 by Bob Tennent and others.
diff --git a/Build/source/texk/dvipdfm-x/tests/fullmap.dvi b/Build/source/texk/dvipdfm-x/tests/fullmap.dvi
new file mode 100644
index 00000000000..a92561fd8bc
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/tests/fullmap.dvi
diff --git a/Build/source/texk/dvipdfm-x/tests/fullmap.tex b/Build/source/texk/dvipdfm-x/tests/fullmap.tex
new file mode 100644
index 00000000000..fa764f3cd4f
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/tests/fullmap.tex
@@ -0,0 +1,7 @@
+\nopagenumbers
+% 
+% For testing << in map lines.
+\special{pdf:mapline augie8r Augie <<augie___.pfb}
+\font\x = augie8r \x Hello.
+%
+\end