@gmb/bitmark-parser-generator 4.13.0 → 4.14.0

package/dist/index.js

@@ -573,6 +573,7 @@ var BitType = superenum({
   surveyRatingOnce: "survey-rating-once",
   table: "table",
   tableAlt: "table-alt",
+  tableExtended: "table-extended",
   tableImage: "table-image",
   tableImageAlt: "table-image-alt",
   takePicture: "take-picture",
@@ -703,6 +704,7 @@ var CardSetConfigKey = superenum7({
   matchImagePairs: "matchImagePairs",
   matchMatrix: "matchMatrix",
   table: "table",
+  tableExtended: "tableExtended",
   pronunciationTable: "pronunciationTable",
   botActionResponses: "botActionResponses",
   exampleBitList: "exampleBitList",
@@ -1193,6 +1195,7 @@ var propertyKeys = {
   property_index: "@index",
   property_internalComment: "@internalComment",
   property_internalPrintPdf: "@internalPrintPdf",
+  property_hasPrintRestriction: "@hasPrintRestriction",
   property_isCaseSensitive: "@isCaseSensitive",
   property_isInfoOnly: "@isInfoOnly",
   property_isPublic: "@isPublic",
@@ -1316,6 +1319,10 @@ var propertyKeys = {
   property_tableSearch: "@tableSearch",
   property_tableSort: "@tableSort",
   property_tableWhitespaceNoWrap: "@tableWhitespaceNoWrap",
+  property_tableCellType: "@tableCellType",
+  property_tableRowSpan: "@tableRowSpan",
+  property_tableColSpan: "@tableColSpan",
+  property_tableScope: "@tableScope",
   property_tag: "@tag",
   property_target: "@target",
   property_technicalTerm: "@technicalTerm",
@@ -2398,6 +2405,47 @@ var CARDSETS = {
       ]
     ]
   },
+  [CardSetConfigKey.tableExtended]: {
+    variants: [
+      // Side 1
+      [
+        // Variant 1..N
+        {
+          tags: [
+            {
+              key: ConfigKey.group_standardItemLeadInstructionHint,
+              description: "Standard tags for lead, instruction, and hint."
+            },
+            {
+              key: ConfigKey.tag_title,
+              description: "Title of the table."
+            },
+            {
+              key: ConfigKey.property_tableCellType,
+              description: "Table cell type (th/td).",
+              format: TagFormat.plainText
+            },
+            {
+              key: ConfigKey.property_tableRowSpan,
+              description: "Number of rows the cell spans.",
+              format: TagFormat.number
+            },
+            {
+              key: ConfigKey.property_tableColSpan,
+              description: "Number of columns the cell spans.",
+              format: TagFormat.number
+            },
+            {
+              key: ConfigKey.property_tableScope,
+              description: "Scope attribute for header cells.",
+              format: TagFormat.plainText
+            }
+          ],
+          repeatCount: Count.infinity
+        }
+      ]
+    ]
+  },
   [CardSetConfigKey.pronunciationTable]: {
     variants: [
       // Side 1
@@ -3272,6 +3320,12 @@ var GROUPS = {
         key: ConfigKey.property_internalPrintPdf,
         description: "Url of the internal print PDF for the book",
         format: TagFormat.plainText
+      },
+      {
+        key: ConfigKey.property_hasPrintRestriction,
+        description: "If true, the book has print restrictions",
+        format: TagFormat.boolean,
+        defaultValue: "true"
       }
     ]
   },
@@ -8519,6 +8573,12 @@ var BITS = {
     ],
     cardSet: CardSetConfigKey.table
   },
+  [BitType.tableExtended]: {
+    since: "4.14.0",
+    baseBitType: BitType.table,
+    description: "Extended table bit, used to create complex tables with all HTML table features",
+    cardSet: CardSetConfigKey.tableExtended
+  },
   [BitType.tableAlt]: {
     since: "1.16.0",
     baseBitType: BitType.table,
@@ -9500,7 +9560,7 @@ var instance2 = new Config();
 // src/generated/package_info.ts
 var PACKAGE_INFO = {
   "name": "@gmb/bitmark-parser-generator",
-  "version": "4.13.0",
+  "version": "4.14.0",
   "author": "Get More Brain Ltd",
   "license": "ISC",
   "description": "A bitmark parser and generator using Peggy.js"
@@ -10001,6 +10061,7 @@ var NodeType = superenum20({
   durationValue: "durationValue",
   elements: "elements",
   elementsValue: "elementsValue",
+  elementsValueValue: "elementsValueValue",
   emphasis: "emphasis",
   end: "end",
   errors: "errors",
@@ -10029,6 +10090,7 @@ var NodeType = superenum20({
   focusY: "focusY",
   focusYValue: "focusYValue",
   footer: "footer",
+  footerValue: "footerValue",
   footerText: "footerText",
   forKeys: "forKeys",
   format: "format",
@@ -10051,11 +10113,13 @@ var NodeType = superenum20({
   hasBookNavigationValue: "hasBookNavigationValue",
   hasMarkAsDone: "hasMarkAsDone",
   hasMarkAsDoneValue: "hasMarkAsDoneValue",
+  head: "head",
   heading: "heading",
   height: "height",
   heightValue: "heightValue",
   highlight: "highlight",
   hint: "hint",
+  hintValue: "hintValue",
   href: "href",
   icon: "icon",
   iconTag: "iconTag",
@@ -10077,10 +10141,13 @@ var NodeType = superenum20({
   ingredients: "ingredients",
   ingredientsValue: "ingredientsValue",
   instruction: "instruction",
+  instructionValue: "instructionValue",
   internalComment: "internalComment",
   internalCommentValue: "internalCommentValue",
   internalPrintPdf: "internalPrintPdf",
   internalPrintPdfValue: "internalPrintPdfValue",
+  hasPrintRestriction: "hasPrintRestriction",
+  hasPrintRestrictionValue: "hasPrintRestrictionValue",
   isCaseSensitive: "isCaseSensitive",
   isCommented: "isCommented",
   isCorrect: "isCorrect",
@@ -10099,6 +10166,7 @@ var NodeType = superenum20({
   isTracked: "isTracked",
   isTrackedValue: "isTrackedValue",
   item: "item",
+  itemValue: "itemValue",
   itemLead: "itemLead",
   jobTitle: "jobTitle",
   jobTitleValue: "jobTitleValue",
@@ -10125,6 +10193,7 @@ var NodeType = superenum20({
   layerRoleValue: "layerRoleValue",
   layerValue: "layerValue",
   lead: "lead",
+  leadValue: "leadValue",
   level: "level",
   levelACTFL: "levelACTFL",
   levelACTFLValue: "levelACTFLValue",
@@ -10146,6 +10215,7 @@ var NodeType = superenum20({
   machineTranslatedValue: "machineTranslatedValue",
   mailingList: "mailingList",
   marginNumber: "marginNumber",
+  marginNumberValue: "marginNumberValue",
   mark: "mark",
   markConfig: "markConfig",
   markConfigValue: "markConfigValue",
@@ -10174,6 +10244,7 @@ var NodeType = superenum20({
   pageNo: "pageNo",
   pageNoValue: "pageNoValue",
   pageNumber: "pageNumber",
+  pageNumberValue: "pageNumberValue",
   pageValue: "pageValue",
   pairs: "pairs",
   pairsValue: "pairsValue",
@@ -10257,6 +10328,7 @@ var NodeType = superenum20({
   publisherValue: "publisherValue",
   quantity: "quantity",
   question: "question",
+  questionValue: "questionValue",
   questions: "questions",
   questionsValue: "questionsValue",
   quizCountItems: "quizCountItems",
@@ -10309,6 +10381,10 @@ var NodeType = superenum20({
   revealSolutions: "revealSolutions",
   root: "root",
   // bit type (root)
+  rows: "rows",
+  rowsValue: "rowsValue",
+  rubric: "rubric",
+  rubricValue: "rubricValue",
   sampleSolution: "sampleSolution",
   sampleSolutionValue: "sampleSolutionValue",
   scormSource: "scormSource",
@@ -10914,6 +10990,103 @@ var DeprecatedTextFormat = superenum23({
   // bitmark-- text format, deprecated
 });
 
+// src/parser/json/TableUtils.ts
+function isTableBasicFormat(table) {
+  const t = table;
+  return !!(t.columns || t.data) && !(t.head || t.body || t.foot);
+}
+function isTableExtendedFormat(table) {
+  const t = table;
+  return !!(t.head || t.body || t.foot);
+}
+function isMixedTableFormat(table) {
+  const t = table;
+  const hasOld = !!(t.columns || t.data);
+  const hasNew = !!(t.head || t.body || t.foot);
+  return hasOld && hasNew;
+}
+function convertBasicToExtendedTableFormat(table) {
+  const tableExtended = {};
+  if (table.columns && table.columns.length > 0) {
+    tableExtended.head = {
+      rows: [
+        {
+          cells: table.columns.map((col) => ({
+            content: col,
+            title: true
+          }))
+        }
+      ]
+    };
+  }
+  if (table.data && table.data.length > 0) {
+    tableExtended.body = {
+      rows: table.data.map((row) => ({
+        cells: row.map((cell) => ({
+          content: cell
+        }))
+      }))
+    };
+  }
+  return tableExtended;
+}
+function convertExtendedToBasicTableFormat(tableExtended) {
+  const table = {};
+  const extractRowCells = (row) => {
+    if (!row || !Array.isArray(row.cells)) {
+      return [];
+    }
+    return row.cells.map((cell) => cell?.content).filter((content) => content !== void 0);
+  };
+  const dataRows = [];
+  const headRows = tableExtended.head?.rows ?? [];
+  if (headRows.length > 0) {
+    const primaryHeader = extractRowCells(headRows[0]);
+    if (primaryHeader.length > 0) {
+      table.columns = primaryHeader;
+    }
+    const remainingHeadRows = headRows.slice(1);
+    remainingHeadRows.forEach((row) => {
+      const cells = extractRowCells(row);
+      if (cells.length > 0) {
+        dataRows.push(cells);
+      }
+    });
+  }
+  const appendSectionRows = (section) => {
+    if (!section || !Array.isArray(section.rows)) {
+      return;
+    }
+    section.rows.forEach((row) => {
+      const cells = extractRowCells(row);
+      if (cells.length > 0) {
+        dataRows.push(cells);
+      }
+    });
+  };
+  appendSectionRows(tableExtended.body);
+  appendSectionRows(tableExtended.foot);
+  if (dataRows.length > 0) {
+    table.data = dataRows;
+  }
+  return table;
+}
+function normalizeTableFormat(bitType, table) {
+  if (isMixedTableFormat(table)) {
+    const t = table;
+    delete t.columns;
+    delete t.data;
+  }
+  const isExtended = instance2.isOfBitType(bitType, BitType.tableExtended);
+  if (isExtended && isTableBasicFormat(table)) {
+    return convertBasicToExtendedTableFormat(table);
+  }
+  if (!isExtended && isTableExtendedFormat(table)) {
+    return convertExtendedToBasicTableFormat(table);
+  }
+  return table;
+}
+
 // src/utils/ArrayUtils.ts
 var ArrayUtils = class {
   /**
@@ -22707,6 +22880,7 @@ var Builder = class extends BaseBuilder {
    * @returns
    */
   buildBit(data, options) {
+    data = structuredClone(data);
     const bitType = data.bitType;
     const bitConfig = instance2.getBitConfig(bitType);
     const deprecatedTextFormat = DeprecatedTextFormat.fromValue(data.textFormat);
@@ -23375,6 +23549,12 @@ var Builder = class extends BaseBuilder {
         data.internalPrintPdf,
         options
       ),
+      hasPrintRestriction: this.toAstProperty(
+        bitType,
+        ConfigKey.property_hasPrintRestriction,
+        data.hasPrintRestriction,
+        options
+      ),
       tocResource: this.toAstProperty(
         bitType,
         ConfigKey.property_tocResource,
@@ -24144,21 +24324,53 @@ var Builder = class extends BaseBuilder {
     return node;
   }
   /**
-   * Build table node
+   * Build table / table extended node
    *
    * @param data - data for the node
    * @returns
    */
   buildTable(context, dataIn) {
     if (!dataIn) return void 0;
-    const node = {
-      columns: (dataIn.columns || []).map(
+    const node = normalizeTableFormat(context.bitType, dataIn);
+    const nodeTable = node;
+    const nodeTableExtended = node;
+    if (Array.isArray(nodeTable.columns) && nodeTable.columns.length > 0) {
+      nodeTable.columns = nodeTable.columns.map(
         (col) => this.handleJsonText(context, TextLocation.tag, col)
-      ),
-      data: (dataIn.data || []).map(
+      );
+    }
+    if (Array.isArray(nodeTable.data) && nodeTable.data.length > 0) {
+      nodeTable.data = nodeTable.data.map(
         (row) => (row || []).map((cell) => this.handleJsonText(context, TextLocation.tag, cell))
-      )
+      );
+    }
+    const buildSection = (section) => {
+      if (!section || !Array.isArray(section.rows)) return void 0;
+      const rows = section.rows.map((row) => {
+        const cells = (row.cells || []).map((cell) => {
+          const tableCell = {
+            content: this.handleJsonText(context, TextLocation.tag, cell.content)
+          };
+          if (cell.title != null) tableCell.title = cell.title;
+          if (cell.rowspan != null) tableCell.rowspan = cell.rowspan;
+          if (cell.colspan != null) tableCell.colspan = cell.colspan;
+          if (cell.scope) tableCell.scope = cell.scope;
+          return tableCell;
+        });
+        return {
+          cells
+        };
+      });
+      return {
+        rows
+      };
     };
+    const head = buildSection(nodeTableExtended.head);
+    if (head && head.rows?.length > 0) nodeTableExtended.head = head;
+    const body = buildSection(nodeTableExtended.body);
+    if (body && body.rows?.length > 0) nodeTableExtended.body = body;
+    const foot = buildSection(nodeTableExtended.foot);
+    if (foot && foot.rows?.length > 0) nodeTableExtended.foot = foot;
     return node;
   }
   /**
@@ -24182,7 +24394,7 @@ var Builder = class extends BaseBuilder {
     if (!data) return void 0;
     const defaultExample = data.__sampleSolutionAst;
     const node = {
-      question: data.question ?? "",
+      question: this.handleJsonText(context, TextLocation.body, data.question),
       partialAnswer: data.partialAnswer ?? "",
       sampleSolution: data.sampleSolution ?? "",
       additionalSolutions: data.additionalSolutions ?? void 0,
@@ -24196,9 +24408,9 @@ var Builder = class extends BaseBuilder {
     };
     objectUtils.removeUnwantedProperties(node, {
       ignoreAllFalse: true,
-      ignoreEmptyArrays: ["item", "hint", "instruction"],
+      ignoreEmptyArrays: ["question", "item", "hint", "instruction"],
       ignoreUndefined: ["example"],
-      ignoreEmptyString: ["question", "partialAnswer", "sampleSolution"]
+      ignoreEmptyString: ["partialAnswer", "sampleSolution"]
     });
     return node;
   }
@@ -24736,7 +24948,7 @@ var Builder = class extends BaseBuilder {
   buildStatement(context, data) {
     if (!data) return void 0;
     const node = {
-      statement: data.statement ?? "",
+      statement: this.handleJsonText(context, TextLocation.tag, data.statement),
       isCorrect: !!data.isCorrect,
       item: this.handleJsonText(context, TextLocation.tag, data.item),
       lead: this.handleJsonText(context, TextLocation.tag, data.lead),
@@ -24746,7 +24958,7 @@ var Builder = class extends BaseBuilder {
     };
     objectUtils.removeUnwantedProperties(node, {
       ignoreAllFalse: true,
-      // ignoreAllEmptyArrays: true,
+      ignoreEmptyArrays: ["statement"],
       ignoreUndefined: ["example"]
     });
     return node;
@@ -24958,7 +25170,7 @@ var Builder = class extends BaseBuilder {
     const node = {
       heading: this.buildHeading(context, data.heading),
       questions: this.buildQuestions(context, data.questions),
-      elements: data.elements,
+      elements: this.handleJsonText(context, TextLocation.body, data.elements),
       flashcards: this.buildFlashcards(context, data.flashcards),
       definitions: this.buildDefinitionList(context, data.definitions ?? data.legend),
       statement: this.buildStatement(context, data.statement),
@@ -24977,7 +25189,9 @@ var Builder = class extends BaseBuilder {
       // captionDefinitionList: this.buildCaptionDefinitionList(context, data.captionDefinitionList),
       cardBits: this.buildCardBits(context, data.cardBits)
     };
-    objectUtils.removeUnwantedProperties(node);
+    objectUtils.removeUnwantedProperties(node, {
+      ignoreEmptyObjects: ["table"]
+    });
     return Object.keys(node).length > 0 ? node : void 0;
   }
   /**
@@ -25481,6 +25695,7 @@ var BitmarkGenerator = class extends AstWalkerGenerator {
     __publicField(this, "hasCardSet", false);
     __publicField(this, "hasFooter", false);
     __publicField(this, "inTag", true);
+    __publicField(this, "skipTableTraversal", false);
     this.enter = this.enter.bind(this);
     this.between = this.between.bind(this);
     this.exit = this.exit.bind(this);
@@ -26183,7 +26398,7 @@ var BitmarkGenerator = class extends AstWalkerGenerator {
   enter_elements(_node, _route) {
   }
   between_elements(_node, _left, _right, _route) {
-    this.writeCardSetVariantDivider();
+    this.writeCardSetSideDivider();
   }
   // bitmarkAst -> bits -> bitsValue -> cardNode -> flashcards
   between_flashcards(_node, _left, _right, _route) {
@@ -26310,6 +26525,7 @@ var BitmarkGenerator = class extends AstWalkerGenerator {
   enter_matrix(_node, _route) {
   }
   between_matrix(_node, _left, _right, _route) {
+    if (!this.isCardAllowed) return;
     this.writeCardSetCardDivider();
   }
   // bitmarkAst -> bits -> bitsValue -> cardNode -> pairs -> pairsValue -> values
@@ -26330,12 +26546,83 @@ var BitmarkGenerator = class extends AstWalkerGenerator {
     this.writeCardSetCardDivider();
   }
   // bitmarkAst -> bits -> bitsValue -> cardNode -> table
+  enter_table(node, route) {
+    const parent = this.getParentNode(route);
+    if (parent?.key !== NodeType.cardNode) return true;
+    const table = node.value;
+    if (!table) return true;
+    if (this.writeAdvancedTable(table)) {
+      return false;
+    }
+    return true;
+  }
   between_table(_node, _left, _right, route) {
     const parent = this.getParentNode(route);
     if (parent?.key !== NodeType.cardNode) return;
     if (!this.isCardAllowed) return;
     this.writeCardSetCardDivider();
   }
+  writeAdvancedTable(table) {
+    const normalized = normalizeTableFormat(BitType.tableExtended, table);
+    const sections = [
+      { key: "thead", qualifier: "thead", section: normalized.head },
+      { key: "tbody", qualifier: void 0, section: normalized.body },
+      { key: "tfoot", qualifier: "tfoot", section: normalized.foot }
+    ];
+    let rowCount = 0;
+    for (const { key, qualifier, section } of sections) {
+      const rows = section?.rows ?? [];
+      if (rows.length === 0) {
+        continue;
+      }
+      for (const row of rows) {
+        this.writeCardSetCardDivider(qualifier);
+        this.writeTableRow(row, key);
+        rowCount++;
+      }
+    }
+    return rowCount > 0;
+  }
+  writeTableRow(row, section) {
+    const cells = row?.cells ?? [];
+    if (cells.length === 0) return;
+    for (let index = 0; index < cells.length; index++) {
+      if (index > 0) {
+        this.writeCardSetSideDivider();
+      }
+      this.writeNL();
+      this.writeTableCell(cells[index], section);
+    }
+  }
+  writeTableCell(cell, section) {
+    const defaultCellType = section === "tbody" ? "td" : "th";
+    const cellType = cell.title ? "th" : "td";
+    if (cellType !== defaultCellType) {
+      this.writeTableCellProperty("tableCellType", cellType);
+      this.writeNL();
+    }
+    if (cell.rowspan && cell.rowspan > 1) {
+      this.writeTableCellProperty("tableRowSpan", cell.rowspan);
+      this.writeNL();
+    }
+    if (cell.colspan && cell.colspan > 1) {
+      this.writeTableCellProperty("tableColSpan", cell.colspan);
+      this.writeNL();
+    }
+    if (cell.scope) {
+      this.writeTableCellProperty("tableScope", cell.scope);
+      this.writeNL();
+    }
+    const content = cell.content ?? instance3.EMPTY_STRING;
+    this.writeTextOrValue(content, this.textFormat, TextLocation.body);
+  }
+  writeTableCellProperty(name, value) {
+    this.writeOPA();
+    this.writeTagKey(name);
+    this.writeColon();
+    this.writeTextOrValue(`${value}`, TextFormat.plainText, TextLocation.tag);
+    this.writeCL();
+  }
   // bitmarkAst -> bits -> bitsValue -> cardNode -> table -> data
   // bitmarkAst -> bits -> bitsValue -> cardNode -> pronunciationTable -> data
   between_data(_node, _left, _right, route) {
@@ -26857,8 +27144,8 @@ var BitmarkGenerator = class extends AstWalkerGenerator {
     } else {
     }
   }
-  // bitmarkAst -> bits -> bitsValue -> elements -> elementsValue
-  leaf_elementsValue(node, _route) {
+  // bitmarkAst -> bits -> bitsValue -> cardNode -> elements -> elementsValue
+  enter_elementsValue(node, _route) {
     if (node.value) {
       this.writeNL();
       this.writeTextOrValue(node.value, this.textFormat, TextLocation.body);
@@ -26941,10 +27228,19 @@ var BitmarkGenerator = class extends AstWalkerGenerator {
     }
   }
   // bitmarkAst -> bits -> bitsValue -> questions -> questionsValue -> question
+  // bitmarkAst -> bits -> bitsValue -> cardNode -> questions -> questionsValue -> question
+  enter_question(node, route) {
+    const parent = this.getParentNode(route);
+    if (parent?.key !== NodeType.questionsValue) return;
+    if (node.value) {
+      this.writeNL();
+      this.writeTextOrValue(node.value, this.textFormat, TextLocation.body);
+    }
+  }
   // bitmarkAst -> bits -> bitsValue -> cardNode -> flashcards -> flashcardsValue -> question
   leaf_question(node, route) {
     const parent = this.getParentNode(route);
-    if (parent?.key !== NodeType.questionsValue && parent?.key !== NodeType.flashcardsValue) return;
+    if (parent?.key !== NodeType.flashcardsValue) return;
     if (node.value) {
       this.writeNL();
       this.writeTextOrValue(node.value, this.textFormat, TextLocation.body);
@@ -27420,12 +27716,12 @@ var BitmarkGenerator = class extends AstWalkerGenerator {
     } else {
     }
   }
-  writeCardSetCardDivider() {
+  writeCardSetCardDivider(qualifier) {
     this.writeNL();
-    if (this.options.cardSetVersion === CardSetVersion.v1) {
-      this.write("===");
-    } else {
-      this.write("====");
+    const divider = this.getCardDividerMarker();
+    this.write(divider);
+    if (qualifier) {
+      this.appendCardDividerQualifier(qualifier);
     }
   }
   writeCardSetSideDivider() {
@@ -27444,6 +27740,20 @@ var BitmarkGenerator = class extends AstWalkerGenerator {
       this.write("++");
     }
   }
+  getCardDividerMarker() {
+    return this.options.cardSetVersion === CardSetVersion.v1 ? "===" : "====";
+  }
+  appendCardDividerQualifier(qualifier) {
+    const marker = this.getCardDividerMarker();
+    const normalizedQualifier = instance3.breakscape(qualifier, {
+      format: TextFormat.plainText,
+      location: TextLocation.tag
+    });
+    this.write(" ");
+    this.write(normalizedQualifier);
+    this.write(" ");
+    this.write(marker);
+  }
   writeNL_IfNotChain(route) {
     if (!this.isChain(route)) {
       this.writeNL();
@@ -27548,7 +27858,10 @@ var BitmarkGenerator = class extends AstWalkerGenerator {
     return !!writeFormat;
   }
   calculateIsCardAllowed() {
-    return this.isBodyBitmarkText && !this.isOfBitType1();
+    return this.isBodyBitmarkText && !this.isOfBitType1() && !this.isTableBitType();
+  }
+  isTableBitType() {
+    return this.isOfBitType([BitType.table]);
   }
   isOfBitType1() {
     return this.isOfBitType([
@@ -28065,7 +28378,7 @@ var JsonGenerator = class extends AstWalkerGenerator {
     const parent = this.getParentNode(route);
     if (parent?.key !== NodeType.cardNode) return;
     if (statement) {
-      this.bitJson.statement = statement.statement ?? "";
+      this.bitJson.statement = statement.statement ?? [];
       this.bitJson.isCorrect = statement.isCorrect ?? false;
       this.bitJson.example = statement.example;
       this.bitJson.isExample = statement.isExample;
@@ -28687,6 +29000,9 @@ var JsonGenerator = class extends AstWalkerGenerator {
         if (bitJson.footer == null) bitJson.footer = this.textDefault;
         if (bitJson.questions == null) bitJson.questions = [];
       }
+      if (instance2.isOfBitType(bitType, BitType.sequence)) {
+        if (bitJson.elements == null) bitJson.elements = [];
+      }
       if (bitType === BitType.matchMatrix) {
         isTopLevelExample = true;
       }
@@ -28747,6 +29063,7 @@ var JsonGenerator = class extends AstWalkerGenerator {
       }
       if (instance2.isOfBitType(bitType, BitType.book)) {
         if (bitJson.maxTocChapterLevel == null) bitJson.maxTocChapterLevel = -1;
+        if (bitJson.hasPrintRestriction == null) bitJson.hasPrintRestriction = true;
         if (bitJson.hasMarkAsDone == null) bitJson.hasMarkAsDone = false;
         if (bitJson.processHandIn == null) bitJson.processHandIn = false;
         if (bitJson.isPublic == null) bitJson.isPublic = false;
@@ -29404,6 +29721,9 @@ var BitmarkPegParserHelper = class {
     __publicField(this, "cardIndex", 0);
     __publicField(this, "cardSideIndex", 0);
     __publicField(this, "cardVariantIndex", 0);
+    __publicField(this, "currentCardQualifier");
+    __publicField(this, "currentSideQualifier");
+    __publicField(this, "currentVariantQualifier");
     __publicField(this, "parse");
     __publicField(this, "parserText");
     __publicField(this, "parserLocation");
@@ -29572,30 +29892,43 @@ var BitmarkPegParserHelper = class {
           cardIndex,
           cardSideIndex,
           cardVariantIndex: cardContentIndex,
-          value: value2
+          value: value2,
+          cardQualifier,
+          cardSideQualifier,
+          cardVariantQualifier
         } = cardData;
         let card = unparsedCardSet.cards[cardIndex];
         if (!card) {
           card = {
-            sides: []
+            sides: [],
+            qualifier: cardQualifier
           };
           unparsedCardSet.cards[cardIndex] = card;
+        } else if (cardQualifier && !card.qualifier) {
+          card.qualifier = cardQualifier;
         }
         let side = card.sides[cardSideIndex];
         if (!side) {
           side = {
-            variants: []
+            variants: [],
+            qualifier: cardSideQualifier
           };
           card.sides[cardSideIndex] = side;
+        } else if (cardSideQualifier && !side.qualifier) {
+          side.qualifier = cardSideQualifier;
         }
         const variant = side.variants[cardContentIndex];
         if (!variant) {
           side.variants[cardContentIndex] = {
             value: value2,
-            parser: parser3
+            parser: parser3,
+            qualifier: cardVariantQualifier
           };
         } else {
           side.variants[cardContentIndex].value += value2;
+          if (cardVariantQualifier && !variant.qualifier) {
+            variant.qualifier = cardVariantQualifier;
+          }
         }
       }
       unparsedCardSet.cards = unparsedCardSet.cards.filter((card) => {
@@ -29608,12 +29941,14 @@ var BitmarkPegParserHelper = class {
       });
       for (const unparsedCard of unparsedCardSet.cards) {
         const card = {
-          sides: []
+          sides: [],
+          qualifier: unparsedCard.qualifier
         };
         cardSet.cards.push(card);
         for (const unparsedSide of unparsedCard.sides) {
           const side = {
-            variants: []
+            variants: [],
+            qualifier: unparsedSide.qualifier
           };
           card.sides.push(side);
           for (const unparsedContent of unparsedSide.variants) {
@@ -29638,7 +29973,8 @@ var BitmarkPegParserHelper = class {
             if (DEBUG_TRACE_CARD_PARSED) this.debugPrint("parsedCardContent", content);
             side.variants.push({
               parser: parser2,
-              content
+              content,
+              qualifier: unparsedContent.qualifier
             });
           }
         }
@@ -29658,12 +29994,18 @@ var BitmarkPegParserHelper = class {
     this.cardIndex = -1;
     this.cardSideIndex = 0;
     this.cardVariantIndex = 0;
+    this.currentCardQualifier = void 0;
+    this.currentSideQualifier = void 0;
+    this.currentVariantQualifier = void 0;
   }
   handleCardSetEnd() {
     if (DEBUG_TRACE_CARD_SET_END) this.debugPrint("CardSetEnd");
     this.cardIndex = 0;
     this.cardSideIndex = 0;
     this.cardVariantIndex = 0;
+    this.currentCardQualifier = void 0;
+    this.currentSideQualifier = void 0;
+    this.currentVariantQualifier = void 0;
   }
   handleCards(value) {
     return value;
@@ -29673,27 +30015,45 @@ var BitmarkPegParserHelper = class {
     let isCardDivider = false;
     let isSideDivider = false;
     let isVariantDivider = false;
+    let qualifier;
     if (Array.isArray(value) && value.length === 2) {
-      value = value[0];
-      if (version === CardSetVersion.v1) {
-        isCardDivider = value === CARD_DIVIDER_V1;
-        isSideDivider = value === CARD_SIDE_DIVIDER_V1;
-        isVariantDivider = value === CARD_VARIANT_DIVIDER_V1;
+      const [divider, maybeQualifier] = value;
+      if (typeof divider === "string") {
+        value = divider;
+        if (typeof maybeQualifier === "string" && maybeQualifier.trim() === maybeQualifier && maybeQualifier.length > 0) {
+          qualifier = maybeQualifier;
+        }
       } else {
-        isCardDivider = value === CARD_DIVIDER_V2;
-        isSideDivider = value === CARD_SIDE_DIVIDER_V2;
-        isVariantDivider = value === CARD_VARIANT_DIVIDER_V2;
+        value = divider;
       }
+    } else if (Array.isArray(value) && value.length === 1) {
+      const [divider] = value;
+      value = divider;
+    }
+    if (version === CardSetVersion.v1) {
+      isCardDivider = value === CARD_DIVIDER_V1;
+      isSideDivider = value === CARD_SIDE_DIVIDER_V1;
+      isVariantDivider = value === CARD_VARIANT_DIVIDER_V1;
+    } else {
+      isCardDivider = value === CARD_DIVIDER_V2;
+      isSideDivider = value === CARD_SIDE_DIVIDER_V2;
+      isVariantDivider = value === CARD_VARIANT_DIVIDER_V2;
     }
     if (isCardDivider) {
       this.cardIndex++;
       this.cardSideIndex = 0;
       this.cardVariantIndex = 0;
+      this.currentCardQualifier = qualifier;
+      this.currentSideQualifier = void 0;
+      this.currentVariantQualifier = void 0;
     } else if (isSideDivider) {
       this.cardSideIndex++;
       this.cardVariantIndex = 0;
+      this.currentSideQualifier = qualifier;
+      this.currentVariantQualifier = void 0;
     } else if (isVariantDivider) {
       this.cardVariantIndex++;
+      this.currentVariantQualifier = qualifier;
     }
     if (this.isType(value, TypeKey.Card)) return value;
     return {
@@ -29702,7 +30062,10 @@ var BitmarkPegParserHelper = class {
         cardIndex: this.cardIndex,
         cardSideIndex: this.cardSideIndex,
         cardVariantIndex: this.cardVariantIndex,
-        value: ""
+        value: "",
+        cardQualifier: this.currentCardQualifier,
+        cardSideQualifier: this.currentSideQualifier,
+        cardVariantQualifier: this.currentVariantQualifier
       },
       parser: {
         text: this.parserText(),
@@ -29723,7 +30086,10 @@ var BitmarkPegParserHelper = class {
         cardIndex: this.cardIndex,
         cardSideIndex: this.cardSideIndex,
         cardVariantIndex: this.cardVariantIndex,
-        value
+        value,
+        cardQualifier: this.currentCardQualifier,
+        cardSideQualifier: this.currentSideQualifier,
+        cardVariantQualifier: this.currentVariantQualifier
       },
       parser: {
         text: this.parserText(),
@@ -30820,6 +31186,7 @@ function buildCards(context, bitType, textFormat, parsedCardSet, statementV1, st
       result = parsePronunciationTable(context, bitType, processedCardSet);
       break;
     case CardSetConfigKey.table:
+    case CardSetConfigKey.tableExtended:
       result = parseTable(context, bitType, processedCardSet);
       break;
     case CardSetConfigKey.botActionResponses:
@@ -30856,20 +31223,23 @@ function processCardSet(context, parsedCardSet) {
   for (const card of parsedCardSet.cards) {
     const processedCard = {
       no: cardNo++,
-      sides: []
+      sides: [],
+      qualifier: card.qualifier
     };
     processedCardSet.cards.push(processedCard);
     for (const side of card.sides) {
       const processedSide = {
         no: sideNo++,
-        variants: []
+        variants: [],
+        qualifier: side.qualifier
       };
       processedCard.sides.push(processedSide);
       for (const variant of side.variants) {
         const { parser: parser2, content } = variant;
         const processedVariant = {
           parser: parser2,
-          no: variantNo++
+          no: variantNo++,
+          qualifier: variant.qualifier
         };
         processedSide.variants.push(processedVariant);
         const tagsConfig = instance2.getTagsConfigForCardSet(bitType, sideNo, variantNo);
@@ -30983,7 +31353,8 @@ function parseElements(_context, _bitType, cardSet) {
     for (const side of card.sides) {
       for (const content of side.variants) {
         const tags2 = content.data;
-        elements.push(tags2.cardBodyStr ?? "");
+        const element = tags2.cardBody?.body ?? tags2.cardBodyStr ?? instance3.EMPTY_STRING;
+        elements.push(element);
       }
     }
   }
@@ -31000,7 +31371,7 @@ function parseStatements(_context, _bitType, cardSet, statementV1, statementsV1)
         if (Array.isArray(chainedStatements)) {
           for (const s of chainedStatements) {
             const statement = {
-              statement: s.statement ?? "",
+              statement: s.statement ?? [],
               isCorrect: s.isCorrect,
               item: s.item,
               lead: s.lead,
@@ -31142,7 +31513,7 @@ function parseQuestions(_context, _bitType, cardSet) {
       for (const content of side.variants) {
         const tags2 = content.data;
         const q = {
-          question: tags2.cardBodyStr ?? "",
+          question: tags2.cardBody?.body ?? tags2.cardBodyStr ?? instance3.EMPTY_STRING,
           ...tags2
         };
         if (q) questions.push(q);
@@ -31346,37 +31717,158 @@ function parsePronunciationTable(_context, _bitType, cardSet) {
   };
   return { pronunciationTable: table };
 }
-function parseTable(_context, _bitType, cardSet) {
-  let isHeading = false;
-  const columns = [];
-  const rows = [];
-  let rowValues = [];
+function parseTable(context, _bitType, cardSet) {
+  const sectionRows = {
+    thead: [],
+    tbody: [],
+    tfoot: []
+  };
+  const getNormalizedQualifier = (rawQualifier) => {
+    if (!rawQualifier) return void 0;
+    const normalized = rawQualifier.trim().toLowerCase();
+    if (normalized === "thead" || normalized === "tbody" || normalized === "tfoot") {
+      return normalized;
+    }
+    context.addWarning(`Unknown table section qualifier '${rawQualifier}', defaulting to tbody.`);
+    return void 0;
+  };
+  const isLegacyHeadingRow = (card, cardIndex) => {
+    if (cardIndex !== 0) return false;
+    return card.sides.some(
+      (side) => side.variants.some((variant) => {
+        const titles = variant.data.title;
+        return Array.isArray(titles) && titles[1]?.titleAst;
+      })
+    );
+  };
+  const readExtraProperty = (extra, key) => {
+    if (!extra) return void 0;
+    const value = extra[key];
+    return Array.isArray(value) ? value[0] : value;
+  };
+  const cleanupExtraProperties = (tags2, keys) => {
+    const extra = tags2.extraProperties;
+    if (!extra) return;
+    for (const key of keys) {
+      if (Object.prototype.hasOwnProperty.call(extra, key)) delete extra[key];
+    }
+    if (Object.keys(extra).length === 0) {
+      delete tags2.extraProperties;
+    }
+  };
+  const normalizeCellType = (raw, section) => {
+    if (typeof raw === "string") {
+      const normalized = raw.trim().toLowerCase();
+      if (normalized === "th" || normalized === "td") {
+        return normalized;
+      }
+      context.addWarning(
+        `Invalid table cell type '${raw}', using default for section '${section}'.`
+      );
+    }
+    return section === "tbody" ? "td" : "th";
+  };
+  const normalizeSpan = (raw, kind) => {
+    if (raw == null) return 1;
+    const numeric = instance6.asNumber(raw);
+    if (numeric == null || !Number.isInteger(numeric) || numeric < 1) {
+      context.addWarning(`Invalid table ${kind} '${raw}', defaulting to 1.`);
+      return 1;
+    }
+    return numeric;
+  };
+  const normalizeScope = (raw) => {
+    if (raw == null) return void 0;
+    if (typeof raw !== "string") {
+      context.addWarning(`Invalid table scope '${raw}', ignoring.`);
+      return void 0;
+    }
+    const normalized = raw.trim().toLowerCase();
+    switch (normalized) {
+      case "row":
+      case "col":
+      case "rowgroup":
+      case "colgroup":
+        return normalized;
+      default:
+        context.addWarning(`Invalid table scope '${raw}', ignoring.`);
+        return void 0;
+    }
+  };
+  const buildCell = (variant, section) => {
+    const tags2 = variant.data;
+    const heading = tags2.title && tags2.title[1]?.titleAst;
+    const bodyContent = tags2.cardBody?.body ?? tags2.cardBodyStr ?? instance3.EMPTY_STRING;
+    const content = heading ?? bodyContent;
+    const cellTypeRaw = tags2.tableCellType ?? readExtraProperty(tags2.extraProperties, "tableCellType");
+    const rowSpanRaw = tags2.tableRowSpan ?? readExtraProperty(tags2.extraProperties, "tableRowSpan");
+    const colSpanRaw = tags2.tableColSpan ?? readExtraProperty(tags2.extraProperties, "tableColSpan");
+    const scopeRaw = tags2.tableScope ?? readExtraProperty(tags2.extraProperties, "tableScope");
+    cleanupExtraProperties(tags2, ["tableCellType", "tableRowSpan", "tableColSpan", "tableScope"]);
+    const cellType = normalizeCellType(cellTypeRaw, section);
+    const rowspan = normalizeSpan(rowSpanRaw, "rowspan");
+    const colspan = normalizeSpan(colSpanRaw, "colspan");
+    const scope = normalizeScope(scopeRaw);
+    const cell = {
+      content
+    };
+    if (cellType === "th") cell.title = true;
+    if (rowspan > 1) cell.rowspan = rowspan;
+    if (colspan > 1) cell.colspan = colspan;
+    if (scope) cell.scope = scope;
+    return cell;
+  };
+  const resolveSectionQualifier = (card) => {
+    const cardQualifier = getNormalizedQualifier(card.qualifier);
+    if (cardQualifier) return cardQualifier;
+    for (const side of card.sides) {
+      const sideQualifier = getNormalizedQualifier(side.qualifier);
+      if (sideQualifier) return sideQualifier;
+      for (const variant of side.variants) {
+        const variantQualifier = getNormalizedQualifier(variant.qualifier);
+        if (variantQualifier) return variantQualifier;
+      }
+    }
+    return void 0;
+  };
   for (let cardIdx = 0; cardIdx < cardSet.cards.length; cardIdx++) {
     const card = cardSet.cards[cardIdx];
-    isHeading = false;
-    rowValues = [];
+    const qualifier = resolveSectionQualifier(card);
+    const section = qualifier ? qualifier : isLegacyHeadingRow(card, cardIdx) ? "thead" : "tbody";
+    const cells = [];
     for (const side of card.sides) {
-      for (const content of side.variants) {
-        const tags2 = content.data;
-        const { title, cardBody } = tags2;
-        const heading = title && title[1].titleAst;
-        if (cardIdx === 0 && heading != null) isHeading = true;
-        if (isHeading) {
-          columns.push(heading ?? []);
-        } else {
-          const value = cardBody?.body ?? [];
-          rowValues.push(value);
-        }
+      for (const variant of side.variants) {
+        cells.push(buildCell(variant, section));
       }
     }
-    if (!isHeading) {
-      rows.push(rowValues);
-    }
+    sectionRows[section].push({
+      cells
+    });
+  }
+  const table = {};
+  const hasHeadRows = sectionRows.thead.length > 0;
+  const hasBodyRows = sectionRows.tbody.length > 0;
+  const hasFootRows = sectionRows.tfoot.length > 0;
+  if (hasHeadRows) {
+    table.head = {
+      rows: sectionRows.thead
+    };
+  }
+  if (hasBodyRows) {
+    table.body = {
+      rows: sectionRows.tbody
+    };
+  }
+  if (hasFootRows) {
+    table.foot = {
+      rows: sectionRows.tfoot
+    };
+  }
+  if (!hasHeadRows && !hasBodyRows && !hasFootRows) {
+    table.head = { rows: [] };
+    table.body = { rows: [] };
+    table.foot = { rows: [] };
   }
-  const table = {
-    columns,
-    data: rows
-  };
   return { table };
 }
 function parseBotActionResponses(_context, _bitType, cardSet) {
@@ -31527,11 +32019,11 @@ function extractHeadingCard(cardSet, valuesIsArray = false) {
 function defaultTagContentProcessor(context, _contentDepth, _tagsConfig, content, target) {
   const { type, value } = content;
   const { textFormat } = context;
-  const textParser9 = new TextParser();
+  const textParser10 = new TextParser();
   const trimmedStringValue = stringUtils.trimmedString(value);
   switch (type) {
     case TypeKey.Instruction: {
-      target.instruction = textParser9.toAst(trimmedStringValue, {
+      target.instruction = textParser10.toAst(trimmedStringValue, {
         format: textFormat,
         location: TextLocation.tag
       });
@@ -31542,7 +32034,7 @@ function defaultTagContentProcessor(context, _contentDepth, _tagsConfig, content
       break;
     }
     case TypeKey.Hint: {
-      target.hint = textParser9.toAst(trimmedStringValue, {
+      target.hint = textParser10.toAst(trimmedStringValue, {
         format: textFormat,
         location: TextLocation.tag
       });
@@ -31572,7 +32064,7 @@ function defaultTagContentProcessor(context, _contentDepth, _tagsConfig, content
         format: TextFormat.bitmarkText,
         location: TextLocation.tag
       });
-      target.__sampleSolutionAst = textParser9.toAst(trimmedStringValue, {
+      target.__sampleSolutionAst = textParser10.toAst(trimmedStringValue, {
         format: textFormat,
         location: TextLocation.tag
       });
@@ -31679,10 +32171,10 @@ function buildGap(context, _contentDepth, tagsConfig, content) {
 function itemLeadTagContentProcessor(context, _contentDepth, _tagsConfig, content, target) {
   const { textFormat } = context;
   const { value } = content;
-  const textParser9 = new TextParser();
+  const textParser10 = new TextParser();
   const trimmedStringValue = stringUtils.trimmedString(value);
   if (!target.itemLead) target.itemLead = [];
-  const text = textParser9.toAst(trimmedStringValue, {
+  const text = textParser10.toAst(trimmedStringValue, {
     format: textFormat,
     location: TextLocation.tag
   });
@@ -32433,7 +32925,9 @@ function buildTitles(_context, bitType, title) {
 }
 
 // src/parser/bitmark/peg/contentProcessors/TrueFalseTagContentProcessor.ts
-function trueFalseTagContentProcessor(_context, _contentDepth, content, target) {
+var textParser9 = new TextParser();
+function trueFalseTagContentProcessor(context, _contentDepth, content, target) {
+  const { textFormat } = context;
   const { type, value } = content;
   const trueFalse = target.trueFalse;
   if (!trueFalse) return;
@@ -32444,8 +32938,13 @@ function trueFalseTagContentProcessor(_context, _contentDepth, content, target)
       location: TextLocation.tag
     }
   );
+  const textAst = textParser9.toAst(trimmedStringValue ?? "", {
+    format: textFormat,
+    location: TextLocation.tag
+  });
   trueFalse.push({
     text: trimmedStringValue,
+    textAst,
     isCorrect: type === TypeKey.True,
     __isDefaultExample: false
   });
@@ -32549,7 +33048,7 @@ function buildStatementsChoicesResponses(context, tagsConfig, trueFalseContent)
         const { statement: _ignore, ...tagsRest } = tags2;
         const statement = {
           ...firstTrueFalse,
-          statement: firstTrueFalse.text,
+          statement: firstTrueFalse.textAst ?? [],
           ...tagsRest
         };
         if (statement) statements.push(statement);
@@ -33334,36 +33833,39 @@ function peg$parse2(input, options) {
   const peg$c7 = "text";
   const peg$c8 = "~~~~";
   const peg$c9 = "footer";
-  const peg$c10 = "--";
-  const peg$c11 = "++";
-  const peg$c12 = "===";
-  const peg$c13 = "==";
-  const peg$c14 = "[@id";
-  const peg$c15 = "#";
-  const peg$c16 = "[\u25BC";
-  const peg$c17 = "[\u25BA";
-  const peg$c18 = "[@";
-  const peg$c19 = "[%";
-  const peg$c20 = "[!";
-  const peg$c21 = "[?";
-  const peg$c22 = "[+";
-  const peg$c23 = "[-";
-  const peg$c24 = "[$";
-  const peg$c25 = "[_";
-  const peg$c26 = "[=";
-  const peg$c27 = "[&";
-  const peg$c28 = "^]";
-  const peg$c29 = "id:";
-  const peg$c30 = ".";
-  const peg$c31 = "\n";
-  const peg$c32 = "\r\n";
+  const peg$c10 = " ";
+  const peg$c11 = "--";
+  const peg$c12 = "++";
+  const peg$c13 = "===";
+  const peg$c14 = "==";
+  const peg$c15 = "[@id";
+  const peg$c16 = "#";
+  const peg$c17 = "[\u25BC";
+  const peg$c18 = "[\u25BA";
+  const peg$c19 = "[@";
+  const peg$c20 = "[%";
+  const peg$c21 = "[!";
+  const peg$c22 = "[?";
+  const peg$c23 = "[+";
+  const peg$c24 = "[-";
+  const peg$c25 = "[$";
+  const peg$c26 = "[_";
+  const peg$c27 = "[=";
+  const peg$c28 = "[&";
+  const peg$c29 = "^]";
+  const peg$c30 = "id:";
+  const peg$c31 = ".";
+  const peg$c32 = "\n";
+  const peg$c33 = "\r\n";
   const peg$r0 = /^[^\]]/;
-  const peg$r1 = /^[^:\]]/;
-  const peg$r2 = /^[^&:\]]/;
-  const peg$r3 = /^[^\n\r\u2028\u2029]/;
-  const peg$r4 = /^[ \t]/;
-  const peg$r5 = /^[\r\u2028-\u2029]/;
-  const peg$r6 = /^[ \t\n\r\u2028\u2029]/;
+  const peg$r1 = /^[a-z]/;
+  const peg$r2 = /^[a-z0-9\-]/;
+  const peg$r3 = /^[^:\]]/;
+  const peg$r4 = /^[^&:\]]/;
+  const peg$r5 = /^[^\n\r\u2028\u2029]/;
+  const peg$r6 = /^[ \t]/;
+  const peg$r7 = /^[\r\u2028-\u2029]/;
+  const peg$r8 = /^[ \t\n\r\u2028\u2029]/;
   const peg$e0 = peg$literalExpectation("[.", false);
   const peg$e1 = peg$classExpectation(["]"], true, false, false);
   const peg$e2 = peg$literalExpectation("]", false);
@@ -33376,40 +33878,43 @@ function peg$parse2(input, options) {
   const peg$e9 = peg$literalExpectation("text", false);
   const peg$e10 = peg$literalExpectation("~~~~", false);
   const peg$e11 = peg$literalExpectation("footer", false);
-  const peg$e12 = peg$literalExpectation("--", false);
-  const peg$e13 = peg$literalExpectation("++", false);
-  const peg$e14 = peg$literalExpectation("===", false);
-  const peg$e15 = peg$literalExpectation("==", false);
-  const peg$e16 = peg$literalExpectation("[@id", false);
-  const peg$e17 = peg$literalExpectation("#", false);
-  const peg$e18 = peg$literalExpectation("[\u25BC", false);
-  const peg$e19 = peg$literalExpectation("[\u25BA", false);
-  const peg$e20 = peg$literalExpectation("[@", false);
-  const peg$e21 = peg$literalExpectation("[%", false);
-  const peg$e22 = peg$literalExpectation("[!", false);
-  const peg$e23 = peg$literalExpectation("[?", false);
-  const peg$e24 = peg$literalExpectation("[+", false);
-  const peg$e25 = peg$literalExpectation("[-", false);
-  const peg$e26 = peg$literalExpectation("[$", false);
-  const peg$e27 = peg$literalExpectation("[_", false);
-  const peg$e28 = peg$literalExpectation("[=", false);
-  const peg$e29 = peg$literalExpectation("[&", false);
-  const peg$e30 = peg$literalExpectation("^]", false);
-  const peg$e31 = peg$literalExpectation("id:", false);
-  const peg$e32 = peg$classExpectation([":", "]"], true, false, false);
-  const peg$e33 = peg$literalExpectation(".", false);
-  const peg$e34 = peg$classExpectation(["&", ":", "]"], true, false, false);
-  const peg$e35 = peg$otherExpectation("Character");
-  const peg$e36 = peg$classExpectation(["\n", "\r", "\u2028", "\u2029"], true, false, false);
-  const peg$e37 = peg$otherExpectation("Blank Line");
-  const peg$e38 = peg$classExpectation([" ", "	"], false, false, false);
-  const peg$e39 = peg$otherExpectation("Line Terminator");
-  const peg$e40 = peg$literalExpectation("\n", false);
-  const peg$e41 = peg$literalExpectation("\r\n", false);
-  const peg$e42 = peg$classExpectation(["\r", ["\u2028", "\u2029"]], false, false, false);
-  const peg$e43 = peg$otherExpectation("Whitespace, then Line Terminator");
-  const peg$e44 = peg$otherExpectation("whitespace");
-  const peg$e45 = peg$classExpectation([" ", "	", "\n", "\r", "\u2028", "\u2029"], false, false, false);
+  const peg$e12 = peg$literalExpectation(" ", false);
+  const peg$e13 = peg$literalExpectation("--", false);
+  const peg$e14 = peg$literalExpectation("++", false);
+  const peg$e15 = peg$literalExpectation("===", false);
+  const peg$e16 = peg$literalExpectation("==", false);
+  const peg$e17 = peg$classExpectation([["a", "z"]], false, false, false);
+  const peg$e18 = peg$classExpectation([["a", "z"], ["0", "9"], "-"], false, false, false);
+  const peg$e19 = peg$literalExpectation("[@id", false);
+  const peg$e20 = peg$literalExpectation("#", false);
+  const peg$e21 = peg$literalExpectation("[\u25BC", false);
+  const peg$e22 = peg$literalExpectation("[\u25BA", false);
+  const peg$e23 = peg$literalExpectation("[@", false);
+  const peg$e24 = peg$literalExpectation("[%", false);
+  const peg$e25 = peg$literalExpectation("[!", false);
+  const peg$e26 = peg$literalExpectation("[?", false);
+  const peg$e27 = peg$literalExpectation("[+", false);
+  const peg$e28 = peg$literalExpectation("[-", false);
+  const peg$e29 = peg$literalExpectation("[$", false);
+  const peg$e30 = peg$literalExpectation("[_", false);
+  const peg$e31 = peg$literalExpectation("[=", false);
+  const peg$e32 = peg$literalExpectation("[&", false);
+  const peg$e33 = peg$literalExpectation("^]", false);
+  const peg$e34 = peg$literalExpectation("id:", false);
+  const peg$e35 = peg$classExpectation([":", "]"], true, false, false);
+  const peg$e36 = peg$literalExpectation(".", false);
+  const peg$e37 = peg$classExpectation(["&", ":", "]"], true, false, false);
+  const peg$e38 = peg$otherExpectation("Character");
+  const peg$e39 = peg$classExpectation(["\n", "\r", "\u2028", "\u2029"], true, false, false);
+  const peg$e40 = peg$otherExpectation("Blank Line");
+  const peg$e41 = peg$classExpectation([" ", "	"], false, false, false);
+  const peg$e42 = peg$otherExpectation("Line Terminator");
+  const peg$e43 = peg$literalExpectation("\n", false);
+  const peg$e44 = peg$literalExpectation("\r\n", false);
+  const peg$e45 = peg$classExpectation(["\r", ["\u2028", "\u2029"]], false, false, false);
+  const peg$e46 = peg$otherExpectation("Whitespace, then Line Terminator");
+  const peg$e47 = peg$otherExpectation("whitespace");
+  const peg$e48 = peg$classExpectation([" ", "	", "\n", "\r", "\u2028", "\u2029"], false, false, false);
   function peg$f0(firstBit, bits) {
     return processor.buildBits([firstBit, ...bits]);
   }
@@ -33482,91 +33987,112 @@ function peg$parse2(input, options) {
   function peg$f23(value) {
     return helper.handleCardLineOrDivider(value, 2);
   }
-  function peg$f24(value) {
+  function peg$f24(qualifier) {
+    return ["====", qualifier];
+  }
+  function peg$f25() {
+    return ["===="];
+  }
+  function peg$f26(qualifier) {
+    return ["--", qualifier];
+  }
+  function peg$f27() {
+    return ["--"];
+  }
+  function peg$f28(qualifier) {
+    return ["++", qualifier];
+  }
+  function peg$f29() {
+    return ["++"];
+  }
+  function peg$f30(value) {
     return helper.handleCardLine(value);
   }
-  function peg$f25(value) {
+  function peg$f31(value) {
     return helper.handleCardSet(value[1].flat());
   }
-  function peg$f26() {
+  function peg$f32() {
     helper.handleCardSetStart();
   }
-  function peg$f27() {
+  function peg$f33() {
     helper.handleCardSetEnd();
   }
-  function peg$f28(value) {
+  function peg$f34(value) {
     return helper.handleCards(value);
   }
-  function peg$f29(value) {
+  function peg$f35(value) {
     return helper.handleCardLineOrDivider(value, 1);
   }
-  function peg$f30(value) {
+  function peg$f36(value) {
     return helper.handleCardLine(value);
   }
-  function peg$f31(value) {
+  function peg$f37(value) {
+    return value;
+  }
+  function peg$f38(value) {
     return helper.handleCardContent(value);
   }
-  function peg$f32(value) {
+  function peg$f39(value) {
     return { type: TypeKey.CardChar, value };
   }
-  function peg$f33(value) {
+  function peg$f40(value) {
     return helper.handlePropertyTag("id", value);
   }
-  function peg$f34(level, title) {
+  function peg$f41(level, title) {
     return helper.handleTag(TypeKey.Title, { level, title });
   }
-  function peg$f35(value) {
+  function peg$f42(value) {
     return helper.handleTag(TypeKey.Anchor, value);
   }
-  function peg$f36(value) {
+  function peg$f43(value) {
     return helper.handleTag(TypeKey.Reference, value);
   }
-  function peg$f37(key, value) {
+  function peg$f44(key, value) {
     return helper.handlePropertyTag(key, value);
   }
-  function peg$f38(value) {
+  function peg$f45(value) {
     return helper.handleTag(TypeKey.ItemLead, value);
   }
-  function peg$f39(value) {
+  function peg$f46(value) {
     return helper.handleTag(TypeKey.Instruction, value);
   }
-  function peg$f40(value) {
+  function peg$f47(value) {
     return helper.handleTag(TypeKey.Hint, value);
   }
-  function peg$f41(value) {
+  function peg$f48(value) {
     return helper.handleTag(TypeKey.True, value);
   }
-  function peg$f42(value) {
+  function peg$f49(value) {
     return helper.handleTag(TypeKey.False, value);
   }
-  function peg$f43(value) {
+  function peg$f50(value) {
     return helper.handleTag(TypeKey.SampleSolution, value);
   }
-  function peg$f44(value) {
+  function peg$f51(value) {
     return helper.handleTag(TypeKey.Gap, value);
   }
-  function peg$f45(value) {
+  function peg$f52(value) {
     return helper.handleTag(TypeKey.Mark, value);
   }
-  function peg$f46(key, value) {
+  function peg$f53(key, value) {
     return helper.handleResourceTag(key, value);
   }
-  function peg$f47(value) {
+  function peg$f54(value) {
     return value;
   }
-  function peg$f48(value) {
+  function peg$f55(value) {
     return value ? value.trim() : "";
   }
-  function peg$f49(value) {
+  function peg$f56(value) {
     return value.length;
   }
-  function peg$f50(value) {
+  function peg$f57(value) {
     return value ? value.trim() : null;
   }
-  function peg$f51(value) {
+  function peg$f58(value) {
     return value ? value.trim() : "";
   }
-  function peg$f52() {
+  function peg$f59() {
     return true;
   }
   let peg$currPos = options.peg$currPos | 0;
@@ -34484,35 +35010,28 @@ function peg$parse2(input, options) {
     return s0;
   }
   function peg$parseCardSetStart_V2() {
-    let s0, s1, s2, s3, s4, s5;
+    let s0, s1, s2, s3;
     s0 = peg$currPos;
-    s1 = peg$parseNL();
+    s1 = [];
+    s2 = peg$parseWNL();
+    if (s2 === peg$FAILED) {
+      s2 = peg$parseNL();
+    }
+    if (s2 !== peg$FAILED) {
+      while (s2 !== peg$FAILED) {
+        s1.push(s2);
+        s2 = peg$parseWNL();
+        if (s2 === peg$FAILED) {
+          s2 = peg$parseNL();
+        }
+      }
+    } else {
+      s1 = peg$FAILED;
+    }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       peg$silentFails++;
-      s3 = peg$currPos;
-      if (input.substr(peg$currPos, 4) === peg$c6) {
-        s4 = peg$c6;
-        peg$currPos += 4;
-      } else {
-        s4 = peg$FAILED;
-        if (peg$silentFails === 0) {
-          peg$fail(peg$e8);
-        }
-      }
-      if (s4 !== peg$FAILED) {
-        s5 = peg$parseWNL();
-        if (s5 !== peg$FAILED) {
-          s4 = [s4, s5];
-          s3 = s4;
-        } else {
-          peg$currPos = s3;
-          s3 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s3;
-        s3 = peg$FAILED;
-      }
+      s3 = peg$parseCardDividerLookahead_V2();
       peg$silentFails--;
       if (s3 !== peg$FAILED) {
         peg$currPos = s2;
@@ -34577,39 +35096,147 @@ function peg$parse2(input, options) {
     return s0;
   }
   function peg$parseCardLineOrDivider_V2() {
-    let s0, s1, s2, s3;
+    let s0, s1;
+    s0 = peg$currPos;
+    s1 = peg$parseCardDividerToken_V2();
+    if (s1 === peg$FAILED) {
+      s1 = peg$parseCardSideDividerToken_V2();
+      if (s1 === peg$FAILED) {
+        s1 = peg$parseCardVariantDividerToken_V2();
+        if (s1 === peg$FAILED) {
+          s1 = peg$parseCardLine_V2();
+        }
+      }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f23(s1);
+    }
+    s0 = s1;
+    return s0;
+  }
+  function peg$parseCardDividerToken_V2() {
+    let s0, s1, s2, s3, s4, s5, s6;
     s0 = peg$currPos;
-    s1 = peg$currPos;
     if (input.substr(peg$currPos, 4) === peg$c6) {
-      s2 = peg$c6;
+      s1 = peg$c6;
       peg$currPos += 4;
     } else {
-      s2 = peg$FAILED;
+      s1 = peg$FAILED;
       if (peg$silentFails === 0) {
         peg$fail(peg$e8);
       }
     }
-    if (s2 !== peg$FAILED) {
-      s3 = peg$parseWNL();
-      if (s3 === peg$FAILED) {
-        s3 = peg$parseWEOL();
+    if (s1 !== peg$FAILED) {
+      if (input.charCodeAt(peg$currPos) === 32) {
+        s2 = peg$c10;
+        peg$currPos++;
+      } else {
+        s2 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e12);
+        }
       }
-      if (s3 !== peg$FAILED) {
-        s2 = [s2, s3];
-        s1 = s2;
+      if (s2 !== peg$FAILED) {
+        s3 = peg$parseQualifier();
+        if (s3 !== peg$FAILED) {
+          if (input.charCodeAt(peg$currPos) === 32) {
+            s4 = peg$c10;
+            peg$currPos++;
+          } else {
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e12);
+            }
+          }
+          if (s4 !== peg$FAILED) {
+            if (input.substr(peg$currPos, 4) === peg$c6) {
+              s5 = peg$c6;
+              peg$currPos += 4;
+            } else {
+              s5 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e8);
+              }
+            }
+            if (s5 !== peg$FAILED) {
+              s6 = peg$parseWNL();
+              if (s6 === peg$FAILED) {
+                s6 = peg$parseWEOL();
+              }
+              if (s6 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s0 = peg$f24(s3);
+              } 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;
+        }
+      } 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, 4) === peg$c6) {
+        s1 = peg$c6;
+        peg$currPos += 4;
       } else {
-        peg$currPos = s1;
         s1 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e8);
+        }
       }
+      if (s1 !== peg$FAILED) {
+        s2 = peg$parseWNL();
+        if (s2 === peg$FAILED) {
+          s2 = peg$parseWEOL();
+        }
+        if (s2 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s0 = peg$f25();
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    }
+    return s0;
+  }
+  function peg$parseCardSideDividerToken_V2() {
+    let s0, s1, s2, s3, s4, s5, s6;
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 2) === peg$c11) {
+      s1 = peg$c11;
+      peg$currPos += 2;
     } else {
-      peg$currPos = s1;
       s1 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e13);
+      }
     }
-    if (s1 === peg$FAILED) {
-      s1 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c10) {
+    if (s1 !== peg$FAILED) {
+      if (input.charCodeAt(peg$currPos) === 32) {
         s2 = peg$c10;
-        peg$currPos += 2;
+        peg$currPos++;
       } else {
         s2 = peg$FAILED;
         if (peg$silentFails === 0) {
@@ -34617,58 +35244,277 @@ function peg$parse2(input, options) {
         }
       }
       if (s2 !== peg$FAILED) {
-        s3 = peg$parseWNL();
-        if (s3 === peg$FAILED) {
-          s3 = peg$parseWEOL();
-        }
+        s3 = peg$parseQualifier();
         if (s3 !== peg$FAILED) {
-          s2 = [s2, s3];
-          s1 = s2;
+          if (input.charCodeAt(peg$currPos) === 32) {
+            s4 = peg$c10;
+            peg$currPos++;
+          } else {
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e12);
+            }
+          }
+          if (s4 !== peg$FAILED) {
+            if (input.substr(peg$currPos, 2) === peg$c11) {
+              s5 = peg$c11;
+              peg$currPos += 2;
+            } else {
+              s5 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e13);
+              }
+            }
+            if (s5 !== peg$FAILED) {
+              s6 = peg$parseWNL();
+              if (s6 === peg$FAILED) {
+                s6 = peg$parseWEOL();
+              }
+              if (s6 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s0 = peg$f26(s3);
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
         } else {
-          peg$currPos = s1;
-          s1 = peg$FAILED;
+          peg$currPos = s0;
+          s0 = peg$FAILED;
         }
       } else {
-        peg$currPos = s1;
+        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, 2) === peg$c11) {
+        s1 = peg$c11;
+        peg$currPos += 2;
+      } else {
         s1 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e13);
+        }
       }
-      if (s1 === peg$FAILED) {
-        s1 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c11) {
-          s2 = peg$c11;
-          peg$currPos += 2;
-        } else {
-          s2 = peg$FAILED;
-          if (peg$silentFails === 0) {
-            peg$fail(peg$e13);
-          }
+      if (s1 !== peg$FAILED) {
+        s2 = peg$parseWNL();
+        if (s2 === peg$FAILED) {
+          s2 = peg$parseWEOL();
         }
         if (s2 !== peg$FAILED) {
-          s3 = peg$parseWNL();
-          if (s3 === peg$FAILED) {
-            s3 = peg$parseWEOL();
+          peg$savedPos = s0;
+          s0 = peg$f27();
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    }
+    return s0;
+  }
+  function peg$parseCardVariantDividerToken_V2() {
+    let s0, s1, s2, s3, s4, s5, s6;
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 2) === peg$c12) {
+      s1 = peg$c12;
+      peg$currPos += 2;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e14);
+      }
+    }
+    if (s1 !== peg$FAILED) {
+      if (input.charCodeAt(peg$currPos) === 32) {
+        s2 = peg$c10;
+        peg$currPos++;
+      } else {
+        s2 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e12);
+        }
+      }
+      if (s2 !== peg$FAILED) {
+        s3 = peg$parseQualifier();
+        if (s3 !== peg$FAILED) {
+          if (input.charCodeAt(peg$currPos) === 32) {
+            s4 = peg$c10;
+            peg$currPos++;
+          } else {
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e12);
+            }
           }
-          if (s3 !== peg$FAILED) {
-            s2 = [s2, s3];
-            s1 = s2;
+          if (s4 !== peg$FAILED) {
+            if (input.substr(peg$currPos, 2) === peg$c12) {
+              s5 = peg$c12;
+              peg$currPos += 2;
+            } else {
+              s5 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e14);
+              }
+            }
+            if (s5 !== peg$FAILED) {
+              s6 = peg$parseWNL();
+              if (s6 === peg$FAILED) {
+                s6 = peg$parseWEOL();
+              }
+              if (s6 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s0 = peg$f28(s3);
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
           } else {
-            peg$currPos = s1;
-            s1 = peg$FAILED;
+            peg$currPos = s0;
+            s0 = peg$FAILED;
           }
         } else {
-          peg$currPos = s1;
-          s1 = peg$FAILED;
+          peg$currPos = s0;
+          s0 = peg$FAILED;
         }
-        if (s1 === peg$FAILED) {
-          s1 = peg$parseCardLine_V2();
+      } 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, 2) === peg$c12) {
+        s1 = peg$c12;
+        peg$currPos += 2;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e14);
         }
       }
+      if (s1 !== peg$FAILED) {
+        s2 = peg$parseWNL();
+        if (s2 === peg$FAILED) {
+          s2 = peg$parseWEOL();
+        }
+        if (s2 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s0 = peg$f29();
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    }
+    return s0;
+  }
+  function peg$parseCardDividerLookahead_V2() {
+    let s0, s1, s2, s3, s4, s5, s6;
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 4) === peg$c6) {
+      s1 = peg$c6;
+      peg$currPos += 4;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e8);
+      }
     }
     if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f23(s1);
+      s2 = peg$currPos;
+      if (input.charCodeAt(peg$currPos) === 32) {
+        s3 = peg$c10;
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e12);
+        }
+      }
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parseQualifier();
+        if (s4 !== peg$FAILED) {
+          if (input.charCodeAt(peg$currPos) === 32) {
+            s5 = peg$c10;
+            peg$currPos++;
+          } else {
+            s5 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e12);
+            }
+          }
+          if (s5 !== peg$FAILED) {
+            if (input.substr(peg$currPos, 4) === peg$c6) {
+              s6 = peg$c6;
+              peg$currPos += 4;
+            } else {
+              s6 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e8);
+              }
+            }
+            if (s6 !== peg$FAILED) {
+              s3 = [s3, s4, s5, s6];
+              s2 = s3;
+            } else {
+              peg$currPos = s2;
+              s2 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s2;
+            s2 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s2;
+          s2 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s2;
+        s2 = peg$FAILED;
+      }
+      if (s2 === peg$FAILED) {
+        s2 = null;
+      }
+      s3 = peg$parseWNL();
+      if (s3 === peg$FAILED) {
+        s3 = peg$parseWEOL();
+      }
+      if (s3 !== peg$FAILED) {
+        s1 = [s1, s2, s3];
+        s0 = s1;
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
-    s0 = s1;
     return s0;
   }
   function peg$parseCardLine_V2() {
@@ -34743,7 +35589,7 @@ function peg$parse2(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f24(s2);
+        s0 = peg$f30(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -34780,7 +35626,7 @@ function peg$parse2(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f25(s1);
+      s1 = peg$f31(s1);
     }
     s0 = s1;
     return s0;
@@ -34788,18 +35634,33 @@ function peg$parse2(input, options) {
   function peg$parseCardSetStart_V1() {
     let s0, s1, s2, s3, s4, s5;
     s0 = peg$currPos;
-    s1 = peg$parseNL();
+    s1 = [];
+    s2 = peg$parseWNL();
+    if (s2 === peg$FAILED) {
+      s2 = peg$parseNL();
+    }
+    if (s2 !== peg$FAILED) {
+      while (s2 !== peg$FAILED) {
+        s1.push(s2);
+        s2 = peg$parseWNL();
+        if (s2 === peg$FAILED) {
+          s2 = peg$parseNL();
+        }
+      }
+    } else {
+      s1 = peg$FAILED;
+    }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       peg$silentFails++;
       s3 = peg$currPos;
-      if (input.substr(peg$currPos, 3) === peg$c12) {
-        s4 = peg$c12;
+      if (input.substr(peg$currPos, 3) === peg$c13) {
+        s4 = peg$c13;
         peg$currPos += 3;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e14);
+          peg$fail(peg$e15);
         }
       }
       if (s4 !== peg$FAILED) {
@@ -34824,7 +35685,7 @@ function peg$parse2(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f26();
+        s0 = peg$f32();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -34862,7 +35723,7 @@ function peg$parse2(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f27();
+      s1 = peg$f33();
     }
     s0 = s1;
     return s0;
@@ -34873,7 +35734,7 @@ function peg$parse2(input, options) {
     s1 = peg$parseCardLineOrDivider_V1();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f28(s1);
+      s1 = peg$f34(s1);
     }
     s0 = s1;
     return s0;
@@ -34882,13 +35743,13 @@ function peg$parse2(input, options) {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
     s1 = peg$currPos;
-    if (input.substr(peg$currPos, 3) === peg$c12) {
-      s2 = peg$c12;
+    if (input.substr(peg$currPos, 3) === peg$c13) {
+      s2 = peg$c13;
       peg$currPos += 3;
     } else {
       s2 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e14);
+        peg$fail(peg$e15);
       }
     }
     if (s2 !== peg$FAILED) {
@@ -34909,13 +35770,13 @@ function peg$parse2(input, options) {
     }
     if (s1 === peg$FAILED) {
       s1 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c13) {
-        s2 = peg$c13;
+      if (input.substr(peg$currPos, 2) === peg$c14) {
+        s2 = peg$c14;
         peg$currPos += 2;
       } else {
         s2 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e15);
+          peg$fail(peg$e16);
         }
       }
       if (s2 !== peg$FAILED) {
@@ -34936,13 +35797,13 @@ function peg$parse2(input, options) {
       }
       if (s1 === peg$FAILED) {
         s1 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c10) {
-          s2 = peg$c10;
+        if (input.substr(peg$currPos, 2) === peg$c11) {
+          s2 = peg$c11;
           peg$currPos += 2;
         } else {
           s2 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e12);
+            peg$fail(peg$e13);
           }
         }
         if (s2 !== peg$FAILED) {
@@ -34968,7 +35829,7 @@ function peg$parse2(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f29(s1);
+      s1 = peg$f35(s1);
     }
     s0 = s1;
     return s0;
@@ -35045,7 +35906,7 @@ function peg$parse2(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f30(s2);
+        s0 = peg$f36(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -35056,6 +35917,102 @@ function peg$parse2(input, options) {
     }
     return s0;
   }
+  function peg$parseQualifier() {
+    let s0, s1, s2;
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    peg$silentFails++;
+    if (input.substr(peg$currPos, 6) === peg$c9) {
+      s2 = peg$c9;
+      peg$currPos += 6;
+    } else {
+      s2 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e11);
+      }
+    }
+    if (s2 === peg$FAILED) {
+      if (input.substr(peg$currPos, 4) === peg$c7) {
+        s2 = peg$c7;
+        peg$currPos += 4;
+      } else {
+        s2 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e9);
+        }
+      }
+    }
+    peg$silentFails--;
+    if (s2 === peg$FAILED) {
+      s1 = void 0;
+    } else {
+      peg$currPos = s1;
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parseQualifierName();
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f37(s2);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    return s0;
+  }
+  function peg$parseQualifierName() {
+    let s0, s1, s2, s3, s4;
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    s2 = input.charAt(peg$currPos);
+    if (peg$r1.test(s2)) {
+      peg$currPos++;
+    } else {
+      s2 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e17);
+      }
+    }
+    if (s2 !== peg$FAILED) {
+      s3 = [];
+      s4 = input.charAt(peg$currPos);
+      if (peg$r2.test(s4)) {
+        peg$currPos++;
+      } else {
+        s4 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e18);
+        }
+      }
+      while (s4 !== peg$FAILED) {
+        s3.push(s4);
+        s4 = input.charAt(peg$currPos);
+        if (peg$r2.test(s4)) {
+          peg$currPos++;
+        } else {
+          s4 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e18);
+          }
+        }
+      }
+      s2 = [s2, s3];
+      s1 = s2;
+    } else {
+      peg$currPos = s1;
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      s0 = input.substring(s0, peg$currPos);
+    } else {
+      s0 = s1;
+    }
+    return s0;
+  }
   function peg$parsecardContent() {
     let s0, s1, s2;
     s0 = peg$currPos;
@@ -35072,7 +36029,7 @@ function peg$parse2(input, options) {
       }
     }
     peg$savedPos = s0;
-    s1 = peg$f31(s1);
+    s1 = peg$f38(s1);
     s0 = s1;
     return s0;
   }
@@ -35090,7 +36047,7 @@ function peg$parse2(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f32(s1);
+      s1 = peg$f39(s1);
     }
     s0 = s1;
     return s0;
@@ -35098,13 +36055,13 @@ function peg$parse2(input, options) {
   function peg$parseIDTag() {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c14) {
-      s1 = peg$c14;
+    if (input.substr(peg$currPos, 4) === peg$c15) {
+      s1 = peg$c15;
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e16);
+        peg$fail(peg$e19);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -35113,7 +36070,7 @@ function peg$parse2(input, options) {
         s3 = peg$parseTag_Close();
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f33(s2);
+          s0 = peg$f40(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -35143,24 +36100,24 @@ function peg$parse2(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = [];
       if (input.charCodeAt(peg$currPos) === 35) {
-        s3 = peg$c15;
+        s3 = peg$c16;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e17);
+          peg$fail(peg$e20);
         }
       }
       if (s3 !== peg$FAILED) {
         while (s3 !== peg$FAILED) {
           s2.push(s3);
           if (input.charCodeAt(peg$currPos) === 35) {
-            s3 = peg$c15;
+            s3 = peg$c16;
             peg$currPos++;
           } else {
             s3 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e17);
+              peg$fail(peg$e20);
             }
           }
         }
@@ -35172,7 +36129,7 @@ function peg$parse2(input, options) {
         s4 = peg$parseTag_CloseOrEOF();
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f34(s2, s3);
+          s0 = peg$f41(s2, s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -35190,13 +36147,13 @@ function peg$parse2(input, options) {
   function peg$parseAnchorTag() {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c16) {
-      s1 = peg$c16;
+    if (input.substr(peg$currPos, 2) === peg$c17) {
+      s1 = peg$c17;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e18);
+        peg$fail(peg$e21);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -35204,7 +36161,7 @@ function peg$parse2(input, options) {
       s3 = peg$parseTag_CloseOrEOF();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f35(s2);
+        s0 = peg$f42(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -35218,13 +36175,13 @@ function peg$parse2(input, options) {
   function peg$parseReferenceTag() {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c17) {
-      s1 = peg$c17;
+    if (input.substr(peg$currPos, 2) === peg$c18) {
+      s1 = peg$c18;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e19);
+        peg$fail(peg$e22);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -35232,7 +36189,7 @@ function peg$parse2(input, options) {
       s3 = peg$parseTag_CloseOrEOF();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f36(s2);
+        s0 = peg$f43(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -35246,13 +36203,13 @@ function peg$parse2(input, options) {
   function peg$parsePropertyTag() {
     let s0, s1, s2, s3, s4;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c18) {
-      s1 = peg$c18;
+    if (input.substr(peg$currPos, 2) === peg$c19) {
+      s1 = peg$c19;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e20);
+        peg$fail(peg$e23);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -35263,7 +36220,7 @@ function peg$parse2(input, options) {
           s4 = peg$parseTag_CloseOrEOF();
           if (s4 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f37(s2, s3);
+            s0 = peg$f44(s2, s3);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -35285,13 +36242,13 @@ function peg$parse2(input, options) {
   function peg$parseItemLeadTag() {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c19) {
-      s1 = peg$c19;
+    if (input.substr(peg$currPos, 2) === peg$c20) {
+      s1 = peg$c20;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e21);
+        peg$fail(peg$e24);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -35299,7 +36256,7 @@ function peg$parse2(input, options) {
       s3 = peg$parseTag_CloseOrEOF();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f38(s2);
+        s0 = peg$f45(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -35313,13 +36270,13 @@ function peg$parse2(input, options) {
   function peg$parseInstructionTag() {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c20) {
-      s1 = peg$c20;
+    if (input.substr(peg$currPos, 2) === peg$c21) {
+      s1 = peg$c21;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e22);
+        peg$fail(peg$e25);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -35327,7 +36284,7 @@ function peg$parse2(input, options) {
       s3 = peg$parseTag_CloseOrEOF();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f39(s2);
+        s0 = peg$f46(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -35341,13 +36298,13 @@ function peg$parse2(input, options) {
   function peg$parseHintTag() {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c21) {
-      s1 = peg$c21;
+    if (input.substr(peg$currPos, 2) === peg$c22) {
+      s1 = peg$c22;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e23);
+        peg$fail(peg$e26);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -35355,7 +36312,7 @@ function peg$parse2(input, options) {
       s3 = peg$parseTag_CloseOrEOF();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f40(s2);
+        s0 = peg$f47(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -35369,13 +36326,13 @@ function peg$parse2(input, options) {
   function peg$parseTrueTag() {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c22) {
-      s1 = peg$c22;
+    if (input.substr(peg$currPos, 2) === peg$c23) {
+      s1 = peg$c23;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e24);
+        peg$fail(peg$e27);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -35383,7 +36340,7 @@ function peg$parse2(input, options) {
       s3 = peg$parseTag_CloseOrEOF();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f41(s2);
+        s0 = peg$f48(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -35397,13 +36354,13 @@ function peg$parse2(input, options) {
   function peg$parseFalseTag() {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c23) {
-      s1 = peg$c23;
+    if (input.substr(peg$currPos, 2) === peg$c24) {
+      s1 = peg$c24;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e25);
+        peg$fail(peg$e28);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -35411,7 +36368,7 @@ function peg$parse2(input, options) {
       s3 = peg$parseTag_CloseOrEOF();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f42(s2);
+        s0 = peg$f49(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -35425,13 +36382,13 @@ function peg$parse2(input, options) {
   function peg$parseSampleSolutionTag() {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c24) {
-      s1 = peg$c24;
+    if (input.substr(peg$currPos, 2) === peg$c25) {
+      s1 = peg$c25;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e26);
+        peg$fail(peg$e29);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -35439,7 +36396,7 @@ function peg$parse2(input, options) {
       s3 = peg$parseTag_CloseOrEOF();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f43(s2);
+        s0 = peg$f50(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -35453,13 +36410,13 @@ function peg$parse2(input, options) {
   function peg$parseGapTag() {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c25) {
-      s1 = peg$c25;
+    if (input.substr(peg$currPos, 2) === peg$c26) {
+      s1 = peg$c26;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e27);
+        peg$fail(peg$e30);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -35467,7 +36424,7 @@ function peg$parse2(input, options) {
       s3 = peg$parseTag_CloseOrEOF();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f44(s2);
+        s0 = peg$f51(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -35481,13 +36438,13 @@ function peg$parse2(input, options) {
   function peg$parseMarkTag() {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c26) {
-      s1 = peg$c26;
+    if (input.substr(peg$currPos, 2) === peg$c27) {
+      s1 = peg$c27;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e28);
+        peg$fail(peg$e31);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -35495,7 +36452,7 @@ function peg$parse2(input, options) {
       s3 = peg$parseTag_CloseOrEOF();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f45(s2);
+        s0 = peg$f52(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -35509,13 +36466,13 @@ function peg$parse2(input, options) {
   function peg$parseResourceTag() {
     let s0, s1, s2, s3, s4;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c27) {
-      s1 = peg$c27;
+    if (input.substr(peg$currPos, 2) === peg$c28) {
+      s1 = peg$c28;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e29);
+        peg$fail(peg$e32);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -35526,7 +36483,7 @@ function peg$parse2(input, options) {
           s4 = peg$parseTag_CloseOrEOF();
           if (s4 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f46(s2, s3);
+            s0 = peg$f53(s2, s3);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -35550,13 +36507,13 @@ function peg$parse2(input, options) {
     s0 = peg$currPos;
     s1 = peg$currPos;
     s2 = [];
-    if (input.substr(peg$currPos, 2) === peg$c28) {
-      s3 = peg$c28;
+    if (input.substr(peg$currPos, 2) === peg$c29) {
+      s3 = peg$c29;
       peg$currPos += 2;
     } else {
       s3 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e30);
+        peg$fail(peg$e33);
       }
     }
     if (s3 === peg$FAILED) {
@@ -35572,13 +36529,13 @@ function peg$parse2(input, options) {
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
-      if (input.substr(peg$currPos, 2) === peg$c28) {
-        s3 = peg$c28;
+      if (input.substr(peg$currPos, 2) === peg$c29) {
+        s3 = peg$c29;
         peg$currPos += 2;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e30);
+          peg$fail(peg$e33);
         }
       }
       if (s3 === peg$FAILED) {
@@ -35595,7 +36552,7 @@ function peg$parse2(input, options) {
     }
     s1 = input.substring(s1, peg$currPos);
     peg$savedPos = s0;
-    s1 = peg$f47(s1);
+    s1 = peg$f54(s1);
     s0 = s1;
     return s0;
   }
@@ -35604,13 +36561,13 @@ function peg$parse2(input, options) {
     s0 = peg$currPos;
     s1 = peg$currPos;
     peg$silentFails++;
-    if (input.substr(peg$currPos, 3) === peg$c29) {
-      s2 = peg$c29;
+    if (input.substr(peg$currPos, 3) === peg$c30) {
+      s2 = peg$c30;
       peg$currPos += 3;
     } else {
       s2 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e31);
+        peg$fail(peg$e34);
       }
     }
     peg$silentFails--;
@@ -35624,29 +36581,29 @@ function peg$parse2(input, options) {
       s2 = peg$currPos;
       s3 = [];
       s4 = input.charAt(peg$currPos);
-      if (peg$r1.test(s4)) {
+      if (peg$r3.test(s4)) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e32);
+          peg$fail(peg$e35);
         }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
         s4 = input.charAt(peg$currPos);
-        if (peg$r1.test(s4)) {
+        if (peg$r3.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e32);
+            peg$fail(peg$e35);
           }
         }
       }
       s2 = input.substring(s2, peg$currPos);
       peg$savedPos = s0;
-      s0 = peg$f48(s2);
+      s0 = peg$f55(s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -35701,24 +36658,24 @@ function peg$parse2(input, options) {
     s0 = peg$currPos;
     s1 = [];
     if (input.charCodeAt(peg$currPos) === 46) {
-      s2 = peg$c30;
+      s2 = peg$c31;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e33);
+        peg$fail(peg$e36);
       }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
         s1.push(s2);
         if (input.charCodeAt(peg$currPos) === 46) {
-          s2 = peg$c30;
+          s2 = peg$c31;
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e33);
+            peg$fail(peg$e36);
           }
         }
       }
@@ -35727,7 +36684,7 @@ function peg$parse2(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f49(s1);
+      s1 = peg$f56(s1);
     }
     s0 = s1;
     return s0;
@@ -35738,29 +36695,29 @@ function peg$parse2(input, options) {
     s1 = peg$currPos;
     s2 = [];
     s3 = input.charAt(peg$currPos);
-    if (peg$r2.test(s3)) {
+    if (peg$r4.test(s3)) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e34);
+        peg$fail(peg$e37);
       }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
       s3 = input.charAt(peg$currPos);
-      if (peg$r2.test(s3)) {
+      if (peg$r4.test(s3)) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e34);
+          peg$fail(peg$e37);
         }
       }
     }
     s1 = input.substring(s1, peg$currPos);
     peg$savedPos = s0;
-    s1 = peg$f50(s1);
+    s1 = peg$f57(s1);
     s0 = s1;
     return s0;
   }
@@ -35779,7 +36736,7 @@ function peg$parse2(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$parseTag_Value();
       peg$savedPos = s0;
-      s0 = peg$f51(s2);
+      s0 = peg$f58(s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -35788,7 +36745,7 @@ function peg$parse2(input, options) {
       s0 = peg$currPos;
       s1 = "";
       peg$savedPos = s0;
-      s1 = peg$f52();
+      s1 = peg$f59();
       s0 = s1;
     }
     return s0;
@@ -35825,19 +36782,19 @@ function peg$parse2(input, options) {
     let s0, s1;
     peg$silentFails++;
     s0 = input.charAt(peg$currPos);
-    if (peg$r3.test(s0)) {
+    if (peg$r5.test(s0)) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e36);
+        peg$fail(peg$e39);
       }
     }
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e35);
+        peg$fail(peg$e38);
       }
     }
     return s0;
@@ -35860,23 +36817,23 @@ function peg$parse2(input, options) {
     s0 = peg$currPos;
     s1 = [];
     s2 = input.charAt(peg$currPos);
-    if (peg$r4.test(s2)) {
+    if (peg$r6.test(s2)) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e38);
+        peg$fail(peg$e41);
       }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
       s2 = input.charAt(peg$currPos);
-      if (peg$r4.test(s2)) {
+      if (peg$r6.test(s2)) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e38);
+          peg$fail(peg$e41);
         }
       }
     }
@@ -35892,7 +36849,7 @@ function peg$parse2(input, options) {
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e37);
+        peg$fail(peg$e40);
       }
     }
     return s0;
@@ -35901,32 +36858,32 @@ function peg$parse2(input, options) {
     let s0, s1;
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 10) {
-      s0 = peg$c31;
+      s0 = peg$c32;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e40);
+        peg$fail(peg$e43);
       }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c32) {
-        s0 = peg$c32;
+      if (input.substr(peg$currPos, 2) === peg$c33) {
+        s0 = peg$c33;
         peg$currPos += 2;
       } else {
         s0 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e41);
+          peg$fail(peg$e44);
         }
       }
       if (s0 === peg$FAILED) {
         s0 = input.charAt(peg$currPos);
-        if (peg$r5.test(s0)) {
+        if (peg$r7.test(s0)) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e42);
+            peg$fail(peg$e45);
           }
         }
       }
@@ -35935,7 +36892,7 @@ function peg$parse2(input, options) {
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e39);
+        peg$fail(peg$e42);
       }
     }
     return s0;
@@ -35946,23 +36903,23 @@ function peg$parse2(input, options) {
     s0 = peg$currPos;
     s1 = [];
     s2 = input.charAt(peg$currPos);
-    if (peg$r4.test(s2)) {
+    if (peg$r6.test(s2)) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e38);
+        peg$fail(peg$e41);
       }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
       s2 = input.charAt(peg$currPos);
-      if (peg$r4.test(s2)) {
+      if (peg$r6.test(s2)) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e38);
+          peg$fail(peg$e41);
         }
       }
     }
@@ -35978,7 +36935,7 @@ function peg$parse2(input, options) {
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e43);
+        peg$fail(peg$e46);
       }
     }
     return s0;
@@ -35987,19 +36944,19 @@ function peg$parse2(input, options) {
     let s0, s1;
     peg$silentFails++;
     s0 = input.charAt(peg$currPos);
-    if (peg$r6.test(s0)) {
+    if (peg$r8.test(s0)) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e45);
+        peg$fail(peg$e48);
       }
     }
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e44);
+        peg$fail(peg$e47);
       }
     }
     return s0;