1 files changed, 32 insertions, 25 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 1722bba5..7982d57b 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -714,18 +714,26 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
             set_Color(tmBannerIcon_ColorId, get_Color(orange_ColorId));
         }
         else if (theme == colorfulLight_GmDocumentTheme) {
-            const iHSLColor base = { 190, 1.0f, 0.35f, 1.0f };
+            const iHSLColor base = addSatLum_HSLColor(get_HSLColor(teal_ColorId), -0.3f, 0.5f);
             setHsl_Color(tmBackground_ColorId, base);
             set_Color(tmParagraph_ColorId, get_Color(black_ColorId));
             set_Color(tmFirstParagraph_ColorId, get_Color(black_ColorId));
-            setHsl_Color(tmQuote_ColorId, addSatLum_HSLColor(base, 0, -0.2f));
+            setHsl_Color(tmQuote_ColorId, addSatLum_HSLColor(base, 0, -0.25f));
             setHsl_Color(tmPreformatted_ColorId, addSatLum_HSLColor(base, 0, -0.3f));
             set_Color(tmHeading1_ColorId, get_Color(white_ColorId));
-            set_Color(tmHeading2_ColorId, mix_Color(get_Color(tmBackground_ColorId), get_Color(white_ColorId), 0.85f));
-            set_Color(tmHeading3_ColorId, mix_Color(get_Color(tmBackground_ColorId), get_Color(white_ColorId), 0.75f));
-            setHsl_Color(tmBannerBackground_ColorId, base);
+            set_Color(tmHeading2_ColorId, mix_Color(get_Color(tmBackground_ColorId), get_Color(black_ColorId), 0.67f));
+            set_Color(tmHeading3_ColorId, mix_Color(get_Color(tmBackground_ColorId), get_Color(black_ColorId), 0.55f));
+            setHsl_Color(tmBannerBackground_ColorId, addSatLum_HSLColor(base, 0, -0.1f));
             setHsl_Color(tmBannerIcon_ColorId, addSatLum_HSLColor(base, 0, -0.2f));
             setHsl_Color(tmBannerTitle_ColorId, addSatLum_HSLColor(base, 0, -0.2f));
+            setHsl_Color(tmLinkIcon_ColorId, addSatLum_HSLColor(get_HSLColor(teal_ColorId), 0, 0.15f));
+            set_Color(tmLinkIconVisited_ColorId, mix_Color(get_Color(tmBackground_ColorId), get_Color(teal_ColorId), 0.35f));
+            set_Color(tmLinkDomain_ColorId, get_Color(teal_ColorId));
+            setHsl_Color(tmHypertextLinkIcon_ColorId, get_HSLColor(white_ColorId));
+            set_Color(tmHypertextLinkIconVisited_ColorId, mix_Color(get_Color(tmBackground_ColorId), get_Color(white_ColorId), 0.5f));
+            set_Color(tmHypertextLinkDomain_ColorId, get_Color(brown_ColorId));
+            setHsl_Color(tmGopherLinkIcon_ColorId, addSatLum_HSLColor(get_HSLColor(tmGopherLinkIcon_ColorId), 0, -0.25f));
+            setHsl_Color(tmGopherLinkTextHover_ColorId, addSatLum_HSLColor(get_HSLColor(tmGopherLinkTextHover_ColorId), 0, -0.3f));
         }
         else if (theme == black_GmDocumentTheme) {
             set_Color(tmBackground_ColorId, get_Color(black_ColorId));
@@ -828,8 +836,6 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
             pink_Hue
         };
         static const float hues[]    = { 5, 25, 40, 56, 80, 120, 160, 180, 208, 231, 270, 324 };
