f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-26 11:42:39 +00:00
Code Wiki Activity

commit changes so far

Browse Source
This commit is contained in:
Trevor Buckner
2025-01-22 15:04:33 -05:00
parent bd5c85147d
commit eebc9c2bfa
2 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ const BrewPage = (props)=>{
...props
};
const pageRef = useRef(null);
const cleanText = safeHTML(props.contents);
let cleanText = safeHTML(props.contents);
useEffect(()=>{
if(!pageRef.current) return;
@@ -78,6 +78,20 @@ const BrewPage = (props)=>{
};
}, []);
// Extract any page styles from `\page{cssProp:value}`
if(cleanText.match(/^<pagebreak/)) {
const injectedTags = Markdown.extractHTMLStyleTags(cleanText.substring(0, cleanText.indexOf('\n')));
const styleObject = injectedTags.styles?.split(';').reduce((acc, curr) => {
const [key, value] = curr.split(':').map(item => item.trim());
const camelCaseKey = key.replace(/-([a-z])/g, g => g[1].toUpperCase()); //Convert to camelCase for React
acc[camelCaseKey] = value;
return acc;
}, {});
props.style = {...props.style, ...styleObject};
cleanText = cleanText.substring(cleanText.indexOf('\n'));
}
return <div className={props.className} id={`p${props.index + 1}`} data-index={props.index} ref={pageRef} style={props.style}>
<div className='columnWrapper' dangerouslySetInnerHTML={{ __html: cleanText }} />
</div>;
@@ -126,7 +140,7 @@ const BrewRenderer = (props)=>{
if(props.renderer == 'legacy') {
rawPages = props.text.split('\\page');
} else {
rawPages = props.text.split(/^\\page$/gm);
rawPages = props.text.split(/^(?=\\page(?:{[^\n{}]+})?$)/gm);
}
const handlePageVisibilityChange = (pageNum, isVisible, isCenter)=>{
@@ -183,6 +197,11 @@ const BrewRenderer = (props)=>{
return <BrewPage className='page phb' index={index} key={index} contents={html} style={styles} onVisibilityChange={handlePageVisibilityChange} />;
} else {
let pageText2 = pageText.substring(0, pageText.indexOf('\n'));
let butt = Markdown.marked.lexer(pageText2);
console.log(butt)
pageText += `\n\n&nbsp;\n\\column\n&nbsp;`; //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);

19
shared/naturalcrit/markdown.js
View File

@@ -527,6 +527,21 @@ const definitionListsMultiLine = {
}
};
const pageBreak = {
name : 'pageBreak',
level : 'block',
start(src) { return src.match(/\n\\page/m)?.index; }, // Hint to Marked.js to stop and check for a match
tokenizer(src) {
const regex = /^\\page(?:$|(?={[^\n{}]+}$))/m;
const match = regex.exec(src);
if(match?.length)
return { type : 'pageBreak', raw : match[0] };
},
renderer(token) {
return `<pagebreak></pagebreak>\n`;
}
};
//v=====--------------------< Variable Handling >-------------------=====v// 242 lines
const replaceVar = function(input, hoist=false, allowUnresolved=false) {
const regex = /([!$]?)\[((?!\s*\])(?:\\.|[^\[\]\\])+)\]/g;
@@ -795,7 +810,7 @@ const tableTerminators = [
];
Marked.use(MarkedVariables());
Marked.use({ extensions : [justifiedParagraphs, definitionListsMultiLine, definitionListsSingleLine, forcedParagraphBreaks,
Marked.use({ extensions : [pageBreak, justifiedParagraphs, definitionListsMultiLine, definitionListsSingleLine, forcedParagraphBreaks,
nonbreakingSpaces, superSubScripts, mustacheSpans, mustacheDivs, mustacheInjectInline] });
Marked.use(mustacheInjectBlock);
Marked.use({ renderer: renderer, tokenizer: tokenizer, mangle: false });
@@ -992,6 +1007,8 @@ const Markdown = {
return errors;
},
extractHTMLStyleTags : extractHTMLStyleTags
};
export default Markdown;