@gmb/bitmark-parser-generator 3.10.0 → 3.12.0

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

@@ -32,6 +32,9 @@ const DEFAULT_OPTIONS = {
 };
 /**
  * Generate bitmark markup from a bitmark AST
+ *
+ * NOTE: Newlines - a newline is written BEFORE each content that requries a newline
+ *
  */
 class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     /**
@@ -54,10 +57,9 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         super();
         this.ast = new Ast_1.Ast();
         // State
+        this.firstBit = true;
         this.hasCardSet = false;
         this.hasFooter = false;
-        this.skipNLBetweenBitsValue = false;
-        this.wroteSomething = false;
         this.inTag = true;
         // Keep TS happy
         this.inTag;
@@ -130,10 +132,9 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         this.writer.closeSync();
     }
     resetState() {
+        this.firstBit = true;
         this.hasCardSet = false;
         this.hasFooter = false;
-        this.skipNLBetweenBitsValue = false;
-        this.wroteSomething = false;
         this.inTag = true;
         this.printed = false;
     }
@@ -150,12 +151,6 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     // Non-Terminal nodes (branches)
     //
     // bitmark
-    // bitmarkAst -> bits
-    between_bits(_node, _left, _right, _route) {
-        this.writeNL();
-        this.writeNL();
-        this.writeNL();
-    }
     // bitmarkAst -> bits -> bitsValue
     enter_bitsValue(node, _route) {
         const bit = node.value;
@@ -163,6 +158,12 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         const bitResourcesConfig = Config_1.Config.getBitResourcesConfig(bit.bitType, bit.resourceType);
         this.hasCardSet = this.haveValidCardSet(bit);
         this.hasFooter = this.haveValidFooter(bit);
+        // Separate the bits with 3 newlines
+        if (!this.firstBit) {
+            this.writeNL();
+            this.writeNL();
+            this.writeNL();
+        }
         // Write the bit tag opening
         this.writeOPD(bit.bitLevel);
         if (bit.isCommented)
@@ -198,22 +199,12 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             this.writeBreakscapedTagString(resourceType);
         }
         this.writeCL();
-        this.writeNL();
+        // this.writeNL();
         // Continue traversal
         return true;
     }
-    between_bitsValue(node, left, right, route) {
-        // The following keys are combined with other keys so don't need newlines
-        const noNlKeys = [
-            NodeType_1.NodeType.bitType,
-            NodeType_1.NodeType.textFormat,
-            NodeType_1.NodeType.level,
-            NodeType_1.NodeType.progress,
-            NodeType_1.NodeType.toc,
-            NodeType_1.NodeType.referenceEnd,
-            NodeType_1.NodeType.labelFalse,
-        ];
-        this.writeNlBetween(node, left, right, route, noNlKeys);
+    exit_bitsValue(_node, _route) {
+        this.firstBit = false;
     }
     // bitmarkAst -> bits -> bitsValue -> internalComment
     enter_internalComment(node, route) {
@@ -224,14 +215,12 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return true;
         for (let i = 0; i < internalComment.length; i++) {
             const comment = internalComment[i];
-            const last = i === internalComment.length - 1;
+            this.writeNL();
             this.writeProperty('internalComment', comment, {
                 format: PropertyFormat_1.PropertyFormat.trimmedString,
                 single: false,
                 ignoreEmpty: true,
             });
-            if (!last)
-                this.writeNL();
         }
         // Stop traversal of this branch
         return false;
@@ -245,13 +234,18 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return true;
         const bit = parent === null || parent === void 0 ? void 0 : parent.value;
         if (bit) {
-            if (value != '')
+            const haveTrue = value != '';
+            const haveFalse = bit.labelFalse && bit.labelFalse[0] != '';
+            if (haveTrue || haveFalse) {
+                this.writeNL();
+            }
+            if (haveTrue)
                 this.writeProperty(PropertyTag_1.PropertyTag.labelTrue, value, {
                     format: PropertyFormat_1.PropertyFormat.trimmedString,
                     single: true,
                     ignoreEmpty: true,
                 });
-            if (bit.labelFalse && bit.labelFalse[0] != '')
+            if (haveFalse)
                 this.writeProperty(PropertyTag_1.PropertyTag.labelFalse, bit.labelFalse, {
                     format: PropertyFormat_1.PropertyFormat.trimmedString,
                     single: true,
@@ -261,6 +255,10 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         // Stop traversal of this branch
         return false;
     }
+    enter_labelFalse(_node, _route) {
+        // Handled above in enter_labelTrue(), but this function needed to block automatic property handling
+        return true;
+    }
     // bitmarkAst -> bits -> bitsValue -> imageSource
     enter_imageSource(node, route) {
         const imageSource = node.value;
@@ -269,6 +267,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.bitsValue)
             return true;
         const { url, mockupId, size, format, trim } = imageSource;
+        this.writeNL();
         this.writeProperty('imageSource', url, {
             format: PropertyFormat_1.PropertyFormat.trimmedString,
             single: true,
@@ -311,6 +310,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.bitsValue)
             return true;
         const { technicalTerm, lang } = nodeValue;
+        this.writeNL();
         this.writeProperty('technicalTerm', technicalTerm, {
             format: PropertyFormat_1.PropertyFormat.trimmedString,
             single: true,
@@ -334,6 +334,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.bitsValue)
             return true;
         const { servings, unit, unitAbbr, decimalPlaces, disableCalculation, hint } = nodeValue;
+        this.writeNL();
         this.writeProperty('servings', servings, {
             format: PropertyFormat_1.PropertyFormat.trimmedString,
             single: true,
@@ -387,6 +388,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.bitsValue)
             return true;
         const { name, title, avatarImage } = person;
+        this.writeNL();
         this.writeProperty('person', name, {
             format: PropertyFormat_1.PropertyFormat.trimmedString,
             single: true,
@@ -405,6 +407,88 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         // Stop traversal of this branch
         return false;
     }
+    // bitmarkAst -> bits -> bitsValue -> cardNode -> definitions -> definitionsValue -> term -> text
+    // bitmarkAst -> bits -> bitsValue -> cardNode -> definitions -> definitionsValue -> definition -> text
+    // bitmarkAst -> bits -> bitsValue -> cardNode -> definitions -> definitionsValue -> alternativeDefinitions
+    // -> alternativeDefinitionsValue -> text
+    // bitmarkAst -> bits -> bitsValue -> cardNode -> flashcards -> flashcardsValue -> question -> text
+    // bitmarkAst -> bits -> bitsValue -> cardNode -> flashcards -> flashcardsValue -> answer -> text
+    // bitmarkAst -> bits -> bitsValue -> cardNode -> flashcards -> flashcardsValue -> alternativeAnswers ->
+    // -> alternativeAnswersValue -> text
+    enter_text(node, route) {
+        const parent = this.getParentNode(route);
+        if (!parent ||
+            (parent.key !== NodeType_1.NodeType.term &&
+                parent.key !== NodeType_1.NodeType.definition &&
+                parent.key !== NodeType_1.NodeType.alternativeDefinitionsValue &&
+                parent.key !== NodeType_1.NodeType.question &&
+                parent.key !== NodeType_1.NodeType.answer &&
+                parent.key !== NodeType_1.NodeType.alternativeAnswersValue)) {
+            return true;
+        }
+        if (node.value) {
+            this.writeNL();
+            this.textGenerator.generateSync(node.value, TextFormat_1.TextFormat.bitmarkMinusMinus);
+        }
+        // Stop traversal of this branch
+        return false;
+    }
+    leaf_text(node, route) {
+        const parent = this.getParentNode(route);
+        if (!parent ||
+            (parent.key !== NodeType_1.NodeType.term &&
+                parent.key !== NodeType_1.NodeType.definition &&
+                parent.key !== NodeType_1.NodeType.alternativeDefinitionsValue &&
+                parent.key !== NodeType_1.NodeType.question &&
+                parent.key !== NodeType_1.NodeType.answer &&
+                parent.key !== NodeType_1.NodeType.alternativeAnswersValue)) {
+            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,
+            }));
+        }
+        // Stop traversal of this branch
+        return false;
+    }
+    // bitmarkAst -> bits -> bitsValue -> * -> term -> icon
+    // bitmarkAst -> bits -> bitsValue -> * -> definition -> icon
+    // bitmarkAst -> bits -> bitsValue -> * -> alternativeDefinitionsValue -> icon
+    enter_icon(node, route) {
+        const resource = node.value;
+        const parent = this.getParentNode(route);
+        if (!parent)
+            return true;
+        if (parent.key !== NodeType_1.NodeType.term &&
+            parent.key !== NodeType_1.NodeType.definition &&
+            parent.key !== NodeType_1.NodeType.alternativeDefinitionsValue &&
+            parent.key !== NodeType_1.NodeType.question &&
+            parent.key !== NodeType_1.NodeType.answer &&
+            parent.key !== NodeType_1.NodeType.alternativeAnswersValue) {
+            // Continue traversal of this branch
+            return true;
+        }
+        // This is a resource, so handle it with the common code
+        this.writeNL();
+        this.writeResource(ResourceTag_1.ResourceTag.icon, resource.src);
+        // this.writePropertyStyleResource(ResourceTag.icon, resource as ResourceJson);
+        // Continue traversal of this branch (for the chained properties)
+        return true;
+    }
+    leaf_iconValue(node, _route) {
+        // Handle as a standard icon property
+        this.writeNL();
+        this.writeProperty('icon', node.value, {
+            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            single: true,
+            ignoreEmpty: true,
+        });
+        // Stop traversal of this branch
+        return false;
+    }
     // bitmarkAst -> bits -> bitsValue -> ratingLevelStart
     enter_ratingLevelStart(node, route) {
         this.enterRatingLevelStartEndCommon(node, route);
@@ -426,6 +510,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return true;
         const { level, label } = n;
         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,
             single: true,
@@ -455,6 +540,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return true;
         const { mark, color, emphasis } = markConfig;
         if (mark) {
+            this.writeNL();
             this.writeProperty('mark', mark, {
                 format: PropertyFormat_1.PropertyFormat.trimmedString,
                 single: true,
@@ -474,74 +560,79 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
                     ignoreEmpty: true,
                 });
             }
-            this.writeNL();
         }
         // Stop traversal of this branch
         return false;
     }
     // bitmarkAst -> bits -> bitsValue -> partialAnswer
     enter_partialAnswer(node, _route) {
-        this.writeProperty('partialAnswer', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
-            single: true,
-            ignoreEmpty: true,
-        });
+        if (node.value) {
+            this.writeNL();
+            this.writeProperty('partialAnswer', node.value, {
+                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                single: true,
+                ignoreEmpty: true,
+            });
+        }
         // Stop traversal of this branch
         return false;
     }
     // bitmarkAst -> bits -> bitsValue -> questions -> questionsValue -> partialAnswer
     leaf_partialAnswer(node, _route) {
-        this.writeProperty('partialAnswer', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
-            single: true,
-            ignoreEmpty: true,
-        });
+        if (node.value) {
+            this.writeNL();
+            this.writeProperty('partialAnswer', node.value, {
+                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                single: true,
+                ignoreEmpty: true,
+            });
+        }
         // Stop traversal of this branch
         return false;
     }
     // bitmarkAst -> bits -> bitsValue -> sampleSolution
     // bitmarkAst -> bits -> bitsValue -> questions -> questionsValue -> sampleSolution
     enter_sampleSolution(node, _route) {
-        this.writeProperty('sampleSolution', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
-            single: true,
-            ignoreEmpty: true,
-        });
+        if (node.value) {
+            this.writeNL();
+            this.writeProperty('sampleSolution', node.value, {
+                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                single: true,
+                ignoreEmpty: true,
+            });
+        }
         // Stop traversal of this branch
         return false;
     }
     leaf_sampleSolution(node, _route) {
-        this.writeProperty('sampleSolution', node.value, {
-            format: PropertyFormat_1.PropertyFormat.trimmedString,
-            single: true,
-            ignoreEmpty: true,
-        });
+        if (node.value) {
+            this.writeNL();
+            this.writeProperty('sampleSolution', node.value, {
+                format: PropertyFormat_1.PropertyFormat.trimmedString,
+                single: true,
+                ignoreEmpty: true,
+            });
+        }
         // Stop traversal of this branch
         return false;
     }
     // bitmarkAst -> bits -> bitsValue -> reasonableNumOfChars
     // bitmarkAst -> bits -> bitsValue -> questions -> questionsValue -> reasonableNumOfChars
     leaf_reasonableNumOfChars(node, _route) {
+        this.writeNL();
         this.writeProperty('reasonableNumOfChars', node.value, {
             format: PropertyFormat_1.PropertyFormat.trimmedString,
             single: true,
             ignoreEmpty: true,
         });
     }
-    // bitmarkAst -> bits -> bitsValue -> questions -> questionsValue -> additionalSolutions
-    between_additionalSolutions(_node, _left, _right, route) {
-        // Ignore values that are not at the bit level as they might be handled elsewhere
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.questionsValue)
-            return;
-        this.writeNL();
-    }
     // bitmarkAst -> bits -> bitsValue -> questions -> questionsValue -> additionalSolutions -> additionalSolutionsValue
     leaf_additionalSolutionsValue(node, route) {
         // Ignore values that are not at the bit level as they might be handled elsewhere
         const parent = this.getParentNode(route, 2);
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.questionsValue)
             return;
+        this.writeNL();
         this.writeProperty('additionalSolutions', node.value, {
             format: PropertyFormat_1.PropertyFormat.trimmedString,
             single: false,
@@ -560,6 +651,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return true; // Will be handled by pageNumber
         if (!this.isEmptyText((_c = parent === null || parent === void 0 ? void 0 : parent.value) === null || _c === void 0 ? void 0 : _c.marginNumber))
             return true; // Will be handled by marginNumber
+        this.writeNL_IfNotChain(route);
         this.writeOPC();
         this.textGenerator.generateSync(item, TextFormat_1.TextFormat.bitmarkMinusMinus);
         this.writeCL();
@@ -576,6 +668,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return true; // Will be handled by pageNumber
         if (!this.isEmptyText((_b = parent === null || parent === void 0 ? void 0 : parent.value) === null || _b === void 0 ? void 0 : _b.marginNumber))
             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.writeCL();
@@ -593,6 +686,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return false; // Ignore empty
         if (!this.isEmptyText((_a = parent === null || parent === void 0 ? void 0 : parent.value) === null || _a === void 0 ? void 0 : _a.marginNumber))
             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.writeCL();
@@ -611,6 +705,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         const parent = this.getParentNode(route);
         if (this.isEmptyText(marginNumber))
             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.writeCL();
@@ -633,7 +728,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.bitsValue && (parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.cardBitsValue)
             return true;
         this.inTag = false;
-        // always write a NL before the body content if there is any?
+        // 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;
@@ -643,7 +738,6 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             if (Array.isArray(json) || ObjectUtils_1.ObjectUtils.isObject(json)) {
                 const text = JSON.stringify(json, null, this.prettifySpace);
                 if (text) {
-                    this.writeNL();
                     this.writePlainTextDivider();
                     this.writeNL();
                     this.write(Breakscape_1.Breakscape.breakscape(text, {
@@ -664,27 +758,15 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         }
         else {
             // handle plain text
-            this.writeNL();
             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.writeNL();
         }
         // Stop traversal of this branch
         return false;
-        // if ((body.body && body.body.length > 0) || body.bodyJson) {
-        //   this.writeNL();
-        //   // Write the plain text divider if not bitmark++/-- format
-        //   const textFormat = this.getTextFormat(route);
-        //   const isBitmarkText = textFormat === TextFormat.bitmarkPlusPlus || textFormat === TextFormat.bitmarkMinusMinus;
-        //   if (!isBitmarkText) {
-        //     this.writePlainTextDivider();
-        //     this.writeNL();
-        //   }
-        // }
     }
     exit_body(_node, _route) {
         this.inTag = true;
@@ -750,6 +832,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             const isBitmarkText = textFormat === TextFormat_1.TextFormat.bitmarkPlusPlus || textFormat === TextFormat_1.TextFormat.bitmarkMinusMinus;
             if (isBitmarkText) {
                 // handle bitmark text
+                this.writeNL();
                 this.write('==== footer ====');
                 this.writeNL();
                 // The text generator will write to the writer
@@ -844,7 +927,6 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (!this.isCardAllowed(route))
             return true;
         this.writeCardSetStart();
-        this.writeNL();
         // Continue traversal
         return true;
     }
@@ -852,41 +934,27 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         // Ignore cards if not allowed
         if (!this.isCardAllowed(route))
             return;
-        this.writeNL();
         this.writeCardSetCardDivider();
-        this.writeNL();
     }
     exit_cardNode(_node, route) {
         // Ignore cards if not allowed
         if (!this.isCardAllowed(route))
             return;
-        this.writeNL();
         this.writeCardSetEnd();
         if (this.options.cardSetVersion === CardSetVersion_1.CardSetVersion.v1) {
-            this.writeNL();
+            // this.writeNL();
         }
     }
-    // bitmarkAst -> bits -> bitsValue -> cardNode -> cardBitsValue
-    between_cardBitsValue(_node, _left, _right, _route) {
-        this.writeNL();
-    }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> elements
     enter_elements(_node, _route) {
         //
     }
     between_elements(_node, _left, _right, _route) {
-        this.writeNL();
         this.writeCardSetVariantDivider();
-        this.writeNL();
-    }
-    exit_elements(_node, _route) {
-        //
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> flashcards
     between_flashcards(_node, _left, _right, _route) {
-        this.writeNL();
         this.writeCardSetCardDivider();
-        this.writeNL();
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> flashcards -> flashcardsValue
     between_flashcardsValue(_node, _left, right, route) {
@@ -895,67 +963,19 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (!this.isCardAllowed(route))
             return;
         if (right.key === NodeType_1.NodeType.answer) {
-            this.writeNL();
             this.writeCardSetSideDivider();
-            this.writeNL();
         }
         else if (right.key === NodeType_1.NodeType.alternativeAnswers && ((_a = right.value) === null || _a === void 0 ? void 0 : _a.length) !== 0) {
-            this.writeNL();
             this.writeCardSetVariantDivider();
-            this.writeNL();
-        }
-    }
-    // bitmarkAst -> bits -> bitsValue -> cardNode -> flashcards -> flashcardsValue -> answer
-    enter_answer(node, route) {
-        // Ignore responses that are not at the flashcardsValue level as they are handled elsewhere
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.flashcardsValue)
-            return true;
-        if (node.value) {
-            this.textGenerator.generateSync(node.value, TextFormat_1.TextFormat.bitmarkMinusMinus);
         }
-        // Stop traversal of this branch
-        return false;
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> flashcards -> flashcardsValue -> alternativeAnswers
     between_alternativeAnswers(_node, _route) {
-        this.writeNL();
         this.writeCardSetVariantDivider();
-        this.writeNL();
-    }
-    // bitmarkAst -> bits -> bitsValue -> cardNode -> flashcards -> flashcardsValue -> alternativeAnswers -> alternativeAnswersValue
-    enter_alternativeAnswersValue(node, route) {
-        // Ignore responses that are not at the alternativeAnswers level as they are handled elsewhere
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.alternativeAnswers)
-            return true;
-        if (node.value) {
-            // this.writeBreakscapedTagString(node.value);
-            this.textGenerator.generateSync(node.value, TextFormat_1.TextFormat.bitmarkMinusMinus);
-        }
-        // Stop traversal of this branch
-        return false;
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> definitions -> definitionsValue -> alternativeDefintions
     between_alternativeDefinitions(_node, _route) {
-        this.writeNL();
         this.writeCardSetVariantDivider();
-        this.writeNL();
-    }
-    // bitmarkAst -> bits -> bitsValue -> cardNode -> definitions -> definitionsValue -> alternativeDefinitions -> alternativeDefinitionsValue
-    enter_alternativeDefinitionsValue(node, route) {
-        // Ignore responses that are not at the alternativeAnswers level as they are handled elsewhere
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.alternativeDefinitions)
-            return true;
-        if (node.value) {
-            // this.writeNL();
-            // this.writeCardSetVariantDivider();
-            // this.writeNL();
-            this.textGenerator.generateSync(node.value, TextFormat_1.TextFormat.bitmarkMinusMinus);
-        }
-        // Stop traversal of this branch
-        return false;
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> statements
     enter_statements(_node, _route) {
@@ -964,17 +984,13 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     between_statements(_node, _left, _right, route) {
         const isTrueFalse1 = this.isOfBitType(route, BitType_1.BitType.trueFalse1);
         if (!isTrueFalse1) {
-            this.writeNL();
             this.writeCardSetCardDivider();
         }
-        this.writeNL();
-    }
-    exit_statements(_node, _route) {
-        //
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> statements -> statementsValue
     enter_statementsValue(node, _route) {
         const statement = node.value;
+        this.writeNL();
         if (statement.isCorrect) {
             this.writeOPP();
         }
@@ -986,18 +1002,11 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         // Continue traversal
         return true;
     }
-    // bitmarkAst -> bits -> bitsValue -> choices
-    // bitmarkAst -> bits -> bitsValue -> cardNode -> quizzes -> quizzesValue -> choices
-    between_choices(_node, _left, _right, _route) {
-        this.writeNL();
-    }
-    exit_choices(_node, _route) {
-        this.writeNL();
-    }
     // bitmarkAst -> bits -> bitsValue -> choices -> choicesValue
     // bitmarkAst -> bits -> bitsValue -> cardNode -> quizzes -> quizzesValue -> choices -> choicesValue
     enter_choicesValue(node, _route) {
         const choice = node.value;
+        this.writeNL();
         if (choice.isCorrect) {
             this.writeOPP();
         }
@@ -1009,18 +1018,11 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         // Continue traversal
         return true;
     }
-    // bitmarkAst -> bits -> bitsValue -> responses
-    // bitmarkAst -> bits -> bitsValue -> cardNode -> quizzes -> quizzesValue -> responses
-    between_responses(_node, _left, _right, _route) {
-        this.writeNL();
-    }
-    exit_responses(_node, _route) {
-        this.writeNL();
-    }
     // bitmarkAst -> bits -> bitsValue -> responses -> responsesValue
     // bitmarkAst -> bits -> bitsValue -> cardNode -> quizzes -> quizzesValue -> responses -> responsesValue
     enter_responsesValue(node, _route) {
         const response = node.value;
+        this.writeNL();
         if (response.isCorrect) {
             this.writeOPP();
         }
@@ -1037,18 +1039,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         //
     }
     between_quizzes(_node, _left, _right, _route) {
-        // this.writeNL();
         this.writeCardSetCardDivider();
-        this.writeNL();
-    }
-    exit_quizzes(_node, _route) {
-        //
-    }
-    // bitmarkAst -> bits -> bitsValue -> cardNode -> quizzes -> quizzesValue
-    between_quizzesValue(_node, _left, right, _route) {
-        if (right.key === NodeType_1.NodeType.choices || right.key === NodeType_1.NodeType.responses) {
-            this.writeNL();
-        }
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> heading
     enter_heading(_node, _route) {
@@ -1058,12 +1049,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         // Ignore cards if not allowed
         if (!this.isCardAllowed(route))
             return;
-        this.writeNL();
         this.writeCardSetSideDivider();
-        this.writeNL();
-    }
-    exit_heading(_node, _route) {
-        //
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> heading -> forValues
     enter_forValues(_node, _route) {
@@ -1073,33 +1059,20 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         // Ignore cards if not allowed
         if (!this.isCardAllowed(route))
             return;
-        this.writeNL();
         this.writeCardSetSideDivider();
-        this.writeNL();
-    }
-    exit_forValues(_node, _route) {
-        //
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> pairs
     enter_pairs(_node, _route) {
         //
     }
     between_pairs(_node, _left, _right, _route) {
-        this.writeNL();
         this.writeCardSetCardDivider();
-        this.writeNL();
-    }
-    exit_pairs(_node, _route) {
-        //
-    }
-    // bitmarkAst -> bits -> bitsValue -> cardNode -> pairs -> pairsValue
-    between_pairsValue(_node, _left, _right, _route) {
-        //
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> pairs -> pairsValue -> keyAudio
     enter_keyAudio(node, _route) {
         const resource = node.value;
         // This is a resource, so handle it with the common code
+        this.writeNL();
         this.writeResource(ResourceTag_1.ResourceTag.audio, resource.src);
         // Stop traversal of this branch
         return false;
@@ -1108,6 +1081,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     enter_keyImage(node, _route) {
         const resource = node.value;
         // This is a resource, so handle it with the common code
+        this.writeNL();
         this.writeResource(ResourceTag_1.ResourceTag.image, resource.src);
         // Stop traversal of this branch
         return false;
@@ -1117,16 +1091,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         //
     }
     between_matrix(_node, _left, _right, _route) {
-        this.writeNL();
         this.writeCardSetCardDivider();
-        this.writeNL();
-    }
-    exit_matrix(_node, _route) {
-        //
-    }
-    // bitmarkAst -> bits -> bitsValue -> cardNode -> matrix -> matrixValue
-    between_matrixValue(_node, _left, _right, _route) {
-        //
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> pairs -> pairsValue -> values
     // bitmarkAst -> bits -> bitsValue -> cardNode -> matrix -> matrixValue -> cells -> cellsValue -> values
@@ -1134,17 +1099,13 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         // Ignore cards if not allowed
         if (!this.isCardAllowed(route))
             return;
-        this.writeNL();
         this.writeCardSetSideDivider();
-        this.writeNL();
     }
     between_values(_node, _left, _right, route) {
         // Ignore cards if not allowed
         if (!this.isCardAllowed(route))
             return;
-        this.writeNL();
         this.writeCardSetVariantDivider();
-        this.writeNL();
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> pronunciationTable
     between_pronunciationTable(_node, _left, _right, route) {
@@ -1154,9 +1115,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         // Ignore cards if not allowed
         if (!this.isCardAllowed(route))
             return;
-        this.writeNL();
         this.writeCardSetCardDivider();
-        this.writeNL();
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> table
     between_table(_node, _left, _right, route) {
@@ -1166,9 +1125,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         // Ignore cards if not allowed
         if (!this.isCardAllowed(route))
             return;
-        this.writeNL();
         this.writeCardSetCardDivider();
-        this.writeNL();
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> table -> data
     // bitmarkAst -> bits -> bitsValue -> cardNode -> pronunciationTable -> data
@@ -1176,9 +1133,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         const parent = this.getParentNode(route);
         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;
-        this.writeNL();
         this.writeCardSetCardDivider();
-        this.writeNL();
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> table -> columns
     // bitmarkAst -> bits -> bitsValue -> cardNode -> captionDefinitionList -> columns
@@ -1190,19 +1145,19 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         // Ignore cards if not allowed
         if (!this.isCardAllowed(route))
             return;
-        this.writeNL();
         this.writeCardSetSideDivider();
-        this.writeNL();
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> table -> columns -> columnsValue
     // bitmarkAst -> bits -> bitsValue -> cardNode -> captionDefinitionList -> columns -> columnsValue
     leaf_columnsValue(node, _route) {
+        this.writeNL();
         this.writeOPHASH();
         if (node.value)
             this.writeBreakscapedTagString(node.value);
         this.writeCL();
     }
     enter_columnsValue(node, _route) {
+        this.writeNL();
         this.writeOPHASH();
         if (node.value) {
             this.textGenerator.generateSync(node.value, TextFormat_1.TextFormat.bitmarkMinusMinus);
@@ -1218,15 +1173,14 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         // Ignore cards if not allowed
         if (!this.isCardAllowed(route))
             return;
-        this.writeNL();
         this.writeCardSetSideDivider();
-        this.writeNL();
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> table -> data -> dataValue -> dataValueValue
     leaf_dataValueValue(node, route) {
         const parent = this.getParentNode(route, 3);
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.table)
             return;
+        this.writeNL();
         this.write(node.value);
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> table -> data -> dataValue -> dataValueValue
@@ -1242,17 +1196,18 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
                 // Pronunciation Table
                 const cell = node.value;
                 if (cell.title) {
+                    this.writeNL();
                     this.writeOP();
                     this.writeHash();
                     this.textGenerator.generateSync(cell.title, TextFormat_1.TextFormat.bitmarkMinusMinus);
                     this.writeCL();
-                    this.writeNL();
                 }
                 if (cell.audio) {
-                    this.writeResource(ResourceTag_1.ResourceTag.audio, cell.audio.src);
                     this.writeNL();
+                    this.writeResource(ResourceTag_1.ResourceTag.audio, cell.audio.src);
                 }
                 if (cell.body) {
+                    this.writeNL();
                     this.textGenerator.generateSync(cell.body, textFormat);
                 }
                 // Stop traversal of this branch
@@ -1260,6 +1215,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             }
             else {
                 // Table
+                this.writeNL();
                 this.textGenerator.generateSync(node.value, textFormat);
             }
         }
@@ -1270,38 +1226,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         const parent = this.getParentNode(route);
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.cardNode)
             return;
-        this.writeNL();
         this.writeCardSetCardDivider();
-        this.writeNL();
-    }
-    // // bitmarkAst -> bits -> bitsValue -> cardNode -> captionDefinitionList -> definitions
-    // protected between_definitions(_node: NodeInfo, _left: NodeInfo, _right: NodeInfo, route: NodeInfo[]): void {
-    //   const parent = this.getParentNode(route);
-    //   if (parent?.key !== NodeType.captionDefinitionList) return;
-    //   this.writeNL();
-    //   this.writeCardSetCardDivider();
-    //   this.writeNL();
-    // }
-    // // bitmarkAst -> bits -> bitsValue -> cardNode -> captionDefinitionList -> definitions -> definitionsValue
-    // protected between_definitionsValue(_node: NodeInfo, _left: NodeInfo, _right: NodeInfo, route: NodeInfo[]): void {
-    //   const parent = this.getParentNode(route);
-    //   if (parent?.key !== NodeType.definitions) return;
-    // // Ignore cards if not allowed
-    // if (!this.isCardAllowed(route)) return;
-    //   this.writeNL();
-    //   this.writeCardSetSideDivider();
-    //   this.writeNL();
-    // }
-    // bitmarkAst -> bits -> bitsValue -> cardNode -> definitions -> definitionsValue -> term
-    enter_term(node, route) {
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.definitionsValue)
-            return true;
-        if (node.value) {
-            this.textGenerator.generateSync(node.value, TextFormat_1.TextFormat.bitmarkMinusMinus);
-        }
-        // Stop traversal of this branch
-        return false;
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> captionDefinitionList -> definitions -> definitionsValue -> term
     leaf_term(node, route) {
@@ -1309,28 +1234,19 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.definitionsValue)
             return true;
         if (node.value) {
+            this.writeNL();
             this.write(node.value);
         }
         // Stop traversal of this branch
         return false;
     }
-    // bitmarkAst -> bits -> bitsValue -> cardNode -> definitions -> definitionsValue -> definition
-    enter_definition(node, route) {
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.definitionsValue)
-            return true;
-        if (node.value) {
-            this.textGenerator.generateSync(node.value, TextFormat_1.TextFormat.bitmarkMinusMinus);
-        }
-        // Stop traversal of this branch
-        return false;
-    }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> captionDefinitionList -> definitions -> definitionsValue -> definition
     leaf_definition(node, route) {
         const parent = this.getParentNode(route);
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.definitionsValue)
             return true;
         if (node.value) {
+            this.writeNL();
             this.write(node.value);
         }
         // Stop traversal of this branch
@@ -1342,9 +1258,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         const parent = this.getParentNode(route);
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.cardNode && (parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.captionDefinitionList)
             return;
-        this.writeNL();
         this.writeCardSetCardDivider();
-        this.writeNL();
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> definitions -> definitionsValue
     between_definitionsValue(_node, _left, right, route) {
@@ -1356,75 +1270,37 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if (!this.isCardAllowed(route))
             return;
         if (right.key === NodeType_1.NodeType.definition) {
-            this.writeNL();
             this.writeCardSetSideDivider();
-            this.writeNL();
         }
         else if (right.key === NodeType_1.NodeType.alternativeDefinitions && ((_a = right.value) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-            this.writeNL();
             this.writeCardSetVariantDivider();
-            this.writeNL();
         }
     }
-    // bitmarkAst -> bits -> bitsValue -> cardNode -> captionDefinitionList -> definitions -> definitionsValue
-    // protected between_definitionsValue(_node: NodeInfo, _left: NodeInfo, right: NodeInfo, route: NodeInfo[]): void {
-    //   const parent = this.getParentNode(route);
-    //   if (parent?.key !== NodeType.definitions) return;
-    // // Ignore cards if not allowed
-    // if (!this.isCardAllowed(route)) return;
-    //   if (right.key === NodeType.definition) {
-    //     this.writeNL();
-    //     this.writeCardSetSideDivider();
-    //     this.writeNL();
-    //   } else if (right.key === NodeType.alternativeDefinitions && right.value?.length > 0) {
-    //     this.writeNL();
-    //     this.writeCardSetVariantDivider();
-    //     this.writeNL();
-    //   }
-    // }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> questions
     enter_questions(_node, _route) {
         //
     }
     between_questions(_node, _left, _right, _route) {
         this.writeCardSetCardDivider();
-        this.writeNL();
-    }
-    exit_questions(_node, _route) {
-        //
-    }
-    // bitmarkAst -> bits -> bitsValue -> cardNode -> questions -> questionsValue
-    between_questionsValue(node, left, right, route) {
-        // The following keys are combined with other keys so don't need newlines
-        const noNlKeys = [
-        //
-        ];
-        this.writeNlBetween(node, left, right, route, noNlKeys);
-    }
-    exit_questionsValue(_node, _route) {
-        this.writeNL();
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> ingredients
     enter_ingredients(_node, _route) {
         //
     }
     between_ingredients(_node, _left, _right, _route) {
-        this.writeNL();
         this.writeCardSetCardDivider();
-        this.writeNL();
-    }
-    exit_ingredients(_node, _route) {
-        //
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> ingredients -> ingredientsValue
     enter_ingredientsValue(node, _route) {
         const ingredient = node.value;
         if (ingredient.title != null) {
+            this.writeNL();
             this.writeOPHASH();
             this.writeBreakscapedTagString(ingredient.title);
             this.writeCL();
-            this.writeNL();
+            // this.writeNL();
         }
+        this.writeNL();
         // [+] / [-]
         if (ingredient.checked) {
             this.writeOPP();
@@ -1468,8 +1344,10 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
                 ignoreEmpty: true,
             });
         // item
-        if (ingredient.item != null)
+        if (ingredient.item != null) {
+            this.writeNL();
             this.write(ingredient.item);
+        }
         // Stop traversal of this branch
         return false;
     }
@@ -1479,35 +1357,20 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     }
     between_botResponses(_node, _left, _right, _route) {
         this.writeCardSetCardDivider();
-        this.writeNL();
-    }
-    exit_botResponses(_node, _route) {
-        //
-    }
-    // bitmarkAst -> bits -> bitsValue -> cardNode -> botResponses -> botResponsesValue
-    between_botResponsesValue(_node, _left, _right, _route) {
-        this.writeNL();
-    }
-    exit_botResponsesValue(_node, _route) {
-        this.writeNL();
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> cardBits
     enter_cardBits(_node, _route) {
         //
     }
     between_cardBits(_node, _left, _right, _route) {
-        this.writeNL();
         this.writeCardSetCardDivider();
-        this.writeNL();
-    }
-    exit_cardBits(_node, _route) {
-        //
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> botResponses -> botResponsesValue -> response
     leaf_response(node, route) {
         const parent = this.getParentNode(route);
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.botResponsesValue)
             return;
+        this.writeNL();
         this.writeOPB();
         this.writeBreakscapedTagString(node.value);
         this.writeCL();
@@ -1517,6 +1380,7 @@ 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;
+        this.writeNL();
         this.writeProperty('reaction', node.value, {
             format: PropertyFormat_1.PropertyFormat.trimmedString,
             single: true,
@@ -1530,6 +1394,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             return;
         const feeback = node.value;
         if (feeback) {
+            this.writeNL();
             this.write(feeback);
         }
     }
@@ -1537,12 +1402,13 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     enter_imagePlaceholder(node, _route) {
         const resource = node.value;
         // This is a resource, so handle it with the common code
+        this.writeNL();
         this.writePropertyStyleResource(node.key, resource);
         // Continue traversal
         return true;
     }
     exit_imagePlaceholder(_node, _route) {
-        this.writeNL();
+        // this.writeNL();
     }
     // bitmarkAst -> bits -> bitsValue -> posterImage
     // bitmarkAst -> bits -> bitsValue -> resource -> * -> posterImage
@@ -1641,9 +1507,6 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     enter_book(_node, _route) {
         // Block standard property handling
     }
-    between_book(_node, _route) {
-        this.writeNL();
-    }
     enter_bookValue(node, _route) {
         const book = node.value;
         // const parent = this.getParentNode(route);
@@ -1714,10 +1577,11 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     //  * -> itemLead --> item
     //  * -> itemLead --> lead
     //  * -> hint
-    enter_hint(node, _route) {
+    enter_hint(node, route) {
         const value = node.value;
         const text = value;
         if (!this.isEmptyText(text)) {
+            this.writeNL_IfNotChain(route);
             this.writeOPQ();
             this.textGenerator.generateSync(text, TextFormat_1.TextFormat.bitmarkMinusMinus);
             this.writeCL();
@@ -1726,10 +1590,11 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         return false;
     }
     // bitmarkAst -> bits -> bitsValue ->  * -> instruction
-    enter_instruction(node, _route) {
+    enter_instruction(node, route) {
         const value = node.value;
         const text = value;
         if (!this.isEmptyText(text)) {
+            this.writeNL_IfNotChain(route);
             this.writeOPB();
             this.textGenerator.generateSync(text, TextFormat_1.TextFormat.bitmarkMinusMinus);
             this.writeCL();
@@ -1739,6 +1604,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     }
     // bitmarkAst -> bits -> bitsValue ->  * -> lang
     enter_lang(node, _route) {
+        this.writeNL();
         this.writeProperty('lang', node.value, {
             format: PropertyFormat_1.PropertyFormat.boolean,
             single: true,
@@ -1747,6 +1613,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     }
     // bitmarkAst -> bits -> bitsValue ->  * -> refAuthor
     enter_refAuthor(node, _route) {
+        this.writeNL();
         this.writeProperty('refAuthor', node.value, {
             format: PropertyFormat_1.PropertyFormat.trimmedString,
             single: false,
@@ -1755,6 +1622,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     }
     // bitmarkAst -> bits -> bitsValue ->  * -> refBookTitle
     enter_refBookTitle(node, _route) {
+        this.writeNL();
         this.writeProperty('refBookTitle', node.value, {
             format: PropertyFormat_1.PropertyFormat.trimmedString,
             single: true,
@@ -1763,14 +1631,24 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     }
     // bitmarkAst -> bits -> bitsValue ->  * -> refPublisher
     enter_refPublisher(node, _route) {
+        this.writeNL();
         this.writeProperty('refPublisher', node.value, {
             format: PropertyFormat_1.PropertyFormat.trimmedString,
             single: false,
             ignoreEmpty: true,
         });
     }
+    // bitmarkAst -> bits -> bitsValue ->  * -> refPublicationYear
+    enter_refPublicationYear(node, _route) {
+        this.writeProperty('refPublicationYear', node.value, {
+            format: PropertyFormat_1.PropertyFormat.trimmedString,
+            single: true,
+            ignoreEmpty: true,
+        });
+    }
     // bitmarkAst -> bits -> bitsValue ->  * -> citationStyle
     enter_citationStyle(node, _route) {
+        this.writeNL();
         this.writeProperty('citationStyle', node.value, {
             format: PropertyFormat_1.PropertyFormat.trimmedString,
             single: true,
@@ -1787,6 +1665,8 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         const example = (_a = parent === null || parent === void 0 ? void 0 : parent.value.example) !== null && _a !== void 0 ? _a : null;
         // const __isDefaultExample = parent?.value.__isDefaultExample ?? false;
         if (example != null && example !== '') {
+            // Write a newline if not in a chain
+            this.writeNL_IfNotChain(route);
             this.writeOPA();
             this.writeString('example');
             this.writeColon();
@@ -1816,6 +1696,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     // bitmarkAst -> bits -> bitsValue -> elements -> elementsValue
     leaf_elementsValue(node, _route) {
         if (node.value) {
+            this.writeNL();
             this.writeBreakscapedTagString(node.value);
         }
     }
@@ -1861,18 +1742,21 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     // bitmarkAst -> bits -> bitsValue ->  * -> isCorrect
     // bitmarkAst -> bits -> bitsValue -> heading -> forKeys
     leaf_forKeys(node, _route) {
+        this.writeNL();
         this.writeOPHASH();
         this.writeBreakscapedTagString(node.value);
         this.writeCL();
     }
     // bitmarkAst -> bits -> bitsValue -> heading -> forValues
     leaf_forValues(node, _route) {
+        this.writeNL();
         this.writeOPHASH();
         this.writeBreakscapedTagString(node.value);
         this.writeCL();
     }
     // bitmarkAst -> bits -> bitsValue -> heading -> forValuesValue
     leaf_forValuesValue(node, _route) {
+        this.writeNL();
         this.writeOPHASH();
         this.writeBreakscapedTagString(node.value);
         this.writeCL();
@@ -1881,6 +1765,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     // bitmarkAst -> bits -> bitsValue -> matrix -> matrixValue -> key
     leaf_key(node, _route) {
         if (node.value) {
+            this.writeNL();
             this.writeBreakscapedTagString(node.value);
         }
     }
@@ -1888,6 +1773,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     // bitmarkAst -> bits -> bitsValue -> matrix -> matrixValue -> cells -> cellsValue -> values -> valuesValue
     leaf_valuesValue(node, _route) {
         if (node.value) {
+            this.writeNL();
             this.writeBreakscapedTagString(node.value);
         }
     }
@@ -1899,22 +1785,9 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.questionsValue && (parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.flashcardsValue)
             return;
         if (node.value) {
+            this.writeNL();
             this.writeBreakscapedTagString(node.value);
-            // this.writeNL();
-        }
-    }
-    enter_question(node, route) {
-        // Ignore responses that are not at the questionsValue level as they are handled elsewhere
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.questionsValue && (parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.flashcardsValue)
-            return true;
-        if (node.value) {
-            this.textGenerator.generateSync(node.value, TextFormat_1.TextFormat.bitmarkMinusMinus);
-            // this.writeString(node.value);
-            // this.writeNL();
         }
-        // Stop traversal of this branch
-        return false;
     }
     // bitmarkAst -> bits -> bitsValue -> statements -> text
     // bitmarkAst -> bits -> bitsValue -> resource -> ...
@@ -2020,8 +1893,9 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             ignoreFalse: true,
         });
     }
-    enter_caption(node, _route) {
+    enter_caption(node, route) {
         const value = node.value;
+        this.writeNL_IfNotChain(route);
         this.writeProperty('caption', value, {
             format: PropertyFormat_1.PropertyFormat.bitmarkMinusMinus,
             single: true, // ??
@@ -2084,17 +1958,6 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     //
     // Resources
     //
-    // bitmarkAst -> bits -> bitsValue -> resources
-    between_resources(_node, _left, _right, _route) {
-        this.writeNL();
-    }
-    exit_resources(_node, _left, _right, _route) {
-        this.writeNL();
-    }
-    // bitmarkAst -> bits -> bitsValue -> resourcesValue
-    between_resourcesValue(_node, _left, _right, _route) {
-        this.writeNL();
-    }
     //
     // Generated Node Handlers
     //
@@ -2129,6 +1992,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
                 // url / src / href / app
                 const url = resource.url || resource.src || resource.body || '';
                 // Write the resource
+                this.writeNL();
                 this.writeResource(type, url);
                 // Continue traversal
                 return true;
@@ -2141,14 +2005,6 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     /**
      * Generate the handlers for properties, as they are mostly the same, but not quite
      */
