@gmb/bitmark-parser-generator 3.26.0 → 3.28.0

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

@@ -62,8 +62,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         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.textFormat = TextFormat_1.TextFormat.bitmarkText;
         this.isBodyBitmarkText = false;
         this.isCardAllowed = false;
         this.firstBit = true;
@@ -147,8 +146,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     }
     resetState() {
         this.bitType = BitType_1.BitType._error;
-        this.textFormat = TextFormat_1.TextFormat.bitmarkMinusMinus;
-        this.tagTextFormat = TextFormat_1.TextFormat.bitmarkMinusMinus;
+        this.textFormat = TextFormat_1.TextFormat.bitmarkText;
         this.isBodyBitmarkText = false;
         this.isCardAllowed = false;
         this.firstBit = true;
@@ -179,17 +177,8 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         // 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.isBodyBitmarkText = this.textFormat === TextFormat_1.TextFormat.bitmarkText;
         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
@@ -251,7 +240,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             const comment = internalComment[i];
             this.writeNL();
             this.writeProperty('internalComment', comment, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: false,
                 ignoreEmpty: true,
             });
@@ -275,13 +264,13 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             }
             if (haveTrue)
                 this.writeProperty(PropertyTag_1.PropertyTag.labelTrue, value, {
-                    format: PropertyFormat_1.PropertyFormat.trimmedString,
+                    format: PropertyFormat_1.PropertyFormat.plainText,
                     single: true,
                     ignoreEmpty: true,
                 });
             if (haveFalse)
                 this.writeProperty(PropertyTag_1.PropertyTag.labelFalse, bit.labelFalse, {
-                    format: PropertyFormat_1.PropertyFormat.trimmedString,
+                    format: PropertyFormat_1.PropertyFormat.plainText,
                     single: true,
                     ignoreEmpty: true,
                 });
