vue-editify 0.2.26 → 0.2.28

package/lib/editify.es.js

@@ -2848,10 +2848,7 @@ const setEditorDomObserve = function() {
   if (!window.MutationObserver) {
     console.warn("The current browser does not support MutationObserver");
   }
-  if (this.__domObserver) {
-    this.__domObserver.disconnect();
-    this.__domObserver = null;
-  }
+  removeEditorDomObserve.apply(this);
   this.__domObserver = new MutationObserver((mutationList) => {
     let length = mutationList.length;
     for (let i = 0; i < length; i++) {
@@ -4246,9 +4243,6 @@ class AlexEditor {
    */
   rangeRender() {
     return new Promise((resolve) => {
-      if (this.disabled) {
-        return resolve();
-      }
       const selection = window.getSelection();
       if (!selection) {
         return resolve();
@@ -4974,7 +4968,7 @@ class AlexEditor {
     event$1.off(this.$el, "beforeinput.alex_editor compositionstart.alex_editor compositionupdate.alex_editor compositionend.alex_editor keydown.alex_editor cut.alex_editor paste.alex_editor copy.alex_editor dragstart.alex_editor drop.alex_editor focus.alex_editor blur.alex_editor");
   }
 }
-const version$2 = "1.4.40";
+const version$2 = "1.5.1";
 console.log(`%c alex-editor %c v${version$2} `, "padding: 2px 1px; border-radius: 3px 0 0 3px; color: #fff; background: #606060; font-weight: bold;", "padding: 2px 1px; border-radius: 0 3px 3px 0; color: #fff; background: #42c02e; font-weight: bold;");
 const number = {
   /**
@@ -6568,7 +6562,8 @@ class Response {
    * @param {CompiledMode} mode
    */
   constructor(mode) {
-    if (mode.data === void 0) mode.data = {};
+    if (mode.data === void 0)
+      mode.data = {};
     this.data = mode.data;
     this.isMatchIgnored = false;
   }
@@ -6635,7 +6630,8 @@ class HTMLRenderer {
    *
    * @param {Node} node */
   openNode(node) {
-    if (!emitsWrappingTags(node)) return;
+    if (!emitsWrappingTags(node))
+      return;
     const className = scopeToCSSClass(
       node.scope,
       { prefix: this.classPrefix }
@@ -6647,7 +6643,8 @@ class HTMLRenderer {
    *
    * @param {Node} node */
   closeNode(node) {
-    if (!emitsWrappingTags(node)) return;
+    if (!emitsWrappingTags(node))
+      return;
     this.buffer += SPAN_CLOSE;
   }
   /**
@@ -6698,7 +6695,8 @@ class TokenTree {
     return void 0;
   }
   closeAllNodes() {
-    while (this.closeNode()) ;
+    while (this.closeNode())
+      ;
   }
   toJSON() {
     return JSON.stringify(this.rootNode, null, 4);
@@ -6728,8 +6726,10 @@ class TokenTree {
    * @param {Node} node
    */
   static _collapse(node) {
-    if (typeof node === "string") return;
-    if (!node.children) return;
+    if (typeof node === "string")
+      return;
+    if (!node.children)
+      return;
     if (node.children.every((el) => typeof el === "string")) {
       node.children = [node.children.join("")];
     } else {
@@ -6769,7 +6769,8 @@ class TokenTreeEmitter extends TokenTree {
    */
   __addSublanguage(emitter, name) {
     const node = emitter.root;
-    if (name) node.scope = `language:${name}`;
+    if (name)
+      node.scope = `language:${name}`;
     this.add(node);
   }
   toHTML() {
@@ -6782,8 +6783,10 @@ class TokenTreeEmitter extends TokenTree {
   }
 }
 function source$1(re) {
-  if (!re) return null;
-  if (typeof re === "string") return re;
+  if (!re)
+    return null;
+  if (typeof re === "string")
+    return re;
   return re.source;
 }
 function lookahead$1(re) {
@@ -6872,7 +6875,8 @@ const SHEBANG = (opts = {}) => {
     relevance: 0,
     /** @type {ModeCallback} */
     "on:begin": (m, resp) => {
-      if (m.index !== 0) resp.ignoreMatch();
+      if (m.index !== 0)
+        resp.ignoreMatch();
     }
   }, opts);
 };
@@ -7022,7 +7026,8 @@ const END_SAME_AS_BEGIN = function(mode) {
       },
       /** @type {ModeCallback} */
       "on:end": (m, resp) => {
-        if (resp.data._beginMatch !== m[1]) resp.ignoreMatch();
+        if (resp.data._beginMatch !== m[1])
+          resp.ignoreMatch();
       }
     }
   );
@@ -7067,30 +7072,39 @@ function scopeClassName(mode, _parent) {
   }
 }
 function beginKeywords(mode, parent) {
-  if (!parent) return;
-  if (!mode.beginKeywords) return;
+  if (!parent)
+    return;
+  if (!mode.beginKeywords)
+    return;
   mode.begin = "\\b(" + mode.beginKeywords.split(" ").join("|") + ")(?!\\.)(?=\\b|\\s)";
   mode.__beforeBegin = skipIfHasPrecedingDot;
   mode.keywords = mode.keywords || mode.beginKeywords;
   delete mode.beginKeywords;
-  if (mode.relevance === void 0) mode.relevance = 0;
+  if (mode.relevance === void 0)
+    mode.relevance = 0;
 }
 function compileIllegal(mode, _parent) {
-  if (!Array.isArray(mode.illegal)) return;
+  if (!Array.isArray(mode.illegal))
+    return;
   mode.illegal = either$1(...mode.illegal);
 }
 function compileMatch(mode, _parent) {
-  if (!mode.match) return;
-  if (mode.begin || mode.end) throw new Error("begin & end are not supported with match");
+  if (!mode.match)
+    return;
+  if (mode.begin || mode.end)
+    throw new Error("begin & end are not supported with match");
   mode.begin = mode.match;
   delete mode.match;
 }
 function compileRelevance(mode, _parent) {
-  if (mode.relevance === void 0) mode.relevance = 1;
+  if (mode.relevance === void 0)
+    mode.relevance = 1;
 }
 const beforeMatchExt = (mode, parent) => {
-  if (!mode.beforeMatch) return;
-  if (mode.starts) throw new Error("beforeMatch cannot be used with starts");
+  if (!mode.beforeMatch)
+    return;
+  if (mode.starts)
+    throw new Error("beforeMatch cannot be used with starts");
   const originalMode = Object.assign({}, mode);
   Object.keys(mode).forEach((key) => {
     delete mode[key];
@@ -7165,7 +7179,8 @@ const warn = (message, ...args) => {
   console.log(`WARN: ${message}`, ...args);
 };
 const deprecated = (version2, message) => {
-  if (seenDeprecations[`${version2}/${message}`]) return;
+  if (seenDeprecations[`${version2}/${message}`])
+    return;
   console.log(`Deprecated as of ${version2}. ${message}`);
   seenDeprecations[`${version2}/${message}`] = true;
 };
@@ -7185,7 +7200,8 @@ function remapScopeNames(mode, regexes, { key }) {
   mode[key]._multi = true;
 }
 function beginMultiClass(mode) {
-  if (!Array.isArray(mode.begin)) return;
+  if (!Array.isArray(mode.begin))
+    return;
   if (mode.skip || mode.excludeBegin || mode.returnBegin) {
     error("skip, excludeBegin, returnBegin not compatible with beginScope: {}");
     throw MultiClassError;
@@ -7198,7 +7214,8 @@ function beginMultiClass(mode) {
   mode.begin = _rewriteBackreferences(mode.begin, { joinWith: "" });
 }
 function endMultiClass(mode) {
-  if (!Array.isArray(mode.end)) return;
+  if (!Array.isArray(mode.end))
+    return;
   if (mode.skip || mode.excludeEnd || mode.returnEnd) {
     error("skip, excludeEnd, returnEnd not compatible with endScope: {}");
     throw MultiClassError;
@@ -7279,7 +7296,8 @@ function compileLanguage(language) {
     }
     // @ts-ignore
     getMatcher(index) {
-      if (this.multiRegexes[index]) return this.multiRegexes[index];
+      if (this.multiRegexes[index])
+        return this.multiRegexes[index];
       const matcher = new MultiRegex();
       this.rules.slice(index).forEach(([re, opts]) => matcher.addRule(re, opts));
       matcher.compile();
@@ -7295,7 +7313,8 @@ function compileLanguage(language) {
     // @ts-ignore
     addRule(re, opts) {
       this.rules.push([re, opts]);
-      if (opts.type === "begin") this.count++;
+      if (opts.type === "begin")
+        this.count++;
     }
     /** @param {string} s */
     exec(s) {
@@ -7303,7 +7322,8 @@ function compileLanguage(language) {
       m.lastIndex = this.lastIndex;
       let result = m.exec(s);
       if (this.resumingScanAtSamePosition()) {
-        if (result && result.index === this.lastIndex) ;
+        if (result && result.index === this.lastIndex)
+          ;
         else {
           const m2 = this.getMatcher(0);
           m2.lastIndex = this.lastIndex + 1;
@@ -7335,7 +7355,8 @@ function compileLanguage(language) {
       /** @type CompiledMode */
       mode
     );
-    if (mode.isCompiled) return cmode;
+    if (mode.isCompiled)
+      return cmode;
     [
       scopeClassName,
       // do this early so compiler extensions generally don't have to worry about
@@ -7367,20 +7388,25 @@ function compileLanguage(language) {
     }
     cmode.keywordPatternRe = langRe(keywordPattern, true);
     if (parent) {
-      if (!mode.begin) mode.begin = /\B|\b/;
+      if (!mode.begin)
+        mode.begin = /\B|\b/;
       cmode.beginRe = langRe(cmode.begin);
-      if (!mode.end && !mode.endsWithParent) mode.end = /\B|\b/;
-      if (mode.end) cmode.endRe = langRe(cmode.end);
+      if (!mode.end && !mode.endsWithParent)
+        mode.end = /\B|\b/;
+      if (mode.end)
+        cmode.endRe = langRe(cmode.end);
       cmode.terminatorEnd = source$1(cmode.end) || "";
       if (mode.endsWithParent && parent.terminatorEnd) {
         cmode.terminatorEnd += (mode.end ? "|" : "") + parent.terminatorEnd;
       }
     }
-    if (mode.illegal) cmode.illegalRe = langRe(
-      /** @type {RegExp | string} */
-      mode.illegal
-    );
-    if (!mode.contains) mode.contains = [];
+    if (mode.illegal)
+      cmode.illegalRe = langRe(
+        /** @type {RegExp | string} */
+        mode.illegal
+      );
+    if (!mode.contains)
+      mode.contains = [];
     mode.contains = [].concat(...mode.contains.map(function(c2) {
       return expandOrCloneMode(c2 === "self" ? mode : c2);
     }));
@@ -7397,7 +7423,8 @@ function compileLanguage(language) {
     cmode.matcher = buildModeRegex(cmode);
     return cmode;
   }
-  if (!language.compilerExtensions) language.compilerExtensions = [];
+  if (!language.compilerExtensions)
+    language.compilerExtensions = [];
   if (language.contains && language.contains.includes("self")) {
     throw new Error("ERR: contains `self` is not supported at the top-level of a language.  See documentation.");
   }
@@ -7408,7 +7435,8 @@ function compileLanguage(language) {
   );
 }
 function dependencyOnParent(mode) {
-  if (!mode) return false;
+  if (!mode)
+    return false;
   return mode.endsWithParent || dependencyOnParent(mode.starts);
 }
 function expandOrCloneMode(mode) {
@@ -7428,7 +7456,7 @@ function expandOrCloneMode(mode) {
   }
   return mode;
 }
-var version$1 = "11.10.0";
+var version$1 = "11.9.0";
 class HTMLInjectionError extends Error {
   constructor(reason, html) {
     super(reason);
@@ -7525,7 +7553,8 @@ const HLJS = function(hljs) {
           emitter.addText(buf);
           buf = "";
           keywordHits[word] = (keywordHits[word] || 0) + 1;
-          if (keywordHits[word] <= MAX_KEYWORD_HITS) relevance += keywordRelevance;
+          if (keywordHits[word] <= MAX_KEYWORD_HITS)
+            relevance += keywordRelevance;
           if (kind.startsWith("_")) {
             buf += match[0];
           } else {
@@ -7542,7 +7571,8 @@ const HLJS = function(hljs) {
       emitter.addText(buf);
     }
     function processSubLanguage() {
-      if (modeBuffer === "") return;
+      if (modeBuffer === "")
+        return;
       let result2 = null;
       if (typeof top.subLanguage === "string") {
         if (!languages2[top.subLanguage]) {
@@ -7569,7 +7599,8 @@ const HLJS = function(hljs) {
       modeBuffer = "";
     }
     function emitKeyword(keyword, scope) {
-      if (keyword === "") return;
+      if (keyword === "")
+        return;
       emitter.startScope(scope);
       emitter.addText(keyword);
       emitter.endScope();
@@ -7616,7 +7647,8 @@ const HLJS = function(hljs) {
         if (mode["on:end"]) {
           const resp = new Response(mode);
           mode["on:end"](match, resp);
-          if (resp.isMatchIgnored) matched = false;
+          if (resp.isMatchIgnored)
+            matched = false;
         }
         if (matched) {
           while (mode.endsParent && mode.parent) {
@@ -7644,9 +7676,11 @@ const HLJS = function(hljs) {
       const resp = new Response(newMode);
       const beforeCallbacks = [newMode.__beforeBegin, newMode["on:begin"]];
       for (const cb of beforeCallbacks) {
-        if (!cb) continue;
+        if (!cb)
+          continue;
         cb(match, resp);
-        if (resp.isMatchIgnored) return doIgnore(lexeme);
+        if (resp.isMatchIgnored)
+          return doIgnore(lexeme);
       }
       if (newMode.skip) {
         modeBuffer += lexeme;
@@ -7779,7 +7813,8 @@ const HLJS = function(hljs) {
           }
           top.matcher.lastIndex = index;
           const match = top.matcher.exec(codeToHighlight);
-          if (!match) break;
+          if (!match)
+            break;
           const beforeMatch = codeToHighlight.substring(index, match.index);
           const processedCount = processLexeme(beforeMatch, match);
           index = match.index + processedCount;
@@ -7848,7 +7883,8 @@ const HLJS = function(hljs) {
     );
     results.unshift(plaintext2);
     const sorted = results.sort((a, b) => {
-      if (a.relevance !== b.relevance) return b.relevance - a.relevance;
+      if (a.relevance !== b.relevance)
+        return b.relevance - a.relevance;
       if (a.language && b.language) {
         if (getLanguage(a.language).supersetOf === b.language) {
           return 1;
@@ -7871,7 +7907,8 @@ const HLJS = function(hljs) {
   function highlightElement(element2) {
     let node = null;
     const language = blockLanguage(element2);
-    if (shouldNotHighlight(language)) return;
+    if (shouldNotHighlight(language))
+      return;
     fire(
       "before:highlightElement",
       { el: element2, language }
@@ -7936,7 +7973,8 @@ const HLJS = function(hljs) {
     blocks.forEach(highlightElement);
   }
   function boot() {
-    if (wantsHighlight) highlightAll();
+    if (wantsHighlight)
+      highlightAll();
   }
   if (typeof window !== "undefined" && window.addEventListener) {
     window.addEventListener("DOMContentLoaded", boot, false);
@@ -7954,7 +7992,8 @@ const HLJS = function(hljs) {
       }
       lang = PLAINTEXT_LANGUAGE;
     }
-    if (!lang.name) lang.name = languageName;
+    if (!lang.name)
+      lang.name = languageName;
     languages2[languageName] = lang;
     lang.rawDefinition = languageDefinition.bind(null, hljs);
     if (lang.aliases) {
@@ -8107,7 +8146,6 @@ function json(hljs) {
   };
   return {
     name: "JSON",
-    aliases: ["jsonc"],
     keywords: {
       literal: LITERALS2
     },
@@ -8364,7 +8402,7 @@ function javascript$1(hljs) {
     // defined later
   };
   const HTML_TEMPLATE = {
-    begin: ".?html`",
+    begin: "html`",
     end: "",
     starts: {
       end: "`",
@@ -8377,7 +8415,7 @@ function javascript$1(hljs) {
     }
   };
   const CSS_TEMPLATE = {
-    begin: ".?css`",
+    begin: "css`",
     end: "",
     starts: {
       end: "`",
@@ -8390,7 +8428,7 @@ function javascript$1(hljs) {
     }
   };
   const GRAPHQL_TEMPLATE = {
-    begin: ".?gql`",
+    begin: "gql`",
     end: "",
     starts: {
       end: "`",
@@ -8486,7 +8524,7 @@ function javascript$1(hljs) {
   const PARAMS_CONTAINS = SUBST_AND_COMMENTS.concat([
     // eat recursive parens in sub expressions
     {
-      begin: /(\s*)\(/,
+      begin: /\(/,
       end: /\)/,
       keywords: KEYWORDS$1$1,
       contains: ["self"].concat(SUBST_AND_COMMENTS)
@@ -8494,9 +8532,7 @@ function javascript$1(hljs) {
   ]);
   const PARAMS = {
     className: "params",
-    // convert this to negative lookbehind in v12
-    begin: /(\s*)\(/,
-    // to match the parms with 
+    begin: /\(/,
     end: /\)/,
     excludeBegin: true,
     excludeEnd: true,
@@ -8609,9 +8645,9 @@ function javascript$1(hljs) {
         ...BUILT_IN_GLOBALS$1,
         "super",
         "import"
-      ].map((x) => `${x}\\s*\\(`)),
+      ]),
       IDENT_RE$1$1,
-      regex.lookahead(/\s*\(/)
+      regex.lookahead(/\(/)
     ),
     className: "title.function",
     relevance: 0
@@ -8727,7 +8763,7 @@ function javascript$1(hljs) {
                     skip: true
                   },
                   {
-                    begin: /(\s*)\(/,
+                    begin: /\(/,
                     end: /\)/,
                     excludeBegin: true,
                     excludeEnd: true,
@@ -8847,7 +8883,8 @@ var NUMERIC$1 = {
   relevance: 0
 };
 function recurRegex(re, substitution, depth) {
-  if (depth === -1) return "";
+  if (depth === -1)
+    return "";
   return re.replace(substitution, (_) => {
     return recurRegex(re, substitution, depth - 1);
   });
@@ -8898,8 +8935,7 @@ function java(hljs) {
     "do",
     "sealed",
     "yield",
-    "permits",
-    "goto"
+    "permits"
   ];
   const BUILT_INS2 = [
     "super",
@@ -9312,7 +9348,7 @@ function javascript(hljs) {
     // defined later
   };
   const HTML_TEMPLATE = {
-    begin: ".?html`",
+    begin: "html`",
     end: "",
     starts: {
       end: "`",
@@ -9325,7 +9361,7 @@ function javascript(hljs) {
     }
   };
   const CSS_TEMPLATE = {
-    begin: ".?css`",
+    begin: "css`",
     end: "",
     starts: {
       end: "`",
@@ -9338,7 +9374,7 @@ function javascript(hljs) {
     }
   };
   const GRAPHQL_TEMPLATE = {
-    begin: ".?gql`",
+    begin: "gql`",
     end: "",
     starts: {
       end: "`",
@@ -9434,7 +9470,7 @@ function javascript(hljs) {
   const PARAMS_CONTAINS = SUBST_AND_COMMENTS.concat([
     // eat recursive parens in sub expressions
     {
-      begin: /(\s*)\(/,
+      begin: /\(/,
       end: /\)/,
       keywords: KEYWORDS$12,
       contains: ["self"].concat(SUBST_AND_COMMENTS)
@@ -9442,9 +9478,7 @@ function javascript(hljs) {
   ]);
   const PARAMS = {
     className: "params",
-    // convert this to negative lookbehind in v12
-    begin: /(\s*)\(/,
-    // to match the parms with 
+    begin: /\(/,
     end: /\)/,
     excludeBegin: true,
     excludeEnd: true,
@@ -9557,9 +9591,9 @@ function javascript(hljs) {
         ...BUILT_IN_GLOBALS,
         "super",
         "import"
-      ].map((x) => `${x}\\s*\\(`)),
+      ]),
       IDENT_RE$12,
-      regex.lookahead(/\s*\(/)
+      regex.lookahead(/\(/)
     ),
     className: "title.function",
     relevance: 0
@@ -9675,7 +9709,7 @@ function javascript(hljs) {
                     skip: true
                   },
                   {
-                    begin: /(\s*)\(/,
+                    begin: /\(/,
                     end: /\)/,
                     excludeBegin: true,
                     excludeEnd: true,
@@ -9784,15 +9818,10 @@ function typescript(hljs) {
     "unknown"
   ];
   const NAMESPACE = {
-    begin: [
-      /namespace/,
-      /\s+/,
-      hljs.IDENT_RE
-    ],
-    beginScope: {
-      1: "keyword",
-      3: "title.class"
-    }
+    beginKeywords: "namespace",
+    end: /\{/,
+    excludeEnd: true,
+    contains: [tsLanguage.exports.CLASS_REFERENCE]
   };
   const INTERFACE = {
     beginKeywords: "interface",
@@ -9811,7 +9840,7 @@ function typescript(hljs) {
   };
   const TS_SPECIFIC_KEYWORDS = [
     "type",
-    // "namespace",
+    "namespace",
     "interface",
     "public",
     "private",
@@ -9821,8 +9850,7 @@ function typescript(hljs) {
     "abstract",
     "readonly",
     "enum",
-    "override",
-    "satisfies"
+    "override"
   ];
   const KEYWORDS$12 = {
     $pattern: IDENT_RE,
@@ -9844,13 +9872,6 @@ function typescript(hljs) {
   };
   Object.assign(tsLanguage.keywords, KEYWORDS$12);
   tsLanguage.exports.PARAMS_CONTAINS.push(DECORATOR);
-  const ATTRIBUTE_HIGHLIGHT = tsLanguage.contains.find((c2) => c2.className === "attr");
-  tsLanguage.exports.PARAMS_CONTAINS.push([
-    tsLanguage.exports.CLASS_REFERENCE,
-    // class reference for highlighting the params types
-    ATTRIBUTE_HIGHLIGHT
-    // highlight the params key
-  ]);
   tsLanguage.contains = tsLanguage.contains.concat([
     DECORATOR,
     NAMESPACE,
@@ -10219,8 +10240,7 @@ function python(hljs) {
       NUMBER,
       {
         // very common convention
-        scope: "variable.language",
-        match: /\bself\b/
+        begin: /\bself\b/
       },
       {
         // eat "if" prior to string so that it won't accidentally be
@@ -10228,7 +10248,6 @@ function python(hljs) {
         beginKeywords: "if",
         relevance: 0
       },
-      { match: /\bor\b/, scope: "keyword" },
       STRING,
       COMMENT_TYPE,
       hljs.HASH_COMMENT_MODE,
@@ -10334,7 +10353,8 @@ function php(hljs) {
       resp.data._beginMatch = m[1] || m[2];
     },
     "on:end": (m, resp) => {
-      if (resp.data._beginMatch !== m[1]) resp.ignoreMatch();
+      if (resp.data._beginMatch !== m[1])
+        resp.ignoreMatch();
     }
   };
   const NOWDOC = hljs.END_SAME_AS_BEGIN({
@@ -10905,7 +10925,7 @@ const MODES$2 = (hljs) => {
     }
   };
 };
-const HTML_TAGS$2 = [
+const TAGS$2 = [
   "a",
   "abbr",
   "address",
@@ -10957,16 +10977,11 @@ const HTML_TAGS$2 = [
   "nav",
   "object",
   "ol",
-  "optgroup",
-  "option",
   "p",
-  "picture",
   "q",
   "quote",
   "samp",
   "section",
-  "select",
-  "source",
   "span",
   "strong",
   "summary",
@@ -10984,53 +10999,6 @@ const HTML_TAGS$2 = [
   "var",
   "video"
 ];
-const SVG_TAGS$2 = [
-  "defs",
-  "g",
-  "marker",
-  "mask",
-  "pattern",
-  "svg",
-  "switch",
-  "symbol",
-  "feBlend",
-  "feColorMatrix",
-  "feComponentTransfer",
-  "feComposite",
-  "feConvolveMatrix",
-  "feDiffuseLighting",
-  "feDisplacementMap",
-  "feFlood",
-  "feGaussianBlur",
-  "feImage",
-  "feMerge",
-  "feMorphology",
-  "feOffset",
-  "feSpecularLighting",
-  "feTile",
-  "feTurbulence",
-  "linearGradient",
-  "radialGradient",
-  "stop",
-  "circle",
-  "ellipse",
-  "image",
-  "line",
-  "path",
-  "polygon",
-  "polyline",
-  "rect",
-  "text",
-  "use",
-  "textPath",
-  "tspan",
-  "foreignObject",
-  "clipPath"
-];
-const TAGS$2 = [
-  ...HTML_TAGS$2,
-  ...SVG_TAGS$2
-];
 const MEDIA_FEATURES$2 = [
   "any-hover",
   "any-pointer",
@@ -11066,7 +11034,7 @@ const MEDIA_FEATURES$2 = [
   "max-width",
   "min-height",
   "max-height"
-].sort().reverse();
+];
 const PSEUDO_CLASSES$2 = [
   "active",
   "any-link",
@@ -11141,7 +11109,7 @@ const PSEUDO_CLASSES$2 = [
   "visited",
   "where"
   // where()
-].sort().reverse();
+];
 const PSEUDO_ELEMENTS$2 = [
   "after",
   "backdrop",
@@ -11157,13 +11125,11 @@ const PSEUDO_ELEMENTS$2 = [
   "selection",
   "slotted",
   "spelling-error"
-].sort().reverse();
+];
 const ATTRIBUTES$2 = [
-  "accent-color",
   "align-content",
   "align-items",
   "align-self",
-  "alignment-baseline",
   "all",
   "animation",
   "animation-delay",
@@ -11174,7 +11140,6 @@ const ATTRIBUTES$2 = [
   "animation-name",
   "animation-play-state",
   "animation-timing-function",
-  "appearance",
   "backface-visibility",
   "background",
   "background-attachment",
@@ -11186,7 +11151,6 @@ const ATTRIBUTES$2 = [
   "background-position",
   "background-repeat",
   "background-size",
-  "baseline-shift",
   "block-size",
   "border",
   "border-block",
@@ -11233,14 +11197,10 @@ const ATTRIBUTES$2 = [
   "border-left-width",
   "border-radius",
   "border-right",
-  "border-end-end-radius",
-  "border-end-start-radius",
   "border-right-color",
   "border-right-style",
   "border-right-width",
   "border-spacing",
-  "border-start-end-radius",
-  "border-start-start-radius",
   "border-style",
   "border-top",
   "border-top-color",
@@ -11256,8 +11216,6 @@ const ATTRIBUTES$2 = [
   "break-after",
   "break-before",
   "break-inside",
-  "cx",
-  "cy",
   "caption-side",
   "caret-color",
   "clear",
@@ -11265,11 +11223,6 @@ const ATTRIBUTES$2 = [
   "clip-path",
   "clip-rule",
   "color",
-  "color-interpolation",
-  "color-interpolation-filters",
-  "color-profile",
-  "color-rendering",
-  "color-scheme",
   "column-count",
   "column-fill",
   "column-gap",
@@ -11291,12 +11244,7 @@ const ATTRIBUTES$2 = [
   "cursor",
   "direction",
   "display",
-  "dominant-baseline",
   "empty-cells",
-  "enable-background",
-  "fill",
-  "fill-opacity",
-  "fill-rule",
   "filter",
   "flex",
   "flex-basis",
@@ -11307,8 +11255,6 @@ const ATTRIBUTES$2 = [
   "flex-wrap",
   "float",
   "flow",
-  "flood-color",
-  "flood-opacity",
   "font",
   "font-display",
   "font-family",
@@ -11330,7 +11276,6 @@ const ATTRIBUTES$2 = [
   "font-variation-settings",
   "font-weight",
   "gap",
-  "glyph-orientation-horizontal",
   "glyph-orientation-vertical",
   "grid",
   "grid-area",
@@ -11357,32 +11302,16 @@ const ATTRIBUTES$2 = [
   "image-resolution",
   "ime-mode",
   "inline-size",
-  "inset",
-  "inset-block",
-  "inset-block-end",
-  "inset-block-start",
-  "inset-inline",
-  "inset-inline-end",
-  "inset-inline-start",
   "isolation",
-  "kerning",
   "justify-content",
-  "justify-items",
-  "justify-self",
   "left",
   "letter-spacing",
-  "lighting-color",
   "line-break",
   "line-height",
   "list-style",
   "list-style-image",
   "list-style-position",
   "list-style-type",
-  "marker",
-  "marker-end",
-  "marker-mid",
-  "marker-start",
-  "mask",
   "margin",
   "margin-block",
   "margin-block-end",
@@ -11464,15 +11393,12 @@ const ATTRIBUTES$2 = [
   "pointer-events",
   "position",
   "quotes",
-  "r",
   "resize",
   "rest",
   "rest-after",
   "rest-before",
   "right",
-  "rotate",
   "row-gap",
-  "scale",
   "scroll-margin",
   "scroll-margin-block",
   "scroll-margin-block-end",
@@ -11504,24 +11430,12 @@ const ATTRIBUTES$2 = [
   "shape-image-threshold",
   "shape-margin",
   "shape-outside",
-  "shape-rendering",
-  "stop-color",
-  "stop-opacity",
-  "stroke",
-  "stroke-dasharray",
-  "stroke-dashoffset",
-  "stroke-linecap",
-  "stroke-linejoin",
-  "stroke-miterlimit",
-  "stroke-opacity",
-  "stroke-width",
   "speak",
   "speak-as",
   "src",
   // @font-face
   "tab-size",
   "table-layout",
-  "text-anchor",
   "text-align",
   "text-align-all",
   "text-align-last",
@@ -11529,9 +11443,7 @@ const ATTRIBUTES$2 = [
   "text-decoration",
   "text-decoration-color",
   "text-decoration-line",
-  "text-decoration-skip-ink",
   "text-decoration-style",
-  "text-decoration-thickness",
   "text-emphasis",
   "text-emphasis-color",
   "text-emphasis-position",
@@ -11543,7 +11455,6 @@ const ATTRIBUTES$2 = [
   "text-rendering",
   "text-shadow",
   "text-transform",
-  "text-underline-offset",
   "text-underline-position",
   "top",
   "transform",
@@ -11555,9 +11466,7 @@ const ATTRIBUTES$2 = [
   "transition-duration",
   "transition-property",
   "transition-timing-function",
-  "translate",
   "unicode-bidi",
-  "vector-effect",
   "vertical-align",
   "visibility",
   "voice-balance",
@@ -11576,10 +11485,10 @@ const ATTRIBUTES$2 = [
   "word-spacing",
   "word-wrap",
   "writing-mode",
-  "x",
-  "y",
   "z-index"
-].sort().reverse();
+  // reverse makes sure longer attributes `font-weight` are matched fully
+  // instead of getting false positives on say `font`
+].reverse();
 function css(hljs) {
   const regex = hljs.regex;
   const modes = MODES$2(hljs);
@@ -11745,7 +11654,7 @@ const MODES$1 = (hljs) => {
     }
   };
 };
-const HTML_TAGS$1 = [
+const TAGS$1 = [
   "a",
   "abbr",
   "address",
@@ -11797,16 +11706,11 @@ const HTML_TAGS$1 = [
   "nav",
   "object",
   "ol",
-  "optgroup",
-  "option",
   "p",
-  "picture",
   "q",
   "quote",
   "samp",
   "section",
-  "select",
-  "source",
   "span",
   "strong",
   "summary",
@@ -11824,53 +11728,6 @@ const HTML_TAGS$1 = [
   "var",
   "video"
 ];
-const SVG_TAGS$1 = [
-  "defs",
-  "g",
-  "marker",
-  "mask",
-  "pattern",
-  "svg",
-  "switch",
-  "symbol",
-  "feBlend",
-  "feColorMatrix",
-  "feComponentTransfer",
-  "feComposite",
-  "feConvolveMatrix",
-  "feDiffuseLighting",
-  "feDisplacementMap",
-  "feFlood",
-  "feGaussianBlur",
-  "feImage",
-  "feMerge",
-  "feMorphology",
-  "feOffset",
-  "feSpecularLighting",
-  "feTile",
-  "feTurbulence",
-  "linearGradient",
-  "radialGradient",
-  "stop",
-  "circle",
-  "ellipse",
-  "image",
-  "line",
-  "path",
-  "polygon",
-  "polyline",
-  "rect",
-  "text",
-  "use",
-  "textPath",
-  "tspan",
-  "foreignObject",
-  "clipPath"
-];
-const TAGS$1 = [
-  ...HTML_TAGS$1,
-  ...SVG_TAGS$1
-];
 const MEDIA_FEATURES$1 = [
   "any-hover",
   "any-pointer",
@@ -11906,7 +11763,7 @@ const MEDIA_FEATURES$1 = [
   "max-width",
   "min-height",
   "max-height"
-].sort().reverse();
+];
 const PSEUDO_CLASSES$1 = [
   "active",
   "any-link",
@@ -11981,7 +11838,7 @@ const PSEUDO_CLASSES$1 = [
   "visited",
   "where"
   // where()
-].sort().reverse();
+];
 const PSEUDO_ELEMENTS$1 = [
   "after",
   "backdrop",
@@ -11997,13 +11854,11 @@ const PSEUDO_ELEMENTS$1 = [
   "selection",
   "slotted",
   "spelling-error"
-].sort().reverse();
+];
 const ATTRIBUTES$1 = [
-  "accent-color",
   "align-content",
   "align-items",
   "align-self",
-  "alignment-baseline",
   "all",
   "animation",
   "animation-delay",
@@ -12014,7 +11869,6 @@ const ATTRIBUTES$1 = [
   "animation-name",
   "animation-play-state",
   "animation-timing-function",
-  "appearance",
   "backface-visibility",
   "background",
   "background-attachment",
@@ -12026,7 +11880,6 @@ const ATTRIBUTES$1 = [
   "background-position",
   "background-repeat",
   "background-size",
-  "baseline-shift",
   "block-size",
   "border",
   "border-block",
@@ -12073,14 +11926,10 @@ const ATTRIBUTES$1 = [
   "border-left-width",
   "border-radius",
   "border-right",
-  "border-end-end-radius",
-  "border-end-start-radius",
   "border-right-color",
   "border-right-style",
   "border-right-width",
   "border-spacing",
-  "border-start-end-radius",
-  "border-start-start-radius",
   "border-style",
   "border-top",
   "border-top-color",
@@ -12096,8 +11945,6 @@ const ATTRIBUTES$1 = [
   "break-after",
   "break-before",
   "break-inside",
-  "cx",
-  "cy",
   "caption-side",
   "caret-color",
   "clear",
@@ -12105,11 +11952,6 @@ const ATTRIBUTES$1 = [
   "clip-path",
   "clip-rule",
   "color",
-  "color-interpolation",
-  "color-interpolation-filters",
-  "color-profile",
-  "color-rendering",
-  "color-scheme",
   "column-count",
   "column-fill",
   "column-gap",
@@ -12131,12 +11973,7 @@ const ATTRIBUTES$1 = [
   "cursor",
   "direction",
   "display",
-  "dominant-baseline",
   "empty-cells",
-  "enable-background",
-  "fill",
-  "fill-opacity",
-  "fill-rule",
   "filter",
   "flex",
   "flex-basis",
@@ -12147,8 +11984,6 @@ const ATTRIBUTES$1 = [
   "flex-wrap",
   "float",
   "flow",
-  "flood-color",
-  "flood-opacity",
   "font",
   "font-display",
   "font-family",
@@ -12170,7 +12005,6 @@ const ATTRIBUTES$1 = [
   "font-variation-settings",
   "font-weight",
   "gap",
-  "glyph-orientation-horizontal",
   "glyph-orientation-vertical",
   "grid",
   "grid-area",
@@ -12197,32 +12031,16 @@ const ATTRIBUTES$1 = [
   "image-resolution",
   "ime-mode",
   "inline-size",
-  "inset",
-  "inset-block",
-  "inset-block-end",
-  "inset-block-start",
-  "inset-inline",
-  "inset-inline-end",
-  "inset-inline-start",
   "isolation",
-  "kerning",
   "justify-content",
-  "justify-items",
-  "justify-self",
   "left",
   "letter-spacing",
-  "lighting-color",
   "line-break",
   "line-height",
   "list-style",
   "list-style-image",
   "list-style-position",
   "list-style-type",
-  "marker",
-  "marker-end",
-  "marker-mid",
-  "marker-start",
-  "mask",
   "margin",
   "margin-block",
   "margin-block-end",
@@ -12304,15 +12122,12 @@ const ATTRIBUTES$1 = [
   "pointer-events",
   "position",
   "quotes",
-  "r",
   "resize",
   "rest",
   "rest-after",
   "rest-before",
   "right",
-  "rotate",
   "row-gap",
-  "scale",
   "scroll-margin",
   "scroll-margin-block",
   "scroll-margin-block-end",
@@ -12344,24 +12159,12 @@ const ATTRIBUTES$1 = [
   "shape-image-threshold",
   "shape-margin",
   "shape-outside",
-  "shape-rendering",
-  "stop-color",
-  "stop-opacity",
-  "stroke",
-  "stroke-dasharray",
-  "stroke-dashoffset",
-  "stroke-linecap",
-  "stroke-linejoin",
-  "stroke-miterlimit",
-  "stroke-opacity",
-  "stroke-width",
   "speak",
   "speak-as",
   "src",
   // @font-face
   "tab-size",
   "table-layout",
-  "text-anchor",
   "text-align",
   "text-align-all",
   "text-align-last",
@@ -12369,9 +12172,7 @@ const ATTRIBUTES$1 = [
   "text-decoration",
   "text-decoration-color",
   "text-decoration-line",
-  "text-decoration-skip-ink",
   "text-decoration-style",
-  "text-decoration-thickness",
   "text-emphasis",
   "text-emphasis-color",
   "text-emphasis-position",
@@ -12383,7 +12184,6 @@ const ATTRIBUTES$1 = [
   "text-rendering",
   "text-shadow",
   "text-transform",
-  "text-underline-offset",
   "text-underline-position",
   "top",
   "transform",
@@ -12395,9 +12195,7 @@ const ATTRIBUTES$1 = [
   "transition-duration",
   "transition-property",
   "transition-timing-function",
-  "translate",
   "unicode-bidi",
-  "vector-effect",
   "vertical-align",
   "visibility",
   "voice-balance",
@@ -12416,11 +12214,11 @@ const ATTRIBUTES$1 = [
   "word-spacing",
   "word-wrap",
   "writing-mode",
-  "x",
-  "y",
   "z-index"
-].sort().reverse();
-const PSEUDO_SELECTORS = PSEUDO_CLASSES$1.concat(PSEUDO_ELEMENTS$1).sort().reverse();
+  // reverse makes sure longer attributes `font-weight` are matched fully
+  // instead of getting false positives on say `font`
+].reverse();
+const PSEUDO_SELECTORS = PSEUDO_CLASSES$1.concat(PSEUDO_ELEMENTS$1);
 function less(hljs) {
   const modes = MODES$1(hljs);
   const PSEUDO_SELECTORS$1 = PSEUDO_SELECTORS;
@@ -12666,7 +12464,7 @@ const MODES = (hljs) => {
     }
   };
 };
-const HTML_TAGS = [
+const TAGS = [
   "a",
   "abbr",
   "address",
@@ -12718,16 +12516,11 @@ const HTML_TAGS = [
   "nav",
   "object",
   "ol",
-  "optgroup",
-  "option",
   "p",
-  "picture",
   "q",
   "quote",
   "samp",
   "section",
-  "select",
-  "source",
   "span",
   "strong",
   "summary",
@@ -12745,53 +12538,6 @@ const HTML_TAGS = [
   "var",
   "video"
 ];
-const SVG_TAGS = [
-  "defs",
-  "g",
-  "marker",
-  "mask",
-  "pattern",
-  "svg",
-  "switch",
-  "symbol",
-  "feBlend",
-  "feColorMatrix",
-  "feComponentTransfer",
-  "feComposite",
-  "feConvolveMatrix",
-  "feDiffuseLighting",
-  "feDisplacementMap",
-  "feFlood",
-  "feGaussianBlur",
-  "feImage",
-  "feMerge",
-  "feMorphology",
-  "feOffset",
-  "feSpecularLighting",
-  "feTile",
-  "feTurbulence",
-  "linearGradient",
-  "radialGradient",
-  "stop",
-  "circle",
-  "ellipse",
-  "image",
-  "line",
-  "path",
-  "polygon",
-  "polyline",
-  "rect",
-  "text",
-  "use",
-  "textPath",
-  "tspan",
-  "foreignObject",
-  "clipPath"
-];
-const TAGS = [
-  ...HTML_TAGS,
-  ...SVG_TAGS
-];
 const MEDIA_FEATURES = [
   "any-hover",
   "any-pointer",
@@ -12827,7 +12573,7 @@ const MEDIA_FEATURES = [
   "max-width",
   "min-height",
   "max-height"
-].sort().reverse();
+];
 const PSEUDO_CLASSES = [
   "active",
   "any-link",
@@ -12902,7 +12648,7 @@ const PSEUDO_CLASSES = [
   "visited",
   "where"
   // where()
-].sort().reverse();
+];
 const PSEUDO_ELEMENTS = [
   "after",
   "backdrop",
@@ -12918,13 +12664,11 @@ const PSEUDO_ELEMENTS = [
   "selection",
   "slotted",
   "spelling-error"
-].sort().reverse();
+];
 const ATTRIBUTES = [
-  "accent-color",
   "align-content",
   "align-items",
   "align-self",
-  "alignment-baseline",
   "all",
   "animation",
   "animation-delay",
@@ -12935,7 +12679,6 @@ const ATTRIBUTES = [
   "animation-name",
   "animation-play-state",
   "animation-timing-function",
-  "appearance",
   "backface-visibility",
   "background",
   "background-attachment",
@@ -12947,7 +12690,6 @@ const ATTRIBUTES = [
   "background-position",
   "background-repeat",
   "background-size",
-  "baseline-shift",
   "block-size",
   "border",
   "border-block",
@@ -12994,14 +12736,10 @@ const ATTRIBUTES = [
   "border-left-width",
   "border-radius",
   "border-right",
-  "border-end-end-radius",
-  "border-end-start-radius",
   "border-right-color",
   "border-right-style",
   "border-right-width",
   "border-spacing",
-  "border-start-end-radius",
-  "border-start-start-radius",
   "border-style",
   "border-top",
   "border-top-color",
@@ -13017,8 +12755,6 @@ const ATTRIBUTES = [
   "break-after",
   "break-before",
   "break-inside",
-  "cx",
-  "cy",
   "caption-side",
   "caret-color",
   "clear",
@@ -13026,11 +12762,6 @@ const ATTRIBUTES = [
   "clip-path",
   "clip-rule",
   "color",
-  "color-interpolation",
-  "color-interpolation-filters",
-  "color-profile",
-  "color-rendering",
-  "color-scheme",
   "column-count",
   "column-fill",
   "column-gap",
@@ -13052,12 +12783,7 @@ const ATTRIBUTES = [
   "cursor",
   "direction",
   "display",
-  "dominant-baseline",
   "empty-cells",
-  "enable-background",
-  "fill",
-  "fill-opacity",
-  "fill-rule",
   "filter",
   "flex",
   "flex-basis",
@@ -13068,8 +12794,6 @@ const ATTRIBUTES = [
   "flex-wrap",
   "float",
   "flow",
-  "flood-color",
-  "flood-opacity",
   "font",
   "font-display",
   "font-family",
@@ -13091,7 +12815,6 @@ const ATTRIBUTES = [
   "font-variation-settings",
   "font-weight",
   "gap",
-  "glyph-orientation-horizontal",
   "glyph-orientation-vertical",
   "grid",
   "grid-area",
@@ -13118,32 +12841,16 @@ const ATTRIBUTES = [
   "image-resolution",
   "ime-mode",
   "inline-size",
-  "inset",
-  "inset-block",
-  "inset-block-end",
-  "inset-block-start",
-  "inset-inline",
-  "inset-inline-end",
-  "inset-inline-start",
   "isolation",
-  "kerning",
   "justify-content",
-  "justify-items",
-  "justify-self",
   "left",
   "letter-spacing",
-  "lighting-color",
   "line-break",
   "line-height",
   "list-style",
   "list-style-image",
   "list-style-position",
   "list-style-type",
-  "marker",
-  "marker-end",
-  "marker-mid",
-  "marker-start",
-  "mask",
   "margin",
   "margin-block",
   "margin-block-end",
@@ -13225,15 +12932,12 @@ const ATTRIBUTES = [
   "pointer-events",
   "position",
   "quotes",
-  "r",
   "resize",
   "rest",
   "rest-after",
   "rest-before",
   "right",
-  "rotate",
   "row-gap",
-  "scale",
   "scroll-margin",
   "scroll-margin-block",
   "scroll-margin-block-end",
@@ -13265,24 +12969,12 @@ const ATTRIBUTES = [
   "shape-image-threshold",
   "shape-margin",
   "shape-outside",
-  "shape-rendering",
-  "stop-color",
-  "stop-opacity",
-  "stroke",
-  "stroke-dasharray",
-  "stroke-dashoffset",
-  "stroke-linecap",
-  "stroke-linejoin",
-  "stroke-miterlimit",
-  "stroke-opacity",
-  "stroke-width",
   "speak",
   "speak-as",
   "src",
   // @font-face
   "tab-size",
   "table-layout",
-  "text-anchor",
   "text-align",
   "text-align-all",
   "text-align-last",
@@ -13290,9 +12982,7 @@ const ATTRIBUTES = [
   "text-decoration",
   "text-decoration-color",
   "text-decoration-line",
-  "text-decoration-skip-ink",
   "text-decoration-style",
-  "text-decoration-thickness",
   "text-emphasis",
   "text-emphasis-color",
   "text-emphasis-position",
@@ -13304,7 +12994,6 @@ const ATTRIBUTES = [
   "text-rendering",
   "text-shadow",
   "text-transform",
-  "text-underline-offset",
   "text-underline-position",
   "top",
   "transform",
@@ -13316,9 +13005,7 @@ const ATTRIBUTES = [
   "transition-duration",
   "transition-property",
   "transition-timing-function",
-  "translate",
   "unicode-bidi",
-  "vector-effect",
   "vertical-align",
   "visibility",
   "voice-balance",
@@ -13337,10 +13024,10 @@ const ATTRIBUTES = [
   "word-spacing",
   "word-wrap",
   "writing-mode",
-  "x",
-  "y",
   "z-index"
-].sort().reverse();
+  // reverse makes sure longer attributes `font-weight` are matched fully
+  // instead of getting false positives on say `font`
+].reverse();
 function scss(hljs) {
   const modes = MODES(hljs);
   const PSEUDO_ELEMENTS$12 = PSEUDO_ELEMENTS;
@@ -13882,11 +13569,6 @@ function markdown(hljs) {
     contains: CONTAINABLE,
     end: "$"
   };
-  const ENTITY = {
-    //https://spec.commonmark.org/0.31.2/#entity-references
-    scope: "literal",
-    match: /&([a-zA-Z0-9]+|#[0-9]{1,7}|#[Xx][0-9a-fA-F]{1,6});/
-  };
   return {
     name: "Markdown",
     aliases: [
@@ -13904,8 +13586,7 @@ function markdown(hljs) {
       CODE,
       HORIZONTAL_RULE,
       LINK,
-      LINK_REFERENCE,
-      ENTITY
+      LINK_REFERENCE
     ]
   };
 }
@@ -14151,8 +13832,10 @@ function objectivec(hljs) {
   };
 }
 function source(re) {
-  if (!re) return null;
-  if (typeof re === "string") return re;
+  if (!re)
+    return null;
+  if (typeof re === "string")
+    return re;
   return re.source;
 }
 function lookahead(re) {
@@ -14284,7 +13967,6 @@ const keywords = [
   // contextual
   "override",
   // contextual
-  "package",
   "postfix",
   // contextual
   "precedencegroup",
@@ -14727,7 +14409,7 @@ function swift(hljs) {
   };
   const KEYWORD_ATTRIBUTE = {
     scope: "keyword",
-    match: concat(/@/, either(...keywordAttributes), lookahead(either(/\(/, /\s+/)))
+    match: concat(/@/, either(...keywordAttributes))
   };
   const USER_DEFINED_ATTRIBUTE = {
     scope: "meta",
@@ -14914,36 +14596,6 @@ function swift(hljs) {
     ],
     end: /}/
   };
-  const TYPE_DECLARATION = {
-    begin: [
-      /(struct|protocol|class|extension|enum|actor)/,
-      /\s+/,
-      identifier,
-      /\s*/
-    ],
-    beginScope: {
-      1: "keyword",
-      3: "title.class"
-    },
-    keywords: KEYWORDS2,
-    contains: [
-      GENERIC_PARAMETERS,
-      ...KEYWORD_MODES,
-      {
-        begin: /:/,
-        end: /\{/,
-        keywords: KEYWORDS2,
-        contains: [
-          {
-            scope: "title.class.inherited",
-            match: typeIdentifier
-          },
-          ...KEYWORD_MODES
-        ],
-        relevance: 0
-      }
-    ]
-  };
   for (const variant of STRING.variants) {
     const interpolation = variant.contains.find((mode) => mode.label === "interpol");
     interpolation.keywords = KEYWORDS2;
@@ -14974,7 +14626,19 @@ function swift(hljs) {
       ...COMMENTS,
       FUNCTION_OR_MACRO,
       INIT_SUBSCRIPT,
-      TYPE_DECLARATION,
+      {
+        beginKeywords: "struct protocol class extension enum actor",
+        end: "\\{",
+        excludeEnd: true,
+        keywords: KEYWORDS2,
+        contains: [
+          hljs.inherit(hljs.TITLE_MODE, {
+            className: "title.class",
+            begin: /[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/
+          }),
+          ...KEYWORD_MODES
+        ]
+      },
       OPERATOR_DECLARATION,
       PRECEDENCEGROUP,
       {
@@ -15483,30 +15147,10 @@ function go(hljs) {
         className: "number",
         variants: [
           {
-            match: /-?\b0[xX]\.[a-fA-F0-9](_?[a-fA-F0-9])*[pP][+-]?\d(_?\d)*i?/,
-            // hex without a present digit before . (making a digit afterwards required)
-            relevance: 0
-          },
-          {
-            match: /-?\b0[xX](_?[a-fA-F0-9])+((\.([a-fA-F0-9](_?[a-fA-F0-9])*)?)?[pP][+-]?\d(_?\d)*)?i?/,
-            // hex with a present digit before . (making a digit afterwards optional)
-            relevance: 0
-          },
-          {
-            match: /-?\b0[oO](_?[0-7])*i?/,
-            // leading 0o octal
-            relevance: 0
-          },
-          {
-            match: /-?\.\d(_?\d)*([eE][+-]?\d(_?\d)*)?i?/,
-            // decimal without a present digit before . (making a digit afterwards required)
-            relevance: 0
+            begin: hljs.C_NUMBER_RE + "[i]",
+            relevance: 1
           },
-          {
-            match: /-?\b\d(_?\d)*(\.(\d(_?\d)*)?)?([eE][+-]?\d(_?\d)*)?i?/,
-            // decimal with a present digit before . (making a digit afterwards optional)
-            relevance: 0
-          }
+          hljs.C_NUMBER_MODE
         ]
       },
       {
@@ -16078,7 +15722,7 @@ function c(hljs) {
     className: "meta",
     begin: /#\s*[a-z]+\b/,
     end: /$/,
-    keywords: { keyword: "if else elif endif define undef warning error line pragma _Pragma ifdef ifndef elifdef elifndef include" },
+    keywords: { keyword: "if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include" },
     contains: [
       {
         begin: /\\\n/,
@@ -16119,8 +15763,6 @@ function c(hljs) {
     "restrict",
     "return",
     "sizeof",
-    "typeof",
-    "typeof_unqual",
     "struct",
     "switch",
     "typedef",
@@ -16154,26 +15796,14 @@ function c(hljs) {
     "char",
     "void",
     "_Bool",
-    "_BitInt",
     "_Complex",
     "_Imaginary",
     "_Decimal32",
     "_Decimal64",
-    "_Decimal96",
     "_Decimal128",
-    "_Decimal64x",
-    "_Decimal128x",
-    "_Float16",
-    "_Float32",
-    "_Float64",
-    "_Float128",
-    "_Float32x",
-    "_Float64x",
-    "_Float128x",
     // modifiers
     "const",
     "static",
-    "constexpr",
     // aliases
     "complex",
     "bool",
@@ -16356,16 +15986,9 @@ function cpp(hljs) {
   const NUMBERS = {
     className: "number",
     variants: [
-      // Floating-point literal.
-      {
-        begin: "[+-]?(?:(?:[0-9](?:'?[0-9])*\\.(?:[0-9](?:'?[0-9])*)?|\\.[0-9](?:'?[0-9])*)(?:[Ee][+-]?[0-9](?:'?[0-9])*)?|[0-9](?:'?[0-9])*[Ee][+-]?[0-9](?:'?[0-9])*|0[Xx](?:[0-9A-Fa-f](?:'?[0-9A-Fa-f])*(?:\\.(?:[0-9A-Fa-f](?:'?[0-9A-Fa-f])*)?)?|\\.[0-9A-Fa-f](?:'?[0-9A-Fa-f])*)[Pp][+-]?[0-9](?:'?[0-9])*)(?:[Ff](?:16|32|64|128)?|(BF|bf)16|[Ll]|)"
-      },
-      // Integer literal.
-      {
-        begin: "[+-]?\\b(?:0[Bb][01](?:'?[01])*|0[Xx][0-9A-Fa-f](?:'?[0-9A-Fa-f])*|0(?:'?[0-7])*|[1-9](?:'?[0-9])*)(?:[Uu](?:LL?|ll?)|[Uu][Zz]?|(?:LL?|ll?)[Uu]?|[Zz][Uu]|)"
-        // Note: there are user-defined literal suffixes too, but perhaps having the custom suffix not part of the
-        // literal highlight actually makes it stand out more.
-      }
+      { begin: "\\b(0b[01']+)" },
+      { begin: "(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)" },
+      { begin: "(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)" }
     ],
     relevance: 0
   };
@@ -17016,11 +16639,6 @@ function csharp(hljs) {
     ],
     relevance: 0
   };
-  const RAW_STRING = {
-    className: "string",
-    begin: /"""("*)(?!")(.|\n)*?"""\1/,
-    relevance: 1
-  };
   const VERBATIM_STRING = {
     className: "string",
     begin: '@"',
@@ -17086,7 +16704,6 @@ function csharp(hljs) {
     hljs.inherit(hljs.C_BLOCK_COMMENT_MODE, { illegal: /\n/ })
   ];
   const STRING = { variants: [
-    RAW_STRING,
     INTERPOLATED_VERBATIM_STRING,
     INTERPOLATED_STRING,
     VERBATIM_STRING,
@@ -18373,16 +17990,13 @@ function kotlin(hljs) {
 }
 function rust(hljs) {
   const regex = hljs.regex;
-  const RAW_IDENTIFIER = /(r#)?/;
-  const UNDERSCORE_IDENT_RE2 = regex.concat(RAW_IDENTIFIER, hljs.UNDERSCORE_IDENT_RE);
-  const IDENT_RE2 = regex.concat(RAW_IDENTIFIER, hljs.IDENT_RE);
   const FUNCTION_INVOKE = {
     className: "title.function.invoke",
     relevance: 0,
     begin: regex.concat(
       /\b/,
       /(?!let|for|while|if|else|match\b)/,
-      IDENT_RE2,
+      hljs.IDENT_RE,
       regex.lookahead(/\s*\(/)
     )
   };
@@ -18432,7 +18046,6 @@ function rust(hljs) {
     "try",
     "type",
     "typeof",
-    "union",
     "unsafe",
     "unsized",
     "use",
@@ -18584,7 +18197,7 @@ function rust(hljs) {
         begin: [
           /fn/,
           /\s+/,
-          UNDERSCORE_IDENT_RE2
+          hljs.UNDERSCORE_IDENT_RE
         ],
         className: {
           1: "keyword",
@@ -18599,10 +18212,7 @@ function rust(hljs) {
           {
             className: "string",
             begin: /"/,
-            end: /"/,
-            contains: [
-              hljs.BACKSLASH_ESCAPE
-            ]
+            end: /"/
           }
         ]
       },
@@ -18611,7 +18221,7 @@ function rust(hljs) {
           /let/,
           /\s+/,
           /(?:mut\s+)?/,
-          UNDERSCORE_IDENT_RE2
+          hljs.UNDERSCORE_IDENT_RE
         ],
         className: {
           1: "keyword",
@@ -18624,7 +18234,7 @@ function rust(hljs) {
         begin: [
           /for/,
           /\s+/,
-          UNDERSCORE_IDENT_RE2,
+          hljs.UNDERSCORE_IDENT_RE,
           /\s+/,
           /in/
         ],
@@ -18638,7 +18248,7 @@ function rust(hljs) {
         begin: [
           /type/,
           /\s+/,
-          UNDERSCORE_IDENT_RE2
+          hljs.UNDERSCORE_IDENT_RE
         ],
         className: {
           1: "keyword",
@@ -18649,7 +18259,7 @@ function rust(hljs) {
         begin: [
           /(?:trait|enum|struct|union|impl|for)/,
           /\s+/,
-          UNDERSCORE_IDENT_RE2
+          hljs.UNDERSCORE_IDENT_RE
         ],
         className: {
           1: "keyword",
@@ -21718,7 +21328,7 @@ var sigmasAndXis = {
   sqrtRuleThickness: [0.04, 0.04, 0.04],
   // This value determines how large a pt is, for metrics which are defined
   // in terms of pts.
-  // This value is also used in katex.scss; if you change it make sure the
+  // This value is also used in katex.less; if you change it make sure the
   // values match.
   ptPerEm: [10, 10, 10],
   // The space between adjacent `|` columns in an array definition. From
@@ -25453,7 +25063,8 @@ function parseCD(parser) {
           mode: "math",
           body: []
         };
-        if ("=|.".indexOf(arrowChar) > -1) ;
+        if ("=|.".indexOf(arrowChar) > -1)
+          ;
         else if ("<>AV".indexOf(arrowChar) > -1) {
           for (var labelNum = 0; labelNum < 2; labelNum++) {
             var inLabel = true;
@@ -29491,7 +29102,8 @@ var mathmlBuilder2 = (group, options) => {
   var isAllString = true;
   for (var i = 0; i < expression.length; i++) {
     var node = expression[i];
-    if (node instanceof mathMLTree.SpaceNode) ;
+    if (node instanceof mathMLTree.SpaceNode)
+      ;
     else if (node instanceof mathMLTree.MathNode) {
       switch (node.type) {
         case "mi":
@@ -30435,10 +30047,9 @@ var optionsWithFont = (group, options) => {
     return options.withTextFontFamily(textFontFamilies[font]);
   } else if (textFontWeights[font]) {
     return options.withTextFontWeight(textFontWeights[font]);
-  } else if (font === "\\emph") {
-    return options.fontShape === "textit" ? options.withTextFontShape("textup") : options.withTextFontShape("textit");
+  } else {
+    return options.withTextFontShape(textFontShapes[font]);
   }
-  return options.withTextFontShape(textFontShapes[font]);
 };
 defineFunction({
   type: "text",
@@ -30454,8 +30065,7 @@ defineFunction({
     "\\textmd",
     // Font Shapes
     "\\textit",
-    "\\textup",
-    "\\emph"
+    "\\textup"
   ],
   props: {
     numArgs: 1,
@@ -33194,7 +32804,7 @@ var katex = {
   /**
    * Current KaTeX version
    */
-  version: "0.16.11",
+  version: "0.16.10",
   /**
    * Renders the given LaTeX into an HTML+MathML combination, and adds
    * it as a child to the specified DOM node.
@@ -39523,9 +39133,18 @@ const TableToolbar = defineComponent(
         editor.value.range.anchor.element = editor.value.range.focus.element;
         editor.value.range.anchor.offset = editor.value.range.focus.offset;
       }
-      const row = getMatchElementByRange(editor.value, dataRangeCaches.value, { parsedom: "tr" });
-      if (row) {
+      const cell = getMatchElementByRange(editor.value, dataRangeCaches.value, { parsedom: "td" });
+      if (cell) {
+        const { rowspan } = getCellSpanNumber(cell);
+        let row = cell.parent;
         const tbody = row.parent;
+        if (type == "down") {
+          let i = 1;
+          while (i < rowspan) {
+            row = editor.value.getNextElement(row);
+            i++;
+          }
+        }
         const { columnNumber } = getTableSize(tbody.children);
         const children = [];
         for (let i = 0; i < columnNumber; i++) {
@@ -44618,7 +44237,7 @@ const Editify = withInstall(editify);
 const install = (app) => {
   app.component(Editify.name, Editify);
 };
-const version = "0.2.26";
+const version = "0.2.28";
 console.log(`%c vue-editify %c v${version} `, "padding: 2px 1px; border-radius: 3px 0 0 3px; color: #fff; background: #606060; font-weight: bold;", "padding: 2px 1px; border-radius: 0 3px 3px 0; color: #fff; background: #42c02e; font-weight: bold;");
 export {
   AlexElement,