doc-utils/markdown2html
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix regexes

Browse Source
This commit is contained in:
James Brumond 2023-05-09 21:47:56 -07:00
parent b3c9ac0c5c
commit ac4d6786d3
Signed by: james
GPG Key ID: E8F2FC44BAA3357A
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/pikchr.ts
View File

@ -6,12 +6,12 @@ export function post_process_pikchr_svg(svg: string, size?: string) {
// text // text
for (const [ color, regex ] of Object.entries(text_regex)) { for (const [ color, regex ] of Object.entries(text_regex)) {
svg = svg.replace(regex, `<text fill="${text_css_vars[color]}"`); svg = svg.replace(regex, (_, $1) => `<text${$1}fill="${text_css_vars[color]}"`);
} }
// shape fill // shape fill
for (const [ color, regex ] of Object.entries(shape_fill_regex)) { for (const [ color, regex ] of Object.entries(shape_fill_regex)) {
svg = svg.replace(regex, `<path style="fill:${fill_css_vars[color]}`); svg = svg.replace(regex, (_, $1) => `<path${$1}style="fill:${fill_css_vars[color]}`);
} }
// arrow heads // arrow heads
@ -45,18 +45,18 @@ type CSSVarColor
; ;
const text_regex: Record<CSSVarColor, RegExp> = { const text_regex: Record<CSSVarColor, RegExp> = {
black: /<text fill="rgb\(0,0,0\)"/gi, black: /<text( | [^>]+ )fill="rgb\(0,0,0\)"/gi,
red: /<text fill="rgb\(255,0,0\)"/gi, red: /<text( | [^>]+ )fill="rgb\(255,0,0\)"/gi,
orange: /<text fill="rgb\(255,165,0\)"/gi, orange: /<text( | [^>]+ )fill="rgb\(255,165,0\)"/gi,
yellow: /<text fill="rgb\(255,255,0\)"/gi, yellow: /<text( | [^>]+ )fill="rgb\(255,255,0\)"/gi,
green: /<text fill="rgb\(0,128,0\)"/gi, green: /<text( | [^>]+ )fill="rgb\(0,128,0\)"/gi,
teal: /<text fill="rgb\(0,128,128\)"/gi, teal: /<text( | [^>]+ )fill="rgb\(0,128,128\)"/gi,
pink: /<text fill="rgb\(255,192,203\)"/gi, pink: /<text( | [^>]+ )fill="rgb\(255,192,203\)"/gi,
purple: /<text fill="rgb\(128,0,128\)"/gi, purple: /<text( | [^>]+ )fill="rgb\(128,0,128\)"/gi,
blue: /<text fill="rgb\(0,0,255\)"/gi, blue: /<text( | [^>]+ )fill="rgb\(0,0,255\)"/gi,
indigo: /<text fill="rgb\(75,0,130\)"/gi, indigo: /<text( | [^>]+ )fill="rgb\(75,0,130\)"/gi,
magenta: /<text fill="rgb\(255,0,255\)"/gi, magenta: /<text( | [^>]+ )fill="rgb\(255,0,255\)"/gi,
brown: /<text fill="rgb\(165,42,42\)"/gi, brown: /<text( | [^>]+ )fill="rgb\(165,42,42\)"/gi,
}; };
const line_regex: Record<CSSVarColor, RegExp> = { const line_regex: Record<CSSVarColor, RegExp> = {
@ -75,18 +75,18 @@ const line_regex: Record<CSSVarColor, RegExp> = {
}; };
const shape_fill_regex = { const shape_fill_regex = {
black: /<path style="fill:rgb\(0,0,0\)/gi, black: /<path( | [^>]+ )style="fill:rgb\(0,0,0\)/gi,
red: /<path style="fill:rgb\(255,0,0\)/gi, red: /<path( | [^>]+ )style="fill:rgb\(255,0,0\)/gi,
orange: /<path style="fill:rgb\(255,165,0\)/gi, orange: /<path( | [^>]+ )style="fill:rgb\(255,165,0\)/gi,
yellow: /<path style="fill:rgb\(255,255,0\)/gi, yellow: /<path( | [^>]+ )style="fill:rgb\(255,255,0\)/gi,
green: /<path style="fill:rgb\(0,128,0\)/gi, green: /<path( | [^>]+ )style="fill:rgb\(0,128,0\)/gi,
teal: /<path style="fill:rgb\(0,128,128\)/gi, teal: /<path( | [^>]+ )style="fill:rgb\(0,128,128\)/gi,
pink: /<path style="fill:rgb\(255,192,203\)/gi, pink: /<path( | [^>]+ )style="fill:rgb\(255,192,203\)/gi,
purple: /<path style="fill:rgb\(128,0,128\)/gi, purple: /<path( | [^>]+ )style="fill:rgb\(128,0,128\)/gi,
blue: /<path style="fill:rgb\(0,0,255\)/gi, blue: /<path( | [^>]+ )style="fill:rgb\(0,0,255\)/gi,
indigo: /<path style="fill:rgb\(75,0,130\)/gi, indigo: /<path( | [^>]+ )style="fill:rgb\(75,0,130\)/gi,
magenta: /<path style="fill:rgb\(255,0,255\)/gi, magenta: /<path( | [^>]+ )style="fill:rgb\(255,0,255\)/gi,
brown: /<path style="fill:rgb\(165,42,42\)/gi, brown: /<path( | [^>]+ )style="fill:rgb\(165,42,42\)/gi,
} }
const arrow_head_regex: Record<CSSVarColor, RegExp> = { const arrow_head_regex: Record<CSSVarColor, RegExp> = {