-        static const float normLum[] = { 0.65f, 0.5f, 0.4f, 0.45f, 0.35f, 0.45f,
-                                         0.35f, 0.35f, 0.55f, 0.7f, 0.7f, 0.65f };
         static const struct {
             int index[2];
         } altHues[iElemCount(hues)] = {
@@ -856,8 +862,9 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
         const iBool isDarkBgSat =
             (d->themeSeed & 0x200000) != 0 && (primIndex < 1 || primIndex > 4);
 
-        //            printf("background: %d %f %f\n", (int) base.hue, base.sat, base.lum);
-        //            printf("isDarkBgSat: %d\n", isDarkBgSat);
+        static const float normLum[] = { 0.8f, 0.7f, 0.675f, 0.65f, 0.55f,
+                                         0.6f, 0.475f, 0.475f, 0.75f, 0.8f,
+                                         0.85f, 0.85f };
 
         if (theme == colorfulDark_GmDocumentTheme) {
             iHSLColor base    = { hues[primIndex],
@@ -903,29 +910,29 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
             set_Color(tmInlineContentMetadata_ColorId, get_Color(tmHeading3_ColorId));
         }
         else if (theme == colorfulLight_GmDocumentTheme) {
+//            static int primIndex = 0;
+//            primIndex = (primIndex + 1) % iElemCount(hues);
             iHSLColor base = { hues[primIndex], 1.0f, normLum[primIndex], 1.0f };
-            printf("prim:%d norm:%f\n", primIndex, normLum[primIndex]); fflush(stdout);
-            if (primIndex == 1) {
-                base.sat -= 0.1f;
-            }
-            if (primIndex == 0 || primIndex == 3 || primIndex == 5 || primIndex == 11) {
-                base.sat -= 0.25f;
-            }
-            if (primIndex == 3) {
-                base.sat -= 0.2f;
-            }
-            base.sat *= 0.8f;
+//            printf("prim:%d norm:%f\n", primIndex, normLum[primIndex]); fflush(stdout);
+            static const float normSat[] = {
+                0.85f, 0.9f, 1, 0.65f, 0.65f,
+                0.65f, 0.9f, 0.9f, 1, 0.9f,
+                1, 0.75f
+            };
+            iBool darkHeadings = iTrue;
+            base.sat *= normSat[primIndex] * 0.8f;
             setHsl_Color(tmBackground_ColorId, base);
             set_Color(tmParagraph_ColorId, get_Color(black_ColorId));
             set_Color(tmFirstParagraph_ColorId, get_Color(black_ColorId));
-            setHsl_Color(tmQuote_ColorId, addSatLum_HSLColor(base, 0, -base.lum * 0.5f));
-            setHsl_Color(tmPreformatted_ColorId, addSatLum_HSLColor(base, 0, -base.lum * 0.67f));
+            setHsl_Color(tmQuote_ColorId, addSatLum_HSLColor(base, 0, -base.lum * 0.67f));
+            setHsl_Color(tmPreformatted_ColorId, addSatLum_HSLColor(base, 0, -base.lum * 0.75f));
             set_Color(tmHeading1_ColorId, get_Color(white_ColorId));
-            set_Color(tmHeading2_ColorId, mix_Color(get_Color(tmBackground_ColorId), get_Color(white_ColorId), 0.85f));
-            set_Color(tmHeading3_ColorId, mix_Color(get_Color(tmBackground_ColorId), get_Color(white_ColorId), 0.75f));
+            set_Color(tmHeading2_ColorId, mix_Color(get_Color(tmBackground_ColorId), get_Color(darkHeadings ? black_ColorId : white_ColorId), 0.7f));
+            set_Color(tmHeading3_ColorId, mix_Color(get_Color(tmBackground_ColorId), get_Color(darkHeadings ? black_ColorId : white_ColorId), 0.6f));
             setHsl_Color(tmBannerBackground_ColorId, addSatLum_HSLColor(base, 0, -0.04f));
             setHsl_Color(tmBannerIcon_ColorId, addSatLum_HSLColor(base, 0, -0.3f));
             setHsl_Color(tmBannerTitle_ColorId, addSatLum_HSLColor(base, 0, -0.25f));
+            set_Color(tmLinkIconVisited_ColorId, mix_Color(get_Color(tmBackground_ColorId), get_Color(teal_ColorId), 0.3f));
         }
         else if (theme == white_GmDocumentTheme) {
             iHSLColor base    = { hues[primIndex], 1.0f, 0.3f, 1.0f };
@@ -950,7 +957,7 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
             const float primHue        = hues[primIndex];
             const iHSLColor primBright = { primHue, 1, 0.6f, 1 };
             const iHSLColor primDim    = { primHue, 1, dimLightness_(primHue, theme == black_GmDocumentTheme ? 0.25f : 0.45f), 1};
-            const iHSLColor altBright  = { altHue, 1, 0.6f, 1 };
+            const iHSLColor altBright  = { altHue, 1, normLum[altIndex[0]] + (theme == gray_GmDocumentTheme ? 0.1f : 0.0f), 1 };
             setHsl_Color(tmQuote_ColorId, altBright);
             setHsl_Color(tmPreformatted_ColorId, altBright);
             setHsl_Color(tmHeading1_ColorId, primBright);