Move <script> Javascript highlighting from java.java(script) to js.js(html)

This commit is contained in:
cn 2012-05-13 01:05:48 +02:00
parent 370e61b5b2
commit f17483d34f
3 changed files with 18 additions and 7 deletions

View File

@ -174,7 +174,7 @@ done
.ifdef php .ifdef php
* tag_begin call=php.php(script) * tag_begin call=php.php(script)
.else .else
* tag_begin call=java.java(script) * tag_begin call=js.js(html)
.endif .endif
:stag_done TagEdge :stag_done TagEdge

View File

@ -37,12 +37,7 @@
"'" char recolor=-1 "'" char recolor=-1
"a-zA-Z_" ident mark buffer "a-zA-Z_" ident mark buffer
"{}" brace recolor=-1 "{}" brace recolor=-1
.ifdef script
",:;=()>[]*&|!~+\-%^" control recolor=-1
"<" maybe_done
.else
",:;=()><[]*&|!~+\-%^" control recolor=-1 ",:;=()><[]*&|!~+\-%^" control recolor=-1
.endif
:maybe_done Control :maybe_done Control
* idle noeat * idle noeat

18
js.jsf
View File

@ -21,6 +21,11 @@
=Methods =Methods
=Number cyan #fg_520 # orange =Number cyan #fg_520 # orange
:begin Idle
* begin noeat call=.js()
.subr js
:idle Idle :idle Idle
* idle * idle
"\n" idle "\n" idle
@ -32,7 +37,12 @@
"'" char recolor=-1 "'" char recolor=-1
"a-zA-Z_" ident mark buffer "a-zA-Z_" ident mark buffer
"{}" brace recolor=-1 "{}" brace recolor=-1
",:;=()><[]*&|!?~+\-%^" control recolor=-1 .ifdef html
",:;=()>[]*&|!?~+\-%^" control recolor=-1
"<" maybe_done
.else
",:;=()><[]*&|!?~+\-%^" control recolor=-1
.endif
# / / regex not allowed after terms # / / regex not allowed after terms
# class Control to handle ')' right # class Control to handle ')' right
@ -42,6 +52,10 @@
"%" control recolor=-1 "%" control recolor=-1
"/" after_term_slash "/" after_term_slash
:maybe_done Control
* idle noeat
"/" idle noeat return recolor=-2
:brace Brace :brace Brace
* idle noeat * idle noeat
@ -259,6 +273,8 @@ done
:method_end Methods :method_end Methods
* idle noeat * idle noeat
.end
.subr comment_todo .subr comment_todo
# initial state # initial state
:comment_todo_init Comment :comment_todo_init Comment