[gtksourceview: 1/2] styles: sync oblivion and tango schemes

[Christian Hergert <chergert src gnome org>]

commit 318952de30187f4622acc4b187c226fef8238482
Author: Dmitry Nalivin <dmitrynalivin gmail com>
Date:   Tue Oct 12 22:41:45 2021 +0300

    styles: sync oblivion and tango schemes
    
    This is an attempt to make two styles more consistent with each other.
    The goal here is to make them work as two variants of the same style,
    so this can be used for the dark style preference later.

 data/styles/oblivion.xml | 41 ++++++++++++++++++++---------------------
 data/styles/tango.xml    | 38 +++++++++++++++++++-------------------
 2 files changed, 39 insertions(+), 40 deletions(-)
---
diff --git a/data/styles/oblivion.xml b/data/styles/oblivion.xml
index f69f9196..2b0c41e6 100644
--- a/data/styles/oblivion.xml
+++ b/data/styles/oblivion.xml
@@ -20,9 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-
 <style-scheme id="oblivion" _name="Oblivion" version="1.0">
-
   <author>Paolo Borelli</author>
   <_description>Dark color scheme using the Tango color palette</_description>
 
@@ -57,22 +55,19 @@
   <color name="white"                       value="#ffffff"/>
   <color name="black"                       value="#000000"/>
 
-  <color name="aluminium4-3-blend"          value="#a1a49e"/>
-  <color name="aluminium6-5-blend"          value="#34393A"/>
-
   <!-- Global Settings -->
   <style name="text"                        foreground="aluminium2" background="aluminium6"/>
-  <style name="selection"                   foreground="aluminium1" background="aluminium4"/>
   <style name="cursor"                      foreground="aluminium2"/>
-  <style name="secondary-cursor"            foreground="aluminium4-3-blend"/>
-  <style name="current-line"                background="aluminium5"/>
+  <style name="secondary-cursor"            foreground="#a1a49e"/>
   <style name="line-numbers"                foreground="aluminium5" background="black"/>
+  <style name="current-line"                background="aluminium5"/>
+  <style name="current-line-number"         background="#212121"/>
   <style name="draw-spaces"                 foreground="aluminium4"/>
-  <style name="background-pattern"          background="aluminium6-5-blend"/>
-  <style name="snippet-focus"               foreground="aluminium6" background="aluminium4-3-blend"/>
+  <style name="background-pattern"          background="#34393a"/>
+  <style name="snippet-focus"               foreground="aluminium6" background="aluminium3"/>
 
   <!-- Bracket Matching -->
-  <style name="bracket-match"               foreground="chocolate2"/>
+  <style name="bracket-match"               foreground="aluminium1" background="aluminium4"/>
   <style name="bracket-mismatch"            foreground="aluminium1" background="scarletred2"/>
 
   <!-- Right Margin -->
@@ -89,9 +84,9 @@
   <!-- Constants -->
   <style name="def:constant"                foreground="butter2"/>
   <style name="def:string"                  foreground="butter2"/>
-  <style name="def:special-char"            foreground="orange3"/>
-  <style name="def:special-constant"        foreground="orange3"/>
-  <style name="def:floating-point"          foreground="orange3"/>
+  <style name="def:special-char"            foreground="orange2"/>
+  <style name="def:special-constant"        foreground="orange2"/>
+  <style name="def:floating-point"          foreground="orange2"/>
 
   <!-- Identifiers -->
   <style name="def:identifier"              foreground="skyblue1"/>
@@ -108,8 +103,8 @@
   <style name="def:inline-code"             foreground="skyblue1"/>
   <style name="def:insertion"               underline="single"/>
   <style name="def:deletion"                strikethrough="true"/>
-  <style name="def:link-text"               foreground="aluminium4"/>
-  <style name="def:link-symbol"             foreground="aluminium4" bold="true"/>
+  <style name="def:link-text"               foreground="skyblue1"/>
+  <style name="def:link-symbol"             foreground="skyblue1" bold="true"/>
   <style name="def:link-destination"        italic="true" underline="single"/>
   <style name="def:heading"                 foreground="chameleon1" bold="true"/>
   <style name="def:thematic-break"          foreground="chameleon1" bold="true"/>
@@ -120,7 +115,7 @@
   <style name="def:preprocessor"            foreground="plum1"/>
   <style name="def:error"                   foreground="aluminium1" background="scarletred2" bold="true"/>
   <style name="def:warning"                 foreground="aluminium1" background="plum1"/>
-  <style name="def:note"                    background="butter1" foreground="aluminium4" bold="true"/>
+  <style name="def:note"                    background="butter1" foreground="aluminium5" bold="true"/>
   <style name="def:net-address"             italic="true" underline="single"/>
 
   <!-- Heading styles, uncomment to enable -->
@@ -138,12 +133,16 @@
   <style name="diff:added-line"             foreground="butter2"/>
   <style name="diff:removed-line"           foreground="skyblue1"/>
   <style name="diff:changed-line"           foreground="plum1"/>
-  <style name="diff:diff-file"              foreground="chameleon1" bold="true"/>
-  <style name="diff:location"               foreground="chameleon1"/>
-  <style name="diff:special-case"           foreground="white" bold="true"/>
+  <style name="diff:diff-file"              use-style="def:type"/>
+  <style name="diff:location"               use-style="def:statement"/>
+  <style name="diff:special-case"           use-style="def:statement"/>
+
+  <style name="xml:namespace"               bold="true"/>
 
   <style name="latex:command"               foreground="chameleon1" bold="true"/>
   <style name="latex:include"               use-style="def:preprocessor"/>
 
