From a4de3ea5e1c95fc472dd9ef75fe9782ac1d372f5 Mon Sep 17 00:00:00 2001
From: Sergey A Kryukov <SAKryukov@users.noreply.github.com>
Date: Thu, 19 Dec 2024 22:42:45 -0500
Subject: [PATCH] Refactoring naming

---
 highlight-utility/index.html                  | 85 +++++++++++--------
 .../language/base.apostrophe-string.js        |  2 +-
 .../language/base.apostrophe.character.js     |  2 +-
 highlighter/language/base.comment-block-c.js  |  2 +-
 highlighter/language/base.comment-c.js        |  2 +-
 .../language/base.comment-number-sign.js      |  2 +-
 highlighter/language/base.numeric.js          |  4 +-
 highlighter/language/base.string-c.js         |  2 +-
 highlighter/language/c.js                     | 46 +++-------
 highlighter/language/cpp.js                   | 14 +--
 highlighter/language/csharp.js                |  9 +-
 highlighter/language/html.js                  | 70 +++++++--------
 highlighter/language/java.js                  | 19 ++---
 highlighter/language/javascript.js            | 13 ++-
 highlighter/language/pascal.js                | 52 ++++--------
 highlighter/language/style.css                | 77 ++++++++++-------
 highlighter/namingScheme.js                   | 55 ++++++++++--
 17 files changed, 242 insertions(+), 214 deletions(-)

diff --git a/highlight-utility/index.html b/highlight-utility/index.html
index 0699238..4dc6627 100644
--- a/highlight-utility/index.html
+++ b/highlight-utility/index.html
@@ -33,28 +33,35 @@
             color: green;
         }
     
