From 21192505bb9133f43d906b125db0977bd7b5459c Mon Sep 17 00:00:00 2001
From: David Bolack <dbolack@gmail.com>
Date: Wed, 4 Jun 2025 21:43:51 -0500
Subject: [PATCH] Switch to npm mopdule based brew variables `

---
 package-lock.json              | 5 +++--
 package.json                   | 2 +-
 shared/naturalcrit/markdown.js | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 911e4d78d..8d85c8489 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -43,7 +43,7 @@
         "marked-nonbreaking-spaces": "^1.0.1",
         "marked-smartypants-lite": "^1.0.3",
         "marked-subsuper-text": "^1.0.3",
-        "marked-variables": "file:../marked-variables",
+        "marked-variables": "^1.0.0",
         "markedLegacy": "npm:marked@^0.3.19",
         "moment": "^2.30.1",
         "mongoose": "^8.15.0",
@@ -84,6 +84,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
+        "dedent": "^1.6.0",
         "dedent-tabs": "^0.10.3",
         "expr-eval": "^2.0.2",
         "romans": "^3.1.0",
@@ -109,7 +110,7 @@
         "eslint-plugin-promise": "^6.6.0",
         "jest-cli": "^29.7.0",
         "lodash": "^4.17.21",
-        "marked": "^15.0.4",
+        "marked": "^15.0.12",
         "rollup": "^4.29.2",
         "semantic-release": "^24.2.0"
       },
diff --git a/package.json b/package.json
index 487806322..d9503337c 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,7 @@
     "marked-nonbreaking-spaces": "^1.0.1",
     "marked-smartypants-lite": "^1.0.3",
     "marked-subsuper-text": "^1.0.3",
-    "marked-variables": "file:../marked-variables",
+    "marked-variables": "^1.0.0",
     "markedLegacy": "npm:marked@^0.3.19",
     "moment": "^2.30.1",
     "mongoose": "^8.15.0",
diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js
index fd7c26174..2f6fcbd9f 100644
--- a/shared/naturalcrit/markdown.js
+++ b/shared/naturalcrit/markdown.js
@@ -479,13 +479,13 @@ const mergeHTMLTags = (originalTags, newTags)=>{
 const Markdown = {
 	marked : Marked,
 	render : (rawBrewText, pageNumber=0)=>{
-		const lastPageNumber = pageNumber > 0 ? getMarkedVariable(pageNumber - 1, 'HB_pageNumber.content') : 0;
+		const lastPageNumber = pageNumber > 0 ? getMarkedVariable(pageNumber - 1, 'HB_pageNumber') : 0;
+		setMarkedVarPage(pageNumber);
+		clearMarkedVarsQueue();
 		setMarkedVariable(pageNumber, 							//Reset global links for current page, to ensure values are parsed in order
 			'HB_pageNumber',									//Add document variables for this page
 			!isNaN(Number(lastPageNumber)) ? Number(lastPageNumber) + 1 : lastPageNumber
 		);
-		clearMarkedVarsQueue();						//Could move into MarkedVariables()
-		setMarkedVarPage(pageNumber);
 		if(pageNumber==0) {
 			MarkedGFMResetHeadingIDs();
 		}