f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-04 03:52:40 +00:00
Code Wiki Activity

Update to marked-variables v1.0.4

Browse Source
This commit is contained in:
Trevor Buckner
2025-11-02 22:48:25 -05:00
parent 071f95994a
commit af5720c7e2
3 changed files with 581 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1116
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@@ -120,7 +120,7 @@
"marked-nonbreaking-spaces": "^1.0.1", "marked-nonbreaking-spaces": "^1.0.1",
"marked-smartypants-lite": "^1.0.3", "marked-smartypants-lite": "^1.0.3",
"marked-subsuper-text": "^1.0.3", "marked-subsuper-text": "^1.0.3",
"marked-variables": "^1.0.2", "marked-variables": "^1.0.4",
"markedLegacy": "npm:marked@^0.3.19", "markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.30.1", "moment": "^2.30.1",
"mongoose": "^8.16.3", "mongoose": "^8.16.3",

25
shared/naturalcrit/markdown.js
View File

@@ -8,10 +8,9 @@ import MarkedAlignedParagraphs from 'marked-alignment-paragraphs';
import MarkedNonbreakingSpaces from 'marked-nonbreaking-spaces'; import MarkedNonbreakingSpaces from 'marked-nonbreaking-spaces';
import MarkedSubSuperText from 'marked-subsuper-text'; import MarkedSubSuperText from 'marked-subsuper-text';
import { markedVariables, import { markedVariables,
setMarkedVarPage, setMarkedVariablePage,
setMarkedVariable, setMarkedVariable,
getMarkedVariable, getMarkedVariable } from 'marked-variables';
clearMarkedVarsQueue } from 'marked-variables';
import { markedSmartypantsLite as MarkedSmartypantsLite } from 'marked-smartypants-lite'; import { markedSmartypantsLite as MarkedSmartypantsLite } from 'marked-smartypants-lite';
import { gfmHeadingId as MarkedGFMHeadingId, resetHeadings as MarkedGFMResetHeadingIDs } from 'marked-gfm-heading-id'; import { gfmHeadingId as MarkedGFMHeadingId, resetHeadings as MarkedGFMResetHeadingIDs } from 'marked-gfm-heading-id';
import { markedEmoji as MarkedEmojis } from 'marked-emoji'; import { markedEmoji as MarkedEmojis } from 'marked-emoji';
@@ -479,16 +478,14 @@ const mergeHTMLTags = (originalTags, newTags)=>{
const Markdown = { const Markdown = {
marked : Marked, marked : Marked,
render : (rawBrewText, pageNumber=0)=>{ render : (rawBrewText, pageNumber=0)=>{
const lastPageNumber = pageNumber > 0 ? getMarkedVariable(pageNumber - 1, 'HB_pageNumber') : 0; setMarkedVariablePage(pageNumber);
setMarkedVarPage(pageNumber);
clearMarkedVarsQueue(); const lastPageNumber = pageNumber > 0 ? getMarkedVariable('HB_pageNumber', pageNumber - 1) : 0;
setMarkedVariable(pageNumber, //Reset global links for current page, to ensure values are parsed in order setMarkedVariable('HB_pageNumber', //Add document variables for this page
'HB_pageNumber', //Add document variables for this page !isNaN(Number(lastPageNumber)) ? Number(lastPageNumber) + 1 : lastPageNumber,
!isNaN(Number(lastPageNumber)) ? Number(lastPageNumber) + 1 : lastPageNumber pageNumber);
);
if(pageNumber==0) { if(pageNumber==0) MarkedGFMResetHeadingIDs();
MarkedGFMResetHeadingIDs();
}
rawBrewText = rawBrewText.replace(/^\\column(?:break)?$/gm, `\n<div class='columnSplit'></div>\n`); rawBrewText = rawBrewText.replace(/^\\column(?:break)?$/gm, `\n<div class='columnSplit'></div>\n`);