diff --git a/data/languages/asm/highlight.xml b/data/languages/asm/highlight.xml index 50de0d6..7957792 100644 --- a/data/languages/asm/highlight.xml +++ b/data/languages/asm/highlight.xml @@ -4,15 +4,24 @@ commentDoxygen - /\*\*.*?\*/ + + /\*(\*|!) + \*/ + comment - /\*.*?\*/ + + /\* + \*/ + preprocesseur - #[ \t]*if 0.*?#(regexif|else) + + #[ \t]*if 0 + #(endif|else) + preprocesseur diff --git a/data/languages/c/highlight.xml b/data/languages/c/highlight.xml index 1d49529..21ab3e2 100644 --- a/data/languages/c/highlight.xml +++ b/data/languages/c/highlight.xml @@ -5,25 +5,38 @@ commentDoxygen - /\*(\*|!)(.|\r|\n)*?\*/ + + /\*(\*|!) + \*/ + doxyparse comment - /\*(.|\r|\n)*?(\*/|\0) + + /\* + \*/ + TODO SYNTAX_ERROR - /\*(.|\r|\n)* + + /\* + preprocesseur - #[ \t]*if 0(.|\r|\n)*?#(endif|else) + + #[ \t]*if 0 + #(endif|else) + SYNTAX_ERROR - #[ \t]*if 0(.|\r|\n)* + + #[ \t]*if 0 + preprocesseur diff --git a/data/languages/glsl/highlight.xml b/data/languages/glsl/highlight.xml index 3b31d6b..86a3bf6 100644 --- a/data/languages/glsl/highlight.xml +++ b/data/languages/glsl/highlight.xml @@ -4,15 +4,24 @@ commentDoxygen - /\*\*.*\*/ + + /\*(\*|!) + \*/ + comment - /\*.*\*/ + + /\* + \*/ + preprocesseur - #[ \t]*if 0(.|\\[\\\n])*#(endif|else) + + #[ \t]*if 0 + #(endif|else) + preprocesseur diff --git a/data/languages/java/highlight.xml b/data/languages/java/highlight.xml index ff74927..34ea23e 100644 --- a/data/languages/java/highlight.xml +++ b/data/languages/java/highlight.xml @@ -4,26 +4,34 @@ commentDoxygen - /\*(\*|!)(.|\r|\n)*?\*/ + + /\*(\*|!) + \*/ + doxyparse comment - /\*(.|\r|\n)*?(\*/|\0) + + /\* + \*/ + TODO SYNTAX_ERROR - /\*(.|\r|\n)* + + /\*(\*|!) + commentDoxygen - //!.* + //!.*$ doxyparse comment - //.* + //.*$ TODO diff --git a/data/languages/lua/highlight.xml b/data/languages/lua/highlight.xml index 606e7df..b9d6417 100644 --- a/data/languages/lua/highlight.xml +++ b/data/languages/lua/highlight.xml @@ -4,7 +4,10 @@ comment - \-\-\[\[.*?\-\-\]\] + + \-\-\[\[ + \-\-\]\] + SYNTAX_ERROR diff --git a/data/languages/php/highlight.xml b/data/languages/php/highlight.xml index 882ef02..44adaff 100644 --- a/data/languages/php/highlight.xml +++ b/data/languages/php/highlight.xml @@ -4,26 +4,34 @@ commentDoxygen - /\*(\*|!)(.|\r|\n)*?\*/ + + /\*(\*|!) + \*/ + doxyparse comment - /\*(.|\r|\n)*?(\*/|\0) + + /\* + \*/ + TODO SYNTAX_ERROR - /\*(.|\r|\n)* + + /\*(\*|!) + commentDoxygen - //!.* + //!.*$ doxyparse comment - (//|#).* + (//|#).*$ TODO diff --git a/data/languages/python/highlight.xml b/data/languages/python/highlight.xml index e0ff056..32ebb89 100644 --- a/data/languages/python/highlight.xml +++ b/data/languages/python/highlight.xml @@ -4,15 +4,23 @@ comment - """(.|\r|\n)*?""" + + """ + """ + comment - '''(.|\r|\n)*?''' + + ''' + ''' + SYNTAX_ERROR - ("""|''')(.|\n|\r)* + + ("""|''') + commentDoxygen diff --git a/data/languages/xml/highlight.xml b/data/languages/xml/highlight.xml index be412a3..01bfc51 100644 --- a/data/languages/xml/highlight.xml +++ b/data/languages/xml/highlight.xml @@ -4,35 +4,41 @@ comment - - -<!\-\-(.|\r|\n)*?\-\-> + + <!\-\- + \-\-> + macro - - <!\[CDATA\[(.|\r|\n)*?\]\]> + + <!\[CDATA\[ + \]\]> + functionName - </[ \t]*\w+?[ \t]*> SYNTAX_ERROR - - </(.|\n|\r)*?> + + </ + > + normal - - <(.|\n|\r)*?> + + < + > + parseInsideBalise commonDefine - &(gt|lt|amp|apos|quot); @@ -43,17 +49,14 @@ error - <\?\w*|\?> functionName - <[ \t]*[0-9a-zA-Z_]+ functionName - /?> diff --git a/lutin_edn.py b/lutin_edn.py index 112ce96..c23dbbd 100644 --- a/lutin_edn.py +++ b/lutin_edn.py @@ -84,14 +84,11 @@ def create(target, module_name): ]) my_module.add_module_depend(['ewol']) my_module.copy_path('data/icon.*','') - """ my_module.copy_path('data/languages/gcov/*.xml','languages/gcov/') my_module.copy_path('data/languages/asm/*.xml','languages/asm/') my_module.copy_path('data/languages/bash/*.xml','languages/bash/') my_module.copy_path('data/languages/boo/*.xml','languages/boo/') - """ my_module.copy_path('data/languages/cpp/*.xml','languages/cpp/') - """ my_module.copy_path('data/languages/c/*.xml','languages/c/') my_module.copy_path('data/languages/cmake/*.xml','languages/cmake/') my_module.copy_path('data/languages/glsl/*.xml','languages/glsl/') @@ -104,7 +101,6 @@ def create(target, module_name): my_module.copy_path('data/languages/php/*.xml','languages/php/') my_module.copy_path('data/languages/xml/*.xml','languages/xml/') my_module.copy_path('data/languages/python/*.xml','languages/python/') - """ my_module.copy_path('data/theme/default/*.svg','theme/shape/square/') my_module.copy_path('data/theme/default/*.edf','theme/shape/square/') my_module.copy_path('data/theme/colorWhite/*.json','theme/color/white/')