From 0d9a114c7250028ae3b8d8a8c3b96dc8146b1fc7 Mon Sep 17 00:00:00 2001 From: Laura Date: Tue, 25 Jun 2024 23:20:21 +0200 Subject: [PATCH] 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.