-    // protected enter_labelTrue(node: NodeInfo, _route: NodeInfo[],
-    // ): void {
-    //   const bit = parent?.value as Bit;
-    //   if (bit) {
-    //     this.writeProperty('labelTrue', node.value ?? '', true);
-    //     this.writeProperty('labelFalse', bit.labelFalse ?? '', true);
-    //   }
-    // }
     generatePropertyHandlers() {
         var _a;
         const propertiesConfig = Config_1.Config.getRawPropertiesConfig();
@@ -2175,6 +2031,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
                 if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.bitsValue)
                     return;
                 // Write the property
+                this.writeNL(); // Only if NOT in chain (how do we know this?)
                 this.writeProperty(propertyConfig.tag, node.value, {
                     format: (_a = propertyConfig.format) !== null && _a !== void 0 ? _a : PropertyFormat_1.PropertyFormat.trimmedString,
                     single: (_b = propertyConfig.single) !== null && _b !== void 0 ? _b : false,
@@ -2187,35 +2044,30 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             this[enterFuncName] = this[enterFuncName].bind(this);
         }
     }
-    writeNlBetween(node, left, _right, _route, 
-    // The following keys are combined with other keys so don't need newlines
-    noNlKeys) {
-        const bit = node.value;
-        if (bit.book) {
-            // If the book node exists, remove the newline caused by reference as it will be bound to book
-            noNlKeys.push(NodeType_1.NodeType.reference);
-        }
-        // Check if a no newline key is to the left in this 'between' callback
-        const noNl = (() => {
-            if (!this.wroteSomething || this.skipNLBetweenBitsValue) {
-                return true;
-            }
-            for (const keyType of noNlKeys) {
-                if (left.key === keyType /*|| right.key === keyType*/)
-                    return true;
-            }
-            return false;
-        })();
-        if (!noNl) {
-            this.writeNL();
-        }
-        this.skipNLBetweenBitsValue = false;
-        this.wroteSomething = false;
-    }
     // END NODE HANDLERS
     //
     // UTILITY FUNCTIONS
     //
