X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FColor.cpp;h=25dfc2cc00b7979e050badec068e0b2889b6a81a;hb=8524ee93c35ed3ca15a0aaafa7b893f2f7d21f47;hp=125321c1de1ca6937a2c8dabf61c9a67dd7f3613;hpb=5008ee540f84715cd10e87f3fa0cd5dc7b974784;p=lyx.git

diff --git a/src/Color.cpp b/src/Color.cpp
index 125321c1de..25dfc2cc00 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -22,29 +22,202 @@
 #include "support/lstrings.h"
 
 #include <map>
+#include <cmath>
+#include <sstream>
+#include <iomanip>
 
 
-namespace lyx {
+#ifndef CXX_GLOBAL_CSTD
+using std::floor;
+#endif
 
-using support::compare_ascii_no_case;
-using support::ascii_lowercase;
+using std::max;
+using std::min;
+using std::setw;
 
-using std::endl;
+using std::istringstream;
+using std::ostringstream;
 using std::string;
+using std::endl;
+
+using lyx::support::compare_ascii_no_case;
+using lyx::support::ascii_lowercase;
 
 
 namespace {
 
 struct ColorEntry {
-	Color::color lcolor;
+	lyx::Color::color lcolor;
 	char const * guiname;
 	char const * latexname;
 	char const * x11name;
 	char const * lyxname;
 };
 
+int const nohue = -1;
+
+int hexstrToInt(string const & str)
+{
+	int val = 0;
+	istringstream is(str);
+	is >> std::setbase(16) >> val;
+	return val;
+}
+
+} // namespace anon
+
+
+
+namespace lyx {
+
+
+/////////////////////////////////////////////////////////////////////
+//
+// RGBColor
+//
+/////////////////////////////////////////////////////////////////////
+
+
+string const X11hexname(RGBColor const & col)
+{
+	ostringstream ostr;
+
+	ostr << '#' << std::setbase(16) << std::setfill('0')
+	     << setw(2) << col.r
+	     << setw(2) << col.g
+	     << setw(2) << col.b;
+
+	return ostr.str();
 }
 
+
+RGBColor::RGBColor(string const & x11hexname)
+	: r(0), g(0), b(0)
+{
+	BOOST_ASSERT(x11hexname.size() == 7 && x11hexname[0] == '#');
+	r = hexstrToInt(x11hexname.substr(1,2));
+	g = hexstrToInt(x11hexname.substr(3,2));
+	b = hexstrToInt(x11hexname.substr(5,2));
+}
+
+
+RGBColor::RGBColor(HSVColor const & hsv)
+{
+	double h = hsv.h;
+	double const s = hsv.s;
+	double const v = hsv.v;
+
+	double rd, gd, bd;
+
+	if (h == nohue || s == 0.0) {
+		rd = gd = bd = v;
+	} else {
+		if (h == 360.0) h = 0.0;
+		h /= 60.0;
+
+		int const j = max(0, static_cast<int>(::floor(h)));
+		//if (j < 0) j = 0;
+
+		double const f = h - j;
+		double const p = v * (1.0 - s);
+		double const q = v * (1.0 - (s * f));
+		double const t = v * (1.0 - (s * (1.0 - f)));
+
+		switch (j) {
+		case 0:
+			rd = v;
+			gd = t;
+			bd = p;
+			break;
+		case 1:
+			rd = q;
+			gd = v;
+			bd = p;
+			break;
+		case 2:
+			rd = p;
+			gd = v;
+			bd = t;
+			break;
+		case 3:
+			rd = p;
+			gd = q;
+			bd = v;
+			break;
+		case 4:
+			rd = t;
+			gd = p;
+			bd = v;
+			break;
+		case 5:
+			rd = v;
+			gd = p;
+			bd = q;
+			break;
+		default:
+			rd = v;
+			gd = t;
+			bd = p;
+			break;  // should never happen.
+		}
+	}
+
+	r = static_cast<int>(::floor((rd * 255.0) + 0.5));
+	g = static_cast<int>(::floor((gd * 255.0) + 0.5));
+	b = static_cast<int>(::floor((bd * 255.0) + 0.5));
+}
+
+
+/////////////////////////////////////////////////////////////////////
+//
+// HSVColor
+//
+/////////////////////////////////////////////////////////////////////
+
+HSVColor::HSVColor(RGBColor const & rgb)
+{
+	double const r = rgb.r / 255.0;
+	double const g = rgb.g / 255.0;
+	double const b = rgb.b / 255.0;
+
+	double const maxval = max(max(r, g), b);
+	double const minval = min(min(r, g), b);
+
+	v = maxval;
+
+	double const diff = maxval - minval;
+	if (maxval != 0.0)
+		s = diff / maxval;
+	else
+		s = 0.0;
+
+	h = nohue;
+	if (s != 0.0) {
+		double const rc = (maxval - r) / diff;
+		double const gc = (maxval - g) / diff;
+		double const bc = (maxval - b) / diff;
+
+		if (r == maxval)
+			h = bc - gc;
+		else if (g == maxval)
+			h = 2.0 + rc - bc;
+		else if (b == maxval)
+			h = 4.0 + gc - rc;
+
+		h *= 60.0;
+		if (h < 0)
+			h += 360;
+	}
+}
+
+
+
+/////////////////////////////////////////////////////////////////////
+//
+// Color::Pimpl
+//
+/////////////////////////////////////////////////////////////////////
+
 class Color::Pimpl {
 public:
 	///
@@ -125,6 +298,7 @@ Color::Color()
 	{ graphicsbg, N_("graphics background"), "graphicsbg", "linen", "graphicsbg" },
 	{ mathmacrobg, N_("Math macro background"), "mathmacrobg", "linen", "mathmacrobg" },
 	{ mathframe, N_("math frame"), "mathframe", "Magenta", "mathframe" },
+	{ mathcorners, N_("math corners"), "mathcorners", "linen", "mathcorners" },
 	{ mathline, N_("math line"), "mathline", "Blue", "mathline" },
 	{ captionframe, N_("caption frame"), "captionframe", "DarkRed", "captionframe" },
 	{ collapsable, N_("collapsable inset text"), "collapsable", "DarkRed", "collapsable" },
@@ -135,12 +309,11 @@ Color::Color()
 	{ eolmarker, N_("end-of-line marker"), "eolmarker", "Brown", "eolmarker" },
 	{ appendix, N_("appendix marker"), "appendix", "Brown", "appendix" },
 	{ changebar, N_("change bar"), "changebar", "Blue", "changebar" },
-	{ strikeout, N_("Deleted text"), "strikeout", "Red", "strikeout" },
-	{ newtext, N_("Added text"), "newtext", "Blue", "newtext" },
+	{ deletedtext, N_("Deleted text"), "deletedtext", "#ff0000", "deletedtext" },
+	{ addedtext, N_("Added text"), "addedtext", "#0000ff", "addedtext" },
 	{ added_space, N_("added space markers"), "added_space", "Brown", "added_space" },
 	{ topline, N_("top/bottom line"), "topline", "Brown", "topline" },
-	{ tabularline, N_("table line"), "tabularline", "black",
-	     "tabularline" },
+	{ tabularline, N_("table line"), "tabularline", "black", "tabularline" },
 	{ tabularonoffline, N_("table on/off line"), "tabularonoffline",
 	     "LightSteelBlue", "tabularonoffline" },
 	{ bottomarea, N_("bottom area"), "bottomarea", "grey40", "bottomarea" },