From da1a4ad40b7bf0159584a9ed4ae76374475ad16c Mon Sep 17 00:00:00 2001
From: Pierce Corcoran <code@thecodewarrior.dev>
Date: Tue, 8 Dec 2020 13:49:46 -0800
Subject: [PATCH 1/4] Refactor color styling and add test cases

---
 Makefile     |   4 +-
 aha.c        | 491 +++++++++++++++++++++++++++++++--------------------
 test_print.c | 215 ++++++++++++++++++++++
 3 files changed, 520 insertions(+), 190 deletions(-)
 create mode 100644 test_print.c

diff --git a/Makefile b/Makefile
index 064c7e0..b4762c0 100644
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,11 @@ all: aha
 
 aha: aha.c
 	$(CC) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) aha.c -o $@
+test_print: test_print.c
+	$(CC) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) test_print.c -o $@
 
 clean:
-	rm -f aha
+	rm -f aha aha_test
 
 install: aha
 ifeq ($(platform), Darwin)
diff --git a/aha.c b/aha.c
index cdffb11..a61fbbd 100644
--- a/aha.c
+++ b/aha.c
@@ -451,6 +451,8 @@ struct State {
 	enum ColorMode fc_colormode;
 	enum ColorMode bc_colormode;
 	int highlighted; //for fc AND bc although not correct...
+	int fc_highlighted;
+	int bc_highlighted;
 };
 
 void swapColors(struct State *const state) {
@@ -481,6 +483,8 @@ const struct State default_state = {
 	.fc_colormode = MODE_3BIT,
 	.bc_colormode = MODE_3BIT,
 	.highlighted = 0,
+	.fc_highlighted = 0,
+	.bc_highlighted = 0,
 };
 
 int statesDiffer(const struct State *const old, const struct State *const new) {
@@ -494,9 +498,106 @@ int statesDiffer(const struct State *const old, const struct State *const new) {
 		(old->crossedout != new->crossedout) ||
 		(old->fc_colormode != new->fc_colormode) ||
 		(old->bc_colormode != new->bc_colormode) ||
-		(old->highlighted != new->highlighted);
+		(old->highlighted != new->highlighted) ||
+		(old->fc_highlighted != new->fc_highlighted) ||
+		(old->bc_highlighted != new->bc_highlighted);
 }
 
+struct ColorStyle {
+	char* fg_default;
+	char* bg_default;
+	char* colors[10];
+	char* bright_colors[10];
+};
+
+const struct ColorStyle styles[3] = {
+	{ // SCHEME_WHITE
+		.fg_default = "black",
+		.bg_default = "white",
+		.colors = {
+			"dimgray", // Black
+			"red", // Red
+			"green", // Green
+			"olive", // Yellow
+			"blue", // Blue
+			"purple", // Magenta
+			"teal", // Cyan
+			"gray", // White
+			"white", // Default Background
+			"black"  // Default Foreground
+		},
+		.bright_colors = {
+			"dimgray", // Bright Black
+			"red", // Bright Red
+			"green", // Bright Green
+			"olive", // Bright Yellow
+			"blue", // Bright Blue
+			"purple", // Bright Magenta
+			"cyan", // Bright Cyan
+			"white", // Bright White
+			"white", // Default Background
+			"black"  // Default Foreground
+		}
+	},
+
+	{ // SCHEME_BLACK
+		.fg_default = "white",
+		.bg_default = "black",
+		.colors = {
+			"black", // Black
+			"red", // Red
+			"lime", // Green
+			"yellow", // Yellow
+			"#3333FF", // Blue
+			"fuchsia", // Magenta
+			"aqua", // Cyan
+			"white", // White
+			"black", // Default Background
+			"white"  // Default Foreground
+		},
+		.bright_colors = {
+			"black", // Bright Black
+			"red", // Bright Red
+			"lime", // Bright Green
+			"yellow", // Bright Yellow
+			"#3333FF", // Bright Blue
+			"fuchsia", // Bright Magenta
+			"aqua", // Bright Cyan
+			"white", // Bright White
+			"black", // Default Background
+			"white"  // Default Foreground
+		}
+	},
+
+	{ // SCHEME_PINK
+		.fg_default = "black",
+		.bg_default = "pink",
+		.colors = {
+			"dimgray", // Black
+			"red", // Red
+			"green", // Green
+			"olive", // Yellow
+			"blue", // Blue
+			"purple", // Magenta
+			"teal", // Cyan
+			"gray", // White
+			"pink", // Default Background
+			"black"  // Default Foreground
+		},
+		.bright_colors = {
+			"dimgray", // Bright Black
+			"red", // Bright Red
+			"green", // Bright Green
+			"olive", // Bright Yellow
+			"blue", // Bright Blue
+			"purple", // Bright Magenta
+			"cyan", // Bright Cyan
+			"white", // Bright White
+			"pink", // Default Background
+			"black"  // Default Foreground
+		}
+	}
+};
 
 void printHeader(const struct Options *opts)
 {
@@ -547,69 +648,38 @@ void printHeader(const struct Options *opts)
 		printf("\">\n");
 	}
 
+	struct ColorStyle style = styles[opts->colorscheme];
+
 	int style_tag = 0;
 	if (opts->stylesheet)
 	{
 		printf("<style type=\"text/css\">\n");
 		style_tag = 1;
 
-		switch (opts->colorscheme)
-		{
-			case SCHEME_BLACK:  printf("body         {color: white; background-color: black;}\n");
-							 printf(".reset       {color: white;}\n");
-							 printf(".bg-reset    {background-color: black;}\n");
-							 printf(".inverted    {color: black;}\n");
-							 printf(".bg-inverted {background-color: white;}\n");
-							 break;
-			case SCHEME_PINK:  printf("body         {background-color: pink;}\n");
-							 printf(".reset       {color: black;}\n");
-							 printf(".bg-reset    {background-color: pink;}\n");
-							 printf(".inverted    {color: pink;}\n");
-							 printf(".bg-inverted {background-color: black;}\n");
-							 break;
-			default: printf(".reset       {color: black;}\n");
-					 printf(".bg-reset    {background-color: white;}\n");
-					 printf(".inverted    {color: white;}\n");
-					 printf(".bg-inverted {background-color: black;}\n");
-		}
-		if (opts->colorscheme != SCHEME_BLACK)
-		{
-			printf(".dimgray     {color: dimgray;}\n");
-			printf(".red         {color: red;}\n");
-			printf(".green       {color: green;}\n");
-			printf(".yellow      {color: olive;}\n");
-			printf(".blue        {color: blue;}\n");
-			printf(".purple      {color: purple;}\n");
-			printf(".cyan        {color: teal;}\n");
-			printf(".white       {color: gray;}\n");
-			printf(".bg-black    {background-color: black;}\n");
-			printf(".bg-red      {background-color: red;}\n");
-			printf(".bg-green    {background-color: green;}\n");
-			printf(".bg-yellow   {background-color: olive;}\n");
-			printf(".bg-blue     {background-color: blue;}\n");
-			printf(".bg-purple   {background-color: purple;}\n");
-			printf(".bg-cyan     {background-color: teal;}\n");
-			printf(".bg-white    {background-color: gray;}\n");
-		}
-		else
-		{
-			printf(".dimgray     {color: dimgray;}\n");
-			printf(".red         {color: red;}\n");
-			printf(".green       {color: lime;}\n");
-			printf(".yellow      {color: yellow;}\n");
-			printf(".blue        {color: #3333FF;}\n");
-			printf(".purple      {color: fuchsia;}\n");
-			printf(".cyan        {color: aqua;}\n");
-			printf(".white       {color: white;}\n");
-			printf(".bg-black    {background-color: black;}\n");
-			printf(".bg-red      {background-color: red;}\n");
-			printf(".bg-green    {background-color: lime;}\n");
-			printf(".bg-yellow   {background-color: yellow;}\n");
-			printf(".bg-blue     {background-color: #3333FF;}\n");
-			printf(".bg-purple   {background-color: fuchsia;}\n");
-			printf(".bg-cyan     {background-color: aqua;}\n");
-			printf(".bg-white    {background-color: white;}\n");
-		}
+
+		printf("body         {color: %s; background-color: %s;}\n", style.fg_default, style.bg_default);
+		printf(".reset       {color: %s;}\n", style.fg_default);
+		printf(".bg-reset    {background-color: %s;}\n", style.bg_default);
+		printf(".inverted    {color: %s;}\n", style.bg_default);
+		printf(".bg-inverted {background-color: %s;}\n", style.fg_default);
+
+		printf(".dimgray     {color: %s;}\n", style.colors[0]);
+		printf(".red         {color: %s;}\n", style.colors[1]);
+		printf(".green       {color: %s;}\n", style.colors[2]);
+		printf(".yellow      {color: %s;}\n", style.colors[3]);
+		printf(".blue        {color: %s;}\n", style.colors[4]);
+		printf(".purple      {color: %s;}\n", style.colors[5]);
+		printf(".cyan        {color: %s;}\n", style.colors[6]);
+		printf(".white       {color: %s;}\n", style.colors[7]);
+		printf(".bg-black    {background-color: %s;}\n", style.colors[0]);
+		printf(".bg-red      {background-color: %s;}\n", style.colors[1]);
+		printf(".bg-green    {background-color: %s;}\n", style.colors[2]);
+		printf(".bg-yellow   {background-color: %s;}\n", style.colors[3]);
+		printf(".bg-blue     {background-color: %s;}\n", style.colors[4]);
+		printf(".bg-purple   {background-color: %s;}\n", style.colors[5]);
+		printf(".bg-cyan     {background-color: %s;}\n", style.colors[6]);
+		printf(".bg-white    {background-color: %s;}\n", style.colors[7]);
+
 		printf(".underline   {text-decoration: underline;}\n");
 		printf(".bold        {font-weight: bold;}\n");
 		printf(".italic      {font-style: italic;}\n");
@@ -640,23 +710,11 @@ void printHeader(const struct Options *opts)
 	else
 	{
 		printf("<body");
-		if(opts->bodystyle || opts->colorscheme==SCHEME_BLACK || opts->colorscheme==SCHEME_PINK)
-		{
-		    int styles=0;
-		    printf(" style=\"");
-		    if(opts->colorscheme==SCHEME_BLACK) {
-			++styles;
-			printf("color:white; background-color:black");
-		    } else if(opts->colorscheme==SCHEME_PINK) {
-			++styles;
-			printf("background-color:pink");
-		    }
-		    if(opts->bodystyle) {
-			if(styles) printf(";");
+		printf(" style=\"color: %s; background-color: %s;", style.fg_default, style.bg_default);
+		if(opts->bodystyle) {
 			printHtml(opts->bodystyle);
-		    }
-		    printf("\"");
 		}
+		printf("\"");
 		printf(">\n");
 	}
 
@@ -668,30 +726,32 @@ int main(int argc,char* args[])
 	struct Options opts = parseArgs(argc, args);
 	register FILE* fp = opts.fp;
 
-	char* fcstyle[10] = {
-		opts.stylesheet ? "dimgray " : "color:dimgray;", //Black
-		opts.stylesheet ? "red " : "color:red;", //Red
-		opts.stylesheet ? "green " : opts.colorscheme==SCHEME_BLACK ? "color:lime;" : "color:green;", //Green
-		opts.stylesheet ? "yellow " : opts.colorscheme==SCHEME_BLACK ? "color:yellow;" : "color:olive;", //Yellow
-		opts.stylesheet ? "blue " : opts.colorscheme==SCHEME_BLACK ? "color:#3333FF;" : "color:blue;", //Blue
-		opts.stylesheet ? "purple " : opts.colorscheme==SCHEME_BLACK ? "color:fuchsia;" : "color:purple;", //Purple
-		opts.stylesheet ? "cyan " : opts.colorscheme==SCHEME_BLACK ? "color:aqua;" : "color:teal;", //Cyan
-		opts.stylesheet ? "white " : opts.colorscheme==SCHEME_BLACK ? "color:white;" : "color:gray;", //White
-		opts.stylesheet ? "inverted " : opts.colorscheme==SCHEME_BLACK ? "color:black;" : opts.colorscheme==SCHEME_PINK ? "color:pink;" : "color:white;", //Background
-		opts.stylesheet ? "reset " : opts.colorscheme==SCHEME_BLACK ? "color:white;" : "color:black;" //Foreground
+	struct ColorStyle style = styles[opts.colorscheme];
+
+	char* fcclass[10] = {
+		"dimgray", // Black
+		"red", // Red
+		"green", // Green
+		"yellow", // Yellow
+		"blue", // Blue
+		"purple", // Magenta
+		"cyan", // Cyan
+		"white", // White
+		"inverted", // Default Background
+		"reset" // Default Foreground
 	};
 
-	char* bcstyle[10] = {
-		opts.stylesheet ? "bg-black " : "background-color:black;", //Black
-		opts.stylesheet ? "bg-red " : "background-color:red;", //Red
-		opts.stylesheet ? "bg-green " : opts.colorscheme==SCHEME_BLACK ? "background-color:lime;" : "background-color:green;", //Green
-		opts.stylesheet ? "bg-yellow " : opts.colorscheme==SCHEME_BLACK ? "background-color:yellow;" : "background-color:olive;", //Yellow
-		opts.stylesheet ? "bg-blue " : opts.colorscheme==SCHEME_BLACK ? "background-color:#3333FF;" : "background-color:blue;", //Blue
-		opts.stylesheet ? "bg-purple " : opts.colorscheme==SCHEME_BLACK ? "background-color:fuchsia;" : "background-color:purple;", //Purple
-		opts.stylesheet ? "bg-cyan " : opts.colorscheme==SCHEME_BLACK ? "background-color:aqua;" : "background-color:teal;", //Cyan
-		opts.stylesheet ? "bg-white " : opts.colorscheme==SCHEME_BLACK ? "background-color:white;" : "background-color:gray;", //White
-		opts.stylesheet ? "bg-reset " : opts.colorscheme==SCHEME_BLACK ? "background-color:black;" : opts.colorscheme==SCHEME_PINK ? "background-color:pink;" : "background-color:white;", //Background
-		opts.stylesheet ? "bg-inverted " : opts.colorscheme==SCHEME_BLACK ? "background-color:white;" : "background-color:black;", //Foreground
+	char* bcclass[10] = {
+		"bg-black", // Black
+		"bg-red", // Red
+		"bg-green", // Green
+		"bg-yellow", // Yellow
+		"bg-blue", // Blue
+		"bg-purple", // Magenta
+		"bg-cyan", // Cyan
+		"bg-white", // White
+		"bg-reset", // Default Background
+		"bg-inverted" // Default Foreground
 	};
 
 	if (!opts.no_header)
@@ -820,12 +880,12 @@ int main(int argc,char* args[])
 											state.fc_colormode = MODE_8BIT;
 											if (momelem->value >=8 && momelem->value <=15)
 											{
-												state.highlighted = 1;
+												state.fc_highlighted = 1;
 												*dest = momelem->value-8;
 											}
 											else
 											{
-												state.highlighted = 0;
+												state.fc_highlighted = 0;
 												*dest = momelem->value;
 											}
 										}
@@ -845,7 +905,7 @@ int main(int argc,char* args[])
 											b = momelem;
 											if ( r && g && b )
 											{
-												state.highlighted = 0;
+												state.fc_highlighted = 0;
 												state.fc_colormode = MODE_24BIT;
 												*dest =
 													(r->value & 255) * 65536 +
@@ -856,14 +916,14 @@ int main(int argc,char* args[])
 										else
 										{
 											state.fc_colormode = MODE_3BIT;
-											state.highlighted = 0;
+											state.fc_highlighted = 0;
 											*dest=momelem->value-30;
 										}
 									}
 									break;
 								case 39: // Set foreground color to default
 									state.fc_colormode = MODE_3BIT;
-									state.highlighted = 0;
+									state.fc_highlighted = 0;
 									state.fc = -1;
 									break;
 								case 40:
@@ -888,12 +948,12 @@ int main(int argc,char* args[])
 											state.bc_colormode = MODE_8BIT;
 											if (momelem->value >=8 && momelem->value <=15)
 											{
-												state.highlighted = 1;
+												state.bc_highlighted = 1;
 												*dest = momelem->value-8;
 											}
 											else
 											{
-												state.highlighted = 0;
+												state.bc_highlighted = 0;
 												*dest = momelem->value;
 											}
 										}
@@ -914,7 +974,7 @@ int main(int argc,char* args[])
 											if ( r && g && b )
 											{
 												state.bc_colormode = MODE_24BIT;
-												state.highlighted = 0;
+												state.bc_highlighted = 0;
 												*dest =
 													(r->value & 255) * 65536 +
 													(g->value & 255) * 256 +
@@ -924,14 +984,14 @@ int main(int argc,char* args[])
 										else
 										{
 											state.bc_colormode = MODE_3BIT;
-											state.highlighted = 0;
+											state.bc_highlighted = 0;
 											*dest=momelem->value-40;
 										}
 									}
 									break;
 								case 49: // Set background color to default
 									state.bc_colormode = MODE_3BIT;
-									state.highlighted = 0;
+									state.bc_highlighted = 0;
 									state.bc = -1;
 									break;
 								case 90:
@@ -947,7 +1007,7 @@ int main(int argc,char* args[])
 										if (negative != 0)
 											dest=&(state.bc);
 										state.fc_colormode = MODE_3BIT;
-										state.highlighted = 1;
+										state.fc_highlighted = 1;
 										*dest=momelem->value-90;
 									}
 									break;
@@ -965,7 +1025,7 @@ int main(int argc,char* args[])
 										if (negative != 0)
 											dest=&(state.fc);
 										state.bc_colormode = MODE_3BIT;
-										state.highlighted = 1;
+										state.bc_highlighted = 1;
 										*dest=momelem->value-100;
 									}
 									break;
@@ -1008,99 +1068,152 @@ int main(int argc,char* args[])
 					if (statesDiffer(&state, &default_state))
 					{
 						if (opts.stylesheet)
-							printf("<span class=\"");
-						else
-							printf("<span style=\"");
-						if (state.underline)
 						{
-							if (opts.stylesheet)
+							printf("<span class=\"");
+							if(state.underline)
 								printf("underline ");
-							else
-								printf("text-decoration:underline;");
-						}
-						if (state.bold)
-						{
-							if (opts.stylesheet)
+							if(state.bold)
 								printf("bold ");
-							else
-								printf("font-weight:bold;");
-						}
-						if (state.italic)
-						{
-							if (opts.stylesheet)
+							if(state.italic)
 								printf("italic ");
-							else
-								printf("font-style:italic;");
-						}
-						if (state.blink)
-						{
-							if (opts.stylesheet)
+							if(state.blink)
 								printf("blink ");
-							else
-								printf("text-decoration:blink;");
-						}
-						if (state.crossedout)
-						{
-							if (opts.stylesheet)
+							if(state.crossedout)
 								printf("crossed-out ");
-							else
-								printf("text-decoration:line-through;");
-						}
-						if (state.highlighted)
-						{
-							if (opts.stylesheet)
+							if(state.fc_highlighted || state.bc_highlighted)
 								printf("highlighted ");
-							else
-								printf("filter: contrast(70%%) brightness(190%%);");
-						}						if (opts.stylesheet &&
-							state.fc_colormode != MODE_3BIT &&
-							(state.fc_colormode != MODE_8BIT || state.fc>15))
-							printf("\" style=\"");
-						switch (state.fc_colormode)
-						{
-							case MODE_3BIT:
-								if (state.fc>=0 && state.fc<=9) printf("%s", fcstyle[state.fc]);
-								break;
-							case MODE_8BIT:
-								if (state.fc>=0 && state.fc<=7)
-									printf("%s", fcstyle[state.fc]);
-								else
+
+							int needs_style = 0;
+							// classes first
+							switch (state.fc_colormode)
+							{
+								case MODE_3BIT:
+									if (state.fc>=0 && state.fc<=9)
+										printf("%s ", fcclass[state.fc]);
+									break;
+								case MODE_8BIT:
+									if (state.fc>=0 && state.fc<=7)
+										printf("%s ", fcclass[state.fc]);
+									else
+										needs_style = 1;
+									break;
+								case MODE_24BIT:
+									needs_style = 1;
+									break;
+							}
+
+							switch (state.bc_colormode)
+							{
+								case MODE_3BIT:
+									if (state.bc>=0 && state.bc<=9)
+										printf("%s ", bcclass[state.bc]);
+									break;
+								case MODE_8BIT:
+									if (state.bc>=0 && state.bc<=7)
+										printf("%s ", bcclass[state.bc]);
+									else
+										needs_style = 1;
+									break;
+								case MODE_24BIT:
+									needs_style = 1;
+									break;
+							};
+
+							// print anything that needs to be in a style attribute
+							if(needs_style)
+							{
+								printf("\" style=\"");
+
+								switch (state.fc_colormode)
 								{
-									char rgb[12];
-									make_rgb(state.fc,rgb);
-									printf("color:#%s;",rgb);
+									case MODE_3BIT:
+										break;
+									case MODE_8BIT:
+										if (state.fc>=0 && state.fc<=7)
+											break;
+										char rgb[12];
+										make_rgb(state.fc,rgb);
+										printf("color:#%s;",rgb);
+										break;
+									case MODE_24BIT:
+										printf("color:#%06x;",state.fc);
+										break;
 								}
-								break;
-							case MODE_24BIT:
-								printf("color:#%06x;",state.fc);
-								break;
-						};
-						if (opts.stylesheet &&
-							!(state.fc_colormode != MODE_3BIT &&
-							(state.fc_colormode != MODE_8BIT || state.fc>15)) && //already in style
-							state.bc_colormode != MODE_3BIT &&
-							(state.bc_colormode != MODE_8BIT || state.bc>15))
-							printf("\" style=\"");
-						switch (state.bc_colormode)
-						{
-							case MODE_3BIT:
-								if (state.bc>=0 && state.bc<=9) printf("%s", bcstyle[state.bc]);
-								break;
-							case MODE_8BIT:
-								if (state.bc>=0 && state.bc<=7)
-									printf("%s", bcstyle[state.bc]);
-								else
+								switch (state.bc_colormode)
 								{
-									char rgb[12];
-									make_rgb(state.bc,rgb);
-									printf("background-color:#%s;",rgb);
+									case MODE_3BIT:
+										break;
+									case MODE_8BIT:
+										if (state.bc>=0 && state.bc<=7)
+											break;
+										char rgb[12];
+										make_rgb(state.bc,rgb);
+										printf("background-color:#%s;",rgb);
+										break;
+									case MODE_24BIT:
+										printf("background-color:#%06x;",state.bc);
+										break;
 								}
-								break;
-							case MODE_24BIT:
-								printf("background-color:#%06x;",state.bc);
-								break;
-						};
-						printf("\">");
+							}
+							printf("\">");
+						}
+						else // !state.stylesheet
+						{
+							printf("<span style=\"");
+							if(state.underline)
+								printf("text-decoration:underline;");
+							if(state.bold)
+								printf("font-weight:bold;");
+							if(state.italic)
+								printf("font-style:italic;");
+							if(state.blink)
+								printf("text-decoration:blink;");
+							if(state.fc_highlighted || state.bc_highlighted)
+								printf("filter: contrast(70%%) brightness(190%%);");
+
+							switch (state.fc_colormode)
+							{
+								case MODE_3BIT:
+									if (state.fc>=0 && state.fc<=9)
+										printf("color:%s;", style.colors[state.fc]);
+									break;
+								case MODE_8BIT:
+									if (state.fc>=0 && state.fc<=7)
+										printf("color:%s;", style.colors[state.fc]);
+									else
+									{
+										char rgb[12];
+										make_rgb(state.fc,rgb);
+										printf("color:#%s;",rgb);
+									}
+									break;
+								case MODE_24BIT:
+									printf("color:#%06x;",state.fc);
+									break;
+							};
+
+							switch (state.bc_colormode)
+							{
+								case MODE_3BIT:
+									if (state.bc>=0 && state.bc<=9)
+										printf("background-color:%s", style.colors[state.bc]);
+									break;
+								case MODE_8BIT:
+									if (state.bc>=0 && state.bc<=7)
+										printf("background-color:%s;", style.colors[state.bc]);
+									else
+									{
+										char rgb[12];
+										make_rgb(state.bc,rgb);
+										printf("background-color:#%s;",rgb);
+									}
+									break;
+								case MODE_24BIT:
+									printf("background-color:#%06x;",state.bc);
+									break;
+							};
+							printf("\">");
+						}
 					}
 				}
 			}