@@ -303,32 +292,32 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         const { url, mockupId, size, format, trim } = imageSource;
         this.writeNL();
         this.writeProperty('imageSource', url, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
         if (url) {
             if (mockupId)
                 this.writeProperty('mockupId', mockupId, {
-                    format: PropertyFormat_1.PropertyFormat.trimmedString,
+                    format: PropertyFormat_1.PropertyFormat.plainText,
                     single: true,
                     ignoreEmpty: true,
                 });
             if (size)
                 this.writeProperty('size', size, {
-                    format: PropertyFormat_1.PropertyFormat.trimmedString,
+                    format: PropertyFormat_1.PropertyFormat.plainText,
                     single: true,
                     ignoreEmpty: true,
                 });
             if (format)
                 this.writeProperty('format', format, {
-                    format: PropertyFormat_1.PropertyFormat.trimmedString,
+                    format: PropertyFormat_1.PropertyFormat.plainText,
                     single: true,
                     ignoreEmpty: true,
                 });
             if (BooleanUtils_1.BooleanUtils.isBoolean(trim))
                 this.writeProperty('trim', trim, {
-                    format: PropertyFormat_1.PropertyFormat.trimmedString,
+                    format: PropertyFormat_1.PropertyFormat.plainText,
                     single: true,
                     ignoreEmpty: true,
                 });
@@ -346,13 +335,13 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         const { technicalTerm, lang } = nodeValue;
         this.writeNL();
         this.writeProperty('technicalTerm', technicalTerm, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
         if (lang != null) {
             this.writeProperty('lang', lang, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: true,
                 ignoreEmpty: true,
             });
@@ -370,41 +359,41 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         const { servings, unit, unitAbbr, decimalPlaces, disableCalculation, hint } = nodeValue;
         this.writeNL();
         this.writeProperty('servings', servings, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
         if (unit != null) {
             this.writeProperty('unit', unit, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: true,
                 ignoreEmpty: true,
             });
         }
         if (unitAbbr != null) {
             this.writeProperty('unitAbbr', unitAbbr, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: true,
                 ignoreEmpty: true,
             });
         }
         if (decimalPlaces != null) {
             this.writeProperty('decimalPlaces', decimalPlaces, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: true,
                 ignoreEmpty: true,
             });
         }
         if (disableCalculation != null) {
             this.writeProperty('disableCalculation', disableCalculation, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: true,
                 ignoreEmpty: true,
             });
         }
         if (hint != null) {
             this.writeOPQ();
-            this.writeTextOrValue(hint, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+            this.writeTextOrValue(hint, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
         return false;
@@ -419,13 +408,13 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         const { name, title, avatarImage } = person;
         this.writeNL();
         this.writeProperty('person', name, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
         if (title) {
             this.writeProperty('title', title, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: true,
                 ignoreEmpty: true,
             });
@@ -509,7 +498,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         // Handle as a standard icon property
         this.writeNL();
         this.writeProperty('icon', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
@@ -539,13 +528,13 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         const levelKey = node.key === NodeType_1.NodeType.ratingLevelStart ? PropertyTag_1.PropertyTag.ratingLevelStart : PropertyTag_1.PropertyTag.ratingLevelEnd;
         this.writeNL();
         this.writeProperty(levelKey, level, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
         if (label) {
             this.writeProperty('label', label, {
-                format: PropertyFormat_1.PropertyFormat.bitmarkMinusMinus,
+                format: PropertyFormat_1.PropertyFormat.bitmarkText,
                 single: true,
                 ignoreEmpty: true,
             });
@@ -569,20 +558,20 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (mark) {
             this.writeNL();
             this.writeProperty('mark', mark, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: true,
                 ignoreEmpty: true,
             });
             if (color) {
                 this.writeProperty('color', color, {
-                    format: PropertyFormat_1.PropertyFormat.trimmedString,
+                    format: PropertyFormat_1.PropertyFormat.plainText,
                     single: true,
                     ignoreEmpty: true,
                 });
             }
             if (emphasis) {
                 this.writeProperty('emphasis', emphasis, {
-                    format: PropertyFormat_1.PropertyFormat.trimmedString,
+                    format: PropertyFormat_1.PropertyFormat.plainText,
                     single: true,
                     ignoreEmpty: true,
                 });
@@ -596,7 +585,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (node.value) {
             this.writeNL();
             this.writeProperty('partialAnswer', node.value, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: true,
                 ignoreEmpty: true,
             });
@@ -609,7 +598,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (node.value) {
             this.writeNL();
             this.writeProperty('partialAnswer', node.value, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: true,
                 ignoreEmpty: true,
             });
@@ -623,7 +612,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (node.value) {
             this.writeNL();
             this.writeProperty('sampleSolution', node.value, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: true,
                 ignoreEmpty: true,
             });
@@ -635,7 +624,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (node.value) {
             this.writeNL();
             this.writeProperty('sampleSolution', node.value, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: true,
                 ignoreEmpty: true,
             });
@@ -648,7 +637,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     leaf_reasonableNumOfChars(node, _route) {
         this.writeNL();
         this.writeProperty('reasonableNumOfChars', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
@@ -661,7 +650,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return;
         this.writeNL();
         this.writeProperty('additionalSolutions', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: false,
         });
     }
@@ -680,7 +669,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return true; // Will be handled by marginNumber
         this.writeNL_IfNotChain(route);
         this.writeOPC();
-        this.writeTextOrValue(item, this.tagTextFormat, TextLocation_1.TextLocation.tag);
+        this.writeTextOrValue(item, TextFormat_1.TextFormat.bitmarkText, TextLocation_1.TextLocation.tag);
         this.writeCL();
         return true;
     }
@@ -697,10 +686,10 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return true; // Will be handled by marginNumber
         this.writeNL_IfNotChain(route);
         this.writeOPC();
-        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.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 : '', TextFormat_1.TextFormat.bitmarkText, TextLocation_1.TextLocation.tag);
         this.writeCL();
         this.writeOPC();
-        this.writeTextOrValue(lead, this.tagTextFormat, TextLocation_1.TextLocation.tag);
+        this.writeTextOrValue(lead, TextFormat_1.TextFormat.bitmarkText, TextLocation_1.TextLocation.tag);
         this.writeCL();
         return true;
     }
@@ -715,13 +704,13 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return true; // Will be handled by marginNumber
         this.writeNL_IfNotChain(route);
         this.writeOPC();
-        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.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 : '', TextFormat_1.TextFormat.bitmarkText, TextLocation_1.TextLocation.tag);
         this.writeCL();
         this.writeOPC();
-        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.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 : '', TextFormat_1.TextFormat.bitmarkText, TextLocation_1.TextLocation.tag);
         this.writeCL();
         this.writeOPC();
-        this.writeTextOrValue(pageNumber !== null && pageNumber !== void 0 ? pageNumber : '', this.tagTextFormat, TextLocation_1.TextLocation.tag);
+        this.writeTextOrValue(pageNumber !== null && pageNumber !== void 0 ? pageNumber : '', TextFormat_1.TextFormat.bitmarkText, TextLocation_1.TextLocation.tag);
         this.writeCL();
         return true;
     }
@@ -734,16 +723,16 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return false; // Ignore empty
         this.writeNL_IfNotChain(route);
         this.writeOPC();
-        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.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 : '', TextFormat_1.TextFormat.bitmarkText, TextLocation_1.TextLocation.tag);
         this.writeCL();
         this.writeOPC();
-        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.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 : '', TextFormat_1.TextFormat.bitmarkText, TextLocation_1.TextLocation.tag);
         this.writeCL();
         this.writeOPC();
