extras/source/palettes/standard.soc |  240 ++++++++++++++++++------------------
 1 file changed, 123 insertions(+), 117 deletions(-)

New commits:
commit bbde6eeae5c0ca5e106eec53dc7882361897a616
Author: heiko tietze <tietze.he...@gmail.com>
Date:   Tue Jan 30 09:26:03 2018 +0100

    tdf#114719 RYB based color palette
    
    Base colors Red, Yellow, Blue / Orange, Green, Purple /
    Magenta, Indigo, Teal, Lime, Gold, Brick;
    Hues and shades modified with Gossett & Chen algorithm
    
    Change-Id: I71facf3b143bb8c922a84075df03ec00f7c55b6b
    Reviewed-on: https://gerrit.libreoffice.org/48887
    Reviewed-by: V Stuart Foote <vstuart.fo...@utsa.edu>
    Reviewed-by: Heiko Tietze <tietze.he...@gmail.com>
    Tested-by: Heiko Tietze <tietze.he...@gmail.com>

diff --git a/extras/source/palettes/standard.soc 
b/extras/source/palettes/standard.soc
index fa4c9bc9a013..9e61e89ac4dc 100644
--- a/extras/source/palettes/standard.soc
+++ b/extras/source/palettes/standard.soc
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <office:color-table xmlns:office="http://openoffice.org/2000/office"; 
xmlns:style="http://openoffice.org/2000/style"; 
xmlns:text="http://openoffice.org/2000/text"; 
xmlns:table="http://openoffice.org/2000/table"; 
xmlns:draw="http://openoffice.org/2000/drawing"; 
xmlns:fo="http://www.w3.org/1999/XSL/Format"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="http://openoffice.org/2000/meta"; 
xmlns:number="http://openoffice.org/2000/datastyle"; 
xmlns:svg="http://www.w3.org/2000/svg"; 
xmlns:chart="http://openoffice.org/2000/chart"; 
xmlns:dr3d="http://openoffice.org/2000/dr3d"; 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="http://openoffice.org/2000/form"; 
xmlns:script="http://openoffice.org/2000/script";>
-  <!-- RYB color wheel palette 
https://bug-attachments.documentfoundation.org/attachment.cgi?id=111095 
(tdf#87538) -->
-  
+  <!-- vsf 2018-01-09, using dave eddy <bahamas10> implementation of Gossett & 
Chen algorithm https://bahamas10.github.io/ryb/about.html -->
+  <!-- regenerated a RYB => RGB sequence for the RYB Hues at: 0, tints at 191, 
153, 115, 77 and shades at -51, -102, -153, -204 -->
+  <!-- Color naming RYB Hues: primary: Red, Yellow, Blue; secondary: Orange, 
Green, Purple; tertiary: Magenta, Indigo, Teal, Lime, Gold, Brick as found 
https://en.wikipedia.org/wiki/Tertiary_color -->
+
   <!-- Gray palette from black to white -->
   <draw:color draw:name="Black" draw:color="#000000"/>
   <draw:color draw:name="Dark Gray 4" draw:color="#111111"/>
@@ -16,126 +18,130 @@
   <draw:color draw:name="Light Gray 5" draw:color="#eeeeee"/>
   <draw:color draw:name="White" draw:color="#ffffff"/>
 
-  <!-- Base colors -->
+  <!-- Base hues -->
+  <!-- 0 brightness -->
+  <draw:color draw:name="Yellow" draw:color="#ffff00"/>
+  <draw:color draw:name="Gold" draw:color="#ffbf00"/>
+  <draw:color draw:name="Orange" draw:color="#ff8000"/>
+  <draw:color draw:name="Brick" draw:color="#ff4000"/>
+  <draw:color draw:name="Red" draw:color="#ff0000"/>
+  <draw:color draw:name="Magenta" draw:color="#bf0041"/>
+  <draw:color draw:name="Purple" draw:color="#800080"/>
+  <draw:color draw:name="Indigo" draw:color="#55308d"/>
+  <draw:color draw:name="Blue" draw:color="#2a6099"/>
+  <draw:color draw:name="Teal" draw:color="#158466"/>
+  <draw:color draw:name="Green" draw:color="#00a933"/>
+  <draw:color draw:name="Lime" draw:color="#81d41a"/>
+
+  <!-- +191 brightness, 75% tint -->
+  <draw:color draw:name="Light Yellow 4" draw:color="#ffffd7"/>
+  <draw:color draw:name="Light Gold 4" draw:color="#fff5ce"/>
+  <draw:color draw:name="Light Orange 4" draw:color="#ffdbb6"/>
+  <draw:color draw:name="Light Brick 4" draw:color="#ffd8ce"/>
+  <draw:color draw:name="Light Red 4" draw:color="#ffd7d7"/>
+  <draw:color draw:name="Light Magenta 4" draw:color="#f7d1d5"/>
+  <draw:color draw:name="Light Purple 4" draw:color="#e0c2cd"/>
+  <draw:color draw:name="Light Indigo 4" draw:color="#dedce6"/>
+  <draw:color draw:name="Light Blue 4" draw:color="#dee6ef"/>
+  <draw:color draw:name="Light Teal 4" draw:color="#dee7e5"/>
+  <draw:color draw:name="Light Green 4" draw:color="#dde8cb"/>
+  <draw:color draw:name="Light Lime 4" draw:color="#f6f9d4"/>
 
-  <draw:color draw:name="Yellow" draw:color="#fff200"/>
-  <draw:color draw:name="Gold" draw:color="#faa61a"/>
-  <draw:color draw:name="Orange" draw:color="#f58220"/>
-  <draw:color draw:name="Brick" draw:color="#ef413d"/>
-  <draw:color draw:name="Red" draw:color="#ed1c24"/>
-  <draw:color draw:name="Violet" draw:color="#a3238e"/>
-  <draw:color draw:name="Purple" draw:color="#5c2d91"/>
-  <draw:color draw:name="Indigo" draw:color="#21409a"/>
-  <draw:color draw:name="Blue" draw:color="#0066b3"/>
-  <draw:color draw:name="Teal" draw:color="#00aaad"/>
-  <draw:color draw:name="Green" draw:color="#00a65d"/>
-  <draw:color draw:name="Lime" draw:color="#72bf44"/>
+  <!-- +153 brightness, 60% tint -->
+  <draw:color draw:name="Light Yellow 3" draw:color="#ffffa6"/>
+  <draw:color draw:name="Light Gold 3" draw:color="#ffe994"/>
+  <draw:color draw:name="Light Orange 3" draw:color="#ffb66c"/>
+  <draw:color draw:name="Light Brick 3" draw:color="#ffaa95"/>
+  <draw:color draw:name="Light Red 3" draw:color="#ffa6a6"/>
+  <draw:color draw:name="Light Magenta 3" draw:color="#ec9ba4"/>
+  <draw:color draw:name="Light Purple 3" draw:color="#bf819e"/>
+  <draw:color draw:name="Light Indigo 3" draw:color="#b7b3ca"/>
+  <draw:color draw:name="Light Blue 3" draw:color="#b4c7dc"/>
+  <draw:color draw:name="Light Teal 3" draw:color="#b3cac7"/>
+  <draw:color draw:name="Light Green 3" draw:color="#afd095"/>
+  <draw:color draw:name="Light Lime 3" draw:color="#e8f2a1"/>
 
-  <!-- Variants -->
+  <!-- +115 brightness, 45% tint -->
+  <draw:color draw:name="Light Yellow 2" draw:color="#ffff6d"/>
+  <draw:color draw:name="Light Gold 2" draw:color="#ffde59"/>
+  <draw:color draw:name="Light Orange 2" draw:color="#ff972f"/>
+  <draw:color draw:name="Light Brick 2" draw:color="#ff7b59"/>
+  <draw:color draw:name="Light Red 2" draw:color="#ff6d6d"/>
+  <draw:color draw:name="Light Magenta 2" draw:color="#e16173"/>
+  <draw:color draw:name="Light Purple 2" draw:color="#a1467e"/>
+  <draw:color draw:name="Light Indigo 2" draw:color="#8e86ae"/>
+  <draw:color draw:name="Light Blue 2" draw:color="#729fcf"/> <!-- #85a4c5 
actually but hard coded COL_DEFAULT_SHAPE_FILLING in xdef.hxx -->
+  <draw:color draw:name="Light Teal 2" draw:color="#81aca6"/>
+  <draw:color draw:name="Light Green 2" draw:color="#77bc65"/>
+  <draw:color draw:name="Light Lime 2" draw:color="#d4ea6b"/>
 
-  <draw:color draw:name="Light Yellow 4" draw:color="#fffbcc"/>
-  <draw:color draw:name="Light Gold 4" draw:color="#ffe5ca"/>
-  <draw:color draw:name="Light Orange 4" draw:color="#fedcc6"/>
-  <draw:color draw:name="Light Brick 4" draw:color="#fcd3c1"/>
-  <draw:color draw:name="Light Red 4" draw:color="#fcd4d1"/>
-  <draw:color draw:name="Light Violet 4" draw:color="#dfcce4"/>
-  <draw:color draw:name="Light Purple 4" draw:color="#bcaed5"/>
-  <draw:color draw:name="Light Indigo 4" draw:color="#8f93c7"/>
-  <draw:color draw:name="Light Blue 4" draw:color="#adc5e7"/>
-  <draw:color draw:name="Light Teal 4" draw:color="#bce4e5"/>
-  <draw:color draw:name="Light Green 4" draw:color="#bee3d3"/>
-  <draw:color draw:name="Light Lime 4" draw:color="#e0efd4"/>
-  
-  <draw:color draw:name="Light Yellow 3" draw:color="#FFF9AE"/>
-  <draw:color draw:name="Light Gold 3" draw:color="#ffdaa2"/>
-  <draw:color draw:name="Light Orange 3" draw:color="#fcc79b"/>
-  <draw:color draw:name="Light Brick 3" draw:color="#f8aa97"/>
-  <draw:color draw:name="Light Red 3" draw:color="#f7a19a"/>
-  <draw:color draw:name="Light Violet 3" draw:color="#c7a0cb"/>
-  <draw:color draw:name="Light Purple 3" draw:color="#9d85be"/>
-  <draw:color draw:name="Light Indigo 3" draw:color="#7477b8"/>
-  <draw:color draw:name="Light Blue 3" draw:color="#7da7d8"/>
-  <draw:color draw:name="Light Teal 3" draw:color="#87d1d1"/>
-  <draw:color draw:name="Light Green 3" draw:color="#8ccfb7"/>
-  <draw:color draw:name="Light Lime 3" draw:color="#c2e0ae"/>
-  
-  <draw:color draw:name="Light Yellow 2" draw:color="#fff685"/>
-  <draw:color draw:name="Light Gold 2" draw:color="#fdc578"/>
-  <draw:color draw:name="Light Orange 2" draw:color="#f9a870"/>
-  <draw:color draw:name="Light Brick 2" draw:color="#f68e76"/>
-  <draw:color draw:name="Light Red 2" draw:color="#f37b70"/>
-  <draw:color draw:name="Light Violet 2" draw:color="#bd7cb5"/>
-  <draw:color draw:name="Light Purple 2" draw:color="#826aaf"/>
-  <draw:color draw:name="Light Indigo 2" draw:color="#5565af"/>
-  <draw:color draw:name="Light Blue 2" draw:color="#5e8ac7"/>
-  <draw:color draw:name="Light Teal 2" draw:color="#59c5c7"/>
-  <draw:color draw:name="Light Green 2" draw:color="#65c295"/>
-  <draw:color draw:name="Light Lime 2" draw:color="#add58a"/>
-  
-  <draw:color draw:name="Light Yellow 1" draw:color="#fff450"/>
-  <draw:color draw:name="Light Gold 1" draw:color="#fdb94d"/>
-  <draw:color draw:name="Light Orange 1" draw:color="#f79448"/>
-  <draw:color draw:name="Light Brick 1" draw:color="#f3715a"/>
-  <draw:color draw:name="Light Red 1" draw:color="#f04e4d"/>
-  <draw:color draw:name="Light Violet 1" draw:color="#aa55a1"/>
-  <draw:color draw:name="Light Purple 1" draw:color="#74489d"/>
-  <draw:color draw:name="Light Indigo 1" draw:color="#454fa1"/>
-  <draw:color draw:name="Light Blue 1" draw:color="#1b75bc"/>
-  <draw:color draw:name="Light Teal 1" draw:color="#00b6bd"/>
-  <draw:color draw:name="Light Green 1" draw:color="#00b274"/>
-  <draw:color draw:name="Light Lime 1" draw:color="#89c765"/>
+  <!-- +77 brightness, 30% tint -->
+  <draw:color draw:name="Light Yellow 1" draw:color="#ffff38"/>
+  <draw:color draw:name="Light Gold 1" draw:color="#ffd428"/>
+  <draw:color draw:name="Light Orange 1" draw:color="#ff860d"/>
+  <draw:color draw:name="Light Brick 1" draw:color="#ff5429"/>
+  <draw:color draw:name="Light Red 1" draw:color="#ff3838"/>
+  <draw:color draw:name="Light Magenta 1" draw:color="#d62e4e"/>
+  <draw:color draw:name="Light Purple 1" draw:color="#8d1d75"/>
+  <draw:color draw:name="Light Indigo 1" draw:color="#6b5e9b"/>
+  <draw:color draw:name="Light Blue 1" draw:color="#5983b0"/>
+  <draw:color draw:name="Light Teal 1" draw:color="#50938a"/>
+  <draw:color draw:name="Light Green 1" draw:color="#3faf46"/>
+  <draw:color draw:name="Light Lime 1" draw:color="#bbe33d"/>
 
-  <draw:color draw:name="Dark Yellow 1" draw:color="#e3d200"/>
-  <draw:color draw:name="Dark Gold 1" draw:color="#d99116"/>
-  <draw:color draw:name="Dark Orange 1" draw:color="#d4711a"/>
-  <draw:color draw:name="Dark Brick 1" draw:color="#cf3834"/>
-  <draw:color draw:name="Dark Red 1" draw:color="#ce181e"/>
-  <draw:color draw:name="Dark Violet 1" draw:color="#8f187c"/>
-  <draw:color draw:name="Dark Purple 1" draw:color="#512480"/>
-  <draw:color draw:name="Dark Indigo 1" draw:color="#1c3687"/>
-  <draw:color draw:name="Dark Blue 1" draw:color="#00599d"/>
-  <draw:color draw:name="Dark Teal 1" draw:color="#009598"/>
-  <draw:color draw:name="Dark Green 1" draw:color="#009353"/>
-  <draw:color draw:name="Dark Lime 1" draw:color="#62a73b"/>  
+  <!-- -51 brightness, 20% shade -->
+  <draw:color draw:name="Dark Yellow 1" draw:color="#e6e905"/>
+  <draw:color draw:name="Dark Gold 1" draw:color="#e8a202"/>
+  <draw:color draw:name="Dark Orange 1" draw:color="#ea7500"/>
+  <draw:color draw:name="Dark Brick 1" draw:color="#ed4c05"/>
+  <draw:color draw:name="Dark Red 1" draw:color="#f10d0c"/>
+  <draw:color draw:name="Dark Magenta 1" draw:color="#a7074b"/>
+  <draw:color draw:name="Dark Purple 1" draw:color="#780373"/>
+  <draw:color draw:name="Dark Indigo 1" draw:color="#5b277d"/>
+  <draw:color draw:name="Dark Blue 1" draw:color="#3465a4"/> <!-- #2e5d8c 
actually but hard coded COL_DEFAULT_SHAPE_STROKE in xdef.hxx -->
+  <draw:color draw:name="Dark Teal 1" draw:color="#168253"/>
+  <draw:color draw:name="Dark Green 1" draw:color="#069a2e"/>
+  <draw:color draw:name="Dark Lime 1" draw:color="#5eb91e"/>
 
-  <draw:color draw:name="Dark Yellow 2" draw:color="#ccbe00"/>
-  <draw:color draw:name="Dark Gold 2" draw:color="#c38312"/>
-  <draw:color draw:name="Dark Orange 2" draw:color="#c06616"/>
-  <draw:color draw:name="Dark Brick 2" draw:color="#bc312e"/>
-  <draw:color draw:name="Dark Red 2" draw:color="#ba131a"/>
-  <draw:color draw:name="Dark Violet 2" draw:color="#820f71"/>
-  <draw:color draw:name="Dark Purple 2" draw:color="#491d74"/>
-  <draw:color draw:name="Dark Indigo 2" draw:color="#182f7c"/>
-  <draw:color draw:name="Dark Blue 2" draw:color="#00508f"/>
-  <draw:color draw:name="Dark Teal 2" draw:color="#00888a"/>
-  <draw:color draw:name="Dark Green 2" draw:color="#00864b"/>
-  <draw:color draw:name="Dark Lime 2" draw:color="#579835"/>  
+  <!-- -102 brightness, 40% shade -->
+  <draw:color draw:name="Dark Yellow 2" draw:color="#acb20c"/>
+  <draw:color draw:name="Dark Gold 2" draw:color="#b47804"/>
+  <draw:color draw:name="Dark Orange 2" draw:color="#b85c00"/>
+  <draw:color draw:name="Dark Brick 2" draw:color="#be480a"/>
+  <draw:color draw:name="Dark Red 2" draw:color="#c9211e"/>
+  <draw:color draw:name="Dark Magenta 2" draw:color="#861141"/>
+  <draw:color draw:name="Dark Purple 2" draw:color="#650953"/>
+  <draw:color draw:name="Dark Indigo 2" draw:color="#55215b"/>
+  <draw:color draw:name="Dark Blue 2" draw:color="#355269"/>
+  <draw:color draw:name="Dark Teal 2" draw:color="#1e6a39"/>
+  <draw:color draw:name="Dark Green 2" draw:color="#127622"/>
+  <draw:color draw:name="Dark Lime 2" draw:color="#468a1a"/>
 
-  <draw:color draw:name="Dark Yellow 3" draw:color="#a09600"/>
-  <draw:color draw:name="Dark Gold 3" draw:color="#9a6704"/>
-  <draw:color draw:name="Dark Orange 3" draw:color="#985006"/>
-  <draw:color draw:name="Dark Brick 3" draw:color="#95231f"/>
-  <draw:color draw:name="Dark Red 3" draw:color="#94070a"/>
-  <draw:color draw:name="Dark Violet 3" draw:color="#680059"/>
-  <draw:color draw:name="Dark Purple 3" draw:color="#390a5d"/>
-  <draw:color draw:name="Dark Indigo 3" draw:color="#0d1f63"/>
-  <draw:color draw:name="Dark Blue 3" draw:color="#003d73"/>
-  <draw:color draw:name="Dark Teal 3" draw:color="#006d6f"/>
-  <draw:color draw:name="Dark Green 3" draw:color="#006c3b"/>
-  <draw:color draw:name="Dark Lime 3" draw:color="#407927"/>  
+  <!-- -153 brightness, 60% shade  -->
+  <draw:color draw:name="Dark Yellow 3" draw:color="#706e0c"/>
+  <draw:color draw:name="Dark Gold 3" draw:color="#784b04"/>
+  <draw:color draw:name="Dark Orange 3" draw:color="#7b3d00"/>
+  <draw:color draw:name="Dark Brick 3" draw:color="#813709"/>
+  <draw:color draw:name="Dark Red 3" draw:color="#8d281e"/>
+  <draw:color draw:name="Dark Magenta 3" draw:color="#611729"/>
+  <draw:color draw:name="Dark Purple 3" draw:color="#4e102d"/>
+  <draw:color draw:name="Dark Indigo 3" draw:color="#481d32"/>
+  <draw:color draw:name="Dark Blue 3" draw:color="#383d3c"/>
+  <draw:color draw:name="Dark Teal 3" draw:color="#28471f"/>
+  <draw:color draw:name="Dark Green 3" draw:color="#224b12"/>
+  <draw:color draw:name="Dark Lime 3" draw:color="#395511"/>
 
-  <!-- new darker row - HSL, reduced L by -10 -->
-  <draw:color draw:name="Dark Yellow 4" draw:color="#6b6400"/>
-  <draw:color draw:name="Dark Gold 4" draw:color="#684703"/>
-  <draw:color draw:name="Dark Orange 4" draw:color="#673604"/>
-  <draw:color draw:name="Dark Brick 4" draw:color="#6a1816"/>
-  <draw:color draw:name="Dark Red 4" draw:color="#610506"/>
-  <draw:color draw:name="Dark Violet 4" draw:color="#33002b"/> 
-  <draw:color draw:name="Dark Purple 4" draw:color="#1c052e"/>
-  <draw:color draw:name="Dark Indigo 4" draw:color="#071136"/>
-  <draw:color draw:name="Dark Blue 4" draw:color="#002342"/>
-  <draw:color draw:name="Dark Teal 4" draw:color="#003c3d"/>
-  <draw:color draw:name="Dark Green 4" draw:color="#00381f"/>
-  <draw:color draw:name="Dark Lime 4" draw:color="#2b511a"/>
-  
+  <!-- -204 brightness, 80% shade -->
+  <draw:color draw:name="Dark Yellow 4" draw:color="#443205"/>
+  <draw:color draw:name="Dark Gold 4" draw:color="#472702"/>
+  <draw:color draw:name="Dark Orange 4" draw:color="#492300"/>
+  <draw:color draw:name="Dark Brick 4" draw:color="#4b2204"/>
+  <draw:color draw:name="Dark Red 4" draw:color="#50200c"/>
+  <draw:color draw:name="Dark Magenta 4" draw:color="#41190d"/>
+  <draw:color draw:name="Dark Purple 4" draw:color="#3b160e"/>
+  <draw:color draw:name="Dark Indigo 4" draw:color="#3a1a0f"/>
+  <draw:color draw:name="Dark Blue 4" draw:color="#362413"/>
+  <draw:color draw:name="Dark Teal 4" draw:color="#302709"/>
+  <draw:color draw:name="Dark Green 4" draw:color="#2e2706"/>
+  <draw:color draw:name="Dark Lime 4" draw:color="#342a06"/>
 </office:color-table>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to