jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1464 from ajaxorg/highlighting/markdown

Browse source 
Tweak heading and list highlighting in markdown mode
This commit is contained in:
Lennart Kats 2013-06-28 15:15:25 -07:00
commit 76fd4b1358
26 changed files with 34 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/ace/mode/_test/tokens_markdown.json
View file

@ -4,28 +4,28 @@
],[ ],[
"start", "start",
["markup.heading.1","#"], ["markup.heading.1","#"],
["markup.heading","f"] ["heading","f"]
],[ ],[
"start", "start",
["text","test: header 2"] ["text","test: header 2"]
],[ ],[
"start", "start",
["markup.heading.2","##"], ["markup.heading.2","##"],
["markup.heading"," foo"] ["heading"," foo"]
],[ ],[
"start", "start",
["text","test: header ends with ' #'"] ["text","test: header ends with ' #'"]
],[ ],[
"start", "start",
["markup.heading.1","#"], ["markup.heading.1","#"],
["markup.heading"," # # "] ["heading"," # # "]
],[ ],[
"start", "start",
["text","test: header ends with '#'"] ["text","test: header ends with '#'"]
],[ ],[
"start", "start",
["markup.heading.1","#"], ["markup.heading.1","#"],
["markup.heading","foo# "] ["heading","foo# "]
],[ ],[
"start", "start",
["text","test: 6+ #s is not a valid header"] ["text","test: 6+ #s is not a valid header"]
@ -49,13 +49,13 @@
],[ ],[
"start", "start",
["markup.heading.1","#"], ["markup.heading.1","#"],
["markup.heading"," test links "], ["heading"," test links "],
["text","["], ["text","["],
["string","Cloud9 IDE"], ["string","Cloud9 IDE"],
["text","]("], ["text","]("],
["markup.underline","http://www.c9.io/"], ["markup.underline","http://www.c9.io/"],
["text",")"], ["text",")"],
["markup.heading"," #"] ["heading"," #"]
],[ ],[
"listblock", "listblock",
["markup.list","* "], ["markup.list","* "],
@ -64,17 +64,18 @@
["text","]("], ["text","]("],
["markup.underline","http://ajaxorg.github.com/ace/"], ["markup.underline","http://ajaxorg.github.com/ace/"],
["text",")"], ["text",")"],
["markup.list"," "] ["list"," "]
],[ ],[
"listblock", "listblock",
["markup.list","* usually "], ["markup.list","* "],
["list","usually "],
["string","*work*"], ["string","*work*"],
["markup.list"," fine ("], ["list"," fine ("],
["string","_em_"], ["string","_em_"],
["markup.list",")"] ["list",")"]
],[ ],[
"listblock", "listblock",
["markup.list","in lists"] ["list","in lists"]
],[ ],[
"start" "start"
],[ ],[

4
lib/ace/mode/markdown_highlight_rules.js
View file

@ -140,7 +140,7 @@ var MarkdownHighlightRules = function() {
}, { }, {
include: "basic" include: "basic"
}, { }, {
defaultToken : "markup.heading" defaultToken : "heading"
} ], } ],
"listblock-start" : [{ "listblock-start" : [{
@ -160,7 +160,7 @@ var MarkdownHighlightRules = function() {
}, { }, {
include : "basic", noEscape: true include : "basic", noEscape: true
}, { }, {
defaultToken : "markup.list" defaultToken : "list"
} ], } ],
"blockquote" : [ { // BLockquotes only escape on blank lines. "blockquote" : [ { // BLockquotes only escape on blank lines.

4
lib/ace/theme/chrome.css
View file

@ -97,11 +97,11 @@
} }
.ace-chrome .ace_markup.ace_heading { .ace-chrome .ace_heading {
color: rgb(12, 7, 255); color: rgb(12, 7, 255);
} }
.ace-chrome .ace_markup.ace_list { .ace-chrome .ace_list {
color:rgb(185, 6, 144); color:rgb(185, 6, 144);
} }

4
lib/ace/theme/clouds.css
View file

@ -112,10 +112,6 @@
color: #606060 color: #606060
} }
.ace-clouds .ace_markup.ace_underline {
text-decoration: underline
}
.ace-clouds .ace_indent-guide { .ace-clouds .ace_indent-guide {
background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y
} }

4
lib/ace/theme/clouds_midnight.css
View file

@ -113,10 +113,6 @@
color: #606060 color: #606060
} }
.ace-clouds-midnight .ace_markup.ace_underline {
text-decoration: underline
}
.ace-clouds-midnight .ace_indent-guide { .ace-clouds-midnight .ace_indent-guide {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHB3d/8PAAOIAdULw8qMAAAAAElFTkSuQmCC) right repeat-y; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHB3d/8PAAOIAdULw8qMAAAAAElFTkSuQmCC) right repeat-y;
} }