+    isChain(route) {
+        const parent = this.getParentNode(route);
+        // Root of bit
+        if ((parent === null || parent === void 0 ? void 0 : parent.key) === NodeType_1.NodeType.bitsValue)
+            return false;
+        // Root of card bits
+        if ((parent === null || parent === void 0 ? void 0 : parent.key) === NodeType_1.NodeType.cardBitsValue)
+            return false;
+        if ((parent === null || parent === void 0 ? void 0 : parent.key) === NodeType_1.NodeType.quizzesValue)
+            return false;
+        if ((parent === null || parent === void 0 ? void 0 : parent.key) === NodeType_1.NodeType.pairsValue)
+            return false;
+        if ((parent === null || parent === void 0 ? void 0 : parent.key) === NodeType_1.NodeType.matrixValue)
+            return false;
+        if ((parent === null || parent === void 0 ? void 0 : parent.key) === NodeType_1.NodeType.definitionsValue)
+            return false;
+        if ((parent === null || parent === void 0 ? void 0 : parent.key) === NodeType_1.NodeType.questionsValue)
+            return false;
+        return true;
+    }
     haveValidCardSet(bit) {
         const bitConfig = Config_1.Config.getBitConfig(bit.bitType);
         if (!bitConfig)
@@ -2347,17 +2199,20 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         this.write('#');
     }
     writePlainTextDivider() {
+        this.writeNL();
         this.write('==== text ====');
     }
     writeCardSetStart() {
+        this.writeNL();
         if (this.options.cardSetVersion === CardSetVersion_1.CardSetVersion.v1) {
-            this.write('\n===');
+            this.write('===');
         }
         else {
-            this.write('\n====');
+            this.write('====');
         }
     }
     writeCardSetEnd() {
+        this.writeNL();
         if (this.options.cardSetVersion === CardSetVersion_1.CardSetVersion.v1) {
             this.write('===');
         }
@@ -2366,6 +2221,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         }
     }
     writeCardSetCardDivider() {
+        this.writeNL();
         if (this.options.cardSetVersion === CardSetVersion_1.CardSetVersion.v1) {
             this.write('===');
         }
@@ -2374,6 +2230,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         }
     }
     writeCardSetSideDivider() {
+        this.writeNL();
         if (this.options.cardSetVersion === CardSetVersion_1.CardSetVersion.v1) {
             this.write('==');
         }
@@ -2382,6 +2239,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         }
     }
     writeCardSetVariantDivider() {
+        this.writeNL();
         if (this.options.cardSetVersion === CardSetVersion_1.CardSetVersion.v1) {
             this.write('--');
         }
@@ -2389,6 +2247,11 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             this.write('++');
         }
     }