diff --git a/test_print.c b/test_print.c
new file mode 100644
index 0000000..fa2842d
--- /dev/null
+++ b/test_print.c
@@ -0,0 +1,215 @@
+#include <stdio.h>
+
+#define ANSI(str) "\x1b[" str
+
+#define ANSI_RESET ANSI("0m")
+#define ANSI_BOLD_ON ANSI("1m")
+#define ANSI_BOLD_OFF ANSI("22m")
+#define ANSI_UNDERSCORE_ON ANSI("4m")
+#define ANSI_UNDERSCORE_OFF ANSI("24m")
+#define ANSI_BLINK_ON ANSI("5m")
+#define ANSI_BLINK_OFF ANSI("25m")
+#define ANSI_CROSSED_OUT_ON ANSI("9m")
+#define ANSI_CROSSED_OUT_OFF ANSI("29m")
+
+#define ANSI_FG_DEFAULT ANSI("39m")
+
+#define ANSI_FG_BLACK ANSI("30m")
+#define ANSI_FG_RED ANSI("31m")
+#define ANSI_FG_GREEN ANSI("32m")
+#define ANSI_FG_YELLOW ANSI("33m")
+#define ANSI_FG_BLUE ANSI("34m")
+#define ANSI_FG_MAGENTA ANSI("35m")
+#define ANSI_FG_CYAN ANSI("36m")
+#define ANSI_FG_WHITE ANSI("37m")
+
+#define ANSI_FG_LIGHT_BLACK ANSI("90m")
+#define ANSI_FG_LIGHT_RED ANSI("91m")
+#define ANSI_FG_LIGHT_GREEN ANSI("92m")
+#define ANSI_FG_LIGHT_YELLOW ANSI("93m")
+#define ANSI_FG_LIGHT_BLUE ANSI("94m")
+#define ANSI_FG_LIGHT_MAGENTA ANSI("95m")
+#define ANSI_FG_LIGHT_CYAN ANSI("96m")
+#define ANSI_FG_LIGHT_WHITE ANSI("97m")
+
+#define ANSI_FG_8BIT(color) ANSI("38;5;" color "m")
+#define ANSI_FG_24BIT(color) ANSI("38;2;" color "m")
+
+#define ANSI_BG_DEFAULT ANSI("49m")
+
+#define ANSI_BG_BLACK ANSI("40m")
+#define ANSI_BG_RED ANSI("41m")
+#define ANSI_BG_GREEN ANSI("42m")
+#define ANSI_BG_YELLOW ANSI("43m")
+#define ANSI_BG_BLUE ANSI("44m")
+#define ANSI_BG_MAGENTA ANSI("45m")
+#define ANSI_BG_CYAN ANSI("46m")
+#define ANSI_BG_WHITE ANSI("47m")
+
+#define ANSI_BG_LIGHT_BLACK ANSI("100m")
+#define ANSI_BG_LIGHT_RED ANSI("101m")
+#define ANSI_BG_LIGHT_GREEN ANSI("102m")
+#define ANSI_BG_LIGHT_YELLOW ANSI("103m")
+#define ANSI_BG_LIGHT_BLUE ANSI("104m")
+#define ANSI_BG_LIGHT_MAGENTA ANSI("105m")
+#define ANSI_BG_LIGHT_CYAN ANSI("106m")
+#define ANSI_BG_LIGHT_WHITE ANSI("107m")
+
+#define ANSI_BG_8BIT(color) ANSI("48;5;" color "m")
+#define ANSI_BG_24BIT(color) ANSI("48;2;" color "m")
+
+#define NL ANSI_RESET "\n"
+#define RST ANSI_RESET
+#define SEP RST " "
+#define SEP_FG ANSI_FG_DEFAULT " "
+#define SEP_BG ANSI_BG_DEFAULT " "
+
+int main(int argc,char* args[])
+{
+	printf("===== ANSI debug =====\n");
+	printf("------- Styles -------\n");
+	printf("Style: "
+		   ANSI_BOLD_ON "Bold" SEP
+		   ANSI_UNDERSCORE_ON "Underscore" SEP
+		   ANSI_BLINK_ON "Blink" SEP
+		   ANSI_CROSSED_OUT_ON "Crossed-out" NL);
+
+	printf("\n---- 3/4-bit color ---\n");
+	printf("FG Color (normal): "
+		   ANSI_FG_BLACK "Black" SEP_FG
+		   ANSI_FG_RED "Red" SEP_FG
+		   ANSI_FG_GREEN "Green" SEP_FG
+		   ANSI_FG_YELLOW "Yellow" SEP_FG
+		   ANSI_FG_BLUE "Blue" SEP_FG
+		   ANSI_FG_MAGENTA "Magenta" SEP_FG
+		   ANSI_FG_CYAN "Cyan" SEP_FG
+		   ANSI_FG_WHITE "White" SEP_FG
+		   ANSI_FG_DEFAULT "Default" NL);
+	printf("FG Color (bright): "
+		   ANSI_FG_LIGHT_BLACK "Black" SEP_FG
+		   ANSI_FG_LIGHT_RED "Red" SEP_FG
+		   ANSI_FG_LIGHT_GREEN "Green" SEP_FG
+		   ANSI_FG_LIGHT_YELLOW "Yellow" SEP_FG
+		   ANSI_FG_LIGHT_BLUE "Blue" SEP_FG
+		   ANSI_FG_LIGHT_MAGENTA "Magenta" SEP_FG
+		   ANSI_FG_LIGHT_CYAN "Cyan" SEP_FG
+		   ANSI_FG_LIGHT_WHITE "White" SEP_FG
+		   ANSI_FG_DEFAULT "Default" NL);
+
+	printf("BG Color (normal): "
+		   ANSI_BG_BLACK "Black" SEP_BG
+		   ANSI_FG_BLACK // for contrast
+		   ANSI_BG_RED "Red" SEP_BG
+		   ANSI_BG_GREEN "Green" SEP_BG
+		   ANSI_BG_YELLOW "Yellow" SEP_BG
+		   ANSI_BG_BLUE "Blue" SEP_BG
+		   ANSI_BG_MAGENTA "Magenta" SEP_BG
+		   ANSI_BG_CYAN "Cyan" SEP_BG
+		   ANSI_BG_WHITE "White"
+		   ANSI_BG_DEFAULT ANSI_FG_DEFAULT " Default" NL);
+	printf("BG Color (bright): "
+		   ANSI_BG_LIGHT_BLACK "Black" SEP_BG
+		   ANSI_FG_BLACK // for contrast
+		   ANSI_BG_LIGHT_RED "Red" SEP_BG
+		   ANSI_BG_LIGHT_GREEN "Green" SEP_BG
+		   ANSI_BG_LIGHT_YELLOW "Yellow" SEP_BG
+		   ANSI_BG_LIGHT_BLUE "Blue" SEP_BG
+		   ANSI_BG_LIGHT_MAGENTA "Magenta" SEP_BG
+		   ANSI_BG_LIGHT_CYAN "Cyan" SEP_BG
+		   ANSI_BG_LIGHT_WHITE "White"
+		   ANSI_BG_DEFAULT ANSI_FG_DEFAULT " Default" NL);
+
+	printf("\n----- 8-bit color ----\n");
+	printf("FG Color (standard): ");
+	for(int i = 0; i < 8; i++) {
+		printf(ANSI_FG_8BIT("%d") "%d" SEP_FG, i, i);
+	}
+	printf("\n");
+	printf("FG Color (high-intensity): ");
+	for(int i = 8; i < 16; i++) {
+		printf(ANSI_FG_8BIT("%d") "%d" SEP_FG, i, i);
+	}
+	printf("\n");
+	printf("FG Color (216):");
+	for(int i = 16; i < 232; ) {
+		printf("\n    ");
+		for(int col = 0; col < 36; col++) {
+			printf(ANSI_FG_8BIT("%d") "%3d" SEP_FG, i, i);
+			i++;
+		}
+	}
+	printf("\n");
+	printf("FG Color (grayscale): ");
+	for(int i = 232; i < 256; i++) {
+		printf(ANSI_FG_8BIT("%d") "%3d" SEP_FG, i, i);
+	}
+	printf("\n");
+
+	printf("BG Color (standard): ");
+	for(int i = 0; i < 8; i++) {
+		printf(ANSI_BG_8BIT("%d") "%d" SEP_BG, i, i);
+	}
+	printf("\n");
+	printf("BG Color (high-intensity): ");
+	for(int i = 8; i < 16; i++) {
+		printf(ANSI_BG_8BIT("%d") "%d" SEP_BG, i, i);
+	}
+	printf("\n");
+	printf("BG Color (216):");
+	for(int i = 16; i < 232; ) {
+		printf("\n    ");
+		for(int col = 0; col < 36; col++) {
+			if(col >= 18)
+				printf(ANSI_FG_8BIT("232")); // using ANSI_FG_BLACK is an edge case
+			printf(ANSI_BG_8BIT("%d") "%3d" SEP, i, i);
+			i++;
+		}
+	}
+	printf("\n");
+	printf("BG Color (grayscale): ");
+	for(int i = 232; i < 256; i++) {
+		if(i >= 244)
+			printf(ANSI_FG_8BIT("232")); // using ANSI_FG_BLACK is an edge case
+		printf(ANSI_BG_8BIT("%d") "%3d" SEP, i, i);
+	}
+	printf("\n");
+
+	printf("\n----- 24-bit color ----\n");
+	char *rgb_colors[6] = {
+			"0;0;0",
+			"128;128;128",
+			"255;255;255",
+			"255;0;0",
+			"0;255;0",
+			"0;0;255",
+	};
+
+	printf("FG Color (RGB): ");
+	for(int i = 0; i < 6; ) {
+		printf("\n    ");
+		for(int col = 0; col < 16 && i < 6; col++) {
+			printf(ANSI_FG_24BIT("%s") "%11s" SEP_FG, rgb_colors[i], rgb_colors[i]);
+			i++;
+		}
+	}
+	printf("\n");
+
+	printf("BG Color (RGB): ");
+	for(int i = 0; i < 6; ) {
+		printf("\n    ");
+		for(int col = 0; col < 16 && i < 6; col++) {
+			printf(ANSI_BG_24BIT("%s") "%11s" SEP_BG, rgb_colors[i], rgb_colors[i]);
+			i++;
+		}
+	}
+	printf("\n");
+
+	printf("\n------ Edge cases -----\n");
+
+	printf("8-bit foreground (blueish), 3-bit background (red):\n");
+	printf("    " ANSI_FG_8BIT("63") ANSI_BG_RED "Edge case" NL);
+	printf("when --stylesheet is enabled, the foreground will be put in a style attribute, and the 3-bit background "
+		   "class will end up in that style attribute and not the class attribute\n");
+
+	return 0;
+}

