version 1.2-1

cran · Jan 24, 2013 · d17508f · d17508f
1 parent 2ddf6cd
commit d17508f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 17 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: colorspace
-Version: 1.2-0
-Date: 2012-10-19
+Version: 1.2-1
+Date: 2013-01-24
 Title: Color Space Manipulation
 Authors@R: c(person(given = "Ross", family = "Ihaka", role = "aut",
         email = "[email protected]"), person(given = "Paul",
@@ -19,9 +19,9 @@ Depends: R (>= 2.10.0), methods
 Suggests: KernSmooth, MASS, kernlab, mvtnorm, vcd, tcltk, dichromat
 License: BSD
 LazyData: yes
-Packaged: 2012-10-19 06:16:58 UTC; zeileis
+Packaged: 2013-01-24 07:18:23 UTC; zeileis
 Author: Ross Ihaka [aut], Paul Murrell [aut], Kurt Hornik [aut], Jason
         C. Fisher [aut], Achim Zeileis [aut, cre]
 Maintainer: Achim Zeileis <[email protected]>
 Repository: CRAN
-Date/Publication: 2012-10-24 07:18:20
+Date/Publication: 2013-01-24 14:59:08
diff --git a/MD5 b/MD5
@@ -1,14 +1,14 @@
-f5306591fb26381fdf8ea19bca9b653e *DESCRIPTION
+47e44df8e953e6e9f86aa871b5d3f216 *DESCRIPTION
 8356d81d3acea4ea672da7460af3d3b8 *NAMESPACE
-f5576b3f5323b934e61adc7bdbad4382 *NEWS
-6d67a5f2f2bc6192a612d614567b614b *R/choose_palette.R
-e4363ae4e41d9b03681d6dbfa1a6c150 *R/colorspace.R
+ce7868c65c60097ce8abaa72e5a948f9 *NEWS
+c6c875275843995d9248203492947030 *R/choose_palette.R
+105046dc05b2027b7dc4e1f17985d477 *R/colorspace.R
 10a677fb3fab53866727fc5993376399 *R/desaturate.R
 b7788dc1f7c99950911f1847ac6e8241 *R/palettes.R
-d05806482346f64a3555bb784f0effec *data/USSouthPolygon.rda
+e9ff78ccf10477e12c2780ecc795a8d6 *data/USSouthPolygon.rda
 2f81a499669b3966aef1d712f47eabb9 *inst/CITATION
 699d2863e53622a6c995d057150bb321 *inst/doc/hcl-colors.Rnw
-72742c0f40d619e28513a79403aa2b7c *inst/doc/hcl-colors.pdf
+de93446ed5677e73fbe80327b338d802 *inst/doc/hcl-colors.pdf
 db9d5f422710029852c85b7252875e15 *man/HLS.Rd
 83d2c121d21919e319c2ef45a42c60c7 *man/HSV.Rd
 17a8655e3d0150245fe6c3e366b7b859 *man/LAB.Rd

diff --git a/NEWS b/NEWS
@@ -1,3 +1,9 @@
+Changes in Version 1.2-1
+
+  o If a new version of the dichromat package (> 1.2-4) with tritan
+    support is found, this is interfaced in choose_palette().
+
+
 Changes in Version 1.2-0
 
   o New Tcl/Tk-based GUI for choosing different types of palettes:

diff --git a/R/choose_palette.R b/R/choose_palette.R
@@ -854,8 +854,17 @@ choose_palette <- function(pal=diverge_hcl, n=7L, parent=NULL) {
     frame7.rb.4 <- ttkradiobutton(frame7, variable=colorblind.type.var,
                                   value="protan", text="protan",
                                   command=function() DrawPalette(is.n=TRUE))
-    tkgrid(frame7.chk.1, frame7.chk.2, frame7.rb.3, frame7.rb.4, "x",
+    frame7.rb.5 <- ttkradiobutton(frame7, variable=colorblind.type.var,
+                                  value="tritan", text="tritan",
+                                  command=function() DrawPalette(is.n=TRUE))
+    ## tritan support in dichromat starting from > 1.2-4
+    if(compareVersion(packageDescription("dichromat")$Version, "1.2-4") > 0) {
+      tkgrid(frame7.chk.1, frame7.chk.2, frame7.rb.3, frame7.rb.4, frame7.rb.5, "x",
+           pady=c(2, 0), sticky="w")    
+    } else {
+      tkgrid(frame7.chk.1, frame7.chk.2, frame7.rb.3, frame7.rb.4, "x",
            pady=c(2, 0), sticky="w")
+    }
     tkgrid.configure(frame7.chk.2, padx=c(7, 0))
     tkgrid.configure(frame7.cvs, columnspan=5)
     tkgrid.columnconfigure(frame7, 4, weight=1)

diff --git a/R/colorspace.R b/R/colorspace.R
@@ -303,9 +303,3 @@ mixcolor =
     if (n2 < n) c2 = c2[rep(1:n2, length = n),]
     get(where)((1 - alpha) * c1 + alpha * c2)
   }
-
-.First.lib =
-  function(lib, pkg)
-  {
-      library.dynam("colorspace", pkg, lib)
-  }
diff --git a/data/USSouthPolygon.rda b/data/USSouthPolygon.rda
diff --git a/inst/doc/hcl-colors.pdf b/inst/doc/hcl-colors.pdf