From efd10664b7808b531676cbbb402703bcc644b0d1 Mon Sep 17 00:00:00 2001
From: Armin Le Grand <alg@apache.org>
Date: Wed, 2 Jan 2013 08:55:58 +0000
Subject: Resolves: #i121520# changed basic color palette as described...

in the task and discussed on the list under '[proposal] Adopt palette to
Symphony palette partially', also corrected typos on gradient
definitions

(cherry picked from commit 57811cc1cd5e49c1e87fb2a9d79f8a3941a025e3)

Conflicts:
	extras/source/palettes/standard.soc

Change-Id: I54fa27963f7c9732211b7bded5a343b9c05449ab
---
 extras/source/palettes/standard.soc | 228 ++++++++++++++++++++++++------------
 extras/source/palettes/standard.sog |   3 +-
 2 files changed, 151 insertions(+), 80 deletions(-)

(limited to 'extras/source')

diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc
index 6361f7bfa1e5..7e1678ed3160 100644
--- a/extras/source/palettes/standard.soc
+++ b/extras/source/palettes/standard.soc
@@ -1,86 +1,156 @@
 <?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">
-  <draw:color draw:name="Black" draw:color="#000000"/>
+  <!-- #i121520# use Symphony palette as base, it is organized as groups of twelve entries -->
   <draw:color draw:name="White" draw:color="#ffffff"/>