From b9f55679796dc0744e27b88d9db3d2568b70418c Mon Sep 17 00:00:00 2001
From: Pierce Corcoran <code@thecodewarrior.dev>
Date: Tue, 8 Dec 2020 15:33:21 -0800
Subject: [PATCH 2/4] Replace `highlighted` with a proper 4-bit color table

---
 aha.c        | 193 +++++++++++++++++++++++----------------------------
 test_print.c | 124 +++++++++++++++++++++------------
 2 files changed, 166 insertions(+), 151 deletions(-)

diff --git a/aha.c b/aha.c
index a61fbbd..28a86b3 100644
--- a/aha.c
+++ b/aha.c
@@ -436,7 +436,7 @@ struct Options parseArgs(int argc, char* args[])
 }
 
 enum ColorMode {
-	MODE_3BIT,
+	MODE_4BIT,
 	MODE_8BIT,
 	MODE_24BIT
 };
@@ -450,17 +450,14 @@ struct State {
 	int crossedout;
 	enum ColorMode fc_colormode;
 	enum ColorMode bc_colormode;
-	int highlighted; //for fc AND bc although not correct...
-	int fc_highlighted;
-	int bc_highlighted;
 };
 
 void swapColors(struct State *const state) {
-	if (state->bc_colormode == MODE_3BIT && state->bc == -1)
-		state->bc = 8;
+	if (state->bc_colormode == MODE_4BIT && state->bc == -1)
+		state->bc = 16;
 
-	if (state->fc_colormode == MODE_3BIT && state->fc == -1)
-		state->fc = 9;
+	if (state->fc_colormode == MODE_4BIT && state->fc == -1)
+		state->fc = 17;
 
 	int temp = state->bc;
 	state->bc = state->fc;
@@ -480,11 +477,8 @@ const struct State default_state = {
 	.underline = 0,
 	.blink = 0,
 	.crossedout = 0,
-	.fc_colormode = MODE_3BIT,
-	.bc_colormode = MODE_3BIT,
-	.highlighted = 0,
-	.fc_highlighted = 0,
-	.bc_highlighted = 0,
+	.fc_colormode = MODE_4BIT,
+	.bc_colormode = MODE_4BIT,
 };
 
 int statesDiffer(const struct State *const old, const struct State *const new) {
@@ -497,17 +491,13 @@ int statesDiffer(const struct State *const old, const struct State *const new) {
 		(old->blink != new->blink) ||
 		(old->crossedout != new->crossedout) ||
 		(old->fc_colormode != new->fc_colormode) ||
-		(old->bc_colormode != new->bc_colormode) ||
-		(old->highlighted != new->highlighted) ||
-		(old->fc_highlighted != new->fc_highlighted) ||
-		(old->bc_highlighted != new->bc_highlighted);
+		(old->bc_colormode != new->bc_colormode);
 }
 
 struct ColorStyle {
 	char* fg_default;
 	char* bg_default;
-	char* colors[10];
-	char* bright_colors[10];
+	char* colors[18];
 };
 
 const struct ColorStyle styles[3] = {
@@ -523,10 +513,6 @@ const struct ColorStyle styles[3] = {
 			"purple", // Magenta
 			"teal", // Cyan
 			"gray", // White
-			"white", // Default Background
-			"black"  // Default Foreground
-		},
-		.bright_colors = {
 			"dimgray", // Bright Black
 			"red", // Bright Red
 			"green", // Bright Green
@@ -552,10 +538,6 @@ const struct ColorStyle styles[3] = {
 			"fuchsia", // Magenta
 			"aqua", // Cyan
 			"white", // White
-			"black", // Default Background
-			"white"  // Default Foreground
-		},
-		.bright_colors = {
 			"black", // Bright Black
 			"red", // Bright Red
 			"lime", // Bright Green
@@ -581,10 +563,6 @@ const struct ColorStyle styles[3] = {
 			"purple", // Magenta
 			"teal", // Cyan
 			"gray", // White
-			"pink", // Default Background
-			"black"  // Default Foreground
-		},
-		.bright_colors = {
 			"dimgray", // Bright Black
 			"red", // Bright Red
 			"green", // Bright Green
@@ -663,29 +641,46 @@ void printHeader(const struct Options *opts)
 		printf(".inverted    {color: %s;}\n", style.bg_default);
 		printf(".bg-inverted {background-color: %s;}\n", style.fg_default);
 
-		printf(".dimgray     {color: %s;}\n", style.colors[0]);
-		printf(".red         {color: %s;}\n", style.colors[1]);
-		printf(".green       {color: %s;}\n", style.colors[2]);
-		printf(".yellow      {color: %s;}\n", style.colors[3]);
-		printf(".blue        {color: %s;}\n", style.colors[4]);
-		printf(".purple      {color: %s;}\n", style.colors[5]);
-		printf(".cyan        {color: %s;}\n", style.colors[6]);
-		printf(".white       {color: %s;}\n", style.colors[7]);
-		printf(".bg-black    {background-color: %s;}\n", style.colors[0]);
-		printf(".bg-red      {background-color: %s;}\n", style.colors[1]);
-		printf(".bg-green    {background-color: %s;}\n", style.colors[2]);
-		printf(".bg-yellow   {background-color: %s;}\n", style.colors[3]);
-		printf(".bg-blue     {background-color: %s;}\n", style.colors[4]);
-		printf(".bg-purple   {background-color: %s;}\n", style.colors[5]);
-		printf(".bg-cyan     {background-color: %s;}\n", style.colors[6]);
-		printf(".bg-white    {background-color: %s;}\n", style.colors[7]);
+		printf(".dimgray {color: %s;}\n", style.colors[0]);
+		printf(".red     {color: %s;}\n", style.colors[1]);
+		printf(".green   {color: %s;}\n", style.colors[2]);
+		printf(".yellow  {color: %s;}\n", style.colors[3]);
+		printf(".blue    {color: %s;}\n", style.colors[4]);
+		printf(".purple  {color: %s;}\n", style.colors[5]);
+		printf(".cyan    {color: %s;}\n", style.colors[6]);
+		printf(".white   {color: %s;}\n", style.colors[7]);
+		printf(".dimgray.highlighted {color: %s;}\n", style.colors[8]);
+		printf(".red    .highlighted {color: %s;}\n", style.colors[9]);
+		printf(".green  .highlighted {color: %s;}\n", style.colors[10]);
+		printf(".yellow .highlighted {color: %s;}\n", style.colors[11]);
+		printf(".blue   .highlighted {color: %s;}\n", style.colors[12]);
+		printf(".purple .highlighted {color: %s;}\n", style.colors[13]);
+		printf(".cyan   .highlighted {color: %s;}\n", style.colors[14]);
+		printf(".white  .highlighted {color: %s;}\n", style.colors[15]);
+
+		printf(".bg-black  {background-color: %s;}\n", style.colors[0]);
+		printf(".bg-red    {background-color: %s;}\n", style.colors[1]);
+		printf(".bg-green  {background-color: %s;}\n", style.colors[2]);
+		printf(".bg-yellow {background-color: %s;}\n", style.colors[3]);
+		printf(".bg-blue   {background-color: %s;}\n", style.colors[4]);
+		printf(".bg-purple {background-color: %s;}\n", style.colors[5]);
+		printf(".bg-cyan   {background-color: %s;}\n", style.colors[6]);
+		printf(".bg-white  {background-color: %s;}\n", style.colors[7]);
+		printf(".bg-black .bg-highlighted {color: %s;}\n", style.colors[8]);
+		printf(".bg-red   .bg-highlighted {color: %s;}\n", style.colors[9]);
+		printf(".bg-green .bg-highlighted {color: %s;}\n", style.colors[10]);
+		printf(".bg-yellow.bg-highlighted {color: %s;}\n", style.colors[11]);
+		printf(".bg-blue  .bg-highlighted {color: %s;}\n", style.colors[12]);
+		printf(".bg-purple.bg-highlighted {color: %s;}\n", style.colors[13]);
+		printf(".bg-cyan  .bg-highlighted {color: %s;}\n", style.colors[14]);
+		printf(".bg-white .bg-highlighted {color: %s;}\n", style.colors[15]);
+
 
 		printf(".underline   {text-decoration: underline;}\n");
 		printf(".bold        {font-weight: bold;}\n");
 		printf(".italic      {font-style: italic;}\n");
 		printf(".blink       {text-decoration: blink;}\n");
 		printf(".crossed-out {text-decoration: line-through;}\n");
-		printf(".highlighted {filter: contrast(70%%) brightness(190%%);}\n");
 	}
 
 	if (opts->word_wrap)
@@ -728,7 +723,7 @@ int main(int argc,char* args[])
 
 	struct ColorStyle style = styles[opts.colorscheme];
 
-	char* fcclass[10] = {
+	char* fcclass[18] = {
 		"dimgray", // Black
 		"red", // Red
 		"green", // Green
@@ -737,11 +732,19 @@ int main(int argc,char* args[])
 		"purple", // Magenta
 		"cyan", // Cyan
 		"white", // White
+		"highlighted dimgray", // Bright Black
+		"highlighted red", // Bright Red
+		"highlighted green", // Bright Green
+		"highlighted yellow", // Bright Yellow
+		"highlighted blue", // Bright Blue
+		"highlighted purple", // Bright Magenta
+		"highlighted cyan", // Bright Cyan
+		"highlighted white", // Bright White
 		"inverted", // Default Background
 		"reset" // Default Foreground
 	};
 
-	char* bcclass[10] = {
+	char* bcclass[18] = {
 		"bg-black", // Black
 		"bg-red", // Red
 		"bg-green", // Green
@@ -750,6 +753,14 @@ int main(int argc,char* args[])
 		"bg-purple", // Magenta
 		"bg-cyan", // Cyan
 		"bg-white", // White
+		"bg-highlighted bg-black", // Bright Black
+		"bg-highlighted bg-red", // Bright Red
+		"bg-highlighted bg-green", // Bright Green
+		"bg-highlighted bg-yellow", // Bright Yellow
+		"bg-highlighted bg-blue", // Bright Blue
+		"bg-highlighted bg-purple", // Bright Magenta
+		"bg-highlighted bg-cyan", // Bright Cyan
+		"bg-highlighted bg-white", // Bright White
 		"bg-reset", // Default Background
 		"bg-inverted" // Default Foreground
 	};
@@ -878,16 +889,7 @@ int main(int argc,char* args[])
 										{
 											momelem = momelem->next->next;
 											state.fc_colormode = MODE_8BIT;
-											if (momelem->value >=8 && momelem->value <=15)
-											{
-												state.fc_highlighted = 1;
-												*dest = momelem->value-8;
-											}
-											else
-											{
-												state.fc_highlighted = 0;
-												*dest = momelem->value;
-											}
+											*dest = momelem->value;
 										}
 										else
 										if (momelem->value == 38 &&
@@ -905,7 +907,6 @@ int main(int argc,char* args[])
 											b = momelem;
 											if ( r && g && b )
 											{
-												state.fc_highlighted = 0;
 												state.fc_colormode = MODE_24BIT;
 												*dest =
 													(r->value & 255) * 65536 +
@@ -915,15 +916,13 @@ int main(int argc,char* args[])
 										}
 										else
 										{
-											state.fc_colormode = MODE_3BIT;
-											state.fc_highlighted = 0;
+											state.fc_colormode = MODE_4BIT;
 											*dest=momelem->value-30;
 										}
 									}
 									break;
 								case 39: // Set foreground color to default
-									state.fc_colormode = MODE_3BIT;
-									state.fc_highlighted = 0;
+									state.fc_colormode = MODE_4BIT;
 									state.fc = -1;
 									break;
 								case 40:
@@ -946,16 +945,7 @@ int main(int argc,char* args[])
 										{
 											momelem = momelem->next->next;
 											state.bc_colormode = MODE_8BIT;
-											if (momelem->value >=8 && momelem->value <=15)
-											{
-												state.bc_highlighted = 1;
-												*dest = momelem->value-8;
-											}
-											else
-											{
-												state.bc_highlighted = 0;
-												*dest = momelem->value;
-											}
+											*dest = momelem->value;
 										}
 										else
 										if (momelem->value == 48 &&
@@ -974,7 +964,6 @@ int main(int argc,char* args[])
 											if ( r && g && b )
 											{
 												state.bc_colormode = MODE_24BIT;
-												state.bc_highlighted = 0;
 												*dest =
 													(r->value & 255) * 65536 +
 													(g->value & 255) * 256 +
@@ -983,15 +972,13 @@ int main(int argc,char* args[])
 										}
 										else
 										{
-											state.bc_colormode = MODE_3BIT;
-											state.bc_highlighted = 0;
+											state.bc_colormode = MODE_4BIT;
 											*dest=momelem->value-40;
 										}
 									}
 									break;
 								case 49: // Set background color to default
-									state.bc_colormode = MODE_3BIT;
-									state.bc_highlighted = 0;
+									state.bc_colormode = MODE_4BIT;
 									state.bc = -1;
 									break;
 								case 90:
@@ -1006,9 +993,8 @@ int main(int argc,char* args[])
 										int *dest = &(state.fc);
 										if (negative != 0)
 											dest=&(state.bc);
-										state.fc_colormode = MODE_3BIT;
-										state.fc_highlighted = 1;
-										*dest=momelem->value-90;
+										state.fc_colormode = MODE_4BIT;
+										*dest=momelem->value-90+8;
 									}
 									break;
 
@@ -1024,9 +1010,8 @@ int main(int argc,char* args[])
 										int *dest = &(state.bc);
 										if (negative != 0)
 											dest=&(state.fc);
-										state.bc_colormode = MODE_3BIT;
-										state.bc_highlighted = 1;
-										*dest=momelem->value-100;
+										state.bc_colormode = MODE_4BIT;
+										*dest=momelem->value-100+8;
 									}
 									break;
 							}
@@ -1080,19 +1065,17 @@ int main(int argc,char* args[])
 								printf("blink ");
 							if(state.crossedout)
 								printf("crossed-out ");
-							if(state.fc_highlighted || state.bc_highlighted)
-								printf("highlighted ");
 
 							int needs_style = 0;
 							// classes first
 							switch (state.fc_colormode)
 							{
-								case MODE_3BIT:
-									if (state.fc>=0 && state.fc<=9)
+								case MODE_4BIT:
+									if (state.fc>=0 && state.fc<=17)
 										printf("%s ", fcclass[state.fc]);
 									break;
 								case MODE_8BIT:
-									if (state.fc>=0 && state.fc<=7)
+									if (state.fc>=0 && state.fc<=15)
 										printf("%s ", fcclass[state.fc]);
 									else
 										needs_style = 1;
@@ -1104,12 +1087,12 @@ int main(int argc,char* args[])
 
 							switch (state.bc_colormode)
 							{
-								case MODE_3BIT:
-									if (state.bc>=0 && state.bc<=9)
+								case MODE_4BIT:
+									if (state.bc>=0 && state.bc<=17)
 										printf("%s ", bcclass[state.bc]);
 									break;
 								case MODE_8BIT:
-									if (state.bc>=0 && state.bc<=7)
+									if (state.bc>=0 && state.bc<=15)
 										printf("%s ", bcclass[state.bc]);
 									else
 										needs_style = 1;
@@ -1126,10 +1109,10 @@ int main(int argc,char* args[])
 
 								switch (state.fc_colormode)
 								{
-									case MODE_3BIT:
+									case MODE_4BIT:
 										break;
 									case MODE_8BIT:
-										if (state.fc>=0 && state.fc<=7)
+										if (state.fc>=0 && state.fc<=15)
 											break;
 										char rgb[12];
 										make_rgb(state.fc,rgb);
@@ -1141,10 +1124,10 @@ int main(int argc,char* args[])
 								}
 								switch (state.bc_colormode)
 								{
-									case MODE_3BIT:
+									case MODE_4BIT:
 										break;
 									case MODE_8BIT:
-										if (state.bc>=0 && state.bc<=7)
+										if (state.bc>=0 && state.bc<=15)
 											break;
 										char rgb[12];
 										make_rgb(state.bc,rgb);
@@ -1168,17 +1151,15 @@ int main(int argc,char* args[])
 								printf("font-style:italic;");
 							if(state.blink)
 								printf("text-decoration:blink;");
-							if(state.fc_highlighted || state.bc_highlighted)
-								printf("filter: contrast(70%%) brightness(190%%);");
 
 							switch (state.fc_colormode)
 							{
-								case MODE_3BIT:
-									if (state.fc>=0 && state.fc<=9)
+								case MODE_4BIT:
+									if (state.fc>=0 && state.fc<=17)
 										printf("color:%s;", style.colors[state.fc]);
 									break;
 								case MODE_8BIT:
-									if (state.fc>=0 && state.fc<=7)
+									if (state.fc>=0 && state.fc<=15)
 										printf("color:%s;", style.colors[state.fc]);
 									else
 									{
@@ -1194,12 +1175,12 @@ int main(int argc,char* args[])
 
 							switch (state.bc_colormode)
 							{
-								case MODE_3BIT:
-									if (state.bc>=0 && state.bc<=9)
+								case MODE_4BIT:
+									if (state.bc>=0 && state.bc<=17)
 										printf("background-color:%s", style.colors[state.bc]);
 									break;
 								case MODE_8BIT:
-									if (state.bc>=0 && state.bc<=7)
+									if (state.bc>=0 && state.bc<=15)
 										printf("background-color:%s;", style.colors[state.bc]);
 									else
 									{
diff --git a/test_print.c b/test_print.c
index fa2842d..188aacb 100644
--- a/test_print.c
+++ b/test_print.c
@@ -3,12 +3,19 @@
 #define ANSI(str) "\x1b[" str
 
 #define ANSI_RESET ANSI("0m")
+
 #define ANSI_BOLD_ON ANSI("1m")
 #define ANSI_BOLD_OFF ANSI("22m")
+#define ANSI_FAINT_ON ANSI("2m")
+#define ANSI_FAINT_OFF ANSI("22m") // same as ANSI_BOLD_OFF
+#define ANSI_ITALIC_ON ANSI("3m")
+#define ANSI_ITALIC_OFF ANSI("23m")
 #define ANSI_UNDERSCORE_ON ANSI("4m")
 #define ANSI_UNDERSCORE_OFF ANSI("24m")
 #define ANSI_BLINK_ON ANSI("5m")
 #define ANSI_BLINK_OFF ANSI("25m")
+#define ANSI_INVERT_ON ANSI("7m")
+#define ANSI_INVERT_OFF ANSI("27m")
 #define ANSI_CROSSED_OUT_ON ANSI("9m")
 #define ANSI_CROSSED_OUT_OFF ANSI("29m")
 
@@ -64,18 +71,21 @@
 #define SEP_FG ANSI_FG_DEFAULT " "
 #define SEP_BG ANSI_BG_DEFAULT " "
 
-int main(int argc,char* args[])
-{
-	printf("===== ANSI debug =====\n");
-	printf("------- Styles -------\n");
+int main(int argc, char *args[]) {
+	printf(ANSI_BOLD_ON "===== ANSI debug =====\n" RST);
+	printf(ANSI_BOLD_ON "------- Styles -------\n" RST);
 	printf("Style: "
-		   ANSI_BOLD_ON "Bold" SEP
-		   ANSI_UNDERSCORE_ON "Underscore" SEP
-		   ANSI_BLINK_ON "Blink" SEP
-		   ANSI_CROSSED_OUT_ON "Crossed-out" NL);
+		   ANSI_BOLD_ON "Bold" ANSI_BOLD_OFF " "
+		   ANSI_ITALIC_ON "Italic" ANSI_ITALIC_OFF " "
+		   ANSI_UNDERSCORE_ON "Underscore" ANSI_UNDERSCORE_OFF " "
+		   ANSI_BLINK_ON "Blink" ANSI_BLINK_OFF " "
+		   ANSI_INVERT_ON "Invert" ANSI_INVERT_OFF " "
+		   ANSI_CROSSED_OUT_ON "Crossed-out" ANSI_CROSSED_OUT_OFF
+		   "\n");
+
+	printf(ANSI_BOLD_ON "\n---- 3/4-bit color ---\n" RST);
 
-	printf("\n---- 3/4-bit color ---\n");
-	printf("FG Color (normal): "
+	printf(ANSI_BOLD_ON "FG Color (normal): " RST
 		   ANSI_FG_BLACK "Black" SEP_FG
 		   ANSI_FG_RED "Red" SEP_FG
 		   ANSI_FG_GREEN "Green" SEP_FG
@@ -85,7 +95,7 @@ int main(int argc,char* args[])
 		   ANSI_FG_CYAN "Cyan" SEP_FG
 		   ANSI_FG_WHITE "White" SEP_FG
 		   ANSI_FG_DEFAULT "Default" NL);
-	printf("FG Color (bright): "
+	printf(ANSI_BOLD_ON "FG Color (bright): " RST
 		   ANSI_FG_LIGHT_BLACK "Black" SEP_FG
 		   ANSI_FG_LIGHT_RED "Red" SEP_FG
 		   ANSI_FG_LIGHT_GREEN "Green" SEP_FG
@@ -96,7 +106,7 @@ int main(int argc,char* args[])
 		   ANSI_FG_LIGHT_WHITE "White" SEP_FG
 		   ANSI_FG_DEFAULT "Default" NL);
 
-	printf("BG Color (normal): "
+	printf(ANSI_BOLD_ON "BG Color (normal): " RST
 		   ANSI_BG_BLACK "Black" SEP_BG
 		   ANSI_FG_BLACK // for contrast
 		   ANSI_BG_RED "Red" SEP_BG
@@ -107,7 +117,7 @@ int main(int argc,char* args[])
 		   ANSI_BG_CYAN "Cyan" SEP_BG
 		   ANSI_BG_WHITE "White"
 		   ANSI_BG_DEFAULT ANSI_FG_DEFAULT " Default" NL);
-	printf("BG Color (bright): "
+	printf(ANSI_BOLD_ON "BG Color (bright): " RST
 		   ANSI_BG_LIGHT_BLACK "Black" SEP_BG
 		   ANSI_FG_BLACK // for contrast
 		   ANSI_BG_LIGHT_RED "Red" SEP_BG
@@ -119,62 +129,62 @@ int main(int argc,char* args[])
 		   ANSI_BG_LIGHT_WHITE "White"
 		   ANSI_BG_DEFAULT ANSI_FG_DEFAULT " Default" NL);
 
-	printf("\n----- 8-bit color ----\n");
-	printf("FG Color (standard): ");
-	for(int i = 0; i < 8; i++) {
+	printf(ANSI_BOLD_ON "\n----- 8-bit color ----\n" RST);
+	printf(ANSI_BOLD_ON "FG Color (standard): " RST);
+	for (int i = 0; i < 8; i++) {
 		printf(ANSI_FG_8BIT("%d") "%d" SEP_FG, i, i);
 	}
 	printf("\n");
-	printf("FG Color (high-intensity): ");
-	for(int i = 8; i < 16; i++) {
+	printf(ANSI_BOLD_ON "FG Color (high-intensity): " RST);
+	for (int i = 8; i < 16; i++) {
 		printf(ANSI_FG_8BIT("%d") "%d" SEP_FG, i, i);
 	}
 	printf("\n");
-	printf("FG Color (216):");
-	for(int i = 16; i < 232; ) {
+	printf(ANSI_BOLD_ON "FG Color (216):" RST);
+	for (int i = 16; i < 232;) {
 		printf("\n    ");
-		for(int col = 0; col < 36; col++) {
+		for (int col = 0; col < 36; col++) {
 			printf(ANSI_FG_8BIT("%d") "%3d" SEP_FG, i, i);
 			i++;
 		}
 	}
 	printf("\n");
-	printf("FG Color (grayscale): ");
-	for(int i = 232; i < 256; i++) {
+	printf(ANSI_BOLD_ON "FG Color (grayscale): " RST);
+	for (int i = 232; i < 256; i++) {
 		printf(ANSI_FG_8BIT("%d") "%3d" SEP_FG, i, i);
 	}
 	printf("\n");
 
-	printf("BG Color (standard): ");
-	for(int i = 0; i < 8; i++) {
+	printf(ANSI_BOLD_ON "BG Color (standard): " RST);
+	for (int i = 0; i < 8; i++) {
 		printf(ANSI_BG_8BIT("%d") "%d" SEP_BG, i, i);
 	}
 	printf("\n");
-	printf("BG Color (high-intensity): ");
-	for(int i = 8; i < 16; i++) {
+	printf(ANSI_BOLD_ON "BG Color (high-intensity): " RST);
+	for (int i = 8; i < 16; i++) {
 		printf(ANSI_BG_8BIT("%d") "%d" SEP_BG, i, i);
 	}
 	printf("\n");
-	printf("BG Color (216):");
-	for(int i = 16; i < 232; ) {
+	printf(ANSI_BOLD_ON "BG Color (216):" RST);
+	for (int i = 16; i < 232;) {
 		printf("\n    ");
-		for(int col = 0; col < 36; col++) {
-			if(col >= 18)
+		for (int col = 0; col < 36; col++) {
+			if (col >= 18)
 				printf(ANSI_FG_8BIT("232")); // using ANSI_FG_BLACK is an edge case
 			printf(ANSI_BG_8BIT("%d") "%3d" SEP, i, i);
 			i++;
 		}
 	}
 	printf("\n");
-	printf("BG Color (grayscale): ");
-	for(int i = 232; i < 256; i++) {
-		if(i >= 244)
+	printf(ANSI_BOLD_ON "BG Color (grayscale): " RST);
+	for (int i = 232; i < 256; i++) {
+		if (i >= 244)
 			printf(ANSI_FG_8BIT("232")); // using ANSI_FG_BLACK is an edge case
 		printf(ANSI_BG_8BIT("%d") "%3d" SEP, i, i);
 	}
 	printf("\n");
 
-	printf("\n----- 24-bit color ----\n");
+	printf(ANSI_BOLD_ON "\n----- 24-bit color ----\n" RST);
 	char *rgb_colors[6] = {
 			"0;0;0",
 			"128;128;128",
@@ -184,32 +194,56 @@ int main(int argc,char* args[])
 			"0;0;255",
 	};
 
-	printf("FG Color (RGB): ");
-	for(int i = 0; i < 6; ) {
+	printf(ANSI_BOLD_ON "FG Color (RGB): " RST);
+	for (int i = 0; i < 6;) {
 		printf("\n    ");
-		for(int col = 0; col < 16 && i < 6; col++) {
+		for (int col = 0; col < 16 && i < 6; col++) {
 			printf(ANSI_FG_24BIT("%s") "%11s" SEP_FG, rgb_colors[i], rgb_colors[i]);
 			i++;
 		}
 	}
 	printf("\n");
 
-	printf("BG Color (RGB): ");
-	for(int i = 0; i < 6; ) {
+	printf(ANSI_BOLD_ON "BG Color (RGB): " RST);
+	for (int i = 0; i < 6;) {
 		printf("\n    ");
-		for(int col = 0; col < 16 && i < 6; col++) {
+		for (int col = 0; col < 16 && i < 6; col++) {
 			printf(ANSI_BG_24BIT("%s") "%11s" SEP_BG, rgb_colors[i], rgb_colors[i]);
 			i++;
 		}
 	}
 	printf("\n");
 
-	printf("\n------ Edge cases -----\n");
+	printf(ANSI_BOLD_ON "\n------- Special ------\n" RST);
+	printf(ANSI_BOLD_ON "Inverted (3-bit): " RST
+		   ANSI_FG_RED ANSI_BG_GREEN "Red on green "
+		   ANSI_INVERT_ON "Green on red" NL);
+	printf(ANSI_BOLD_ON "Inverted (8-bit): " RST
+		   ANSI_FG_8BIT("40") ANSI_BG_8BIT("170") "Green on pink"
+		   ANSI_INVERT_ON "Pink on green" NL);
+	printf(ANSI_BOLD_ON "Inverted (24-bit): " RST
+		   ANSI_FG_24BIT("160;32;240") ANSI_BG_24BIT("111;240;31") "Purple on green "
+		   ANSI_INVERT_ON "Green on purple" NL);
+
+	printf(ANSI_BOLD_ON "\n------ Edge cases -----\n" RST);
 
-	printf("8-bit foreground (blueish), 3-bit background (red):\n");
+	printf(ANSI_BOLD_ON "8-bit foreground (blueish), 3-bit background (red):\n" RST);
 	printf("    " ANSI_FG_8BIT("63") ANSI_BG_RED "Edge case" NL);
-	printf("when --stylesheet is enabled, the foreground will be put in a style attribute, and the 3-bit background "
-		   "class will end up in that style attribute and not the class attribute\n");
+	printf("    (when --stylesheet is enabled, the foreground will be put in a style attribute, and the 3-bit "
+		   "background class will end up in that style attribute and not the class attribute)\n");
+	printf(ANSI_BOLD_ON "Double-invert: " RST
+		   ANSI_FG_RED ANSI_BG_GREEN "Red on green "
+		   ANSI_INVERT_ON "Green on red "
+		   ANSI_INVERT_ON "Still green on red" NL);
+	printf(ANSI_BOLD_ON "Inverted (mixed 8/3-bit): " RST
+		   ANSI_FG_8BIT("92") ANSI_BG_GREEN "Purple on green "
+		   ANSI_INVERT_ON "Green on purple" NL);
+	printf(ANSI_BOLD_ON "Inverted (mixed 24/3-bit): " RST
+		   ANSI_FG_GREEN ANSI_BG_24BIT("160;32;240") "Green on purple"
+		   ANSI_INVERT_ON "Purple on green" NL);
+	printf(ANSI_BOLD_ON "Inverted (mixed 24/8-bit): " RST
+		   ANSI_FG_24BIT("160;32;240") ANSI_BG_8BIT("40") "Purple on green "
+		   ANSI_INVERT_ON "Green on purple" NL);
 
 	return 0;
 }

From 48f0ecd4653cb12416186f716238c35ae8fe69c6 Mon Sep 17 00:00:00 2001
From: Pierce Corcoran <code@thecodewarrior.dev>
Date: Tue, 8 Dec 2020 17:59:20 -0800
Subject: [PATCH 3/4] Add --colors command line option

---
 aha.1 |  10 ++
 aha.c | 317 +++++++++++++++++++++++++++++++---------------------------
 2 files changed, 179 insertions(+), 148 deletions(-)

diff --git a/aha.1 b/aha.1
index 290c7e0..a957484 100644
--- a/aha.1
+++ b/aha.1
@@ -21,6 +21,10 @@ The options are as follows:
 .Bl -tag -width Ds
 .It Fl b , Fl Fl black
 Style HTML output to use a black background with white text.
+.It Fl Fl colors
+Style HTML output to use a black background with white text.
+Set a custom color scheme. X must be a comma-separated list of 18 CSS colors representing the default colors and all 16 4-bit color codes:
+"foreground, background, black, red, green, yellow, blue, magenta, cyan, white, (+ bright versions of those eight)"
 .It Fl c Ar file , Fl Fl css Ar file
 Adds the given css
 .Ar file
@@ -96,6 +100,12 @@ Create an HTML file with a white background using the output of
 .Pp
 .Dl $ diff -u --color=always oldfile.c newfile.c | aha > diff.html
 .Pp
+Create an HTML file with a white foreground, blue background, and mapping every 4-bit color code to red using
+.Nm Ap s
+help:
+.Pp
+.Dl $ aha -h | aha --colors '#fff,#00f,red,red,red,red,red,red,red,red,red,red,red,red,red,red,red,red' > aha-help.html
+.Pp
 Create an HTML file with a black background from the output of
 .Xr htop 1 .
 You have to use option
diff --git a/aha.c b/aha.c
index 28a86b3..581e40b 100644
--- a/aha.c
+++ b/aha.c
@@ -148,6 +148,63 @@ void deleteParse(pelem elem)
 	}
 }
 
+typedef struct ColorScheme_t {
+	char* fg_default;
+	char* bg_default;
+	char* colors[18]; // last two elements are fg, bg
+	char* data;
+} ColorScheme;
+
+ColorScheme *parseColorScheme(const char* text)
+{
+	ColorScheme *scheme = malloc(sizeof(struct ColorScheme_t));
+	scheme->data = strdup(text);
+	int i = -2;
+
+	char *token = scheme->data;
+	while(1)
+	{
+		if(i == 16) // too many elements
+		{
+			free(scheme->data);
+			free(scheme);
+			return NULL;
+		}
+
+		if(i == -2)
+			scheme->fg_default = token;
+		else if(i == -1)
+			scheme->bg_default = token;
+		else
+			scheme->colors[i] = token;
+
+		i++;
+
+		token += strcspn(token, ",");
+		if(*token != 0)
+			*token++ = 0; // insert null terminator
+		else
+			break; // we're at the end of the string
+	}
+	if(i < 16) // too few elements
+	{
+		free(scheme->data);
+		free(scheme);
+		return NULL;
+	}
+
+	scheme->colors[16] = scheme->fg_default;
+	scheme->colors[17] = scheme->bg_default;
+
+	return scheme;
+}
+
+void deleteColorScheme(ColorScheme *style)
+{
+	free(style->data);
+	free(style);
+}
+
 void printHtml(char *text) {
 	while(1) {
 		switch(*text) {
@@ -165,14 +222,8 @@ void printHtml(char *text) {
 	}
 }
 
-enum ColorScheme {
-	SCHEME_WHITE,
-	SCHEME_BLACK,
-	SCHEME_PINK
-};
-
 struct Options {
-	enum ColorScheme colorscheme;
+	ColorScheme *scheme;
 	char* filename;
 	FILE *fp;
 	int htop_fix;
@@ -235,10 +286,34 @@ void make_rgb (int color_id, char str_rgb[12]){
 #define VERSION_PRINTF_MAKRO \
 	printf("\033[1;31mAnsi Html Adapter\033[0m Version "AHA_VERSION"\n");
 
+const char* white_scheme =
+		// Foreground, background
+		"black,white,"
+		// Black, red, green, yellow, blue, magenta, cyan, white
+		"dimgray,red,green,olive,blue,purple,teal,gray,"
+		// Bright black, red, green, yellow, blue, magenta, cyan, white
+		"dimgray,red,green,olive,blue,purple,cyan,white";
+
+const char* black_scheme =
+		// Foreground, background
+		"white,black,"
+		// Black, red, green, yellow, blue, magenta, cyan, white
+		"black,red,lime,yellow,#3333FF,fuchsia,aqua,white,"
+		// Bright black, red, green, yellow, blue, magenta, cyan, white
+		"black,red,lime,yellow,#3333FF,fuchsia,aqua,white";
+
+const char* pink_scheme =
+		// Foreground, background
+		"black,pink,"
+		// Black, red, green, yellow, blue, magenta, cyan, white
+		"dimgray,red,green,olive,blue,purple,teal,gray,"
+		// Bright black, red, green, yellow, blue, magenta, cyan, white
+		"dimgray,red,green,olive,blue,purple,cyan,white";
+
 struct Options parseArgs(int argc, char* args[])
 {
 	struct Options opts = (struct Options){
-		.colorscheme = SCHEME_WHITE,
+		.scheme = parseColorScheme(white_scheme),
 		.filename = NULL,
 		.fp = stdin,
 		.htop_fix = 0,
@@ -267,6 +342,11 @@ struct Options parseArgs(int argc, char* args[])
 			printf("\033[4mOptions\033[0m:\n");
 			printf("      --black,       -b: \033[1;30m\033[1;47mBlack\033[0m Background and \033[1;37mWhite\033[0m \"standard color\"\n");
 			printf("      --pink,        -p: \033[1;35mPink\033[0m Background\n");
+			printf("      --colors X       : Set a custom color scheme. X must be a comma-separated\n");
+			printf("                         list of 18 CSS colors representing the default colors\n");
+			printf("                         and all 16 4-bit color codes: \"\033[1mforeground,background,\n");
+			printf("                         black,red,green,yellow,blue,magenta,cyan,white,\n");
+			printf("                         (+ bright versions of those eight)\033[0m\"\n");
 			printf("      --style X,   -y X: Set the style used in the <body> element\n");
 			printf("      --stylesheet,  -s: Use a stylesheet instead of inline styles\n");
 			printf("      --iso X,     -i X: Uses ISO 8859-X instead of utf-8. X must be 1..16\n");
@@ -297,6 +377,12 @@ struct Options parseArgs(int argc, char* args[])
 			printf("\n");
 			printf("            \033[1;3;33m$\033[0m diff -u --color=always oldfile.c newfile.c | \033[1maha\033[0m > diff.html\n");
 			printf("\n");
+			printf("          Create an HTML file with a white foreground, blue background, and\n");
+			printf("          mapping every 4-bit color code to red using \033[1maha\033[0m's help:\n");
+			printf("\n");
+			printf("            \033[1;3;33m$\033[0m \033[1maha\033[0m -h | \033[1maha\033[0m --colors \"#fff,#00f,red,red,red,red,red,red,red,\\\n");
+			printf("              red,red,red,red,red,red,red,red,red\" > \033[1maha\033[0m-help.html\n");
+			printf("\n");
 			printf("          Create an HTML file with a black background from the output of \033[3mhtop\033[0m.\n");
 			printf("          You have to use option -l due the other new-line-commands \033[3mhtop\033[0m uses:\n");
 			printf("\n");
@@ -345,10 +431,33 @@ struct Options parseArgs(int argc, char* args[])
 			opts.word_wrap=1;
 		else
 		if ((strcmp(args[p],"--black")==0) || (strcmp(args[p],"-b")==0))
-			opts.colorscheme=SCHEME_BLACK;
+		{
+			deleteColorScheme(opts.scheme);
+			opts.scheme = parseColorScheme(black_scheme);
+		}
 		else
 		if ((strcmp(args[p],"--pink")==0) || (strcmp(args[p],"-p")==0))
-			opts.colorscheme=SCHEME_PINK;
+		{
+			deleteColorScheme(opts.scheme);
+			opts.scheme = parseColorScheme(pink_scheme);
+		}
+		else
+		if ((strcmp(args[p],"--colors")==0))
+		{
+			if (p+1>=argc)
+			{
+				fprintf(stderr,"No colors given!\n");
+				exit(EXIT_FAILURE);
+			}
+			deleteColorScheme(opts.scheme);
+			opts.scheme = parseColorScheme(args[p + 1]);
+			if (opts.scheme == NULL)
+			{
+				fprintf(stderr,"Invalid color scheme '%s'. Scheme must be exactly 18 comma-separated values.\n", args[p+1]);
+				exit(EXIT_FAILURE);
+			}
+			p++;
+		}
 		else
 		if ((strcmp(args[p],"--stylesheet")==0) || (strcmp(args[p],"-s")==0))
 			opts.stylesheet=1;
@@ -454,10 +563,10 @@ struct State {
 
 void swapColors(struct State *const state) {
 	if (state->bc_colormode == MODE_4BIT && state->bc == -1)
-		state->bc = 16;
+		state->bc = 17;
 
 	if (state->fc_colormode == MODE_4BIT && state->fc == -1)
-		state->fc = 17;
+		state->fc = 16;
 
 	int temp = state->bc;
 	state->bc = state->fc;
@@ -494,89 +603,6 @@ int statesDiffer(const struct State *const old, const struct State *const new) {
 		(old->bc_colormode != new->bc_colormode);
 }
 
-struct ColorStyle {
-	char* fg_default;
-	char* bg_default;
-	char* colors[18];
-};
-
-const struct ColorStyle styles[3] = {
-	{ // SCHEME_WHITE
-		.fg_default = "black",
-		.bg_default = "white",
-		.colors = {
-			"dimgray", // Black
-			"red", // Red
-			"green", // Green
-			"olive", // Yellow
-			"blue", // Blue
-			"purple", // Magenta
-			"teal", // Cyan
-			"gray", // White
-			"dimgray", // Bright Black
-			"red", // Bright Red
-			"green", // Bright Green
-			"olive", // Bright Yellow
-			"blue", // Bright Blue
-			"purple", // Bright Magenta
-			"cyan", // Bright Cyan
-			"white", // Bright White
-			"white", // Default Background
-			"black"  // Default Foreground
-		}
-	},
-
-	{ // SCHEME_BLACK
-		.fg_default = "white",
-		.bg_default = "black",
-		.colors = {
-			"black", // Black
-			"red", // Red
-			"lime", // Green
-			"yellow", // Yellow
-			"#3333FF", // Blue
-			"fuchsia", // Magenta
-			"aqua", // Cyan
-			"white", // White
-			"black", // Bright Black
-			"red", // Bright Red
-			"lime", // Bright Green
-			"yellow", // Bright Yellow
-			"#3333FF", // Bright Blue
-			"fuchsia", // Bright Magenta
-			"aqua", // Bright Cyan
-			"white", // Bright White
-			"black", // Default Background
-			"white"  // Default Foreground
-		}
-	},
-
-	{ // SCHEME_PINK
-		.fg_default = "black",
-		.bg_default = "pink",
-		.colors = {
-			"dimgray", // Black
-			"red", // Red
-			"green", // Green
-			"olive", // Yellow
-			"blue", // Blue
-			"purple", // Magenta
-			"teal", // Cyan
-			"gray", // White
-			"dimgray", // Bright Black
-			"red", // Bright Red
-			"green", // Bright Green
-			"olive", // Bright Yellow
-			"blue", // Bright Blue
-			"purple", // Bright Magenta
-			"cyan", // Bright Cyan
-			"white", // Bright White
-			"pink", // Default Background
-			"black"  // Default Foreground
-		}
-	}
-};
-
 void printHeader(const struct Options *opts)
 {
 	char encoding[16] = "UTF-8";
@@ -626,54 +652,51 @@ void printHeader(const struct Options *opts)
 		printf("\">\n");
 	}
 
-	struct ColorStyle style = styles[opts->colorscheme];
-
 	int style_tag = 0;
 	if (opts->stylesheet)
 	{
 		printf("<style type=\"text/css\">\n");
 		style_tag = 1;
 
-
-		printf("body         {color: %s; background-color: %s;}\n", style.fg_default, style.bg_default);
-		printf(".reset       {color: %s;}\n", style.fg_default);
-		printf(".bg-reset    {background-color: %s;}\n", style.bg_default);
-		printf(".inverted    {color: %s;}\n", style.bg_default);
-		printf(".bg-inverted {background-color: %s;}\n", style.fg_default);
-
-		printf(".dimgray {color: %s;}\n", style.colors[0]);
-		printf(".red     {color: %s;}\n", style.colors[1]);
-		printf(".green   {color: %s;}\n", style.colors[2]);
-		printf(".yellow  {color: %s;}\n", style.colors[3]);
-		printf(".blue    {color: %s;}\n", style.colors[4]);
-		printf(".purple  {color: %s;}\n", style.colors[5]);
-		printf(".cyan    {color: %s;}\n", style.colors[6]);
-		printf(".white   {color: %s;}\n", style.colors[7]);
-		printf(".dimgray.highlighted {color: %s;}\n", style.colors[8]);
-		printf(".red    .highlighted {color: %s;}\n", style.colors[9]);
-		printf(".green  .highlighted {color: %s;}\n", style.colors[10]);
-		printf(".yellow .highlighted {color: %s;}\n", style.colors[11]);
-		printf(".blue   .highlighted {color: %s;}\n", style.colors[12]);
-		printf(".purple .highlighted {color: %s;}\n", style.colors[13]);
-		printf(".cyan   .highlighted {color: %s;}\n", style.colors[14]);
-		printf(".white  .highlighted {color: %s;}\n", style.colors[15]);
-
-		printf(".bg-black  {background-color: %s;}\n", style.colors[0]);
-		printf(".bg-red    {background-color: %s;}\n", style.colors[1]);
-		printf(".bg-green  {background-color: %s;}\n", style.colors[2]);
-		printf(".bg-yellow {background-color: %s;}\n", style.colors[3]);
-		printf(".bg-blue   {background-color: %s;}\n", style.colors[4]);
-		printf(".bg-purple {background-color: %s;}\n", style.colors[5]);
-		printf(".bg-cyan   {background-color: %s;}\n", style.colors[6]);
-		printf(".bg-white  {background-color: %s;}\n", style.colors[7]);
-		printf(".bg-black .bg-highlighted {color: %s;}\n", style.colors[8]);
-		printf(".bg-red   .bg-highlighted {color: %s;}\n", style.colors[9]);
-		printf(".bg-green .bg-highlighted {color: %s;}\n", style.colors[10]);
-		printf(".bg-yellow.bg-highlighted {color: %s;}\n", style.colors[11]);
-		printf(".bg-blue  .bg-highlighted {color: %s;}\n", style.colors[12]);
-		printf(".bg-purple.bg-highlighted {color: %s;}\n", style.colors[13]);
-		printf(".bg-cyan  .bg-highlighted {color: %s;}\n", style.colors[14]);
-		printf(".bg-white .bg-highlighted {color: %s;}\n", style.colors[15]);
+		printf("body         {color: %s; background-color: %s;}\n", opts->scheme->fg_default, opts->scheme->bg_default);
+		printf(".reset       {color: %s;}\n", opts->scheme->fg_default);
+		printf(".bg-reset    {background-color: %s;}\n", opts->scheme->bg_default);
+		printf(".inverted    {color: %s;}\n", opts->scheme->bg_default);
+		printf(".bg-inverted {background-color: %s;}\n", opts->scheme->fg_default);
+
+		printf(".dimgray {color: %s;}\n", opts->scheme->colors[0]);
+		printf(".red     {color: %s;}\n", opts->scheme->colors[1]);
+		printf(".green   {color: %s;}\n", opts->scheme->colors[2]);
+		printf(".yellow  {color: %s;}\n", opts->scheme->colors[3]);
+		printf(".blue    {color: %s;}\n", opts->scheme->colors[4]);
+		printf(".purple  {color: %s;}\n", opts->scheme->colors[5]);
+		printf(".cyan    {color: %s;}\n", opts->scheme->colors[6]);
+		printf(".white   {color: %s;}\n", opts->scheme->colors[7]);
+		printf(".dimgray.highlighted {color: %s;}\n", opts->scheme->colors[8]);
+		printf(".red.highlighted     {color: %s;}\n", opts->scheme->colors[9]);
+		printf(".green.highlighted   {color: %s;}\n", opts->scheme->colors[10]);
+		printf(".yellow.highlighted  {color: %s;}\n", opts->scheme->colors[11]);
+		printf(".blue.highlighted    {color: %s;}\n", opts->scheme->colors[12]);
+		printf(".purple.highlighted  {color: %s;}\n", opts->scheme->colors[13]);
+		printf(".cyan.highlighted    {color: %s;}\n", opts->scheme->colors[14]);
+		printf(".white.highlighted   {color: %s;}\n", opts->scheme->colors[15]);
+
+		printf(".bg-black  {background-color: %s;}\n", opts->scheme->colors[0]);
+		printf(".bg-red    {background-color: %s;}\n", opts->scheme->colors[1]);
+		printf(".bg-green  {background-color: %s;}\n", opts->scheme->colors[2]);
+		printf(".bg-yellow {background-color: %s;}\n", opts->scheme->colors[3]);
+		printf(".bg-blue   {background-color: %s;}\n", opts->scheme->colors[4]);
+		printf(".bg-purple {background-color: %s;}\n", opts->scheme->colors[5]);
+		printf(".bg-cyan   {background-color: %s;}\n", opts->scheme->colors[6]);
+		printf(".bg-white  {background-color: %s;}\n", opts->scheme->colors[7]);
+		printf(".bg-black.bg-highlighted  {background-color: %s;}\n", opts->scheme->colors[8]);
+		printf(".bg-red.bg-highlighted    {background-color: %s;}\n", opts->scheme->colors[9]);
+		printf(".bg-green.bg-highlighted  {background-color: %s;}\n", opts->scheme->colors[10]);
+		printf(".bg-yellow.bg-highlighted {background-color: %s;}\n", opts->scheme->colors[11]);
+		printf(".bg-blue.bg-highlighted   {background-color: %s;}\n", opts->scheme->colors[12]);
+		printf(".bg-purple.bg-highlighted {background-color: %s;}\n", opts->scheme->colors[13]);
+		printf(".bg-cyan.bg-highlighted   {background-color: %s;}\n", opts->scheme->colors[14]);
+		printf(".bg-white.bg-highlighted  {background-color: %s;}\n", opts->scheme->colors[15]);
 
 
 		printf(".underline   {text-decoration: underline;}\n");
@@ -705,7 +728,7 @@ void printHeader(const struct Options *opts)
 	else
 	{
 		printf("<body");
-		printf(" style=\"color: %s; background-color: %s;", style.fg_default, style.bg_default);
+		printf(" style=\"color: %s; background-color: %s;", opts->scheme->fg_default, opts->scheme->bg_default);
 		if(opts->bodystyle) {
 			printHtml(opts->bodystyle);
 		}
@@ -721,8 +744,6 @@ int main(int argc,char* args[])
 	struct Options opts = parseArgs(argc, args);
 	register FILE* fp = opts.fp;
 
-	struct ColorStyle style = styles[opts.colorscheme];
-
 	char* fcclass[18] = {
 		"dimgray", // Black
 		"red", // Red
@@ -740,8 +761,8 @@ int main(int argc,char* args[])
 		"highlighted purple", // Bright Magenta
 		"highlighted cyan", // Bright Cyan
 		"highlighted white", // Bright White
-		"inverted", // Default Background
-		"reset" // Default Foreground
+		"reset", // Default Foreground
+		"inverted" // Default Background
 	};
 
 	char* bcclass[18] = {
@@ -761,8 +782,8 @@ int main(int argc,char* args[])
 		"bg-highlighted bg-purple", // Bright Magenta
 		"bg-highlighted bg-cyan", // Bright Cyan
 		"bg-highlighted bg-white", // Bright White
-		"bg-reset", // Default Background
-		"bg-inverted" // Default Foreground
+		"bg-inverted", // Default Foreground
+		"bg-reset" // Default Background
 	};
 
 	if (!opts.no_header)
@@ -1156,11 +1177,11 @@ int main(int argc,char* args[])
 							{
 								case MODE_4BIT:
 									if (state.fc>=0 && state.fc<=17)
-										printf("color:%s;", style.colors[state.fc]);
+										printf("color:%s;", opts.scheme->colors[state.fc]);
 									break;
 								case MODE_8BIT:
 									if (state.fc>=0 && state.fc<=15)
-										printf("color:%s;", style.colors[state.fc]);
+										printf("color:%s;", opts.scheme->colors[state.fc]);
 									else
 									{
 										char rgb[12];
@@ -1177,11 +1198,11 @@ int main(int argc,char* args[])
 							{
 								case MODE_4BIT:
 									if (state.bc>=0 && state.bc<=17)
-										printf("background-color:%s", style.colors[state.bc]);
+										printf("background-color:%s", opts.scheme->colors[state.bc]);
 									break;
 								case MODE_8BIT:
 									if (state.bc>=0 && state.bc<=15)
-										printf("background-color:%s;", style.colors[state.bc]);
+										printf("background-color:%s;", opts.scheme->colors[state.bc]);
 									else
 									{
 										char rgb[12];

From 0763154534bd0f54ce0baf9f83efb7c3b6800076 Mon Sep 17 00:00:00 2001
From: Pierce Corcoran <code@thecodewarrior.dev>
Date: Fri, 11 Dec 2020 09:15:11 -0800
Subject: [PATCH 4/4] Fix crossed-out not applying to inline styles

---
 aha.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aha.c b/aha.c
index 581e40b..6601c22 100644
--- a/aha.c
+++ b/aha.c
@@ -1172,6 +1172,8 @@ int main(int argc,char* args[])
 								printf("font-style:italic;");
 							if(state.blink)
 								printf("text-decoration:blink;");
+							if(state.crossedout)
+								printf("text-decoration: line-through;");
 
 							switch (state.fc_colormode)
 							{