src/help.rs

@@ -28,33 +28,33 @@ pub fn list_text() {
 
 flag list:
    agender                agender pride flag
-   aromantic              aromantic pride flag
+   aro, aromantic         aromantic pride flag
    aroace                 aromantic-asexual pride flag
-   asexual                asexual pride flag
+   ace, asexual           asexual pride flag
    bigender               bigender pride flag
-   bisexual               bisexual pride flag
-   gay                    gay men pride flag
+   bi, bisexual           bisexual pride flag
+   gay, mlm               gay men pride flag
    genderfluid            genderfluid pride flag
    gender-nonconforming   gender nonconforming pride flag
    genderqueer            genderqueer pride flag
    gendervoid             gendervoid pride flag
    lesbian                lesbian pride flag
    multigender            multigender pride flag
-   nonbinary              nonbinary pride flag
-   pansexual              pansexual pride flag
-   rainbow                six-color rainbow flag
+   nb, nonbinary          nonbinary pride flag
+   pan, pansexual         pansexual pride flag
+   pride, rainbow         six-color rainbow flag
    progress               progress arrow rainbow flag
-   transgender            transgender pride flag");
+   trans, transgender     transgender pride flag");
 }
 
 pub fn flag_help(flag: &str) {
 	match flag {
-		"pride" | "rainbow" | "-"
+		"pride" | "rainbow"
 			=> {
 			println!("The ubiquitous 1979 6-color rainbow pride flag, representing the larger queer community.
 
 names:
-   'pride', 'rainbow', '-'
+   'pride', 'rainbow'
 
 variants:
    8-color            Gilbert Baker's original 1978 flag with 8 stripes
@@ -63,8 +63,6 @@ variants:
    philadelphia       The 2017 Philadelphia Pride flag with black and brown stripes
    progress           The 2018 Progess rainbow pride flag designed by Daniel Quasar");
 			},
-		"progress"
-			=> { println!("Daniel Quasar's 2018 Progress rainbow pride flag.\n\nnames:\n   'progress'"); }
 
 		"transgender" | "trans"
 			=> {
@@ -74,47 +72,9 @@ names:
    'transgender', 'trans'");
 			},
 
-		//	alphabetical below this point
-
-		"aromantic" | "aro"
-			=> { println!("The aromantic pride flag.\n\nnames:\n   'aromantic', 'aro'"); }
-		"asexaul" | "ace"
-			=> { println!("The asexual pride flag.\n\nnames:\n   'asexual', 'ace'"); }
-		"aroace" | "aromantic-asexual"
-			=> {
-				println!("The aromantic-asexual pride flag.
-
-names:
-   'aroace', 'aromantic-asexual'
-
-notes:
-   Currently only displays in terminals 20 lines or taller.");
-			},
-
-		"bisexual" | "bi"
-			=> {
-				println!("The bisexual flag designed by Michael Page in 1998.
-
-names:
-   'bisexual', 'bi'");
-			},
-
-
-		"gay" | "mlm"
-			=> {
-				println!("The 7-stripe gay men pride flag designed by @gayflagblog on tumblr in 2019.
-
-names:
-   'gay', 'mlm'");
-			},
-
-		"gender-nonconforming" | "gendernonconforming" | "gnc"
-			=> { println!("The gender-nonconforming pride flag.\n\nnames:\n   'gender-nonconforming', 'gendernonconforming', 'gnc'"); },
-
-
 		"lesbian"
 			=> {
-				println!("The 5-stripe lesbian flag designed by Emily Gwen in 2018.
+				println!("Emily Gwen's 2018 5-stripe lesbian flag.
 
 names:
    'lesbian'
@@ -122,28 +82,11 @@ names:
 variants:
    7-color            7-stripe flag, also designed in 2018 by Emily Gwen");
 			},
-
-
-		"nonbinary" | "nb"
-			=> {
-				println!("The nonbinary pride flag designed by Kyle Rowan in 2014.
-
-names:
-   'nonbinary', 'nb'");
-			},
-
-
-		"pansexual" | "pan"
-			=> {
-				println!("The pansexual pride flag designed by Jasper V around 2010
-
-names:
-   'pansexual', 'pan'");
-			},
-
+		"progress"
+			=> { println!("Daniel Quasar's 2018 Progress rainbow pride flag.\n\nnames:\n   'progress'"); }
 
 		_
-			=> { help_text(); }
+			=> help_text()
 	}
 }
 

src/main.rs

@@ -6,8 +6,11 @@ mod color;
 mod complex;
 mod draw;
 mod flag;
+<<<<<<< HEAD
 mod help;
+=======
 mod util;
+>>>>>>> main
 mod variant;
 
 use crate::flag::Flag;
@@ -134,9 +137,9 @@ fn main() {
 //			=>	complex::polyamorous(),
 
 		Some("progress")
-			=>	complex::progress(small),
+			=>	flag::progress(),
 
-		_ => { help::help_text(); exit(1) }
+		_ => { help_text(); exit(1) }
 	};
 
 	flag.draw(!small);