-        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.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 : '', TextFormat_1.TextFormat.bitmarkText, TextLocation_1.TextLocation.tag);
         this.writeCL();
         this.writeOPC();
-        this.writeTextOrValue(marginNumber, this.tagTextFormat, TextLocation_1.TextLocation.tag);
+        this.writeTextOrValue(marginNumber, TextFormat_1.TextFormat.bitmarkText, TextLocation_1.TextLocation.tag);
         this.writeCL();
         return true;
     }
@@ -765,7 +754,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
                 if (text) {
                     this.writePlainTextDivider();
                     this.writeNL();
-                    this.writeTextOrValue(text, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.body);
+                    this.writeTextOrValue(text, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.body);
                 }
             }
         }
@@ -784,7 +773,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             this.writePlainTextDivider();
             this.writeNL();
             const s = (StringUtils_1.StringUtils.isString(body.body) ? body.body : '');
-            this.writeTextOrValue(`${s}`, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.body);
+            this.writeTextOrValue(`${s}`, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.body);
         }
         // Stop traversal of this branch
         return false;
@@ -811,7 +800,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         else {
             for (const solution of gap.solutions) {
                 this.writeOPU();
-                this.writeTextOrValue(solution, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+                this.writeTextOrValue(solution, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
                 this.writeCL();
             }
         }
@@ -822,7 +811,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     enter_mark(node, _route) {
         const mark = node.value;
         this.writeOPE();
-        this.writeTextOrValue(mark.solution, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+        this.writeTextOrValue(mark.solution, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
         this.writeCL();
         // Continue traversal
         return true;
@@ -852,7 +841,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             if (this.isBodyBitmarkText) {
                 // handle bitmark text
                 this.writeNL();
-                this.writeTextOrValue('==== footer ====', TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.body);
+                this.writeTextOrValue('==== footer ====', TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.body);
                 this.writeNL();
                 // The text generator will write to the writer
                 this.writeTextOrValue(footer.footer, this.textFormat, TextLocation_1.TextLocation.body, {
@@ -894,7 +883,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return;
         if (solution) {
             this.writeOPE();
-            this.writeTextOrValue(solution, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+            this.writeTextOrValue(solution, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
     }
@@ -906,7 +895,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         const mark = node.value;
         if (mark) {
             this.writeProperty('mark', mark, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: true,
                 ignoreEmpty: true,
             });
@@ -921,7 +910,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         else {
             this.writeOPM();
         }
-        this.writeTextOrValue(selectOption.text, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+        this.writeTextOrValue(selectOption.text, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
         this.writeCL();
         // Continue traversal
         return true;
@@ -935,7 +924,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         else {
             this.writeOPM();
         }
-        this.writeTextOrValue(highlightText.text, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+        this.writeTextOrValue(highlightText.text, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
         this.writeCL();
         // Continue traversal
         return true;
@@ -1016,7 +1005,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         else {
             this.writeOPM();
         }
-        this.writeTextOrValue(statement.statement, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+        this.writeTextOrValue(statement.statement, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
         this.writeCL();
         // Continue traversal
         return true;
@@ -1033,7 +1022,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         else {
             this.writeOPM();
         }
-        this.writeTextOrValue(choice.choice, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+        this.writeTextOrValue(choice.choice, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
         this.writeCL();
         // Continue traversal
         return true;
@@ -1049,7 +1038,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         else {
             this.writeOPM();
         }
-        this.writeTextOrValue(response.response, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+        this.writeTextOrValue(response.response, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
         this.writeCL();
         // Continue traversal
         return true;
@@ -1182,13 +1171,13 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     leaf_columnsValue(node, _route) {
         this.writeNL();
         this.writeOPHASH();
-        this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+        this.writeTextOrValue(node.value, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
         this.writeCL();
     }
     enter_columnsValue(node, _route) {
         this.writeNL();
         this.writeOPHASH();
-        this.writeTextOrValue(node.value, this.tagTextFormat, TextLocation_1.TextLocation.tag);
+        this.writeTextOrValue(node.value, TextFormat_1.TextFormat.bitmarkText, TextLocation_1.TextLocation.tag);
         this.writeCL();
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> table -> data -> dataValue
@@ -1224,7 +1213,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
                     this.writeNL();
                     this.writeOP();
                     this.writeHash();
-                    this.writeTextOrValue(cell.title, this.tagTextFormat, TextLocation_1.TextLocation.tag);
+                    this.writeTextOrValue(cell.title, TextFormat_1.TextFormat.bitmarkText, TextLocation_1.TextLocation.tag);
                     this.writeCL();
                 }
                 if (cell.audio) {
@@ -1320,7 +1309,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (ingredient.title != null) {
             this.writeNL();
             this.writeOPHASH();
-            this.writeTextOrValue(ingredient.title, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+            this.writeTextOrValue(ingredient.title, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
             this.writeCL();
             // this.writeNL();
         }
@@ -1336,34 +1325,34 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         // [!43]
         if (ingredient.quantity != null) {
             this.writeOPB();
-            this.writeTextOrValue(`${ingredient.quantity}`, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+            this.writeTextOrValue(`${ingredient.quantity}`, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
         // [@unit:kilograms]
         if (ingredient.unit != null)
             this.writeProperty('unit', ingredient.unit, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: true,
                 ignoreEmpty: true,
             });
         // [@unitAbbr:kg]
         if (ingredient.unitAbbr != null)
             this.writeProperty('unitAbbr', ingredient.unitAbbr, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: true,
                 ignoreEmpty: true,
             });
         // [@decimalPlaces:1]
         if (ingredient.decimalPlaces != null)
             this.writeProperty('decimalPlaces', ingredient.decimalPlaces, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: true,
                 ignoreEmpty: true,
             });
         // [@disableCalculation]
         if (ingredient.disableCalculation)
             this.writeProperty('disableCalculation', true, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: true,
                 ignoreEmpty: true,
             });
@@ -1396,7 +1385,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return;
         this.writeNL();
         this.writeOPB();
-        this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+        this.writeTextOrValue(node.value, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
         this.writeCL();
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> botResponses -> botResponsesValue -> reaction
@@ -1406,7 +1395,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return;
         this.writeNL();
         this.writeProperty('reaction', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
@@ -1443,7 +1432,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             const posterImage = node.value;
             if (posterImage) {
                 this.writeProperty('posterImage', posterImage, {
-                    format: PropertyFormat_1.PropertyFormat.trimmedString,
+                    format: PropertyFormat_1.PropertyFormat.plainText,
                     single: true,
                     ignoreEmpty: true,
                 });
@@ -1454,7 +1443,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             const posterImage = node.value;
             if (posterImage && posterImage.src) {
                 this.writeProperty('posterImage', posterImage.src, {
-                    format: PropertyFormat_1.PropertyFormat.trimmedString,
+                    format: PropertyFormat_1.PropertyFormat.plainText,
                     single: true,
                     ignoreEmpty: true,
                 });
@@ -1476,7 +1465,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
                 const thumbnail = thumbnails[i];
                 const key = thumbnailKeys[i];
                 this.writeProperty(key, thumbnail.src, {
-                    format: PropertyFormat_1.PropertyFormat.trimmedString,
+                    format: PropertyFormat_1.PropertyFormat.plainText,
                     single: true,
                     ignoreEmpty: true,
                 });
@@ -1525,7 +1514,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             this.writeOP();
             for (let i = 0; i < +level; i++)
                 this.writeHash();
-            this.writeTextOrValue(title, this.tagTextFormat, TextLocation_1.TextLocation.tag);
+            this.writeTextOrValue(title, TextFormat_1.TextFormat.bitmarkText, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
         // Stop traversal of this branch
@@ -1545,7 +1534,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             this.writeOP();
             for (let i = 0; i < level; i++)
                 this.writeHash();
-            this.writeTextOrValue(subtitle, this.tagTextFormat, TextLocation_1.TextLocation.tag);
+            this.writeTextOrValue(subtitle, TextFormat_1.TextFormat.bitmarkText, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
         // Stop traversal of this branch
@@ -1563,17 +1552,17 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (book) {
             this.writeNL();
             this.writeProperty('book', book.book, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: true,
                 ignoreEmpty: false,
             });
             if (book.reference) {
                 this.writeOPRANGLE();
-                this.writeTextOrValue(book.reference, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+                this.writeTextOrValue(book.reference, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
                 this.writeCL();
                 if (book.referenceEnd) {
                     this.writeOPRANGLE();
-                    this.writeTextOrValue(book.referenceEnd, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+                    this.writeTextOrValue(book.referenceEnd, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
                     this.writeCL();
                 }
             }
@@ -1588,17 +1577,17 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (bit && node.value) {
             this.writeNL();
             this.writeProperty('book', node.value, {
-                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                format: PropertyFormat_1.PropertyFormat.plainText,
                 single: true,
                 ignoreEmpty: false,
             });
             if (bit.reference) {
                 this.writeOPRANGLE();
-                this.writeTextOrValue(bit.reference, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+                this.writeTextOrValue(bit.reference, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
                 this.writeCL();
                 if (bit.referenceEnd) {
                     this.writeOPRANGLE();
-                    this.writeTextOrValue(bit.referenceEnd, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+                    this.writeTextOrValue(bit.referenceEnd, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
                     this.writeCL();
                 }
             }
@@ -1609,7 +1598,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (node.value) {
             this.writeNL();
             this.writeOPDANGLE();
-            this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+            this.writeTextOrValue(node.value, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
     }
@@ -1622,7 +1611,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             if (!bit.book) {
                 this.writeNL();
                 this.writeOPRANGLE();
-                this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+                this.writeTextOrValue(node.value, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
                 this.writeCL();
             }
         }
@@ -1636,7 +1625,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (!this.isEmptyText(text)) {
             this.writeNL_IfNotChain(route);
             this.writeOPQ();
-            this.writeTextOrValue(text, this.tagTextFormat, TextLocation_1.TextLocation.tag);
+            this.writeTextOrValue(text, TextFormat_1.TextFormat.bitmarkText, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
         // Stop traversal of this branch
@@ -1649,7 +1638,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (!this.isEmptyText(text)) {
             this.writeNL_IfNotChain(route);
             this.writeOPB();
-            this.writeTextOrValue(text, this.tagTextFormat, TextLocation_1.TextLocation.tag);
+            this.writeTextOrValue(text, TextFormat_1.TextFormat.bitmarkText, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
         // Stop traversal of this branch
@@ -1672,7 +1661,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return;
         this.writeNL();
         this.writeProperty('refAuthor', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: false,
             ignoreEmpty: true,
         });
@@ -1683,7 +1672,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return;
         this.writeNL();
         this.writeProperty('refBookTitle', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
@@ -1694,7 +1683,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return;
         this.writeNL();
         this.writeProperty('refPublisher', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: false,
             ignoreEmpty: true,
         });
@@ -1705,7 +1694,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return;
         this.writeNL();
         this.writeProperty('refPublicationYear', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
@@ -1716,7 +1705,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return;
         this.writeNL();
         this.writeProperty('citationStyle', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
@@ -1744,11 +1733,11 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             }
             else if (Array.isArray(example)) {
                 // TextAst
-                this.writeTextOrValue(example, this.tagTextFormat, TextLocation_1.TextLocation.tag);
+                this.writeTextOrValue(example, TextFormat_1.TextFormat.bitmarkText, TextLocation_1.TextLocation.tag);
             }
             else {
                 // String
-                this.writeTextOrValue(example, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+                this.writeTextOrValue(example, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
             }
             this.writeCL();
         }
@@ -1774,7 +1763,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return;
         if (node.value != null) {
             this.writeOPU();
-            this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+            this.writeTextOrValue(node.value, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
     }
@@ -1783,7 +1772,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     leaf_prefix(node, _route) {
         if (node.value) {
             this.writeOPPRE();
-            this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+            this.writeTextOrValue(node.value, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
     }
@@ -1792,7 +1781,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     leaf_postfix(node, _route) {
         if (node.value) {
             this.writeOPPOST();
-            this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+            this.writeTextOrValue(node.value, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
             this.writeCL();
         }
     }
@@ -1810,21 +1799,21 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     leaf_forKeys(node, _route) {
         this.writeNL();
         this.writeOPHASH();
-        this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+        this.writeTextOrValue(node.value, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
         this.writeCL();
     }
     // bitmarkAst -> bits -> bitsValue -> heading -> forValues
     leaf_forValues(node, _route) {
         this.writeNL();
         this.writeOPHASH();
-        this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+        this.writeTextOrValue(node.value, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
         this.writeCL();
     }
     // bitmarkAst -> bits -> bitsValue -> heading -> forValuesValue
     leaf_forValuesValue(node, _route) {
         this.writeNL();
         this.writeOPHASH();
-        this.writeTextOrValue(node.value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+        this.writeTextOrValue(node.value, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
         this.writeCL();
     }
     // bitmarkAst -> bits -> bitsValue -> pairs -> pairsValue -> key
@@ -1862,49 +1851,49 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     // [src1x,src2x,src3x,src4x,width,height,alt,zoomDisabled,caption]
     leaf_src1x(node, _route) {
         this.writeProperty('src1x', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
     }
     leaf_src2x(node, _route) {
         this.writeProperty('src2x', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
     }
     leaf_src3x(node, _route) {
         this.writeProperty('src3x', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
     }
     leaf_src4x(node, _route) {
         this.writeProperty('src4x', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
     }
     leaf_width(node, _route) {
         this.writeProperty('width', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
     }
     leaf_height(node, _route) {
         this.writeProperty('height', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
     }
     leaf_alt(node, _route) {
         this.writeProperty('alt', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
@@ -1934,14 +1923,14 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     }
     leaf_license(node, _route) {
         this.writeProperty('license', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
     }
     leaf_copyright(node, _route) {
         this.writeProperty('copyright', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
@@ -1965,7 +1954,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         const value = node.value;
         this.writeNL_IfNotChain(route);
         this.writeProperty('caption', value, {
-            format: PropertyFormat_1.PropertyFormat.bitmarkMinusMinus,
+            format: PropertyFormat_1.PropertyFormat.bitmarkText,
             single: true, // ??
             ignoreEmpty: true,
         });
@@ -1978,7 +1967,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return;
         this.writeNL_IfNotChain(route);
         this.writeProperty('search', value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
@@ -1993,7 +1982,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if ((parent === null || parent === void 0 ? void 0 : parent.key) === NodeType_1.NodeType.bitsValue)
             return;
         this.writeProperty('duration', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            format: PropertyFormat_1.PropertyFormat.plainText,
             single: true,
             ignoreEmpty: true,
         });
@@ -2103,7 +2092,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
                 // Write the property
                 this.writeNL_IfNotChain(route); // Only if NOT in chain
                 this.writeProperty(propertyConfig.tag, node.value, {
-                    format: (_a = propertyConfig.format) !== null && _a !== void 0 ? _a : PropertyFormat_1.PropertyFormat.trimmedString,
+                    format: (_a = propertyConfig.format) !== null && _a !== void 0 ? _a : PropertyFormat_1.PropertyFormat.plainText,
                     single: (_b = propertyConfig.single) !== null && _b !== void 0 ? _b : false,
                     ignoreFalse: propertyConfig.defaultValue === 'false',
                     ignoreTrue: propertyConfig.defaultValue === 'true',
@@ -2225,7 +2214,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     writeTagKey(s) {
         if (s != null) {
             this.write(Breakscape_1.Breakscape.breakscape(`${s}`, {
-                textFormat: TextFormat_1.TextFormat.text,
+                textFormat: TextFormat_1.TextFormat.plainText,
                 textLocation: TextLocation_1.TextLocation.tag,
             }));
         }
@@ -2245,8 +2234,8 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         const s = typeof text === 'string' ? text : undefined;
         const ast = Array.isArray(text) ? text : undefined;
         const spaces = isTagValue ? this.spacesAroundValuesStr : '';
-        // For plain strings use TextFormat.text, otherwise keep the requested format
-        const effectiveFmt = format === TextFormat_1.TextFormat.bitmarkPlusPlus || format === TextFormat_1.TextFormat.bitmarkMinusMinus ? format : TextFormat_1.TextFormat.text;
+        // For plain strings use TextFormat.text, otherwise keep the requested format for breakscaping.
+        const breakscapeFormat = format === TextFormat_1.TextFormat.bitmarkText ? format : TextFormat_1.TextFormat.plainText;
         /** Wrap a piece of text in the required padding (only for tag values). */
         const wrap = (content) => (isTagValue ? `${spaces}${content}${spaces}` : content);
         /**
@@ -2266,7 +2255,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         /* String */
         if (s != null) {
             const writeString = () => this.write(Breakscape_1.Breakscape.breakscape(s, {
-                textFormat: effectiveFmt,
+                textFormat: breakscapeFormat,
                 textLocation: location,
             }));
             if (isTagValue) {
@@ -2455,7 +2444,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             this.writeOPA();
             this.writeTagKey(key);
             this.writeColon();
-            this.writeTextOrValue(src, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+            this.writeTextOrValue(src, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
             if (resource.type === ResourceTag_1.ResourceTag.article) {
                 // this.writeNL();
             }
@@ -2469,7 +2458,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             this.writeOPAMP();
             this.writeTagKey(type);
             this.writeColon();
-            this.writeTextOrValue(value, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+            this.writeTextOrValue(value, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
             if (type === ResourceTag_1.ResourceTag.article) {
                 // this.writeNL();
             }
@@ -2477,10 +2466,9 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         }
     }
     writeProperty(name, values, options) {
-        var _a;
         let valuesArray;
         if (values !== undefined) {
-            const isBitmarkText = options.format === PropertyFormat_1.PropertyFormat.bitmarkMinusMinus || options.format === PropertyFormat_1.PropertyFormat.bitmarkPlusPlus;
+            const isBitmarkText = options.format === PropertyFormat_1.PropertyFormat.bitmarkText;
             if (isBitmarkText) {
                 // Write bitmark text
                 if (options.ignoreEmpty && isBitmarkText && this.isEmptyText(values))
@@ -2488,7 +2476,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
                 this.writeOPA();
                 this.writeTagKey(name);
                 this.writeColon();
-                this.writeTextOrValue(values, (_a = TextFormat_1.TextFormat.fromValue(options.format)) !== null && _a !== void 0 ? _a : TextFormat_1.TextFormat.bitmarkMinusMinus, TextLocation_1.TextLocation.tag);
+                this.writeTextOrValue(values, TextFormat_1.TextFormat.bitmarkText, TextLocation_1.TextLocation.tag);
                 this.writeCL();
             }
             else {
@@ -2513,7 +2501,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
                             this.writeOPA();
                             this.writeTagKey(name);
                             this.writeColon();
-                            this.writeTextOrValue(`${val}`, TextFormat_1.TextFormat.text, TextLocation_1.TextLocation.tag);
+                            this.writeTextOrValue(`${val}`, TextFormat_1.TextFormat.plainText, TextLocation_1.TextLocation.tag);
                             this.writeCL();
                             // propertyIndex++;
                         }