-        pre span.comment.block.pascal.highlighter {
+        pre span.comment.pascal.highlighter {
             color: #367
         }
+        pre span.pascal.part.highlighter {
+            color: saddlebrown;
+            letter-spacing: 0.1em;
+        }
+        pre span.assignment.highlighter {
+            color: darkmagenta;
+        }
+
     
         pre span.keyword.highlighter,
         pre span.selector.highlighter,
-        pre span.storage.module.highlighter,
-        pre span.storage.class.highlighter,
-        pre span.storage.function.highlighter {
+        pre span.storage.modifier.highlighter {
             color: blue;
-            font-weight: normal;
+        }
+        pre span.type.keyword.highlighter {
+            color: brown;
         }
     
         pre span._custom-word_.highlighter {
-            color: slateBlue;
+            color: darkslateblue;
         }
     
         pre span.literal.keyword.highlighter {
             color: darkviolet;
         }
     
-        pre span.literal.keyword.highlighter,
         pre span.constant.value.numeric.highlighter,
         pre span.constant.value.character.highlighter,
         pre span.unit.highlighter {
@@ -68,11 +75,17 @@
             background-color: red;
         }
     
+        pre span.annotation.highlighter,
+        pre span.preprocessor.signature.highlighter,
         pre span.preprocessor.keyword.highlighter {
             color: steelBlue;
             font-weight: bold
         }
-    
+        pre span.meta.preprocessor.highlighter {
+            color: rebeccaPurple;
+        }
+
+        
         pre span.preprocessor.value.highlighter {
             color: sandybrown;
             font-weight: bold
@@ -94,10 +107,11 @@
             font-weight: bold
         }
     
-        pre span.keyword.namespace.highlighter,
-        pre span.entity.name.class.highlighter {
+        pre span.name.namespace.highlighter {
+            color: blue;
+        }
+        pre span.name.class.highlighter {
             color: #B06;
-            font-weight: bold
         }
     
         pre span.literal.string.highlighter,
@@ -124,21 +138,33 @@
             color: #33B
         }
     
-        pre span.entity.name.function.highlighter {
+        pre span.name.function.highlighter {
             color: #06B;
             font-weight: bold
         }
-    
-        pre span.support.tag.highlighter,
-        pre span.support.tag-name.highlighter,
-        pre span.entity.tag.script.highlighter,
-        pre span.entity.tag.style.highlighter {
-            color: #070
+
+
+        pre span.xmltag.all.highlighter,
+        pre span.xmltag.close.highlighter
+        {
+            color: darkgreen;
         }
-    
-        pre span.support.attribute.highlighter {
-            color: #007;
-            font-style: italic
+        pre span.xmltag.attribute.highlighter {
+            color: purple;
+            font-style: italic;
+        }
+        pre span.xmltag.operator.highlighter {
+            color: blue;
+            font-weight: semibold;
+        }
+        pre span.source.style.highlighter,
+        pre span.xmltag.style.tag,
+        pre span.xmltag.style.open,
+        pre span.xmltag.style.close,
+        pre span.xmltag.style.name,
+        pre span.xmltag.style.attribute
+        {
+            color: green;
         }
     
         pre span.entity.name.tag.highlighter,
@@ -156,22 +182,11 @@
         pre span.entity.function.highlighter,
         pre span.support.magic.highlighter {
             color: #C00;
-            font-weight: bold
-        }
-    
-        pre span.preprocessor.highlighter,
-        pre span.meta.preprocessor.highlighter {
-            color: rebeccaPurple;
-            font-weight: bold
-        }
-    
-        pre span.pascal.assignment.highlighter {
-            color: blue;
-            font-weight: bold
-        }
+        }        
     </style>
     <style>  
         * { font-family: sans-serif; }
+        pre, pre span { font-family: monospace; letter-spacing: 0; }
         textarea { width: 100%; height: 20em; }
         label { width: 100%; display: flex; flex-direction: row; align-items: center; justify-content: space-between; }    
         input { width: 100%; }
diff --git a/highlighter/language/base.apostrophe-string.js b/highlighter/language/base.apostrophe-string.js
index 450fb52..e889d80 100644
--- a/highlighter/language/base.apostrophe-string.js
+++ b/highlighter/language/base.apostrophe-string.js
@@ -1,5 +1,5 @@
 /**
-* @Sergey A Kryukov
+* @author Sergey A Kryukov
 */
 RuleSet.extend("base.apostrophe-string", [
     {
diff --git a/highlighter/language/base.apostrophe.character.js b/highlighter/language/base.apostrophe.character.js
index 1a27dc5..2c971e5 100644
--- a/highlighter/language/base.apostrophe.character.js
+++ b/highlighter/language/base.apostrophe.character.js
@@ -1,5 +1,5 @@
 /**
-* @Sergey A Kryukov
+* @author Sergey A Kryukov
 */
 RuleSet.extend("base.apostrophe.character", [
     {
diff --git a/highlighter/language/base.comment-block-c.js b/highlighter/language/base.comment-block-c.js
index dc17ce4..cb5c0ef 100644
--- a/highlighter/language/base.comment-block-c.js
+++ b/highlighter/language/base.comment-block-c.js
@@ -1,5 +1,5 @@
 /**
-* @Sergey A Kryukov
+* @author Sergey A Kryukov
 */
 RuleSet.extend("base.comment-block-c", [
     { 
diff --git a/highlighter/language/base.comment-c.js b/highlighter/language/base.comment-c.js
index 54c9ec1..5fcca21 100644
--- a/highlighter/language/base.comment-c.js
+++ b/highlighter/language/base.comment-c.js
@@ -1,5 +1,5 @@
 /**
-* @Sergey A Kryukov
+* @author Sergey A Kryukov
 */
 RuleSet.extend("base.comment-c", [
     { 
diff --git a/highlighter/language/base.comment-number-sign.js b/highlighter/language/base.comment-number-sign.js
index 75c2ce1..8cc242d 100644
--- a/highlighter/language/base.comment-number-sign.js
+++ b/highlighter/language/base.comment-number-sign.js
@@ -1,5 +1,5 @@
 /**
-* @Sergey A Kryukov
+* @author Sergey A Kryukov
 */
 RuleSet.extend("base.comment-number-sign", [
     { 
diff --git a/highlighter/language/base.numeric.js b/highlighter/language/base.numeric.js
index 42b1e96..515b303 100644
--- a/highlighter/language/base.numeric.js
+++ b/highlighter/language/base.numeric.js
@@ -1,9 +1,9 @@
 /**
-* @Sergey A Kryukov
+* @author Sergey A Kryukov
 */
 RuleSet.extend("base.numeric", [
     {
-        name: 'constant.value.numeric',
+        name: namingScheme.literal.numeric,
         pattern: /\b(\d+(\.\d+)?(e(\+|\-)?\d+)?(f|d)?|0x[\da-f]+)\b/gi
     },
 ]);
diff --git a/highlighter/language/base.string-c.js b/highlighter/language/base.string-c.js
index 5ebb076..7980a68 100644
--- a/highlighter/language/base.string-c.js
+++ b/highlighter/language/base.string-c.js
@@ -1,5 +1,5 @@
 /**
-* @Sergey A Kryukov
+* @author Sergey A Kryukov
 */
 RuleSet.extend("base.string-c", [
     {
diff --git a/highlighter/language/c.js b/highlighter/language/c.js
index 2ff03f7..61b2914 100644
--- a/highlighter/language/c.js
+++ b/highlighter/language/c.js
@@ -7,59 +7,33 @@
  */
 RuleSet.extend('c', [
     {
-        name: 'preprocessor.keyword',
-        pattern: /#(define|elif|else|endif|error|if|ifdef|ifndef|import|include|line|pragma|undef|using)\b/g
-    },
-    {
-        name: 'meta.preprocessor',
         matches: {
-            1: [
-                {
-                    matches: {
-                        1: 'keyword.define',
-                        2: 'entity.name'
-                    },
-                    pattern: /(\w+)\s(\w+)\b/g
-                },
-                {
-                    name: 'keyword.define',
-                    pattern: /endif/g
-                },
-                {
-                    name: 'constant.numeric',
-                    pattern: /\d+/g
-                },
-                {
-                    matches: {
-                        1: 'keyword.include',
-                        2: 'string'
-                    },
-                    pattern: /(include)\s(.*?)$/g
-                }
-            ]
+            1: namingScheme.preprocessor.signature,
+            2: namingScheme.preprocessor.keyword,
+            3: namingScheme.preprocessor.value,
         },
-        pattern: /\#([\S\s]*?)$/gm
+        pattern: /(#)(include|define|elif|else|endif|error|ifdef|ifndef|if|import|line|pragma|undef|using)(.*?)$/gm
     },
     {
         name: namingScheme.keyword,
-        pattern: /\b(do|goto|typedef|struct|union|enum)\b/g
+        pattern: /\b(alignas|alignof|auto|bool|break|case|char|const|constexpr|continue|default|do|double|else|enum|extern|false|float|for|goto|if|inline|int|long|nullptr|register|restrict|return|short|signed|sizeof|static|static_assert|struct|switch|thread_local|true|typedef|typeof|typeof_unqual|union|unsigned|void|volatile|while|_Alignas|_Alignof|_Atomic|_BitInt|_Bool|_Complex|_Decimal128|_Decimal32|_Decimal64|_Generic (C11)|_Imaginary|_Noreturn|_Static_assert|_Th)\b/g
     },
     {
         matches: {
-            1: 'storage.type',
-            3: 'storage.type',
-            4: 'entity.name.function'
+            1: namingScheme.type.keyword,
+            3: namingScheme.type.keyword,
+            4: namingScheme.name.function
         },
         pattern: /\b((un)?signed|const)? ?(void|char|short|int|long|float|double)\*? +((\w+)(?= ?\())?/g
     },
     {
         matches: {
-            2: 'entity.name.function'
+            2: namingScheme.name.function
         },
         pattern: /(\w|\*) +((\w+)(?= ?\())/g
     },
     {
-        name: 'storage.modifier',
+        name: namingScheme.storage.modifier,
         pattern: /\b(static|extern|auto|register|volatile|inline)\b/g
     },
 ], ["base.comment-block-c", "base.comment-c", "base.string-c"]);
diff --git a/highlighter/language/cpp.js b/highlighter/language/cpp.js
index d2ef3d4..46c86a3 100644
--- a/highlighter/language/cpp.js
+++ b/highlighter/language/cpp.js
@@ -1,15 +1,19 @@
 /**
  * C++ patterns
  *
-* @author Sergey A Kryukov
+ * @author Sergey A Kryukov
  */
-RuleSet.extend('cpp', [
+RuleSet.extend("cpp", [
     {
-        name: 'keyword',
+        name: namingScheme.keyword,
         pattern: /\b(final|override|transaction_safe|transaction_safe_dynamic|import|module|alignas|alignof|and|and_eq|asm|atomic_cancel|atomic_commit|atomic_noexcept|auto|bitand|bitor|bool|break|case|catch|char|char8_t|char16_t|char32_t|class|compl|concept|const|consteval|constexpr|constinit|const_cast|continue|co_await|co_return|co_yield|decltype|default|delete|do|double|dynamic_cast|else|enum|explicit|export|extern|false|float|for|friend|goto|if|inline|int|long|mutable|namespace|new|noexcept|not|not_eq|nullptr|operator|or|or_eq|private|protected|public|reflexpr|register|reinterpret_cast|requires|return|short|signed|sizeof|static|static_assert|static_cast|struct|switch|synchronized|template|this|thread_local|throw|true|try|typedef|typeid|typename|union|unsigned|using|virtual|void|volatile|wchar_t|while|xor|xor_eq)\b/g
     },
     {
-        name: 'preprocessor.keyword',
-        pattern: /#(if|elif|else|endif|ifdef|ifndef|elifdef|elifndef|define|undef|include|line|error|warning|pragma|defined|__has_include|__has_cpp_attribute|export|import|module)\b/g
+        matches: {
+            1: namingScheme.preprocessor.signature,
+            2: namingScheme.preprocessor.keyword,
+            3: namingScheme.preprocessor.value,
+        },
+        pattern: /(#)(if|elif|else|endif|ifdef|ifndef|elifdef|elifndef|define|undef|include|line|error|warning|pragma|defined|__has_include|__has_cpp_attribute|export|import|module)(.*?)$/gm
     },
 ], ["c"]);
diff --git a/highlighter/language/csharp.js b/highlighter/language/csharp.js
index 66f322a..71683e9 100644
--- a/highlighter/language/csharp.js
+++ b/highlighter/language/csharp.js
@@ -3,13 +3,14 @@
 *
 * @author Sergey A Kryukov
 */
-RuleSet.extend('csharp', [
+RuleSet.extend("csharp", [
     {
         matches: {
-            1: "preprocessor.keyword", 
-            2: "preprocessor.value" 
+            1: namingScheme.preprocessor.signature,
+            2: namingScheme.preprocessor.keyword,
+            3: namingScheme.preprocessor.value,
         },
-        pattern: /^\s*(#nullable|#if|#elif|#else|#endif|#define|#undef|#region|#endregion)(.*?)$/gm
+        pattern: /(#)(nullable|if|elif|else|endif|define|undef|region|endregion)(.*?)$/gm
     },
     { 
         name: namingScheme.keyword,
diff --git a/highlighter/language/html.js b/highlighter/language/html.js
index 5c2da6d..8c8606a 100644
--- a/highlighter/language/html.js
+++ b/highlighter/language/html.js
@@ -2,16 +2,17 @@
  * HTML patterns
  *
  * @author Craig Campbell
+ * @author Sergey A Kryukov
  */
-RuleSet.extend('html', [
+RuleSet.extend("html", [
     {
         name: namingScheme.source.php,
         matches: {
-            1: 'variable.language.php-tag',
+            1: namingScheme.xmltag.php,
             2: {
-                language: 'php'
+                language: namingScheme.source.php,
             },
-            3: 'variable.language.php-tag'
+            3: namingScheme.xmltag.php,
         },
         pattern: /(&lt;\?php|&lt;\?=?(?!xml))([\s\S]*?)(\?&gt;)/gm
     },
@@ -20,31 +21,31 @@ RuleSet.extend('html', [
         matches: {
             1: {
                 matches: {
-                    1: 'support.tag.style',
+                    1: namingScheme.xmltag.style.open,
                     2: [
                         {
-                            name: 'entity.tag.style',
+                            name: namingScheme.xmltag.style.name,
                             pattern: /^style/g
                         },
                         {
-                            name: 'string',
+                            name: namingScheme.literal.string,
                             pattern: /('|")(.*?)(\1)/g
                         },
                         {
-                            name: 'entity.tag.style.attribute',
+                            name: namingScheme.xmltag.style.attribite,
                             pattern: /(\w+)/g
                         }
                     ],
-                    3: 'support.tag.style'
+                    3: namingScheme.xmltag.style.close,
                 },
                 pattern: /(&lt;\/?)(style.*?)(&gt;)/g
             },
             2: {
-                language: 'css'
+                language: namingScheme.source.css,
             },
-            3: 'support.tag.style',
-            4: 'entity.tag.style',
-            5: 'support.tag.style'
+            3: namingScheme.xmltag.style.open,
+            4: namingScheme.xmltag.style.tag,
+            5: namingScheme.xmltag.style.close,
         },
         pattern: /(&lt;style.*?&gt;)([\s\S]*?)(&lt;\/)(style)(&gt;)/gm
     },
@@ -53,32 +54,31 @@ RuleSet.extend('html', [
         matches: {
             1: {
                 matches: {
-                    1: 'support.tag.script',
+                    1: namingScheme.xmltag.script.open,
                     2: [
                         {
-                            name: 'entity.tag.script',
+                            name: namingScheme.xmltag.script.name,
                             pattern: /^script/g
                         },
-
                         {
-                            name: 'string',
+                            name: namingScheme.literal.string,
                             pattern: /('|")(.*?)(\1)/g
                         },
                         {
-                            name: 'entity.tag.script.attribute',
+                            name: namingScheme.xmltag.script.attribite,
                             pattern: /(\w+)/g
                         }
                     ],
-                    3: 'support.tag.script'
+                    3: namingScheme.xmltag.script.close,
                 },
                 pattern: /(&lt;\/?)(script.*?)(&gt;)/g
             },
             2: {
-                language: 'javascript'
+                language: namingScheme.source.javascript,
             },
-            3: 'support.tag.script',
-            4: 'entity.tag.script',
-            5: 'support.tag.script'
+            3: namingScheme.xmltag.script.open,
+            4: namingScheme.xmltag.script.tag,
+            5: namingScheme.xmltag.script.close,
         },
         pattern: /(&lt;script(?! src).*?&gt;)([\s\S]*?)(&lt;\/)(script)(&gt;)/gm
     },
@@ -88,29 +88,29 @@ RuleSet.extend('html', [
     },
     {
         matches: {
-            1: 'support.tag.open',
-            2: 'support.tag.close'
+            1: namingScheme.xmltag.open,
+            2: namingScheme.xmltag.close,
         },
         pattern: /(&lt;)|(\/?\??&gt;)/g
     },
     {
-        name: 'support.tag',
+        name: namingScheme.xmltag.all,
         matches: {
-            1: 'support.tag',
-            2: 'support.tag.special', // ! or / inside <>
-            3: 'support.tag-name'
+            1: namingScheme.xmltag.all,
+            2: namingScheme.xmltag.special, // ! or / inside <>
+            3: namingScheme.xmltag.name,
         },
         pattern: /(&lt;\??)(\/|\!?)(\w+)/g
     },
     {
         matches: {
-            1: 'support.attribute'
+            1: namingScheme.xmltag.attribute,
         },
         pattern: /([a-z-]+)(?=\=)/gi
     },
     {
         matches: {
-            1: 'support.operator',
+            1: namingScheme.xmltag.operator,
             2: namingScheme.literal.quote,
             3: namingScheme.literal.string,
             4: namingScheme.literal.quote
@@ -119,17 +119,17 @@ RuleSet.extend('html', [
     },
     { // in script?
         matches: {
-            1: 'support.operator',
-            2: 'support.value'
+            1: namingScheme.xmltag.operator,
+            2: namingScheme.xmltag.value,
         },
         pattern: /(=)([a-zA-Z\-0-9]*)\b/g
     },
     {
         matches: { // attribute name
-            1: 'support.attribute'
+            1: namingScheme.xmltag.attribute,
         },
         pattern: /\s([\w-]+)(?=\s|&gt;)(?![\s\S]*&lt;)/g
     }
 ]);
 
-RuleSet.addAlias('xml', 'html');
+RuleSet.addAlias("xml", "html");
diff --git a/highlighter/language/java.js b/highlighter/language/java.js
index bc96eb2..daa0358 100644
--- a/highlighter/language/java.js
+++ b/highlighter/language/java.js
@@ -2,6 +2,7 @@
 * Java patterns
 *
 * @author Leo Accend
+* @author Sergey A Kryukov
 */
 RuleSet.extend( "java", [
   {
@@ -11,7 +12,7 @@ RuleSet.extend( "java", [
   {
     matches: {
       1: namingScheme.keyword,
-      2: "support.namespace"
+      2: namingScheme.name.namespace,
     },
     pattern: /(import|package)\s(.+)/g
   },
@@ -21,30 +22,22 @@ RuleSet.extend( "java", [
     pattern: /\b(abstract|assert|boolean|break|byte|case|catch|char|class|const|continue|default|do|double|else|enum|extends|final|finally|float|for|goto|if|implements|import|instanceof|int|interface|long|native|new|package|private|protected|public|return|short|static|strictfp|super|switch|synchronized|this|throw|throws|transient|try|void|volatile|while)\b/g
   },
   {
-    name: "char",
-    pattern: /(')(.|\\.|\\u[\dA-Fa-f]{4})\1/g
-  },
-  {
-    name: "integer",
-    pattern: /\b(0x[\da-f]+|\d+)L?\b/g
-  },
-  {
-    name: "support.annotation",
+    name: namingScheme.annotation,
     pattern: /@\w+/g
   },
   {
     matches: {
-      1: "entity.function"
+      1: namingScheme.name.function
     },
     pattern: /([^@\.\s]+)\(/g
   },
   {
-    name: "entity.class",
+    name: namingScheme.name.class,
     pattern: /\b([A-Z]\w*)\b/g
   },
   {
     // see http://docs.oracle.com/javase/tutorial/java/nutsandbolts/operators.html
-    name: "operator",
+    name: namingScheme.operator,
     pattern: /(\+{1,2}|-{1,2}|~|!|\*|\/|%|(?:&lt;){1,2}|(?:&gt;){1,3}|instanceof|(?:&amp;){1,2}|\^|\|{1,2}|\?|:|(?:=|!|\+|-|\*|\/|%|\^|\||(?:&lt;){1,2}|(?:&gt;){1,3})?=)/g
   }
 ], ["base.string-c", "base.comment-block-c", "base.comment-c"]);
diff --git a/highlighter/language/javascript.js b/highlighter/language/javascript.js
index 5df5739..7475b6e 100644
--- a/highlighter/language/javascript.js
+++ b/highlighter/language/javascript.js
@@ -34,17 +34,24 @@ RuleSet.extend("javascript", [
         },
         pattern: /(new)\s+([^\(]*)(?=\()/g
     },
-    // matches arrow function declaration:
+    // matches arrow function declaration: //SA???
     {
         matches: {
-            1: 'entity.name.function', //SA???
+            1: namingScheme.name.function, 
         },
         pattern: /(\S*?)\s*?(\=|\:)\s*?(\(.*?\)|(\S+?))\s*?\=&gt;/g
     },
+    {
+        matches: {
+            1: namingScheme.keyword,
+            2: namingScheme.name.function, 
+        },
+        pattern: /(function)\s+(.*?)\(/g
+    },
 ], [
     "base.comment-block-c",
     "base.comment-c",
     "base.numeric",
 ]);
 
-RuleSet.addAlias('js', 'javascript');
+RuleSet.addAlias("js", "javascript");
diff --git a/highlighter/language/pascal.js b/highlighter/language/pascal.js
index 6002efc..f76f31f 100644
--- a/highlighter/language/pascal.js
+++ b/highlighter/language/pascal.js
@@ -3,9 +3,9 @@
 *
 * @author Sergey A Kryukov
 */
-RuleSet.extend('pascal', [
+RuleSet.extend("pascal", [
     {
-        name: 'comment.block.pascal',
+        name: namingScheme.comment.pascal,
         pattern: /(\{(.|[\r\n])*?\})/gm
     },
     {
@@ -25,51 +25,33 @@ RuleSet.extend('pascal', [
         },
         pattern: /((("|')([^\\\1]|\\.)*?(\3)))/gm
     },
-    /*
-    {
-        matches: {
-            1: [
-                {
-                    name: namingScheme.operator,
-                    pattern: /\=|\+/g
-                },
-                {
-                    name: 'keyword.dot',
-                    pattern: /\./g
-                }
-            ],
-            2: {
-                name: 'string',
-                matches: {
-                    name: 'constant.character.escape',
-                    pattern: /\\("){1}/g
-                },
-                2: {
-                    name: 'character',
-                    matches: {
-                        name: 'constant.character.escape',
-                        pattern: /\\('){1}/g
-                    }
-                }
-            }
-        },
-        pattern: /(\(|\s|\[|\=|:|\+|\.|\{|,)(('|")([^\\\1]|\\.)*?(\3))/gm
-    },*/
     {
         name: namingScheme.operator,
         pattern: /\+|\!|\-|&(gt|lt|amp);|\||\*|\=/g
     },
     {
-        name: 'pascal.assignment',
+        name: namingScheme.assignment,
         pattern: /:=/g
     },
     {
         name: namingScheme.keyword,
-        pattern: /\b(absolute|and|array|asm|begin|case|const|constructor|destructor|div|do|downto|else|end|file|for|function|goto|if|implementation|in|inherited|inline|interface|label|mod|nil|not|object|of|operator|or|packed|procedure|program|record|reintroduce|repeat|self|set|shl|shr|string|then|to|type|unit|until|uses|var|while|with|xor|as|class|dispinterface|except|exports|finalization|finally|initialization|inline|is|library|on|out|packed|property|raise|resourcestring|threadvar|try)(?=\b)/gi
+        pattern: /\b(absolute|and|array|asm|begin|case|const|constructor|destructor|div|do|downto|else|end|file|for|function|goto|if|in|inherited|inline|label|mod|not|object|of|operator|or|packed|procedure|program|record|reintroduce|repeat|self|set|shl|shr|then|to|type|unit|until|uses|var|while|with|xor|as|class|dispinterface|except|exports|finalization|finally|initialization|inline|is|library|on|out|packed|property|raise|resourcestring|threadvar|try)(?=\b)/gi
+    },
+    { 
+        name: namingScheme.type.keyword,
+        pattern: /\b(string|real|integer|character|boolean)\b/gi
+    },
+    {
+        name: namingScheme.pascal.part,
+        pattern: /\b(interface|implementation)(?=\b)/gi
+    },
+    { 
+        name: namingScheme.literal.keyword,
+        pattern: /\b(true|false|nil)\b/g
     },
     {
         name: namingScheme.comment.text,
         pattern: /\/\/.*?$/gm
     }, 
 
-], ['base.comment-c']);
+], ["base.comment-c"]);
diff --git a/highlighter/language/style.css b/highlighter/language/style.css
index 0a30586..b9546a9 100644
--- a/highlighter/language/style.css
+++ b/highlighter/language/style.css
@@ -1,3 +1,16 @@
+/*
+// Languages:
+base.*
+json
+csharp
+cpp
+c
+html
+java
+javascript
+css: todo
+*/
+
 /*
 // Rule names, +: used in CSS, ?: unused:
 + literal.string (base.string-c, base.string-c, base.apostrophe-string, base.apostrophe-string, css, css, html, javascript, javascript, json, json, pascal, pascal)
@@ -6,49 +19,47 @@
 + comment.text (base.comment-c, base.comment-c, base.comment-number-sign, base.comment-number-sign, css, css, pascal, pascal)
 + comment.block (base.comment-block-c, base.comment-block-c, html, html)
 + constant.value.numeric (base.numeric, base.numeric)
-+ preprocessor.keyword (c, c, cpp, cpp, csharp)
-+ meta.preprocessor (c, c)
-+ keyword (c, c, cpp, cpp, csharp, csharp, java, java, java, javascript, javascript, javascript, pascal, pascal)
-+ storage.type (c, c)
-+ entity.name.function (c, c, javascript)
++ preprocessor.signature (c, cpp)
++ preprocessor.keyword (c, cpp, csharp)
++ preprocessor.value (c, cpp, csharp)
++ keyword (c, c, cpp, cpp, csharp, csharp, java, java, java, javascript, javascript, javascript, javascript, pascal, pascal)
++ type.keyword (c, c, csharp, csharp, pascal, pascal)
++ name.function (c, c, java, javascript, javascript)
 ? storage.modifier (c, c)
-+ preprocessor.value (csharp)
-? type.keyword (csharp, csharp)
-+ literal.keyword (csharp, csharp, java, java, javascript)
++ literal.keyword (csharp, csharp, java, java, javascript, pascal, pascal)
 ? constant.numeric (css)
 + unit (css)
 ? support.css-property (css, css)
 ? support.vendor-prefix (css, css)
 ? support.css-value (css)
-? source.php (html, html)
-? variable.language.php-tag (html, html)
-? php (html)
-? source.css (html, html)
-? support.tag.style (html, html, html, html)
-? css (html)
-+ entity.tag.style (html)
-? source.js (html, html)
-? support.tag.script (html, html, html, html)
-? javascript (html)
-+ entity.tag.script (html)
-? support.tag.open (html)
-? support.tag.close (html)
-+ support.tag (html, html, html)
-? support.tag.special (html)
-+ support.tag-name (html)
-+ support.attribute (html, html)
-? support.operator (html, html)
+? source.php (html, html, html)
+? xmltag.php (html, html)
+? source.css (html, html, html)
+? xmltag.style.open (html, html)
+? xmltag.style.close (html, html)
+? xmltag.style.tag (html)
+? xmltag.script.open (html, html)
+? xmltag.script.close (html, html)
+? source.javascript (html)
+? xmltag.script.tag (html)
+? xmltag.open (html)
++ xmltag.close (html)
++ xmltag.all (html, html, html)
+? xmltag.special (html)
+? xmltag.name (html)
++ xmltag.attribute (html, html)
++ xmltag.operator (html, html)
 + literal.quote (html, html)
-? support.value (html)
-? support.namespace (java)
+? xmltag.value (html)
++ name.namespace (java)
 ? char (java, java)
 ? integer (java, java)
-? support.annotation (java, java)
-+ entity.function (java)
-? entity.class (java, java)
++ annotation (java, java)
++ name.class (java, java)
 + operator (java, java, json, json, pascal, pascal)
 + magic.strict (javascript)
 + property (json, json)
-+ comment.block.pascal (pascal, pascal)
-+ pascal.assignment (pascal, pascal)
++ comment.pascal (pascal, pascal)
++ assignment (pascal, pascal)
++ pascal.part (pascal, pascal)
 */
\ No newline at end of file
diff --git a/highlighter/namingScheme.js b/highlighter/namingScheme.js
index 7eb5d2b..59fc2fb 100644
--- a/highlighter/namingScheme.js
+++ b/highlighter/namingScheme.js
@@ -18,36 +18,77 @@ const namingScheme = (() => {
         operator: 0,
         unit: 0, // CSS unit of measurement
         keyword: 0,
+        annotation: 0,
+        assignment: 0,
+        selector: 0, 
+        name: {
+            function: 0,
+            class: 0,
+            namespace: 0,
+        },
         literal: {
             keyword: 0, // like null, nil, true, false, NaN, Infinity
             string: 0,
             quote: 0,
             escape: 0,
+            numeric: 0,
         },
         type: {
             keyword: 0, // like char, int, uint...
         },
+        storage: {
+            modifier: 0,
+        },
+        preprocessor: {
+            signature: 0,
+            keyword: 0,
+            value: 0,
+        },
         comment: {
             text: 0,
             block: 0,
+            pascal: 0,
         },
-        xml: {
-            tag: 0,
-            value: 0,
-        },
+        pascal: { part: 0, },
         constant: {
             value: {
                 numeric: 0,
                 character: 0,
             },
         },
+        magic: { //JavaScript
+            strict: 0,
+        },
         source: { // HTML
             css: 0,
             php: 0,
-            js: 0,
+            javascript: 0,
         },
-        magic: { //JavaScript
-            strict: 0,
+        xmltag: {
+            all: 0, //support.tag
+            name: 0, //support.tag-name
+            script: 0, //entity.tag.script
+            style: {
+                tag: 0, //entity.tag.style?
+                open: 0, //support.tag.style
+                name: 0, //entity.tag.style, "style"
+                attribite: 0, //'entity.tag.style.attribute'
+                close: 0, //'support.tag.style'
+            }, 
+            script: {
+                tag: 0, //entity.tag.script?
+                open: 0, //support.tag.script
+                name: 0, //entity.tag.script, "script"
+                attribite: 0, //'entity.tag.script.attribute'
+                close: 0, //'support.tag.script'
+            }, 
+            open: 0, //support.tag.open
+            close: 0, //support.tag.close
+            special: 0, //support.tag.special
+            php: 0, //variable.language.php-tag
+            attribute: 0, //'support.attribute'
+            operator: 0, //'support.operator'
+            value: 0,
         }
     }; //scheme