mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2025-12-28 15:42:38 +00:00
Merge branch 'master' into justifiedParagraphs
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
/* eslint-disable max-depth */
|
||||
/* eslint-disable max-lines */
|
||||
import _ from 'lodash';
|
||||
import { Parser as MathParser } from 'expr-eval';
|
||||
@@ -717,7 +718,7 @@ function MarkedVariables() {
|
||||
}
|
||||
if(match[8]) { // Inline Definition
|
||||
const label = match[10] ? match[10].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
|
||||
let content = match[11] ? match[11].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
|
||||
let content = match[11] || null;
|
||||
|
||||
// In case of nested (), find the correct matching end )
|
||||
let level = 0;
|
||||
@@ -733,10 +734,8 @@ function MarkedVariables() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(i > -1) {
|
||||
combinedRegex.lastIndex = combinedRegex.lastIndex - (content.length - i);
|
||||
content = content.slice(0, i).trim().replace(/\s+/g, ' ');
|
||||
}
|
||||
combinedRegex.lastIndex = combinedRegex.lastIndex - (content.length - i);
|
||||
content = content.slice(0, i).trim().replace(/\s+/g, ' ');
|
||||
|
||||
varsQueue.push(
|
||||
{ type : 'varDefBlock',
|
||||
|
||||
Reference in New Issue
Block a user