diff --git a/lib/ace/theme/clouds.js b/lib/ace/theme/clouds.js index 31db8dd0..389c82e3 100644 --- a/lib/ace/theme/clouds.js +++ b/lib/ace/theme/clouds.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #000000;\ }\ - \ +\ .ace-clouds .ace_marker-layer .ace_selection {\ background: #BDD5FC;\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-clouds .ace_marker-layer .ace_selected_word {\ border: 1px solid #BDD5FC;\ }\ - \ +\ .ace-clouds .ace_invisible {\ color: #BFBFBF;\ }\ diff --git a/lib/ace/theme/clouds_midnight.js b/lib/ace/theme/clouds_midnight.js index 96a3fe74..de6fea2e 100644 --- a/lib/ace/theme/clouds_midnight.js +++ b/lib/ace/theme/clouds_midnight.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #7DA5DC;\ }\ - \ +\ .ace-clouds-midnight .ace_marker-layer .ace_selection {\ background: #000000;\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-clouds-midnight .ace_marker-layer .ace_selected_word {\ border: 1px solid #000000;\ }\ - \ +\ .ace-clouds-midnight .ace_invisible {\ color: #BFBFBF;\ }\ diff --git a/lib/ace/theme/cobalt.js b/lib/ace/theme/cobalt.js index a13f8db5..4631fef2 100644 --- a/lib/ace/theme/cobalt.js +++ b/lib/ace/theme/cobalt.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #FFFFFF;\ }\ - \ +\ .ace-cobalt .ace_marker-layer .ace_selection {\ background: rgba(179, 101, 57, 0.75);\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-cobalt .ace_marker-layer .ace_selected_word {\ border: 1px solid rgba(179, 101, 57, 0.75);\ }\ - \ +\ .ace-cobalt .ace_invisible {\ color: rgba(255, 255, 255, 0.15);\ }\ @@ -109,6 +109,14 @@ exports.cssText = "\ color:#FF628C;\ }\ \ +.ace-cobalt .ace_constant.ace_character, {\ + color:#FF628C;\ +}\ +\ +.ace-cobalt .ace_constant.ace_character.ace_escape, {\ + color:#FF628C;\ +}\ +\ .ace-cobalt .ace_invalid {\ color:#F8F8F8;\ background-color:#800F00;\ diff --git a/lib/ace/theme/dawn.js b/lib/ace/theme/dawn.js index de78eede..3967d959 100644 --- a/lib/ace/theme/dawn.js +++ b/lib/ace/theme/dawn.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #000000;\ }\ - \ +\ .ace-dawn .ace_marker-layer .ace_selection {\ background: rgba(39, 95, 255, 0.30);\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-dawn .ace_marker-layer .ace_selected_word {\ border: 1px solid rgba(39, 95, 255, 0.30);\ }\ - \ +\ .ace-dawn .ace_invisible {\ color: rgba(75, 75, 126, 0.50);\ }\ @@ -109,6 +109,14 @@ exports.cssText = "\ color:#811F24;\ }\ \ +.ace-dawn .ace_constant.ace_character, {\ + color:#811F24;\ +}\ +\ +.ace-dawn .ace_constant.ace_character.ace_escape, {\ + color:#811F24;\ +}\ +\ .ace-dawn .ace_invalid.ace_illegal {\ text-decoration:underline;\ font-style:italic;\ diff --git a/lib/ace/theme/idle_fingers.js b/lib/ace/theme/idle_fingers.js index 7a90540d..551e7811 100644 --- a/lib/ace/theme/idle_fingers.js +++ b/lib/ace/theme/idle_fingers.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #91FF00;\ }\ - \ +\ .ace-idle-fingers .ace_marker-layer .ace_selection {\ background: rgba(90, 100, 126, 0.88);\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-idle-fingers .ace_marker-layer .ace_selected_word {\ border: 1px solid rgba(90, 100, 126, 0.88);\ }\ - \ +\ .ace-idle-fingers .ace_invisible {\ color: #404040;\ }\ @@ -109,6 +109,14 @@ exports.cssText = "\ color:#6C99BB;\ }\ \ +.ace-idle-fingers .ace_constant.ace_character, {\ + color:#6C99BB;\ +}\ +\ +.ace-idle-fingers .ace_constant.ace_character.ace_escape, {\ + color:#6C99BB;\ +}\ +\ .ace-idle-fingers .ace_invalid {\ color:#FFFFFF;\ background-color:#FF0000;\ @@ -158,7 +166,7 @@ color:#BC9458;\ \ .ace-idle-fingers .ace_collab.ace_user1 {\ color:#323232;\ -background-color:#FFF980; \ +background-color:#FFF980;\ }"; var dom = require("../lib/dom"); diff --git a/lib/ace/theme/kr_theme.js b/lib/ace/theme/kr_theme.js index 66fe58c2..56313438 100644 --- a/lib/ace/theme/kr_theme.js +++ b/lib/ace/theme/kr_theme.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #FF9900;\ }\ - \ +\ .ace-kr-theme .ace_marker-layer .ace_selection {\ background: rgba(170, 0, 255, 0.45);\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-kr-theme .ace_marker-layer .ace_selected_word {\ border: 1px solid rgba(170, 0, 255, 0.45);\ }\ - \ +\ .ace-kr-theme .ace_invisible {\ color: rgba(255, 177, 111, 0.32);\ }\ @@ -109,6 +109,14 @@ exports.cssText = "\ color:rgba(210, 117, 24, 0.76);\ }\ \ +.ace-kr-theme .ace_constant.ace_character, {\ + color:rgba(210, 117, 24, 0.76);\ +}\ +\ +.ace-kr-theme .ace_constant.ace_character.ace_escape, {\ + color:rgba(210, 117, 24, 0.76);\ +}\ +\ .ace-kr-theme .ace_invalid {\ color:#F8F8F8;\ background-color:#A41300;\ diff --git a/lib/ace/theme/merbivore.js b/lib/ace/theme/merbivore.js index de2f396b..ddc09766 100644 --- a/lib/ace/theme/merbivore.js +++ b/lib/ace/theme/merbivore.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #FFFFFF;\ }\ - \ +\ .ace-merbivore .ace_marker-layer .ace_selection {\ background: #454545;\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-merbivore .ace_marker-layer .ace_selected_word {\ border: 1px solid #454545;\ }\ - \ +\ .ace-merbivore .ace_invisible {\ color: #404040;\ }\ @@ -109,6 +109,14 @@ exports.cssText = "\ color:#1EDAFB;\ }\ \ +.ace-merbivore .ace_constant.ace_character, {\ + color:#1EDAFB;\ +}\ +\ +.ace-merbivore .ace_constant.ace_character.ace_escape, {\ + color:#1EDAFB;\ +}\ +\ .ace-merbivore .ace_constant.ace_language {\ color:#FDC251;\ }\ diff --git a/lib/ace/theme/merbivore_soft.js b/lib/ace/theme/merbivore_soft.js index dce3cebd..d684ff63 100644 --- a/lib/ace/theme/merbivore_soft.js +++ b/lib/ace/theme/merbivore_soft.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #FFFFFF;\ }\ - \ +\ .ace-merbivore-soft .ace_marker-layer .ace_selection {\ background: #494949;\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-merbivore-soft .ace_marker-layer .ace_selected_word {\ border: 1px solid #494949;\ }\ - \ +\ .ace-merbivore-soft .ace_invisible {\ color: #404040;\ }\ @@ -109,6 +109,14 @@ exports.cssText = "\ color:#68C1D8;\ }\ \ +.ace-merbivore-soft .ace_constant.ace_character, {\ + color:#68C1D8;\ +}\ +\ +.ace-merbivore-soft .ace_constant.ace_character.ace_escape, {\ + color:#68C1D8;\ +}\ +\ .ace-merbivore-soft .ace_constant.ace_language {\ color:#E1C582;\ }\ diff --git a/lib/ace/theme/mono_industrial.js b/lib/ace/theme/mono_industrial.js index 21f4e6f8..ae4274cb 100644 --- a/lib/ace/theme/mono_industrial.js +++ b/lib/ace/theme/mono_industrial.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #FFFFFF;\ }\ - \ +\ .ace-mono-industrial .ace_marker-layer .ace_selection {\ background: rgba(145, 153, 148, 0.40);\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-mono-industrial .ace_marker-layer .ace_selected_word {\ border: 1px solid rgba(145, 153, 148, 0.40);\ }\ - \ +\ .ace-mono-industrial .ace_invisible {\ color: rgba(102, 108, 104, 0.50);\ }\ @@ -113,6 +113,14 @@ exports.cssText = "\ color:#E98800;\ }\ \ +.ace-mono-industrial .ace_constant.ace_character, {\ + color:#E98800;\ +}\ +\ +.ace-mono-industrial .ace_constant.ace_character.ace_escape, {\ + color:#E98800;\ +}\ +\ .ace-mono-industrial .ace_constant.ace_numeric {\ color:#E98800;\ }\ diff --git a/lib/ace/theme/monokai.js b/lib/ace/theme/monokai.js index c1a5a2d8..2794ff45 100644 --- a/lib/ace/theme/monokai.js +++ b/lib/ace/theme/monokai.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #F8F8F0;\ }\ - \ +\ .ace-monokai .ace_marker-layer .ace_selection {\ background: #49483E;\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-monokai .ace_marker-layer .ace_selected_word {\ border: 1px solid #49483E;\ }\ - \ +\ .ace-monokai .ace_invisible {\ color: #49483E;\ }\ diff --git a/lib/ace/theme/pastel_on_dark.js b/lib/ace/theme/pastel_on_dark.js index 415ffaf2..d0ad8bd6 100644 --- a/lib/ace/theme/pastel_on_dark.js +++ b/lib/ace/theme/pastel_on_dark.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #A7A7A7;\ }\ - \ +\ .ace-pastel-on-dark .ace_marker-layer .ace_selection {\ background: rgba(221, 240, 255, 0.20);\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-pastel-on-dark .ace_marker-layer .ace_selected_word {\ border: 1px solid rgba(221, 240, 255, 0.20);\ }\ - \ +\ .ace-pastel-on-dark .ace_invisible {\ color: rgba(255, 255, 255, 0.25);\ }\ @@ -113,6 +113,14 @@ exports.cssText = "\ color:#4FB7C5;\ }\ \ +.ace-pastel-on-dark .ace_constant.ace_character, {\ + color:#4FB7C5;\ +}\ +\ +.ace-pastel-on-dark .ace_constant.ace_character.ace_escape, {\ + color:#4FB7C5;\ +}\ +\ .ace-pastel-on-dark .ace_constant.ace_language {\ color:#DE8E30;\ }\ diff --git a/lib/ace/theme/solarized_dark.js b/lib/ace/theme/solarized_dark.js index 0a18111e..fcf0ae42 100644 --- a/lib/ace/theme/solarized_dark.js +++ b/lib/ace/theme/solarized_dark.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #D30102;\ }\ - \ +\ .ace-solarized-dark .ace_marker-layer .ace_selection {\ background: #073642;\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-solarized-dark .ace_marker-layer .ace_selected_word {\ border: 1px solid #073642;\ }\ - \ +\ .ace-solarized-dark .ace_invisible {\ color: rgba(147, 161, 161, 0.50);\ }\ diff --git a/lib/ace/theme/solarized_light.js b/lib/ace/theme/solarized_light.js index e6866d08..9191e556 100644 --- a/lib/ace/theme/solarized_light.js +++ b/lib/ace/theme/solarized_light.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #000000;\ }\ - \ +\ .ace-solarized-light .ace_marker-layer .ace_selection {\ background: #073642;\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-solarized-light .ace_marker-layer .ace_selected_word {\ border: 1px solid #073642;\ }\ - \ +\ .ace-solarized-light .ace_invisible {\ color: rgba(147, 161, 161, 0.50);\ }\ diff --git a/lib/ace/theme/textmate.js b/lib/ace/theme/textmate.js index 8bc8d7c4..8931e60a 100644 --- a/lib/ace/theme/textmate.js +++ b/lib/ace/theme/textmate.js @@ -84,6 +84,10 @@ exports.cssText = ".ace-tm .ace_editor {\ color: blue;\ }\ \ +.ace-tm .ace_line .ace_constant {\ + color: rgb(197, 6, 11);\ +}\ +\ .ace-tm .ace_line .ace_constant.ace_buildin {\ color: rgb(88, 72, 246);\ }\ diff --git a/lib/ace/theme/tomorrow.js b/lib/ace/theme/tomorrow.js index c42902f1..a891f06a 100644 --- a/lib/ace/theme/tomorrow.js +++ b/lib/ace/theme/tomorrow.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #AEAFAD;\ }\ - \ +\ .ace-tomorrow .ace_marker-layer .ace_selection {\ background: #D6D6D6;\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-tomorrow .ace_marker-layer .ace_selected_word {\ border: 1px solid #D6D6D6;\ }\ - \ +\ .ace-tomorrow .ace_invisible {\ color: #D1D1D1;\ }\ diff --git a/lib/ace/theme/tomorrow_night.js b/lib/ace/theme/tomorrow_night.js index e6638144..bb8e3a21 100644 --- a/lib/ace/theme/tomorrow_night.js +++ b/lib/ace/theme/tomorrow_night.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #AEAFAD;\ }\ - \ +\ .ace-tomorrow-night .ace_marker-layer .ace_selection {\ background: #373B41;\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-tomorrow-night .ace_marker-layer .ace_selected_word {\ border: 1px solid #373B41;\ }\ - \ +\ .ace-tomorrow-night .ace_invisible {\ color: #4B4E55;\ }\ diff --git a/lib/ace/theme/tomorrow_night_blue.js b/lib/ace/theme/tomorrow_night_blue.js index f81499f3..f8e5c0d8 100644 --- a/lib/ace/theme/tomorrow_night_blue.js +++ b/lib/ace/theme/tomorrow_night_blue.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #FFFFFF;\ }\ - \ +\ .ace-tomorrow-night-blue .ace_marker-layer .ace_selection {\ background: #003F8E;\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-tomorrow-night-blue .ace_marker-layer .ace_selected_word {\ border: 1px solid #003F8E;\ }\ - \ +\ .ace-tomorrow-night-blue .ace_invisible {\ color: #404F7D;\ }\ diff --git a/lib/ace/theme/tomorrow_night_bright.js b/lib/ace/theme/tomorrow_night_bright.js index e797641a..d294cbfc 100644 --- a/lib/ace/theme/tomorrow_night_bright.js +++ b/lib/ace/theme/tomorrow_night_bright.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #9F9F9F;\ }\ - \ +\ .ace-tomorrow-night-bright .ace_marker-layer .ace_selection {\ background: #424242;\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-tomorrow-night-bright .ace_marker-layer .ace_selected_word {\ border: 1px solid #424242;\ }\ - \ +\ .ace-tomorrow-night-bright .ace_invisible {\ color: #343434;\ }\ diff --git a/lib/ace/theme/tomorrow_night_eighties.js b/lib/ace/theme/tomorrow_night_eighties.js index cd815ca2..6c4efbd8 100644 --- a/lib/ace/theme/tomorrow_night_eighties.js +++ b/lib/ace/theme/tomorrow_night_eighties.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #CCCCCC;\ }\ - \ +\ .ace-tomorrow-night-eighties .ace_marker-layer .ace_selection {\ background: #515151;\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-tomorrow-night-eighties .ace_marker-layer .ace_selected_word {\ border: 1px solid #515151;\ }\ - \ +\ .ace-tomorrow-night-eighties .ace_invisible {\ color: #6A6A6A;\ }\ diff --git a/lib/ace/theme/twilight.js b/lib/ace/theme/twilight.js index f66991ef..728b9922 100644 --- a/lib/ace/theme/twilight.js +++ b/lib/ace/theme/twilight.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #A7A7A7;\ }\ - \ +\ .ace-twilight .ace_marker-layer .ace_selection {\ background: rgba(221, 240, 255, 0.20);\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-twilight .ace_marker-layer .ace_selected_word {\ border: 1px solid rgba(221, 240, 255, 0.20);\ }\ - \ +\ .ace-twilight .ace_invisible {\ color: rgba(255, 255, 255, 0.25);\ }\ @@ -109,6 +109,14 @@ exports.cssText = "\ color:#CF6A4C;\ }\ \ +.ace-twilight .ace_constant.ace_character, {\ + color:#CF6A4C;\ +}\ +\ +.ace-twilight .ace_constant.ace_character.ace_escape, {\ + color:#CF6A4C;\ +}\ +\ .ace-twilight .ace_invalid.ace_illegal {\ color:#F8F8F8;\ background-color:rgba(86, 45, 86, 0.75);\ diff --git a/lib/ace/theme/vibrant_ink.js b/lib/ace/theme/vibrant_ink.js index 3354a2e7..6ac945c3 100644 --- a/lib/ace/theme/vibrant_ink.js +++ b/lib/ace/theme/vibrant_ink.js @@ -75,7 +75,7 @@ exports.cssText = "\ border-left: 0px;\ border-bottom: 1px solid #FFFFFF;\ }\ - \ +\ .ace-vibrant-ink .ace_marker-layer .ace_selection {\ background: #6699CC;\ }\ @@ -96,7 +96,7 @@ exports.cssText = "\ .ace-vibrant-ink .ace_marker-layer .ace_selected_word {\ border: 1px solid #6699CC;\ }\ - \ +\ .ace-vibrant-ink .ace_invisible {\ color: #404040;\ }\ @@ -109,6 +109,14 @@ exports.cssText = "\ color:#339999;\ }\ \ +.ace-vibrant-ink .ace_constant.ace_character, {\ + color:#339999;\ +}\ +\ +.ace-vibrant-ink .ace_constant.ace_character.ace_escape, {\ + color:#339999;\ +}\ +\ .ace-vibrant-ink .ace_constant.ace_numeric {\ color:#99CC99;\ }\ diff --git a/tool/Theme.tmpl.css b/tool/Theme.tmpl.css index 6f2962c3..6585a895 100644 --- a/tool/Theme.tmpl.css +++ b/tool/Theme.tmpl.css @@ -34,7 +34,7 @@ border-left: 0px; border-bottom: 1px solid %overwrite%; } - + .%cssClass% .ace_marker-layer .ace_selection { background: %selection%; } @@ -55,7 +55,7 @@ .%cssClass% .ace_marker-layer .ace_selected_word { %selected_word_highlight% } - + .%cssClass% .ace_invisible { %invisible% } @@ -72,6 +72,14 @@ %constant% } +.%cssClass% .ace_constant.ace_character, { + %constant% +} + +.%cssClass% .ace_constant.ace_character.ace_escape, { + %constant% +} + .%cssClass% .ace_constant.ace_language { %constant.language% } @@ -230,5 +238,5 @@ } .%cssClass% .ace_collab.ace_user1 { - %collab.user1% + %collab.user1% } \ No newline at end of file diff --git a/tool/tmtheme.js b/tool/tmtheme.js old mode 100644 new mode 100755 index bfda3f1f..34fc4836 --- a/tool/tmtheme.js +++ b/tool/tmtheme.js @@ -8,16 +8,16 @@ function plistToJson(el) { return $plistParse(el.selectSingleNode("dict")); } -function $plistParse(el) { +function $plistParse(el) { if (el.tagName == "dict") { var dict = {}; var key; var childNodes = el.childNodes; for (var i=0, l=childNodes.length; i