From b7ed8a91c4127d0e9ff6d84ef9b31f6f7bf5a809 Mon Sep 17 00:00:00 2001
From: Laura <erdaradun.gaztea+github@gmail.com>
Date: Sun, 23 Jun 2024 22:39:31 +0200
Subject: [PATCH] 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.