-  <draw:color draw:name="Blue" draw:color="#000080"/>
-  <draw:color draw:name="Green" draw:color="#008000"/>
-  <draw:color draw:name="Turquoise" draw:color="#008080"/>
-  <draw:color draw:name="Red" draw:color="#800000"/>
-  <draw:color draw:name="Magenta" draw:color="#800080"/>
-  <draw:color draw:name="Brown" draw:color="#808000"/>
-  <draw:color draw:name="Gray" draw:color="#808080"/>
-  <draw:color draw:name="Light gray" draw:color="#c0c0c0"/>
-  <draw:color draw:name="Light blue" draw:color="#0000ff"/>
-  <draw:color draw:name="Light green" draw:color="#00ff00"/>
-  <draw:color draw:name="Light cyan" draw:color="#00ffff"/>
-  <draw:color draw:name="Light red" draw:color="#ff0000"/>
-  <draw:color draw:name="Light magenta" draw:color="#ff00ff"/>
-  <draw:color draw:name="Yellow" draw:color="#ffff00"/>
-  <draw:color draw:name="Gray 80%" draw:color="#333333"/>
-  <draw:color draw:name="Gray 70%" draw:color="#4c4c4c"/>
-  <draw:color draw:name="Gray 60%" draw:color="#666666"/>
-  <draw:color draw:name="Gray 40%" draw:color="#999999"/>
-  <draw:color draw:name="Gray 30%" draw:color="#b3b3b3"/>
-  <draw:color draw:name="Gray 20%" draw:color="#cccccc"/>
-  <draw:color draw:name="Gray 10%" draw:color="#e6e6e6"/>
+  <draw:color draw:name="Gray 1" draw:color="#eeeeee"/>
+  <draw:color draw:name="Gray 2" draw:color="#dddddd"/>
+  <draw:color draw:name="Gray 3" draw:color="#cccccc"/>
+  <draw:color draw:name="Gray 4" draw:color="#b2b2b2"/>
+  <draw:color draw:name="Gray 5" draw:color="#999999"/>
+  <draw:color draw:name="Gray 6" draw:color="#808080"/>
+  <draw:color draw:name="Gray 7" draw:color="#666666"/>
+  <draw:color draw:name="Gray 8" draw:color="#333333"/>
+  <draw:color draw:name="Gray 9" draw:color="#1c1c1c"/>
+  <draw:color draw:name="Gray 10" draw:color="#111111"/>
+  <draw:color draw:name="Black" draw:color="#000000"/>
+  <draw:color draw:name="Yellow" draw:color="#ffff99"/>
+  <draw:color draw:name="Orange" draw:color="#ff6600"/>
+  <draw:color draw:name="Red" draw:color="#ff3333"/>
+  <draw:color draw:name="Pink" draw:color="#ff00cc"/>
+  <draw:color draw:name="Magenta" draw:color="#ff33ff"/>
+  <draw:color draw:name="Purple" draw:color="#9900ff"/>
+  <draw:color draw:name="Blue" draw:color="#6666ff"/>
+  <draw:color draw:name="Sky Blue" draw:color="#00ccff"/>
+  <draw:color draw:name="Cyan" draw:color="#66ffff"/>
+  <draw:color draw:name="Turquoise" draw:color="#33ff99"/>
+  <draw:color draw:name="Green" draw:color="#99ff66"/>
+  <draw:color draw:name="Yellow Green" draw:color="#ccff00"/>
+  <draw:color draw:name="Yellow 1" draw:color="#ffff66"/>
+  <draw:color draw:name="Orange 1" draw:color="#ffcc00"/>
+  <draw:color draw:name="Red 1" draw:color="#ff9999"/>
+  <draw:color draw:name="Pink 1" draw:color="#ff66cc"/>
+  <draw:color draw:name="Magenta 1" draw:color="#ff99ff"/>
+  <draw:color draw:name="Purple 1" draw:color="#cc66ff"/>
+  <draw:color draw:name="Blue 1" draw:color="#9999ff"/>
+  <draw:color draw:name="Sky Blue 1" draw:color="#9999ff"/>
+  <draw:color draw:name="Cyan 1" draw:color="#99ffff"/>
+  <draw:color draw:name="Turquoise 1" draw:color="#66ff99"/>
+  <draw:color draw:name="Green 1" draw:color="#99ff99"/>
+  <draw:color draw:name="Yellow Green 1" draw:color="#ccff66"/>
+  <draw:color draw:name="Yellow 2" draw:color="#ffff00"/>
+  <draw:color draw:name="Orange 2" draw:color="#ff9900"/>
+  <draw:color draw:name="Red 2" draw:color="#ff6666"/>
+  <draw:color draw:name="Pink 2" draw:color="#ff3399"/>
+  <draw:color draw:name="Magenta 2" draw:color="#ff66ff"/>
+  <draw:color draw:name="Purple 2" draw:color="#9933ff"/>
+  <draw:color draw:name="Blue 2" draw:color="#3333ff"/>
+  <draw:color draw:name="Sky Blue 2" draw:color="#3399ff"/>
+  <draw:color draw:name="Cyan 2" draw:color="#00ffff"/>
+  <draw:color draw:name="Turquoise 2" draw:color="#00ff66"/>
+  <draw:color draw:name="Green 2" draw:color="#66ff66"/>
+  <draw:color draw:name="Yellow Green 2" draw:color="#99ff33"/>
+  <draw:color draw:name="Yellow 3" draw:color="#cc9900"/>
+  <draw:color draw:name="Orange 3" draw:color="#ff3300"/>
+  <draw:color draw:name="Red 3" draw:color="#ff0000"/>
+  <draw:color draw:name="Pink 3" draw:color="#ff0066"/>
+  <draw:color draw:name="Magenta 3" draw:color="#ff00ff"/>
+  <draw:color draw:name="Purple 3" draw:color="#6600ff"/>
+  <draw:color draw:name="Blue 3" draw:color="#0000ff"/>
+  <draw:color draw:name="Sky Blue 3" draw:color="#0066ff"/>
+  <draw:color draw:name="Cyan 3" draw:color="#00cccc"/>
+  <draw:color draw:name="Turquoise 3" draw:color="#00cc33"/>
+  <draw:color draw:name="Green 3" draw:color="#00cc00"/>
+  <draw:color draw:name="Yellow Green 3" draw:color="#66ff00"/>
+  <draw:color draw:name="Yellow 4" draw:color="#996600"/>
+  <draw:color draw:name="Orange 4" draw:color="#cc3300"/>
+  <draw:color draw:name="Red 4" draw:color="#cc0000"/>
+  <draw:color draw:name="Pink 4" draw:color="#cc0066"/>
+  <draw:color draw:name="Magenta 4" draw:color="#cc00cc"/>
+  <draw:color draw:name="Purple 4" draw:color="#6600cc"/>
+  <draw:color draw:name="Blue 4" draw:color="#0000cc"/>
+  <draw:color draw:name="Sky Blue 4" draw:color="#0066cc"/>
+  <draw:color draw:name="Cyan 4" draw:color="#009999"/>
+  <draw:color draw:name="Turquoise 4" draw:color="#009933"/>
+  <draw:color draw:name="Green 4" draw:color="#009900"/>
+  <draw:color draw:name="Yellow Green 4" draw:color="#66cc00"/>
+  <draw:color draw:name="Yellow 5" draw:color="#663300"/>
+  <draw:color draw:name="Orange 5" draw:color="#801900"/>
+  <draw:color draw:name="Red 5" draw:color="#990000"/>
+  <draw:color draw:name="Pink 5" draw:color="#990066"/>
+  <draw:color draw:name="Magenta 5" draw:color="#990099"/>
+  <draw:color draw:name="Purple 5" draw:color="#330099"/>
+  <draw:color draw:name="Blue 5" draw:color="#000099"/>
+  <draw:color draw:name="Sky Blue 5" draw:color="#006699"/>
+  <draw:color draw:name="Cyan 5" draw:color="#006666"/>
+  <draw:color draw:name="Turquoise 5" draw:color="#007826"/>
+  <draw:color draw:name="Green 5" draw:color="#006600"/>
+  <draw:color draw:name="Yellow Green 5" draw:color="#669900"/>
+  <draw:color draw:name="Yellow 6" draw:color="#333300"/>
+  <draw:color draw:name="Orange 6" draw:color="#461900"/>
+  <draw:color draw:name="Red 6" draw:color="#330000"/>
+  <draw:color draw:name="Pink 6" draw:color="#330033"/>
+  <draw:color draw:name="Magenta 6" draw:color="#660066"/>
+  <draw:color draw:name="Purple 6" draw:color="#000033"/>
+  <draw:color draw:name="Blue 6" draw:color="#000066"/>
+  <draw:color draw:name="Sky Blue 6" draw:color="#000080"/>
+  <draw:color draw:name="Cyan 6" draw:color="#003333"/>
+  <draw:color draw:name="Turquoise 6" draw:color="#00331a"/>
+  <draw:color draw:name="Green 6" draw:color="#003300"/>
+  <draw:color draw:name="Yellow Green 6" draw:color="#193300"/>
+  <draw:color draw:name="Yellow 7" draw:color="#666633"/>
+  <draw:color draw:name="Orange 7" draw:color="#661900"/>
+  <draw:color draw:name="Red 7" draw:color="#663333"/>
+  <draw:color draw:name="Pink 7" draw:color="#660033"/>
+  <draw:color draw:name="Magenta 7" draw:color="#663366"/>
+  <draw:color draw:name="Purple 7" draw:color="#330066"/>
+  <draw:color draw:name="Blue 7" draw:color="#333366"/>
+  <draw:color draw:name="Sky Blue 7" draw:color="#003366"/>
+  <draw:color draw:name="Cyan 7" draw:color="#336666"/>
+  <draw:color draw:name="Turquoise 7" draw:color="#006633"/>
+  <draw:color draw:name="Green 7" draw:color="#336633"/>
+  <draw:color draw:name="Yellow Green 7" draw:color="#336600"/>
+  <draw:color draw:name="Yellow 8" draw:color="#999966"/>
+  <draw:color draw:name="Orange 8" draw:color="#996633"/>
+  <draw:color draw:name="Red 8" draw:color="#996666"/>
+  <draw:color draw:name="Pink 8" draw:color="#993366"/>
+  <draw:color draw:name="Magenta 8" draw:color="#996699"/>
+  <draw:color draw:name="Purple 8" draw:color="#663399"/>
+  <draw:color draw:name="Blue 8" draw:color="#666699"/>
+  <draw:color draw:name="Sky Blue 8" draw:color="#336699"/>
+  <draw:color draw:name="Cyan 8" draw:color="#669999"/>
+  <draw:color draw:name="Turquoise 8" draw:color="#339966"/>
+  <draw:color draw:name="Green 8" draw:color="#669966"/>
+  <draw:color draw:name="Yellow Green 8" draw:color="#669933"/>
+  <draw:color draw:name="Yellow 9" draw:color="#cccc99"/>
+  <draw:color draw:name="Orange 9" draw:color="#cc9966"/>
+  <draw:color draw:name="Red 9" draw:color="#cc9999"/>
+  <draw:color draw:name="Pink 9" draw:color="#cc6699"/>
+  <draw:color draw:name="Magenta 9" draw:color="#cc99cc"/>
+  <draw:color draw:name="Purple 9" draw:color="#9966cc"/>
+  <draw:color draw:name="Blue 9" draw:color="#9999cc"/>
+  <draw:color draw:name="Sky Blue 9" draw:color="#6699cc"/>
+  <draw:color draw:name="Cyan 9" draw:color="#99cccc"/>
+  <draw:color draw:name="Turquoise 9" draw:color="#66cc99"/>
+  <draw:color draw:name="Green 9" draw:color="#99cc99"/>
+  <draw:color draw:name="Yellow Green 9" draw:color="#99cc66"/>
+  <draw:color draw:name="Yellow 10" draw:color="#ffffcc"/>
+  <draw:color draw:name="Orange 10" draw:color="#ffcc99"/>
+  <draw:color draw:name="Red 10" draw:color="#ffcccc"/>
+  <draw:color draw:name="Pink 10" draw:color="#ff99cc"/>
+  <draw:color draw:name="Magenta 10" draw:color="#ffccff"/>
+  <draw:color draw:name="Purple 10" draw:color="#cc99ff"/>
+  <draw:color draw:name="Blue 10" draw:color="#ccccff"/>
+  <draw:color draw:name="Sky Blue 10" draw:color="#99ccff"/>
+  <draw:color draw:name="Cyan 10" draw:color="#ccffff"/>
+  <draw:color draw:name="Turquoise 10" draw:color="#99ffcc"/>
+  <draw:color draw:name="Green 10" draw:color="#ccffcc"/>
+  <draw:color draw:name="Yellow Green 10" draw:color="#ccff99"/>
+
+  <!-- #i121520# use some 'nice' colors from original palette -->
   <draw:color draw:name="Blue gray" draw:color="#e6e6ff"/>