+    writeNL_IfNotChain(route) {
+        if (!this.isChain(route)) {
+            this.writeNL();
+        }
+    }
     writeNL() {
         if (this.options.debugGenerationInline) {
             this.write('\\n');
@@ -2408,7 +2271,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             this.writeColon();
             this.writeBreakscapedTagString(src);
             if (resource.type === ResourceTag_1.ResourceTag.article) {
-                this.writeNL();
+                // this.writeNL();
             }
             this.writeCL();
         }
@@ -2422,7 +2285,7 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             this.writeColon();
             this.writeBreakscapedTagString(value);
             if (type === ResourceTag_1.ResourceTag.article) {
-                this.writeNL();
+                // this.writeNL();
             }
             this.writeCL();
         }
@@ -2430,7 +2293,6 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     writeProperty(name, values, options) {
         var _a;
         let valuesArray;
-        let wroteSomething = false;
         if (values !== undefined) {
             const isBitmarkText = options.format === PropertyFormat_1.PropertyFormat.bitmarkMinusMinus || options.format === PropertyFormat_1.PropertyFormat.bitmarkPlusPlus;
             if (isBitmarkText) {
@@ -2442,7 +2304,6 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
                 this.writeColon();
                 this.textGenerator.generateSync(values, (_a = TextFormat_1.TextFormat.fromValue(options.format)) !== null && _a !== void 0 ? _a : TextFormat_1.TextFormat.bitmarkMinusMinus);
                 this.writeCL();
-                wroteSomething = true;
             }
             else {
                 // Write any other property type
@@ -2455,7 +2316,6 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
                 if (valuesArray.length > 0) {
                     if (options.single)
                         valuesArray = valuesArray.slice(valuesArray.length - 1);
-                    let propertyIndex = 0;
                     for (const val of valuesArray) {
                         if (val !== undefined) {
                             if (options.ignoreFalse && val === false)
@@ -2464,23 +2324,17 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
                                 continue;
                             if (options.ignoreEmpty && val === '')
                                 continue;
-                            if (propertyIndex > 0)
-                                this.writeNL();
                             this.writeOPA();
                             this.writeBreakscapedTagString(name);
                             this.writeColon();
                             this.writeBreakscapedTagString(`${val}`);
                             this.writeCL();
-                            wroteSomething = true;
-                            propertyIndex++;
+                            // propertyIndex++;
                         }
                     }
                 }
             } // isBitmarkText
         }
-        if (!wroteSomething) {
-            this.skipNLBetweenBitsValue = true;
-        }
     }
     writeInlineDebug(key, state) {
         let tag = key;
@@ -2548,8 +2402,6 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
      * @param value - The string value to be written.
      */
     write(value) {
-        if (value)
-            this.wroteSomething = true;
         this.writer.write(value);
         return this;
     }
@@ -2558,8 +2410,6 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
      * @param value - The line to write. When omitted, only the endOfLineString is written.
      */
     writeLine(value) {
-        if (value)
-            this.wroteSomething = true;
         this.writer.writeLine(value);
         return this;
     }
@@ -2569,8 +2419,6 @@ class BitmarkGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
      * @param delimiter - An optional delimiter to be written at the end of each line, except for the last one.
      */
     writeLines(values, delimiter) {
-        if (values.length > 0 && values.reduce((acc, v) => (v ? true : acc), false))
-            this.wroteSomething = true;
         this.writer.writeLines(values, delimiter);
         return this;
     }