@gmb/bitmark-parser-generator 3.23.0 → 3.25.0

package/dist/cjs/generator/bitmark/BitmarkGenerator.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BitmarkGenerator = void 0;
 const Ast_1 = require("../../ast/Ast");
+const StringWriter_1 = require("../../ast/writer/StringWriter");
 const Breakscape_1 = require("../../breakscaping/Breakscape");
 const Config_1 = require("../../config/Config");
 const NodeType_1 = require("../../model/ast/NodeType");
@@ -22,6 +23,7 @@ const PropertyFormat_1 = require("../../model/enum/PropertyFormat");
 const PropertyTag_1 = require("../../model/enum/PropertyTag");
 const ResourceTag_1 = require("../../model/enum/ResourceTag");
 const TextFormat_1 = require("../../model/enum/TextFormat");
+const TextLocation_1 = require("../../model/enum/TextLocation");
 const BooleanUtils_1 = require("../../utils/BooleanUtils");
 const ObjectUtils_1 = require("../../utils/ObjectUtils");
 const StringUtils_1 = require("../../utils/StringUtils");
@@ -30,6 +32,8 @@ const TextGenerator_1 = require("../text/TextGenerator");
 const DEFAULT_OPTIONS = {
     debugGenerationInline: false,
 };
+const DEFAULT_SPACES_AROUND_VALUES = 1;
+const MAX_SPACES_AROUND_VALUES = 10;
 /**
  * Generate bitmark markup from a bitmark AST
  *
@@ -57,6 +61,11 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         super();
         this.ast = new Ast_1.Ast();
         // State
+        this.bitType = BitType_1.BitType._error;
+        this.textFormat = TextFormat_1.TextFormat.bitmarkMinusMinus;
+        this.tagTextFormat = TextFormat_1.TextFormat.bitmarkMinusMinus;
+        this.isBodyBitmarkText = false;
+        this.isCardAllowed = false;
         this.firstBit = true;
         this.hasCardSet = false;
         this.hasFooter = false;
@@ -87,13 +96,18 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         }
         // Calculate the prettify space
         this.prettifySpace = this.options.prettifyJson === true ? 2 : this.options.prettifyJson || undefined;
+        // Calculate the spaces around values
+        this.spacesAroundValues = this.calcSpacesAroundValues();
+        this.spacesAroundValuesStr = ' '.repeat(this.spacesAroundValues);
         // Create the text generator
         this.textGenerator = new TextGenerator_1.TextGenerator(this.bitmarkVersion, {
             writeCallback: this.write,
             bodyBitCallback: this.bodyBitCallback,
             debugGenerationInline: this.debugGenerationInline,
         });
-        this.writer = writer;
+        this.mainWriter = writer;
+        this.partWriter = new StringWriter_1.StringWriter();
+        this.writer = this.mainWriter;
         this.generateResourceHandlers();
         this.generatePropertyHandlers();
     }
@@ -132,6 +146,11 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         this.writer.closeSync();
     }
     resetState() {
+        this.bitType = BitType_1.BitType._error;
+        this.textFormat = TextFormat_1.TextFormat.bitmarkMinusMinus;
+        this.tagTextFormat = TextFormat_1.TextFormat.bitmarkMinusMinus;
+        this.isBodyBitmarkText = false;
+        this.isCardAllowed = false;
         this.firstBit = true;
         this.hasCardSet = false;
         this.hasFooter = false;
@@ -153,9 +172,24 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     // bitmark
     // bitmarkAst -> bits -> bitsValue
     enter_bitsValue(node, _route) {
+        var _a;
         const bit = node.value;
         const bitConfig = Config_1.Config.getBitConfig(bit.bitType);
         const bitResourcesConfig = Config_1.Config.getBitResourcesConfig(bit.bitType, bit.resourceType);
+        // Set state variables
+        this.bitType = bit.bitType;
+        this.textFormat = (_a = bit.textFormat) !== null && _a !== void 0 ? _a : bitConfig.textFormatDefault;
+        this.isBodyBitmarkText =
+            this.textFormat === TextFormat_1.TextFormat.bitmarkMinusMinus || this.textFormat === TextFormat_1.TextFormat.bitmarkPlusPlus;
+        this.isCardAllowed = this.calculateIsCardAllowed();
+        // NOTE:
+        // If the bit text format is bitmark++ then the tagTextFormat should be bitmark+, but that is not implemented yet.
+        // It works anyhow, and would require a lot of changes to implement.
+        // Since this may well change in the future, we will keep the code as is for now.
+        this.tagTextFormat =
+            this.textFormat === TextFormat_1.TextFormat.bitmarkPlusPlus
+                ? TextFormat_1.TextFormat.bitmarkPlusPlus // NOTE: should be bitmarkPlus
+                : TextFormat_1.TextFormat.bitmarkMinusMinus;
         this.hasCardSet = this.haveValidCardSet(bit);
         this.hasFooter = this.haveValidFooter(bit);
         // Separate the bits with 3 newlines
@@ -168,12 +202,12 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         this.writeOPD(bit.bitLevel);
         if (bit.isCommented)
             this.writeString('|');
-        this.writeBreakscapedTagString(bit.bitType);
+        this.writeTagKey(bit.bitType);
         if (bit.textFormat) {
             const write = this.isWriteTextFormat(bit.textFormat, bitConfig.textFormatDefault);
             if (write) {
                 this.writeColon();
-                this.writeBreakscapedTagString(bit.textFormat);
+                this.writeTagKey(bit.textFormat);
             }
         }
         // Use the bitConfig to see if we need to write the resourceType attachment
@@ -196,7 +230,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         }
         if (resourceType) {
             this.writeAmpersand();
-            this.writeBreakscapedTagString(resourceType);
+            this.writeTagKey(resourceType);
         }
         this.writeCL();
         // this.writeNL();
@@ -370,13 +404,8 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         }
         if (hint != null) {
             this.writeOPQ();
-            this.writeBreakscapedTagString(hint);
+            this.writeTextOrValue(hint, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
             this.writeCL();
-            // this.writeProperty('hint', hint, {
-            //   format: PropertyFormat.trimmedString,
-            //   single: true,
-            //   ignoreEmpty: true,
-            // });
         }
         return false;
     }
@@ -402,7 +431,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             });
         }
         if (avatarImage) {
-            this.writeResource(ResourceTag_1.ResourceTag.image, avatarImage.src);
+            this.writeResource(ResourceTag_1.ResourceTag.image, avatarImage.image.src);
         }
         // Stop traversal of this branch
         return false;
@@ -416,8 +445,6 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     // bitmarkAst -> bits -> bitsValue -> cardNode -> flashcards -> flashcardsValue -> alternativeAnswers ->
     // -> alternativeAnswersValue -> text
     enter_text(node, route) {
-        var _a;
-        const textFormat = (_a = this.getTextFormat(route)) !== null && _a !== void 0 ? _a : TextFormat_1.TextFormat.bitmarkMinusMinus;
         const parent = this.getParentNode(route);
         if (!parent ||
             (parent.key !== NodeType_1.NodeType.term &&
@@ -430,7 +457,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         }
         if (node.value) {
             this.writeNL();
-            this.textGenerator.generateSync(node.value, textFormat);
+            this.writeTextOrValue(node.value, this.textFormat, TextLocation_1.TextLocation.body);
         }
         // Stop traversal of this branch
         return false;
@@ -448,11 +475,8 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return true;
         }
         if (StringUtils_1.StringUtils.isString(node.value)) {
-            const str = node.value;
             this.writeNL();
-            this.write(Breakscape_1.Breakscape.breakscape(str, {
-                textFormat: TextFormat_1.TextFormat.text,
-            }));
+            this.writeTextOrValue(node.value, this.textFormat, TextLocation_1.TextLocation.body);
         }
         // Stop traversal of this branch
         return false;
@@ -656,7 +680,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return true; // Will be handled by marginNumber
         this.writeNL_IfNotChain(route);
         this.writeOPC();
-        this.textGenerator.generateSync(item, TextFormat_1.TextFormat.bitmarkMinusMinus);
+        this.writeTextOrValue(item, this.tagTextFormat, TextLocation_1.TextLocation.tag);
         this.writeCL();
         return true;
     }
@@ -673,10 +697,10 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return true; // Will be handled by marginNumber
         this.writeNL_IfNotChain(route);
         this.writeOPC();
-        this.textGenerator.generateSync((_d = (_c = parent === null || parent === void 0 ? void 0 : parent.value) === null || _c === void 0 ? void 0 : _c.item) !== null && _d !== void 0 ? _d : '', TextFormat_1.TextFormat.bitmarkMinusMinus);
+        this.writeTextOrValue((_d = (_c = parent === null || parent === void 0 ? void 0 : parent.value) === null || _c === void 0 ? void 0 : _c.item) !== null && _d !== void 0 ? _d : '', this.tagTextFormat, TextLocation_1.TextLocation.tag);
         this.writeCL();
         this.writeOPC();
-        this.textGenerator.generateSync(lead, TextFormat_1.TextFormat.bitmarkMinusMinus);
+        this.writeTextOrValue(lead, this.tagTextFormat, TextLocation_1.TextLocation.tag);
         this.writeCL();
         return true;
     }
@@ -691,13 +715,13 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return true; // Will be handled by marginNumber
         this.writeNL_IfNotChain(route);
         this.writeOPC();
-        this.textGenerator.generateSync((_c = (_b = parent === null || parent === void 0 ? void 0 : parent.value) === null || _b === void 0 ? void 0 : _b.item) !== null && _c !== void 0 ? _c : '', TextFormat_1.TextFormat.bitmarkMinusMinus);
+        this.writeTextOrValue((_c = (_b = parent === null || parent === void 0 ? void 0 : parent.value) === null || _b === void 0 ? void 0 : _b.item) !== null && _c !== void 0 ? _c : '', this.tagTextFormat, TextLocation_1.TextLocation.tag);
         this.writeCL();
         this.writeOPC();
-        this.textGenerator.generateSync((_e = (_d = parent === null || parent === void 0 ? void 0 : parent.value) === null || _d === void 0 ? void 0 : _d.lead) !== null && _e !== void 0 ? _e : '', TextFormat_1.TextFormat.bitmarkMinusMinus);
+        this.writeTextOrValue((_e = (_d = parent === null || parent === void 0 ? void 0 : parent.value) === null || _d === void 0 ? void 0 : _d.lead) !== null && _e !== void 0 ? _e : '', this.tagTextFormat, TextLocation_1.TextLocation.tag);
         this.writeCL();
         this.writeOPC();
-        this.textGenerator.generateSync(pageNumber !== null && pageNumber !== void 0 ? pageNumber : '', TextFormat_1.TextFormat.bitmarkMinusMinus);
+        this.writeTextOrValue(pageNumber !== null && pageNumber !== void 0 ? pageNumber : '', this.tagTextFormat, TextLocation_1.TextLocation.tag);
         this.writeCL();
         return true;
     }
@@ -710,16 +734,16 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return false; // Ignore empty
         this.writeNL_IfNotChain(route);
         this.writeOPC();
-        this.textGenerator.generateSync((_b = (_a = parent === null || parent === void 0 ? void 0 : parent.value) === null || _a === void 0 ? void 0 : _a.item) !== null && _b !== void 0 ? _b : '', TextFormat_1.TextFormat.bitmarkMinusMinus);
+        this.writeTextOrValue((_b = (_a = parent === null || parent === void 0 ? void 0 : parent.value) === null || _a === void 0 ? void 0 : _a.item) !== null && _b !== void 0 ? _b : '', this.tagTextFormat, TextLocation_1.TextLocation.tag);
         this.writeCL();
         this.writeOPC();
-        this.textGenerator.generateSync((_d = (_c = parent === null || parent === void 0 ? void 0 : parent.value) === null || _c === void 0 ? void 0 : _c.lead) !== null && _d !== void 0 ? _d : '', TextFormat_1.TextFormat.bitmarkMinusMinus);
+        this.writeTextOrValue((_d = (_c = parent === null || parent === void 0 ? void 0 : parent.value) === null || _c === void 0 ? void 0 : _c.lead) !== null && _d !== void 0 ? _d : '', this.tagTextFormat, TextLocation_1.TextLocation.tag);
         this.writeCL();
         this.writeOPC();
-        this.textGenerator.generateSync((_f = (_e = parent === null || parent === void 0 ? void 0 : parent.value) === null || _e === void 0 ? void 0 : _e.pageNumber) !== null && _f !== void 0 ? _f : '', TextFormat_1.TextFormat.bitmarkMinusMinus);
+        this.writeTextOrValue((_f = (_e = parent === null || parent === void 0 ? void 0 : parent.value) === null || _e === void 0 ? void 0 : _e.pageNumber) !== null && _f !== void 0 ? _f : '', this.tagTextFormat, TextLocation_1.TextLocation.tag);
         this.writeCL();
         this.writeOPC();
-        this.textGenerator.generateSync(marginNumber, TextFormat_1.TextFormat.bitmarkMinusMinus);
+        this.writeTextOrValue(marginNumber, this.tagTextFormat, TextLocation_1.TextLocation.tag);
         this.writeCL();
         return true;
     }
@@ -733,29 +757,25 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         this.inTag = false;
         // Always write a NL before the body content if there is any (see Handle body)
         const body = node.value;
-        const textFormat = this.getTextFormat(route);
-        const isBitmarkText = textFormat === TextFormat_1.TextFormat.bitmarkPlusPlus || textFormat === TextFormat_1.TextFormat.bitmarkMinusMinus;
         // Handle body
-        if (textFormat === TextFormat_1.TextFormat.json) {
+        if (this.textFormat === TextFormat_1.TextFormat.json) {
             const json = (_a = body.body) !== null && _a !== void 0 ? _a : null;
             if (Array.isArray(json) || ObjectUtils_1.ObjectUtils.isObject(json)) {
                 const text = JSON.stringify(json, null, this.prettifySpace);
                 if (text) {
                     this.writePlainTextDivider();
                     this.writeNL();
-                    this.write(Breakscape_1.Breakscape.breakscape(text, {
-                        textFormat: TextFormat_1.TextFormat.text,
-                    }));
+                    this.writeTextOrValue(text, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.body);
                 }
             }
         }
-        else if (isBitmarkText) {
+        else if (this.isBodyBitmarkText) {
             // handle bitmark text
             const plainTextDividerAllowed = !(this.hasCardSet || this.hasFooter);
             this.writeNL();
             // The text generator will write to the writer
             const b = (Array.isArray(body.body) ? body.body : []);
-            this.textGenerator.generateSync(b, textFormat, {
+            this.writeTextOrValue(b, this.textFormat, TextLocation_1.TextLocation.body, {
                 plainTextDividerAllowed,
             });
         }
@@ -764,9 +784,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             this.writePlainTextDivider();
             this.writeNL();
             const s = (StringUtils_1.StringUtils.isString(body.body) ? body.body : '');
-            this.write(Breakscape_1.Breakscape.breakscape(`${s}`, {
-                textFormat: TextFormat_1.TextFormat.text,
-            }));
+            this.writeTextOrValue(`${s}`, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.body);
         }
         // Stop traversal of this branch
         return false;
@@ -793,7 +811,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         else {
             for (const solution of gap.solutions) {
                 this.writeOPU();
-                this.writeBreakscapedTagString(solution);
+                this.writeTextOrValue(solution, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
                 this.writeCL();
             }
         }
@@ -804,7 +822,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     enter_mark(node, _route) {
         const mark = node.value;
         this.writeOPE();
-        this.writeBreakscapedTagString(mark.solution);
+        this.writeTextOrValue(mark.solution, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
         this.writeCL();
         // Continue traversal
         return true;
@@ -825,21 +843,19 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.bitsValue)
             return true;
         const footer = node.value;
-        const textFormat = this.getTextFormat(route);
         // Handle footer
-        if (textFormat === TextFormat_1.TextFormat.json) {
+        if (this.textFormat === TextFormat_1.TextFormat.json) {
             // Json footer?!
             // Not valid, ignore
         }
         else if (footer.footer && footer.footer.length > 0) {
-            const isBitmarkText = textFormat === TextFormat_1.TextFormat.bitmarkPlusPlus || textFormat === TextFormat_1.TextFormat.bitmarkMinusMinus;
-            if (isBitmarkText) {
+            if (this.isBodyBitmarkText) {
                 // handle bitmark text
                 this.writeNL();
-                this.write('==== footer ====');
+                this.writeTextOrValue('==== footer ====', TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.body);
                 this.writeNL();
                 // The text generator will write to the writer
-                this.textGenerator.generateSync(footer.footer, textFormat, {
+                this.writeTextOrValue(footer.footer, this.textFormat, TextLocation_1.TextLocation.body, {
                     plainTextDividerAllowed: true, // Always allowed for the footer.
                 });
             }
@@ -878,7 +894,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return;
         if (solution) {
             this.writeOPE();
-            this.writeBreakscapedTagString(solution);
+            this.writeTextOrValue(solution, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
     }
@@ -905,7 +921,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         else {
             this.writeOPM();
         }
-        this.write(selectOption.text);
+        this.writeTextOrValue(selectOption.text, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
         this.writeCL();
         // Continue traversal
         return true;
@@ -919,29 +935,29 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         else {
             this.writeOPM();
         }
-        this.write(highlightText.text);
+        this.writeTextOrValue(highlightText.text, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
         this.writeCL();
         // Continue traversal
         return true;
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode
-    enter_cardNode(_node, route) {
+    enter_cardNode(_node, _route) {
         // Ignore cards if not allowed
-        if (!this.isCardAllowed(route))
+        if (!this.isCardAllowed)
             return true;
         this.writeCardSetStart();
         // Continue traversal
         return true;
     }
-    between_cardNode(_node, _left, _right, route) {
+    between_cardNode(_node, _left, _right, _route) {
         // Ignore cards if not allowed
-        if (!this.isCardAllowed(route))
+        if (!this.isCardAllowed)
             return;
         this.writeCardSetCardDivider();
     }
-    exit_cardNode(_node, route) {
+    exit_cardNode(_node, _route) {
         // Ignore cards if not allowed
-        if (!this.isCardAllowed(route))
+        if (!this.isCardAllowed)
             return;
         this.writeCardSetEnd();
         if (this.options.cardSetVersion === CardSetVersion_1.CardSetVersion.v1) {
@@ -960,10 +976,10 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         this.writeCardSetCardDivider();
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> flashcards -> flashcardsValue
-    between_flashcardsValue(_node, _left, right, route) {
+    between_flashcardsValue(_node, _left, right, _route) {
         var _a;
         // Ignore cards if not allowed
-        if (!this.isCardAllowed(route))
+        if (!this.isCardAllowed)
             return;
         if (right.key === NodeType_1.NodeType.answer) {
             this.writeCardSetSideDivider();
@@ -984,8 +1000,8 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     enter_statements(_node, _route) {
         //
     }
-    between_statements(_node, _left, _right, route) {
-        const isTrueFalse1 = this.isOfBitType(route, BitType_1.BitType.trueFalse1);
+    between_statements(_node, _left, _right, _route) {
+        const isTrueFalse1 = this.isOfBitType(BitType_1.BitType.trueFalse1);
         if (!isTrueFalse1) {
             this.writeCardSetCardDivider();
         }
@@ -1000,7 +1016,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         else {
             this.writeOPM();
         }
-        this.write(statement.statement);
+        this.writeTextOrValue(statement.statement, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
         this.writeCL();
         // Continue traversal
         return true;
@@ -1017,7 +1033,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         else {
             this.writeOPM();
         }
-        this.write(choice.choice);
+        this.writeTextOrValue(choice.choice, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
         this.writeCL();
         // Continue traversal
         return true;
@@ -1033,7 +1049,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         else {
             this.writeOPM();
         }
-        this.write(response.response);
+        this.writeTextOrValue(response.response, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
         this.writeCL();
         // Continue traversal
         return true;
@@ -1059,9 +1075,9 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     enter_heading(_node, _route) {
         //
     }
-    between_heading(_node, _left, _right, route) {
+    between_heading(_node, _left, _right, _route) {
         // Ignore cards if not allowed
-        if (!this.isCardAllowed(route))
+        if (!this.isCardAllowed)
             return;
         this.writeCardSetSideDivider();
     }
@@ -1069,9 +1085,9 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     enter_forValues(_node, _route) {
         //
     }
-    between_forValues(_node, _left, _right, route) {
+    between_forValues(_node, _left, _right, _route) {
         // Ignore cards if not allowed
-        if (!this.isCardAllowed(route))
+        if (!this.isCardAllowed)
             return;
         this.writeCardSetSideDivider();
     }
@@ -1109,15 +1125,15 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> pairs -> pairsValue -> values
     // bitmarkAst -> bits -> bitsValue -> cardNode -> matrix -> matrixValue -> cells -> cellsValue -> values
-    enter_values(_node, route) {
+    enter_values(_node, _route) {
         // Ignore cards if not allowed
-        if (!this.isCardAllowed(route))
+        if (!this.isCardAllowed)
             return;
         this.writeCardSetSideDivider();
     }
-    between_values(_node, _left, _right, route) {
+    between_values(_node, _left, _right, _route) {
         // Ignore cards if not allowed
-        if (!this.isCardAllowed(route))
+        if (!this.isCardAllowed)
             return;
         this.writeCardSetVariantDivider();
     }
@@ -1127,7 +1143,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.cardNode)
             return;
         // Ignore cards if not allowed
-        if (!this.isCardAllowed(route))
+        if (!this.isCardAllowed)
             return;
         this.writeCardSetCardDivider();
     }
@@ -1137,7 +1153,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.cardNode)
             return;
         // Ignore cards if not allowed
-        if (!this.isCardAllowed(route))
+        if (!this.isCardAllowed)
             return;
         this.writeCardSetCardDivider();
     }
@@ -1157,7 +1173,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (parentKey !== NodeType_1.NodeType.table && parentKey !== NodeType_1.NodeType.captionDefinitionList)
             return;
         // Ignore cards if not allowed
-        if (!this.isCardAllowed(route))
+        if (!this.isCardAllowed)
             return;
         this.writeCardSetSideDivider();
     }
@@ -1166,16 +1182,13 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     leaf_columnsValue(node, _route) {
         this.writeNL();
         this.writeOPHASH();
-        if (node.value)
-            this.writeBreakscapedTagString(node.value);
+        this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
         this.writeCL();
     }
     enter_columnsValue(node, _route) {
         this.writeNL();
         this.writeOPHASH();
-        if (node.value) {
-            this.textGenerator.generateSync(node.value, TextFormat_1.TextFormat.bitmarkMinusMinus);
-        }
+        this.writeTextOrValue(node.value, this.tagTextFormat, TextLocation_1.TextLocation.tag);
         this.writeCL();
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> table -> data -> dataValue
@@ -1185,7 +1198,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.table && (parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.pronunciationTable)
             return;
         // Ignore cards if not allowed
-        if (!this.isCardAllowed(route))
+        if (!this.isCardAllowed)
             return;
         this.writeCardSetSideDivider();
     }
@@ -1195,16 +1208,14 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.table)
             return;
         this.writeNL();
-        this.write(node.value);
+        this.writeTextOrValue(node.value, this.textFormat, TextLocation_1.TextLocation.body);
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> table -> data -> dataValue -> dataValueValue
     // bitmarkAst -> bits -> bitsValue -> cardNode -> pronunciationTable -> data -> dataValue -> dataValueValue
     enter_dataValueValue(node, route) {
-        var _a;
         const parent = this.getParentNode(route, 3);
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.table && (parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.pronunciationTable)
             return;
-        const textFormat = (_a = this.getTextFormat(route)) !== null && _a !== void 0 ? _a : TextFormat_1.TextFormat.bitmarkMinusMinus;
         if (node.value) {
             if ((parent === null || parent === void 0 ? void 0 : parent.key) === NodeType_1.NodeType.pronunciationTable) {
                 // Pronunciation Table
@@ -1213,16 +1224,16 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
                     this.writeNL();
                     this.writeOP();
                     this.writeHash();
-                    this.textGenerator.generateSync(cell.title, TextFormat_1.TextFormat.bitmarkMinusMinus);
+                    this.writeTextOrValue(cell.title, this.tagTextFormat, TextLocation_1.TextLocation.tag);
                     this.writeCL();
                 }
                 if (cell.audio) {
                     this.writeNL();
-                    this.writeResource(ResourceTag_1.ResourceTag.audio, cell.audio.src);
+                    this.writeResource(ResourceTag_1.ResourceTag.audio, cell.audio.audio.src);
                 }
                 if (cell.body) {
                     this.writeNL();
-                    this.textGenerator.generateSync(cell.body, textFormat);
+                    this.writeTextOrValue(cell.body, this.textFormat, TextLocation_1.TextLocation.body);
                 }
                 // Stop traversal of this branch
                 return false;
@@ -1230,10 +1241,9 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             else {
                 // Table
                 this.writeNL();
-                this.textGenerator.generateSync(node.value, textFormat);
+                this.writeTextOrValue(node.value, this.textFormat, TextLocation_1.TextLocation.body);
             }
         }
-        // this.write(node.value);
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> captionDefinitionList
     between_captionDefinitionList(_node, _left, _right, route) {
@@ -1249,7 +1259,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return true;
         if (node.value) {
             this.writeNL();
-            this.write(node.value);
+            this.writeTextOrValue(node.value, this.textFormat, TextLocation_1.TextLocation.body);
         }
         // Stop traversal of this branch
         return false;
@@ -1261,7 +1271,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return true;
         if (node.value) {
             this.writeNL();
-            this.write(node.value);
+            this.writeTextOrValue(node.value, this.textFormat, TextLocation_1.TextLocation.body);
         }
         // Stop traversal of this branch
         return false;
@@ -1281,7 +1291,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.definitions)
             return;
         // Ignore cards if not allowed
-        if (!this.isCardAllowed(route))
+        if (!this.isCardAllowed)
             return;
         if (right.key === NodeType_1.NodeType.definition) {
             this.writeCardSetSideDivider();
@@ -1310,7 +1320,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (ingredient.title != null) {
             this.writeNL();
             this.writeOPHASH();
-            this.writeBreakscapedTagString(ingredient.title);
+            this.writeTextOrValue(ingredient.title, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
             this.writeCL();
             // this.writeNL();
         }
@@ -1326,7 +1336,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         // [!43]
         if (ingredient.quantity != null) {
             this.writeOPB();
-            this.writeBreakscapedTagString(`${ingredient.quantity}`);
+            this.writeTextOrValue(`${ingredient.quantity}`, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
         // [@unit:kilograms]
@@ -1360,7 +1370,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         // item
         if (ingredient.item != null) {
             this.writeNL();
-            this.write(ingredient.item);
+            this.writeTextOrValue(ingredient.item, this.textFormat, TextLocation_1.TextLocation.body);
         }
         // Stop traversal of this branch
         return false;
@@ -1386,7 +1396,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return;
         this.writeNL();
         this.writeOPB();
-        this.writeBreakscapedTagString(node.value);
+        this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
         this.writeCL();
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> botResponses -> botResponsesValue -> reaction
@@ -1406,10 +1416,10 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         const parent = this.getParentNode(route);
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.botResponsesValue)
             return;
-        const feeback = node.value;
-        if (feeback) {
+        const feedback = node.value;
+        if (feedback) {
             this.writeNL();
-            this.write(feeback);
+            this.writeTextOrValue(feedback, this.textFormat, TextLocation_1.TextLocation.body);
         }
     }
     // bitmarkAst -> bits -> bitsValue -> imagePlaceholder
@@ -1477,6 +1487,29 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     }
     // bitmarkAst -> bits -> bitsValue -> bitType
     // bitmarkAst -> bits -> bitsValue -> textFormat
+    //  bitmarkAst -> bits -> level
+    leaf_level(node, route) {
+        // Ensure this is at the bit level
+        const parent = this.getParentNode(route);
+        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.bitsValue)
+            return true;
+        // Ensure this is a chapter bit
+        if (!Config_1.Config.isOfBitType(this.bitType, [BitType_1.BitType.chapter]))
+            return true;
+        const level = node.value;
+        const bit = parent === null || parent === void 0 ? void 0 : parent.value;
+        if (level > 0 && bit.title == null) {
+            // If the level is set, but there is no title, this is a [.chapter] bit with an empty title.
+            // We need to write an empty title tag at the correct level.
+            this.writeNL();
+            this.writeOP();
+            for (let i = 0; i < +level; i++)
+                this.writeHash();
+            this.writeCL();
+        }
+        // Stop traversal of this branch
+        return false;
+    }
     //  bitmarkAst -> bits -> title
     enter_title(node, route) {
         // Ensure this is at the bit level
@@ -1492,7 +1525,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             this.writeOP();
             for (let i = 0; i < +level; i++)
                 this.writeHash();
-            this.textGenerator.generateSync(title, TextFormat_1.TextFormat.bitmarkMinusMinus);
+            this.writeTextOrValue(title, this.tagTextFormat, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
         // Stop traversal of this branch
@@ -1512,7 +1545,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             this.writeOP();
             for (let i = 0; i < level; i++)
                 this.writeHash();
-            this.textGenerator.generateSync(subtitle, TextFormat_1.TextFormat.bitmarkMinusMinus);
+            this.writeTextOrValue(subtitle, this.tagTextFormat, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
         // Stop traversal of this branch
@@ -1536,11 +1569,11 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             });
             if (book.reference) {
                 this.writeOPRANGLE();
-                this.writeBreakscapedTagString(book.reference);
+                this.writeTextOrValue(book.reference, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
                 this.writeCL();
                 if (book.referenceEnd) {
                     this.writeOPRANGLE();
-                    this.writeBreakscapedTagString(book.referenceEnd);
+                    this.writeTextOrValue(book.referenceEnd, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
                     this.writeCL();
                 }
             }
@@ -1561,11 +1594,11 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             });
             if (bit.reference) {
                 this.writeOPRANGLE();
-                this.writeBreakscapedTagString(bit.reference);
+                this.writeTextOrValue(bit.reference, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
                 this.writeCL();
                 if (bit.referenceEnd) {
                     this.writeOPRANGLE();
-                    this.writeBreakscapedTagString(bit.referenceEnd);
+                    this.writeTextOrValue(bit.referenceEnd, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
                     this.writeCL();
                 }
             }
@@ -1576,7 +1609,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (node.value) {
             this.writeNL();
             this.writeOPDANGLE();
-            this.writeBreakscapedTagString(node.value);
+            this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
     }
@@ -1589,7 +1622,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             if (!bit.book) {
                 this.writeNL();
                 this.writeOPRANGLE();
-                this.writeBreakscapedTagString(node.value);
+                this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
                 this.writeCL();
             }
         }
@@ -1603,7 +1636,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (!this.isEmptyText(text)) {
             this.writeNL_IfNotChain(route);
             this.writeOPQ();
-            this.textGenerator.generateSync(text, TextFormat_1.TextFormat.bitmarkMinusMinus);
+            this.writeTextOrValue(text, this.tagTextFormat, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
         // Stop traversal of this branch
@@ -1616,7 +1649,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (!this.isEmptyText(text)) {
             this.writeNL_IfNotChain(route);
             this.writeOPB();
-            this.textGenerator.generateSync(text, TextFormat_1.TextFormat.bitmarkMinusMinus);
+            this.writeTextOrValue(text, this.tagTextFormat, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
         // Stop traversal of this branch
@@ -1704,18 +1737,18 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             this.writeString('example');
             this.writeColon();
             if (example === true) {
-                this.writeString('true');
+                this.writeString(' true ');
             }
             else if (example === false) {
-                this.writeString('false');
+                this.writeString(' false ');
             }
             else if (Array.isArray(example)) {
                 // TextAst
-                this.textGenerator.generateSync(example, TextFormat_1.TextFormat.bitmarkMinusMinus);
+                this.writeTextOrValue(example, this.tagTextFormat, TextLocation_1.TextLocation.tag);
             }
             else {
                 // String
-                this.writeBreakscapedTagString(example);
+                this.writeTextOrValue(example, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
             }
             this.writeCL();
         }
@@ -1730,7 +1763,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     leaf_elementsValue(node, _route) {
         if (node.value) {
             this.writeNL();
-            this.writeBreakscapedTagString(node.value);
+            this.writeTextOrValue(node.value, this.textFormat, TextLocation_1.TextLocation.body);
         }
     }
     // bitmarkAst -> bits -> bitsValue -> body -> bodyValue -> gap -> solutions -> solution
@@ -1741,7 +1774,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return;
         if (node.value != null) {
             this.writeOPU();
-            this.writeBreakscapedTagString(node.value);
+            this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
     }
@@ -1750,7 +1783,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     leaf_prefix(node, _route) {
         if (node.value) {
             this.writeOPPRE();
-            this.writeBreakscapedTagString(node.value);
+            this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
     }
@@ -1759,7 +1792,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     leaf_postfix(node, _route) {
         if (node.value) {
             this.writeOPPOST();
-            this.writeBreakscapedTagString(node.value);
+            this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
     }
@@ -1777,21 +1810,21 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     leaf_forKeys(node, _route) {
         this.writeNL();
         this.writeOPHASH();
-        this.writeBreakscapedTagString(node.value);
+        this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
         this.writeCL();
     }
     // bitmarkAst -> bits -> bitsValue -> heading -> forValues
     leaf_forValues(node, _route) {
         this.writeNL();
         this.writeOPHASH();
-        this.writeBreakscapedTagString(node.value);
+        this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
         this.writeCL();
     }
     // bitmarkAst -> bits -> bitsValue -> heading -> forValuesValue
     leaf_forValuesValue(node, _route) {
         this.writeNL();
         this.writeOPHASH();
-        this.writeBreakscapedTagString(node.value);
+        this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
         this.writeCL();
     }
     // bitmarkAst -> bits -> bitsValue -> pairs -> pairsValue -> key
@@ -1799,7 +1832,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     leaf_key(node, _route) {
         if (node.value) {
             this.writeNL();
-            this.writeBreakscapedTagString(node.value);
+            this.writeTextOrValue(node.value, this.textFormat, TextLocation_1.TextLocation.body);
         }
     }
     // bitmarkAst -> bits -> bitsValue -> pairs -> pairsValue -> values -> valuesValue
@@ -1807,7 +1840,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     leaf_valuesValue(node, _route) {
         if (node.value) {
             this.writeNL();
-            this.writeBreakscapedTagString(node.value);
+            this.writeTextOrValue(node.value, this.textFormat, TextLocation_1.TextLocation.body);
         }
     }
     // bitmarkAst -> bits -> bitsValue -> questions -> questionsValue -> question
@@ -1819,7 +1852,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return;
         if (node.value) {
             this.writeNL();
-            this.writeBreakscapedTagString(node.value);
+            this.writeTextOrValue(node.value, this.textFormat, TextLocation_1.TextLocation.body);
         }
     }
     // bitmarkAst -> bits -> bitsValue -> statements -> text
@@ -1876,9 +1909,8 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             ignoreEmpty: true,
         });
     }
-    leaf_zoomDisabled(node, route) {
-        const bitType = this.getBitType(route);
-        if (Config_1.Config.isOfBitType(bitType, [
+    leaf_zoomDisabled(node, _route) {
+        if (Config_1.Config.isOfBitType(this.bitType, [
             BitType_1.BitType.imageSeparator,
             BitType_1.BitType.pageBanner,
             BitType_1.BitType.imagesLogoGrave,
@@ -2143,8 +2175,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return false;
         }
         else if (footer.footer && footer.footer.length > 0) {
-            const isBitmarkText = textFormat === TextFormat_1.TextFormat.bitmarkPlusPlus || textFormat === TextFormat_1.TextFormat.bitmarkMinusMinus;
-            if (isBitmarkText) {
+            if (this.isBodyBitmarkText) {
                 // handle bitmark text
                 return true;
             }
@@ -2156,17 +2187,108 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         }
         return false;
     }
+    /**
+     * Calculate the number of spaces around values from the options.
+     *
+     * This function should only be called from the constructor.
+     * Otherwise use this.spacesAroundValues.
+     *
+     * @returns
+     */
+    calcSpacesAroundValues() {
+        const val = this.options.spacesAroundValues;
+        let spaces = DEFAULT_SPACES_AROUND_VALUES;
+        if (val != null) {
+            if (val === true) {
+                spaces = DEFAULT_SPACES_AROUND_VALUES;
+            }
+            else if (val === false) {
+                spaces = 0;
+            }
+            else {
+                spaces = val;
+            }
+        }
+        spaces = Math.min(Math.max(spaces, 0), MAX_SPACES_AROUND_VALUES);
+        return spaces;
+    }
     // END UTILITY FUNCTIONS
     //
     // WRITE FUNCTIONS
     //