-  <draw:color draw:name="Red 1" draw:color="#ff3366"/>
-  <draw:color draw:name="Red 2" draw:color="#dc2300"/>
-  <draw:color draw:name="Red 3" draw:color="#b84700"/>
-  <draw:color draw:name="Red 4" draw:color="#ff3333"/>
-  <draw:color draw:name="Red 5" draw:color="#eb613d"/>
-  <draw:color draw:name="Red 6" draw:color="#b84747"/>
-  <draw:color draw:name="Red 7" draw:color="#b80047"/>
-  <draw:color draw:name="Red 8" draw:color="#99284c"/>
-  <draw:color draw:name="Magenta 1" draw:color="#94006b"/>
-  <draw:color draw:name="Magenta 2" draw:color="#94476b"/>
-  <draw:color draw:name="Magenta 3" draw:color="#944794"/>
-  <draw:color draw:name="Magenta 4" draw:color="#9966cc"/>
-  <draw:color draw:name="Magenta 5" draw:color="#6b4794"/>
-  <draw:color draw:name="Magenta 6" draw:color="#6b2394"/>
-  <draw:color draw:name="Magenta 7" draw:color="#6b0094"/>
-  <draw:color draw:name="Magenta 8" draw:color="#5e11a6"/>
-  <draw:color draw:name="Blue 1" draw:color="#280099"/>
-  <draw:color draw:name="Blue 2" draw:color="#4700b8"/>
-  <draw:color draw:name="Blue 3" draw:color="#2300dc"/>
-  <draw:color draw:name="Blue 4" draw:color="#2323dc"/>
-  <draw:color draw:name="Blue 5" draw:color="#0047ff"/>
-  <draw:color draw:name="Blue 6" draw:color="#0099ff"/>
-  <draw:color draw:name="Blue 7" draw:color="#00b8ff"/>
-  <draw:color draw:name="Blue 8" draw:color="#99ccff"/>
   <draw:color draw:name="Blue 9" draw:color="#CFE7F5"/>
