Remove LaTeX3 grammar

The LaTeX3 language now uses the standard latex grammar.

dev/build-grammar.js

@@ -23,7 +23,6 @@ async function main() {
         'src/BibTeX-style.tmLanguage.yaml',
         'src/DocTeX.tmLanguage.yaml',
         'src/JLweave.tmLanguage.yaml',
-        'src/LaTeX-Expl3.tmLanguage.yaml',
         'src/Pweave.tmLanguage.yaml',
         'src/RSweave.tmLanguage.yaml'
     ]

package.json

@@ -202,8 +202,27 @@
       },
       {
         "language": "latex-expl3",
-        "scopeName": "text.tex.latex.expl3",
-        "path": "./syntax/LaTeX-Expl3.tmLanguage.json"
+        "scopeName": "text.tex.latex",
+        "path": "./syntax/LaTeX.tmLanguage.json",
+        "embeddedLanguages": {
+          "source.asymptote": "asymptote",
+          "source.cpp": "cpp_embedded_latex",
+          "source.css": "css",
+          "source.dot": "dot",
+          "source.gnuplot": "gnuplot",
+          "text.html": "html",
+          "source.java": "java",
+          "source.js": "javascript",
+          "source.julia": "julia",
+          "source.lua": "lua",
+          "source.python": "python",
+          "source.ruby": "ruby",
+          "source.scala": "scala",
+          "source.ts": "typescript",
+          "text.xml": "xml",
+          "source.yaml": "yaml",
+          "meta.embedded.markdown_latex_combined": "markdown_latex_combined"
+        }
       },
       {
         "language": "markdown_latex_combined",

syntax/LaTeX.tmLanguage.json

@@ -3035,6 +3035,15 @@
             "match": "(\\\\)(text(s(terling|ixoldstyle|urd|e(ction|venoldstyle|rvicemark))|yen|n(ineoldstyle|umero|aira)|c(ircledP|o(py(left|right)|lonmonetary)|urrency|e(nt(oldstyle)?|lsius))|t(hree(superior|oldstyle|quarters(emdash)?)|i(ldelow|mes)|w(o(superior|oldstyle)|elveudash)|rademark)|interrobang(down)?|zerooldstyle|o(hm|ne(superior|half|oldstyle|quarter)|penbullet|rd(feminine|masculine))|d(i(scount|ed|v(orced)?)|o(ng|wnarrow|llar(oldstyle)?)|egree|agger(dbl)?|blhyphen(char)?)|uparrow|p(ilcrow|e(so|r(t(housand|enthousand)|iodcentered))|aragraph|m)|e(stimated|ightoldstyle|uro)|quotes(traight(dblbase|base)|ingle)|f(iveoldstyle|ouroldstyle|lorin|ractionsolidus)|won|l(not|ira|e(ftarrow|af)|quill|angle|brackdbl)|a(s(cii(caron|dieresis|acute|grave|macron|breve)|teriskcentered)|cutedbl)|r(ightarrow|e(cipe|ferencemark|gistered)|quill|angle|brackdbl)|g(uarani|ravedbl)|m(ho|inus|u(sicalnote)?|arried)|b(igcircle|orn|ullet|lank|a(ht|rdbl)|rokenbar)))\\b",
             "name": "constant.character.latex"
         },
+        {
+            "captures": {
+                "1": {
+                    "name": "punctuation.definition.variable.latex"
+                }
+            },
+            "match": "(\\\\)[cgl](?:[_\\p{Alphabetic}@]+)+_(?:bitset|clist|dim|fp|int|muskip|str|tl|bool|box|coffin|flag|fparray|intarray|ior|iow|prop|regex|seq)",
+            "name": "variable.other.latex3.latex"
+        },
         {
             "captures": {
                 "1": {

syntax/TeX.tmLanguage.json

@@ -101,7 +101,7 @@
                     "name": "punctuation.definition.function.tex"
                 }
             },
-            "match": "(\\\\)(?:[\\p{Alphabetic}@]+|[,;])",
+            "match": "(\\\\)(?:[,;]|(?:[\\p{Alphabetic}@]+(?:(?:_[\\p{Alphabetic}@]+)*:[NncVvoxefTFpwD]*)?))",
             "name": "support.function.general.tex"
         },
         {