8
lib/ace/theme/cobalt.css
View file

@ -123,16 +123,12 @@
color: #9EFFFF color: #9EFFFF
} }
.ace-cobalt .ace_markup.ace_underline { .ace-cobalt .ace_heading {
text-decoration: underline
}
.ace-cobalt .ace_markup.ace_heading {
color: #C8E4FD; color: #C8E4FD;
background-color: #001221 background-color: #001221
} }
.ace-cobalt .ace_markup.ace_list { .ace-cobalt .ace_list {
background-color: #130D26 background-color: #130D26
} }

8
lib/ace/theme/dawn.css
View file

@ -94,7 +94,7 @@
border-color: #080808 border-color: #080808
} }
.ace-dawn .ace_markup.ace_list, .ace-dawn .ace_list,
.ace-dawn .ace_support.ace_function { .ace-dawn .ace_support.ace_function {
color: #693A17 color: #693A17
} }
@ -121,11 +121,7 @@
color: #234A97 color: #234A97
} }
.ace-dawn .ace_markup.ace_underline { .ace-dawn .ace_heading {
text-decoration: underline
}
.ace-dawn .ace_markup.ace_heading {
color: #19356D color: #19356D
} }

4
lib/ace/theme/dreamweaver.css
View file

@ -105,11 +105,11 @@
} }
.ace-dreamweaver .ace_markup.ace_heading { .ace-dreamweaver .ace_heading {
color: rgb(12, 7, 255); color: rgb(12, 7, 255);
} }
.ace-dreamweaver .ace_markup.ace_list { .ace-dreamweaver .ace_list {
color:rgb(185, 6, 144); color:rgb(185, 6, 144);
} }

4
lib/ace/theme/idle_fingers.css
View file

@ -112,10 +112,6 @@
color: #FFC66D color: #FFC66D
} }
.ace-idle-fingers .ace_markup.ace_underline {
text-decoration: underline
}
.ace-idle-fingers .ace_collab.ace_user1 { .ace-idle-fingers .ace_collab.ace_user1 {
color: #323232; color: #323232;
background-color: #FFF980 background-color: #FFF980

6
lib/ace/theme/kr_theme.css
View file

@ -119,11 +119,7 @@
color: #BABD9C color: #BABD9C
} }
.ace-kr-theme .ace_markup.ace_underline { .ace-kr-theme .ace_list {
text-decoration: underline
}
.ace-kr-theme .ace_markup.ace_list {
background-color: #0F0040 background-color: #0F0040
} }

4
lib/ace/theme/merbivore.css
View file

@ -110,10 +110,6 @@
color: #FFFF89 color: #FFFF89
} }
.ace-merbivore .ace_markup.ace_underline {
text-decoration: underline
}
.ace-merbivore .ace_indent-guide { .ace-merbivore .ace_indent-guide {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQFxf3ZXB1df0PAAdsAmERTkEHAAAAAElFTkSuQmCC) right repeat-y; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQFxf3ZXB1df0PAAdsAmERTkEHAAAAAElFTkSuQmCC) right repeat-y;
} }

4
lib/ace/theme/merbivore_soft.css
View file

@ -111,10 +111,6 @@
color: #EAF1A3 color: #EAF1A3
} }
.ace-merbivore-soft .ace_markup.ace_underline {
text-decoration: underline
}
.ace-merbivore-soft .ace_indent-guide { .ace-merbivore-soft .ace_indent-guide {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWOQkpLyZfD09PwPAAfYAnaStpHRAAAAAElFTkSuQmCC) right repeat-y; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWOQkpLyZfD09PwPAAfYAnaStpHRAAAAAElFTkSuQmCC) right repeat-y;
} }

4
lib/ace/theme/mono_industrial.css
View file

@ -122,10 +122,6 @@
color: #909993 color: #909993
} }
.ace-mono-industrial .ace_markup.ace_underline {
text-decoration: underline
}
.ace-mono-industrial .ace_entity.ace_name.ace_tag { .ace-mono-industrial .ace_entity.ace_name.ace_tag {
color: #A65EFF color: #A65EFF
} }

4
lib/ace/theme/monokai.css
View file

@ -117,10 +117,6 @@
color: #75715E color: #75715E
} }
.ace-monokai .ace_markup.ace_underline {
text-decoration: underline
}
.ace-monokai .ace_indent-guide { .ace-monokai .ace_indent-guide {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ0FD0ZXBzd/wPAAjVAoxeSgNeAAAAAElFTkSuQmCC) right repeat-y; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ0FD0ZXBzd/wPAAjVAoxeSgNeAAAAAElFTkSuQmCC) right repeat-y;
} }