-  <draw:color draw:name="Turquoise 1" draw:color="#00dcff"/>
-  <draw:color draw:name="Turquoise 2" draw:color="#00cccc"/>
-  <draw:color draw:name="Turquoise 3" draw:color="#23b8dc"/>
-  <draw:color draw:name="Turquoise 4" draw:color="#47b8b8"/>
-  <draw:color draw:name="Turquoise 5" draw:color="#33a3a3"/>
-  <draw:color draw:name="Turquoise 6" draw:color="#198a8a"/>
-  <draw:color draw:name="Turquoise 7" draw:color="#006b6b"/>
-  <draw:color draw:name="Turquoise 8" draw:color="#004a4a"/>
-  <draw:color draw:name="Green 1" draw:color="#355e00"/>
-  <draw:color draw:name="Green 2" draw:color="#5c8526"/>
-  <draw:color draw:name="Green 3" draw:color="#7da647"/>
-  <draw:color draw:name="Green 4" draw:color="#94bd5e"/>
-  <draw:color draw:name="Green 5" draw:color="#00ae00"/>
-  <draw:color draw:name="Green 6" draw:color="#33cc66"/>
-  <draw:color draw:name="Green 7" draw:color="#3deb3d"/>
-  <draw:color draw:name="Green 8" draw:color="#23ff23"/>
-  <draw:color draw:name="Yellow 1" draw:color="#e6ff00"/>
-  <draw:color draw:name="Yellow 2" draw:color="#ffff99"/>
-  <draw:color draw:name="Yellow 3" draw:color="#ffff66"/>
-  <draw:color draw:name="Yellow 4" draw:color="#e6e64c"/>
-  <draw:color draw:name="Yellow 5" draw:color="#cccc00"/>
-  <draw:color draw:name="Yellow 6" draw:color="#b3b300"/>
-  <draw:color draw:name="Yellow 7" draw:color="#808019"/>
-  <draw:color draw:name="Yellow 8" draw:color="#666600"/>
-  <draw:color draw:name="Brown 1" draw:color="#4c1900"/>
-  <draw:color draw:name="Brown 2" draw:color="#663300"/>
-  <draw:color draw:name="Brown 3" draw:color="#804c19"/>
-  <draw:color draw:name="Brown 4" draw:color="#996633"/>
-  <draw:color draw:name="Orange 1" draw:color="#cc6633"/>
-  <draw:color draw:name="Orange 2" draw:color="#ff6633"/>
-  <draw:color draw:name="Orange 3" draw:color="#ff9966"/>
-  <draw:color draw:name="Orange 4" draw:color="#ffcc99"/>
+
+  <!-- #i121520# add 'pale' colors from original palette -->
   <draw:color draw:name="Violet" draw:color="#9999ff"/>
   <draw:color draw:name="Bordeaux" draw:color="#993366"/>
   <draw:color draw:name="Pale yellow" draw:color="#ffffcc"/>
