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

html.jsf

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

java.jsf

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

js.jsf

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