4
lib/ace/theme/pastel_on_dark.css
View file

@ -129,10 +129,6 @@
color: #494949 color: #494949
} }
.ace-pastel-on-dark .ace_markup.ace_underline {
text-decoration: underline
}
.ace-pastel-on-dark .ace_indent-guide { .ace-pastel-on-dark .ace_indent-guide {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYIiPj/8PAARgAh2NTMh8AAAAAElFTkSuQmCC) right repeat-y; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYIiPj/8PAARgAh2NTMh8AAAAAElFTkSuQmCC) right repeat-y;
} }

4
lib/ace/theme/solarized_dark.css
View file

@ -105,10 +105,6 @@
color: #657B83 color: #657B83
} }
.ace-solarized-dark .ace_markup.ace_underline {
text-decoration: underline
}
.ace-solarized-dark .ace_indent-guide { .ace-solarized-dark .ace_indent-guide {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNg0Db1ZVCxc/sPAAd4AlUHlLenAAAAAElFTkSuQmCC) right repeat-y; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNg0Db1ZVCxc/sPAAd4AlUHlLenAAAAAElFTkSuQmCC) right repeat-y;
} }

4
lib/ace/theme/solarized_light.css
View file

@ -106,10 +106,6 @@
color: #93A1A1 color: #93A1A1
} }
.ace-solarized-light .ace_markup.ace_underline {
text-decoration: underline
}
.ace-solarized-light .ace_indent-guide { .ace-solarized-light .ace_indent-guide {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHjy8NJ/AAjgA5fzQUmBAAAAAElFTkSuQmCC) right repeat-y; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHjy8NJ/AAjgA5fzQUmBAAAAAElFTkSuQmCC) right repeat-y;
} }

6
lib/ace/theme/terminal.css
View file

@ -115,7 +115,7 @@
color: #E7C547 color: #E7C547
} }
.ace-terminal-theme .ace_markup.ace_heading, .ace-terminal-theme .ace_heading,
.ace-terminal-theme .ace_string { .ace-terminal-theme .ace_string {
color: #B9CA4A color: #B9CA4A
} }
@ -132,10 +132,6 @@
color: orangered color: orangered
} }
.ace-terminal-theme .ace_markup.ace_underline {
text-decoration: underline
}
.ace-terminal-theme .ace_indent-guide { .ace-terminal-theme .ace_indent-guide {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYLBWV/8PAAK4AYnhiq+xAAAAAElFTkSuQmCC) right repeat-y; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYLBWV/8PAAK4AYnhiq+xAAAAAElFTkSuQmCC) right repeat-y;
} }

4
lib/ace/theme/textmate.css
View file

@ -105,11 +105,11 @@
} }
.ace-tm .ace_markup.ace_heading { .ace-tm .ace_heading {
color: rgb(12, 7, 255); color: rgb(12, 7, 255);
} }
.ace-tm .ace_markup.ace_list { .ace-tm .ace_list {
color:rgb(185, 6, 144); color:rgb(185, 6, 144);
} }

6
lib/ace/theme/tomorrow.css
View file

@ -108,7 +108,7 @@
color: #C99E00 color: #C99E00
} }
.ace-tomorrow .ace_markup.ace_heading, .ace-tomorrow .ace_heading,
.ace-tomorrow .ace_string { .ace-tomorrow .ace_string {
color: #718C00 color: #718C00
} }
@ -125,10 +125,6 @@
color: #8E908C color: #8E908C
} }
.ace-tomorrow .ace_markup.ace_underline {
text-decoration: underline
}
.ace-tomorrow .ace_indent-guide { .ace-tomorrow .ace_indent-guide {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bdu3f/BwAlfgctduB85QAAAABJRU5ErkJggg==) right repeat-y background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bdu3f/BwAlfgctduB85QAAAABJRU5ErkJggg==) right repeat-y
} }

6
lib/ace/theme/tomorrow_night.css
View file

@ -107,7 +107,7 @@
color: #F0C674 color: #F0C674
} }
.ace-tomorrow-night .ace_markup.ace_heading, .ace-tomorrow-night .ace_heading,
.ace-tomorrow-night .ace_string { .ace-tomorrow-night .ace_string {
color: #B5BD68 color: #B5BD68
} }
@ -124,10 +124,6 @@
color: #969896 color: #969896
} }
.ace-tomorrow-night .ace_markup.ace_underline {
text-decoration: underline
}
.ace-tomorrow-night .ace_indent-guide { .ace-tomorrow-night .ace_indent-guide {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHB3d/8PAAOIAdULw8qMAAAAAElFTkSuQmCC) right repeat-y; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHB3d/8PAAOIAdULw8qMAAAAAElFTkSuQmCC) right repeat-y;
} }

