From fa31f912a07bb9727174897b7fb2f819ccebc9e7 Mon Sep 17 00:00:00 2001
From: Jan Marvin Garbuszus <jan.garbuszus@rub.de>
Date: Tue, 15 Aug 2023 23:22:51 +0200
Subject: [PATCH] more work on colors for fills, fonts and borders

---
 src/xlsb.cpp    | 40 ++++++++++++++++++++++++++++++++++++----
 src/xlsb_funs.h | 19 +++++++++++++++++--
 2 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/src/xlsb.cpp b/src/xlsb.cpp
index 26c1ef358..5050e9e9a 100644
--- a/src/xlsb.cpp
+++ b/src/xlsb.cpp
@@ -169,7 +169,14 @@ int styles_bin(std::string filePath, std::string outPath, bool debug) {
         }
 
         if (color[0] == 0x03) {
-          out << "<color theme=\"" << color[1] << "\" />" << std::endl;
+
+          double tint = 0.0;
+          if (color[2] != 0) tint = (double)color[2]/32767;
+
+          std::stringstream stream;
+          stream << std::setprecision(16) << tint;
+
+          out << "<color theme=\"" << color[1] << "\" tint=\"" << stream.str() << "\" />";
         }
 
         if (color[1])
@@ -278,8 +285,33 @@ int styles_bin(std::string filePath, std::string outPath, bool debug) {
           if (fls == 18) out << "gray0625";
           out << "\">" << std::endl;
           // if FF000000 & FFFFFFFF they can be omitted
-          out << "<fgColor rgb=\"" << to_argb(fgColor[6], fgColor[3], fgColor[4], fgColor[5]) << std::dec << "\" />" << std::endl;
-          out << "<bgColor rgb=\"" << to_argb(bgColor[6], bgColor[3], bgColor[4], bgColor[5]) << std::dec << "\" />" << std::endl;
+
+          double bgtint = 0.0, fgtint = 0.0;
+          if (bgColor[2] != 0) bgtint = (double)bgColor[2]/32767;
+          if (fgColor[2] != 0) fgtint = (double)fgColor[2]/32767;
+
+          std::stringstream bgstream, fgstream;
+          bgstream << std::setprecision(16) << bgtint;
+          fgstream << std::setprecision(16) << fgtint;
+
+          if (fgColor[0] == 0x00)
+            out << "<fgColor auto=\"1\" />" << std::endl;
+          if (fgColor[0] == 0x01)
+            out << "<fgColor indexed=\"" << fgColor[1] << "\" />";
+          if (fgColor[0] == 0x02)
+            out << "<fgColor rgb=\"" << to_argb(fgColor[6], fgColor[3], fgColor[4], fgColor[5]) << "\" />";
+          if (fgColor[0] == 0x03)
+            out << "<fgColor theme=\"" << fgColor[1] << "\" tint=\"" << fgstream.str() << "\" />";
+
+          if (bgColor[0] == 0x00)
+            out << "<bgColor auto=\"1\" />" << std::endl;
+          if (bgColor[0] == 0x01)
+            out << "<bgColor indexed=\"" << bgColor[1] << "\" />";
+          if (bgColor[0] == 0x02)
+            out << "<bgColor rgb=\"" << to_argb(bgColor[6], bgColor[3], bgColor[4], bgColor[5]) << "\" />";
+          if (bgColor[0] == 0x03)
+            out << "<bgColor theme=\"" << bgColor[1] << "\" tint=\"" << fgstream.str() << "\" />";
+
           out << "</patternFill>" << std::endl;
           out << "</fill>" << std::endl;
         } else {
@@ -2307,7 +2339,7 @@ int worksheet_bin(std::string filePath, bool chartsheet, std::string outPath, bo
         out << "<col" << " min=\"" << colFirst << "\" max =\"" << colLast << "\"";
 
         if (ixfe > 0)
-          out << " s=\"" <<  ixfe << "\"";
+          out << " style=\"" <<  ixfe << "\"";
 
         out << " width=\"" <<  (double)coldx/256 << "\"";
         if (fields->fHidden)
diff --git a/src/xlsb_funs.h b/src/xlsb_funs.h
index de6871fda..b60321ea1 100644
--- a/src/xlsb_funs.h
+++ b/src/xlsb_funs.h
@@ -811,8 +811,23 @@ std::string brtBorder(std::string type, std::istream& sas, bool swapit) {
 
   out << "<" << type << " style = \"" << as_border_style(dg) << "\"";
   if (dg > 0) {
-    out << "><color hex=\"" << to_argb(color[6], color[3], color[4], color[5]) << "\" />";
-        out << "</" << type << ">" << std::endl;
+
+    double tint = 0.0;
+    if (color[2] != 0) tint = (double)color[2]/32767;
+
+    std::stringstream stream;
+    stream << std::setprecision(16) << tint;
+
+    if (color[0] == 0x00)
+      out << "><color auto=\"1\" />" << std::endl;
+    if (color[0] == 0x01)
+      out << "><color indexed=\"" << color[1] << "\" />";
+    if (color[0] == 0x02)
+      out << "><color hex=\"" << to_argb(color[6], color[3], color[4], color[5]) << "\" />";
+    if (color[0] == 0x03)
+      out << "><color theme=\"" << color[1] << "\" tint=\"" << stream.str() << "\" />";
+
+    out << "</" << type << ">" << std::endl;
   } else {
     out << "/>" << std::endl;
   }