2016-03-26 13:07:00

1 files changed, 65 insertions, 3 deletions

diff --git a/tex/context/base/mkiv/colo-imp-rgb.mkiv b/tex/context/base/mkiv/colo-imp-rgb.mkiv
index d7b691fcc..58b2ca42c 100644
--- a/tex/context/base/mkiv/colo-imp-rgb.mkiv
+++ b/tex/context/base/mkiv/colo-imp-rgb.mkiv
@@ -38,6 +38,9 @@
 \definecolor [lightred]      [r=1,   g=0,   b=0]
 \definecolor [lightgreen]    [r=0,   g=1,   b=0]
 \definecolor [lightblue]     [r=0,   g=0,   b=1]
+\definecolor [lightcyan]     [r=0,   g=1,   b=1]
+\definecolor [lightmagenta]  [r=1,   g=0,   b=1]
+\definecolor [lightyellow]   [r=1,   g=1,   b=0]
 
 \definecolor [middlered]     [r=.8,  g=0,   b=0]
 \definecolor [middlegreen]   [r=0,   g=.8,  b=0]
@@ -87,12 +90,15 @@
 
   \definecolor [donkercyaan]   [darkcyan]
   \definecolor [middelcyaan]   [middlecyan]
+  \definecolor [lichtcyaan]    [lightcyan]
 
   \definecolor [donkermagenta] [darkmagenta]
   \definecolor [middelmagenta] [middlemagenta]
+  \definecolor [lichtmagenta]  [lightmagenta]
 
   \definecolor [donkergeel]    [darkyellow]
   \definecolor [middelgeel]    [middleyellow]
+  \definecolor [lichtgeel]     [lightyellow]
 
   \definecolor [donkergrijs]   [darkgray]
   \definecolor [middengrijs]   [middlegray]
@@ -128,12 +134,15 @@
 
   \definecolor [dunkelcyan]    [darkcyan]
   \definecolor [mittelcyan]    [middlecyan]
+  \definecolor [hellcyan]      [lightcyan]
 
   \definecolor [dunkelmagenta] [darkmagenta]
   \definecolor [mittelmagenta] [middlemagenta]
+  \definecolor [hellmagenta]   [lightmagenta]
 
   \definecolor [dunkelgelb]    [darkyellow]
   \definecolor [mittelgelb]    [middleyellow]
+  \definecolor [hellgelb]      [lightyellow]
 
   \definecolor [dunkelgrau]    [darkgray]
   \definecolor [mittelgrau]    [middlegray]
@@ -168,12 +177,15 @@
 
   \definecolor [tmaveazurova]   [darkcyan]
   \definecolor [stredneazurova] [middlecyan]
+  \definecolor [svelteazurova]  [lightcyan]
 
   \definecolor [tmavefialova]   [darkmagenta]
   \definecolor [strednefialova] [middlemagenta]
+  \definecolor [sveltefialova]  [lightmagenta]
 
   \definecolor [tmavezluta]     [darkyellow]
   \definecolor [strednezluta]   [middleyellow]
+  \definecolor [sveltezluta]    [lightyellow]
 
   \definecolor [tmaveseda]      [darkgray]
   \definecolor [stredneseda]    [middlegray]
@@ -210,14 +222,16 @@
   \definecolor [bluchiaro]     [lightblue]
 
   \definecolor [azzurroscuro]  [darkcyan]
-  \definecolor [azzurrochiaro] [middlecyan]
+  \definecolor [azzurromedio]  [middlecyan]
+  \definecolor [azzurrochiaro] [lightcyan]
 
   \definecolor [cremisiscuro]  [darkmagenta]
-  \definecolor [cremisichiaro] [middlemagenta]
-
+  \definecolor [cremisimedio]  [middlemagenta]
+  \definecolor [cremisichiaro] [lightmagenta]
 
   \definecolor [gialloscuro]     [darkyellow]
   \definecolor [giallomedio]     [middleyellow]
+  \definecolor [giallochiaro]    [lightyellow]
 
   \definecolor [grigioscuro]     [darkgray]
   \definecolor [grigiomedio]     [middlegray]
@@ -225,6 +239,50 @@
 
 \stopinterface
 
+\startinterface french
+
+  \definecolor [rouge]         [red]
+  \definecolor [vert]          [green]
+  \definecolor [bleu]          [blue]
+
+  \definecolor [cyan]          [cyan]
+  \definecolor [magenta]       [magenta]
+  \definecolor [jaune]         [yellow]
+
+  \definecolor [blanche]       [white]
+  \definecolor [gris]          [gray]
+  \definecolor [noir]          [black]
+
+  \definecolor [rougefoncé]    [darkred]
+  \definecolor [rougemoyen]    [middlered]
+  \definecolor [rougeclair]    [lightred]
+
+  \definecolor [vertfoncé]     [darkgreen]
+  \definecolor [vertmoyen]     [middlegreen]
+  \definecolor [vertclair]     [lightgreen]
+
+  \definecolor [bleufoncé]     [darkblue]
+  \definecolor [bleumoyen]     [middleblue]
+  \definecolor [bleuclair]     [lightblue]
+
+  \definecolor [cyanfoncé]     [darkcyan]
+  \definecolor [cyanmoyen]     [middlecyan]
+  \definecolor [cyanclair]     [lightcyan]
+
+  \definecolor [magentafoncé]  [darkmagenta]
+  \definecolor [magentamoyen]  [middlemagenta]
+  \definecolor [magentaclair]  [lightmagenta]
+
+  \definecolor [jaunefoncé]    [darkyellow]
+  \definecolor [jaunemoyen]    [middleyellow]
+  \definecolor [jauneclair]    [lightyellow]
+
+  \definecolor [grisfoncé]     [darkgray]
+  \definecolor [grismoyen]     [middlegray]
+  \definecolor [grisclair]     [lightgray]
+
+\stopinterface
+
 \startinterface romanian
 
   \definecolor [rosu]            [red]
@@ -253,12 +311,15 @@
 
   \definecolor [cianinchis]      [darkcyan]
   \definecolor [cianmediu]       [middlecyan]
+  \definecolor [ciandeschis]     [lightcyan]
 
   \definecolor [magentainchis]   [darkmagenta]
   \definecolor [magentamediu]    [middlemagenta]
+  \definecolor [magentadeschis]  [lightmagenta]
 
   \definecolor [galbeninchis]    [darkyellow]
   \definecolor [galbenmediu]     [middleyellow]
+  \definecolor [galbendeschis]   [lightyellow]
 
   \definecolor [griinchis]       [darkgray]
   \definecolor [grimediu]        [middlegray]
@@ -269,6 +330,7 @@
 %D Bonus (needed for FO test):
 
 \definecolor [orange]       [r=1, g=.5]
+\definecolor [lightorange]  [r=1, g=.5]
 \definecolor [middleorange] [r=.6,g=.3]
 \definecolor [darkorange]   [r=.4,g=.2]