6
lib/ace/theme/tomorrow_night_blue.css
View file

@ -107,7 +107,7 @@
color: #FFEEAD color: #FFEEAD
} }
.ace-tomorrow-night-blue .ace_markup.ace_heading, .ace-tomorrow-night-blue .ace_heading,
.ace-tomorrow-night-blue .ace_string { .ace-tomorrow-night-blue .ace_string {
color: #D1F1A9 color: #D1F1A9
} }
@ -124,10 +124,6 @@
color: #7285B7 color: #7285B7
} }
.ace-tomorrow-night-blue .ace_markup.ace_underline {
text-decoration: underline
}
.ace-tomorrow-night-blue .ace_indent-guide { .ace-tomorrow-night-blue .ace_indent-guide {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYJDzqfwPAANXAeNsiA+ZAAAAAElFTkSuQmCC) right repeat-y; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYJDzqfwPAANXAeNsiA+ZAAAAAElFTkSuQmCC) right repeat-y;
} }

6
lib/ace/theme/tomorrow_night_bright.css
View file

@ -107,7 +107,7 @@
color: #E7C547 color: #E7C547
} }
.ace-tomorrow-night-bright .ace_markup.ace_heading, .ace-tomorrow-night-bright .ace_heading,
.ace-tomorrow-night-bright .ace_string { .ace-tomorrow-night-bright .ace_string {
color: #B9CA4A color: #B9CA4A
} }
@ -124,10 +124,6 @@
color: #969896 color: #969896
} }
.ace-tomorrow-night-bright .ace_markup.ace_underline {
text-decoration: underline
}
.ace-tomorrow-night-bright .ace_indent-guide { .ace-tomorrow-night-bright .ace_indent-guide {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYFBXV/8PAAJoAXX4kT2EAAAAAElFTkSuQmCC) right repeat-y; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYFBXV/8PAAJoAXX4kT2EAAAAAElFTkSuQmCC) right repeat-y;
} }

6
lib/ace/theme/tomorrow_night_eighties.css
View file

@ -107,7 +107,7 @@
color: #FFCC66 color: #FFCC66
} }
.ace-tomorrow-night-eighties .ace_markup.ace_heading, .ace-tomorrow-night-eighties .ace_heading,
.ace-tomorrow-night-eighties .ace_string { .ace-tomorrow-night-eighties .ace_string {
color: #99CC99 color: #99CC99
} }
@ -123,10 +123,6 @@
color: #F2777A color: #F2777A
} }
.ace-tomorrow-night-eighties .ace_markup.ace_underline {
text-decoration: underline
}
.ace-tomorrow-night-eighties .ace_indent-guide { .ace-tomorrow-night-eighties .ace_indent-guide {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ09NrYAgMjP4PAAtGAwchHMyAAAAAAElFTkSuQmCC) right repeat-y background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ09NrYAgMjP4PAAtGAwchHMyAAAAAAElFTkSuQmCC) right repeat-y
} }

8
lib/ace/theme/twilight.css
View file

@ -65,7 +65,7 @@
.ace-twilight .ace_constant.ace_character, .ace-twilight .ace_constant.ace_character,
.ace-twilight .ace_constant.ace_character.ace_escape, .ace-twilight .ace_constant.ace_character.ace_escape,
.ace-twilight .ace_constant.ace_other, .ace-twilight .ace_constant.ace_other,
.ace-twilight .ace_markup.ace_heading, .ace-twilight .ace_heading,
.ace-twilight .ace_support.ace_constant { .ace-twilight .ace_support.ace_constant {
color: #CF6A4C color: #CF6A4C
} }
@ -94,7 +94,7 @@
color: #DAD085 color: #DAD085
} }
.ace-twilight .ace_markup.ace_list, .ace-twilight .ace_list,
.ace-twilight .ace_storage { .ace-twilight .ace_storage {
color: #F9EE98 color: #F9EE98
} }
@ -126,10 +126,6 @@
color: #494949 color: #494949
} }
.ace-twilight .ace_markup.ace_underline {
text-decoration: underline
}
.ace-twilight .ace_indent-guide { .ace-twilight .ace_indent-guide {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQERFpYLC1tf0PAAgOAnPnhxyiAAAAAElFTkSuQmCC) right repeat-y; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQERFpYLC1tf0PAAgOAnPnhxyiAAAAAElFTkSuQmCC) right repeat-y;
} }