Skip to content

Commit

Permalink
adding khroma package. close #88
Browse files Browse the repository at this point in the history
  • Loading branch information
EmilHvitfeldt committed Jun 6, 2020
1 parent 5862b71 commit 6bf8595
Show file tree
Hide file tree
Showing 13 changed files with 1,433 additions and 563 deletions.
2 changes: 0 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ Include bullet in `NEWS.md` file.

- [ ] Modify `data-raw/palettes_d.R`
- [ ] run `data-raw/palettes_d_names.R` script
- [ ] Modify `R/data.R` update the format for `palettes_d` and `palettes_d_names` with
`length(palettes_d)` and `nrow(palettes_d_names)` respectively.
- [ ] run `devtools::document()`
- [ ] Include license reference in `LICENSE` file.
- [ ] Include package information in `data-raw/packages` and run.
Expand Down
7 changes: 7 additions & 0 deletions LICENSE.note
Original file line number Diff line number Diff line change
Expand Up @@ -328,3 +328,10 @@ futurevisions palettes
By: Joey Stanley
License: No license
https://github.com/JoeyStanley/futurevisions/blob/master/DESCRIPTION

---

khroma palettes
By: Nicolas Frerebeau & Brice Lebrun
License: GPL-3
https://github.com/nfrerebeau/khroma/blob/master/LICENSE.md
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# paletteer (development version)

* Packages that provide continious color paletttes have been moved from Imports to Suggests. (#93)
* 17 palettes have been added from the khroma package. (#88)

# paletteer 1.1.0

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ you need for a smooth transition of color:

![](man/figures/README-unnamed-chunk-4-1.png)<!-- -->

This package includes 1771 from 50 different packages and information
This package includes 1881 from 52 different packages and information
about these can be found in the following data.frames:
`palettes_c_names`, `palettes_d_names` and `palettes_dynamic_names`.
Additionally this [github
Expand Down Expand Up @@ -129,8 +129,7 @@ paletteer_c("nord::frost")

## Included packages

**paletteer** includes palettes from the following
packages:
**paletteer** includes palettes from the following packages:

| Name | Github | CRAN |
| :----------------- | :---------------------------------------------------------------------------------------------- | :-------------------------------------------------------- |
Expand All @@ -155,6 +154,7 @@ packages:
| harrypotter | [aljrico/harrypotter - 2.1.1](https://github.com/aljrico/harrypotter) | [2.1.1](https://CRAN.R-project.org/package=harrypotter) |
| IslamicArt | [lambdamoses/IslamicArt - 0.1.0](https://github.com/lambdamoses/IslamicArt) | \- |
| jcolors | [jaredhuling/jcolors - 0.0.4](https://github.com/jaredhuling/jcolors) | [0.0.4](https://CRAN.R-project.org/package=jcolors) |
| khroma | [nfrerebeau/khroma - 1.3.0.9000](https://github.com/nfrerebeau/khroma) | [1.3.0](https://CRAN.R-project.org/package=khroma) |
| LaCroixColoR | [johannesbjork/LaCroixColoR - 0.1.0](https://github.com/johannesbjork/LaCroixColoR) | \- |
| lisa | [tyluRp/lisa - 0.1.1.9000](https://github.com/tyluRp/lisa) | [0.1.1](https://CRAN.R-project.org/package=lisa) |
| MapPalettes | [disarm-platform/MapPalettes - 0.0.2](https://github.com/disarm-platform/MapPalettes) | \- |
Expand Down
3 changes: 2 additions & 1 deletion data-raw/packages.R
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ paletteer_packages <- tibble::tribble(
"dichromat", NA, NA, TRUE, "2.0-0",
"DresdenColor", "katiesaund/DresdenColor", "0.0.0.9000", FALSE, NA,
"dutchmasters", "EdwinTh/dutchmasters", "0.1.0", FALSE, NA,
"fishualize", "nschiett/fishualize", "0.2.999", TRUE, "0.1.0",
"fishualize", "nschiett/fishualize", "0.2.0", TRUE, "0.2.0",
"futurevisions", "JoeyStanley/futurevisions", "0.1.0", FALSE, NA,
"gameofthrones", "aljrico/gameofthrones", "1.0.2", TRUE, "1.0.2",
"ggpomological", "gadenbuie/ggpomological", "0.1.2", FALSE, NA,
Expand All @@ -21,6 +21,7 @@ paletteer_packages <- tibble::tribble(
"grDevices", NA, NA, TRUE, "2.0-14",
"harrypotter", "aljrico/harrypotter", "2.1.1", TRUE, "2.1.1",
"IslamicArt", "lambdamoses/IslamicArt", "0.1.0", FALSE, NA,
"khroma", "nfrerebeau/khroma", "1.3.0.9000", TRUE, "1.3.0",
"jcolors", "jaredhuling/jcolors", "0.0.4", TRUE, "0.0.4",
"LaCroixColoR", "johannesbjork/LaCroixColoR", "0.1.0", FALSE, NA,
"lisa", "tyluRp/lisa", "0.1.1.9000", TRUE, "0.1.1",
Expand Down
4 changes: 4 additions & 0 deletions data-raw/palettes_d.R
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ jcolors_pals <- lapply(
unname
)

## khroma ---------------------------------------------------------------------
khroma_pals <- lapply(khroma:::.schemes, function(x) unname(x$colours))

## LaCroixColoR ---------------------------------------------------------------
LaCroixColoR_pals <- c(
lapply(LaCroixColoR::lacroix_palettes[1:20], function(x)
Expand Down Expand Up @@ -358,6 +361,7 @@ palettes_d <- list(
ghibli = ghibli_pals,
grDevices = grDevices_pals,
IslamicArt = IslamicArt_pals,
khroma = khroma_pals,
jcolors = jcolors_pals,
LaCroixColoR = LaCroixColoR_pals,
lisa = lisa_pals,
Expand Down
Binary file modified data/paletteer_packages.rda
Binary file not shown.
Binary file modified data/palettes_d.rda
Binary file not shown.
Binary file modified data/palettes_d_names.rda
Binary file not shown.
4 changes: 2 additions & 2 deletions man/palettes_d.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/palettes_d_names.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6bf8595

Please sign in to comment.