diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index a82ea8b34..48e95e8c4 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -196,8 +196,8 @@ const BrewRenderer = (props)=>{ 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) - const html = Markdown.render(pageText, index); + let html = Markdown.render(pageText, index); + if(html.indexOf(`\n
\n`) == -1) html += `\n
\n`; return ; } diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js index 3d259443f..878519a4a 100644 --- a/shared/naturalcrit/markdown.js +++ b/shared/naturalcrit/markdown.js @@ -895,18 +895,6 @@ const globalVarsList = {}; let varsQueue = []; 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 \n')) { - cols[0] = cols[0].slice(0, cols[0].length-'\n\n \n'.length); - cols[0] += '\n```\n\n \n'; - } else cols[0] += '\n```\n'; - } - return cols.join(`\n\\column\n`); -}; - const Markdown = { marked : Marked, render : (rawBrewText, pageNumber=0)=>{ @@ -917,7 +905,7 @@ const Markdown = { MarkedGFMResetHeadingIDs(); } - rawBrewText = closePre(rawBrewText).replace(/^\\column$/gm, `\n
\n`); + rawBrewText = rawBrewText.replace(/^\\column$/gm, `\n
\n`); const opts = Marked.defaults;