@gmb/bitmark-parser-generator 5.31.1 → 5.33.0

package/dist/index.cjs

@@ -514,6 +514,8 @@ var BitType = {
   pageSectionFolder: "page-section-folder",
   pageShopInShop: "page-shop-in-shop",
   pageSpecial: "page-special",
+  pageEnd: "page-end",
+  pageStart: "page-start",
   pageSubpage: "page-subpage",
   pageSubscribe: "page-subscribe",
   parameters: "parameters",
@@ -3200,11 +3202,16 @@ var CARDSETS = {
                 exportJsonKey: { "@bit": { heading: { forKeys: "$" } } }
               },
               {
+                // Axis-side `[@isCaseSensitive]` is a cascade SOURCE
+                // only: it must fire (so value-side cells inherit via
+                // `$ancestor`) but emit nothing itself — emission is
+                // owned by the value-side's cell-nested rule
+                // (`cells[$s].isCaseSensitive`, PLAN-122). The earlier
+                // flat `$ancestor` rule here double-emitted at bit
+                // scope and broke the `optimize(fullize(x)) ==
+                // optimize(x)` law on match-matrix.
                 key: ConfigKey.property_isCaseSensitive,
-                exportJsonKey: [
-                  { "@absent": { isCaseSensitive: "$ancestor" } },
-                  { isCaseSensitive: "$" }
-                ],
+                exportJsonKey: {},
                 description: "Property to indicate if the match is case sensitive.",
                 format: TagFormat.boolean
               }
@@ -5084,18 +5091,16 @@ var GROUPS = {
             description: "Item, lead, page number, margin number, instruction and hint tags"
           },
           {
-            // PLAN-072 + ALIGN-EXAMPLE-CASCADE §3.2: cascade-fired
-            // `@example` from the bit header marks EVERY choice with
-            // `isExample: true` (matches BPG output), but only the
-            // FIRST correct choice gets `example: true` (BPG
-            // `fillBooleanExample(..., firstCorrectOnly=true)`).
-            //
-            // Two `@absent` rules, picked first-match-wins:
-            //   1. Verbose form gated on `@parent.isCorrect=true` with
-            //      `maxEmits:1` — fires once for the first correct.
-            //   2. Plain `@absent` — fires on every remaining entry
-            //      (subsequent corrects and all incorrects), emitting
-            //      `isExample` only.
+            // PLAN-072 + ALIGN-EXAMPLE-CASCADE §3.2, corrected by
+            // bpg 5.31 probing: cascade-fired `@example` decorates only
+            // the FIRST correct choice (`example: true` via the
+            // `@parent.isCorrect`-gated `@absent` rule, `maxEmits:1` —
+            // BPG `fillBooleanExample(..., firstCorrectOnly=true)`).
+            // There is deliberately NO plain `@absent` rule: an ancestor
+            // bare example must leave the remaining choices untouched
+            // (a plain `@absent` decoration broke the
+            // `optimize(fullize(x)) == optimize(x)` law — the
+            // synthesized `isExample` keys survived re-optimization).
             // The `serialize_cards` cascade-counter scope holds the cap
             // across the whole cardset.
             // @card scope-shift writes choice-container isExample (e.g.
@@ -5123,13 +5128,6 @@ var GROUPS = {
                   "@card": { isExample: true }
                 }
               },
-              {
-                "@absent": {
-                  isExample: true,
-                  "@bit": { isExample: true },
-                  "@card": { isExample: true }
-                }
-              },
               {
                 isExample: true,
                 example: "$",
@@ -5171,11 +5169,13 @@ var GROUPS = {
             description: "Item, lead, page number, margin number, instruction and hint tags"
           },
           {
-            // PLAN-072 + ALIGN-EXAMPLE-CASCADE §3.2: cascade-fired
-            // `@example` on a `-` (incorrect choice) emits
-            // `isExample: true` only — no `example` (BPG fixtures show
-            // `isExample` on every choice, but `example` only on the
-            // first correct via firstCorrectOnly cascade).
+            // PLAN-072 + ALIGN-EXAMPLE-CASCADE §3.2, corrected by
+            // bpg 5.31 probing: an ancestor bare `@example` leaves
+            // incorrect choices UNTOUCHED — no cascade decoration at
+            // all (no `@absent` rule; a plain `@absent → isExample`
+            // decoration broke the `optimize(fullize(x)) ==
+            // optimize(x)` law). Only an explicit `[@example]` on the
+            // choice itself emits.
             // @card scope-shift writes choice-container isExample.
             key: ConfigKey.property_example,
             jsonKey: "example",
@@ -5188,13 +5188,6 @@ var GROUPS = {
                   "@card": { isExample: true }
                 }
               },
-              {
-                "@absent": {
-                  isExample: true,
-                  "@bit": { isExample: true },
-                  "@card": { isExample: true }
-                }
-              },
               {
                 isExample: true,
                 example: "$",
@@ -5202,7 +5195,7 @@ var GROUPS = {
                 "@card": { isExample: true }
               }
             ],
-            description: "An example for the true/false statement/question (incorrect entry \u2014 isExample only on cascade)",
+            description: "An example for the true/false statement/question (incorrect entry \u2014 no cascade decoration: an ancestor bare example leaves incorrect choices untouched, bpg 5.31)",
             format: TagFormat.boolean,
             nullable: true
           }
@@ -7261,7 +7254,9 @@ var BITS = {
         description: "Common tags for quiz bits"
       },
       {
-        exportJsonKey: { title: "$" },
+        maxCount: 2,
+        jsonKey: "title|multi(count=2, key=subtitle)",
+        exportJsonKey: [{ "@level=1": { title: "$" } }, { "@level=2": { subtitle: "$" } }],
         key: ConfigKey.tag_title,
         description: "The title of the flashcard quiz"
       },
@@ -7366,7 +7361,9 @@ var BITS = {
     description: "Article bit, used for articles / paragraphs",
     tags: [
       {
-        exportJsonKey: { title: "$" },
+        maxCount: 2,
+        jsonKey: "title|multi(count=2, key=subtitle)",
+        exportJsonKey: [{ "@level=1": { title: "$" } }, { "@level=2": { subtitle: "$" } }],
         key: ConfigKey.tag_title,
         description: "The title of the article"
       }
@@ -9332,7 +9329,9 @@ var BITS = {
     description: "Example bit, used to provide examples in articles or books",
     tags: [
       {
-        exportJsonKey: { title: "$" },
+        maxCount: 2,
+        jsonKey: "title|multi(count=2, key=subtitle)",
+        exportJsonKey: [{ "@level=1": { title: "$" } }, { "@level=2": { subtitle: "$" } }],
         key: ConfigKey.tag_title,
         description: "The title of the example"
       },
@@ -11933,7 +11932,9 @@ var BITS = {
     description: "Page bit, used to create pages in articles or books",
     tags: [
       {
-        exportJsonKey: { title: "$" },
+        maxCount: 2,
+        jsonKey: "title|multi(count=2, key=subtitle)",
+        exportJsonKey: [{ "@level=1": { title: "$" } }, { "@level=2": { subtitle: "$" } }],
         key: ConfigKey.tag_title,
         description: "Title of the page, used to display the page title"
       },
@@ -12033,6 +12034,16 @@ var BITS = {
     baseBitType: BitType.pageSubpage,
     description: "Page special bit, used to create special pages in articles or books"
   },
+  [BitType.pageEnd]: {
+    since: "5.33.0",
+    baseBitType: BitType.article,
+    description: "Page end bit, used to mark the end of a page section in articles or books"
+  },
+  [BitType.pageStart]: {
+    since: "5.33.0",
+    baseBitType: BitType.article,
+    description: "Page start bit, used to mark the start of a page section in articles or books"
+  },
   [BitType.pagePerson]: {
     since: "1.5.16",
     baseBitType: BitType._standard,
@@ -12391,7 +12402,9 @@ var BITS = {
     description: "Review note bit, used to create review notes in articles or books",
     tags: [
       {
-        exportJsonKey: { title: "$" },
+        maxCount: 2,
+        jsonKey: "title|multi(count=2, key=subtitle)",
+        exportJsonKey: [{ "@level=1": { title: "$" } }, { "@level=2": { subtitle: "$" } }],
         key: ConfigKey.tag_title,
         description: "Title of the review note, used to display the note title"
       },
@@ -13977,7 +13990,7 @@ var instance2 = new Config();
 // src/generated/package_info.ts
 var PACKAGE_INFO = {
   "name": "@gmb/bitmark-parser-generator",
-  "version": "5.31.1",
+  "version": "5.33.0",
   "author": "Get More Brain Ltd",
   "license": "ISC",
   "description": "A bitmark parser and generator using Peggy.js"
@@ -14252,6 +14265,7 @@ var TextMarkType = {
   del: "del",
   underline: "underline",
   doubleUnderline: "doubleUnderline",
+  smallcaps: "smallcaps",
   circle: "circle",
   languageEmRed: "languageEmRed",
   languageEmOrange: "languageEmOrange",
@@ -14283,7 +14297,10 @@ var TextMarkType = {
   code: "code",
   timer: "timer",
   duration: "duration",
+  // legacy: no longer produced by the parser (>= 8.41.1), accepted as generator input
   color: "color",
+  // legacy: no longer produced by the parser (>= 8.41.1, now textStyle), accepted as generator input
+  textStyle: "textStyle",
   colorPicker: "colorPicker",
   comment: "comment"
 };
@@ -15868,6 +15885,7 @@ var INLINE_MARK_TYPES = [
   TextMarkType.del,
   TextMarkType.underline,
   TextMarkType.doubleUnderline,
+  TextMarkType.smallcaps,
   TextMarkType.circle,
   TextMarkType.languageEmRed,
   TextMarkType.languageEmOrange,
@@ -15898,11 +15916,24 @@ var INLINE_MARK_TYPES = [
   TextMarkType.var,
   TextMarkType.code,
   TextMarkType.timer,
-  TextMarkType.duration,
   TextMarkType.color,
+  // legacy input, written as color: (same as textStyle)
+  TextMarkType.textStyle,
   TextMarkType.colorPicker,
   TextMarkType.comment
 ];
+var HIGHLIGHT_COLORS = [
+  "orange",
+  "yellow",
+  "green",
+  "blue",
+  "purple",
+  "pink",
+  "brown",
+  "white",
+  "black",
+  "gray"
+];
 var INDENTATION_REGEX = new RegExp(/(\n|\r\n)/, "g");
 var LINK_REGEX = new RegExp(/https?:\/\/|mailto:(.*)/, "g");
 var LINK_BREAKSCAPE_REGEX = new RegExp(/\]/, "g");
@@ -16466,14 +16497,16 @@ var TextGenerator = class _TextGenerator extends AstWalkerGenerator {
         this.writeMarkTextWrapper(INLINE_MARK);
         return;
       }
-      const singleMark = node.marks.length === 1 && forceSingleMark;
-      const markStartEnd = node.marks.reduce(
+      const marks = this.getWritableMarks(node.marks);
+      if (marks.length === 0) return;
+      const singleMark = marks.length === 1 && forceSingleMark;
+      const markStartEnd = marks.reduce(
         (acc, mark) => {
           if (acc) return acc;
-          if (STANDARD_MARK_TYPES.indexOf(mark.type) !== -1) {
+          if (this.isStandardMark(mark)) {
             if (singleMark) return STANDARD_MARKS[mark.type];
             return INLINE_MARK;
-          } else if (INLINE_MARK_TYPES.indexOf(mark.type) !== -1) {
+          } else if (this.isInlineMark(mark)) {
             return INLINE_MARK;
           } else {
           }
@@ -16488,8 +16521,8 @@ var TextGenerator = class _TextGenerator extends AstWalkerGenerator {
           this.writeMarkTextWrapper(markStartEnd);
         }
         if (stage == Stage.between) {
-          for (const mark of node.marks) {
-            if (STANDARD_MARK_TYPES.indexOf(mark.type) !== -1) {
+          for (const mark of marks) {
+            if (this.isStandardMark(mark)) {
               if (!singleMark) {
                 this.writeInlineMarkStartEnd();
                 this.writeInlineMark(mark);
@@ -16518,7 +16551,7 @@ var TextGenerator = class _TextGenerator extends AstWalkerGenerator {
             } else if (TextMarkType.symbol === mark.type) {
               this.writeInlineMarkStartEnd();
               this.writeSymbolMark(mark);
-            } else if (INLINE_MARK_TYPES.indexOf(mark.type) !== -1) {
+            } else if (this.isInlineMark(mark)) {
               this.writeInlineMarkStartEnd();
               this.writeInlineMark(mark);
             } else {
@@ -16527,12 +16560,12 @@ var TextGenerator = class _TextGenerator extends AstWalkerGenerator {
         }
         if (stage == Stage.exit) {
           let inlineMarkWritten = false;
-          for (const mark of node.marks) {
-            if (STANDARD_MARK_TYPES.indexOf(mark.type) !== -1) {
+          for (const mark of marks) {
+            if (this.isStandardMark(mark)) {
               if (!singleMark) {
                 inlineMarkWritten = true;
               }
-            } else if (TextMarkType.comment === mark.type || TextMarkType.link === mark.type || TextMarkType.ref === mark.type || TextMarkType.xref === mark.type || TextMarkType.footnote === mark.type || TextMarkType.footnoteStar === mark.type || INLINE_MARK_TYPES.indexOf(mark.type) !== -1) {
+            } else if (TextMarkType.comment === mark.type || TextMarkType.link === mark.type || TextMarkType.ref === mark.type || TextMarkType.xref === mark.type || TextMarkType.footnote === mark.type || TextMarkType.footnoteStar === mark.type || this.isInlineMark(mark)) {
               inlineMarkWritten = true;
             } else {
             }
@@ -16613,8 +16646,15 @@ var TextGenerator = class _TextGenerator extends AstWalkerGenerator {
     if (node.attrs == null || !node.attrs.src) return;
     const attrs = node.attrs;
     const inlineImage = node.type === TextNodeType.imageInline;
+    let ignoreAttributes;
+    if (inlineImage) {
+      ignoreAttributes = /* @__PURE__ */ new Set(["alt", "zoomDisabled", "title"]);
+      const a = attrs;
+      if (a.alignmentVertical === "top") ignoreAttributes.add("alignmentVertical");
+      if (a.size === "line-height") ignoreAttributes.add("size");
+    }
     const mediaAttrs = this.getMediaAttrs(inlineImage ? "imageInline" : "image", attrs, {
-      ignoreAttributes: inlineImage ? /* @__PURE__ */ new Set(["alt", "zoomDisabled", "title"]) : void 0
+      ignoreAttributes
     });
     let s = "";
     if (inlineImage) {
@@ -16644,16 +16684,87 @@ var TextGenerator = class _TextGenerator extends AstWalkerGenerator {
     if (s) this.write(s);
   }
   writeInlineMark(mark) {
-    let s = `${mark.type}`;
-    if (mark.attrs) {
-      for (const [k, v] of Object.entries(mark.attrs)) {
-        if (k === "language" && v !== "plain text" || k === "color" || k === "propertyRef" || k === "name" || k === "duration") {
-          s = `${s}:${v}`;
+    const attrs = mark.attrs ?? {};
+    let s;
+    switch (mark.type) {
+      case TextMarkType.textStyle:
+      case TextMarkType.color:
+        s = `color:${attrs.color ?? ""}`;
+        break;
+      case TextMarkType.timer:
+        s = attrs.name ? `timer:${attrs.name}` : "timer";
+        s += `|duration:${attrs.duration ?? ""}`;
+        break;
+      case TextMarkType.highlight:
+      case TextMarkType.userHighlight:
+        s = attrs.color ? `${mark.type}|color:${attrs.color}` : `${mark.type}`;
+        break;
+      default: {
+        s = `${mark.type}`;
+        for (const [k, v] of Object.entries(attrs)) {
+          if (k === "language" && v !== "plain text" || k === "propertyRef" || k === "name") {
+            s = `${s}:${v}`;
+          }
         }
       }
     }
     this.write(s);
   }
+  /**
+   * Resolve the marks of a text node into the marks that will actually be written.
+   *
+   * - Merges a legacy standalone 'duration' mark into its sibling 'timer' mark.
+   * - Drops marks the current grammar cannot express (standalone 'duration', 'timer'
+   *   without a duration).
+   * - Moves a 'textStyle'/'color' mark before a preceding bare 'highlight'/'userHighlight'
+   *   mark when its color is a valid highlight color; written in the original order the
+   *   output would re-parse as a highlight-with-color compound mark and change meaning.
+   */
+  getWritableMarks(nodeMarks) {
+    const attrsOf = (m) => m.attrs ?? {};
+    let marks = [...nodeMarks];
+    const timer = marks.find((m) => m.type === TextMarkType.timer);
+    const duration = marks.find((m) => m.type === TextMarkType.duration);
+    if (timer && duration && !attrsOf(timer).duration) {
+      marks = marks.map(
+        (m) => m === timer ? {
+          ...timer,
+          attrs: { ...attrsOf(timer), duration: attrsOf(duration).duration }
+        } : m
+      );
+    }
+    marks = marks.filter((m) => {
+      if (m.type === TextMarkType.duration) return false;
+      if (m.type === TextMarkType.timer) return !!attrsOf(m).duration;
+      return true;
+    });
+    const isBareHighlight = (m) => (m.type === TextMarkType.highlight || m.type === TextMarkType.userHighlight) && !attrsOf(m).color;
+    const isHighlightColorStyle = (m) => (m.type === TextMarkType.textStyle || m.type === TextMarkType.color) && HIGHLIGHT_COLORS.indexOf(attrsOf(m).color) !== -1;
+    for (let i = 0; i < marks.length - 1; i++) {
+      if (isBareHighlight(marks[i]) && isHighlightColorStyle(marks[i + 1])) {
+        const tmp = marks[i];
+        marks[i] = marks[i + 1];
+        marks[i + 1] = tmp;
+      }
+    }
+    return marks;
+  }
+  /**
+   * True if the mark is written using its standard form (e.g. **bold**, !!highlight!!)
+   * when it is the only mark. A highlight mark with a color attribute is excluded - it
+   * can only be expressed using the inline chain form (==text==|highlight|color:x|).
+   */
+  isStandardMark(mark) {
+    if (STANDARD_MARK_TYPES.indexOf(mark.type) === -1) return false;
+    return !(mark.attrs && mark.attrs.color);
+  }
+  /**
+   * True if the mark is written using the inline chain form (==text==|mark|).
+   */
+  isInlineMark(mark) {
+    if (INLINE_MARK_TYPES.indexOf(mark.type) !== -1) return true;
+    return mark.type === TextMarkType.highlight && !!(mark.attrs && mark.attrs.color);
+  }
   writeCommentMark(mark) {
     const comment = mark.comment || "";
     const s = `#${comment}`;
@@ -16858,7 +16969,7 @@ var TextGenerator = class _TextGenerator extends AstWalkerGenerator {
 };
 
 // src/generated/parser/text/text-peggy-parser.js
-var VERSION = "8.37.3";
+var VERSION = "8.41.1";
 function unbreakscape(str) {
   if (typeof str !== "string") return null;
   return instance3.unbreakscape(str);
@@ -17073,87 +17184,88 @@ function peg$parse(input, options) {
   const peg$c60 = "var:";
   const peg$c61 = "code:";
   const peg$c62 = "timer";
-  const peg$c63 = "timer:";
-  const peg$c64 = "duration:";
-  const peg$c65 = "P";
-  const peg$c66 = "color:";
-  const peg$c67 = "colorPicker:";
-  const peg$c68 = "|\u25BA";
-  const peg$c69 = "bold";
-  const peg$c70 = "italic";
-  const peg$c71 = "light";
-  const peg$c72 = "highlightOrange";
-  const peg$c73 = "highlightYellow";
-  const peg$c74 = "highlightGreen";
-  const peg$c75 = "highlightBlue";
-  const peg$c76 = "highlightPurple";
-  const peg$c77 = "highlightPink";
-  const peg$c78 = "highlightBrown";
-  const peg$c79 = "highlightBlack";
-  const peg$c80 = "highlightWhite";
-  const peg$c81 = "highlightGray";
-  const peg$c82 = "highlight";
-  const peg$c83 = "strike";
-  const peg$c84 = "subscript";
-  const peg$c85 = "superscript";
-  const peg$c86 = "ins";
-  const peg$c87 = "del";
-  const peg$c88 = "underline";
-  const peg$c89 = "doubleUnderline";
-  const peg$c90 = "circle";
-  const peg$c91 = "languageEmRed";
-  const peg$c92 = "languageEmOrange";
-  const peg$c93 = "languageEmYellow";
-  const peg$c94 = "languageEmGreen";
-  const peg$c95 = "languageEmBlue";
-  const peg$c96 = "languageEmPurple";
-  const peg$c97 = "languageEmPink";
-  const peg$c98 = "languageEmBrown";
-  const peg$c99 = "languageEmBlack";
-  const peg$c100 = "languageEmWhite";
-  const peg$c101 = "languageEmGray";
-  const peg$c102 = "languageEm";
-  const peg$c103 = "userUnderline";
-  const peg$c104 = "userDoubleUnderline";
-  const peg$c105 = "userStrike";
-  const peg$c106 = "userCircle";
-  const peg$c107 = "userHighlight";
-  const peg$c108 = "notranslate";
-  const peg$c109 = "aqua";
-  const peg$c110 = "black";
-  const peg$c111 = "blue";
-  const peg$c112 = "brown";
-  const peg$c113 = "fuchsia";
-  const peg$c114 = "lightgrey";
-  const peg$c115 = "gray";
-  const peg$c116 = "darkgray";
-  const peg$c117 = "green";
-  const peg$c118 = "lime";
-  const peg$c119 = "magenta";
-  const peg$c120 = "maroon";
-  const peg$c121 = "navy";
-  const peg$c122 = "olive";
-  const peg$c123 = "orange";
-  const peg$c124 = "pink";
-  const peg$c125 = "purple";
-  const peg$c126 = "red";
-  const peg$c127 = "silver";
-  const peg$c128 = "teal";
-  const peg$c129 = "violet";
-  const peg$c130 = "white";
-  const peg$c131 = "yellow";
-  const peg$c132 = "*";
-  const peg$c133 = "_";
-  const peg$c134 = "`";
-  const peg$c135 = "!";
-  const peg$c136 = "[!";
-  const peg$c137 = "]";
-  const peg$c138 = "\n";
-  const peg$c139 = "\r\n";
-  const peg$c140 = "http";
-  const peg$c141 = "s";
-  const peg$c142 = "://";
-  const peg$c143 = "mailto:";
+  const peg$c63 = "duration:";
+  const peg$c64 = "P";
+  const peg$c65 = "timer:";
+  const peg$c66 = "highlight";
+  const peg$c67 = "color:";
+  const peg$c68 = "userHighlight";
+  const peg$c69 = "colorPicker:";
+  const peg$c70 = "|\u25BA";
+  const peg$c71 = "bold";
+  const peg$c72 = "italic";
+  const peg$c73 = "light";
+  const peg$c74 = "highlightOrange";
+  const peg$c75 = "highlightYellow";
+  const peg$c76 = "highlightGreen";
+  const peg$c77 = "highlightBlue";
+  const peg$c78 = "highlightPurple";
+  const peg$c79 = "highlightPink";
+  const peg$c80 = "highlightBrown";
+  const peg$c81 = "highlightBlack";
+  const peg$c82 = "highlightWhite";
+  const peg$c83 = "highlightGray";
+  const peg$c84 = "strike";
+  const peg$c85 = "subscript";
+  const peg$c86 = "superscript";
+  const peg$c87 = "ins";
+  const peg$c88 = "del";
+  const peg$c89 = "underline";
+  const peg$c90 = "doubleUnderline";
+  const peg$c91 = "smallcaps";
+  const peg$c92 = "circle";
+  const peg$c93 = "languageEmRed";
+  const peg$c94 = "languageEmOrange";
+  const peg$c95 = "languageEmYellow";
+  const peg$c96 = "languageEmGreen";
+  const peg$c97 = "languageEmBlue";
+  const peg$c98 = "languageEmPurple";
+  const peg$c99 = "languageEmPink";
+  const peg$c100 = "languageEmBrown";
+  const peg$c101 = "languageEmBlack";
+  const peg$c102 = "languageEmWhite";
+  const peg$c103 = "languageEmGray";
+  const peg$c104 = "languageEm";
+  const peg$c105 = "userUnderline";
+  const peg$c106 = "userDoubleUnderline";
+  const peg$c107 = "userStrike";
+  const peg$c108 = "userCircle";
+  const peg$c109 = "notranslate";
+  const peg$c110 = "aqua";
+  const peg$c111 = "black";
+  const peg$c112 = "blue";
+  const peg$c113 = "brown";
+  const peg$c114 = "fuchsia";
+  const peg$c115 = "lightgrey";
+  const peg$c116 = "gray";
+  const peg$c117 = "darkgray";
+  const peg$c118 = "green";
+  const peg$c119 = "lime";
+  const peg$c120 = "magenta";
+  const peg$c121 = "maroon";
+  const peg$c122 = "navy";
+  const peg$c123 = "olive";
+  const peg$c124 = "orange";
+  const peg$c125 = "pink";
+  const peg$c126 = "purple";
+  const peg$c127 = "red";
+  const peg$c128 = "silver";
+  const peg$c129 = "teal";
+  const peg$c130 = "violet";
+  const peg$c131 = "white";
+  const peg$c132 = "yellow";
+  const peg$c133 = "*";
+  const peg$c134 = "_";
+  const peg$c135 = "`";
+  const peg$c136 = "!";
+  const peg$c137 = "[!";
+  const peg$c138 = "]";
+  const peg$c139 = "\n";
+  const peg$c140 = "\r\n";
+  const peg$c141 = "http";
+  const peg$c142 = "s";
+  const peg$c143 = "://";
+  const peg$c144 = "mailto:";
   const peg$r0 = /^[ \t]/;
   const peg$r1 = /^[0-9]/;
   const peg$r2 = /^[\r\u2028-\u2029]/;
@@ -17226,91 +17338,92 @@ function peg$parse(input, options) {
   const peg$e64 = peg$literalExpectation("var:", false);
   const peg$e65 = peg$literalExpectation("code:", false);
   const peg$e66 = peg$literalExpectation("timer", false);
-  const peg$e67 = peg$literalExpectation("timer:", false);
-  const peg$e68 = peg$literalExpectation("duration:", false);
-  const peg$e69 = peg$literalExpectation("P", false);
-  const peg$e70 = peg$literalExpectation("color:", false);
-  const peg$e71 = peg$literalExpectation("colorPicker:", false);
-  const peg$e72 = peg$literalExpectation("|\u25BA", false);
-  const peg$e73 = peg$literalExpectation("bold", false);
-  const peg$e74 = peg$literalExpectation("italic", false);
-  const peg$e75 = peg$literalExpectation("light", false);
-  const peg$e76 = peg$literalExpectation("highlightOrange", false);
-  const peg$e77 = peg$literalExpectation("highlightYellow", false);
-  const peg$e78 = peg$literalExpectation("highlightGreen", false);
-  const peg$e79 = peg$literalExpectation("highlightBlue", false);
-  const peg$e80 = peg$literalExpectation("highlightPurple", false);
-  const peg$e81 = peg$literalExpectation("highlightPink", false);
-  const peg$e82 = peg$literalExpectation("highlightBrown", false);
-  const peg$e83 = peg$literalExpectation("highlightBlack", false);
-  const peg$e84 = peg$literalExpectation("highlightWhite", false);
-  const peg$e85 = peg$literalExpectation("highlightGray", false);
-  const peg$e86 = peg$literalExpectation("highlight", false);
-  const peg$e87 = peg$literalExpectation("strike", false);
-  const peg$e88 = peg$literalExpectation("subscript", false);
-  const peg$e89 = peg$literalExpectation("superscript", false);
-  const peg$e90 = peg$literalExpectation("ins", false);
-  const peg$e91 = peg$literalExpectation("del", false);
-  const peg$e92 = peg$literalExpectation("underline", false);
-  const peg$e93 = peg$literalExpectation("doubleUnderline", false);
-  const peg$e94 = peg$literalExpectation("circle", false);
-  const peg$e95 = peg$literalExpectation("languageEmRed", false);
-  const peg$e96 = peg$literalExpectation("languageEmOrange", false);
-  const peg$e97 = peg$literalExpectation("languageEmYellow", false);
-  const peg$e98 = peg$literalExpectation("languageEmGreen", false);
-  const peg$e99 = peg$literalExpectation("languageEmBlue", false);
-  const peg$e100 = peg$literalExpectation("languageEmPurple", false);
-  const peg$e101 = peg$literalExpectation("languageEmPink", false);
-  const peg$e102 = peg$literalExpectation("languageEmBrown", false);
-  const peg$e103 = peg$literalExpectation("languageEmBlack", false);
-  const peg$e104 = peg$literalExpectation("languageEmWhite", false);
-  const peg$e105 = peg$literalExpectation("languageEmGray", false);
-  const peg$e106 = peg$literalExpectation("languageEm", false);
-  const peg$e107 = peg$literalExpectation("userUnderline", false);
-  const peg$e108 = peg$literalExpectation("userDoubleUnderline", false);
-  const peg$e109 = peg$literalExpectation("userStrike", false);
-  const peg$e110 = peg$literalExpectation("userCircle", false);
-  const peg$e111 = peg$literalExpectation("userHighlight", false);
-  const peg$e112 = peg$literalExpectation("notranslate", false);
-  const peg$e113 = peg$literalExpectation("aqua", false);
-  const peg$e114 = peg$literalExpectation("black", false);
-  const peg$e115 = peg$literalExpectation("blue", false);
-  const peg$e116 = peg$literalExpectation("brown", false);
-  const peg$e117 = peg$literalExpectation("fuchsia", false);
-  const peg$e118 = peg$literalExpectation("lightgrey", false);
-  const peg$e119 = peg$literalExpectation("gray", false);
-  const peg$e120 = peg$literalExpectation("darkgray", false);
-  const peg$e121 = peg$literalExpectation("green", false);
-  const peg$e122 = peg$literalExpectation("lime", false);
-  const peg$e123 = peg$literalExpectation("magenta", false);
-  const peg$e124 = peg$literalExpectation("maroon", false);
-  const peg$e125 = peg$literalExpectation("navy", false);
-  const peg$e126 = peg$literalExpectation("olive", false);
-  const peg$e127 = peg$literalExpectation("orange", false);
-  const peg$e128 = peg$literalExpectation("pink", false);
-  const peg$e129 = peg$literalExpectation("purple", false);
-  const peg$e130 = peg$literalExpectation("red", false);
-  const peg$e131 = peg$literalExpectation("silver", false);
-  const peg$e132 = peg$literalExpectation("teal", false);
-  const peg$e133 = peg$literalExpectation("violet", false);
-  const peg$e134 = peg$literalExpectation("white", false);
-  const peg$e135 = peg$literalExpectation("yellow", false);
-  const peg$e136 = peg$literalExpectation("*", false);
-  const peg$e137 = peg$literalExpectation("_", false);
-  const peg$e138 = peg$literalExpectation("`", false);
-  const peg$e139 = peg$literalExpectation("!", false);
-  const peg$e140 = peg$literalExpectation("[!", false);
-  const peg$e141 = peg$literalExpectation("]", false);
-  const peg$e142 = peg$otherExpectation("Line Terminator");
-  const peg$e143 = peg$literalExpectation("\n", false);
-  const peg$e144 = peg$literalExpectation("\r\n", false);
-  const peg$e145 = peg$classExpectation(["\r", ["\u2028", "\u2029"]], false, false, false);
-  const peg$e146 = peg$classExpectation(["\n", "\r", "\u2028", "\u2029"], true, false, false);
-  const peg$e147 = peg$literalExpectation("http", false);
-  const peg$e148 = peg$literalExpectation("s", false);
-  const peg$e149 = peg$literalExpectation("://", false);
-  const peg$e150 = peg$literalExpectation("mailto:", false);
-  const peg$e151 = peg$classExpectation(["!", ["#", ";"], "=", ["?", "["], ["]", "_"], ["a", "{"], ["}", "~"]], false, false, false);
+  const peg$e67 = peg$literalExpectation("duration:", false);
+  const peg$e68 = peg$literalExpectation("P", false);
+  const peg$e69 = peg$literalExpectation("timer:", false);
+  const peg$e70 = peg$literalExpectation("highlight", false);
+  const peg$e71 = peg$literalExpectation("color:", false);
+  const peg$e72 = peg$literalExpectation("userHighlight", false);
+  const peg$e73 = peg$literalExpectation("colorPicker:", false);
+  const peg$e74 = peg$literalExpectation("|\u25BA", false);
+  const peg$e75 = peg$literalExpectation("bold", false);
+  const peg$e76 = peg$literalExpectation("italic", false);
+  const peg$e77 = peg$literalExpectation("light", false);
+  const peg$e78 = peg$literalExpectation("highlightOrange", false);
+  const peg$e79 = peg$literalExpectation("highlightYellow", false);
+  const peg$e80 = peg$literalExpectation("highlightGreen", false);
+  const peg$e81 = peg$literalExpectation("highlightBlue", false);
+  const peg$e82 = peg$literalExpectation("highlightPurple", false);
+  const peg$e83 = peg$literalExpectation("highlightPink", false);
+  const peg$e84 = peg$literalExpectation("highlightBrown", false);
+  const peg$e85 = peg$literalExpectation("highlightBlack", false);
+  const peg$e86 = peg$literalExpectation("highlightWhite", false);
+  const peg$e87 = peg$literalExpectation("highlightGray", false);
+  const peg$e88 = peg$literalExpectation("strike", false);
+  const peg$e89 = peg$literalExpectation("subscript", false);
+  const peg$e90 = peg$literalExpectation("superscript", false);
+  const peg$e91 = peg$literalExpectation("ins", false);
+  const peg$e92 = peg$literalExpectation("del", false);
+  const peg$e93 = peg$literalExpectation("underline", false);
+  const peg$e94 = peg$literalExpectation("doubleUnderline", false);
+  const peg$e95 = peg$literalExpectation("smallcaps", false);
+  const peg$e96 = peg$literalExpectation("circle", false);
+  const peg$e97 = peg$literalExpectation("languageEmRed", false);
+  const peg$e98 = peg$literalExpectation("languageEmOrange", false);
+  const peg$e99 = peg$literalExpectation("languageEmYellow", false);
+  const peg$e100 = peg$literalExpectation("languageEmGreen", false);
+  const peg$e101 = peg$literalExpectation("languageEmBlue", false);
+  const peg$e102 = peg$literalExpectation("languageEmPurple", false);
+  const peg$e103 = peg$literalExpectation("languageEmPink", false);
+  const peg$e104 = peg$literalExpectation("languageEmBrown", false);
+  const peg$e105 = peg$literalExpectation("languageEmBlack", false);
+  const peg$e106 = peg$literalExpectation("languageEmWhite", false);
+  const peg$e107 = peg$literalExpectation("languageEmGray", false);
+  const peg$e108 = peg$literalExpectation("languageEm", false);
+  const peg$e109 = peg$literalExpectation("userUnderline", false);
+  const peg$e110 = peg$literalExpectation("userDoubleUnderline", false);
+  const peg$e111 = peg$literalExpectation("userStrike", false);
+  const peg$e112 = peg$literalExpectation("userCircle", false);
+  const peg$e113 = peg$literalExpectation("notranslate", false);
+  const peg$e114 = peg$literalExpectation("aqua", false);
+  const peg$e115 = peg$literalExpectation("black", false);
+  const peg$e116 = peg$literalExpectation("blue", false);
+  const peg$e117 = peg$literalExpectation("brown", false);
+  const peg$e118 = peg$literalExpectation("fuchsia", false);
+  const peg$e119 = peg$literalExpectation("lightgrey", false);
+  const peg$e120 = peg$literalExpectation("gray", false);
+  const peg$e121 = peg$literalExpectation("darkgray", false);
+  const peg$e122 = peg$literalExpectation("green", false);
+  const peg$e123 = peg$literalExpectation("lime", false);
+  const peg$e124 = peg$literalExpectation("magenta", false);
+  const peg$e125 = peg$literalExpectation("maroon", false);
+  const peg$e126 = peg$literalExpectation("navy", false);
+  const peg$e127 = peg$literalExpectation("olive", false);
+  const peg$e128 = peg$literalExpectation("orange", false);
+  const peg$e129 = peg$literalExpectation("pink", false);
+  const peg$e130 = peg$literalExpectation("purple", false);
+  const peg$e131 = peg$literalExpectation("red", false);
+  const peg$e132 = peg$literalExpectation("silver", false);
+  const peg$e133 = peg$literalExpectation("teal", false);
+  const peg$e134 = peg$literalExpectation("violet", false);
+  const peg$e135 = peg$literalExpectation("white", false);
+  const peg$e136 = peg$literalExpectation("yellow", false);
+  const peg$e137 = peg$literalExpectation("*", false);
+  const peg$e138 = peg$literalExpectation("_", false);
+  const peg$e139 = peg$literalExpectation("`", false);
+  const peg$e140 = peg$literalExpectation("!", false);
+  const peg$e141 = peg$literalExpectation("[!", false);
+  const peg$e142 = peg$literalExpectation("]", false);
+  const peg$e143 = peg$otherExpectation("Line Terminator");
+  const peg$e144 = peg$literalExpectation("\n", false);
+  const peg$e145 = peg$literalExpectation("\r\n", false);
+  const peg$e146 = peg$classExpectation(["\r", ["\u2028", "\u2029"]], false, false, false);
+  const peg$e147 = peg$classExpectation(["\n", "\r", "\u2028", "\u2029"], true, false, false);
+  const peg$e148 = peg$literalExpectation("http", false);
+  const peg$e149 = peg$literalExpectation("s", false);
+  const peg$e150 = peg$literalExpectation("://", false);
+  const peg$e151 = peg$literalExpectation("mailto:", false);
+  const peg$e152 = peg$classExpectation(["!", ["#", ";"], "=", ["?", "["], ["]", "_"], ["a", "{"], ["}", "~"]], false, false, false);
   function peg$f0() {
     return VERSION;
   }
@@ -17586,7 +17699,7 @@ function peg$parse(input, options) {
     return { attrs: { formula: unbreakscape(t) }, type: "latex" };
   }
   function peg$f57(alt, u, ch) {
-    return { attrs: { alt, src: (u.pr + u.t).trim(), ...Object.assign({}, ...ch), zoomDisabled: true }, type: "imageInline" };
+    return { attrs: { alt, src: (u.pr + u.t).trim(), "alignmentVertical": "top", size: "line-height", ...Object.assign({}, ...ch), zoomDisabled: true }, type: "imageInline" };
   }
   function peg$f58(t, marks) {
     if (!marks) marks = [];
@@ -17665,59 +17778,62 @@ function peg$parse(input, options) {
   function peg$f82(lang) {
     return { type: "code", attrs: { language: lang.trim().toLowerCase() } };
   }
-  function peg$f83() {
-    return { type: "timer", attrs: { name: "" } };
+  function peg$f83(d) {
+    return { type: "timer", attrs: { name: "", duration: d.trim() } };
   }
-  function peg$f84(str) {
-    return { type: "timer", attrs: { name: str.trim() } };
+  function peg$f84(str, d) {
+    return { type: "timer", attrs: { name: str.trim(), duration: d.trim() } };
   }
-  function peg$f85(str) {
-    return { type: "duration", attrs: { duration: str } };
+  function peg$f85(color) {
+    return { type: "highlight", attrs: { color } };
   }
   function peg$f86(color) {
-    return { type: "color", attrs: { color } };
+    return { type: "userHighlight", attrs: { color } };
   }
-  function peg$f87(str) {
+  function peg$f87(color) {
+    return { type: "textStyle", attrs: { color } };
+  }
+  function peg$f88(str) {
     return { type: "colorPicker", attrs: { propertyRef: str.trim() } };
   }
-  function peg$f88(style) {
+  function peg$f89(style) {
     return { type: style };
   }
-  function peg$f89(str) {
+  function peg$f90(str) {
     return { type: "comment", comment: str };
   }
-  function peg$f90(r) {
+  function peg$f91(r) {
     return r.trim();
   }
-  function peg$f91(bs) {
+  function peg$f92(bs) {
     return [{ type: "paragraph", content: bs, attrs: {} }];
   }
-  function peg$f92(first, more) {
+  function peg$f93(first, more) {
     const cleaned_ = cleanEmptyTextNodes(first ? [first, ...more.flat()] : more.flat());
     return cleaned_;
   }
-  function peg$f93() {
+  function peg$f94() {
     return { "type": "hardBreak" };
   }
-  function peg$f94(t) {
+  function peg$f95(t) {
     return { text: unbreakscape(t), type: "text" };
   }
-  function peg$f95(t) {
+  function peg$f96(t) {
     return { index: +t, type: "bit" };
   }
-  function peg$f96(t) {
+  function peg$f97(t) {
     return { marks: [{ type: "bold" }], text: unbreakscape(t), type: "text" };
   }
-  function peg$f97(t) {
+  function peg$f98(t) {
     return { marks: [{ type: "italic" }], text: unbreakscape(t), type: "text" };
   }
-  function peg$f98(t) {
+  function peg$f99(t) {
     return { marks: [{ type: "light" }], text: unbreakscape(t), type: "text" };
   }
-  function peg$f99(t) {
+  function peg$f100(t) {
     return { marks: [{ type: "highlight" }], text: unbreakscape(t), type: "text" };
   }
-  function peg$f100(pr, t) {
+  function peg$f101(pr, t) {
     return { pr, t };
   }
   let peg$currPos = options.peg$currPos | 0;
@@ -22587,7 +22703,7 @@ function peg$parse(input, options) {
     return s0;
   }
   function peg$parseAttrChainItem() {
-    let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10;
+    let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12;
     s0 = peg$currPos;
     if (input.substr(peg$currPos, 5) === peg$c52) {
       s1 = peg$c52;
@@ -23555,8 +23671,110 @@ function peg$parse(input, options) {
                           if (s1 !== peg$FAILED) {
                             s2 = peg$parseBlockTag();
                             if (s2 !== peg$FAILED) {
-                              peg$savedPos = s0;
-                              s0 = peg$f83();
+                              if (input.substr(peg$currPos, 9) === peg$c63) {
+                                s3 = peg$c63;
+                                peg$currPos += 9;
+                              } else {
+                                s3 = peg$FAILED;
+                                if (peg$silentFails === 0) {
+                                  peg$fail(peg$e67);
+                                }
+                              }
+                              if (s3 !== peg$FAILED) {
+                                s4 = peg$currPos;
+                                s5 = peg$currPos;
+                                if (input.charCodeAt(peg$currPos) === 80) {
+                                  s6 = peg$c64;
+                                  peg$currPos++;
+                                } else {
+                                  s6 = peg$FAILED;
+                                  if (peg$silentFails === 0) {
+                                    peg$fail(peg$e68);
+                                  }
+                                }
+                                if (s6 !== peg$FAILED) {
+                                  s7 = peg$currPos;
+                                  s8 = [];
+                                  s9 = peg$currPos;
+                                  s10 = peg$currPos;
+                                  peg$silentFails++;
+                                  s11 = peg$parseBlockTag();
+                                  peg$silentFails--;
+                                  if (s11 === peg$FAILED) {
+                                    s10 = void 0;
+                                  } else {
+                                    peg$currPos = s10;
+                                    s10 = peg$FAILED;
+                                  }
+                                  if (s10 !== peg$FAILED) {
+                                    s11 = peg$parsechar();
+                                    if (s11 !== peg$FAILED) {
+                                      s10 = [s10, s11];
+                                      s9 = s10;
+                                    } else {
+                                      peg$currPos = s9;
+                                      s9 = peg$FAILED;
+                                    }
+                                  } else {
+                                    peg$currPos = s9;
+                                    s9 = peg$FAILED;
+                                  }
+                                  while (s9 !== peg$FAILED) {
+                                    s8.push(s9);
+                                    s9 = peg$currPos;
+                                    s10 = peg$currPos;
+                                    peg$silentFails++;
+                                    s11 = peg$parseBlockTag();
+                                    peg$silentFails--;
+                                    if (s11 === peg$FAILED) {
+                                      s10 = void 0;
+                                    } else {
+                                      peg$currPos = s10;
+                                      s10 = peg$FAILED;
+                                    }
+                                    if (s10 !== peg$FAILED) {
+                                      s11 = peg$parsechar();
+                                      if (s11 !== peg$FAILED) {
+                                        s10 = [s10, s11];
+                                        s9 = s10;
+                                      } else {
+                                        peg$currPos = s9;
+                                        s9 = peg$FAILED;
+                                      }
+                                    } else {
+                                      peg$currPos = s9;
+                                      s9 = peg$FAILED;
+                                    }
+                                  }
+                                  s7 = input.substring(s7, peg$currPos);
+                                  s6 = [s6, s7];
+                                  s5 = s6;
+                                } else {
+                                  peg$currPos = s5;
+                                  s5 = peg$FAILED;
+                                }
+                                if (s5 !== peg$FAILED) {
+                                  s4 = input.substring(s4, peg$currPos);
+                                } else {
+                                  s4 = s5;
+                                }
+                                if (s4 !== peg$FAILED) {
+                                  s5 = peg$parseBlockTag();
+                                  if (s5 !== peg$FAILED) {
+                                    peg$savedPos = s0;
+                                    s0 = peg$f83(s4);
+                                  } else {
+                                    peg$currPos = s0;
+                                    s0 = peg$FAILED;
+                                  }
+                                } else {
+                                  peg$currPos = s0;
+                                  s0 = peg$FAILED;
+                                }
+                              } else {
+                                peg$currPos = s0;
+                                s0 = peg$FAILED;
+                              }
                             } else {
                               peg$currPos = s0;
                               s0 = peg$FAILED;
@@ -23567,13 +23785,13 @@ function peg$parse(input, options) {
                           }
                           if (s0 === peg$FAILED) {
                             s0 = peg$currPos;
-                            if (input.substr(peg$currPos, 6) === peg$c63) {
-                              s1 = peg$c63;
+                            if (input.substr(peg$currPos, 6) === peg$c65) {
+                              s1 = peg$c65;
                               peg$currPos += 6;
                             } else {
                               s1 = peg$FAILED;
                               if (peg$silentFails === 0) {
-                                peg$fail(peg$e67);
+                                peg$fail(peg$e69);
                               }
                             }
                             if (s1 !== peg$FAILED) {
@@ -23633,110 +23851,156 @@ function peg$parse(input, options) {
                               s2 = input.substring(s2, peg$currPos);
                               s3 = peg$parseBlockTag();
                               if (s3 !== peg$FAILED) {
-                                peg$savedPos = s0;
-                                s0 = peg$f84(s2);
-                              } else {
-                                peg$currPos = s0;
-                                s0 = peg$FAILED;
-                              }
-                            } else {
-                              peg$currPos = s0;
-                              s0 = peg$FAILED;
-                            }
-                            if (s0 === peg$FAILED) {
-                              s0 = peg$currPos;
-                              if (input.substr(peg$currPos, 9) === peg$c64) {
-                                s1 = peg$c64;
-                                peg$currPos += 9;
-                              } else {
-                                s1 = peg$FAILED;
-                                if (peg$silentFails === 0) {
-                                  peg$fail(peg$e68);
-                                }
-                              }
-                              if (s1 !== peg$FAILED) {
-                                s2 = peg$currPos;
-                                s3 = peg$currPos;
-                                if (input.charCodeAt(peg$currPos) === 80) {
-                                  s4 = peg$c65;
-                                  peg$currPos++;
+                                if (input.substr(peg$currPos, 9) === peg$c63) {
+                                  s4 = peg$c63;
+                                  peg$currPos += 9;
                                 } else {
                                   s4 = peg$FAILED;
                                   if (peg$silentFails === 0) {
-                                    peg$fail(peg$e69);
+                                    peg$fail(peg$e67);
                                   }
                                 }
                                 if (s4 !== peg$FAILED) {
                                   s5 = peg$currPos;
-                                  s6 = [];
-                                  s7 = peg$currPos;
-                                  s8 = peg$currPos;
-                                  peg$silentFails++;
-                                  s9 = peg$parseBlockTag();
-                                  peg$silentFails--;
-                                  if (s9 === peg$FAILED) {
-                                    s8 = void 0;
+                                  s6 = peg$currPos;
+                                  if (input.charCodeAt(peg$currPos) === 80) {
+                                    s7 = peg$c64;
+                                    peg$currPos++;
                                   } else {
-                                    peg$currPos = s8;
-                                    s8 = peg$FAILED;
-                                  }
-                                  if (s8 !== peg$FAILED) {
-                                    s9 = peg$parsechar();
-                                    if (s9 !== peg$FAILED) {
-                                      s8 = [s8, s9];
-                                      s7 = s8;
-                                    } else {
-                                      peg$currPos = s7;
-                                      s7 = peg$FAILED;
-                                    }
-                                  } else {
-                                    peg$currPos = s7;
                                     s7 = peg$FAILED;
+                                    if (peg$silentFails === 0) {
+                                      peg$fail(peg$e68);
+                                    }
                                   }
-                                  while (s7 !== peg$FAILED) {
-                                    s6.push(s7);
-                                    s7 = peg$currPos;
+                                  if (s7 !== peg$FAILED) {
                                     s8 = peg$currPos;
+                                    s9 = [];
+                                    s10 = peg$currPos;
+                                    s11 = peg$currPos;
                                     peg$silentFails++;
-                                    s9 = peg$parseBlockTag();
+                                    s12 = peg$parseBlockTag();
                                     peg$silentFails--;
-                                    if (s9 === peg$FAILED) {
-                                      s8 = void 0;
+                                    if (s12 === peg$FAILED) {
+                                      s11 = void 0;
                                     } else {
-                                      peg$currPos = s8;
-                                      s8 = peg$FAILED;
+                                      peg$currPos = s11;
+                                      s11 = peg$FAILED;
                                     }
-                                    if (s8 !== peg$FAILED) {
-                                      s9 = peg$parsechar();
-                                      if (s9 !== peg$FAILED) {
-                                        s8 = [s8, s9];
-                                        s7 = s8;
+                                    if (s11 !== peg$FAILED) {
+                                      s12 = peg$parsechar();
+                                      if (s12 !== peg$FAILED) {
+                                        s11 = [s11, s12];
+                                        s10 = s11;
                                       } else {
-                                        peg$currPos = s7;
-                                        s7 = peg$FAILED;
+                                        peg$currPos = s10;
+                                        s10 = peg$FAILED;
                                       }
                                     } else {
-                                      peg$currPos = s7;
-                                      s7 = peg$FAILED;
+                                      peg$currPos = s10;
+                                      s10 = peg$FAILED;
+                                    }
+                                    while (s10 !== peg$FAILED) {
+                                      s9.push(s10);
+                                      s10 = peg$currPos;
+                                      s11 = peg$currPos;
+                                      peg$silentFails++;
+                                      s12 = peg$parseBlockTag();
+                                      peg$silentFails--;
+                                      if (s12 === peg$FAILED) {
+                                        s11 = void 0;
+                                      } else {
+                                        peg$currPos = s11;
+                                        s11 = peg$FAILED;
+                                      }
+                                      if (s11 !== peg$FAILED) {
+                                        s12 = peg$parsechar();
+                                        if (s12 !== peg$FAILED) {
+                                          s11 = [s11, s12];
+                                          s10 = s11;
+                                        } else {
+                                          peg$currPos = s10;
+                                          s10 = peg$FAILED;
+                                        }
+                                      } else {
+                                        peg$currPos = s10;
+                                        s10 = peg$FAILED;
+                                      }
                                     }
+                                    s8 = input.substring(s8, peg$currPos);
+                                    s7 = [s7, s8];
+                                    s6 = s7;
+                                  } else {
+                                    peg$currPos = s6;
+                                    s6 = peg$FAILED;
+                                  }
+                                  if (s6 !== peg$FAILED) {
+                                    s5 = input.substring(s5, peg$currPos);
+                                  } else {
+                                    s5 = s6;
+                                  }
+                                  if (s5 !== peg$FAILED) {
+                                    s6 = peg$parseBlockTag();
+                                    if (s6 !== peg$FAILED) {
+                                      peg$savedPos = s0;
+                                      s0 = peg$f84(s2, s5);
+                                    } else {
+                                      peg$currPos = s0;
+                                      s0 = peg$FAILED;
+                                    }
+                                  } else {
+                                    peg$currPos = s0;
+                                    s0 = peg$FAILED;
                                   }
-                                  s5 = input.substring(s5, peg$currPos);
-                                  s4 = [s4, s5];
-                                  s3 = s4;
                                 } else {
-                                  peg$currPos = s3;
-                                  s3 = peg$FAILED;
+                                  peg$currPos = s0;
+                                  s0 = peg$FAILED;
                                 }
-                                if (s3 !== peg$FAILED) {
-                                  s2 = input.substring(s2, peg$currPos);
-                                } else {
-                                  s2 = s3;
+                              } else {
+                                peg$currPos = s0;
+                                s0 = peg$FAILED;
+                              }
+                            } else {
+                              peg$currPos = s0;
+                              s0 = peg$FAILED;
+                            }
+                            if (s0 === peg$FAILED) {
+                              s0 = peg$currPos;
+                              if (input.substr(peg$currPos, 9) === peg$c66) {
+                                s1 = peg$c66;
+                                peg$currPos += 9;
+                              } else {
+                                s1 = peg$FAILED;
+                                if (peg$silentFails === 0) {
+                                  peg$fail(peg$e70);
                                 }
+                              }
+                              if (s1 !== peg$FAILED) {
+                                s2 = peg$parseBlockTag();
                                 if (s2 !== peg$FAILED) {
-                                  s3 = peg$parseBlockTag();
+                                  if (input.substr(peg$currPos, 6) === peg$c67) {
+                                    s3 = peg$c67;
+                                    peg$currPos += 6;
+                                  } else {
+                                    s3 = peg$FAILED;
+                                    if (peg$silentFails === 0) {
+                                      peg$fail(peg$e71);
+                                    }
+                                  }
                                   if (s3 !== peg$FAILED) {
-                                    peg$savedPos = s0;
-                                    s0 = peg$f85(s2);
+                                    s4 = peg$parseHighlightColor();
+                                    if (s4 !== peg$FAILED) {
+                                      s5 = peg$parseBlockTag();
+                                      if (s5 !== peg$FAILED) {
+                                        peg$savedPos = s0;
+                                        s0 = peg$f85(s4);
+                                      } else {
+                                        peg$currPos = s0;
+                                        s0 = peg$FAILED;
+                                      }
+                                    } else {
+                                      peg$currPos = s0;
+                                      s0 = peg$FAILED;
+                                    }
                                   } else {
                                     peg$currPos = s0;
                                     s0 = peg$FAILED;
@@ -23751,22 +24015,42 @@ function peg$parse(input, options) {
                               }
                               if (s0 === peg$FAILED) {
                                 s0 = peg$currPos;
-                                if (input.substr(peg$currPos, 6) === peg$c66) {
-                                  s1 = peg$c66;
-                                  peg$currPos += 6;
+                                if (input.substr(peg$currPos, 13) === peg$c68) {
+                                  s1 = peg$c68;
+                                  peg$currPos += 13;
                                 } else {
                                   s1 = peg$FAILED;
                                   if (peg$silentFails === 0) {
-                                    peg$fail(peg$e70);
+                                    peg$fail(peg$e72);
                                   }
                                 }
                                 if (s1 !== peg$FAILED) {
-                                  s2 = peg$parseColor();
+                                  s2 = peg$parseBlockTag();
                                   if (s2 !== peg$FAILED) {
-                                    s3 = peg$parseBlockTag();
+                                    if (input.substr(peg$currPos, 6) === peg$c67) {
+                                      s3 = peg$c67;
+                                      peg$currPos += 6;
+                                    } else {
+                                      s3 = peg$FAILED;
+                                      if (peg$silentFails === 0) {
+                                        peg$fail(peg$e71);
+                                      }
+                                    }
                                     if (s3 !== peg$FAILED) {
-                                      peg$savedPos = s0;
-                                      s0 = peg$f86(s2);
+                                      s4 = peg$parseHighlightColor();
+                                      if (s4 !== peg$FAILED) {
+                                        s5 = peg$parseBlockTag();
+                                        if (s5 !== peg$FAILED) {
+                                          peg$savedPos = s0;
+                                          s0 = peg$f86(s4);
+                                        } else {
+                                          peg$currPos = s0;
+                                          s0 = peg$FAILED;
+                                        }
+                                      } else {
+                                        peg$currPos = s0;
+                                        s0 = peg$FAILED;
+                                      }
                                     } else {
                                       peg$currPos = s0;
                                       s0 = peg$FAILED;
@@ -23781,9 +24065,9 @@ function peg$parse(input, options) {
                                 }
                                 if (s0 === peg$FAILED) {
                                   s0 = peg$currPos;
-                                  if (input.substr(peg$currPos, 12) === peg$c67) {
+                                  if (input.substr(peg$currPos, 6) === peg$c67) {
                                     s1 = peg$c67;
-                                    peg$currPos += 12;
+                                    peg$currPos += 6;
                                   } else {
                                     s1 = peg$FAILED;
                                     if (peg$silentFails === 0) {
@@ -23791,34 +24075,38 @@ function peg$parse(input, options) {
                                     }
                                   }
                                   if (s1 !== peg$FAILED) {
-                                    s2 = peg$currPos;
-                                    s3 = [];
-                                    s4 = peg$currPos;
-                                    s5 = peg$currPos;
-                                    peg$silentFails++;
-                                    s6 = peg$parseBlockTag();
-                                    peg$silentFails--;
-                                    if (s6 === peg$FAILED) {
-                                      s5 = void 0;
-                                    } else {
-                                      peg$currPos = s5;
-                                      s5 = peg$FAILED;
-                                    }
-                                    if (s5 !== peg$FAILED) {
-                                      s6 = peg$parsechar();
-                                      if (s6 !== peg$FAILED) {
-                                        s5 = [s5, s6];
-                                        s4 = s5;
+                                    s2 = peg$parseColor();
+                                    if (s2 !== peg$FAILED) {
+                                      s3 = peg$parseBlockTag();
+                                      if (s3 !== peg$FAILED) {
+                                        peg$savedPos = s0;
+                                        s0 = peg$f87(s2);
                                       } else {
-                                        peg$currPos = s4;
-                                        s4 = peg$FAILED;
+                                        peg$currPos = s0;
+                                        s0 = peg$FAILED;
                                       }
                                     } else {
-                                      peg$currPos = s4;
-                                      s4 = peg$FAILED;
+                                      peg$currPos = s0;
+                                      s0 = peg$FAILED;
+                                    }
+                                  } else {
+                                    peg$currPos = s0;
+                                    s0 = peg$FAILED;
+                                  }
+                                  if (s0 === peg$FAILED) {
+                                    s0 = peg$currPos;
+                                    if (input.substr(peg$currPos, 12) === peg$c69) {
+                                      s1 = peg$c69;
+                                      peg$currPos += 12;
+                                    } else {
+                                      s1 = peg$FAILED;
+                                      if (peg$silentFails === 0) {
+                                        peg$fail(peg$e73);
+                                      }
                                     }
-                                    while (s4 !== peg$FAILED) {
-                                      s3.push(s4);
+                                    if (s1 !== peg$FAILED) {
+                                      s2 = peg$currPos;
+                                      s3 = [];
                                       s4 = peg$currPos;
                                       s5 = peg$currPos;
                                       peg$silentFails++;
@@ -23843,50 +24131,8 @@ function peg$parse(input, options) {
                                         peg$currPos = s4;
                                         s4 = peg$FAILED;
                                       }
-                                    }
-                                    s2 = input.substring(s2, peg$currPos);
-                                    s3 = peg$parseBlockTag();
-                                    if (s3 !== peg$FAILED) {
-                                      peg$savedPos = s0;
-                                      s0 = peg$f87(s2);
-                                    } else {
-                                      peg$currPos = s0;
-                                      s0 = peg$FAILED;
-                                    }
-                                  } else {
-                                    peg$currPos = s0;
-                                    s0 = peg$FAILED;
-                                  }
-                                  if (s0 === peg$FAILED) {
-                                    s0 = peg$currPos;
-                                    s1 = peg$parseAlternativeStyleTags();
-                                    if (s1 !== peg$FAILED) {
-                                      s2 = peg$parseBlockTag();
-                                      if (s2 !== peg$FAILED) {
-                                        peg$savedPos = s0;
-                                        s0 = peg$f88(s1);
-                                      } else {
-                                        peg$currPos = s0;
-                                        s0 = peg$FAILED;
-                                      }
-                                    } else {
-                                      peg$currPos = s0;
-                                      s0 = peg$FAILED;
-                                    }
-                                    if (s0 === peg$FAILED) {
-                                      s0 = peg$currPos;
-                                      if (input.charCodeAt(peg$currPos) === 35) {
-                                        s1 = peg$c21;
-                                        peg$currPos++;
-                                      } else {
-                                        s1 = peg$FAILED;
-                                        if (peg$silentFails === 0) {
-                                          peg$fail(peg$e25);
-                                        }
-                                      }
-                                      if (s1 !== peg$FAILED) {
-                                        s2 = peg$currPos;
-                                        s3 = [];
+                                      while (s4 !== peg$FAILED) {
+                                        s3.push(s4);
                                         s4 = peg$currPos;
                                         s5 = peg$currPos;
                                         peg$silentFails++;
@@ -23911,8 +24157,50 @@ function peg$parse(input, options) {
                                           peg$currPos = s4;
                                           s4 = peg$FAILED;
                                         }
-                                        while (s4 !== peg$FAILED) {
-                                          s3.push(s4);
+                                      }
+                                      s2 = input.substring(s2, peg$currPos);
+                                      s3 = peg$parseBlockTag();
+                                      if (s3 !== peg$FAILED) {
+                                        peg$savedPos = s0;
+                                        s0 = peg$f88(s2);
+                                      } else {
+                                        peg$currPos = s0;
+                                        s0 = peg$FAILED;
+                                      }
+                                    } else {
+                                      peg$currPos = s0;
+                                      s0 = peg$FAILED;
+                                    }
+                                    if (s0 === peg$FAILED) {
+                                      s0 = peg$currPos;
+                                      s1 = peg$parseAlternativeStyleTags();
+                                      if (s1 !== peg$FAILED) {
+                                        s2 = peg$parseBlockTag();
+                                        if (s2 !== peg$FAILED) {
+                                          peg$savedPos = s0;
+                                          s0 = peg$f89(s1);
+                                        } else {
+                                          peg$currPos = s0;
+                                          s0 = peg$FAILED;
+                                        }
+                                      } else {
+                                        peg$currPos = s0;
+                                        s0 = peg$FAILED;
+                                      }
+                                      if (s0 === peg$FAILED) {
+                                        s0 = peg$currPos;
+                                        if (input.charCodeAt(peg$currPos) === 35) {
+                                          s1 = peg$c21;
+                                          peg$currPos++;
+                                        } else {
+                                          s1 = peg$FAILED;
+                                          if (peg$silentFails === 0) {
+                                            peg$fail(peg$e25);
+                                          }
+                                        }
+                                        if (s1 !== peg$FAILED) {
+                                          s2 = peg$currPos;
+                                          s3 = [];
                                           s4 = peg$currPos;
                                           s5 = peg$currPos;
                                           peg$silentFails++;
@@ -23937,19 +24225,46 @@ function peg$parse(input, options) {
                                             peg$currPos = s4;
                                             s4 = peg$FAILED;
                                           }
-                                        }
-                                        s2 = input.substring(s2, peg$currPos);
-                                        s3 = peg$parseBlockTag();
-                                        if (s3 !== peg$FAILED) {
-                                          peg$savedPos = s0;
-                                          s0 = peg$f89(s2);
+                                          while (s4 !== peg$FAILED) {
+                                            s3.push(s4);
+                                            s4 = peg$currPos;
+                                            s5 = peg$currPos;
+                                            peg$silentFails++;
+                                            s6 = peg$parseBlockTag();
+                                            peg$silentFails--;
+                                            if (s6 === peg$FAILED) {
+                                              s5 = void 0;
+                                            } else {
+                                              peg$currPos = s5;
+                                              s5 = peg$FAILED;
+                                            }
+                                            if (s5 !== peg$FAILED) {
+                                              s6 = peg$parsechar();
+                                              if (s6 !== peg$FAILED) {
+                                                s5 = [s5, s6];
+                                                s4 = s5;
+                                              } else {
+                                                peg$currPos = s4;
+                                                s4 = peg$FAILED;
+                                              }
+                                            } else {
+                                              peg$currPos = s4;
+                                              s4 = peg$FAILED;
+                                            }
+                                          }
+                                          s2 = input.substring(s2, peg$currPos);
+                                          s3 = peg$parseBlockTag();
+                                          if (s3 !== peg$FAILED) {
+                                            peg$savedPos = s0;
+                                            s0 = peg$f90(s2);
+                                          } else {
+                                            peg$currPos = s0;
+                                            s0 = peg$FAILED;
+                                          }
                                         } else {
                                           peg$currPos = s0;
                                           s0 = peg$FAILED;
                                         }
-                                      } else {
-                                        peg$currPos = s0;
-                                        s0 = peg$FAILED;
                                       }
                                     }
                                   }
@@ -23983,13 +24298,13 @@ function peg$parse(input, options) {
   function peg$parseRef() {
     let s0, s1, s2, s3, s4, s5, s6;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c68) {
-      s1 = peg$c68;
+    if (input.substr(peg$currPos, 2) === peg$c70) {
+      s1 = peg$c70;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e72);
+        peg$fail(peg$e74);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -24048,7 +24363,7 @@ function peg$parse(input, options) {
       }
       s2 = input.substring(s2, peg$currPos);
       peg$savedPos = s0;
-      s0 = peg$f90(s2);
+      s0 = peg$f91(s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -24057,403 +24372,414 @@ function peg$parse(input, options) {
   }
   function peg$parseAlternativeStyleTags() {
     let s0;
-    if (input.substr(peg$currPos, 4) === peg$c69) {
-      s0 = peg$c69;
+    if (input.substr(peg$currPos, 4) === peg$c71) {
+      s0 = peg$c71;
       peg$currPos += 4;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e73);
+        peg$fail(peg$e75);
       }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 6) === peg$c70) {
-        s0 = peg$c70;
+      if (input.substr(peg$currPos, 6) === peg$c72) {
+        s0 = peg$c72;
         peg$currPos += 6;
       } else {
         s0 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e74);
+          peg$fail(peg$e76);
         }
       }
       if (s0 === peg$FAILED) {
-        if (input.substr(peg$currPos, 5) === peg$c71) {
-          s0 = peg$c71;
+        if (input.substr(peg$currPos, 5) === peg$c73) {
+          s0 = peg$c73;
           peg$currPos += 5;
         } else {
           s0 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e75);
+            peg$fail(peg$e77);
           }
         }
         if (s0 === peg$FAILED) {
-          if (input.substr(peg$currPos, 15) === peg$c72) {
-            s0 = peg$c72;
+          if (input.substr(peg$currPos, 15) === peg$c74) {
+            s0 = peg$c74;
             peg$currPos += 15;
           } else {
             s0 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e76);
+              peg$fail(peg$e78);
             }
           }
           if (s0 === peg$FAILED) {
-            if (input.substr(peg$currPos, 15) === peg$c73) {
-              s0 = peg$c73;
+            if (input.substr(peg$currPos, 15) === peg$c75) {
+              s0 = peg$c75;
               peg$currPos += 15;
             } else {
               s0 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e77);
+                peg$fail(peg$e79);
               }
             }
             if (s0 === peg$FAILED) {
-              if (input.substr(peg$currPos, 14) === peg$c74) {
-                s0 = peg$c74;
+              if (input.substr(peg$currPos, 14) === peg$c76) {
+                s0 = peg$c76;
                 peg$currPos += 14;
               } else {
                 s0 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e78);
+                  peg$fail(peg$e80);
                 }
               }
               if (s0 === peg$FAILED) {
-                if (input.substr(peg$currPos, 13) === peg$c75) {
-                  s0 = peg$c75;
+                if (input.substr(peg$currPos, 13) === peg$c77) {
+                  s0 = peg$c77;
                   peg$currPos += 13;
                 } else {
                   s0 = peg$FAILED;
                   if (peg$silentFails === 0) {
-                    peg$fail(peg$e79);
+                    peg$fail(peg$e81);
                   }
                 }
                 if (s0 === peg$FAILED) {
-                  if (input.substr(peg$currPos, 15) === peg$c76) {
-                    s0 = peg$c76;
+                  if (input.substr(peg$currPos, 15) === peg$c78) {
+                    s0 = peg$c78;
                     peg$currPos += 15;
                   } else {
                     s0 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                      peg$fail(peg$e80);
+                      peg$fail(peg$e82);
                     }
                   }
                   if (s0 === peg$FAILED) {
-                    if (input.substr(peg$currPos, 13) === peg$c77) {
-                      s0 = peg$c77;
+                    if (input.substr(peg$currPos, 13) === peg$c79) {
+                      s0 = peg$c79;
                       peg$currPos += 13;
                     } else {
                       s0 = peg$FAILED;
                       if (peg$silentFails === 0) {
-                        peg$fail(peg$e81);
+                        peg$fail(peg$e83);
                       }
                     }
                     if (s0 === peg$FAILED) {
-                      if (input.substr(peg$currPos, 14) === peg$c78) {
-                        s0 = peg$c78;
+                      if (input.substr(peg$currPos, 14) === peg$c80) {
+                        s0 = peg$c80;
                         peg$currPos += 14;
                       } else {
                         s0 = peg$FAILED;
                         if (peg$silentFails === 0) {
-                          peg$fail(peg$e82);
+                          peg$fail(peg$e84);
                         }
                       }
                       if (s0 === peg$FAILED) {
-                        if (input.substr(peg$currPos, 14) === peg$c79) {
-                          s0 = peg$c79;
+                        if (input.substr(peg$currPos, 14) === peg$c81) {
+                          s0 = peg$c81;
                           peg$currPos += 14;
                         } else {
                           s0 = peg$FAILED;
                           if (peg$silentFails === 0) {
-                            peg$fail(peg$e83);
+                            peg$fail(peg$e85);
                           }
                         }
                         if (s0 === peg$FAILED) {
-                          if (input.substr(peg$currPos, 14) === peg$c80) {
-                            s0 = peg$c80;
+                          if (input.substr(peg$currPos, 14) === peg$c82) {
+                            s0 = peg$c82;
                             peg$currPos += 14;
                           } else {
                             s0 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                              peg$fail(peg$e84);
+                              peg$fail(peg$e86);
                             }
                           }
                           if (s0 === peg$FAILED) {
-                            if (input.substr(peg$currPos, 13) === peg$c81) {
-                              s0 = peg$c81;
+                            if (input.substr(peg$currPos, 13) === peg$c83) {
+                              s0 = peg$c83;
                               peg$currPos += 13;
                             } else {
                               s0 = peg$FAILED;
                               if (peg$silentFails === 0) {
-                                peg$fail(peg$e85);
+                                peg$fail(peg$e87);
                               }
                             }
                             if (s0 === peg$FAILED) {
-                              if (input.substr(peg$currPos, 9) === peg$c82) {
-                                s0 = peg$c82;
+                              if (input.substr(peg$currPos, 9) === peg$c66) {
+                                s0 = peg$c66;
                                 peg$currPos += 9;
                               } else {
                                 s0 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                  peg$fail(peg$e86);
+                                  peg$fail(peg$e70);
                                 }
                               }
                               if (s0 === peg$FAILED) {
-                                if (input.substr(peg$currPos, 6) === peg$c83) {
-                                  s0 = peg$c83;
+                                if (input.substr(peg$currPos, 6) === peg$c84) {
+                                  s0 = peg$c84;
                                   peg$currPos += 6;
                                 } else {
                                   s0 = peg$FAILED;
                                   if (peg$silentFails === 0) {
-                                    peg$fail(peg$e87);
+                                    peg$fail(peg$e88);
                                   }
                                 }
                                 if (s0 === peg$FAILED) {
-                                  if (input.substr(peg$currPos, 9) === peg$c84) {
-                                    s0 = peg$c84;
+                                  if (input.substr(peg$currPos, 9) === peg$c85) {
+                                    s0 = peg$c85;
                                     peg$currPos += 9;
                                   } else {
                                     s0 = peg$FAILED;
                                     if (peg$silentFails === 0) {
-                                      peg$fail(peg$e88);
+                                      peg$fail(peg$e89);
                                     }
                                   }
                                   if (s0 === peg$FAILED) {
-                                    if (input.substr(peg$currPos, 11) === peg$c85) {
-                                      s0 = peg$c85;
+                                    if (input.substr(peg$currPos, 11) === peg$c86) {
+                                      s0 = peg$c86;
                                       peg$currPos += 11;
                                     } else {
                                       s0 = peg$FAILED;
                                       if (peg$silentFails === 0) {
-                                        peg$fail(peg$e89);
+                                        peg$fail(peg$e90);
                                       }
                                     }
                                     if (s0 === peg$FAILED) {
-                                      if (input.substr(peg$currPos, 3) === peg$c86) {
-                                        s0 = peg$c86;
+                                      if (input.substr(peg$currPos, 3) === peg$c87) {
+                                        s0 = peg$c87;
                                         peg$currPos += 3;
                                       } else {
                                         s0 = peg$FAILED;
                                         if (peg$silentFails === 0) {
-                                          peg$fail(peg$e90);
+                                          peg$fail(peg$e91);
                                         }
                                       }
                                       if (s0 === peg$FAILED) {
-                                        if (input.substr(peg$currPos, 3) === peg$c87) {
-                                          s0 = peg$c87;
+                                        if (input.substr(peg$currPos, 3) === peg$c88) {
+                                          s0 = peg$c88;
                                           peg$currPos += 3;
                                         } else {
                                           s0 = peg$FAILED;
                                           if (peg$silentFails === 0) {
-                                            peg$fail(peg$e91);
+                                            peg$fail(peg$e92);
                                           }
                                         }
                                         if (s0 === peg$FAILED) {
-                                          if (input.substr(peg$currPos, 9) === peg$c88) {
-                                            s0 = peg$c88;
+                                          if (input.substr(peg$currPos, 9) === peg$c89) {
+                                            s0 = peg$c89;
                                             peg$currPos += 9;
                                           } else {
                                             s0 = peg$FAILED;
                                             if (peg$silentFails === 0) {
-                                              peg$fail(peg$e92);
+                                              peg$fail(peg$e93);
                                             }
                                           }
                                           if (s0 === peg$FAILED) {
-                                            if (input.substr(peg$currPos, 15) === peg$c89) {
-                                              s0 = peg$c89;
+                                            if (input.substr(peg$currPos, 15) === peg$c90) {
+                                              s0 = peg$c90;
                                               peg$currPos += 15;
                                             } else {
                                               s0 = peg$FAILED;
                                               if (peg$silentFails === 0) {
-                                                peg$fail(peg$e93);
+                                                peg$fail(peg$e94);
                                               }
                                             }
                                             if (s0 === peg$FAILED) {
-                                              if (input.substr(peg$currPos, 6) === peg$c90) {
-                                                s0 = peg$c90;
-                                                peg$currPos += 6;
+                                              if (input.substr(peg$currPos, 9) === peg$c91) {
+                                                s0 = peg$c91;
+                                                peg$currPos += 9;
                                               } else {
                                                 s0 = peg$FAILED;
                                                 if (peg$silentFails === 0) {
-                                                  peg$fail(peg$e94);
+                                                  peg$fail(peg$e95);
                                                 }
                                               }
                                               if (s0 === peg$FAILED) {
-                                                if (input.substr(peg$currPos, 13) === peg$c91) {
-                                                  s0 = peg$c91;
-                                                  peg$currPos += 13;
+                                                if (input.substr(peg$currPos, 6) === peg$c92) {
+                                                  s0 = peg$c92;
+                                                  peg$currPos += 6;
                                                 } else {
                                                   s0 = peg$FAILED;
                                                   if (peg$silentFails === 0) {
-                                                    peg$fail(peg$e95);
+                                                    peg$fail(peg$e96);
                                                   }
                                                 }
                                                 if (s0 === peg$FAILED) {
-                                                  if (input.substr(peg$currPos, 16) === peg$c92) {
-                                                    s0 = peg$c92;
-                                                    peg$currPos += 16;
+                                                  if (input.substr(peg$currPos, 13) === peg$c93) {
+                                                    s0 = peg$c93;
+                                                    peg$currPos += 13;
                                                   } else {
                                                     s0 = peg$FAILED;
                                                     if (peg$silentFails === 0) {
-                                                      peg$fail(peg$e96);
+                                                      peg$fail(peg$e97);
                                                     }
                                                   }
                                                   if (s0 === peg$FAILED) {
-                                                    if (input.substr(peg$currPos, 16) === peg$c93) {
-                                                      s0 = peg$c93;
+                                                    if (input.substr(peg$currPos, 16) === peg$c94) {
+                                                      s0 = peg$c94;
                                                       peg$currPos += 16;
                                                     } else {
                                                       s0 = peg$FAILED;
                                                       if (peg$silentFails === 0) {
-                                                        peg$fail(peg$e97);
+                                                        peg$fail(peg$e98);
                                                       }
                                                     }
                                                     if (s0 === peg$FAILED) {
-                                                      if (input.substr(peg$currPos, 15) === peg$c94) {
-                                                        s0 = peg$c94;
-                                                        peg$currPos += 15;
+                                                      if (input.substr(peg$currPos, 16) === peg$c95) {
+                                                        s0 = peg$c95;
+                                                        peg$currPos += 16;
                                                       } else {
                                                         s0 = peg$FAILED;
                                                         if (peg$silentFails === 0) {
-                                                          peg$fail(peg$e98);
+                                                          peg$fail(peg$e99);
                                                         }
                                                       }
                                                       if (s0 === peg$FAILED) {
-                                                        if (input.substr(peg$currPos, 14) === peg$c95) {
-                                                          s0 = peg$c95;
-                                                          peg$currPos += 14;
+                                                        if (input.substr(peg$currPos, 15) === peg$c96) {
+                                                          s0 = peg$c96;
+                                                          peg$currPos += 15;
                                                         } else {
                                                           s0 = peg$FAILED;
                                                           if (peg$silentFails === 0) {
-                                                            peg$fail(peg$e99);
+                                                            peg$fail(peg$e100);
                                                           }
                                                         }
                                                         if (s0 === peg$FAILED) {
-                                                          if (input.substr(peg$currPos, 16) === peg$c96) {
-                                                            s0 = peg$c96;
-                                                            peg$currPos += 16;
+                                                          if (input.substr(peg$currPos, 14) === peg$c97) {
+                                                            s0 = peg$c97;
+                                                            peg$currPos += 14;
                                                           } else {
                                                             s0 = peg$FAILED;
                                                             if (peg$silentFails === 0) {
-                                                              peg$fail(peg$e100);
+                                                              peg$fail(peg$e101);
                                                             }
                                                           }
                                                           if (s0 === peg$FAILED) {
-                                                            if (input.substr(peg$currPos, 14) === peg$c97) {
-                                                              s0 = peg$c97;
-                                                              peg$currPos += 14;
+                                                            if (input.substr(peg$currPos, 16) === peg$c98) {
+                                                              s0 = peg$c98;
+                                                              peg$currPos += 16;
                                                             } else {
                                                               s0 = peg$FAILED;
                                                               if (peg$silentFails === 0) {
-                                                                peg$fail(peg$e101);
+                                                                peg$fail(peg$e102);
                                                               }
                                                             }
                                                             if (s0 === peg$FAILED) {
-                                                              if (input.substr(peg$currPos, 15) === peg$c98) {
-                                                                s0 = peg$c98;
-                                                                peg$currPos += 15;
+                                                              if (input.substr(peg$currPos, 14) === peg$c99) {
+                                                                s0 = peg$c99;
+                                                                peg$currPos += 14;
                                                               } else {
                                                                 s0 = peg$FAILED;
                                                                 if (peg$silentFails === 0) {
-                                                                  peg$fail(peg$e102);
+                                                                  peg$fail(peg$e103);
                                                                 }
                                                               }
                                                               if (s0 === peg$FAILED) {
-                                                                if (input.substr(peg$currPos, 15) === peg$c99) {
-                                                                  s0 = peg$c99;
+                                                                if (input.substr(peg$currPos, 15) === peg$c100) {
+                                                                  s0 = peg$c100;
                                                                   peg$currPos += 15;
                                                                 } else {
                                                                   s0 = peg$FAILED;
                                                                   if (peg$silentFails === 0) {
-                                                                    peg$fail(peg$e103);
+                                                                    peg$fail(peg$e104);
                                                                   }
                                                                 }
                                                                 if (s0 === peg$FAILED) {
-                                                                  if (input.substr(peg$currPos, 15) === peg$c100) {
-                                                                    s0 = peg$c100;
+                                                                  if (input.substr(peg$currPos, 15) === peg$c101) {
+                                                                    s0 = peg$c101;
                                                                     peg$currPos += 15;
                                                                   } else {
                                                                     s0 = peg$FAILED;
                                                                     if (peg$silentFails === 0) {
-                                                                      peg$fail(peg$e104);
+                                                                      peg$fail(peg$e105);
                                                                     }
                                                                   }
                                                                   if (s0 === peg$FAILED) {
-                                                                    if (input.substr(peg$currPos, 14) === peg$c101) {
-                                                                      s0 = peg$c101;
-                                                                      peg$currPos += 14;
+                                                                    if (input.substr(peg$currPos, 15) === peg$c102) {
+                                                                      s0 = peg$c102;
+                                                                      peg$currPos += 15;
                                                                     } else {
                                                                       s0 = peg$FAILED;
                                                                       if (peg$silentFails === 0) {
-                                                                        peg$fail(peg$e105);
+                                                                        peg$fail(peg$e106);
                                                                       }
                                                                     }
                                                                     if (s0 === peg$FAILED) {
-                                                                      if (input.substr(peg$currPos, 10) === peg$c102) {
-                                                                        s0 = peg$c102;
-                                                                        peg$currPos += 10;
+                                                                      if (input.substr(peg$currPos, 14) === peg$c103) {
+                                                                        s0 = peg$c103;
+                                                                        peg$currPos += 14;
                                                                       } else {
                                                                         s0 = peg$FAILED;
                                                                         if (peg$silentFails === 0) {
-                                                                          peg$fail(peg$e106);
+                                                                          peg$fail(peg$e107);
                                                                         }
                                                                       }
                                                                       if (s0 === peg$FAILED) {
-                                                                        if (input.substr(peg$currPos, 13) === peg$c103) {
-                                                                          s0 = peg$c103;
-                                                                          peg$currPos += 13;
+                                                                        if (input.substr(peg$currPos, 10) === peg$c104) {
+                                                                          s0 = peg$c104;
+                                                                          peg$currPos += 10;
                                                                         } else {
                                                                           s0 = peg$FAILED;
                                                                           if (peg$silentFails === 0) {
-                                                                            peg$fail(peg$e107);
+                                                                            peg$fail(peg$e108);
                                                                           }
                                                                         }
                                                                         if (s0 === peg$FAILED) {
-                                                                          if (input.substr(peg$currPos, 19) === peg$c104) {
-                                                                            s0 = peg$c104;
-                                                                            peg$currPos += 19;
+                                                                          if (input.substr(peg$currPos, 13) === peg$c105) {
+                                                                            s0 = peg$c105;
+                                                                            peg$currPos += 13;
                                                                           } else {
                                                                             s0 = peg$FAILED;
                                                                             if (peg$silentFails === 0) {
-                                                                              peg$fail(peg$e108);
+                                                                              peg$fail(peg$e109);
                                                                             }
                                                                           }
                                                                           if (s0 === peg$FAILED) {
-                                                                            if (input.substr(peg$currPos, 10) === peg$c105) {
-                                                                              s0 = peg$c105;
-                                                                              peg$currPos += 10;
+                                                                            if (input.substr(peg$currPos, 19) === peg$c106) {
+                                                                              s0 = peg$c106;
+                                                                              peg$currPos += 19;
                                                                             } else {
                                                                               s0 = peg$FAILED;
                                                                               if (peg$silentFails === 0) {
-                                                                                peg$fail(peg$e109);
+                                                                                peg$fail(peg$e110);
                                                                               }
                                                                             }
                                                                             if (s0 === peg$FAILED) {
-                                                                              if (input.substr(peg$currPos, 10) === peg$c106) {
-                                                                                s0 = peg$c106;
+                                                                              if (input.substr(peg$currPos, 10) === peg$c107) {
+                                                                                s0 = peg$c107;
                                                                                 peg$currPos += 10;
                                                                               } else {
                                                                                 s0 = peg$FAILED;
                                                                                 if (peg$silentFails === 0) {
-                                                                                  peg$fail(peg$e110);
+                                                                                  peg$fail(peg$e111);
                                                                                 }
                                                                               }
                                                                               if (s0 === peg$FAILED) {
-                                                                                if (input.substr(peg$currPos, 13) === peg$c107) {
-                                                                                  s0 = peg$c107;
-                                                                                  peg$currPos += 13;
+                                                                                if (input.substr(peg$currPos, 10) === peg$c108) {
+                                                                                  s0 = peg$c108;
+                                                                                  peg$currPos += 10;
                                                                                 } else {
                                                                                   s0 = peg$FAILED;
                                                                                   if (peg$silentFails === 0) {
-                                                                                    peg$fail(peg$e111);
+                                                                                    peg$fail(peg$e112);
                                                                                   }
                                                                                 }
                                                                                 if (s0 === peg$FAILED) {
-                                                                                  if (input.substr(peg$currPos, 11) === peg$c108) {
-                                                                                    s0 = peg$c108;
-                                                                                    peg$currPos += 11;
+                                                                                  if (input.substr(peg$currPos, 13) === peg$c68) {
+                                                                                    s0 = peg$c68;
+                                                                                    peg$currPos += 13;
                                                                                   } else {
                                                                                     s0 = peg$FAILED;
                                                                                     if (peg$silentFails === 0) {
-                                                                                      peg$fail(peg$e112);
+                                                                                      peg$fail(peg$e72);
+                                                                                    }
+                                                                                  }
+                                                                                  if (s0 === peg$FAILED) {
+                                                                                    if (input.substr(peg$currPos, 11) === peg$c109) {
+                                                                                      s0 = peg$c109;
+                                                                                      peg$currPos += 11;
+                                                                                    } else {
+                                                                                      s0 = peg$FAILED;
+                                                                                      if (peg$silentFails === 0) {
+                                                                                        peg$fail(peg$e113);
+                                                                                      }
                                                                                     }
                                                                                   }
                                                                                 }
@@ -24499,233 +24825,233 @@ function peg$parse(input, options) {
   }
   function peg$parseColor() {
     let s0;
-    if (input.substr(peg$currPos, 4) === peg$c109) {
-      s0 = peg$c109;
+    if (input.substr(peg$currPos, 4) === peg$c110) {
+      s0 = peg$c110;
       peg$currPos += 4;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e113);
+        peg$fail(peg$e114);
       }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 5) === peg$c110) {
-        s0 = peg$c110;
+      if (input.substr(peg$currPos, 5) === peg$c111) {
+        s0 = peg$c111;
         peg$currPos += 5;
       } else {
         s0 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e114);
+          peg$fail(peg$e115);
         }
       }
       if (s0 === peg$FAILED) {
-        if (input.substr(peg$currPos, 4) === peg$c111) {
-          s0 = peg$c111;
+        if (input.substr(peg$currPos, 4) === peg$c112) {
+          s0 = peg$c112;
           peg$currPos += 4;
         } else {
           s0 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e115);
+            peg$fail(peg$e116);
           }
         }
         if (s0 === peg$FAILED) {
-          if (input.substr(peg$currPos, 5) === peg$c112) {
-            s0 = peg$c112;
+          if (input.substr(peg$currPos, 5) === peg$c113) {
+            s0 = peg$c113;
             peg$currPos += 5;
           } else {
             s0 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e116);
+              peg$fail(peg$e117);
             }
           }
           if (s0 === peg$FAILED) {
-            if (input.substr(peg$currPos, 7) === peg$c113) {
-              s0 = peg$c113;
+            if (input.substr(peg$currPos, 7) === peg$c114) {
+              s0 = peg$c114;
               peg$currPos += 7;
             } else {
               s0 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e117);
+                peg$fail(peg$e118);
               }
             }
             if (s0 === peg$FAILED) {
-              if (input.substr(peg$currPos, 9) === peg$c114) {
-                s0 = peg$c114;
+              if (input.substr(peg$currPos, 9) === peg$c115) {
+                s0 = peg$c115;
                 peg$currPos += 9;
               } else {
                 s0 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e118);
+                  peg$fail(peg$e119);
                 }
               }
               if (s0 === peg$FAILED) {
-                if (input.substr(peg$currPos, 4) === peg$c115) {
-                  s0 = peg$c115;
+                if (input.substr(peg$currPos, 4) === peg$c116) {
+                  s0 = peg$c116;
                   peg$currPos += 4;
                 } else {
                   s0 = peg$FAILED;
                   if (peg$silentFails === 0) {
-                    peg$fail(peg$e119);
+                    peg$fail(peg$e120);
                   }
                 }
                 if (s0 === peg$FAILED) {
-                  if (input.substr(peg$currPos, 8) === peg$c116) {
-                    s0 = peg$c116;
+                  if (input.substr(peg$currPos, 8) === peg$c117) {
+                    s0 = peg$c117;
                     peg$currPos += 8;
                   } else {
                     s0 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                      peg$fail(peg$e120);
+                      peg$fail(peg$e121);
                     }
                   }
                   if (s0 === peg$FAILED) {
-                    if (input.substr(peg$currPos, 5) === peg$c117) {
-                      s0 = peg$c117;
+                    if (input.substr(peg$currPos, 5) === peg$c118) {
+                      s0 = peg$c118;
                       peg$currPos += 5;
                     } else {
                       s0 = peg$FAILED;
                       if (peg$silentFails === 0) {
-                        peg$fail(peg$e121);
+                        peg$fail(peg$e122);
                       }
                     }
                     if (s0 === peg$FAILED) {
-                      if (input.substr(peg$currPos, 4) === peg$c118) {
-                        s0 = peg$c118;
+                      if (input.substr(peg$currPos, 4) === peg$c119) {
+                        s0 = peg$c119;
                         peg$currPos += 4;
                       } else {
                         s0 = peg$FAILED;
                         if (peg$silentFails === 0) {
-                          peg$fail(peg$e122);
+                          peg$fail(peg$e123);
                         }
                       }
                       if (s0 === peg$FAILED) {
-                        if (input.substr(peg$currPos, 7) === peg$c119) {
-                          s0 = peg$c119;
+                        if (input.substr(peg$currPos, 7) === peg$c120) {
+                          s0 = peg$c120;
                           peg$currPos += 7;
                         } else {
                           s0 = peg$FAILED;
                           if (peg$silentFails === 0) {
-                            peg$fail(peg$e123);
+                            peg$fail(peg$e124);
                           }
                         }
                         if (s0 === peg$FAILED) {
-                          if (input.substr(peg$currPos, 6) === peg$c120) {
-                            s0 = peg$c120;
+                          if (input.substr(peg$currPos, 6) === peg$c121) {
+                            s0 = peg$c121;
                             peg$currPos += 6;
                           } else {
                             s0 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                              peg$fail(peg$e124);
+                              peg$fail(peg$e125);
                             }
                           }
                           if (s0 === peg$FAILED) {
-                            if (input.substr(peg$currPos, 4) === peg$c121) {
-                              s0 = peg$c121;
+                            if (input.substr(peg$currPos, 4) === peg$c122) {
+                              s0 = peg$c122;
                               peg$currPos += 4;
                             } else {
                               s0 = peg$FAILED;
                               if (peg$silentFails === 0) {
-                                peg$fail(peg$e125);
+                                peg$fail(peg$e126);
                               }
                             }
                             if (s0 === peg$FAILED) {
-                              if (input.substr(peg$currPos, 5) === peg$c122) {
-                                s0 = peg$c122;
+                              if (input.substr(peg$currPos, 5) === peg$c123) {
+                                s0 = peg$c123;
                                 peg$currPos += 5;
                               } else {
                                 s0 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                  peg$fail(peg$e126);
+                                  peg$fail(peg$e127);
                                 }
                               }
                               if (s0 === peg$FAILED) {
-                                if (input.substr(peg$currPos, 6) === peg$c123) {
-                                  s0 = peg$c123;
+                                if (input.substr(peg$currPos, 6) === peg$c124) {
+                                  s0 = peg$c124;
                                   peg$currPos += 6;
                                 } else {
                                   s0 = peg$FAILED;
                                   if (peg$silentFails === 0) {
-                                    peg$fail(peg$e127);
+                                    peg$fail(peg$e128);
                                   }
                                 }
                                 if (s0 === peg$FAILED) {
-                                  if (input.substr(peg$currPos, 4) === peg$c124) {
-                                    s0 = peg$c124;
+                                  if (input.substr(peg$currPos, 4) === peg$c125) {
+                                    s0 = peg$c125;
                                     peg$currPos += 4;
                                   } else {
                                     s0 = peg$FAILED;
                                     if (peg$silentFails === 0) {
-                                      peg$fail(peg$e128);
+                                      peg$fail(peg$e129);
                                     }
                                   }
                                   if (s0 === peg$FAILED) {
-                                    if (input.substr(peg$currPos, 6) === peg$c125) {
-                                      s0 = peg$c125;
+                                    if (input.substr(peg$currPos, 6) === peg$c126) {
+                                      s0 = peg$c126;
                                       peg$currPos += 6;
                                     } else {
                                       s0 = peg$FAILED;
                                       if (peg$silentFails === 0) {
-                                        peg$fail(peg$e129);
+                                        peg$fail(peg$e130);
                                       }
                                     }
                                     if (s0 === peg$FAILED) {
-                                      if (input.substr(peg$currPos, 3) === peg$c126) {
-                                        s0 = peg$c126;
+                                      if (input.substr(peg$currPos, 3) === peg$c127) {
+                                        s0 = peg$c127;
                                         peg$currPos += 3;
                                       } else {
                                         s0 = peg$FAILED;
                                         if (peg$silentFails === 0) {
-                                          peg$fail(peg$e130);
+                                          peg$fail(peg$e131);
                                         }
                                       }
                                       if (s0 === peg$FAILED) {
-                                        if (input.substr(peg$currPos, 6) === peg$c127) {
-                                          s0 = peg$c127;
+                                        if (input.substr(peg$currPos, 6) === peg$c128) {
+                                          s0 = peg$c128;
                                           peg$currPos += 6;
                                         } else {
                                           s0 = peg$FAILED;
                                           if (peg$silentFails === 0) {
-                                            peg$fail(peg$e131);
+                                            peg$fail(peg$e132);
                                           }
                                         }
                                         if (s0 === peg$FAILED) {
-                                          if (input.substr(peg$currPos, 4) === peg$c128) {
-                                            s0 = peg$c128;
+                                          if (input.substr(peg$currPos, 4) === peg$c129) {
+                                            s0 = peg$c129;
                                             peg$currPos += 4;
                                           } else {
                                             s0 = peg$FAILED;
                                             if (peg$silentFails === 0) {
-                                              peg$fail(peg$e132);
+                                              peg$fail(peg$e133);
                                             }
                                           }
                                           if (s0 === peg$FAILED) {
-                                            if (input.substr(peg$currPos, 6) === peg$c129) {
-                                              s0 = peg$c129;
+                                            if (input.substr(peg$currPos, 6) === peg$c130) {
+                                              s0 = peg$c130;
                                               peg$currPos += 6;
                                             } else {
                                               s0 = peg$FAILED;
                                               if (peg$silentFails === 0) {
-                                                peg$fail(peg$e133);
+                                                peg$fail(peg$e134);
                                               }
                                             }
                                             if (s0 === peg$FAILED) {
-                                              if (input.substr(peg$currPos, 5) === peg$c130) {
-                                                s0 = peg$c130;
+                                              if (input.substr(peg$currPos, 5) === peg$c131) {
+                                                s0 = peg$c131;
                                                 peg$currPos += 5;
                                               } else {
                                                 s0 = peg$FAILED;
                                                 if (peg$silentFails === 0) {
-                                                  peg$fail(peg$e134);
+                                                  peg$fail(peg$e135);
                                                 }
                                               }
                                               if (s0 === peg$FAILED) {
-                                                if (input.substr(peg$currPos, 6) === peg$c131) {
-                                                  s0 = peg$c131;
+                                                if (input.substr(peg$currPos, 6) === peg$c132) {
+                                                  s0 = peg$c132;
                                                   peg$currPos += 6;
                                                 } else {
                                                   s0 = peg$FAILED;
                                                   if (peg$silentFails === 0) {
-                                                    peg$fail(peg$e135);
+                                                    peg$fail(peg$e136);
                                                   }
                                                 }
                                               }
@@ -24752,13 +25078,125 @@ function peg$parse(input, options) {
     }
     return s0;
   }
+  function peg$parseHighlightColor() {
+    let s0;
+    if (input.substr(peg$currPos, 6) === peg$c124) {
+      s0 = peg$c124;
+      peg$currPos += 6;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e128);
+      }
+    }
+    if (s0 === peg$FAILED) {
+      if (input.substr(peg$currPos, 6) === peg$c132) {
+        s0 = peg$c132;
+        peg$currPos += 6;
+      } else {
+        s0 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e136);
+        }
+      }
+      if (s0 === peg$FAILED) {
+        if (input.substr(peg$currPos, 5) === peg$c118) {
+          s0 = peg$c118;
+          peg$currPos += 5;
+        } else {
+          s0 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e122);
+          }
+        }
+        if (s0 === peg$FAILED) {
+          if (input.substr(peg$currPos, 4) === peg$c112) {
+            s0 = peg$c112;
+            peg$currPos += 4;
+          } else {
+            s0 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e116);
+            }
+          }
+          if (s0 === peg$FAILED) {
+            if (input.substr(peg$currPos, 6) === peg$c126) {
+              s0 = peg$c126;
+              peg$currPos += 6;
+            } else {
+              s0 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e130);
+              }
+            }
+            if (s0 === peg$FAILED) {
+              if (input.substr(peg$currPos, 4) === peg$c125) {
+                s0 = peg$c125;
+                peg$currPos += 4;
+              } else {
+                s0 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                  peg$fail(peg$e129);
+                }
+              }
+              if (s0 === peg$FAILED) {
+                if (input.substr(peg$currPos, 5) === peg$c113) {
+                  s0 = peg$c113;
+                  peg$currPos += 5;
+                } else {
+                  s0 = peg$FAILED;
+                  if (peg$silentFails === 0) {
+                    peg$fail(peg$e117);
+                  }
+                }
+                if (s0 === peg$FAILED) {
+                  if (input.substr(peg$currPos, 5) === peg$c131) {
+                    s0 = peg$c131;
+                    peg$currPos += 5;
+                  } else {
+                    s0 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                      peg$fail(peg$e135);
+                    }
+                  }
+                  if (s0 === peg$FAILED) {
+                    if (input.substr(peg$currPos, 5) === peg$c111) {
+                      s0 = peg$c111;
+                      peg$currPos += 5;
+                    } else {
+                      s0 = peg$FAILED;
+                      if (peg$silentFails === 0) {
+                        peg$fail(peg$e115);
+                      }
+                    }
+                    if (s0 === peg$FAILED) {
+                      if (input.substr(peg$currPos, 4) === peg$c116) {
+                        s0 = peg$c116;
+                        peg$currPos += 4;
+                      } else {
+                        s0 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                          peg$fail(peg$e120);
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    return s0;
+  }
   function peg$parsebitmarkMinusMinus() {
     let s0, s1;
     peg$silentFails++;
     s0 = peg$currPos;
     s1 = peg$parsebitmarkMinusMinusString();
     peg$savedPos = s0;
-    s1 = peg$f91(s1);
+    s1 = peg$f92(s1);
     s0 = s1;
     peg$silentFails--;
     return s0;
@@ -24784,7 +25222,7 @@ function peg$parse(input, options) {
       }
     }
     peg$savedPos = s0;
-    s0 = peg$f92(s1, s2);
+    s0 = peg$f93(s1, s2);
     peg$silentFails--;
     return s0;
   }
@@ -24794,7 +25232,7 @@ function peg$parse(input, options) {
     s1 = peg$parseNL();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f93();
+      s1 = peg$f94();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -24923,7 +25361,7 @@ function peg$parse(input, options) {
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f94(s1);
+        s1 = peg$f95(s1);
       }
       s0 = s1;
     }
@@ -24932,12 +25370,12 @@ function peg$parse(input, options) {
   function peg$parseBoldHalfTag() {
     let s0;
     if (input.charCodeAt(peg$currPos) === 42) {
-      s0 = peg$c132;
+      s0 = peg$c133;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e136);
+        peg$fail(peg$e137);
       }
     }
     return s0;
@@ -24945,12 +25383,12 @@ function peg$parse(input, options) {
   function peg$parseItalicHalfTag() {
     let s0;
     if (input.charCodeAt(peg$currPos) === 95) {
-      s0 = peg$c133;
+      s0 = peg$c134;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e137);
+        peg$fail(peg$e138);
       }
     }
     return s0;
@@ -24958,12 +25396,12 @@ function peg$parse(input, options) {
   function peg$parseLightHalfTag() {
     let s0;
     if (input.charCodeAt(peg$currPos) === 96) {
-      s0 = peg$c134;
+      s0 = peg$c135;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e138);
+        peg$fail(peg$e139);
       }
     }
     return s0;
@@ -24971,12 +25409,12 @@ function peg$parse(input, options) {
   function peg$parseHighlightHalfTag() {
     let s0;
     if (input.charCodeAt(peg$currPos) === 33) {
-      s0 = peg$c135;
+      s0 = peg$c136;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e139);
+        peg$fail(peg$e140);
       }
     }
     return s0;
@@ -25059,13 +25497,13 @@ function peg$parse(input, options) {
   }
   function peg$parseBodyBitOpenTag() {
     let s0;
-    if (input.substr(peg$currPos, 2) === peg$c136) {
-      s0 = peg$c136;
+    if (input.substr(peg$currPos, 2) === peg$c137) {
+      s0 = peg$c137;
       peg$currPos += 2;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e140);
+        peg$fail(peg$e141);
       }
     }
     return s0;
@@ -25073,12 +25511,12 @@ function peg$parse(input, options) {
   function peg$parseBodyBitCloseTag() {
     let s0;
     if (input.charCodeAt(peg$currPos) === 93) {
-      s0 = peg$c137;
+      s0 = peg$c138;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e141);
+        peg$fail(peg$e142);
       }
     }
     return s0;
@@ -25124,7 +25562,7 @@ function peg$parse(input, options) {
         s3 = peg$parseBodyBitCloseTag();
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f95(s2);
+          s0 = peg$f96(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -25214,7 +25652,7 @@ function peg$parse(input, options) {
         s3 = peg$parseBoldTag();
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f96(s2);
+          s0 = peg$f97(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -25300,7 +25738,7 @@ function peg$parse(input, options) {
           s3 = peg$parseItalicTag();
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f97(s2);
+            s0 = peg$f98(s2);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -25386,7 +25824,7 @@ function peg$parse(input, options) {
             s3 = peg$parseLightTag();
             if (s3 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f98(s2);
+              s0 = peg$f99(s2);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -25472,7 +25910,7 @@ function peg$parse(input, options) {
               s3 = peg$parseHighlightTag();
               if (s3 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f99(s2);
+                s0 = peg$f100(s2);
               } else {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
@@ -25557,22 +25995,22 @@ function peg$parse(input, options) {
     let s0, s1;
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 10) {
-      s0 = peg$c138;
+      s0 = peg$c139;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e143);
+        peg$fail(peg$e144);
       }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c139) {
-        s0 = peg$c139;
+      if (input.substr(peg$currPos, 2) === peg$c140) {
+        s0 = peg$c140;
         peg$currPos += 2;
       } else {
         s0 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e144);
+          peg$fail(peg$e145);
         }
       }
       if (s0 === peg$FAILED) {
@@ -25582,7 +26020,7 @@ function peg$parse(input, options) {
         } else {
           s0 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e145);
+            peg$fail(peg$e146);
           }
         }
       }
@@ -25591,7 +26029,7 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e142);
+        peg$fail(peg$e143);
       }
     }
     return s0;
@@ -25604,7 +26042,7 @@ function peg$parse(input, options) {
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e146);
+        peg$fail(peg$e147);
       }
     }
     return s0;
@@ -25638,35 +26076,35 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4, s5, s6, s7, s8;
     s0 = peg$currPos;
     s1 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c140) {
-      s2 = peg$c140;
+    if (input.substr(peg$currPos, 4) === peg$c141) {
+      s2 = peg$c141;
       peg$currPos += 4;
     } else {
       s2 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e147);
+        peg$fail(peg$e148);
       }
     }
     if (s2 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 115) {
-        s3 = peg$c141;
+        s3 = peg$c142;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e148);
+          peg$fail(peg$e149);
         }
       }
       if (s3 === peg$FAILED) {
         s3 = null;
       }
-      if (input.substr(peg$currPos, 3) === peg$c142) {
-        s4 = peg$c142;
+      if (input.substr(peg$currPos, 3) === peg$c143) {
+        s4 = peg$c143;
         peg$currPos += 3;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e149);
+          peg$fail(peg$e150);
         }
       }
       if (s4 !== peg$FAILED) {
@@ -25744,35 +26182,35 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$currPos;
     s2 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c140) {
-      s3 = peg$c140;
+    if (input.substr(peg$currPos, 4) === peg$c141) {
+      s3 = peg$c141;
       peg$currPos += 4;
     } else {
       s3 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e147);
+        peg$fail(peg$e148);
       }
     }
     if (s3 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 115) {
-        s4 = peg$c141;
+        s4 = peg$c142;
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e148);
+          peg$fail(peg$e149);
         }
       }
       if (s4 === peg$FAILED) {
         s4 = null;
       }
-      if (input.substr(peg$currPos, 3) === peg$c142) {
-        s5 = peg$c142;
+      if (input.substr(peg$currPos, 3) === peg$c143) {
+        s5 = peg$c143;
         peg$currPos += 3;
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e149);
+          peg$fail(peg$e150);
         }
       }
       if (s5 !== peg$FAILED) {
@@ -25787,13 +26225,13 @@ function peg$parse(input, options) {
       s2 = peg$FAILED;
     }
     if (s2 === peg$FAILED) {
-      if (input.substr(peg$currPos, 7) === peg$c143) {
-        s2 = peg$c143;
+      if (input.substr(peg$currPos, 7) === peg$c144) {
+        s2 = peg$c144;
         peg$currPos += 7;
       } else {
         s2 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e150);
+          peg$fail(peg$e151);
         }
       }
     }
@@ -25858,7 +26296,7 @@ function peg$parse(input, options) {
       }
       s2 = input.substring(s2, peg$currPos);
       peg$savedPos = s0;
-      s0 = peg$f100(s1, s2);
+      s0 = peg$f101(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -25873,7 +26311,7 @@ function peg$parse(input, options) {
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e151);
+        peg$fail(peg$e152);
       }
     }
     return s0;
@@ -44217,6 +44655,8 @@ var ConfigBuilder = class {
           format = "bitmark";
         } else if (tag.format === TagFormat.number) {
           format = "number";
+        } else if (tag.format === TagFormat.coordinates) {
+          format = "coordinates";
         }
       } else if (tagType === BitTagConfigKeyType.resource) {
         format = "string";