f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-08 22:32:41 +00:00
Code Wiki Activity

Changed tactic per suggestion

Browse Source 
Unsure if the test is absolutely necessary.
This commit is contained in:
David Bolack
2025-03-05 10:52:43 -06:00
parent c420410904
commit 55f333a9e5
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/homebrew/brewRenderer/brewRenderer.jsx
View File

@@ -196,8 +196,8 @@ const BrewRenderer = (props)=>{
pageText = pageText.includes('\n') ? pageText.substring(pageText.indexOf('\n') + 1) : ''; // Remove the \page line pageText = pageText.includes('\n') ? pageText.substring(pageText.indexOf('\n') + 1) : ''; // Remove the \page line
} }
pageText += `\n\n \n\\column\n `; //Artificial column break at page end to emulate column-fill:auto (until `wide` is used, when column-fill:balance will reappear) let html = Markdown.render(pageText, index);
const html = Markdown.render(pageText, index); if(html.indexOf(`\n<div class='columnSplit'></div>\n`) == -1) html += `\n<div class='columnSplit'></div>\n`;
return <BrewPage className={classes} index={index} key={index} contents={html} style={styles} attributes={attributes} onVisibilityChange={handlePageVisibilityChange} />; return <BrewPage className={classes} index={index} key={index} contents={html} style={styles} attributes={attributes} onVisibilityChange={handlePageVisibilityChange} />;
} }

14
shared/naturalcrit/markdown.js
View File

@@ -895,18 +895,6 @@ const globalVarsList = {};
let varsQueue = []; let varsQueue = [];
let globalPageNumber = 0; let globalPageNumber = 0;
const closePre = (text)=>{
const cols = text.split(/^\\column$/gm);
if((cols[0].match(/```/g)||[]).length % 2 != 0) {
// Catch inserted column pattern
if(cols[0].endsWith('\n\n&nbsp;\n')) {
cols[0] = cols[0].slice(0, cols[0].length-'\n\n&nbsp;\n'.length);
cols[0] += '\n```\n\n&nbsp;\n';
} else cols[0] += '\n```\n';
}
return cols.join(`\n\\column\n`);
};
const Markdown = { const Markdown = {
marked : Marked, marked : Marked,
render : (rawBrewText, pageNumber=0)=>{ render : (rawBrewText, pageNumber=0)=>{
@@ -917,7 +905,7 @@ const Markdown = {
MarkedGFMResetHeadingIDs(); MarkedGFMResetHeadingIDs();
} }
rawBrewText = closePre(rawBrewText).replace(/^\\column$/gm, `\n<div class='columnSplit'></div>\n`); rawBrewText = rawBrewText.replace(/^\\column$/gm, `\n<div class='columnSplit'></div>\n`);
const opts = Marked.defaults; const opts = Marked.defaults;