-    writeBreakscapedTagString(s) {
+    /**
+     * Helper function to write a tag key, breakscaping appropriately.
+     * Use only to write a tag key.
+     *
+     * @param s
+     */
+    writeTagKey(s) {
         if (s != null) {
             this.write(Breakscape_1.Breakscape.breakscape(`${s}`, {
-                textFormat: TextFormat_1.TextFormat.tag,
+                textFormat: TextFormat_1.TextFormat.text,
+                textLocation: TextLocation_1.TextLocation.tag,
             }));
         }
     }
+    /**
+     * Write text or value, handling the format and location (i.e. conversion to text and breakscaping).
+     *
+     * @param text
+     * @param format
+     * @param location
+     * @param options
+     */
+    writeTextOrValue(text, format, location, options) {
+        const isTagValue = location === TextLocation_1.TextLocation.tag;
+        const s = StringUtils_1.StringUtils.isString(text) ? text : undefined;
+        const ast = Array.isArray(text) ? text : undefined;
+        const isBitmarkText = format === TextFormat_1.TextFormat.bitmarkPlusPlus || format === TextFormat_1.TextFormat.bitmarkMinusMinus;
+        const isPlainText = !isBitmarkText;
+        const spacesAroundValues = isTagValue ? this.spacesAroundValuesStr : '';
+        if (isPlainText) {
+            // Plain text
+            if (s != null) {
+                this.write(`${spacesAroundValues}${Breakscape_1.Breakscape.breakscape(`${s}`, {
+                    textFormat: TextFormat_1.TextFormat.text,
+                    textLocation: location,
+                })}${spacesAroundValues}`);
+            }
+        }
+        else {
+            // Bitmark text (but might not be AST as some values are just strings (and all v2 values are strings))
+            if (s != null) {
+                this.write(`${spacesAroundValues}${Breakscape_1.Breakscape.breakscape(`${s}`, {
+                    textFormat: format,
+                    textLocation: location,
+                })}${spacesAroundValues}`);
+            }
+            else if (ast != null) {
+                // When writing a tag value, we don't know if it is empty until we write it, so we need to
+                // write it using the part writer, and then check if it is empty before writing to the main writer.
+                // Body values can be written directly to the main writer.
+                if (isTagValue) {
+                    // Change the writer to the part writer
+                    this.writer = this.partWriter;
+                    this.partWriter.openSync();
+                    // Write the text
+                    this.textGenerator.generateSync(ast, format, location, options);
+                    // Get the written text
+                    this.partWriter.closeSync();
+                    const text = this.partWriter.getString();
+                    // Restore the main writer
+                    this.writer = this.mainWriter;
+                    // Write the text to the main writer, adding spaces around it where required
+                    if (text) {
+                        this.write(`${spacesAroundValues}${text.trim()}${spacesAroundValues}`);
+                    }
+                }
+                else {
+                    // Write the text directly to the main writer
+                    this.textGenerator.generateSync(ast, format, location, options);
+                }
+            }
+        }
+    }
     writeString(s) {
         if (s != null)
             this.write(`${s}`);
@@ -2235,8 +2357,14 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         this.write('[');
     }
     writeCL() {
-        // HACK to fix breakscaping when string ends with a ^ (must add a space)
-        this.writer.getLastWrite().endsWith('^') ? this.write(' ]') : this.write(']');
+        // HACK to fix breakscaping when string ends with a ^ (must add a space) if
+        // options.spacesAroundValues is 0
+        if (this.spacesAroundValues === 0) {
+            this.writer.getLastWrite().endsWith('^') ? this.write(' ]') : this.write(']');
+        }
+        else {
+            this.write(']');
+        }
     }
     writeAmpersand() {
         this.write('&');
@@ -2250,6 +2378,9 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     writeHash() {
         this.write('#');
     }
+    writeSpacesAroundValues() {
+        this.write(this.spacesAroundValuesStr);
+    }
     writePlainTextDivider() {
         this.writeNL();
         this.write('==== text ====');
@@ -2319,9 +2450,9 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             const resourceData = resource[resourceTag];
             const src = resourceData ? resourceData.src || resourceData.url || resourceData.body || '' : '';
             this.writeOPA();
-            this.writeBreakscapedTagString(key);
+            this.writeTagKey(key);
             this.writeColon();
-            this.writeBreakscapedTagString(src);
+            this.writeTextOrValue(src, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
             if (resource.type === ResourceTag_1.ResourceTag.article) {
                 // this.writeNL();
             }
@@ -2333,9 +2464,9 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (type) {
             // Standard case
             this.writeOPAMP();
-            this.writeBreakscapedTagString(type);
+            this.writeTagKey(type);
             this.writeColon();
-            this.writeBreakscapedTagString(value);
+            this.writeTextOrValue(value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
             if (type === ResourceTag_1.ResourceTag.article) {
                 // this.writeNL();
             }
@@ -2352,9 +2483,9 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
                 if (options.ignoreEmpty && isBitmarkText && this.isEmptyText(values))
                     return;
                 this.writeOPA();
-                this.writeBreakscapedTagString(name);
+                this.writeTagKey(name);
                 this.writeColon();
-                this.textGenerator.generateSync(values, (_a = TextFormat_1.TextFormat.fromValue(options.format)) !== null && _a !== void 0 ? _a : TextFormat_1.TextFormat.bitmarkMinusMinus);
+                this.writeTextOrValue(values, (_a = TextFormat_1.TextFormat.fromValue(options.format)) !== null && _a !== void 0 ? _a : TextFormat_1.TextFormat.bitmarkMinusMinus, TextLocation_1.TextLocation.tag);
                 this.writeCL();
             }
             else {
@@ -2377,9 +2508,9 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
                             if (options.ignoreEmpty && val === '')
                                 continue;
                             this.writeOPA();
-                            this.writeBreakscapedTagString(name);
+                            this.writeTagKey(name);
                             this.writeColon();
-                            this.writeBreakscapedTagString(`${val}`);
+                            this.writeTextOrValue(`${val}`, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
                             this.writeCL();
                             // propertyIndex++;
                         }
@@ -2416,35 +2547,14 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         const writeFormat = !isDefault || this.options.explicitTextFormat;
         return !!writeFormat;
     }
-    getTextFormat(route) {
-        for (const node of route) {
-            if (node.key === NodeType_1.NodeType.bitsValue) {
-                const n = node.value;
-                return n === null || n === void 0 ? void 0 : n.textFormat;
-            }
-        }
-        return undefined;
-    }
-    isCardAllowed(route) {
-        const textFormat = this.getTextFormat(route);
-        const isBitmarkText = textFormat === TextFormat_1.TextFormat.bitmarkMinusMinus || textFormat === TextFormat_1.TextFormat.bitmarkPlusPlus;
-        return isBitmarkText && !this.isOfBitType1(route);
-    }
-    isOfBitType1(route) {
-        return this.isOfBitType(route, [BitType_1.BitType.trueFalse1, BitType_1.BitType.multipleChoice1, BitType_1.BitType.multipleResponse1]);
+    calculateIsCardAllowed() {
+        return this.isBodyBitmarkText && !this.isOfBitType1();
     }
-    isOfBitType(route, baseBitType) {
-        const bt = this.getBitType(route);
-        return Config_1.Config.isOfBitType(bt, baseBitType);
+    isOfBitType1() {
+        return this.isOfBitType([BitType_1.BitType.trueFalse1, BitType_1.BitType.multipleChoice1, BitType_1.BitType.multipleResponse1]);
     }
-    getBitType(route) {
-        for (const node of route) {
-            if (node.key === NodeType_1.NodeType.bitsValue) {
-                const n = node.value;
-                return n === null || n === void 0 ? void 0 : n.bitType;
-            }
-        }
-        return undefined;
+    isOfBitType(baseBitType) {
+        return Config_1.Config.isOfBitType(this.bitType, baseBitType);
     }
     //
     // Writer interface