summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfmx/src/spc_util.c
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-04-21 00:43:12 +0000
committerKarl Berry <karl@freefriends.org>2008-04-21 00:43:12 +0000
commit522864734c14c14e4271f25fc2930a0a98285f71 (patch)
treeaed654dbf1ae6e72828140d796cf6d3556c439f9 /Build/source/texk/dvipdfmx/src/spc_util.c
parentc45aea54ea6e47ebd46f0a0025acfd0b9b2b9311 (diff)
dvipdfmx-20071115
git-svn-id: svn://tug.org/texlive/trunk@7557 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfmx/src/spc_util.c')
-rw-r--r--Build/source/texk/dvipdfmx/src/spc_util.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/Build/source/texk/dvipdfmx/src/spc_util.c b/Build/source/texk/dvipdfmx/src/spc_util.c
index e2d86eded94..ad53e6d0b95 100644
--- a/Build/source/texk/dvipdfmx/src/spc_util.c
+++ b/Build/source/texk/dvipdfmx/src/spc_util.c
@@ -1,8 +1,8 @@
-/* $Header: /home/cvsroot/dvipdfmx/src/spc_util.c,v 1.7 2005/08/12 16:27:52 chofchof Exp $
+/* $Header: /home/cvsroot/dvipdfmx/src/spc_util.c,v 1.8 2007/04/24 09:29:39 chofchof Exp $
This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+ Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -636,6 +636,7 @@ spc_util_read_dimtrns (struct spc_env *spe, transform_info *ti, struct spc_arg *
#ifdef cmyk
#undef cmyk
#endif
+#define gray(g) {1, {g}}
#define rgb8(r,g,b) {3, {((r)/255.0), ((g)/255.0), ((b)/255.0), 0.0}}
#define cmyk(c,m,y,k) {4, {(c), (m), (y), (k)}}
@@ -709,9 +710,13 @@ static struct colordef_
{"Sepia", cmyk(0.00, 0.83, 1.00, 0.70)},
{"Brown", cmyk(0.00, 0.81, 1.00, 0.60)},
{"Tan", cmyk(0.14, 0.42, 0.56, 0.00)},
- {"Gray", cmyk(0.00, 0.00, 0.00, 0.50)},
- {"Black", cmyk(0.00, 0.00, 0.00, 1.00)},
- {"White", cmyk(0.00, 0.00, 0.00, 0.00)},
+ /* Adobe Reader 7 and 8 had problem when gray and cmyk black colors
+ * are mixed. No problem with Previewer.app.
+ * It happens when \usepackage[dvipdfm]{graphicx} and then called
+ * \usepackage{color} without dvipdfm option. */
+ {"Gray", gray(0.5)},
+ {"Black", gray(0.0)},
+ {"White", gray(1.0)},
{NULL}
};