+  <style name="sh:variable"                 foreground="orange2"/>
+  <style name="sh:variable-definition"      foreground="chameleon1"/>
+  
 </style-scheme>
-
diff --git a/data/styles/tango.xml b/data/styles/tango.xml
index eaa68ca9..b4f329e3 100644
--- a/data/styles/tango.xml
+++ b/data/styles/tango.xml
@@ -25,8 +25,6 @@
   <_description>Color scheme using Tango color palette</_description>
 
   <!-- Tango Palette -->
-  <color name="white"                       value="#FFFFFF"/>
-  <color name="black"                       value="#000000"/>
   <color name="butter1"                     value="#fce94f"/>
   <color name="butter2"                     value="#edd400"/>
   <color name="butter3"                     value="#c4a000"/>
@@ -54,13 +52,16 @@
   <color name="aluminium4"                  value="#888a85"/>
   <color name="aluminium5"                  value="#555753"/>
   <color name="aluminium6"                  value="#2e3436"/>
-
-  <style name="text"                        foreground="black" background="white"/>
+  <color name="white"                       value="#ffffff"/>
+  <color name="black"                       value="#000000"/>
 
   <!-- Global Settings -->
-  <style name="line-numbers"                background="aluminium1"/>
+  <style name="text"                        foreground="aluminium6" background="white"/>
+  <style name="cursor"                      foreground="aluminium6"/>
+  <style name="secondary-cursor"            foreground="aluminium4"/>
+  <style name="line-numbers"                foreground="aluminium5" background="aluminium1"/>
   <style name="current-line"                background="aluminium1"/>
-  <style name="current-line-number"         background="aluminium1"/>
+  <style name="current-line-number"         background="#e3e3e1"/>
   <style name="draw-spaces"                 foreground="aluminium3"/>
   <style name="background-pattern"          background="#f3f3f3"/>
   <style name="snippet-focus"               foreground="aluminium6" background="aluminium2"/>
@@ -76,26 +77,29 @@
   <style name="search-match"                background="butter1"/>
 
   <!-- Comments -->
-  <style name="def:comment"                 foreground="skyblue3"/>
-  <style name="def:shebang"                 foreground="skyblue3" bold="true"/>
+  <style name="def:comment"                 foreground="aluminium4"/>
+  <style name="def:shebang"                 foreground="aluminium4" bold="true"/>
   <style name="def:doc-comment-element"     italic="true"/>
 
   <!-- Constants -->
   <style name="def:constant"                foreground="plum1"/>
-  <style name="def:special-char"            foreground="plum3"/>
+  <style name="def:string"                  foreground="plum1"/>
+  <style name="def:special-char"            foreground="plum2"/>
+  <style name="def:special-constant"        foreground="plum2"/>
+  <style name="def:floating-point"          foreground="plum2"/>
 
   <!-- Identifiers -->
   <style name="def:identifier"              foreground="skyblue2"/>
 
   <!-- Statements -->
-  <style name="def:statement"               foreground="scarletred3" bold="true"/>
+  <style name="def:statement"               foreground="aluminium6" bold="true"/>
 
   <!-- Types -->
   <style name="def:type"                    foreground="chameleon3" bold="true"/>
 
   <!-- Markup -->
   <style name="def:emphasis"                italic="true"/>
-  <style name="def:strong-emphasis"         foreground="scarletred3" bold="true"/>
+  <style name="def:strong-emphasis"         foreground="aluminium6" bold="true"/>
   <style name="def:inline-code"             foreground="skyblue2"/>
   <style name="def:insertion"               underline="single"/>
   <style name="def:deletion"                strikethrough="true"/>
@@ -105,12 +109,12 @@
   <style name="def:heading"                 foreground="chameleon3" bold="true"/>
   <style name="def:thematic-break"          foreground="chameleon3" bold="true"/>
   <style name="def:preformatted-section"    foreground="skyblue2"/>
-  <style name="def:list-marker"             foreground="scarletred3" bold="true"/>
+  <style name="def:list-marker"             foreground="aluminium6" bold="true"/>
 
   <!-- Others -->
   <style name="def:preprocessor"            foreground="chocolate3"/>
-  <style name="def:error"                   background="scarletred2" bold="true"/>
-  <style name="def:warning"                 background="plum1"/>
+  <style name="def:error"                   foreground="white" background="scarletred2" bold="true"/>
+  <style name="def:warning"                 foreground="white" background="plum1"/>
   <style name="def:note"                    background="orange1" bold="true"/>
   <style name="def:net-address"             italic="true" underline="single"/>
 
@@ -131,17 +135,13 @@
   <style name="diff:changed-line"           use-style="def:preprocessor"/>
   <style name="diff:diff-file"              use-style="def:type"/>
   <style name="diff:location"               use-style="def:statement"/>
-  <style name="diff:special-case"           use-style="def:constant"/>
+  <style name="diff:special-case"           use-style="def:statement"/>
 
-  <style name="xml:tags"                    foreground="chameleon3"/>
   <style name="xml:namespace"               bold="true"/>
 
-  <style name="js:built-in-constructor"     foreground="chameleon3"/>
-
   <style name="latex:display-math"          foreground="plum3"/>
   <style name="latex:command"               foreground="chameleon3" bold="true"/>
   <style name="latex:include"               use-style="def:preprocessor"/>
-  <style name="latex:special-char"          use-style="def:constant"/>
 
   <style name="sh:variable"                 foreground="plum3"/>
   <style name="sh:variable-definition"      foreground="chameleon3"/>