From 1b0fd6b207ba648023b15af2d875b499ceaa0410 Mon Sep 17 00:00:00 2001 From: Bob Rudis Date: Thu, 3 Mar 2016 07:15:53 -0500 Subject: [PATCH] cleanup CRAN checks --- DESCRIPTION | 5 ++--- NAMESPACE | 1 + R/a-pokemon-colors.r | 8 ++++---- R/ggalt-package.r | 2 +- R/pokemon.r | 1 - man/scale_pokemon.Rd | 3 --- 6 files changed, 8 insertions(+), 12 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 0888f35..5263091 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: ggalt -Title: Extra Coordinate Systems, Geoms, Statistical Transformations and Scales for 'ggplot2' +Title: Extra Coordinate Systems, 'Geoms', Statistical Transformations and Scales for 'ggplot2' Version: 0.1.5.9000 Authors@R: c(person("Bob", "Rudis", email = "bob@rudis.net", role = c("aut", "cre"))) Description: A compendium of 'geoms', 'coords', 'stats' & scales for 'ggplot2', @@ -31,7 +31,6 @@ Imports: gtable, ash, maps, - MASS, - ggplot2 + MASS RoxygenNote: 5.0.1 VignetteBuilder: knitr diff --git a/NAMESPACE b/NAMESPACE index d59ada8..1af8200 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -32,6 +32,7 @@ import(ash) import(ggplot2) import(grDevices) import(graphics) +import(maps) import(proj4) importFrom(RColorBrewer,brewer.pal) importFrom(dplyr,filter) diff --git a/R/a-pokemon-colors.r b/R/a-pokemon-colors.r index 2ba53f5..dfa410d 100644 --- a/R/a-pokemon-colors.r +++ b/R/a-pokemon-colors.r @@ -66,14 +66,14 @@ pokemon <- structure(list(bulbasaur = c("#399494", "#62d5b4", "#101010", "#cdbdb4", "#734a18", "#e6d5c5", "#eeeede", "#836210", "#838383", "#ffffff", "#10397b", "#297bcd"), sandslash = c("#8b6218", "#101010", "#f6d520", "#d5ac20", "#4a3910", "#ded5b4", "#ac8331", "#5a4a00", -"#ffffff", "#525252", "#947b00", "#8b8b8b"), `nidoran♀` = c("#d5d5ff", +"#ffffff", "#525252", "#947b00", "#8b8b8b"), `nidoran female` = c("#d5d5ff", "#acaccd", "#414183", "#101010", "#7383ac", "#189c94", "#bd314a", "#ffffff", "#396a94", "#eeeeff", "#ff5241", "#dedede"), nidorina = c("#8bc5cd", "#c5e6ee", "#5a94b4", "#395a62", "#101010", "#183973", "#4a83f6", "#ffffff", "#838383", "#1062b4", "#d5d5d5", "#c52010", "#ee4a39", "#ff9c8b"), nidoqueen = c("#628bac", "#5ab4cd", "#314a4a", "#101010", "#bdac5a", "#e6cd8b", "#9cd5de", "#735a29", "#eee6a4", "#ffffff", -"#d5d5d5"), `nidoran♂` = c("#bd62c5", "#e69cd5", "#62416a", +"#d5d5d5"), `nidoran male` = c("#bd62c5", "#e69cd5", "#62416a", "#101010", "#006241", "#eebdee", "#9c4aac", "#00a473", "#18cd9c", "#cdcdcd", "#ffffff", "#b41800", "#de4129", "#ff6a52"), nidorino = c("#945ab4", "#cd83de", "#5a3962", "#101010", "#e6acee", "#009462", "#4acda4", @@ -1508,8 +1508,8 @@ pokemon <- structure(list(bulbasaur = c("#399494", "#62d5b4", "#101010", "wartortle", "blastoise", "caterpie", "metapod", "butterfree", "weedle", "kakuna", "beedrill", "pidgey", "pidgeotto", "pidgeot", "rattata", "raticate", "spearow", "fearow", "ekans", "arbok", -"pikachu", "raichu", "sandshrew", "sandslash", "nidoran\342\231\200", -"nidorina", "nidoqueen", "nidoran\342\231\202", "nidorino", "nidoking", +"pikachu", "raichu", "sandshrew", "sandslash", "nidoran male", +"nidorina", "nidoqueen", "nidoran female", "nidorino", "nidoking", "clefairy", "clefable", "vulpix", "ninetales", "jigglypuff", "wigglytuff", "zubat", "golbat", "oddish", "gloom", "vileplume", "paras", "parasect", "venonat", "venomoth", "diglett", "dugtrio", diff --git a/R/ggalt-package.r b/R/ggalt-package.r index 5e98853..755ac86 100644 --- a/R/ggalt-package.r +++ b/R/ggalt-package.r @@ -5,7 +5,7 @@ #' @name ggalt #' @docType package #' @author Bob Rudis (@@hrbrmstr) -#' @import ggplot2 graphics grDevices KernSmooth proj4 ash MASS +#' @import maps ggplot2 graphics grDevices KernSmooth proj4 ash MASS #' @importFrom dplyr filter #' @importFrom scales rescale expand_range #' @importFrom grid grobName grobTree unit.c grobHeight grobWidth viewport diff --git a/R/pokemon.r b/R/pokemon.r index 3eb958a..8ee0c2c 100644 --- a/R/pokemon.r +++ b/R/pokemon.r @@ -8,7 +8,6 @@ #' @inheritParams pokemon_pal #' @family colour pokemon #' @rdname scale_pokemon -#' @seealso \code{\link{theme_economist}} for examples. #' @export scale_colour_pokemon <- function(avatar="bulbasaur", ...) { discrete_scale("colour", "pokemon", pokemon_pal(avatar=avatar), ...) diff --git a/man/scale_pokemon.Rd b/man/scale_pokemon.Rd index 05aca78..b28702b 100644 --- a/man/scale_pokemon.Rd +++ b/man/scale_pokemon.Rd @@ -24,7 +24,4 @@ Color scales using the colors in the Pokemon characters \details{ Data taken from the hard work by the \href{http://www.pokegraphs.com/}{folks here}. } -\seealso{ -\code{\link{theme_economist}} for examples. -}