summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-05-07 21:39:45 +0000
committerKarl Berry <karl@freefriends.org>2015-05-07 21:39:45 +0000
commit64c52f821362a3f1db230327b2cbfdf2d385558b (patch)
tree4dfa9390f6a1debf165fc7535628d6e921e9af1c
parentf8161ba0f72d6243c5a8670ebe60bd9039192ed9 (diff)
cjk-gs-integrate (7may15)
git-svn-id: svn://tug.org/texlive/trunk@37257 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl7
-rwxr-xr-xMaster/bin/i386-linux/dvisvgmbin2083852 -> 2108588 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-CNS1.tex80
-rw-r--r--Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1-012.tex76
-rw-r--r--Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1-345.tex78
-rw-r--r--Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1.tex76
-rw-r--r--Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-Japan1.tex80
-rw-r--r--Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-Korea1.tex64
-rw-r--r--Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/cidtable.sty42
9 files changed, 252 insertions, 251 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index db963c8112b..f225956ebee 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,12 +1,13 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 37141 2015-05-01 15:56:19Z karl $
+# $Id: tlmgr.pl 37221 2015-05-06 01:49:18Z preining $
#
# Copyright 2008-2015 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
+#
-my $svnrev = '$Revision: 37141 $';
-my $datrev = '$Date: 2015-05-01 17:56:19 +0200 (Fri, 01 May 2015) $';
+my $svnrev = '$Revision: 37221 $';
+my $datrev = '$Date: 2015-05-06 03:49:18 +0200 (Wed, 06 May 2015) $';
my $tlmgrrevision;
my $prg;
if ($svnrev =~ m/: ([0-9]+) /) {
diff --git a/Master/bin/i386-linux/dvisvgm b/Master/bin/i386-linux/dvisvgm
index 1848f4f02db..33b13f57a33 100755
--- a/Master/bin/i386-linux/dvisvgm
+++ b/Master/bin/i386-linux/dvisvgm
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-CNS1.tex b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-CNS1.tex
index 6f8c9653acb..f10654f5592 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-CNS1.tex
+++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-CNS1.tex
@@ -1,40 +1,40 @@
-\ifx\dviware\undefined \def\dviware{dvipdfmx}\fi
-\documentclass[\dviware]{jsarticle}
-\usepackage{cidtable}
-
-\begin{document}
-\begin{center}
-Adobe-CNS1 Glyphs\\
- \begin{tabular}{ll} \hline
- Supplement & Color \\ \hline
- 0 & \colorsample{0} \\
- 1 & \colorsample{1} \\
- 2 & \colorsample{2} \\
- 3 & \colorsample{3} \\
- 4 & \colorsample{4} \\
- 5 & \colorsample{5} \\
- 6 & \colorsample{6} \\ \hline
- \end{tabular}
-\end{center}
-
-\newcount\code\global\code=0
-\newcount\supplement\global\supplement=0
-
-\noindent
-\foreach \row in {0,...,957}{%
-\hbox to 7ex{\hfill\number\code}\quad
-\foreach \col in {0,...,19}{%
-\ifcase\supplement%
-\ifnum\code>14098 \global\advance\supplement by 1\fi\or
-\ifnum\code>17407 \global\advance\supplement by 1\fi\or
-\ifnum\code>17600 \global\advance\supplement by 1\fi\or
-\ifnum\code>18845 \global\advance\supplement by 1\fi\or
-\ifnum\code>18964 \global\advance\supplement by 1\fi\or
-\ifnum\code>19087 \global\advance\supplement by 1\fi\fi
-\ifnum\code < 19156
- \colorbox{\colorname{\supplement}}{\CIDT{\code}}\
-\fi
-\global\advance\code by 1
-}\\
-}
-\end{document}
+\ifx\dviware\undefined \def\dviware{dvipdfmx}\fi
+\documentclass[\dviware]{jsarticle}
+\usepackage{cidtable}
+
+\begin{document}
+\begin{center}
+Adobe-CNS1 Glyphs\\
+ \begin{tabular}{ll} \hline
+ Supplement & Color \\ \hline
+ 0 & \colorsample{0} \\
+ 1 & \colorsample{1} \\
+ 2 & \colorsample{2} \\
+ 3 & \colorsample{3} \\
+ 4 & \colorsample{4} \\
+ 5 & \colorsample{5} \\
+ 6 & \colorsample{6} \\ \hline
+ \end{tabular}
+\end{center}
+
+\newcount\code\global\code=0
+\newcount\supplement\global\supplement=0
+
+\noindent
+\foreach \row in {0,...,957}{%
+\hbox to 7ex{\hfill\number\code}\quad
+\foreach \col in {0,...,19}{%
+\ifcase\supplement%
+\ifnum\code>14098 \global\advance\supplement by 1\fi\or
+\ifnum\code>17407 \global\advance\supplement by 1\fi\or
+\ifnum\code>17600 \global\advance\supplement by 1\fi\or
+\ifnum\code>18845 \global\advance\supplement by 1\fi\or
+\ifnum\code>18964 \global\advance\supplement by 1\fi\or
+\ifnum\code>19087 \global\advance\supplement by 1\fi\fi
+\ifnum\code < 19156
+ \colorbox{\colorname{\supplement}}{\CIDT{\code}}\
+\fi
+\global\advance\code by 1
+}\\
+}
+\end{document}
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1-012.tex b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1-012.tex
index 1126a53364b..109404aacec 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1-012.tex
+++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1-012.tex
@@ -1,38 +1,38 @@
-\ifx\dviware\undefined \def\dviware{dvipdfmx}\fi
-\documentclass[\dviware]{jsarticle}
-\usepackage{cidtable}
-
-\begin{document}
-\begin{center}
-Adobe-GB1 Glyphs\\
- \begin{tabular}{ll} \hline
- Supplement & Color \\ \hline
- 0 & \colorsample{0} \\
- 1 & \colorsample{1} \\
- 2 & \colorsample{2} \\
- 3 & \colorsample{3} \\
- 4 & \colorsample{4} \\
- 5 & \colorsample{5} \\ \hline
- \end{tabular}
-\end{center}
-
-\newcount\code\global\code=0
-\newcount\supplement\global\supplement=0
-
-\noindent
-\foreach \row in {0,...,1514}{%
-\hbox to 7ex{\hfill\number\code}\quad
-\foreach \col in {0,...,19}{%
-\ifcase\supplement%
-\ifnum\code>7716 \global\advance\supplement by 1\fi\or
-\ifnum\code>9896 \global\advance\supplement by 1\fi\or
-\ifnum\code>22126 \global\advance\supplement by 1\fi\or
-\ifnum\code>22352 \global\advance\supplement by 1\fi\or
-\ifnum\code>29063 \global\advance\supplement by 1\fi\fi
-\ifnum\code < 22353
- \colorbox{\colorname{\supplement}}{\CIDC{\code}}\
-\fi
-\global\advance\code by 1
-}\\
-}
-\end{document}
+\ifx\dviware\undefined \def\dviware{dvipdfmx}\fi
+\documentclass[\dviware]{jsarticle}
+\usepackage{cidtable}
+
+\begin{document}
+\begin{center}
+Adobe-GB1 Glyphs\\
+ \begin{tabular}{ll} \hline
+ Supplement & Color \\ \hline
+ 0 & \colorsample{0} \\
+ 1 & \colorsample{1} \\
+ 2 & \colorsample{2} \\
+ 3 & \colorsample{3} \\
+ 4 & \colorsample{4} \\
+ 5 & \colorsample{5} \\ \hline
+ \end{tabular}
+\end{center}
+
+\newcount\code\global\code=0
+\newcount\supplement\global\supplement=0
+
+\noindent
+\foreach \row in {0,...,1514}{%
+\hbox to 7ex{\hfill\number\code}\quad
+\foreach \col in {0,...,19}{%
+\ifcase\supplement%
+\ifnum\code>7716 \global\advance\supplement by 1\fi\or
+\ifnum\code>9896 \global\advance\supplement by 1\fi\or
+\ifnum\code>22126 \global\advance\supplement by 1\fi\or
+\ifnum\code>22352 \global\advance\supplement by 1\fi\or
+\ifnum\code>29063 \global\advance\supplement by 1\fi\fi
+\ifnum\code < 22353
+ \colorbox{\colorname{\supplement}}{\CIDC{\code}}\
+\fi
+\global\advance\code by 1
+}\\
+}
+\end{document}
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1-345.tex b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1-345.tex
index 05f0d11a331..820c7660ae9 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1-345.tex
+++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1-345.tex
@@ -1,39 +1,39 @@
-\ifx\dviware\undefined \def\dviware{dvipdfmx}\fi
-\documentclass[\dviware]{jsarticle}
-\usepackage{cidtable}
-
-\begin{document}
-\begin{center}
-Adobe-GB1 Glyphs\\
- \begin{tabular}{ll} \hline
- Supplement & Color \\ \hline
- 0 & \colorsample{0} \\
- 1 & \colorsample{1} \\
- 2 & \colorsample{2} \\
- 3 & \colorsample{3} \\
- 4 & \colorsample{4} \\
- 5 & \colorsample{5} \\ \hline
- \end{tabular}
-\end{center}
-
-\newcount\code\global\code=0
-\newcount\supplement\global\supplement=0
-
-\noindent
-\foreach \row in {0,...,1514}{%
-\hbox to 7ex{\hfill\number\code}\quad
-\foreach \col in {0,...,19}{%
-\ifcase\supplement%
-\ifnum\code>7716 \global\advance\supplement by 1\fi\or
-\ifnum\code>9896 \global\advance\supplement by 1\fi\or
-\ifnum\code>22126 \global\advance\supplement by 1\fi\or
-\ifnum\code>22352 \global\advance\supplement by 1\fi\or
-\ifnum\code>29063 \global\advance\supplement by 1\fi\fi
-\ifnum\code < 30284
- \ifnum\code > 22126
- \colorbox{\colorname{\supplement}}{\CIDC{\code}}\
-\fi\fi
-\global\advance\code by 1
-}\\
-}
-\end{document}
+\ifx\dviware\undefined \def\dviware{dvipdfmx}\fi
+\documentclass[\dviware]{jsarticle}
+\usepackage{cidtable}
+
+\begin{document}
+\begin{center}
+Adobe-GB1 Glyphs\\
+ \begin{tabular}{ll} \hline
+ Supplement & Color \\ \hline
+ 0 & \colorsample{0} \\
+ 1 & \colorsample{1} \\
+ 2 & \colorsample{2} \\
+ 3 & \colorsample{3} \\
+ 4 & \colorsample{4} \\
+ 5 & \colorsample{5} \\ \hline
+ \end{tabular}
+\end{center}
+
+\newcount\code\global\code=0
+\newcount\supplement\global\supplement=0
+
+\noindent
+\foreach \row in {0,...,1514}{%
+\hbox to 7ex{\hfill\number\code}\quad
+\foreach \col in {0,...,19}{%
+\ifcase\supplement%
+\ifnum\code>7716 \global\advance\supplement by 1\fi\or
+\ifnum\code>9896 \global\advance\supplement by 1\fi\or
+\ifnum\code>22126 \global\advance\supplement by 1\fi\or
+\ifnum\code>22352 \global\advance\supplement by 1\fi\or
+\ifnum\code>29063 \global\advance\supplement by 1\fi\fi
+\ifnum\code < 30284
+ \ifnum\code > 22126
+ \colorbox{\colorname{\supplement}}{\CIDC{\code}}\
+\fi\fi
+\global\advance\code by 1
+}\\
+}
+\end{document}
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1.tex b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1.tex
index fc519fd6e54..883592a76fb 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1.tex
+++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1.tex
@@ -1,38 +1,38 @@
-\ifx\dviware\undefined \def\dviware{dvipdfmx}\fi
-\documentclass[\dviware]{jsarticle}
-\usepackage{cidtable}
-
-\begin{document}
-\begin{center}
-Adobe-GB1 Glyphs\\
- \begin{tabular}{ll} \hline
- Supplement & Color \\ \hline
- 0 & \colorsample{0} \\
- 1 & \colorsample{1} \\
- 2 & \colorsample{2} \\
- 3 & \colorsample{3} \\
- 4 & \colorsample{4} \\
- 5 & \colorsample{5} \\ \hline
- \end{tabular}
-\end{center}
-
-\newcount\code\global\code=0
-\newcount\supplement\global\supplement=0
-
-\noindent
-\foreach \row in {0,...,1514}{%
-\hbox to 7ex{\hfill\number\code}\quad
-\foreach \col in {0,...,19}{%
-\ifcase\supplement%
-\ifnum\code>7716 \global\advance\supplement by 1\fi\or
-\ifnum\code>9896 \global\advance\supplement by 1\fi\or
-\ifnum\code>22126 \global\advance\supplement by 1\fi\or
-\ifnum\code>22352 \global\advance\supplement by 1\fi\or
-\ifnum\code>29063 \global\advance\supplement by 1\fi\fi
-\ifnum\code < 30284
- \colorbox{\colorname{\supplement}}{\CIDC{\code}}\
-\fi
-\global\advance\code by 1
-}\\
-}
-\end{document}
+\ifx\dviware\undefined \def\dviware{dvipdfmx}\fi
+\documentclass[\dviware]{jsarticle}
+\usepackage{cidtable}
+
+\begin{document}
+\begin{center}
+Adobe-GB1 Glyphs\\
+ \begin{tabular}{ll} \hline
+ Supplement & Color \\ \hline
+ 0 & \colorsample{0} \\
+ 1 & \colorsample{1} \\
+ 2 & \colorsample{2} \\
+ 3 & \colorsample{3} \\
+ 4 & \colorsample{4} \\
+ 5 & \colorsample{5} \\ \hline
+ \end{tabular}
+\end{center}
+
+\newcount\code\global\code=0
+\newcount\supplement\global\supplement=0
+
+\noindent
+\foreach \row in {0,...,1514}{%
+\hbox to 7ex{\hfill\number\code}\quad
+\foreach \col in {0,...,19}{%
+\ifcase\supplement%
+\ifnum\code>7716 \global\advance\supplement by 1\fi\or
+\ifnum\code>9896 \global\advance\supplement by 1\fi\or
+\ifnum\code>22126 \global\advance\supplement by 1\fi\or
+\ifnum\code>22352 \global\advance\supplement by 1\fi\or
+\ifnum\code>29063 \global\advance\supplement by 1\fi\fi
+\ifnum\code < 30284
+ \colorbox{\colorname{\supplement}}{\CIDC{\code}}\
+\fi
+\global\advance\code by 1
+}\\
+}
+\end{document}
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-Japan1.tex b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-Japan1.tex
index 05d51c9e3df..0793a5248d7 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-Japan1.tex
+++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-Japan1.tex
@@ -1,40 +1,40 @@
-\ifx\dviware\undefined \def\dviware{dvipdfmx}\fi
-\documentclass[\dviware]{jsarticle}
-\usepackage{cidtable}
-
-\begin{document}
-\begin{center}
-Adobe-Japan1 Glyphs\\
- \begin{tabular}{ll} \hline
- Supplement & Color \\ \hline
- 0 & \colorsample{0} \\
- 1 & \colorsample{1} \\
- 2 & \colorsample{2} \\
- 3 & \colorsample{3} \\
- 4 & \colorsample{4} \\
- 5 & \colorsample{5} \\
- 6 & \colorsample{6} \\ \hline
- \end{tabular}
-\end{center}
-
-\newcount\code\global\code=0
-\newcount\supplement\global\supplement=0
-
-\noindent
-\foreach \row in {0,...,1152}{%
-\hbox to 7ex{\hfill\number\code}\quad
-\foreach \col in {0,...,19}{%
-\ifcase\supplement%
-\ifnum\code>8283 \global\advance\supplement by 1\fi\or
-\ifnum\code>8358 \global\advance\supplement by 1\fi\or
-\ifnum\code>8719 \global\advance\supplement by 1\fi\or
-\ifnum\code>9353 \global\advance\supplement by 1\fi\or
-\ifnum\code>15443 \global\advance\supplement by 1\fi\or
-\ifnum\code>20316 \global\advance\supplement by 1\fi\fi
-\ifnum\code < 23058
- \colorbox{\colorname{\supplement}}{\CID{\code}}\
-\fi
-\global\advance\code by 1
-}\\
-}
-\end{document}
+\ifx\dviware\undefined \def\dviware{dvipdfmx}\fi
+\documentclass[\dviware]{jsarticle}
+\usepackage{cidtable}
+
+\begin{document}
+\begin{center}
+Adobe-Japan1 Glyphs\\
+ \begin{tabular}{ll} \hline
+ Supplement & Color \\ \hline
+ 0 & \colorsample{0} \\
+ 1 & \colorsample{1} \\
+ 2 & \colorsample{2} \\
+ 3 & \colorsample{3} \\
+ 4 & \colorsample{4} \\
+ 5 & \colorsample{5} \\
+ 6 & \colorsample{6} \\ \hline
+ \end{tabular}
+\end{center}
+
+\newcount\code\global\code=0
+\newcount\supplement\global\supplement=0
+
+\noindent
+\foreach \row in {0,...,1152}{%
+\hbox to 7ex{\hfill\number\code}\quad
+\foreach \col in {0,...,19}{%
+\ifcase\supplement%
+\ifnum\code>8283 \global\advance\supplement by 1\fi\or
+\ifnum\code>8358 \global\advance\supplement by 1\fi\or
+\ifnum\code>8719 \global\advance\supplement by 1\fi\or
+\ifnum\code>9353 \global\advance\supplement by 1\fi\or
+\ifnum\code>15443 \global\advance\supplement by 1\fi\or
+\ifnum\code>20316 \global\advance\supplement by 1\fi\fi
+\ifnum\code < 23058
+ \colorbox{\colorname{\supplement}}{\CID{\code}}\
+\fi
+\global\advance\code by 1
+}\\
+}
+\end{document}
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-Korea1.tex b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-Korea1.tex
index a528daef869..2aad5ae5269 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-Korea1.tex
+++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-Korea1.tex
@@ -1,32 +1,32 @@
-\ifx\dviware\undefined \def\dviware{dvipdfmx}\fi
-\documentclass[\dviware]{jsarticle}
-\usepackage{cidtable}
-
-\begin{document}
-\begin{center}
-Adobe-Korea1 Glyphs\\
- \begin{tabular}{ll} \hline
- Supplement & Color \\ \hline
- 0 & \colorsample{0} \\
- 1 & \colorsample{1} \\
- 2 & \colorsample{2} \\ \hline
- \end{tabular}
-\end{center}
-
-\newcount\code\global\code=0
-\newcount\supplement\global\supplement=0
-
-\noindent
-\foreach \row in {0,...,917}{%
-\hbox to 7ex{\hfill\number\code}\quad
-\foreach \col in {0,...,19}{%
-\ifcase\supplement%
-\ifnum\code>9332 \global\advance\supplement by 1\fi\or
-\ifnum\code>18154 \global\advance\supplement by 1\fi\fi
-\ifnum\code < 18352
- \colorbox{\colorname{\supplement}}{\CIDK{\code}}\
-\fi
-\global\advance\code by 1
-}\\
-}
-\end{document}
+\ifx\dviware\undefined \def\dviware{dvipdfmx}\fi
+\documentclass[\dviware]{jsarticle}
+\usepackage{cidtable}
+
+\begin{document}
+\begin{center}
+Adobe-Korea1 Glyphs\\
+ \begin{tabular}{ll} \hline
+ Supplement & Color \\ \hline
+ 0 & \colorsample{0} \\
+ 1 & \colorsample{1} \\
+ 2 & \colorsample{2} \\ \hline
+ \end{tabular}
+\end{center}
+
+\newcount\code\global\code=0
+\newcount\supplement\global\supplement=0
+
+\noindent
+\foreach \row in {0,...,917}{%
+\hbox to 7ex{\hfill\number\code}\quad
+\foreach \col in {0,...,19}{%
+\ifcase\supplement%
+\ifnum\code>9332 \global\advance\supplement by 1\fi\or
+\ifnum\code>18154 \global\advance\supplement by 1\fi\fi
+\ifnum\code < 18352
+ \colorbox{\colorname{\supplement}}{\CIDK{\code}}\
+\fi
+\global\advance\code by 1
+}\\
+}
+\end{document}
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/cidtable.sty b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/cidtable.sty
index 6d58d40cd64..18ee5cbdbb6 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/cidtable.sty
+++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/cidtable.sty
@@ -1,21 +1,21 @@
-\usepackage[deluxe, expert, multi]{otf}
-\usepackage{pgffor}
-\usepackage{color}
-\setlength{\fboxsep}{0pt}
-%\setlength{\fboxrule}{0.2pt}
-\definecolor{UClightgray}{cmyk}{.15,.10,.10,0}
-\definecolor{UClightpink}{cmyk}{0,.25,.15,0}
-\definecolor{UClightyellowgreen}{cmyk}{.25,0,.80,0}
-\definecolor{UClightskyblue}{cmyk}{.30,0,0,0}
-\definecolor{UCbeige}{cmyk}{0,.25,.45,0}
-\definecolor{UClightgreen}{cmyk}{.45,0,.45,0}
-\definecolor{UCcream}{cmyk}{0,0,.40,0}
-\definecolor{UClightpurple}{cmyk}{.25,.30,0,0}
-
-\newcommand\colorname[1]{\ifcase#1%
-UClightpink\or
-UClightyellowgreen\or UClightskyblue\or UCbeige\or
-UClightgreen\or UCcream\or UClightpurple\fi}
-\newcommand{\colorsample}[1]{{\color{\colorname{#1}}\rule{10pt}{10pt}} \colorname{#1}}
-
-\endinput
+\usepackage[deluxe, expert, multi]{otf}
+\usepackage{pgffor}
+\usepackage{color}
+\setlength{\fboxsep}{0pt}
+%\setlength{\fboxrule}{0.2pt}
+\definecolor{UClightgray}{cmyk}{.15,.10,.10,0}
+\definecolor{UClightpink}{cmyk}{0,.25,.15,0}
+\definecolor{UClightyellowgreen}{cmyk}{.25,0,.80,0}
+\definecolor{UClightskyblue}{cmyk}{.30,0,0,0}
+\definecolor{UCbeige}{cmyk}{0,.25,.45,0}
+\definecolor{UClightgreen}{cmyk}{.45,0,.45,0}
+\definecolor{UCcream}{cmyk}{0,0,.40,0}
+\definecolor{UClightpurple}{cmyk}{.25,.30,0,0}
+
+\newcommand\colorname[1]{\ifcase#1%
+UClightpink\or
+UClightyellowgreen\or UClightskyblue\or UCbeige\or
+UClightgreen\or UCcream\or UClightpurple\fi}
+\newcommand{\colorsample}[1]{{\color{\colorname{#1}}\rule{10pt}{10pt}} \colorname{#1}}
+
+\endinput