From 1c9bf825a0a8fe6ed14dc6887288c574a7e7a1a5 Mon Sep 17 00:00:00 2001
From: Jasper Van der Jeugt <m@jaspervdj.be>
Date: Sat, 25 Aug 2018 15:37:05 +0200
Subject: [PATCH] Tweak documentation and tests for RGB support

---
 CHANGELOG.md         |  3 +++
 README.md            | 10 ++++++----
 stack.yaml           |  2 +-
 tests/themes.md      |  5 +++--
 tests/themes.md.dump |  4 ++--
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab57bc6..eaa9674 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+- master
+    * Add RGB colour support for themes (contribution by Hamza Haiken)
+
 - 0.7.2.0 (2018-05-08)
     * GHC 8.4 compatibility
 
diff --git a/README.md b/README.md
index be17de6..218382e 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Features:
 - Supports [smart slide splitting](#input-format).
 - Slides can be split up into [multiple fragments](#fragmented-slides)
 - There is a [live reload](#running) mode.
-- [Theming](#theming) support.
+- [Theming](#theming) support including 24-bit RGB.
 - [Auto advancing](#auto-advancing) with configurable delay.
 - Optionally [re-wrapping](#line-wrapping) text to terminal width with proper
   indentation.
@@ -410,9 +410,11 @@ The accepted styles are:
 `vividBlue`, `vividCyan`, `vividGreen`, `vividMagenta`, `vividRed`,
 `vividWhite`, `vividYellow`
 
-Also accepted are:
-
-`rgb#RrGgBb`, `onRgb#RrGgBb`, where `Rr` `Gg` and `Bb` are hexadecimal bytes (e.g. `rgb#f08000` for orange).
+Also accepted are styles of the form `rgb#RrGgBb` and `onRgb#RrGgBb`, where `Rr`
+`Gg` and `Bb` are hexadecimal bytes (e.g. `rgb#f08000` for an orange foreground,
+and `onRgb#101060` for a deep purple background).  Naturally, your terminal
+needs to support 24-bit RGB for this to work.  When creating portable
+presentations, it might be better to stick with the named colours listed above.
 
 ### Syntax Highlighting
 
diff --git a/stack.yaml b/stack.yaml
index 7e870ae..1d3602f 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: nightly-2018-05-06
+resolver: lts-11.7
 packages:
 - '.'
 flags:
diff --git a/tests/themes.md b/tests/themes.md
index d74f645..ca2958c 100644
--- a/tests/themes.md
+++ b/tests/themes.md
@@ -2,10 +2,11 @@
 patat:
   theme:
     bulletListMarkers: '-+'
-    emph: [onRgb#ff8800, underline]
+    emph: [onVividRed, underline]
+    strong: [rgb#f08000, onRgb#101060]
 ...
 
 - This is a simple list.
     * With _nested_ items.
-    * One or two.
+    * One or two **bold**.
 - The list theming is customized a bit.
diff --git a/tests/themes.md.dump b/tests/themes.md.dump
index 5a042fd..f68c671 100644
--- a/tests/themes.md.dump
+++ b/tests/themes.md.dump
@@ -1,5 +1,5 @@
   - This is a simple list.
-      + With nested items.
-      + One or two.
+      + With nested items.
+      + One or two bold.
 
   - The list theming is customized a bit.