diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index ceb8da597..1ff09b02f 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -19,7 +19,7 @@ const { printCurrentBrew } = require('../../../shared/helpers.js'); import HeaderNav from './headerNav/headerNav.jsx'; import { safeHTML } from './safeHTML.js'; -const PAGEBREAK_REGEX_V3 = /^(?=\\page(?: *{[^\n{}]*})?$)/m; +const PAGEBREAK_REGEX_V3 = /^(?=\\page(?:break)?(?: *{[^\n{}]*})?$)/m; const PAGE_HEIGHT = 1056; const INITIAL_CONTENT = dedent` diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx index 6859c5aa2..cf9a17303 100644 --- a/client/homebrew/editor/editor.jsx +++ b/client/homebrew/editor/editor.jsx @@ -12,7 +12,7 @@ const MetadataEditor = require('./metadataEditor/metadataEditor.jsx'); const EDITOR_THEME_KEY = 'HOMEBREWERY-EDITOR-THEME'; -const PAGEBREAK_REGEX_V3 = /^(?=\\page(?: *{[^\n{}]*})?$)/m; +const PAGEBREAK_REGEX_V3 = /^(?=\\page(?:break)?(?: *{[^\n{}]*})?$)/m; const SNIPPETBREAK_REGEX_V3 = /^\\snippet\ .*$/; const SNIPPETBAR_HEIGHT = 25; const DEFAULT_STYLE_TEXT = dedent` @@ -211,7 +211,7 @@ const Editor = createClass({ // New Codemirror styling for V3 renderer if(this.props.renderer === 'V3') { - if(line.match(/^\\column$/)){ + if(line.match(/^\\column(?:break)?$/)){ codeMirror.addLineClass(lineNumber, 'text', 'columnSplit'); } diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js index 90a9488dc..ac6988734 100644 --- a/shared/naturalcrit/markdown.js +++ b/shared/naturalcrit/markdown.js @@ -825,7 +825,7 @@ const Markdown = { MarkedGFMResetHeadingIDs(); } - rawBrewText = rawBrewText.replace(/^\\column$/gm, `\n
\n`); + rawBrewText = rawBrewText.replace(/^\\column(?:break)?$/gm, `\n\n`); const opts = Marked.defaults;