diff -u syntax/4gl.jsf syntax-new/4gl.jsf --- syntax/4gl.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/4gl.jsf 2010-02-02 18:19:51 +0300 @@ -7,9 +7,9 @@ # bg_white bg_cyan bg_magenta bg_blue bg_yellow bg_green bg_red bg_black =Idle -=Comment green +=Comment magenta =Constant cyan -=Type magenta +=Type bold white # conditional operators, blocks =Condition bold # buffer repositioning diff -u syntax/ada.jsf syntax-new/ada.jsf --- syntax/ada.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/ada.jsf 2010-02-02 18:19:51 +0300 @@ -3,10 +3,10 @@ # Define colors =Idle -=Comment green +=Comment magenta =Constant cyan =Escape bold cyan -=Keyword bold +=Keyword bold yellow =Operator bold :idle Idle diff -u syntax/asm.jsf syntax-new/asm.jsf --- syntax/asm.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/asm.jsf 2010-02-02 18:19:51 +0300 @@ -17,13 +17,13 @@ =Bad bold red =Preproc blue =Define bold blue -=Comment green +=Comment magenta =IncLocal cyan =IncSystem bold cyan =Constant cyan =Escape bold cyan -=Type bold -=Keyword bold +=Type bold white +=Keyword bold yellow =CppKeyword bold =Brace =Control diff -u syntax/awk.jsf syntax-new/awk.jsf --- syntax/awk.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/awk.jsf 2010-02-02 18:19:51 +0300 @@ -7,15 +7,15 @@ =Bad bold red =Preproc blue =Define bold blue -=Comment green +=Comment magenta =IncLocal cyan =IncSystem bold cyan =Constant cyan =Escape bold cyan -=Type bold -=Keyword bold +=Type bold white +=Keyword bold yellow =CppKeyword bold -=Brace magenta +=Brace green =Control :reset Idle diff -u syntax/c.jsf syntax-new/c.jsf --- syntax/c.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/c.jsf 2010-02-02 18:19:51 +0300 @@ -191,15 +191,15 @@ =Bad bold red =Preproc blue =Define bold blue -=Comment green +=Comment magenta =IncLocal cyan =IncSystem bold cyan =Constant cyan =Escape bold cyan -=Type bold -=Keyword bold +=Type white bold +=Keyword yellow bold =CppKeyword bold -=Brace magenta +=Brace green =Control :reset Idle diff -u syntax/cobol.jsf syntax-new/cobol.jsf --- syntax/cobol.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/cobol.jsf 2010-02-02 18:19:51 +0300 @@ -4,13 +4,13 @@ =Bad bold red =Preproc blue =Define bold blue -=Comment green +=Comment magenta =IncLocal cyan =IncSystem bold cyan =Constant cyan =Escape bold cyan -=Type bold -=Keyword bold +=Type bold white +=Keyword bold yellow :reset Idle * idle noeat diff -u syntax/conf.jsf syntax-new/conf.jsf --- syntax/conf.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/conf.jsf 2010-02-02 18:19:51 +0300 @@ -1,7 +1,7 @@ # JOE syntax highlight file for typical UNIX configuration files =Idle -=Comment green +=Comment magenta =String cyan =Escape bold red =Backtick blue diff -u syntax/csh.jsf syntax-new/csh.jsf --- syntax/csh.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/csh.jsf 2010-02-02 18:19:51 +0300 @@ -6,11 +6,11 @@ # Colors =Idle -=Comment green +=Comment magenta =Constant cyan =Escape bold cyan -=Keyword bold -=Var magenta +=Keyword bold yellow +=Var green # Syntax diff -u syntax/css.jsf syntax-new/css.jsf --- syntax/css.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/css.jsf 2010-02-02 18:19:51 +0300 @@ -6,11 +6,11 @@ # Define colors =Idle -=Comment green -=Class cyan -=Id red -=Tag magenta -=Keyword bold +=Comment magenta +=Class cyan +=Id red +=Tag green +=Keyword bold yellow =HTML :begin Idle diff -u syntax/haskell.jsf syntax-new/haskell.jsf --- syntax/haskell.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/haskell.jsf 2010-02-02 18:19:51 +0300 @@ -14,7 +14,7 @@ =VarId =VarSym =ReservedId bold -=Comment green +=Comment magenta =Pragma bold green =Error bg_red black =FloatNumber bold cyan diff -u syntax/java.jsf syntax-new/java.jsf --- syntax/java.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/java.jsf 2010-02-02 18:19:51 +0300 @@ -6,14 +6,14 @@ =Idle =Preproc blue =Define bold blue -=Comment green +=Comment magenta =Constant cyan =Escape bold cyan -=Type bold -=Keyword bold +=Type bold white +=Keyword bold yellow =Operator bold =Bad bold red -=Brace magenta +=Brace green =Control :begin Idle diff -u syntax/joerc.jsf syntax-new/joerc.jsf --- syntax/joerc.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/joerc.jsf 2010-02-02 18:19:51 +0300 @@ -1,7 +1,7 @@ # JOE syntax highlight file for typical UNIX configuration files =Idle -=Comment green +=Comment magenta =String cyan =Escape bold cyan =Bad bold red diff -u syntax/jsf.jsf syntax-new/jsf.jsf --- syntax/jsf.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/jsf.jsf 2010-02-02 18:19:51 +0300 @@ -33,14 +33,14 @@ ##################### =Idle -=Comment green +=Comment magenta =Conditional blue =Parameter bold blue -=Keyword bold -=Color yellow +=Keyword bold yellow +=Color green =StandardColor bold =State -=Subr magenta +=Subr bold magenta =Literal cyan =Escape bold cyan =Bad bold red diff -u syntax/lisp.jsf syntax-new/lisp.jsf --- syntax/lisp.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/lisp.jsf 2010-02-02 18:19:51 +0300 @@ -3,7 +3,7 @@ # Needs lots of work... =Idle -=Comment green +=Comment magenta =String cyan =Escape bold cyan diff -u syntax/lua.jsf syntax-new/lua.jsf --- syntax/lua.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/lua.jsf 2010-02-02 18:19:51 +0300 @@ -2,10 +2,10 @@ =Idle =Bad bold red -=Comment green +=Comment magenta =Constant cyan =Escape bold cyan -=Keyword bold +=Keyword bold yellow :idle Idle * idle diff -u syntax/m4.jsf syntax-new/m4.jsf --- syntax/m4.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/m4.jsf 2010-02-02 18:19:51 +0300 @@ -1,10 +1,10 @@ # m4 =Idle -=Comment green +=Comment magenta =Constant cyan -=Var magenta -=Brace bold magenta +=Var green +=Brace bold green =Kw bold :start Idle Только в syntax-new: make.jsf diff -u syntax/matlab.jsf syntax-new/matlab.jsf --- syntax/matlab.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/matlab.jsf 2010-02-02 18:19:51 +0300 @@ -3,10 +3,10 @@ # =Idle -=Comment green +=Comment magenta =Keyword blue -=String magenta -=Secondary magenta +=String green +=Secondary green =Error red =Command yellow diff -u syntax/ocaml.jsf syntax-new/ocaml.jsf --- syntax/ocaml.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/ocaml.jsf 2010-02-02 18:19:51 +0300 @@ -77,13 +77,13 @@ =Expr =Bad bold red -=Comment green +=Comment magenta =Literal cyan =Escape bold cyan -=Type bold -=Keyword bold +=Type bold white +=Keyword bold yellow =Operator blue -=Control magenta +=Control green =CapId blue =LowId =Stdlib bold blue diff -u syntax/perl.jsf syntax-new/perl.jsf --- syntax/perl.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/perl.jsf 2010-02-02 18:19:51 +0300 @@ -4,14 +4,14 @@ =Idle =Preproc blue -=Comment green +=Comment magenta =POD green =Constant cyan =Escape bold cyan -=Type bold -=Keyword bold +=Type bold white +=Keyword bold yellow =Bad bold red -=Var yellow +=Var green :begin Idle diff -u syntax/php.jsf syntax-new/php.jsf --- syntax/php.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/php.jsf 2010-02-02 18:19:51 +0300 @@ -16,13 +16,13 @@ # Define colors =Idle -=Comment green +=Comment magenta =Constant cyan =Constant_sq blue =Escape bold cyan -=Keyword bold -=Var red -=Methods bold +=Keyword yellow bold +=Var green +=Methods bold # Call HTML highlighter. It will call the PHP highlighter subroutine in this file. diff -u syntax/ps.jsf syntax-new/ps.jsf --- syntax/ps.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/ps.jsf 2010-02-02 18:19:51 +0300 @@ -4,7 +4,7 @@ =Bad bold red =Preproc blue =Define bold blue -=Comment green +=Comment magenta =IncLocal cyan =IncSystem bold cyan =Constant cyan diff -u syntax/python.jsf syntax-new/python.jsf --- syntax/python.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/python.jsf 2010-02-02 18:19:51 +0300 @@ -5,7 +5,7 @@ # * highlight function and class names? =Idle -=Comment green +=Comment magenta =Docstring cyan =DocEscape bold cyan =Constant cyan diff -u syntax/rexx.jsf syntax-new/rexx.jsf --- syntax/rexx.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/rexx.jsf 2010-02-02 18:19:51 +0300 @@ -2,10 +2,10 @@ =Idle =Bad bold red -=Comment green +=Comment magenta =Constant cyan =Escape bold cyan -=Keyword bold +=Keyword bold yellow :idle Idle * idle diff -u syntax/ruby.jsf syntax-new/ruby.jsf --- syntax/ruby.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/ruby.jsf 2010-02-02 18:19:51 +0300 @@ -7,14 +7,14 @@ =Idle =Preproc blue -=Comment green +=Comment magenta =POD green =Constant cyan =Escape bold cyan -=Type bold -=Keyword bold +=Type bold white +=Keyword bold yellow =Bad bold red -=Var yellow +=Var green # Detect pod diff -u syntax/sed.jsf syntax-new/sed.jsf --- syntax/sed.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/sed.jsf 2010-02-02 18:19:51 +0300 @@ -8,12 +8,12 @@ - =Idle -=Comment green +=Comment magenta =String cyan =Escape bold cyan =Bad red -=Keyword bold -=Delimiter magenta +=Keyword bold yellow +=Delimiter green # Zero address commands: # : } # Zero or one address: = a i q r diff -u syntax/sh.jsf syntax-new/sh.jsf --- syntax/sh.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/sh.jsf 2010-02-02 18:19:51 +0300 @@ -11,11 +11,11 @@ # Colors =Idle -=Comment green +=Comment magenta =Constant cyan =Escape bold cyan -=Keyword bold -=Var magenta +=Keyword yellow bold +=Var green # Syntax diff -u syntax/skill.jsf syntax-new/skill.jsf --- syntax/skill.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/skill.jsf 2010-02-02 18:19:51 +0300 @@ -3,12 +3,12 @@ # Written by Joachim Fenkes in 2005 =Idle -=Comment green +=Comment magenta =String cyan =Escape bold cyan =Bracket bold =Symbol bold blue -=Keyword bold +=Keyword bold yellow =Number bold magenta =Bad bold red diff -u syntax/sml.jsf syntax-new/sml.jsf --- syntax/sml.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/sml.jsf 2010-02-02 18:19:51 +0300 @@ -77,11 +77,11 @@ =Expr =Bad bg_red -=Comment green +=Comment magenta =Literal cyan =Escape bold cyan -=Type blue -=Keyword bold +=Type blue white +=Keyword bold yellow =Operator bold black =Control green =Id diff -u syntax/spec.jsf syntax-new/spec.jsf --- syntax/spec.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/spec.jsf 2010-02-02 18:19:51 +0300 @@ -8,12 +8,12 @@ =Colon blue =Macro bold blue =CtrlMacro bold cyan -=Comment green +=Comment magenta =Variable cyan =Text dim white =Section red -=Shell magenta -=Shell2 bold magenta +=Shell green +=Shell2 bold green =ShellCmd yellow =ShellRedir bold yellow diff -u syntax/sql.jsf syntax-new/sql.jsf --- syntax/sql.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/sql.jsf 2010-02-02 18:19:51 +0300 @@ -13,15 +13,15 @@ =Bad bold red =Preproc blue =Define bold blue -=Comment green +=Comment magenta =IncLocal cyan =IncSystem bold cyan =Constant cyan =Escape bold cyan -=Type bold -=Keyword bold +=Type bold white +=Keyword bold yellow =CppKeyword bold -=Brace magenta +=Brace green =Control :idle Idle diff -u syntax/tcl.jsf syntax-new/tcl.jsf --- syntax/tcl.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/tcl.jsf 2010-02-02 18:19:51 +0300 @@ -1,10 +1,10 @@ # JOE syntax highlight file for TCL =Idle -=Comment green +=Comment magenta =Constant cyan =Escape bold cyan -=Keyword bold +=Keyword bold yellow =Subst magenta =SubstEscape bold magenta diff -u syntax/tex.jsf syntax-new/tex.jsf --- syntax/tex.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/tex.jsf 2010-02-02 18:19:51 +0300 @@ -1,10 +1,10 @@ # joe [La]TeX syntax highlighting =Idle -=Comment green -=Keyword bold +=Comment magenta +=Keyword bold yellow =Mathmode cyan -=Brace magenta +=Brace green =Parameter bold blue :idle Idle diff -u syntax/troff.jsf syntax-new/troff.jsf --- syntax/troff.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/troff.jsf 2010-02-02 18:19:51 +0300 @@ -1,9 +1,9 @@ # Syntax file for Troff =Idle -=Comment green -=Escape magenta -=Command bold +=Comment magenta +=Escape green +=Command bold white =Bad red # First character of line diff -u syntax/verilog.jsf syntax-new/verilog.jsf --- syntax/verilog.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/verilog.jsf 2010-02-02 18:19:51 +0300 @@ -4,11 +4,11 @@ =Idle =Preproc bold blue -=Comment green +=Comment magenta =Constant cyan =Escape bold cyan -=Type bold -=Keyword bold +=Type bold white +=Keyword bold yellow # Skip whitespace at start of line :reset Idle diff -u syntax/vhdl.jsf syntax-new/vhdl.jsf --- syntax/vhdl.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/vhdl.jsf 2010-02-02 18:19:51 +0300 @@ -3,7 +3,7 @@ # Define colors =Idle -=Comment green +=Comment magenta =Constant cyan =Escape bold cyan =Keyword bold diff -u syntax/xml.jsf syntax-new/xml.jsf --- syntax/xml.jsf 2010-01-29 21:34:48 +0300 +++ syntax-new/xml.jsf 2010-02-02 18:19:51 +0300 @@ -25,12 +25,12 @@ =Constant blue bold =EntityRef magenta =Decl cyan -=CommentStart green -=CommentBody green -=CommentEnd green -=PIStart magenta bold -=PIBody magenta -=PIEnd magenta bold +=CommentStart magenta +=CommentBody magenta +=CommentEnd magenta +=PIStart green bold +=PIBody green +=PIEnd green bold =CdataStart blue bold =CdataBody bold =CdataEnd blue bold