From 73e155111a51f60346fc90c7e9ce34ba8e92045b Mon Sep 17 00:00:00 2001 From: Chris Campbell Date: Mon, 29 Jan 2024 13:07:57 -0800 Subject: [PATCH] fix: include H2O, O2, and O3 in list of automatically subscripted chemicals --- .../sample-docs/projects/sample-guide/content/appendix.md | 3 +++ packages/docs-builder/src/gen-html.ts | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/examples/sample-docs/projects/sample-guide/content/appendix.md b/examples/sample-docs/projects/sample-guide/content/appendix.md index bd1f187..ca11e70 100644 --- a/examples/sample-docs/projects/sample-guide/content/appendix.md +++ b/examples/sample-docs/projects/sample-guide/content/appendix.md @@ -8,6 +8,9 @@ The following chemical formulas should be subscripted automatically: * CO2 * CF4 * CH4 +* H2O * N2O * NF3 +* O2 +* O3 * SF6 diff --git a/packages/docs-builder/src/gen-html.ts b/packages/docs-builder/src/gen-html.ts index 9451c25..8dfffcb 100644 --- a/packages/docs-builder/src/gen-html.ts +++ b/packages/docs-builder/src/gen-html.ts @@ -551,8 +551,11 @@ const subscriptMap = new Map([ ['CO2', 'CO2'], ['CF4', 'CF4'], ['CH4', 'CH4'], + ['H2O', 'H2O'], ['N2O', 'N2O'], ['NF3', 'NF3'], + ['O2', 'O2'], + ['O3', 'O3'], ['SF6', 'SF6'] ]) @@ -563,8 +566,11 @@ const subscriptMap = new Map([ * CO2 * CF4 * CH4 + * H2O * N2O * NF3 + * O2 + * O3 * SF6 * * @param s The input string. @@ -574,7 +580,7 @@ function subscriptify(s: string): string { // XXX: Some historical graph images in the En-ROADS User Guide have // {CO2,CH4,N2O} in the file name, so this regex is set up to avoid // converting those filenames - return s.replace(/(Hist_)?(CO2|CF4|CH4|N2O|NF3|SF6)/g, (m, m1, m2) => { + return s.replace(/(Hist_)?(CO2|CF4|CH4|H2O|N2O|NF3|O2|O3|SF6)/g, (m, m1, m2) => { if (m1) { return m } else {