From 81c48bcfe1e872c1fc4de2b3778b3bb3112defe5 Mon Sep 17 00:00:00 2001 From: Laura Date: Mon, 12 Sep 2022 13:06:11 +0200 Subject: [PATCH 01/28] reorder (and group) palettes --- R/zzz_data.R | 72 ++++++++++++++++++++++++-------------------- man/palette_lgbtq.Rd | 24 +++++++-------- man/theme_lgbtq.Rd | 24 +++++++-------- 3 files changed, 63 insertions(+), 57 deletions(-) diff --git a/R/zzz_data.R b/R/zzz_data.R index 6a2c477..6445b0a 100644 --- a/R/zzz_data.R +++ b/R/zzz_data.R @@ -1,51 +1,55 @@ pride_data <- list( + # Base flags rainbow = list( colors = c("#E40303", "#FF8C00", "#FFED00", "#008026", "#24408E", "#732982"), theme = theme_lgbtq_white ), - philadelphia = list( - colors = c("#000000", "#784F17", "#D12229", "#F68A1E", "#FDE01A", "#007940", "#24408E", "#732982"), - theme = theme_lgbtq_white + lesbian = list( + colors = c("#D62900", "#FF9B55", "#FFFFFF", "#D461A6", "#A50062") ), - progress = list( - colors = c("#D12229", "#F68A1E", "#FDE01A", "#007940", "#24408E", "#732982", - "#FFFFFF", "#FFAFC8", "#74D7EE", "#784F17", "#000000") + gay = list( + colors = c("#078D70", "#98E8C1", "#FFFFFF", "#7BADE2", "#3D1A78") ), bisexual = list( colors = c("#D00070", "#8C4799", "#0032A0"), theme = theme_ggplot2 ), - asexual = list( - colors = c("#000000", "#A4A4A4", "#FFFFFF", "#810081") - ), transgender = list( colors = c("#55CDFC", "#F7A8B8", "#FFFFFF") ), - pansexual = list( - colors = c("#FF1B8D", "#FFDA00", "#1BB3FF"), + asexual = list( + colors = c("#000000", "#A4A4A4", "#FFFFFF", "#810081") + ), + intersex = list( + colors = c("#FFD800", "#7902AA"), theme = theme_lgbtq_white ), nonbinary = list( colors = c("#FFF430", "#FFFFFF", "#9C59D1", "#000000") ), - lesbian = list( - colors = c("#D62900", "#FF9B55", "#FFFFFF", "#D461A6", "#A50062") - ), - gay = list( - colors = c("#078D70", "#98E8C1", "#FFFFFF", "#7BADE2", "#3D1A78") - ), - intersex = list( - colors = c("#FFD800", "#7902AA"), + # Rainbow variants + philadelphia = list( + colors = c("#000000", "#784F17", "#D12229", "#F68A1E", "#FDE01A", "#007940", "#24408E", "#732982"), theme = theme_lgbtq_white ), + progress = list( + colors = c("#D12229", "#F68A1E", "#FDE01A", "#007940", "#24408E", "#732982", + "#FFFFFF", "#FFAFC8", "#74D7EE", "#784F17", "#000000") + ), + # A-spectrum aromantic = list( colors = c("#3DA542", "#A7D379", "#FFFFFF", "#A4A4A4", "#000000") ), - genderfluid = list( - colors = c("#FF76A4", "#FFFFFF", "#C011D7", "#000000", "#2F3CBE") + alloace = list( + colors = c("#D50100", "#F85858", "#FFFFFF", "#81007F") ), - genderqueer = list( - colors = c("#B57EDC", "#FFFFFF", "#4A8123") + aroallo = list( + colors = c("#3DA542", "#A8D379", "#FFFFFF", "#FBE34B", "#E8BB00") + ), + # Other sexualities + pansexual = list( + colors = c("#FF1B8D", "#FFDA00", "#1BB3FF"), + theme = theme_lgbtq_white ), lesbian_7 = list( colors = c("#A60061", "#B95594", "#D162A8", "#FFFFFF", "#E5ADD1", "#C64D53", "#8C1801") @@ -53,10 +57,7 @@ pride_data <- list( gay_7 = list( colors = c("#078D70", "#26CEAA", "#98E8C1", "#FFFFFF", "#7BADE2", "#5049CC", "#3D1A78") ), - agender = list( - colors = c("#000000", "#BCC4C7", "#FFFFFF", "#B7F684"), - theme = theme_agender - ), + # Fem-masc genders demiboy = list( colors = c("#7F7F7F", "#C4C4C4", "#9DD7EA", "#FFFFFF"), theme = theme_demiboy @@ -65,14 +66,19 @@ pride_data <- list( colors = c("#7F7F7F", "#C4C4C4", "#FDADC8", "#FFFFFF"), theme = theme_demigirl ), + # Other genders + genderfluid = list( + colors = c("#FF76A4", "#FFFFFF", "#C011D7", "#000000", "#2F3CBE") + ), + genderqueer = list( + colors = c("#B57EDC", "#FFFFFF", "#4A8123") + ), + agender = list( + colors = c("#000000", "#BCC4C7", "#FFFFFF", "#B7F684"), + theme = theme_agender + ), bigender = list( colors = c("#C479A2", "#EDA5CD", "#D6C7E8", "#FFFFFF", "#9AC7E8", "#6D82D1"), theme = theme_ggplot2 - ), - alloace = list( - colors = c("#D50100", "#F85858", "#FFFFFF", "#81007F") - ), - aroallo = list( - colors = c("#3DA542", "#A8D379", "#FFFFFF", "#FBE34B", "#E8BB00") ) ) diff --git a/man/palette_lgbtq.Rd b/man/palette_lgbtq.Rd index 54c1caa..6677794 100644 --- a/man/palette_lgbtq.Rd +++ b/man/palette_lgbtq.Rd @@ -23,27 +23,27 @@ flag. Note: the number of colors vary between palettes! Currently available palettes are: \itemize{ \item \code{rainbow} (6 colors) -\item \code{philadelphia} (8 colors) -\item \code{progress} (11 colors) -\item \code{bisexual} (3 colors) -\item \code{asexual} (4 colors) -\item \code{transgender} (3 colors) -\item \code{pansexual} (3 colors) -\item \code{nonbinary} (4 colors) \item \code{lesbian} (5 colors) \item \code{gay} (5 colors) +\item \code{bisexual} (3 colors) +\item \code{transgender} (3 colors) +\item \code{asexual} (4 colors) \item \code{intersex} (2 colors) +\item \code{nonbinary} (4 colors) +\item \code{philadelphia} (8 colors) +\item \code{progress} (11 colors) \item \code{aromantic} (5 colors) -\item \code{genderfluid} (5 colors) -\item \code{genderqueer} (3 colors) +\item \code{alloace} (4 colors) +\item \code{aroallo} (5 colors) +\item \code{pansexual} (3 colors) \item \code{lesbian_7} (7 colors) \item \code{gay_7} (7 colors) -\item \code{agender} (4 colors) \item \code{demiboy} (4 colors) \item \code{demigirl} (4 colors) +\item \code{genderfluid} (5 colors) +\item \code{genderqueer} (3 colors) +\item \code{agender} (4 colors) \item \code{bigender} (6 colors) -\item \code{alloace} (4 colors) -\item \code{aroallo} (5 colors) } } diff --git a/man/theme_lgbtq.Rd b/man/theme_lgbtq.Rd index 67bd29e..7f24675 100644 --- a/man/theme_lgbtq.Rd +++ b/man/theme_lgbtq.Rd @@ -27,27 +27,27 @@ LGBTQ themes are carefully curated for each palette. Currently available palettes are: \itemize{ \item \code{rainbow} (6 colors) -\item \code{philadelphia} (8 colors) -\item \code{progress} (11 colors) -\item \code{bisexual} (3 colors) -\item \code{asexual} (4 colors) -\item \code{transgender} (3 colors) -\item \code{pansexual} (3 colors) -\item \code{nonbinary} (4 colors) \item \code{lesbian} (5 colors) \item \code{gay} (5 colors) +\item \code{bisexual} (3 colors) +\item \code{transgender} (3 colors) +\item \code{asexual} (4 colors) \item \code{intersex} (2 colors) +\item \code{nonbinary} (4 colors) +\item \code{philadelphia} (8 colors) +\item \code{progress} (11 colors) \item \code{aromantic} (5 colors) -\item \code{genderfluid} (5 colors) -\item \code{genderqueer} (3 colors) +\item \code{alloace} (4 colors) +\item \code{aroallo} (5 colors) +\item \code{pansexual} (3 colors) \item \code{lesbian_7} (7 colors) \item \code{gay_7} (7 colors) -\item \code{agender} (4 colors) \item \code{demiboy} (4 colors) \item \code{demigirl} (4 colors) +\item \code{genderfluid} (5 colors) +\item \code{genderqueer} (3 colors) +\item \code{agender} (4 colors) \item \code{bigender} (6 colors) -\item \code{alloace} (4 colors) -\item \code{aroallo} (5 colors) } } From 4e3c89d92802af10a03f29d3ae0e5b47c5e9a798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20B=C4=85ka=C5=82a?= Date: Mon, 12 Sep 2022 14:53:05 +0200 Subject: [PATCH 02/28] Increment version number to 0.1.1.9000 --- DESCRIPTION | 2 +- NEWS.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 74ed411..c3fc856 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: gglgbtq Type: Package Title: Show Pride on 'ggplot2' Plots -Version: 0.1.1 +Version: 0.1.1.9000 Date: 2022-08-06 Authors@R: c(person("Laura", "Bakala", email = "erdaradun.gaztea@gmail.com", diff --git a/NEWS.md b/NEWS.md index 8842351..987b780 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +# gglgbtq (development version) + # gglgbtq 0.1.1 * Implemented the following palettes: `agender`, `alloace`, `aroallo`, `bigender`, `demiboy`, `demigirl`. From f8368ed5cddb6839d77bf4039ca584516331a174 Mon Sep 17 00:00:00 2001 From: Laura Date: Mon, 12 Sep 2022 14:54:59 +0200 Subject: [PATCH 03/28] implement acesthetic --- NEWS.md | 2 ++ R/zzz_data.R | 3 +++ man/palette_lgbtq.Rd | 1 + man/theme_lgbtq.Rd | 1 + vignettes/gallery.Rmd | 6 ++++++ 5 files changed, 13 insertions(+) diff --git a/NEWS.md b/NEWS.md index 987b780..a86c51e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,7 @@ # gglgbtq (development version) +* Implemented the following palettes: `acesthetic`. + # gglgbtq 0.1.1 * Implemented the following palettes: `agender`, `alloace`, `aroallo`, `bigender`, `demiboy`, `demigirl`. diff --git a/R/zzz_data.R b/R/zzz_data.R index 6445b0a..5b7e777 100644 --- a/R/zzz_data.R +++ b/R/zzz_data.R @@ -40,6 +40,9 @@ pride_data <- list( aromantic = list( colors = c("#3DA542", "#A7D379", "#FFFFFF", "#A4A4A4", "#000000") ), + acesthetic = list( + colors = c("#000000", "#A4A4A4", "#FFFFFF", "#FD82AE") + ), alloace = list( colors = c("#D50100", "#F85858", "#FFFFFF", "#81007F") ), diff --git a/man/palette_lgbtq.Rd b/man/palette_lgbtq.Rd index 6677794..1bfbf3d 100644 --- a/man/palette_lgbtq.Rd +++ b/man/palette_lgbtq.Rd @@ -33,6 +33,7 @@ Currently available palettes are: \item \code{philadelphia} (8 colors) \item \code{progress} (11 colors) \item \code{aromantic} (5 colors) +\item \code{acesthetic} (4 colors) \item \code{alloace} (4 colors) \item \code{aroallo} (5 colors) \item \code{pansexual} (3 colors) diff --git a/man/theme_lgbtq.Rd b/man/theme_lgbtq.Rd index 7f24675..4b3e64e 100644 --- a/man/theme_lgbtq.Rd +++ b/man/theme_lgbtq.Rd @@ -37,6 +37,7 @@ Currently available palettes are: \item \code{philadelphia} (8 colors) \item \code{progress} (11 colors) \item \code{aromantic} (5 colors) +\item \code{acesthetic} (4 colors) \item \code{alloace} (4 colors) \item \code{aroallo} (5 colors) \item \code{pansexual} (3 colors) diff --git a/vignettes/gallery.Rmd b/vignettes/gallery.Rmd index dfedce7..b0bc1ac 100644 --- a/vignettes/gallery.Rmd +++ b/vignettes/gallery.Rmd @@ -96,6 +96,12 @@ palette_lgbtq("aromantic") An aromantic person does not experience romantic attraction towards anyone. +```{r acesthetic} +palette_lgbtq("acesthetic") +``` + +"Acesthetic" (also called "anaesthetic") is a lack of aesthetic attraction (one of the tertiary orientations) towards other people. + ```{r alloace} palette_lgbtq("alloace") ``` From 80976df2c266cff435c622cc41ebaed933080841 Mon Sep 17 00:00:00 2001 From: Laura Date: Mon, 12 Sep 2022 15:17:25 +0200 Subject: [PATCH 04/28] implement analterous --- NEWS.md | 2 +- R/zzz_data.R | 3 +++ man/palette_lgbtq.Rd | 1 + man/theme_lgbtq.Rd | 1 + vignettes/gallery.Rmd | 6 ++++++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index a86c51e..2ddf3c4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # gglgbtq (development version) -* Implemented the following palettes: `acesthetic`. +* Implemented the following palettes: `acesthetic`, `analterous`. # gglgbtq 0.1.1 diff --git a/R/zzz_data.R b/R/zzz_data.R index 5b7e777..4d48edd 100644 --- a/R/zzz_data.R +++ b/R/zzz_data.R @@ -43,6 +43,9 @@ pride_data <- list( acesthetic = list( colors = c("#000000", "#A4A4A4", "#FFFFFF", "#FD82AE") ), + analterous = list( + colors = c("#000000", "#A4A4A4", "#FFFFFF", "#75A0FF") + ), alloace = list( colors = c("#D50100", "#F85858", "#FFFFFF", "#81007F") ), diff --git a/man/palette_lgbtq.Rd b/man/palette_lgbtq.Rd index 1bfbf3d..d14ae10 100644 --- a/man/palette_lgbtq.Rd +++ b/man/palette_lgbtq.Rd @@ -34,6 +34,7 @@ Currently available palettes are: \item \code{progress} (11 colors) \item \code{aromantic} (5 colors) \item \code{acesthetic} (4 colors) +\item \code{analterous} (4 colors) \item \code{alloace} (4 colors) \item \code{aroallo} (5 colors) \item \code{pansexual} (3 colors) diff --git a/man/theme_lgbtq.Rd b/man/theme_lgbtq.Rd index 4b3e64e..f417b77 100644 --- a/man/theme_lgbtq.Rd +++ b/man/theme_lgbtq.Rd @@ -38,6 +38,7 @@ Currently available palettes are: \item \code{progress} (11 colors) \item \code{aromantic} (5 colors) \item \code{acesthetic} (4 colors) +\item \code{analterous} (4 colors) \item \code{alloace} (4 colors) \item \code{aroallo} (5 colors) \item \code{pansexual} (3 colors) diff --git a/vignettes/gallery.Rmd b/vignettes/gallery.Rmd index b0bc1ac..84384ce 100644 --- a/vignettes/gallery.Rmd +++ b/vignettes/gallery.Rmd @@ -102,6 +102,12 @@ palette_lgbtq("acesthetic") "Acesthetic" (also called "anaesthetic") is a lack of aesthetic attraction (one of the tertiary orientations) towards other people. +```{r analterous} +palette_lgbtq("analterous") +``` + +"Alterous attraction" is a term for the gray area between romantic and platonic attraction. A person that does not experience it is called "analterous". + ```{r alloace} palette_lgbtq("alloace") ``` From 209bd0dfc11db1dc767236261ddd66f28e8df189 Mon Sep 17 00:00:00 2001 From: Laura Date: Mon, 12 Sep 2022 15:43:55 +0200 Subject: [PATCH 05/28] implement asensual --- NEWS.md | 2 +- R/zzz_data.R | 3 +++ man/palette_lgbtq.Rd | 1 + man/theme_lgbtq.Rd | 1 + vignettes/gallery.Rmd | 6 ++++++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 2ddf3c4..65bdd44 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # gglgbtq (development version) -* Implemented the following palettes: `acesthetic`, `analterous`. +* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`. # gglgbtq 0.1.1 diff --git a/R/zzz_data.R b/R/zzz_data.R index 4d48edd..20dda37 100644 --- a/R/zzz_data.R +++ b/R/zzz_data.R @@ -46,6 +46,9 @@ pride_data <- list( analterous = list( colors = c("#000000", "#A4A4A4", "#FFFFFF", "#75A0FF") ), + asensual = list( + colors = c("#000000", "#A4A4A4", "#FFFFFF", "#FFD698") + ), alloace = list( colors = c("#D50100", "#F85858", "#FFFFFF", "#81007F") ), diff --git a/man/palette_lgbtq.Rd b/man/palette_lgbtq.Rd index d14ae10..dc73afd 100644 --- a/man/palette_lgbtq.Rd +++ b/man/palette_lgbtq.Rd @@ -35,6 +35,7 @@ Currently available palettes are: \item \code{aromantic} (5 colors) \item \code{acesthetic} (4 colors) \item \code{analterous} (4 colors) +\item \code{asensual} (4 colors) \item \code{alloace} (4 colors) \item \code{aroallo} (5 colors) \item \code{pansexual} (3 colors) diff --git a/man/theme_lgbtq.Rd b/man/theme_lgbtq.Rd index f417b77..2f9d15c 100644 --- a/man/theme_lgbtq.Rd +++ b/man/theme_lgbtq.Rd @@ -39,6 +39,7 @@ Currently available palettes are: \item \code{aromantic} (5 colors) \item \code{acesthetic} (4 colors) \item \code{analterous} (4 colors) +\item \code{asensual} (4 colors) \item \code{alloace} (4 colors) \item \code{aroallo} (5 colors) \item \code{pansexual} (3 colors) diff --git a/vignettes/gallery.Rmd b/vignettes/gallery.Rmd index 84384ce..3cf8289 100644 --- a/vignettes/gallery.Rmd +++ b/vignettes/gallery.Rmd @@ -108,6 +108,12 @@ palette_lgbtq("analterous") "Alterous attraction" is a term for the gray area between romantic and platonic attraction. A person that does not experience it is called "analterous". +```{r asensual} +palette_lgbtq("asensual") +``` + +A person that does not experience sensual attraction, i.e. a desire for a (possibly intimate) physical contact like cuddling. + ```{r alloace} palette_lgbtq("alloace") ``` From e591d5a43303e814680877f4fb66f03c31380559 Mon Sep 17 00:00:00 2001 From: Laura Date: Mon, 12 Sep 2022 17:55:57 +0200 Subject: [PATCH 06/28] implement ace_spectrum --- NEWS.md | 2 +- R/zzz_data.R | 3 +++ man/palette_lgbtq.Rd | 1 + man/theme_lgbtq.Rd | 1 + vignettes/gallery.Rmd | 6 ++++++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 65bdd44..30a0177 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # gglgbtq (development version) -* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`. +* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`. # gglgbtq 0.1.1 diff --git a/R/zzz_data.R b/R/zzz_data.R index 20dda37..4033d34 100644 --- a/R/zzz_data.R +++ b/R/zzz_data.R @@ -49,6 +49,9 @@ pride_data <- list( asensual = list( colors = c("#000000", "#A4A4A4", "#FFFFFF", "#FFD698") ), + ace_spectrum = list( + colors = c("#151747", "#7557AD", "#D992B4", "#FFEDED") + ), alloace = list( colors = c("#D50100", "#F85858", "#FFFFFF", "#81007F") ), diff --git a/man/palette_lgbtq.Rd b/man/palette_lgbtq.Rd index dc73afd..19d8db7 100644 --- a/man/palette_lgbtq.Rd +++ b/man/palette_lgbtq.Rd @@ -36,6 +36,7 @@ Currently available palettes are: \item \code{acesthetic} (4 colors) \item \code{analterous} (4 colors) \item \code{asensual} (4 colors) +\item \code{ace_spectrum} (4 colors) \item \code{alloace} (4 colors) \item \code{aroallo} (5 colors) \item \code{pansexual} (3 colors) diff --git a/man/theme_lgbtq.Rd b/man/theme_lgbtq.Rd index 2f9d15c..3bde544 100644 --- a/man/theme_lgbtq.Rd +++ b/man/theme_lgbtq.Rd @@ -40,6 +40,7 @@ Currently available palettes are: \item \code{acesthetic} (4 colors) \item \code{analterous} (4 colors) \item \code{asensual} (4 colors) +\item \code{ace_spectrum} (4 colors) \item \code{alloace} (4 colors) \item \code{aroallo} (5 colors) \item \code{pansexual} (3 colors) diff --git a/vignettes/gallery.Rmd b/vignettes/gallery.Rmd index 3cf8289..ce9806a 100644 --- a/vignettes/gallery.Rmd +++ b/vignettes/gallery.Rmd @@ -114,6 +114,12 @@ palette_lgbtq("asensual") A person that does not experience sensual attraction, i.e. a desire for a (possibly intimate) physical contact like cuddling. +```{r ace_spectrum} +palette_lgbtq("ace_spectrum") +``` + +This term encompasses all sexual orientations that are characterized by a complete or partial lack of sexual attraction, e.g. "asexual", "demisexual" or "graysexual". + ```{r alloace} palette_lgbtq("alloace") ``` From 0deff97fd912fdcb7424fee97520298f6ffb0416 Mon Sep 17 00:00:00 2001 From: Laura Date: Mon, 12 Sep 2022 20:43:37 +0200 Subject: [PATCH 07/28] implement aro_spectrum --- NEWS.md | 2 +- R/zzz_data.R | 3 +++ man/palette_lgbtq.Rd | 1 + man/theme_lgbtq.Rd | 1 + vignettes/gallery.Rmd | 6 ++++++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 30a0177..799bd9c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # gglgbtq (development version) -* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`. +* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`. # gglgbtq 0.1.1 diff --git a/R/zzz_data.R b/R/zzz_data.R index 4033d34..f92b507 100644 --- a/R/zzz_data.R +++ b/R/zzz_data.R @@ -52,6 +52,9 @@ pride_data <- list( ace_spectrum = list( colors = c("#151747", "#7557AD", "#D992B4", "#FFEDED") ), + aro_spectrum = list( + colors = c("#3FA053", "#96D07C", "#F3FCCF", "#176363", "#052027") + ), alloace = list( colors = c("#D50100", "#F85858", "#FFFFFF", "#81007F") ), diff --git a/man/palette_lgbtq.Rd b/man/palette_lgbtq.Rd index 19d8db7..2cb28c9 100644 --- a/man/palette_lgbtq.Rd +++ b/man/palette_lgbtq.Rd @@ -37,6 +37,7 @@ Currently available palettes are: \item \code{analterous} (4 colors) \item \code{asensual} (4 colors) \item \code{ace_spectrum} (4 colors) +\item \code{aro_spectrum} (5 colors) \item \code{alloace} (4 colors) \item \code{aroallo} (5 colors) \item \code{pansexual} (3 colors) diff --git a/man/theme_lgbtq.Rd b/man/theme_lgbtq.Rd index 3bde544..71f80b4 100644 --- a/man/theme_lgbtq.Rd +++ b/man/theme_lgbtq.Rd @@ -41,6 +41,7 @@ Currently available palettes are: \item \code{analterous} (4 colors) \item \code{asensual} (4 colors) \item \code{ace_spectrum} (4 colors) +\item \code{aro_spectrum} (5 colors) \item \code{alloace} (4 colors) \item \code{aroallo} (5 colors) \item \code{pansexual} (3 colors) diff --git a/vignettes/gallery.Rmd b/vignettes/gallery.Rmd index ce9806a..312f128 100644 --- a/vignettes/gallery.Rmd +++ b/vignettes/gallery.Rmd @@ -120,6 +120,12 @@ palette_lgbtq("ace_spectrum") This term encompasses all sexual orientations that are characterized by a complete or partial lack of sexual attraction, e.g. "asexual", "demisexual" or "graysexual". +```{r aro_spectrum} +palette_lgbtq("aro_spectrum") +``` + +"Aromantic spectrum" (also called "aro spectrum" or "arospec") is an umbrella term for all romantic orientations characterized by a complete or partial lack of romantic attraction, e.g. "aromantic", "demiromantic", "grayromantic"... analogously to "ace spectrum". + ```{r alloace} palette_lgbtq("alloace") ``` From ea3680d61107d30deb91326012523406b04e9503 Mon Sep 17 00:00:00 2001 From: Laura Date: Wed, 14 Sep 2022 12:22:45 +0200 Subject: [PATCH 08/28] implement gynesexual --- NEWS.md | 2 +- R/zzz_data.R | 4 ++++ man/palette_lgbtq.Rd | 1 + man/theme_lgbtq.Rd | 1 + vignettes/gallery.Rmd | 6 ++++++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 799bd9c..5dcb1b5 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # gglgbtq (development version) -* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`. +* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`, `gynesexual`. # gglgbtq 0.1.1 diff --git a/R/zzz_data.R b/R/zzz_data.R index f92b507..67fc30d 100644 --- a/R/zzz_data.R +++ b/R/zzz_data.R @@ -66,6 +66,10 @@ pride_data <- list( colors = c("#FF1B8D", "#FFDA00", "#1BB3FF"), theme = theme_lgbtq_white ), + gynesexual = list( + colors = c("#F3A9B6", "#903F2A", "#5A953B"), + theme = theme_lgbtq_white + ), lesbian_7 = list( colors = c("#A60061", "#B95594", "#D162A8", "#FFFFFF", "#E5ADD1", "#C64D53", "#8C1801") ), diff --git a/man/palette_lgbtq.Rd b/man/palette_lgbtq.Rd index 2cb28c9..2934250 100644 --- a/man/palette_lgbtq.Rd +++ b/man/palette_lgbtq.Rd @@ -41,6 +41,7 @@ Currently available palettes are: \item \code{alloace} (4 colors) \item \code{aroallo} (5 colors) \item \code{pansexual} (3 colors) +\item \code{gynesexual} (3 colors) \item \code{lesbian_7} (7 colors) \item \code{gay_7} (7 colors) \item \code{demiboy} (4 colors) diff --git a/man/theme_lgbtq.Rd b/man/theme_lgbtq.Rd index 71f80b4..b826c3c 100644 --- a/man/theme_lgbtq.Rd +++ b/man/theme_lgbtq.Rd @@ -45,6 +45,7 @@ Currently available palettes are: \item \code{alloace} (4 colors) \item \code{aroallo} (5 colors) \item \code{pansexual} (3 colors) +\item \code{gynesexual} (3 colors) \item \code{lesbian_7} (7 colors) \item \code{gay_7} (7 colors) \item \code{demiboy} (4 colors) diff --git a/vignettes/gallery.Rmd b/vignettes/gallery.Rmd index 312f128..be19a0f 100644 --- a/vignettes/gallery.Rmd +++ b/vignettes/gallery.Rmd @@ -148,6 +148,12 @@ palette_lgbtq("pansexual") A pansexual person may be attracted to any person regardless of target's gender. This sexuality differs from "omnisexual" in that this attraction is not influenced by gender, does not depend on gender. Also, pansexuality's flag is cooler. +```{r gynesexual} +palette_lgbtq("gynesexual") +``` + +A "gynesexual" person is attracted to women or feminine-presenting people. This term is superior to "straight [man]" and "lesbian", since it does not imply anything about person's gender and is usable by non-binary people as well. + ```{r lesbian_7} palette_lgbtq("lesbian_7") ``` From 37ca5544fdda24dc9e98d986fe69ebbec963f3d0 Mon Sep 17 00:00:00 2001 From: Laura Date: Wed, 14 Sep 2022 14:34:01 +0200 Subject: [PATCH 09/28] implement androsexual --- NEWS.md | 2 +- R/zzz_data.R | 4 ++++ man/palette_lgbtq.Rd | 1 + man/theme_lgbtq.Rd | 1 + vignettes/gallery.Rmd | 6 ++++++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 5dcb1b5..f05e5b3 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # gglgbtq (development version) -* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`, `gynesexual`. +* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`, `androsexual`, `gynesexual`. # gglgbtq 0.1.1 diff --git a/R/zzz_data.R b/R/zzz_data.R index 67fc30d..949cf1e 100644 --- a/R/zzz_data.R +++ b/R/zzz_data.R @@ -66,6 +66,10 @@ pride_data <- list( colors = c("#FF1B8D", "#FFDA00", "#1BB3FF"), theme = theme_lgbtq_white ), + androsexual = list( + colors = c("#00CCFF", "#603524", "#B79ADD"), + theme = theme_lgbtq_white + ), gynesexual = list( colors = c("#F3A9B6", "#903F2A", "#5A953B"), theme = theme_lgbtq_white diff --git a/man/palette_lgbtq.Rd b/man/palette_lgbtq.Rd index 2934250..1acee7a 100644 --- a/man/palette_lgbtq.Rd +++ b/man/palette_lgbtq.Rd @@ -41,6 +41,7 @@ Currently available palettes are: \item \code{alloace} (4 colors) \item \code{aroallo} (5 colors) \item \code{pansexual} (3 colors) +\item \code{androsexual} (3 colors) \item \code{gynesexual} (3 colors) \item \code{lesbian_7} (7 colors) \item \code{gay_7} (7 colors) diff --git a/man/theme_lgbtq.Rd b/man/theme_lgbtq.Rd index b826c3c..247464b 100644 --- a/man/theme_lgbtq.Rd +++ b/man/theme_lgbtq.Rd @@ -45,6 +45,7 @@ Currently available palettes are: \item \code{alloace} (4 colors) \item \code{aroallo} (5 colors) \item \code{pansexual} (3 colors) +\item \code{androsexual} (3 colors) \item \code{gynesexual} (3 colors) \item \code{lesbian_7} (7 colors) \item \code{gay_7} (7 colors) diff --git a/vignettes/gallery.Rmd b/vignettes/gallery.Rmd index be19a0f..5b29026 100644 --- a/vignettes/gallery.Rmd +++ b/vignettes/gallery.Rmd @@ -148,6 +148,12 @@ palette_lgbtq("pansexual") A pansexual person may be attracted to any person regardless of target's gender. This sexuality differs from "omnisexual" in that this attraction is not influenced by gender, does not depend on gender. Also, pansexuality's flag is cooler. +```{r androsexual} +palette_lgbtq("androsexual") +``` + +"Androsexual" is a term for any person, regardless of their gender, that is attracted to men or masculine-presenting people. Preferable to the traditional terms like "straight"/"gay", since it can be easily used by non-binary people as well. + ```{r gynesexual} palette_lgbtq("gynesexual") ``` From edeb1a9af7df24865b22e3522e00de6a8287f468 Mon Sep 17 00:00:00 2001 From: Laura Date: Thu, 15 Sep 2022 00:50:05 +0200 Subject: [PATCH 10/28] implement solarian --- NEWS.md | 2 +- R/zzz_data.R | 5 +++++ man/palette_lgbtq.Rd | 1 + man/theme_lgbtq.Rd | 1 + vignettes/gallery.Rmd | 18 ++++++++++++++++++ 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index f05e5b3..8b08354 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # gglgbtq (development version) -* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`, `androsexual`, `gynesexual`. +* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`, `androsexual`, `gynesexual`, `solarian`. # gglgbtq 0.1.1 diff --git a/R/zzz_data.R b/R/zzz_data.R index 949cf1e..9a75c05 100644 --- a/R/zzz_data.R +++ b/R/zzz_data.R @@ -89,6 +89,11 @@ pride_data <- list( colors = c("#7F7F7F", "#C4C4C4", "#FDADC8", "#FFFFFF"), theme = theme_demigirl ), + # Galactian alignment system + solarian = list( + colors = c("#FFB187", "#FF7D51", "#FFF7B8", "#000000", "#B5B5B5"), + theme = theme_ggplot2 + ), # Other genders genderfluid = list( colors = c("#FF76A4", "#FFFFFF", "#C011D7", "#000000", "#2F3CBE") diff --git a/man/palette_lgbtq.Rd b/man/palette_lgbtq.Rd index 1acee7a..d389e1b 100644 --- a/man/palette_lgbtq.Rd +++ b/man/palette_lgbtq.Rd @@ -47,6 +47,7 @@ Currently available palettes are: \item \code{gay_7} (7 colors) \item \code{demiboy} (4 colors) \item \code{demigirl} (4 colors) +\item \code{solarian} (5 colors) \item \code{genderfluid} (5 colors) \item \code{genderqueer} (3 colors) \item \code{agender} (4 colors) diff --git a/man/theme_lgbtq.Rd b/man/theme_lgbtq.Rd index 247464b..a694a80 100644 --- a/man/theme_lgbtq.Rd +++ b/man/theme_lgbtq.Rd @@ -51,6 +51,7 @@ Currently available palettes are: \item \code{gay_7} (7 colors) \item \code{demiboy} (4 colors) \item \code{demigirl} (4 colors) +\item \code{solarian} (5 colors) \item \code{genderfluid} (5 colors) \item \code{genderqueer} (3 colors) \item \code{agender} (4 colors) diff --git a/vignettes/gallery.Rmd b/vignettes/gallery.Rmd index 5b29026..122c3d7 100644 --- a/vignettes/gallery.Rmd +++ b/vignettes/gallery.Rmd @@ -188,6 +188,24 @@ palette_lgbtq("demigirl") A person that is partially a woman. The other part of their gender may or may not include other genders. +## Galactian alignment system + +Some non-binary people got tired of having to explain their genders in binary terms, like in the category above. As such, they created a gender system with names based on celestial bodies that allows to specify one's gender alignment (which does not imply one's actual gender). + +```{r solarian} +palette_lgbtq("solarian") +``` + +A non-binary person whose identity is male-aligned or whose expression is masculine-aligned. + + + ## Other genders ...and all the other terms related to gender that do not fit in the fem-masc spectrum: From 85922aa55e97de25f68a7fb7677937da148f0642 Mon Sep 17 00:00:00 2001 From: Laura Date: Thu, 15 Sep 2022 00:51:26 +0200 Subject: [PATCH 11/28] implement lunarian --- NEWS.md | 2 +- R/zzz_data.R | 4 ++++ man/palette_lgbtq.Rd | 1 + man/theme_lgbtq.Rd | 1 + vignettes/gallery.Rmd | 6 ++++++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 8b08354..beabd43 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # gglgbtq (development version) -* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`, `androsexual`, `gynesexual`, `solarian`. +* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`, `androsexual`, `gynesexual`, `lunarian`, `solarian`. # gglgbtq 0.1.1 diff --git a/R/zzz_data.R b/R/zzz_data.R index 9a75c05..e6f292a 100644 --- a/R/zzz_data.R +++ b/R/zzz_data.R @@ -90,6 +90,10 @@ pride_data <- list( theme = theme_demigirl ), # Galactian alignment system + lunarian = list( + colors = c("#C6A5D0", "#85618D", "#FFF7B8", "#000000", "#B5B5B5"), + theme = theme_ggplot2 + ), solarian = list( colors = c("#FFB187", "#FF7D51", "#FFF7B8", "#000000", "#B5B5B5"), theme = theme_ggplot2 diff --git a/man/palette_lgbtq.Rd b/man/palette_lgbtq.Rd index d389e1b..dd6315a 100644 --- a/man/palette_lgbtq.Rd +++ b/man/palette_lgbtq.Rd @@ -47,6 +47,7 @@ Currently available palettes are: \item \code{gay_7} (7 colors) \item \code{demiboy} (4 colors) \item \code{demigirl} (4 colors) +\item \code{lunarian} (5 colors) \item \code{solarian} (5 colors) \item \code{genderfluid} (5 colors) \item \code{genderqueer} (3 colors) diff --git a/man/theme_lgbtq.Rd b/man/theme_lgbtq.Rd index a694a80..5f1460d 100644 --- a/man/theme_lgbtq.Rd +++ b/man/theme_lgbtq.Rd @@ -51,6 +51,7 @@ Currently available palettes are: \item \code{gay_7} (7 colors) \item \code{demiboy} (4 colors) \item \code{demigirl} (4 colors) +\item \code{lunarian} (5 colors) \item \code{solarian} (5 colors) \item \code{genderfluid} (5 colors) \item \code{genderqueer} (3 colors) diff --git a/vignettes/gallery.Rmd b/vignettes/gallery.Rmd index 122c3d7..766789d 100644 --- a/vignettes/gallery.Rmd +++ b/vignettes/gallery.Rmd @@ -192,6 +192,12 @@ A person that is partially a woman. The other part of their gender may or may no Some non-binary people got tired of having to explain their genders in binary terms, like in the category above. As such, they created a gender system with names based on celestial bodies that allows to specify one's gender alignment (which does not imply one's actual gender). +```{r lunarian} +palette_lgbtq("lunarian") +``` + +"Lunarian" means a person of female-aligned identity or whose expression is feminine-aligned. + ```{r solarian} palette_lgbtq("solarian") ``` From fe0aca8a1be96cbdcf8d7f306ecba31aeff862db Mon Sep 17 00:00:00 2001 From: Laura Date: Thu, 15 Sep 2022 01:02:31 +0200 Subject: [PATCH 12/28] implement stellarian --- NEWS.md | 2 +- R/zzz_data.R | 4 ++++ man/palette_lgbtq.Rd | 1 + man/theme_lgbtq.Rd | 1 + vignettes/gallery.Rmd | 6 ++++++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index beabd43..ecd2560 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # gglgbtq (development version) -* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`, `androsexual`, `gynesexual`, `lunarian`, `solarian`. +* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`, `androsexual`, `gynesexual`, `lunarian`, `solarian`, `stellarian`. # gglgbtq 0.1.1 diff --git a/R/zzz_data.R b/R/zzz_data.R index e6f292a..99e7299 100644 --- a/R/zzz_data.R +++ b/R/zzz_data.R @@ -98,6 +98,10 @@ pride_data <- list( colors = c("#FFB187", "#FF7D51", "#FFF7B8", "#000000", "#B5B5B5"), theme = theme_ggplot2 ), + stellarian = list( + colors = c("#B6D6C1", "#79C49D", "#FFF7B8", "#000000", "#B5B5B5"), + theme = theme_ggplot2 + ), # Other genders genderfluid = list( colors = c("#FF76A4", "#FFFFFF", "#C011D7", "#000000", "#2F3CBE") diff --git a/man/palette_lgbtq.Rd b/man/palette_lgbtq.Rd index dd6315a..c95a89f 100644 --- a/man/palette_lgbtq.Rd +++ b/man/palette_lgbtq.Rd @@ -49,6 +49,7 @@ Currently available palettes are: \item \code{demigirl} (4 colors) \item \code{lunarian} (5 colors) \item \code{solarian} (5 colors) +\item \code{stellarian} (5 colors) \item \code{genderfluid} (5 colors) \item \code{genderqueer} (3 colors) \item \code{agender} (4 colors) diff --git a/man/theme_lgbtq.Rd b/man/theme_lgbtq.Rd index 5f1460d..2ba935a 100644 --- a/man/theme_lgbtq.Rd +++ b/man/theme_lgbtq.Rd @@ -53,6 +53,7 @@ Currently available palettes are: \item \code{demigirl} (4 colors) \item \code{lunarian} (5 colors) \item \code{solarian} (5 colors) +\item \code{stellarian} (5 colors) \item \code{genderfluid} (5 colors) \item \code{genderqueer} (3 colors) \item \code{agender} (4 colors) diff --git a/vignettes/gallery.Rmd b/vignettes/gallery.Rmd index 766789d..d7c9e6a 100644 --- a/vignettes/gallery.Rmd +++ b/vignettes/gallery.Rmd @@ -204,6 +204,12 @@ palette_lgbtq("solarian") A non-binary person whose identity is male-aligned or whose expression is masculine-aligned. +```{r stellarian} +palette_lgbtq("stellarian") +``` + +A term for a non-binary person of neutral-aligned identity, unrelated to manhood and womanhood, however still perceived as gendered. + +Almost all ggplot2 uses of `palette_lgbtq()` will be with `color` and +`fill` scales, so the `scale_color_lgbtq()` and `scale_fill_lgbtq()` +functions provide a shorthand and more descriptive notation: + +``` r +ggplot(data, aes(x = x, y = y, fill = group)) + + geom_bar(stat = "identity", position = "dodge") + + scale_fill_lgbtq("pansexual") +``` + +![](README_files/figure-gfm/ggplot2_scale-1.png) + ## Gallery Only a few most common palettes are included below. For the complete diff --git a/README_files/figure-gfm/ggplot2-1.png b/README_files/figure-gfm/ggplot2-1.png index feacf05e870417079bab4488c7b2b7999c7c9a81..6cd5bfce2d50c552f19cace952841e82cb7442ef 100644 GIT binary patch literal 3487 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 literal 3727 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 PkEN$O(e3*!-+=!F>BPB( diff --git a/README_files/figure-gfm/ggplot2_scale-1.png b/README_files/figure-gfm/ggplot2_scale-1.png new file mode 100644 index 0000000000000000000000000000000000000000..6cd5bfce2d50c552f19cace952841e82cb7442ef GIT binary patch literal 3487 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 literal 0 HcmV?d00001 diff --git a/README_files/figure-gfm/ggplot2_theme-1.png b/README_files/figure-gfm/ggplot2_theme-1.png index 1f663edd65136dac2a5754e5b184738a9cf4a667..f1d41e9783bdcbf7ac93d9ae2b2c17e7a74e51cf 100644 GIT binary patch literal 4088 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 KxN`eI%D(_HumkA; literal 3948 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 BF7^Nb diff --git a/README_files/figure-gfm/ggplot2_theme_custom-1.png b/README_files/figure-gfm/ggplot2_theme_custom-1.png index b00be0926c39f9f316c9545053974bbaf9a43cad..751e478e63fd2d6e89d1ddc64e41112049bcbca0 100644 GIT binary patch literal 3784 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 T?yxwo{735M?CDgreLwU!Ng7J4 literal 3713 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 From 71fa1a2edee9631584a273e6759923df9fee2a24 Mon Sep 17 00:00:00 2001 From: Laura Date: Sun, 23 Jun 2024 14:41:36 +0200 Subject: [PATCH 20/28] implement helian --- NEWS.md | 2 +- R/data.R | 3 +++ R/themes-extract.R | 1 + man/palette_lgbtq.Rd | 1 + man/theme_lgbtq.Rd | 1 + vignettes/gallery.Rmd | 2 -- 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index d029e0a..65f533e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,7 @@ # gglgbtq (development version) * Added `scale_color_lgbtq()` and `scale_fill_lgbtq()` for convenience. -* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`, `androsexual`, `gynesexual`, `lunarian`, `solarian`, `stellarian`. +* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`, `androsexual`, `gynesexual`, `helian`, `lunarian`, `solarian`, `stellarian`. # gglgbtq 0.1.1 diff --git a/R/data.R b/R/data.R index 31c88e9..bee6491 100644 --- a/R/data.R +++ b/R/data.R @@ -81,6 +81,9 @@ pride_data <- list( colors = c("#7F7F7F", "#C4C4C4", "#FDADC8", "#FFFFFF") ), # Galactian alignment system + helian = list( + colors = c("#FF7367", "#BC3028", "#FFF7B8", "#000000", "#B5B5B5") + ), lunarian = list( colors = c("#C6A5D0", "#85618D", "#FFF7B8", "#000000", "#B5B5B5") ), diff --git a/R/themes-extract.R b/R/themes-extract.R index 1b0d99f..1111c80 100644 --- a/R/themes-extract.R +++ b/R/themes-extract.R @@ -12,6 +12,7 @@ extract_theme <- function(palette) { "demigirl" = theme_demigirl, "bigender" = , "bisexual" = , + "helian" = , "lunarian" = , "solarian" = , "stellarian" = theme_ggplot2, diff --git a/man/palette_lgbtq.Rd b/man/palette_lgbtq.Rd index 8ac74f9..21d1f04 100644 --- a/man/palette_lgbtq.Rd +++ b/man/palette_lgbtq.Rd @@ -46,6 +46,7 @@ Currently available palettes are: \item \code{gay_7} (7 colors) \item \code{demiboy} (4 colors) \item \code{demigirl} (4 colors) +\item \code{helian} (5 colors) \item \code{lunarian} (5 colors) \item \code{solarian} (5 colors) \item \code{stellarian} (5 colors) diff --git a/man/theme_lgbtq.Rd b/man/theme_lgbtq.Rd index 6258595..d0935fe 100644 --- a/man/theme_lgbtq.Rd +++ b/man/theme_lgbtq.Rd @@ -51,6 +51,7 @@ Currently available palettes are: \item \code{gay_7} (7 colors) \item \code{demiboy} (4 colors) \item \code{demigirl} (4 colors) +\item \code{helian} (5 colors) \item \code{lunarian} (5 colors) \item \code{solarian} (5 colors) \item \code{stellarian} (5 colors) diff --git a/vignettes/gallery.Rmd b/vignettes/gallery.Rmd index d7c9e6a..1e5448a 100644 --- a/vignettes/gallery.Rmd +++ b/vignettes/gallery.Rmd @@ -210,13 +210,11 @@ palette_lgbtq("stellarian") A term for a non-binary person of neutral-aligned identity, unrelated to manhood and womanhood, however still perceived as gendered. - ## Other genders From 40e341897aa30ca89a868dd9fedfd33ce68436cd Mon Sep 17 00:00:00 2001 From: Laura Date: Sun, 23 Jun 2024 14:47:17 +0200 Subject: [PATCH 21/28] update workflows (long overdue) --- .github/workflows/R-CMD-check.yaml | 24 ++++++++------ .github/workflows/pkgdown.yaml | 37 ++++++++++++++------- .github/workflows/render-rmarkdown.yaml | 40 ----------------------- .github/workflows/test-coverage.yaml | 43 +++++++++++++++++++++---- 4 files changed, 77 insertions(+), 67 deletions(-) delete mode 100644 .github/workflows/render-rmarkdown.yaml diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 0390442..df23d6e 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -1,4 +1,4 @@ -# Workflow derived from https://github.com/r-lib/actions/tree/master/examples +# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: push: @@ -8,6 +8,8 @@ on: name: R-CMD-check +permissions: read-all + jobs: R-CMD-check: runs-on: ${{ matrix.config.os }} @@ -18,32 +20,34 @@ jobs: fail-fast: false matrix: config: - - {os: macOS-latest, r: 'release'} + - {os: macos-latest, r: 'release'} - {os: windows-latest, r: 'release'} - - {os: windows-latest, r: '3.6'} - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} - {os: ubuntu-latest, r: 'release'} - {os: ubuntu-latest, r: 'oldrel-1'} - {os: ubuntu-latest, r: 'oldrel-2'} - - {os: ubuntu-latest, r: 'oldrel-3'} env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} R_KEEP_PKG_SOURCE: yes steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: r-lib/actions/setup-pandoc@v1 + - uses: r-lib/actions/setup-pandoc@v2 - - uses: r-lib/actions/setup-r@v1 + - uses: r-lib/actions/setup-r@v2 with: r-version: ${{ matrix.config.r }} http-user-agent: ${{ matrix.config.http-user-agent }} use-public-rspm: true - - uses: r-lib/actions/setup-r-dependencies@v1 + - uses: r-lib/actions/setup-r-dependencies@v2 with: - extra-packages: rcmdcheck + extra-packages: any::rcmdcheck + needs: check - - uses: r-lib/actions/check-r-package@v1 + - uses: r-lib/actions/check-r-package@v2 + with: + upload-snapshots: true + build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")' diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 63cbb18..c9f0165 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -1,35 +1,50 @@ -# Workflow derived from https://github.com/r-lib/actions/tree/master/examples +# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: push: branches: [main, master] + pull_request: + branches: [main, master] release: types: [published] workflow_dispatch: name: pkgdown +permissions: read-all + jobs: pkgdown: runs-on: ubuntu-latest + # Only restrict concurrency for non-PR jobs + concurrency: + group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }} env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + permissions: + contents: write steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: r-lib/actions/setup-pandoc@v1 + - uses: r-lib/actions/setup-pandoc@v2 - - uses: r-lib/actions/setup-r@v1 + - uses: r-lib/actions/setup-r@v2 with: use-public-rspm: true - - uses: r-lib/actions/setup-r-dependencies@v1 + - uses: r-lib/actions/setup-r-dependencies@v2 with: - extra-packages: pkgdown + extra-packages: any::pkgdown, local::. needs: website - - name: Deploy package - run: | - git config --local user.name "$GITHUB_ACTOR" - git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com" - Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)' + - name: Build site + run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE) + shell: Rscript {0} + + - name: Deploy to GitHub pages 🚀 + if: github.event_name != 'pull_request' + uses: JamesIves/github-pages-deploy-action@v4.5.0 + with: + clean: false + branch: gh-pages + folder: docs diff --git a/.github/workflows/render-rmarkdown.yaml b/.github/workflows/render-rmarkdown.yaml deleted file mode 100644 index b536abf..0000000 --- a/.github/workflows/render-rmarkdown.yaml +++ /dev/null @@ -1,40 +0,0 @@ -# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples -# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help -on: - push: - branches: [main, master] - paths: ['README.Rmd'] - -name: render-readme - -jobs: - render-rmarkdown: - runs-on: ubuntu-latest - env: - GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} - steps: - - name: Checkout repo - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - uses: r-lib/actions/setup-pandoc@v2 - - - uses: r-lib/actions/setup-r@v2 - - - uses: r-lib/actions/setup-renv@v2 - - - uses: r-lib/actions/setup-r-dependencies@v2 - with: - extra-packages: any::pkgdown, local::. - - - name: Render Rmarkdown files and Commit Results - run: | - RMD_PATH=($(git diff --name-only ${{ github.event.before }} ${{ github.sha }} | grep '[.]Rmd$')) - Rscript -e 'for (f in commandArgs(TRUE)) if (file.exists(f)) rmarkdown::render(f)' ${RMD_PATH[*]} - git config --local user.name "$GITHUB_ACTOR" - git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com" - git add README_files/ - git add README.md - git commit -m 'Re-build Rmarkdown files' || echo "No changes to commit" - git push origin || echo "No changes to commit" diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 3c0da1c..fefc52e 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -1,4 +1,4 @@ -# Workflow derived from https://github.com/r-lib/actions/tree/master/examples +# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: push: @@ -8,6 +8,8 @@ on: name: test-coverage +permissions: read-all + jobs: test-coverage: runs-on: ubuntu-latest @@ -15,16 +17,45 @@ jobs: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: r-lib/actions/setup-r@v1 + - uses: r-lib/actions/setup-r@v2 with: use-public-rspm: true - - uses: r-lib/actions/setup-r-dependencies@v1 + - uses: r-lib/actions/setup-r-dependencies@v2 with: - extra-packages: covr + extra-packages: any::covr, any::xml2 + needs: coverage - name: Test coverage - run: covr::codecov() + run: | + cov <- covr::package_coverage( + quiet = FALSE, + clean = FALSE, + install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package") + ) + covr::to_cobertura(cov) shell: Rscript {0} + + - uses: codecov/codecov-action@v4 + with: + fail_ci_if_error: ${{ github.event_name != 'pull_request' && true || false }} + file: ./cobertura.xml + plugin: noop + disable_search: true + token: ${{ secrets.CODECOV_TOKEN }} + + - name: Show testthat output + if: always() + run: | + ## -------------------------------------------------------------------- + find '${{ runner.temp }}/package' -name 'testthat.Rout*' -exec cat '{}' \; || true + shell: bash + + - name: Upload test results + if: failure() + uses: actions/upload-artifact@v4 + with: + name: coverage-test-failures + path: ${{ runner.temp }}/package From b7ed8a91c4127d0e9ff6d84ef9b31f6f7bf5a809 Mon Sep 17 00:00:00 2001 From: Laura Date: Sun, 23 Jun 2024 22:39:31 +0200 Subject: [PATCH 22/28] more flags --- NEWS.md | 2 +- R/data.R | 13 +++++++++++++ man/palette_lgbtq.Rd | 4 ++++ man/theme_lgbtq.Rd | 4 ++++ vignettes/gallery.Rmd | 26 ++++++++++++++++++++++++++ 5 files changed, 48 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 65f533e..5775c06 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,7 @@ # gglgbtq (development version) * Added `scale_color_lgbtq()` and `scale_fill_lgbtq()` for convenience. -* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`, `androsexual`, `gynesexual`, `helian`, `lunarian`, `solarian`, `stellarian`. +* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`, `aroace`, `androsexual`, `gynesexual`, `helian`, `lunarian`, `solarian`, `stellarian`, `amatopunk`, `butch`, `femme`. # gglgbtq 0.1.1 diff --git a/R/data.R b/R/data.R index bee6491..f243ced 100644 --- a/R/data.R +++ b/R/data.R @@ -51,6 +51,9 @@ pride_data <- list( aro_spectrum = list( colors = c("#3FA053", "#96D07C", "#F3FCCF", "#176363", "#052027") ), + aroace = list( + colors = c("#E28C00", "#ECCD00", "#FFFFFF", "#62AEDC", "#203856") + ), alloace = list( colors = c("#D50100", "#F85858", "#FFFFFF", "#81007F") ), @@ -105,5 +108,15 @@ pride_data <- list( ), bigender = list( colors = c("#C479A2", "#EDA5CD", "#D6C7E8", "#FFFFFF", "#9AC7E8", "#6D82D1") + ), + # Subcultures + amatopunk = list( + colors = c("#531768", "#B74D71", "#DB966D", "#FFE7AA", "#4E8C69") + ), + butch = list( + colors = c("#324070", "#6A7AA4", "#8A92A9", "#EDECEB", "#C0B4DB", "#764EC5", "#51048A") + ), + femme = list( + colors = c("#7D0037", "#DE42F1", "#FDFDFD", "#F29C41", "#9E470E") ) ) diff --git a/man/palette_lgbtq.Rd b/man/palette_lgbtq.Rd index 21d1f04..b0e0ebe 100644 --- a/man/palette_lgbtq.Rd +++ b/man/palette_lgbtq.Rd @@ -37,6 +37,7 @@ Currently available palettes are: \item \code{asensual} (4 colors) \item \code{ace_spectrum} (4 colors) \item \code{aro_spectrum} (5 colors) +\item \code{aroace} (5 colors) \item \code{alloace} (4 colors) \item \code{aroallo} (5 colors) \item \code{pansexual} (3 colors) @@ -54,6 +55,9 @@ Currently available palettes are: \item \code{genderqueer} (3 colors) \item \code{agender} (4 colors) \item \code{bigender} (6 colors) +\item \code{amatopunk} (5 colors) +\item \code{butch} (7 colors) +\item \code{femme} (5 colors) } } diff --git a/man/theme_lgbtq.Rd b/man/theme_lgbtq.Rd index d0935fe..642ab96 100644 --- a/man/theme_lgbtq.Rd +++ b/man/theme_lgbtq.Rd @@ -42,6 +42,7 @@ Currently available palettes are: \item \code{asensual} (4 colors) \item \code{ace_spectrum} (4 colors) \item \code{aro_spectrum} (5 colors) +\item \code{aroace} (5 colors) \item \code{alloace} (4 colors) \item \code{aroallo} (5 colors) \item \code{pansexual} (3 colors) @@ -59,6 +60,9 @@ Currently available palettes are: \item \code{genderqueer} (3 colors) \item \code{agender} (4 colors) \item \code{bigender} (6 colors) +\item \code{amatopunk} (5 colors) +\item \code{butch} (7 colors) +\item \code{femme} (5 colors) } } diff --git a/vignettes/gallery.Rmd b/vignettes/gallery.Rmd index 1e5448a..4348dc3 100644 --- a/vignettes/gallery.Rmd +++ b/vignettes/gallery.Rmd @@ -126,6 +126,12 @@ palette_lgbtq("aro_spectrum") "Aromantic spectrum" (also called "aro spectrum" or "arospec") is an umbrella term for all romantic orientations characterized by a complete or partial lack of romantic attraction, e.g. "aromantic", "demiromantic", "grayromantic"... analogously to "ace spectrum". +```{r aroace} +palette_lgbtq("aroace") +``` + +"Aroace" is a term for individuals experiencing neither romantic nor sexual attration; in other words, "aromantic asexual". + ```{r alloace} palette_lgbtq("alloace") ``` @@ -244,6 +250,26 @@ palette_lgbtq("bigender") "Bigender" means a gender identity composed of two genders a person feels strong connection with. They may exist simultaneously or fluctuate over time. One of the two genders is probably stolen from some agender person. +## Subcultures + +```{r amatopunk} +palette_lgbtq("amatopunk") +``` + +Amatopunks challenge the amatonormativity, i.e. the societal expectations that everybody should desire a monogamous sexual and romantic relationship, exclusive towards polyamorous, asexual, and aromantic people (as in, belonging to any of these three groups). + +```{r butch} +palette_lgbtq("butch") +``` + +"Butch" is a term most commonly used to describe a lesbian with a masculine expression. There exists a variant with 5 stripes too, albeit far less prevalent. + +```{r femme} +palette_lgbtq("femme") +``` + +"Femme" is a term most commonly used to describe a lesbian with a feminine expression. There are a lot of different proposed flags yet none in predominant use, and the one included here was chosen for the best distinguishability of its colors. + ## Uncategorized All the terms that do not fit elsewhere. Currently empty. From 25edd50214d6684f5bcca17996e98c43663a84f8 Mon Sep 17 00:00:00 2001 From: Laura Date: Mon, 24 Jun 2024 12:19:30 +0200 Subject: [PATCH 23/28] add logo and refresh README --- README.Rmd | 3 ++- README.md | 6 +++--- README_files/figure-gfm/ggplot2-1.png | Bin 3487 -> 3500 bytes README_files/figure-gfm/ggplot2_scale-1.png | Bin 3487 -> 3500 bytes README_files/figure-gfm/ggplot2_theme-1.png | Bin 4088 -> 4035 bytes .../figure-gfm/ggplot2_theme_custom-1.png | Bin 3784 -> 3599 bytes man/figures/logo.svg | 1 + 7 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 man/figures/logo.svg diff --git a/README.Rmd b/README.Rmd index 5e160ae..c562284 100644 --- a/README.Rmd +++ b/README.Rmd @@ -10,9 +10,10 @@ knitr::opts_chunk$set( library(gglgbtq) options(gglgbtq_font_size = 1.7) +set.seed(7) ``` -# gglgbtq +# gglgbtq [![Lifecycle: experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://lifecycle.r-lib.org/articles/stages.html#experimental) diff --git a/README.md b/README.md index e296134..64037d9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# gglgbtq +# gglgbtq @@ -31,7 +31,7 @@ To list all available palettes, call: ``` r show_pride() -## # A tibble: 32 × 2 +## # A tibble: 37 × 2 ## palettes lengths ## ## 1 rainbow 6 @@ -44,7 +44,7 @@ show_pride() ## 8 nonbinary 4 ## 9 philadelphia 8 ## 10 progress 11 -## # ℹ 22 more rows +## # ℹ 27 more rows ``` The most common use case is to use palettes with ggplot2: diff --git a/README_files/figure-gfm/ggplot2-1.png b/README_files/figure-gfm/ggplot2-1.png index 6cd5bfce2d50c552f19cace952841e82cb7442ef..75a268f059947211c0bfcecabeb43724842c050f 100644 GIT binary patch literal 3500 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 VW^5ilu+#i?ZTI%^y6qWy;%}&e8&CiM literal 3487 zcmd5G`4{4)1`_q*TRJIhT5 z$=3tB%wQP`g~EDyy6s1y00@OrS*xjvSb`h2-a-~R$%pKYtSA&7g`%SH$j(7g1%@@S zot+(G!lUqb6cvx>;Hd&UM^0Sa=tLr$NaqpRZPX7jRO%v#Lq#@$fGU6y1f58y6WMe+ zkIs9^UJ76n+3Yr$gGX_e=r~jqhlA&Es2l-@BNuSwFpo~;Ee5c8Z9LvfSU^PysCWS^ z5WsL7o7e`!at>Y&!!LRCmoPjsGBQ3s4jX18IK&OhP>37x!SEs+!6HByhC|D1N05ud zob)^xi$ZBPFCHqbC%8vYsO87J+z8~;rK4q9L5B4!K`a(~C`<20LF4)hmKBZ9TpLe& zpRV0ro7e%v?zQTwO;^@*_Dlr^442xX(`|FREX!!en@=;;&KzRgR6~`lC2hg7zBsC> z@3RLAHvrTg$LUP;=M>Ms9XOvuOZ@?@zi~ult||TT48{t_?K?lI;REJ^%DsG-a3B+1 zMPumgP&pMC;5o zOLTAd>)S0Q9s1Uay2RG${Yl4C&XU3p%It0bVWPW@KY6_B_V@&ho<67bqxSzUkuL53 z?b81-MfU1=W>PRyG$ZN9i)SOiJKOzEDpv)}od_r=md6xM*{d-grXEmd#NG%h6^dq$ zA%OO& z^~Km9XpyQqM|-?}crPlid0b~qB7$E}$0VhLj}MrWfbHKGF`yi_qB%dM%ar-zJYw~6 zmdsjuUBBOG={1)1G-=~5uc~#X2+8I!>dZDQzev^*I z$w5u&HxUZfLaPqT;cE`^Yi2!$Uwl>{^9@Mch_hmqP?nT(jfYJd_d8~wH;8AD7tUXH zPY8W1aBCN+fvvP&!L@b=){`D*`Z-BPy22R3&gU;*Oxkmd3WtUpA2;QU37kTX)W+;J zLJ}truo`Z!IT#ijnGnhp|GpdRn03FpsmA}*tykeSJFd;$uzL?;_Sw1wm+9HS$#K)o zzy3ZuXv)0tLWG~ju>vU_RuV#&P}uWI44({~6NRZa^o}Sg)UIWwB(Ijl02eXXYxq@N z^UVF63xjzTBf>Jpm>2XY6D@Nft*Ug&xV|fwPTIXGK8L`I+@!~?Fk=a@(z1o=bg@su z12Iw1dB5ge{=D2VgZQ)lcK?R*A32Th`suY~J>kRK!zXv`?O z-K5jd;rQi;l+->aGl|-AqMD*Fc-Ne5`Jdb+%lJlrc`(VGfrg> z5Y_cw1devLzV^ze#fz=;&dfiEw7a(A)8dv&qv7GkOCw#j7Nj)9j5O?e|3&F@=i6x@ zb_0d_CPPEv>n7U~6WL1a+GRnKBbW{|($xL368=lDwz2@cv=7QnAOY(o39P-0<@+GC zY@1|9*TCY9CDukx_d#Z{-Vl(7e2YG;r^$i7Q9#pCF$%#q2?3#lLDxS3`w8{Oe|y@}Dv zhu`kp`DAK#&|)UpwYT5#_DsGOnOnU(VET2=Wxe5+Cn3;_OWNXR?#~E=`gU@{iR!3b z^U;Hc-p-n*tETi2yvIz^aoo}fD$BPzDmYZyQ&vP43Ze@^6XP@-w*avhJaxDjDy5^FN6}q(sZ2#P_KSX+(KUV+xP$5`Zoz_5{_^v-SG4(r3($1C+ zU~_fUT&H`syi|7o)YlOkhCUh|t<7%FV~3O?wH?T-BSC|;*_Erd8*iG~bP>cz?J}}P zq065e>Tx$C(bzC~5g27n{b+cXF3o4L`#^q~8_@l}kPj5WN0#b1XeuenL>rt14{yNH zbb;(^o)AIP{;C;E{azP`OUgf9hohPkian_#$wL$Z z^fglTirtb6X}tr#DPII>1Nr{ulC?@!XbRru-iaKO-WXkODbj{(I&pJjcj{(NzZ-t? z7Sp~>)v5##_B6DQKQFjK*I2nHd1>G)x~Hv>T+BePYX9Z@8njHgl`A73*@BFUlYnsN z=~Q^rLP}QTn`8dDO~^1P(~6r>RLb!|LhUMtm1~w4ohfeuKmRivUFD#Mu_$J3iY7304Tx=F0vb2L8j-iev{-X2_M@WgEOaleS94mHN1WO{GCE%LxM zr*1VK6TfTLDY9hOF3t>{liG~ulm*_K&C-Qv?)E1DG2)oXgSGZrPF#aY)%aJmXVkf& zZ>M3`&8CtE!6`TTB6IIr^lJm7KfTMI)_}BUb@C9AMqW@?>+k5i9cWo@ji@=HLeIlE z4cMfLjNZCdMd!dKd-SrarhlKxN89fI#Eh;Nt_fOasL9`$wtY&g0L@DHY+~SP_LUyo zGzgXL{B`s$rA-qU?SNWWFcWoY0q1zIjH(r4faGcSDr-JqeAY$_7;XFI+0kfWD}j0N fzh?VO2&`dx?M8pr8_P$Ff3&>Zeci6RhJWz~#_uS5 diff --git a/README_files/figure-gfm/ggplot2_scale-1.png b/README_files/figure-gfm/ggplot2_scale-1.png index 6cd5bfce2d50c552f19cace952841e82cb7442ef..75a268f059947211c0bfcecabeb43724842c050f 100644 GIT binary patch literal 3500 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 VW^5ilu+#i?ZTI%^y6qWy;%}&e8&CiM literal 3487 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 diff --git a/README_files/figure-gfm/ggplot2_theme-1.png b/README_files/figure-gfm/ggplot2_theme-1.png index f1d41e9783bdcbf7ac93d9ae2b2c17e7a74e51cf..e536484a7e9d69b4aba53dece3c5176fad7a902c 100644 GIT binary patch literal 4035 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 literal 4088 zcmeHKX;f3!77m!m1q6Z&K@doQ0d+-hIxu_u2c~`|f*A zriYuejFhSr3m>3$^1daID?yiC!FFf{pIYLhu3=4x1U|8s;!3Yes zYN4^QF*JmQVX-g*7E8kt7+6|AUUZT0cq*P$hNrd@-sunsA`p!LT?__+A%qYlJc)#- zl1OEwvJvXK0u@iCwhL)k7;W7gjR2$3urwNh#-P#q8MJ<383|t|QlOT#mz9kO83Y)E zfMp07456@{ifU*(G$Isoxm=-IE(C(+gnck*4w?`OMOX+3p@c%=P%ya} zicIo^%b{o(Ocr{VZ5C^bC=G&MT3vCVS6l(FP})yzOg=q547EQie1G3H3+nXoLbjQH z%fJDBAAvB*D?wVN`f7bg`eks;s;ND(YPbPAM?Sf`OdT(;bHZr|20T>;veIPXj`k81 ztsggm=b0&V7tR(`Od7gcrQO2Ed|bJ4M~X_hN>UR%V;+IwXc=CD$y54nuMZ%fky_qL z>)NH!Pwi+8*d?X~zvH)ijUtJ}ln!Rip!O#NAn#yKW1u(=2)+B&DnbEm?@_1pYUhTD z_9JhS927J?bCHzIUm_`H3ieExv^|qx52yx$K;M1<+++ZN`H~o7G6F+1#=vDN(eUHC zX>>8=G0 zu&a{Z$PIeK|9+wFMMkKltN~|mnEmEEsgJ|EkAb0o`|tosDQf7u-B8@PtwPf*JY_sg zYb};I@OciJGxIk76VB+^Vs|P^#!n{?$|>OM{v@%%YGr-`Ag_@YxlM|cJS}@BdD-e= z@!A;+>!dpCx;s|V<+DdKh(@LMJA5*AI5W$+^k{}lOx)+m8QMhaW~xXs5x_H$HAOZQ z_FhgsMq~jXFD;oKX&ILLiVSv{Iqhq_HC1qH?HHdp#%?C^gRs`|wcdiLS$;Q>AD8qZ z(Gp=85U0s+KvqkW89$q?kZYo=_9)D;n=edo%ji2=di9zYvXfk;(k~rmUUjzY9zP-< zGq-GB9Y8`1{%TVo3&3SWQ}wezVikFG#B)A>mf3J}MG$^0nwf|p>O-N*Z9pu~O*rrK zi`HQK#BS!HDBsxsX2f}pa&38(k8&NA+i7F)((%9-TQLMw4LN_j`wqREd-w7Uy&YFs z0ga91{1AFE(nJ}GX&+T}h`W7Rydlh1un~VR!qDAPO|u0)S8DTDxRgwxTak? z;xTW>^ne)B092*qDZg(59YiFdKlE#fHd$yk6?|Vg^F}e$3jT^A8gVqw-uMXz+_YV1 z`!BX0wkXCtjmp~!#R-7i6#9=yO$HsMX`Aa5=3HG-)@^5&ou@aG|@ zNE1c&CRELt-`XEvh$4*jF8Yo3v-)BdhDT-+_x46tnGI^&PHusmwK)OWlDq?2IuCWO z{TjW{ycXftNne}5YgV_W1@{ityVSm|bUjzpu@WK;?@_Y_{Z+v1f>E8?30$q~d`*p&#PwhU z2M;_B=<{JlEstrg?XiqnJAUd#L48(0U+pqeB5Fv_!Q;C7OHHeU>jGab*+QG%V^&~( zttVNNKjMD4RtCkNiim_O5IMse_9gO!f1`&EaAo;+0-Twk|QYVX&*$sif<> zEflF%cO-^r9lK~eK7(0AdPS_lp$vR6>>htN=6Jg@(rZ^D<ESQuYWTP31AAQzNR2#(~nnXDYT}8hu`8tJm#*i;QcI zq9UHh=@^P?r&LcXWag+ed3JC(ziTH6Sf7CM=4}eeZMui@z;7EoZHiReWQ?TkFMjy`8EA5W<0HnavQWJBZX;AE$%;{8n z(SUa?PdysTx2GX9W#J;TKAN--P8Z8It%sK3-aqunm8+7d|~9)HW&nd zZ)-z6M4rFe5htjuJ-JKcT=8`0usB5u>6-mIgT1xCW&B=#j)^qXd<6VI98b!qmF?@v^=Mit0P| zL^hmG9)HEnR$a6XE9ZHya=AV;qfKkG!*Thpn(sqdFufV3HthfGZP3@9>2e|1VF^PC zR_e^#-c!v`#U{J>zGu+jx!Kz5E3FA`yoZfC@$d4o&SgdUasR>?|B*C$th^|hmQ#d{ zmEEsZuuqH1{DVYwbV9z`dAQ@AUfFx)-osOoea|@!jNLNpmG>^PSEN1Sptbym+4xWc zJEg0Qe5SAw!}*=EJO2^>Hx9Odk>AUiK9q?4UQY1G`|qV4br$uH@KJMc@drVHXlwR6 ziS{I}V7n5AgWq+F zw!@y8ANVE4Cyj32RB2xhfDsgt-Sdb$omER3*D~GXFnVZEf}Mp48aNyEo|m= zR+%RsMC)rq@*pHLrQlx&^{UY=A=y__U!O9t`Gb>^org{gTavtTm9;y1Im#+=T835h z3fjL;Ze7tUptm*E8ICm+tknz(Y?rUEDm4nk=0-AgITwQ)TWu&B7at`_CIY!ai)WTB zINp=T+m?1TRlD>MTiUmil~ve%vFm|QX<{3IwHS-Iva%N+Nt;FiSd)^S&9-8OnL?9a z0??fMI&bEt^qO?!;OduBBVEH?gLC3!v(St3e{-x8Ig8fcibX0)ssq?vr}z1FSLd2W zR@T#-0_dbR{ zBo0cv4kwJUw5=rTE9{slm#v11kDR%mx|)FaFM{5$`JX4vCEM9)*Sn#U_n(SR@UD(- KxN`eI%D(_HumkA; diff --git a/README_files/figure-gfm/ggplot2_theme_custom-1.png b/README_files/figure-gfm/ggplot2_theme_custom-1.png index 751e478e63fd2d6e89d1ddc64e41112049bcbca0..302eae58de7487872bd8fac238dc33f1e05a1493 100644 GIT binary patch literal 3599 zcmd^Cdsq`!79VXQAru6KpeP1XAE^*n7mzvzWDrEuK&%v%6cwlup#*s&m8gRXMG0wr z0)nGhOdEj~LV_Sr>mw8j!~*gN0puA$-icrkW(ObrKEK`W{c>hdW7%truVo*Cf-O!9fjx&rLh%-rGSiroPK1OPSwVn05> z7B4GAZES2X5eR@Fzy?7+$QFZqIb-hPFc>@rN66q+vftXU*>fO18@t3}wiv|_90rHO z;Bh!Yjj_F6PToA%`KHGvEm;g~A?G%m&14 zP>hPjC|b#5RHCSy56V%rN66_x(ZRt%bXf`p!gOdWfax#=iq2s%AcjIwwEa-reJnEV zBU|@I0DvAg*1JDX8Y=h#06tW>yFgyCSBElnSj(hFXN-f~t{D35Xua9Yv;HI`v+Du1 zci4HQ)ijFkw6id`D)ir5b2ZIV8BY$trA9=KXEqgDq_xnt0e;DCx&R#q!?pzC?`G7k z35c04Hi2Oh@UZAgGTc5h&U&tStWyh})!;{VyD)o`b@u2(L&VntgND4$^dcVs*I6TrCAu<*cUZF)>apAI=T^2-ABRMusO< z#BQQL*nKwe(AF_sr){!(848w=YB6WM53*R@f4v1alecQA&#@A`f#{AI%(kS`lr4|k zkE*|VAxVSrGy7RSl20r&_$Yi7S*jS;^qi){wI@AwD1kHrsO4y`#Nkp-a3NfXRT8ok zlSV+e8Z3+qZ1@N!w0^D+*^pdheJ~;YCo_1xv5V~7J4Z=K4c@>u;D2hWdDU`h4~-&N z2y4u+KMECoauRVQ3?v|gWF%@%r1_$BOFRoIo1crX8Qs+K?GyM>oc}>+g!?PeWS+My z$&3n90!`;E95EAukJg{B^nZi?Kv8xMLF$)X@iE;!nhcC*J>H?i@)FlqF_=GFx~IML zm6u^%bph&sOOuOsMeL++OuvIqEgY`iCKFoAd&h*+xsCQK^kA_QLpD)U^i(>&@AyG# zU+=B{MyZR;sQ>vy8mqYOO}UMY9Voa$QEsNyR-HFcMIOz!T$qWlx~eg=#Y_ooP6apUJob_8@ua)THpk#b@_AS3x#dR^Uu0&~^=Ggi;~nJ1BvH;P zZyAA}W@MX+*jofLwi8TFuK7rrnXP&DyGM;VH!8Gm1%1KQ1aWYfch))Nys>-juY<A)K3}@`dTDb#MSZI*mdnbN0<0jFM=t` z-z=0K>Zi|_htEpNCdjF?&EM;dmC+^@PbKW(QEu?02^J4cPH44g>wU<5S(ob8OWt@9 z$#C6id3uBhF>$)a4Za5+m_Au}+()=?r7yQN`KP!iqEkp=O!3b!xIwYHB}5A1~)5LNH;- z?l0Ni=b�^^bLQ85ly_Sx}ulxu_l6jeS1QSE+ZjKfv}_d5Cma@v0~ht-KK2Aj#qm zR^O0hay2BDPAix&Eh5=YEtT$AY&+bMd^p*0%4U_02o`5@gP~>UwTwWT^0ud{*{H!s zc7LGjXj!733S*Imi`xBV9yd~@y1vQ~qnwHicTJ{F1z@U|dSj^ogmD>kVv=!cECsGI zP`^P7ipOXgi1cvkG;3(O1GVUz?fMwo*R^YvRe`(QZkCzua$;_TYBv66DUc_LO8TRv zDKRTpSS6UO7EJeuS1-jPt|DSx;!F(HoZ62NexOnFy9~TOmD#>+4<_w?B1w=z!=WdE zbGg7A6LBGA8ob)j3&6QDak&AQ!uC3{(37H#G1V~_92GxfeVA3gFNqLzIYdKBxRq~A zfm;t|lt1izHh4M-iEhaWT^Fl~Gp7iA|1DHtseCv+{K#FcES3+I(*>dK_Hq?%f#-hf z2LhNk973NB>#aXCC|e({K3GcUe&*2Dk#~4#Uw7O)2V0CHkA-#*&xT^_~&A&D>h?$3laPWE*EW>r$x{=8>|Zku3JVP&zgf5n{ni%$ zX811?Ui@<@SX0R8@E=vFon4rv@4_}{uzH(K7hF*_7UDh3r2#Zl@Rx!1?_}ofB!_4; z=Hjv~Wx#D@EC+kY^gJY{qM_!mn2`TYNnFI2#dat@xicwnVOC=ufNH61ygW2M)u?c@ zqdjB4?F*Rnp)?_U^hIZFcKW5rcLi%mihT2So~+HT<$v5HNIdQABr8k_riHF(6sd-0 zj~j1O!4a|>+b5$IA?tAtnY+yD$q>e4?&Q0 zgj@36#JZ7$EgwKeI%|m_9_RZ2CIsz1qUY0Kjddt|KjJ#`&w`1Sf_0{YYY1)?uG4z? zA(aFEB=F9%z?}1?C%1s#XAvNyXFVL`8;>8>I5S=6G&j!=d`)69udLBGya_S+3n0h@ zhd)g6lx18yM>;rKB3INZ9wc0iDz)Bqy7&m3^<8!J`nLAV*jI4hrYpLWyI=M7SEuZ? zg(jOSlJk*69MyE|_P}4dWjC}zt;DHM zCGDnI+{J)VpBY@kHv^VSp+?!{#PI0@=OCsXuT<}_dm=4dkJ#z-2dnoezMk0WU5>88 zzOULs1SgPiRaWW#zs-kwl@(J_QPwew|86E&k@(Pim=x*6bcn;dO=%O>N}r7%x8LiW zkNK!gjLx!(SOhMB8kG(k*II81G2T0Hyf;C$TE05myhv=~Ja@2jclB_|b3Oq7 E13Wg(o&W#< literal 3784 zcmeHKeK?fq8lQGYjPlW#C?9Q@VQMicQbT6nmN2}GHho+yty4o{MA?xr+pA4!jjtp)R5aNzwn~+3Q^Az2>@}_j#V*eLuhZ z_uS9@K694l>7t>ouZ}{YG~8UBcA`)p@ldEGYt=qRM*PaGZz0VKn#V3@q(z~~C=?w< zMt&R=U0`q<-n3~GGDJp^$tXIR%pubSWR3__J`50KgN%HTT~A-Mq0^Nh4jp*}0=fW3 z5DbvP0ND&iJ|n-EJ#WAU+3b3lLq>7t-ErtB4u{O)&^ZDQM%8Vi6#Mf?>ET zD5eI940FVF-%%7w6M5IHSyC6CcK{LOf}0btD>`d9Tf^6&ZsoUnA$u}$?U}`H5wjS^ z5UzuV8}Cb^s=b5Z+z?&N^5^#pMzZXKo^4IBhPLERZk?Pcz~Ao3*@YA1?k>UgU2&y- zOUCZH!bbb#nF1>ZmEBX2ZqiPV+5k$+8I|@Dviz(!fCh!0RsSe=7DxYrwMHKEc@uOtLp{zqLgR_$V;ub~O$3OdS_m?V5UuW94W$f=P6!#Iak-Gkrd=Ewe`HU^mmUsXTPlV17) z_`Enltac}1b3>!1z6lU<3R}GIbj+?H7jCo#19{+lA9QIOfo0|p<$#( zZ9PnqX*v(1Bvz;=d*Xes>Xw~UyDGkP!{>f@BKyV!)aBr&?&-QFn8a(>;7ZMe6$wY(45ek9GxiJTwmL2vVdO$hJU+`<=@Va1IlDqJt zt58O09p=?J&w2YntxnK2QmUj|EZqT#)d<0mt5RT4`!_~d8$iin4tjFcZ^~0I30asb zM5pq$Y{y(&i$p~Pbe!Is8v6?=n?dj_7PldOOU@58$n4B}{C&d8;tZJ$;WyV_e!_;Q z0ZD2{Q1OBiC259gF9C@fQYWm0c(Jo0WNE*AzC^siWV7C&IPoW$2TXU zrEy5kG2=hXa|Y?Z@d$R|fRG~vY%EG8x^u%Uv~-$}ZYpnr|URgPjO!pCm! z%iIf@Ic4D!kwo*JDMZ(T0gz*sf1~p%Jdq(E*287L2~j+(VIh34b;kqEo(z8|M@!*x zb^&=oGT1a8qh-{ORAV_-R(*;YS`>e*7#8ZTN62RIvw0Hv zb6Tjv^fPI$v=b$YGp`0H5r8UXc3a(jQ0Rlja_a$YD+VEi>Nw)4r_&FmT3G}TG%qSTrgP_pSvvcxg25^D_6 zkLx~d8(tnLDfQy=A6y?N|J^KsSR`8g;9&&UF#yS}_b4Y!($LpSZ$`Yl{&Y_cx;APk zCHOLe2)%CPq7>+NgP=-WG}cPVeEdA}jp~$}Ui`fk;j0xB7x8fGC(j%ZzGqeLb#$-u3fN;;HPQ%NI#uG!avDeC!s{NB4dfYC zYRtT9snUGK1MiC#y<(Sg0@)4kvrb&whOgd|%dshs{#b%>f_BS4Gxy zDQ#_=FVB`n!l{#2;%t<~E3wKjw&YxhDrgs{z^0Ax(heK!(X-VwH)}5ni!D#sefPMb za(AVlTK~vvxsz2c;+H>-tfj8~TKGSyDw0mgGc`Yb-VXsA{30-sF|C(9Ijf*k2q6yh&Z%AA=;bMav6XgL| zOi1L2ET-W9fgh0P2Nk2Ze#Yg_avv(KcmABpLRi-w;^HP-4e?!z!lv#OKD(Y9IrXmp zN#R!4ip3gXa+6oX4C?EbRA>8UM}%1A@GN}P(A&DRLXMv}togiT2Iks6(wn~>Tebtz zwRiZwmYMsVKLQLKmx8*O$E9np@b=7%hF`9&V$JT0z2!=KsDe?+u8^-5JjrYW(ww1< zR`tYS5Z}M?-?)H>VR2cSa?RI0E)R4(!|DeEFC2^f*x|A#;~SUeu`*N4W|2dVX9(BP>DB^x+*7OD}DNi#HS7$NH`4v<@GVpY+>`RNDml-`I z)fBio6vL_wXH^`!k`0CI}UXP*W z;PUPYncM&mOmCEbHWD;YTIWtHTi$(xg3=g^Nw)yn?~h75?Vu$t(5=2=gYA|BtGrWy zl?10nTK~ZEefL&h^g({bi;nu_YAlAD(KY_Y{Vp4Qwc(dq{!rpw<6skDI?^vxy5pC# z=stJ8aD~DQn{GAN0*4-2mc0X6DljyN<)gLTJe3zZu+4rQi5bP={;M??gi>e$;cnk( T?yxwo{735M?CDgreLwU!Ng7J4 diff --git a/man/figures/logo.svg b/man/figures/logo.svg new file mode 100644 index 0000000..7a985ac --- /dev/null +++ b/man/figures/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file From 5477fc5464c2591f09f0050a1a15a58655c96a59 Mon Sep 17 00:00:00 2001 From: Laura Date: Mon, 24 Jun 2024 22:56:26 +0200 Subject: [PATCH 24/28] gay flags --- NEWS.md | 2 +- R/data.R | 6 ++++++ man/palette_lgbtq.Rd | 2 ++ man/theme_lgbtq.Rd | 2 ++ vignettes/gallery.Rmd | 10 ++++++++++ 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 5775c06..f4b0181 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,7 @@ # gglgbtq (development version) * Added `scale_color_lgbtq()` and `scale_fill_lgbtq()` for convenience. -* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`, `aroace`, `androsexual`, `gynesexual`, `helian`, `lunarian`, `solarian`, `stellarian`, `amatopunk`, `butch`, `femme`. +* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`, `aroace`, `androsexual`, `gynesexual`, `helian`, `lunarian`, `solarian`, `stellarian`, `amatopunk`, `bear`, `butch`, `femme`, `otter`. # gglgbtq 0.1.1 diff --git a/R/data.R b/R/data.R index f243ced..fba12cf 100644 --- a/R/data.R +++ b/R/data.R @@ -113,10 +113,16 @@ pride_data <- list( amatopunk = list( colors = c("#531768", "#B74D71", "#DB966D", "#FFE7AA", "#4E8C69") ), + bear = list( + colors = c("#623804", "#D56300", "#FEDD63", "#FEE6B8", "#FFFFFF", "#555555", "#000000") + ), butch = list( colors = c("#324070", "#6A7AA4", "#8A92A9", "#EDECEB", "#C0B4DB", "#764EC5", "#51048A") ), femme = list( colors = c("#7D0037", "#DE42F1", "#FDFDFD", "#F29C41", "#9E470E") + ), + otter = list( + colors = c("#23A8FA", "#9AD7FC", "#FFFFFF", "#B4B4B4", "#2A2A2A") ) ) diff --git a/man/palette_lgbtq.Rd b/man/palette_lgbtq.Rd index b0e0ebe..fd3ce5f 100644 --- a/man/palette_lgbtq.Rd +++ b/man/palette_lgbtq.Rd @@ -56,8 +56,10 @@ Currently available palettes are: \item \code{agender} (4 colors) \item \code{bigender} (6 colors) \item \code{amatopunk} (5 colors) +\item \code{bear} (7 colors) \item \code{butch} (7 colors) \item \code{femme} (5 colors) +\item \code{otter} (5 colors) } } diff --git a/man/theme_lgbtq.Rd b/man/theme_lgbtq.Rd index 642ab96..be21022 100644 --- a/man/theme_lgbtq.Rd +++ b/man/theme_lgbtq.Rd @@ -61,8 +61,10 @@ Currently available palettes are: \item \code{agender} (4 colors) \item \code{bigender} (6 colors) \item \code{amatopunk} (5 colors) +\item \code{bear} (7 colors) \item \code{butch} (7 colors) \item \code{femme} (5 colors) +\item \code{otter} (5 colors) } } diff --git a/vignettes/gallery.Rmd b/vignettes/gallery.Rmd index 4348dc3..dacf6ae 100644 --- a/vignettes/gallery.Rmd +++ b/vignettes/gallery.Rmd @@ -258,6 +258,12 @@ palette_lgbtq("amatopunk") Amatopunks challenge the amatonormativity, i.e. the societal expectations that everybody should desire a monogamous sexual and romantic relationship, exclusive towards polyamorous, asexual, and aromantic people (as in, belonging to any of these three groups). +```{r bear} +palette_lgbtq("bear") +``` + +Typically "bears" are gay men (or masculine-aligned nonbinary people) with plethora of body hair and - usually - a sizable overall volume, whether from being fat, muscular, or stocky. + ```{r butch} palette_lgbtq("butch") ``` @@ -270,6 +276,10 @@ palette_lgbtq("femme") "Femme" is a term most commonly used to describe a lesbian with a feminine expression. There are a lot of different proposed flags yet none in predominant use, and the one included here was chosen for the best distinguishability of its colors. +```{r otter} +palette_lgbtq("otter") +``` + ## Uncategorized All the terms that do not fit elsewhere. Currently empty. From 0d9a114c7250028ae3b8d8a8c3b96dc8146b1fc7 Mon Sep 17 00:00:00 2001 From: Laura Date: Tue, 25 Jun 2024 23:20:21 +0200 Subject: [PATCH 25/28] even more flags and Rmd regeneration --- NEWS.md | 2 +- R/data.R | 7 +++++++ R/themes-extract.R | 1 + README.Rmd | 11 ++++++----- README.md | 18 +++++++++++------- README_files/figure-gfm/ggplot2_scale-1.png | Bin 3500 -> 3599 bytes man/palette_lgbtq.Rd | 2 ++ man/theme_lgbtq.Rd | 2 ++ vignettes/gallery.Rmd | 18 +++++++++++++++++- 9 files changed, 47 insertions(+), 14 deletions(-) diff --git a/NEWS.md b/NEWS.md index f4b0181..3f08920 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,7 @@ # gglgbtq (development version) * Added `scale_color_lgbtq()` and `scale_fill_lgbtq()` for convenience. -* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`, `aroace`, `androsexual`, `gynesexual`, `helian`, `lunarian`, `solarian`, `stellarian`, `amatopunk`, `bear`, `butch`, `femme`, `otter`. +* Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`, `aroace`, `androsexual`, `gynesexual`, `abrosexual`, `helian`, `lunarian`, `solarian`, `stellarian`, `amatopunk`, `bear`, `butch`, `femme`, `otter`, `queerhet`. # gglgbtq 0.1.1 diff --git a/R/data.R b/R/data.R index fba12cf..9071a17 100644 --- a/R/data.R +++ b/R/data.R @@ -70,6 +70,9 @@ pride_data <- list( gynesexual = list( colors = c("#F3A9B6", "#903F2A", "#5A953B") ), + abrosexual = list( + colors = c("#37CBBD", "#95E9B1", "#FFFFFF", "#FEA396", "#F35777") + ), lesbian_7 = list( colors = c("#A60061", "#B95594", "#D162A8", "#FFFFFF", "#E5ADD1", "#C64D53", "#8C1801") ), @@ -124,5 +127,9 @@ pride_data <- list( ), otter = list( colors = c("#23A8FA", "#9AD7FC", "#FFFFFF", "#B4B4B4", "#2A2A2A") + ), + # Uncategorized + queerhet = list( + colors = c("#4E8492", "#6CCB99", "#727D6E", "#DAC686", "#B86962") ) ) diff --git a/R/themes-extract.R b/R/themes-extract.R index 1111c80..64b09c5 100644 --- a/R/themes-extract.R +++ b/R/themes-extract.R @@ -6,6 +6,7 @@ extract_theme <- function(palette) { "intersex" = , "pansexual" = , "philadelphia" = , + "queerhet" = , "rainbow" = theme_lgbtq_white, "agender" = theme_agender, "demiboy" = theme_demiboy, diff --git a/README.Rmd b/README.Rmd index c562284..5f3374f 100644 --- a/README.Rmd +++ b/README.Rmd @@ -54,7 +54,7 @@ data <- data.frame( ggplot(data, aes(x = x, y = y, fill = group)) + geom_bar(stat = "identity", position = "dodge") + - scale_fill_manual(values = palette_lgbtq("pansexual")) + scale_fill_lgbtq("pansexual") ``` Use matching `theme_lgbtq()` to make colors stand out the most: @@ -62,7 +62,7 @@ Use matching `theme_lgbtq()` to make colors stand out the most: ```{r ggplot2_theme, fig.height=3} ggplot(data, aes(x = x, y = y, fill = group)) + geom_bar(stat = "identity", position = "dodge") + - scale_fill_manual(values = palette_lgbtq("pansexual")) + + scale_fill_lgbtq("pansexual") + theme_lgbtq("pansexual") ``` @@ -71,16 +71,17 @@ ggplot(data, aes(x = x, y = y, fill = group)) + ```{r ggplot2_theme_custom, fig.height=3} ggplot(data, aes(x = x, y = y, fill = group)) + geom_bar(stat = "identity", position = "dodge") + - scale_fill_manual(values = palette_lgbtq("pansexual")) + + scale_fill_lgbtq("pansexual") + theme_lgbtq("pansexual", legend.position = "left") ``` -Almost all ggplot2 uses of `palette_lgbtq()` will be with `color` and `fill` scales, so the `scale_color_lgbtq()` and `scale_fill_lgbtq()` functions provide a shorthand and more descriptive notation: +Almost all ggplot2 uses of `palette_lgbtq()` will be with `color` and `fill` scales, so the `scale_color_lgbtq()` and `scale_fill_lgbtq()` functions provide a shorthand and more descriptive notation; there's nothing stopping you, however, from passing them manually or using in any other package, though the ggplot2 dependency might be a pretty large one. ```{r ggplot2_scale, fig.height=3} ggplot(data, aes(x = x, y = y, fill = group)) + geom_bar(stat = "identity", position = "dodge") + - scale_fill_lgbtq("pansexual") + scale_fill_manual(values = palette_lgbtq("pansexual")) + + theme_lgbtq("pansexual", legend.position = "left") ``` ## Gallery diff --git a/README.md b/README.md index 64037d9..75393dd 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ To list all available palettes, call: ``` r show_pride() -## # A tibble: 37 × 2 +## # A tibble: 41 × 2 ## palettes lengths ## ## 1 rainbow 6 @@ -44,7 +44,7 @@ show_pride() ## 8 nonbinary 4 ## 9 philadelphia 8 ## 10 progress 11 -## # ℹ 27 more rows +## # ℹ 31 more rows ``` The most common use case is to use palettes with ggplot2: @@ -61,7 +61,7 @@ data <- data.frame( ggplot(data, aes(x = x, y = y, fill = group)) + geom_bar(stat = "identity", position = "dodge") + - scale_fill_manual(values = palette_lgbtq("pansexual")) + scale_fill_lgbtq("pansexual") ``` ![](README_files/figure-gfm/ggplot2-1.png) @@ -71,7 +71,7 @@ Use matching `theme_lgbtq()` to make colors stand out the most: ``` r ggplot(data, aes(x = x, y = y, fill = group)) + geom_bar(stat = "identity", position = "dodge") + - scale_fill_manual(values = palette_lgbtq("pansexual")) + + scale_fill_lgbtq("pansexual") + theme_lgbtq("pansexual") ``` @@ -83,7 +83,7 @@ it’s fully customizable: ``` r ggplot(data, aes(x = x, y = y, fill = group)) + geom_bar(stat = "identity", position = "dodge") + - scale_fill_manual(values = palette_lgbtq("pansexual")) + + scale_fill_lgbtq("pansexual") + theme_lgbtq("pansexual", legend.position = "left") ``` @@ -91,12 +91,16 @@ ggplot(data, aes(x = x, y = y, fill = group)) + Almost all ggplot2 uses of `palette_lgbtq()` will be with `color` and `fill` scales, so the `scale_color_lgbtq()` and `scale_fill_lgbtq()` -functions provide a shorthand and more descriptive notation: +functions provide a shorthand and more descriptive notation; there’s +nothing stopping you, however, from passing them manually or using in +any other package, though the ggplot2 dependency might be a pretty large +one. ``` r ggplot(data, aes(x = x, y = y, fill = group)) + geom_bar(stat = "identity", position = "dodge") + - scale_fill_lgbtq("pansexual") + scale_fill_manual(values = palette_lgbtq("pansexual")) + + theme_lgbtq("pansexual", legend.position = "left") ``` ![](README_files/figure-gfm/ggplot2_scale-1.png) diff --git a/README_files/figure-gfm/ggplot2_scale-1.png b/README_files/figure-gfm/ggplot2_scale-1.png index 75a268f059947211c0bfcecabeb43724842c050f..302eae58de7487872bd8fac238dc33f1e05a1493 100644 GIT binary patch literal 3599 zcmd^Cdsq`!79VXQAru6KpeP1XAE^*n7mzvzWDrEuK&%v%6cwlup#*s&m8gRXMG0wr z0)nGhOdEj~LV_Sr>mw8j!~*gN0puA$-icrkW(ObrKEK`W{c>hdW7%truVo*Cf-O!9fjx&rLh%-rGSiroPK1OPSwVn05> z7B4GAZES2X5eR@Fzy?7+$QFZqIb-hPFc>@rN66q+vftXU*>fO18@t3}wiv|_90rHO z;Bh!Yjj_F6PToA%`KHGvEm;g~A?G%m&14 zP>hPjC|b#5RHCSy56V%rN66_x(ZRt%bXf`p!gOdWfax#=iq2s%AcjIwwEa-reJnEV zBU|@I0DvAg*1JDX8Y=h#06tW>yFgyCSBElnSj(hFXN-f~t{D35Xua9Yv;HI`v+Du1 zci4HQ)ijFkw6id`D)ir5b2ZIV8BY$trA9=KXEqgDq_xnt0e;DCx&R#q!?pzC?`G7k z35c04Hi2Oh@UZAgGTc5h&U&tStWyh})!;{VyD)o`b@u2(L&VntgND4$^dcVs*I6TrCAu<*cUZF)>apAI=T^2-ABRMusO< z#BQQL*nKwe(AF_sr){!(848w=YB6WM53*R@f4v1alecQA&#@A`f#{AI%(kS`lr4|k zkE*|VAxVSrGy7RSl20r&_$Yi7S*jS;^qi){wI@AwD1kHrsO4y`#Nkp-a3NfXRT8ok zlSV+e8Z3+qZ1@N!w0^D+*^pdheJ~;YCo_1xv5V~7J4Z=K4c@>u;D2hWdDU`h4~-&N z2y4u+KMECoauRVQ3?v|gWF%@%r1_$BOFRoIo1crX8Qs+K?GyM>oc}>+g!?PeWS+My z$&3n90!`;E95EAukJg{B^nZi?Kv8xMLF$)X@iE;!nhcC*J>H?i@)FlqF_=GFx~IML zm6u^%bph&sOOuOsMeL++OuvIqEgY`iCKFoAd&h*+xsCQK^kA_QLpD)U^i(>&@AyG# zU+=B{MyZR;sQ>vy8mqYOO}UMY9Voa$QEsNyR-HFcMIOz!T$qWlx~eg=#Y_ooP6apUJob_8@ua)THpk#b@_AS3x#dR^Uu0&~^=Ggi;~nJ1BvH;P zZyAA}W@MX+*jofLwi8TFuK7rrnXP&DyGM;VH!8Gm1%1KQ1aWYfch))Nys>-juY<A)K3}@`dTDb#MSZI*mdnbN0<0jFM=t` z-z=0K>Zi|_htEpNCdjF?&EM;dmC+^@PbKW(QEu?02^J4cPH44g>wU<5S(ob8OWt@9 z$#C6id3uBhF>$)a4Za5+m_Au}+()=?r7yQN`KP!iqEkp=O!3b!xIwYHB}5A1~)5LNH;- z?l0Ni=b�^^bLQ85ly_Sx}ulxu_l6jeS1QSE+ZjKfv}_d5Cma@v0~ht-KK2Aj#qm zR^O0hay2BDPAix&Eh5=YEtT$AY&+bMd^p*0%4U_02o`5@gP~>UwTwWT^0ud{*{H!s zc7LGjXj!733S*Imi`xBV9yd~@y1vQ~qnwHicTJ{F1z@U|dSj^ogmD>kVv=!cECsGI zP`^P7ipOXgi1cvkG;3(O1GVUz?fMwo*R^YvRe`(QZkCzua$;_TYBv66DUc_LO8TRv zDKRTpSS6UO7EJeuS1-jPt|DSx;!F(HoZ62NexOnFy9~TOmD#>+4<_w?B1w=z!=WdE zbGg7A6LBGA8ob)j3&6QDak&AQ!uC3{(37H#G1V~_92GxfeVA3gFNqLzIYdKBxRq~A zfm;t|lt1izHh4M-iEhaWT^Fl~Gp7iA|1DHtseCv+{K#FcES3+I(*>dK_Hq?%f#-hf z2LhNk973NB>#aXCC|e({K3GcUe&*2Dk#~4#Uw7O)2V0CHkA-#*&xT^_~&A&D>h?$3laPWE*EW>r$x{=8>|Zku3JVP&zgf5n{ni%$ zX811?Ui@<@SX0R8@E=vFon4rv@4_}{uzH(K7hF*_7UDh3r2#Zl@Rx!1?_}ofB!_4; z=Hjv~Wx#D@EC+kY^gJY{qM_!mn2`TYNnFI2#dat@xicwnVOC=ufNH61ygW2M)u?c@ zqdjB4?F*Rnp)?_U^hIZFcKW5rcLi%mihT2So~+HT<$v5HNIdQABr8k_riHF(6sd-0 zj~j1O!4a|>+b5$IA?tAtnY+yD$q>e4?&Q0 zgj@36#JZ7$EgwKeI%|m_9_RZ2CIsz1qUY0Kjddt|KjJ#`&w`1Sf_0{YYY1)?uG4z? zA(aFEB=F9%z?}1?C%1s#XAvNyXFVL`8;>8>I5S=6G&j!=d`)69udLBGya_S+3n0h@ zhd)g6lx18yM>;rKB3INZ9wc0iDz)Bqy7&m3^<8!J`nLAV*jI4hrYpLWyI=M7SEuZ? zg(jOSlJk*69MyE|_P}4dWjC}zt;DHM zCGDnI+{J)VpBY@kHv^VSp+?!{#PI0@=OCsXuT<}_dm=4dkJ#z-2dnoezMk0WU5>88 zzOULs1SgPiRaWW#zs-kwl@(J_QPwew|86E&k@(Pim=x*6bcn;dO=%O>N}r7%x8LiW zkNK!gjLx!(SOhMB8kG(k*II81G2T0Hyf;C$TE05myhv=~Ja@2jclB_|b3Oq7 E13Wg(o&W#< literal 3500 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 VW^5ilu+#i?ZTI%^y6qWy;%}&e8&CiM diff --git a/man/palette_lgbtq.Rd b/man/palette_lgbtq.Rd index fd3ce5f..5ee4e54 100644 --- a/man/palette_lgbtq.Rd +++ b/man/palette_lgbtq.Rd @@ -43,6 +43,7 @@ Currently available palettes are: \item \code{pansexual} (3 colors) \item \code{androsexual} (3 colors) \item \code{gynesexual} (3 colors) +\item \code{abrosexual} (5 colors) \item \code{lesbian_7} (7 colors) \item \code{gay_7} (7 colors) \item \code{demiboy} (4 colors) @@ -60,6 +61,7 @@ Currently available palettes are: \item \code{butch} (7 colors) \item \code{femme} (5 colors) \item \code{otter} (5 colors) +\item \code{queerhet} (5 colors) } } diff --git a/man/theme_lgbtq.Rd b/man/theme_lgbtq.Rd index be21022..6503242 100644 --- a/man/theme_lgbtq.Rd +++ b/man/theme_lgbtq.Rd @@ -48,6 +48,7 @@ Currently available palettes are: \item \code{pansexual} (3 colors) \item \code{androsexual} (3 colors) \item \code{gynesexual} (3 colors) +\item \code{abrosexual} (5 colors) \item \code{lesbian_7} (7 colors) \item \code{gay_7} (7 colors) \item \code{demiboy} (4 colors) @@ -65,6 +66,7 @@ Currently available palettes are: \item \code{butch} (7 colors) \item \code{femme} (5 colors) \item \code{otter} (5 colors) +\item \code{queerhet} (5 colors) } } diff --git a/vignettes/gallery.Rmd b/vignettes/gallery.Rmd index dacf6ae..b9317d8 100644 --- a/vignettes/gallery.Rmd +++ b/vignettes/gallery.Rmd @@ -166,6 +166,12 @@ palette_lgbtq("gynesexual") A "gynesexual" person is attracted to women or feminine-presenting people. This term is superior to "straight [man]" and "lesbian", since it does not imply anything about person's gender and is usable by non-binary people as well. +```{r abrosexual} +palette_lgbtq("abrosexual") +``` + +Abrosexuality is defined by the fluctuations of one's sexual orientation, whether constant or occasional. It doesn't specify where on the sexuality spectrum these fluctuations occur. + ```{r lesbian_7} palette_lgbtq("lesbian_7") ``` @@ -252,6 +258,8 @@ palette_lgbtq("bigender") ## Subcultures +While somebody's sexual orientation isn't that person's lifestyle (even though there are people suggesting otherwise), the terms here describe the way certain people express and identify themselves in strong connection with their sexuality. In a way, this is the closest to "lifestyle" you can get here. + ```{r amatopunk} palette_lgbtq("amatopunk") ``` @@ -280,6 +288,14 @@ palette_lgbtq("femme") palette_lgbtq("otter") ``` +Since "bear" triggers a natural association with a high-volume person, as explained before, the "otter" is its low-volume counterpart; retaining the other characteristics referring to maleness, gayness, and hairiness. + ## Uncategorized -All the terms that do not fit elsewhere. Currently empty. +All the terms that do not fit elsewhere. + +```{r queerhet} +palette_lgbtq("queerhet") +``` + +Queerhets use this term to signalize that allocishets are not the only heterosexual people in the existence. There exist people who are both straight and queer -- by being either transgender or A-spec. From 96c2396378f635d64e2b06dbd3a51219b0b0f7ea Mon Sep 17 00:00:00 2001 From: Laura Date: Tue, 25 Jun 2024 23:30:46 +0200 Subject: [PATCH 26/28] remove Date field --- DESCRIPTION | 1 - cran-comments.md | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 74deff2..8d7bdc6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,6 @@ Package: gglgbtq Type: Package Title: Show Pride on 'ggplot2' Plots Version: 0.1.1.9000 -Date: 2022-08-06 Authors@R: c(person("Laura", "Bakala", email = "erdaradun.gaztea@gmail.com", role = c("cre", "aut", "cph"), diff --git a/cran-comments.md b/cran-comments.md index d0bcfa2..409c174 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,4 +1,4 @@ -Updated code to fix warning with new ggplot2 release. Aside from that, added a few new palettes and a vignette. +Two new functions for convenience and a lot of new palettes. ## R CMD check results From 969df3d7692477aaccbafd10d5bfe0ab6ed6ebf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20B=C4=85ka=C5=82a?= Date: Tue, 25 Jun 2024 23:31:58 +0200 Subject: [PATCH 27/28] Increment version number to 0.2.0 --- DESCRIPTION | 2 +- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 8d7bdc6..fdca5ff 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: gglgbtq Type: Package Title: Show Pride on 'ggplot2' Plots -Version: 0.1.1.9000 +Version: 0.2.0 Authors@R: c(person("Laura", "Bakala", email = "erdaradun.gaztea@gmail.com", role = c("cre", "aut", "cph"), diff --git a/NEWS.md b/NEWS.md index 3f08920..ef5196b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# gglgbtq (development version) +# gglgbtq 0.2.0 * Added `scale_color_lgbtq()` and `scale_fill_lgbtq()` for convenience. * Implemented the following palettes: `acesthetic`, `analterous`, `asensual`, `ace_spectrum`, `aro_spectrum`, `aroace`, `androsexual`, `gynesexual`, `abrosexual`, `helian`, `lunarian`, `solarian`, `stellarian`, `amatopunk`, `bear`, `butch`, `femme`, `otter`, `queerhet`. From 08a4b5a8498b7a53ad45174654bfb729b3e2c11d Mon Sep 17 00:00:00 2001 From: Laura Date: Tue, 25 Jun 2024 23:35:13 +0200 Subject: [PATCH 28/28] fix missing return tag --- R/scales.R | 2 ++ man/lgbtq-scales.Rd | 3 +++ 2 files changed, 5 insertions(+) diff --git a/R/scales.R b/R/scales.R index d7a08bd..135ac0a 100644 --- a/R/scales.R +++ b/R/scales.R @@ -9,6 +9,8 @@ #' @param ... `ANY` \cr #' Arguments passed to [ggplot2::scale_color_manual()]. #' +#' @return A scale to be used with a \pkg{ggplot2} object. +#' #' @examples #' data <- data.frame( #' x = 1:10, y = 15:6, diff --git a/man/lgbtq-scales.Rd b/man/lgbtq-scales.Rd index 63db978..c2c7a0d 100644 --- a/man/lgbtq-scales.Rd +++ b/man/lgbtq-scales.Rd @@ -20,6 +20,9 @@ Name of the flag the colors are based on.} \item{...}{\code{ANY} \cr Arguments passed to \code{\link[ggplot2:scale_manual]{ggplot2::scale_color_manual()}}.} } +\value{ +A scale to be used with a \pkg{ggplot2} object. +} \description{ These functions provide a shorthand for passing \code{\link[=palette_lgbtq]{palette_lgbtq()}} to \code{values} parameter of an appropriate ggplot2 scale.