Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix space issue in image tags #4014

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix space issue in image tags #4014

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f1eb6e1
Alter varCallInline content to alig with preceeding varDefBlock in in…
dbolacksn Jan 29, 2025
158122e
Merge branch 'master' into issue_3659
dbolacksn Jan 31, 2025
564f5d7
WIP
dbolacksn Jan 31, 2025
b1ff68c
Update code to use helper function to ensure unifrom normalization of…
dbolacksn Jan 31, 2025
8711265
Merge branch 'issue_3659' of github.com:dbolack-ab/homebrewery into i…
dbolacksn Jan 31, 2025
497f8bd
Merge branch 'master' into issue_3659
dbolacksn Jan 31, 2025
7c293f5
Merge branch 'master' into issue_3659
dbolacksn Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions shared/naturalcrit/markdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ mathParser.functions.signed = function (a) {
return `${a}`;
};

// Make sure we normalize variable names consistantly.
const normalizeVarNames = (label)=>{
return label.trim()
.replace(/\s+/g, ' ');
};

//Processes the markdown within an HTML block if it's just a class-wrapper
renderer.html = function (html) {
if(_.startsWith(_.trim(html), '<div') && _.endsWith(_.trim(html), '</div>')){
Expand Down Expand Up @@ -533,7 +539,7 @@ const replaceVar = function(input, hoist=false, allowUnresolved=false) {
const match = regex.exec(input);

const prefix = match[1];
const label = match[2];
const label = normalizeVarNames(match[2]); // Ensure the label name is normalized as it should be in the var stack.

//v=====--------------------< HANDLE MATH >-------------------=====v//
const mathRegex = /[a-z]+\(|[+\-*/^(),]/g;
Expand Down Expand Up @@ -688,7 +694,7 @@ function MarkedVariables() {
});
}
if(match[3]) { // Block Definition
const label = match[4] ? match[4].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
const label = match[4] ? normalizeVarNames(match[4]) : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
const content = match[5] ? match[5].trim().replace(/[ \t]+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space

varsQueue.push(
Expand All @@ -698,7 +704,7 @@ function MarkedVariables() {
});
}
if(match[6]) { // Block Call
const label = match[7] ? match[7].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
const label = match[7] ? normalizeVarNames(match[7]) : null; // Trim edge spaces and shorten blocks of whitespace to 1 space

varsQueue.push(
{ type : 'varCallBlock',
Expand All @@ -707,7 +713,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
const label = match[10] ? normalizeVarNames(match[10]) : 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 )
Expand Down Expand Up @@ -739,7 +745,7 @@ function MarkedVariables() {
});
}
if(match[12]) { // Inline Call
const label = match[13] ? match[13].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
const label = match[13] ? normalizeVarNames(match[13]) : null; // Trim edge spaces and shorten blocks of whitespace to 1 space

varsQueue.push(
{ type : 'varCallInline',
Expand Down