@@ -88,6 +158,8 @@
   <draw:color draw:name="Dark violet" draw:color="#660066"/>
   <draw:color draw:name="Salmon" draw:color="#ff8080"/>
   <draw:color draw:name="Sea blue" draw:color="#0066cc"/>
+
+  <!-- #i121520# add Chart colors from original palette -->
   <draw:color draw:name="Chart 1" draw:color="#004586"/>
   <draw:color draw:name="Chart 2" draw:color="#ff420e"/>
   <draw:color draw:name="Chart 3" draw:color="#ffd320"/>
diff --git a/extras/source/palettes/standard.sog b/extras/source/palettes/standard.sog
index 038843c24f37..b3f4852d606e 100644
--- a/extras/source/palettes/standard.sog
+++ b/extras/source/palettes/standard.sog
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <office:gradient-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">
   <!-- #121511# new entries derived from Symphony, moved gray gradients to the front -->
   <draw:gradient draw:name="Gray Gradient 1" draw:style="linear" draw:start-color="#1c1c1c" draw:end-color="#cccccc" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/>
@@ -33,7 +32,7 @@
   <draw:gradient draw:name="Radial red/yellow" draw:style="radial" draw:cx="50%" draw:cy="50%" draw:start-color="#ff3333" draw:end-color="#e6ff00" draw:start-intensity="100%" draw:end-intensity="100%" draw:border="0%"/>
   <draw:gradient draw:name="Axial light red/white" draw:style="axial" draw:start-color="#ff0000" draw:end-color="#ffffff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="50%"/>
 
-  <!-- not so useful old gradients (vandidates for removal) -->
+  <!-- not so useful old gradients (candidates for removal) -->
   <draw:gradient draw:name="Gradient 2" draw:style="axial" draw:start-color="#000080" draw:end-color="#800000" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="300" draw:border="10%"/>
   <draw:gradient draw:name="Gradient 4" draw:style="ellipsoid" draw:cx="40%" draw:cy="40%" draw:start-color="#ffff00" draw:end-color="#008000" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="900" draw:border="30%"/>
   <draw:gradient draw:name="Gradient 5" draw:style="square" draw:cx="50%" draw:cy="50%" draw:start-color="#008000" draw:end-color="#800080" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="1200" draw:border="40%"/>
-- 
cgit