From 6ec11c31d247b7da71fe4c0525cec510f2d3c1a1 Mon Sep 17 00:00:00 2001
From: Jason Fox <jason.fox@fiware.org>
Date: Tue, 26 May 2026 07:40:27 +0200
Subject: [PATCH] Add color contrast

---
 build_dita2html5-bootstrap_template.xml | 31 +++++++++++++++++++++++++
 css/bootswatch-colors.css               | 10 ++++++++
 css/bootswatch-static.css               | 10 ++++++++
 css/common-bootstrap.css                |  6 -----
 4 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 css/bootswatch-colors.css
 create mode 100644 css/bootswatch-static.css

diff --git a/build_dita2html5-bootstrap_template.xml b/build_dita2html5-bootstrap_template.xml
index 82163771..a93c2a90 100644
--- a/build_dita2html5-bootstrap_template.xml
+++ b/build_dita2html5-bootstrap_template.xml
@@ -21,6 +21,37 @@
       value="${dita.plugin.org.dita-bootstrap.html.dir}/css/"
     />
 
+    <!-- Add DITA colors with bootswatch overrides as necessary -->
+
+    <condition
+      property="dita-bootstrap.bootswatch.css.file"
+      value="${dita-bootstrap.css.dir}/bootswatch-static.css"
+    >
+      <or>
+        <equals arg1="${bootstrap.theme}" arg2="cyborg"/>
+        <equals arg1="${bootstrap.theme}" arg2="darkly"/>
+        <equals arg1="${bootstrap.theme}" arg2="slate"/>
+        <equals arg1="${bootstrap.theme}" arg2="solar"/>
+        <equals arg1="${bootstrap.theme}" arg2="vapor"/>
+      </or>
+    </condition>
+    <property
+      name="dita-bootstrap.bootswatch.css.file"
+      value="${dita-bootstrap.css.dir}/bootswatch-colors.css"
+    />
+
+    <loadfile
+      property="dita-bootstrap.bootswatch.css"
+      srcFile="${dita-bootstrap.bootswatch.css.file}"
+    />
+    <echo
+      append="true"
+      message="${line.separator}${dita-bootstrap.bootswatch.css}"
+      if:set="dita-bootstrap.css.add"
+      file="${extend.css.file}"
+    />
+
+
     <!-- Add Common CSS where Bootstrap variables override DITA-OT defaults -->
     <loadfile
       property="dita-bootstrap.css"
diff --git a/css/bootswatch-colors.css b/css/bootswatch-colors.css
new file mode 100644
index 00000000..252a4573
--- /dev/null
+++ b/css/bootswatch-colors.css
@@ -0,0 +1,10 @@
+/*!
+ *  This file is part of the DITA Bootstrap plug-in for DITA Open Toolkit.
+ *  See the accompanying LICENSE file for applicable licenses.
+ */
+
+:root {
+  --dita-prussian-blue: var(--bs-primary-text-emphasis);
+  --dita-maroon: var(--bs-danger-text-emphasis);
+  --dita-violet: var(--bs-purple);
+}
diff --git a/css/bootswatch-static.css b/css/bootswatch-static.css
new file mode 100644
index 00000000..97bdbb77
--- /dev/null
+++ b/css/bootswatch-static.css
@@ -0,0 +1,10 @@
+/*!
+ *  This file is part of the DITA Bootstrap plug-in for DITA Open Toolkit.
+ *  See the accompanying LICENSE file for applicable licenses.
+ */
+
+:root {
+  --dita-prussian-blue: #6a91cf;
+  --dita-violet: #cc99cd;
+  --dita-maroon: #ff7676;
+}
diff --git a/css/common-bootstrap.css b/css/common-bootstrap.css
index 7a0d5256..6e29dafd 100644
--- a/css/common-bootstrap.css
+++ b/css/common-bootstrap.css
@@ -3,12 +3,6 @@
  *  See the accompanying LICENSE file for applicable licenses.
  */
 
-:root {
-  --dita-prussian-blue: var(--bs-primary-text-emphasis);
-  --dita-maroon: var(--bs-danger-text-emphasis);
-  --dita-violet: var(--bs-purple);
-}
-
 .list-group-item.active,
 .nav-link.active,
 [data-bs-theme='dark'] {