From 5c9338af4a579ea726c5acaeb8d06c1b12bd2767 Mon Sep 17 00:00:00 2001
From: Angus Hollands <goosey15@gmail.com>
Date: Thu, 11 Apr 2024 00:24:08 +0100
Subject: [PATCH] :bug: Request DOI metadata as CSL-JSON after BibTeX (#1073)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: support CSL-JSON from doi.org too
* fix: run built-in cleanup
* refactor: rename DOI function
* fix: export BibTeX using citation-js
* 🔧 Handle totally non-existent dois
* 🐛 Ensure citation nodes resolved from CSL-JSON have label
---------

Co-authored-by: Franklin Koch <franklinwkoch@gmail.com>
Co-authored-by: Rowan Cockett <rowanc1@gmail.com>
---
 .changeset/many-pianos-approve.md             |   7 +
 .changeset/ten-rockets-buy.md                 |   5 +
 packages/citation-js-utils/src/index.ts       | 113 +++++++++---
 .../citation-js-utils/tests/basic.spec.ts     |  17 +-
 .../types/citation-js/index.d.ts              |  11 +-
 .../myst-cli/src/build/utils/bibtex.spec.ts   |  35 ----
 packages/myst-cli/src/build/utils/bibtex.ts   |  30 +--
 packages/myst-cli/src/process/citations.ts    |  10 +-
 packages/myst-cli/src/process/file.ts         |   4 +-
 packages/myst-cli/src/transforms/doi.spec.ts  |  38 +++-
 packages/myst-cli/src/transforms/dois.ts      | 174 +++++++++++++-----
 packages/myst-to-jats/src/backmatter.ts       |   4 +-
 packages/mystmd/tests/dois/index.md           |  24 +++
 packages/mystmd/tests/dois/myst.yml           |  14 ++
 packages/mystmd/tests/dois/references.bib     |  50 +++++
 packages/mystmd/tests/endToEnd.spec.ts        |  52 +++---
 packages/mystmd/tests/exports.yml             |   8 +
 packages/mystmd/tests/outputs/dois.bib        | 107 +++++++++++
 packages/mystmd/tests/outputs/dois.tex        |  54 ++++++
 19 files changed, 575 insertions(+), 182 deletions(-)
 create mode 100644 .changeset/many-pianos-approve.md
 create mode 100644 .changeset/ten-rockets-buy.md
 delete mode 100644 packages/myst-cli/src/build/utils/bibtex.spec.ts
 create mode 100644 packages/mystmd/tests/dois/index.md
 create mode 100644 packages/mystmd/tests/dois/myst.yml
 create mode 100644 packages/mystmd/tests/dois/references.bib
 create mode 100644 packages/mystmd/tests/outputs/dois.bib
 create mode 100644 packages/mystmd/tests/outputs/dois.tex

diff --git a/.changeset/many-pianos-approve.md b/.changeset/many-pianos-approve.md
new file mode 100644
index 000000000..30e2a150f
--- /dev/null
+++ b/.changeset/many-pianos-approve.md
@@ -0,0 +1,7 @@
+---
+"citation-js-utils": minor
+"myst-to-jats": patch
+"myst-cli": patch
+---
+
+Load citations from CSL and non-CSL
diff --git a/.changeset/ten-rockets-buy.md b/.changeset/ten-rockets-buy.md
new file mode 100644
index 000000000..9a2482f8a
--- /dev/null
+++ b/.changeset/ten-rockets-buy.md
@@ -0,0 +1,5 @@
+---
+'mystmd': patch
+---
+
+Add end-to-end tests for various DOIs
diff --git a/packages/citation-js-utils/src/index.ts b/packages/citation-js-utils/src/index.ts
index 40448b217..d4e496a2b 100644
--- a/packages/citation-js-utils/src/index.ts
+++ b/packages/citation-js-utils/src/index.ts
@@ -1,5 +1,5 @@
-import type { OutputOptions } from '@citation-js/core';
 import { Cite } from '@citation-js/core';
+import { clean as cleanCSL } from '@citation-js/core/lib/plugins/input/csl.js';
 import sanitizeHtml from 'sanitize-html';
 
 import '@citation-js/plugin-bibtex';
@@ -8,10 +8,10 @@ import '@citation-js/plugin-csl';
 const DOI_IN_TEXT = /(10.\d{4,9}\/[-._;()/:A-Z0-9]*[A-Z0-9])/i;
 
 // This is duplicated in citation-js types, which are not exported
-export type CitationJson = {
+export type CSL = {
   type?: 'article-journal' | string;
   id: string;
-  author?: { given: string; family: string }[];
+  author?: { given: string; family: string; literal?: string }[];
   issued?: { 'date-parts'?: number[][]; literal?: string };
   publisher?: string;
   title?: string;
@@ -47,14 +47,6 @@ function cleanRef(citation: string) {
   return cleanHtml.replace(/^1\./g, '').replace(/&amp;/g, '&').trim();
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const defaultOpts: OutputOptions = {
-  format: 'string',
-  type: 'json',
-  style: 'ris',
-  lang: 'en-US',
-};
-
 export enum CitationJSStyles {
   'apa' = 'citation-apa',
   'vancouver' = 'citation-vancouver',
@@ -66,14 +58,7 @@ export enum InlineCite {
   't' = 't',
 }
 
-const defaultString: OutputOptions = {
-  format: 'string',
-  lang: 'en-US',
-  type: 'html',
-  style: CitationJSStyles.apa,
-};
-
-export function yearFromCitation(data: CitationJson) {
+export function yearFromCitation(data: CSL) {
   let year: number | string | undefined = data.issued?.['date-parts']?.[0]?.[0];
   if (year) return year;
   year = data.issued?.['literal']?.match(/\b[12][0-9]{3}\b/)?.[0];
@@ -81,7 +66,7 @@ export function yearFromCitation(data: CitationJson) {
   return 'n.d.';
 }
 
-export function getInlineCitation(data: CitationJson, kind: InlineCite, opts?: InlineOptions) {
+export function getInlineCitation(data: CSL, kind: InlineCite, opts?: InlineOptions) {
   let authors = data.author;
   if (!authors || authors.length === 0) {
     authors = data.editor;
@@ -112,7 +97,7 @@ export function getInlineCitation(data: CitationJson, kind: InlineCite, opts?: I
   }
   if (authors.length > 2) {
     return [
-      { type: 'text', value: `${prefix}${authors[0].family} ` },
+      { type: 'text', value: `${prefix}${authors[0].family ?? authors[0].literal} ` },
       { type: 'emphasis', children: [{ type: 'text', value: 'et al.' }] },
       { type: 'text', value: `${yearPart}` },
     ];
@@ -129,7 +114,9 @@ export type CitationRenderer = Record<
     inline: (kind?: InlineCite, opts?: InlineOptions) => InlineNode[];
     getDOI: () => string | undefined;
     getURL: () => string | undefined;
-    cite: CitationJson;
+    cite: CSL;
+    getLabel: () => string;
+    exportBibTeX: () => string;
   }
 >;
 
@@ -171,12 +158,58 @@ export function firstNonDoiUrl(str?: string, doi?: string) {
   return matches.map((match) => match[0]).find((match) => !doi || !match.includes(doi));
 }
 
+/**
+ * Parse a citation style of the form `citation-<style>` into its `<style>`
+ *
+ * @param style: citation style string
+ */
+function parseCitationStyle(style: string): string {
+  const [styleType, styleFormat] = style.split('-');
+  if (styleType !== 'citation') {
+    throw new Error(`unexpected citation style: ${style}`);
+  }
+  return styleFormat;
+}
+
+/**
+ * Parse a BibTeX string into an array of CSL items
+ *
+ * @param source - BibTeX string
+ *
+ */
+export function parseBibTeX(source: string): CSL[] {
+  return new Cite(source).data;
+}
+
+/**
+ * Parse CSL-JSON into an array of "clean" CSL items
+ *
+ * @param source - array of unclean CSL items
+ */
+export function parseCSLJSON(source: object[]): CSL[] {
+  return cleanCSL(source);
+}
+
+/**
+ * Compatability shim for existing callers of getCitations
+ * Replaced by getCitationRenderers
+ *
+ * @param bibtex - BibTeX string
+ */
 export async function getCitations(bibtex: string): Promise<CitationRenderer> {
-  const cite = new Cite();
-  const p = await Cite.async(bibtex);
+  const csl = parseBibTeX(bibtex);
+  return await getCitationRenderers(csl);
+}
 
+/**
+ * Build renderers for the given array of CSL items
+ *
+ * @param data - array of CSL items
+ */
+export async function getCitationRenderers(data: CSL[]): Promise<CitationRenderer> {
+  const cite = new Cite();
   return Object.fromEntries(
-    p.data.map((c: any): [string, CitationRenderer[0]] => {
+    data.map((c): [string, CitationRenderer[0]] => {
       const matchDoi = c.URL?.match(DOI_IN_TEXT) ?? c.note?.match(DOI_IN_TEXT);
       if (!c.DOI && matchDoi) {
         c.DOI = matchDoi[0];
@@ -189,7 +222,13 @@ export async function getCitations(bibtex: string): Promise<CitationRenderer> {
           },
           render(style?: CitationJSStyles) {
             return replaceUrlsWithAnchorElement(
-              cleanRef(cite.set(c).get({ ...defaultString, style: style ?? CitationJSStyles.apa })),
+              cleanRef(
+                cite.set(c).format('bibliography', {
+                  template: parseCitationStyle(style ?? (CitationJSStyles.apa as string)),
+                  format: 'html',
+                  lang: 'en-US',
+                }) as string,
+              ),
               c.DOI,
             );
           },
@@ -197,9 +236,29 @@ export async function getCitations(bibtex: string): Promise<CitationRenderer> {
             return c.DOI || undefined;
           },
           getURL(): string | undefined {
-            return firstNonDoiUrl(cleanRef(cite.set(c).get(defaultString)), c.DOI) ?? doiUrl(c.DOI);
+            return (
+              firstNonDoiUrl(
+                cleanRef(
+                  cite.set(c).format('bibliography', {
+                    template: parseCitationStyle(CitationJSStyles.apa as string),
+                    format: 'html',
+                    lang: 'en-US',
+                  }) as string,
+                ),
+                c.DOI,
+              ) ?? doiUrl(c.DOI)
+            );
           },
           cite: c,
+          getLabel(): string {
+            const bibtexObjects = cite.set(c).format('bibtex', { format: 'object' }) as {
+              label: string;
+            }[];
+            return bibtexObjects[0]?.label;
+          },
+          exportBibTeX(): string {
+            return cite.set(c).format('bibtex', { format: 'text' }) as string;
+          },
         },
       ];
     }),
diff --git a/packages/citation-js-utils/tests/basic.spec.ts b/packages/citation-js-utils/tests/basic.spec.ts
index d5bc1e659..a1fccb717 100644
--- a/packages/citation-js-utils/tests/basic.spec.ts
+++ b/packages/citation-js-utils/tests/basic.spec.ts
@@ -1,5 +1,11 @@
 import { describe, expect, it } from 'vitest';
-import { getCitations, CitationJSStyles, yearFromCitation, firstNonDoiUrl } from '../src';
+import {
+  getCitationRenderers,
+  parseBibTeX,
+  CitationJSStyles,
+  yearFromCitation,
+  firstNonDoiUrl,
+} from '../src';
 import {
   bibtex,
   doiInNote,
@@ -13,7 +19,8 @@ const key = 'Cockett2015SimPEG';
 
 describe('Test reference rendering', () => {
   it('APA', async () => {
-    const citations = await getCitations(bibtex);
+    const data = parseBibTeX(bibtex);
+    const citations = await getCitationRenderers(data);
     expect(Object.keys(citations).length).toBe(1);
     const cite = citations[key];
     expect(cite.render()).toEqual(TEST_APA_HTML);
@@ -21,7 +28,8 @@ describe('Test reference rendering', () => {
     expect(cite.getDOI()).toEqual('10.1016/j.cageo.2015.09.015');
   });
   it('Vancouver', async () => {
-    const citations = await getCitations(bibtex);
+    const data = parseBibTeX(bibtex);
+    const citations = await getCitationRenderers(data);
     const cite = citations[key];
     expect(cite.render(CitationJSStyles.vancouver)).toEqual(TEST_VANCOUVER_HTML);
   });
@@ -29,7 +37,8 @@ describe('Test reference rendering', () => {
     ['url', doiInURL],
     ['note', doiInNote],
   ])('Extract the DOI from the %s', async (_, src) => {
-    const citations = await getCitations(src);
+    const data = parseBibTeX(src);
+    const citations = await getCitationRenderers(data);
     expect(citations['cury2020sparse'].getDOI()).toBe(TEST_DOI_IN_OTHER_FIELD);
   });
 });
diff --git a/packages/citation-js-utils/types/citation-js/index.d.ts b/packages/citation-js-utils/types/citation-js/index.d.ts
index b7233b313..ed877bc7b 100644
--- a/packages/citation-js-utils/types/citation-js/index.d.ts
+++ b/packages/citation-js-utils/types/citation-js/index.d.ts
@@ -2,6 +2,9 @@
 // https://fettblog.eu/typescript-react-extending-jsx-elements/
 declare module '@citation-js/plugin-bibtex' {}
 declare module '@citation-js/plugin-csl' {}
+declare module '@citation-js/core/lib/plugins/input/csl.js' {
+  export function clean(data: any): any {}
+}
 declare module '@citation-js/core' {
   export type OutputOptions = {
     format: 'string';
@@ -38,13 +41,13 @@ declare module '@citation-js/core' {
   } & Record<string, any>;
 
   export class Cite {
-    constructor(input?: string | CSL);
+    constructor(input?: any);
 
-    static async(data: string | Cite): Promise<Cite>;
+    static async(data: any): Promise<Cite>;
 
-    set(data: string | Cite): this;
+    set(data: any): this;
 
-    get: (opts: OutputOptions) => string;
+    format: (format: string, options: any) => string | object[];
 
     data: CSL[];
   }
diff --git a/packages/myst-cli/src/build/utils/bibtex.spec.ts b/packages/myst-cli/src/build/utils/bibtex.spec.ts
deleted file mode 100644
index 627ac9159..000000000
--- a/packages/myst-cli/src/build/utils/bibtex.spec.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { extractBibtex } from './bibtex';
-
-describe('extractBibtex', () => {
-  it('no key returns undefined', async () => {
-    expect(extractBibtex('cite-key', 'bad bibtex data')).toEqual(undefined);
-  });
-  it('misformated key returns undefined', async () => {
-    expect(extractBibtex('cite-key', '@article { cite-key }')).toEqual(undefined);
-  });
-  it('minimal entry returns', async () => {
-    expect(extractBibtex('cite-key', '@article{cite-key}')).toEqual('@article{cite-key}');
-  });
-  it('minimal entry returns', async () => {
-    expect(extractBibtex('cite-key', '@article{a}\n@article{cite-key}\n@article{b}')).toEqual(
-      '@article{cite-key}',
-    );
-  });
-  it('entry with nested brackets returns', async () => {
-    expect(
-      extractBibtex(
-        'cite-key',
-        '@article{a}\n@article{cite-key, \n\tabstract = {my abs},\n\ttitle = {test {title}}}\n@article{b}',
-      ),
-    ).toEqual('@article{cite-key, \n\tabstract = {my abs},\n\ttitle = {test {title}}}');
-  });
-  it('entry with mismatched brackets returns undefined', async () => {
-    expect(
-      extractBibtex(
-        'cite-key',
-        '@article{a}\n@article{cite-key, \n\tabstract = {my abs},\n\ttitle = {test {title}}\n@article{b}',
-      ),
-    ).toEqual(undefined);
-  });
-});
diff --git a/packages/myst-cli/src/build/utils/bibtex.ts b/packages/myst-cli/src/build/utils/bibtex.ts
index aeb88c3f0..a8486ef18 100644
--- a/packages/myst-cli/src/build/utils/bibtex.ts
+++ b/packages/myst-cli/src/build/utils/bibtex.ts
@@ -5,29 +5,6 @@ import type { ISession } from '../../session/types.js';
 import { addWarningForFile } from '../../utils/addWarningForFile.js';
 import type { References } from 'myst-common';
 
-/**
- * Extract a single entry from the entire content of a bibtex file
- *
- * Look for the pattern '@article{key' then finds the closing bracket
- * and returns that substring. The "article" prefix may be any
- * alpha word.
- */
-export function extractBibtex(key: string, bibtex: string) {
-  const match = bibtex.match(new RegExp(`@[a-zA-Z]*{${key}`, 'g'));
-  if (!match) return;
-  const start = bibtex.indexOf(match[0]);
-  let bracketCount = 0;
-  let ind = start + match[0].length;
-  while (bibtex[ind] && (bibtex[ind] !== '}' || bracketCount !== 0)) {
-    if (bibtex[ind - 1] && bibtex[ind - 1] !== '\\') {
-      if (bibtex[ind] === '{') bracketCount++;
-      if (bibtex[ind] === '}') bracketCount--;
-    }
-    ind++;
-  }
-  return bibtex[ind] ? bibtex.substring(start, ind + 1) : undefined;
-}
-
 /**
  * Write new bibtex file from citation renderer data and reference order
  *
@@ -48,12 +25,7 @@ export function writeBibtexFromCitationRenderers(
   const citationLookup: Record<string, string> = {};
   Object.values(cache.$citationRenderers).forEach((renderers) => {
     Object.entries(renderers).forEach(([key, renderer]) => {
-      const bibtexContent = (renderer.cite._graph as any[]).find((item) => {
-        return item.type === '@biblatex/text';
-      });
-      if (bibtexContent?.data) {
-        citationLookup[key] = extractBibtex(key, bibtexContent.data) ?? bibtexContent.data;
-      }
+      citationLookup[key] = renderer.exportBibTeX();
     });
   });
   const bibtexContent: string[] = [];
diff --git a/packages/myst-cli/src/process/citations.ts b/packages/myst-cli/src/process/citations.ts
index 824a5e009..2538a3bbd 100644
--- a/packages/myst-cli/src/process/citations.ts
+++ b/packages/myst-cli/src/process/citations.ts
@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import type { CitationRenderer } from 'citation-js-utils';
-import { getCitations } from 'citation-js-utils';
+import { getCitationRenderers, parseBibTeX } from 'citation-js-utils';
 import { tic, isUrl } from 'myst-cli-utils';
 import { RuleId, plural } from 'myst-common';
 import type { ISession, ISessionWithCache } from '../session/types.js';
@@ -8,7 +8,10 @@ import { castSession } from '../session/cache.js';
 import { selectors } from '../store/index.js';
 import { addWarningForFile } from '../utils/addWarningForFile.js';
 
-export async function loadCitations(session: ISession, path: string): Promise<CitationRenderer> {
+export async function loadBibTeXCitationRenderers(
+  session: ISession,
+  path: string,
+): Promise<CitationRenderer> {
   const toc = tic();
   let data: string;
   if (isUrl(path)) {
@@ -23,7 +26,8 @@ export async function loadCitations(session: ISession, path: string): Promise<Ci
     session.log.debug(`Loading citations at "${path}"`);
     data = fs.readFileSync(path).toString();
   }
-  const renderer = await getCitations(data);
+  const csl = parseBibTeX(data);
+  const renderer = await getCitationRenderers(csl);
   session.log.debug(toc(`Read ${plural('%s citations(s)', renderer)} from ${path} in %s.`));
   return renderer;
 }
diff --git a/packages/myst-cli/src/process/file.ts b/packages/myst-cli/src/process/file.ts
index 587e5d83d..89d6e4dbf 100644
--- a/packages/myst-cli/src/process/file.ts
+++ b/packages/myst-cli/src/process/file.ts
@@ -14,7 +14,7 @@ import { warnings, watch } from '../store/reducers.js';
 import type { PreRendererData, RendererData } from '../transforms/types.js';
 import { logMessagesFromVFile } from '../utils/logging.js';
 import { addWarningForFile } from '../utils/addWarningForFile.js';
-import { loadCitations } from './citations.js';
+import { loadBibTeXCitationRenderers } from './citations.js';
 import { parseMyst } from './myst.js';
 import { processNotebook } from './notebook.js';
 import { selectors } from '../store/index.js';
@@ -104,7 +104,7 @@ export async function loadFile(
         break;
       }
       case '.bib': {
-        const renderer = await loadCitations(session, file);
+        const renderer = await loadBibTeXCitationRenderers(session, file);
         cache.$citationRenderers[file] = renderer;
         break;
       }
diff --git a/packages/myst-cli/src/transforms/doi.spec.ts b/packages/myst-cli/src/transforms/doi.spec.ts
index 4eb98e167..9d0138e95 100644
--- a/packages/myst-cli/src/transforms/doi.spec.ts
+++ b/packages/myst-cli/src/transforms/doi.spec.ts
@@ -1,26 +1,44 @@
 import { describe, expect, it } from 'vitest';
 import { Session } from '../session';
-import { getDoiOrgBibtex } from './dois';
+import { resolveDOIAsBibTeX, resolveDOIAsCSLJSON } from './dois';
 
-const PRIESTLEY_1972 =
-  '@article{PRIESTLEY_1972, title={On the Assessment of Surface Heat Flux and Evaporation Using Large-Scale Parameters}, volume={100}, ISSN={1520-0493}, url={http://dx.doi.org/10.1175/1520-0493(1972)100<0081:OTAOSH>2.3.CO;2}, DOI={10.1175/1520-0493(1972)100<0081:otaosh>2.3.co;2}, number={2}, journal={Monthly Weather Review}, publisher={American Meteorological Society}, author={PRIESTLEY, C. H. B. and TAYLOR, R. J.}, year={1972}, month=feb, pages={81–92} }';
-describe('DOI Resolvers', () => {
+const PRIESTLEY_1972_CSL_JSON = [
+  {
+    'container-title': 'Monthly Weather Review',
+    author: [
+      { given: 'C. H. B.', family: 'PRIESTLEY' },
+      { given: 'R. J.', family: 'TAYLOR' },
+    ],
+    DOI: '10.1175/1520-0493(1972)100<0081:otaosh>2.3.co;2',
+    type: 'article-journal',
+    issue: '2',
+    issued: { 'date-parts': [[1972, 2]] },
+    page: '81-92',
+    publisher: 'American Meteorological Society',
+    title: 'On the Assessment of Surface Heat Flux and Evaporation Using Large-Scale Parameters',
+    volume: '100',
+  },
+];
+describe.each([
+  { resolver: resolveDOIAsBibTeX, name: 'BibTeX' },
+  { resolver: resolveDOIAsCSLJSON, name: 'CSL-JSON' },
+])('DOI Resolvers for $name', ({ resolver, name }) => {
   it('short DOI resolves', async () => {
-    const bibtex = await getDoiOrgBibtex(new Session(), 'https://doi.org/cr3qwn');
-    expect(bibtex?.trim()).toEqual(PRIESTLEY_1972);
+    const data = await resolver(new Session(), 'https://doi.org/cr3qwn');
+    expect(data).toMatchObject(PRIESTLEY_1972_CSL_JSON);
   });
   it('url encoded DOI resolves', async () => {
-    const bibtex = await getDoiOrgBibtex(
+    const data = await resolver(
       new Session(),
       'https://doi.org/10.1175%2F1520-0493%281972%29100%3C0081%3AOTAOSH%3E2.3.CO%3B2',
     );
-    expect(bibtex?.trim()).toEqual(PRIESTLEY_1972);
+    expect(data).toMatchObject(PRIESTLEY_1972_CSL_JSON);
   });
   it('markdown link with strange characters resolves', async () => {
-    const bibtex = await getDoiOrgBibtex(
+    const data = await resolver(
       new Session(),
       'https://doi.org/10.1175/1520-0493(1972)100<0081:OTAOSH>2.3.CO;2',
     );
-    expect(bibtex?.trim()).toEqual(PRIESTLEY_1972);
+    expect(data).toMatchObject(PRIESTLEY_1972_CSL_JSON);
   });
 });
diff --git a/packages/myst-cli/src/transforms/dois.ts b/packages/myst-cli/src/transforms/dois.ts
index 063a121f3..eabc942bd 100644
--- a/packages/myst-cli/src/transforms/dois.ts
+++ b/packages/myst-cli/src/transforms/dois.ts
@@ -1,11 +1,11 @@
 import fs from 'node:fs';
 import { join } from 'node:path';
-import type { CitationRenderer } from 'citation-js-utils';
-import { getCitations } from 'citation-js-utils';
+import type { CitationRenderer, CSL } from 'citation-js-utils';
+import { getCitationRenderers, parseBibTeX, parseCSLJSON } from 'citation-js-utils';
 import { doi } from 'doi-utils';
 import type { Link } from 'myst-spec';
 import type { GenericNode, GenericParent } from 'myst-common';
-import { fileWarn, toText, RuleId, plural, fileError } from 'myst-common';
+import { toText, RuleId, plural, fileError } from 'myst-common';
 import { selectAll } from 'unist-util-select';
 import { computeHash, tic } from 'myst-cli-utils';
 import type { Cite } from 'myst-spec-ext';
@@ -13,8 +13,17 @@ import type { SingleCitationRenderer } from './types.js';
 import type { VFile } from 'vfile';
 import type { ISession } from '../session/types.js';
 
-function doiBibtexCacheFile(session: ISession, normalizedDoi: string) {
-  const filename = `doi-${computeHash(normalizedDoi)}.bib`;
+const CSL_JSON_MIMETYPE = 'application/vnd.citationstyles.csl+json';
+const BIBTEX_MIMETYPE = 'application/x-bibtex';
+
+/**
+ * Build a path to the cache-file for the given DOI
+ *
+ * @param session: CLI session
+ * @param normalizedDoi: normalized DOI of the form `prefix/suffix`
+ */
+function doiCSLJSONCacheFile(session: ISession, normalizedDoi: string) {
+  const filename = `doi-${computeHash(normalizedDoi)}.csl.json`;
   const cacheFolder = join(session.buildPath(), 'cache');
   if (!fs.existsSync(cacheFolder)) fs.mkdirSync(cacheFolder, { recursive: true });
   return join(cacheFolder, filename);
@@ -28,44 +37,122 @@ function doiResolvesCacheFile(session: ISession, normalizedDoi: string) {
 }
 
 /**
- * Fetch bibtex entry for doi from doi.org using application/x-bibtex accept header
+ * Resolve the given doi.org DOI URL into its BibTeX metadata
+ *
+ * @param session - CLI session
+ * @param url - doi.org DOI URL
  */
-export async function getDoiOrgBibtex(
+export async function resolveDOIAsBibTeX(
   session: ISession,
-  doiString: string,
-): Promise<string | null> {
-  const normalizedDoi = doi.normalize(doiString);
-  const url = doi.buildUrl(doiString); // This must be based on the incoming string, not the normalizedDoi. (e.g. short DOIs)
-  if (!doi.validate(doiString) || !normalizedDoi || !url) return null;
-  const cachePath = doiBibtexCacheFile(session, normalizedDoi);
-  if (fs.existsSync(cachePath)) {
-    const bibtex = fs.readFileSync(cachePath).toString();
-    session.log.debug(`Loaded cached reference bibtex for doi:${normalizedDoi}`);
-    return bibtex;
+  url: string,
+): Promise<CSL[] | undefined> {
+  session.log.debug('Fetching DOI BibTeX from doi.org');
+  const response = await session
+    .fetch(url, {
+      headers: [['Accept', BIBTEX_MIMETYPE]],
+    })
+    .catch(() => {
+      session.log.debug(`Request to ${url} failed.`);
+      return undefined;
+    });
+  if (!response || !response.ok) {
+    session.log.debug(`doi.org fetch failed for ${url}`);
+    return undefined;
   }
-  const toc = tic();
-  session.log.debug('Fetching DOI bibtex from doi.org');
+  const data = await response.text();
+  return parseBibTeX(data);
+}
+
+/**
+ * Resolve the given doi.org DOI URL into its CSL-JSON metadata
+ *
+ * @param session - CLI session
+ * @param url - doi.org DOI URL
+ */
+
+export async function resolveDOIAsCSLJSON(
+  session: ISession,
+  url: string,
+): Promise<CSL[] | undefined> {
+  session.log.debug('Fetching DOI CSL JSON from doi.org');
   const response = await session
     .fetch(url, {
-      headers: [['Accept', 'application/x-bibtex']],
+      headers: [['Accept', CSL_JSON_MIMETYPE]],
     })
     .catch(() => {
       session.log.debug(`Request to ${url} failed.`);
-      return null;
+      return undefined;
     });
   if (!response || !response.ok) {
-    session.log.debug(`doi.org fetch failed for ${doiString}`);
-    return null;
+    session.log.debug(`doi.org fetch failed for ${url}`);
+    return undefined;
+  }
+  const data = await response.json();
+  // Return parse result of _array_ of CSL items
+  return parseCSLJSON([data as object]);
+}
+
+/**
+ * Fetch CSL-JSON formatted metadata for the given doi.org DOI
+ *
+ * @param session - CLI session
+ * @param doiString - DOI
+ * @param vfile
+ * @param node
+ */
+export async function resolveDoiOrg(
+  session: ISession,
+  doiString: string,
+): Promise<CSL[] | undefined> {
+  const normalizedDoi = doi.normalize(doiString);
+  const url = doi.buildUrl(doiString); // This must be based on the incoming string, not the normalizedDoi. (e.g. short DOIs)
+  if (!doi.validate(doiString) || !normalizedDoi || !url) return undefined;
+
+  // Cache DOI resolution as CSL JSON (parsed)
+  const cachePath = doiCSLJSONCacheFile(session, normalizedDoi);
+
+  if (fs.existsSync(cachePath)) {
+    const cached = fs.readFileSync(cachePath).toString();
+    session.log.debug(`Loaded cached reference CSL-JSON for doi:${normalizedDoi}`);
+    return JSON.parse(cached);
+  }
+  const toc = tic();
+
+  let data: CSL[] | undefined;
+  try {
+    data = await resolveDOIAsBibTeX(session, url);
+    if (data) {
+      session.log.debug(toc(`Fetched reference BibTeX for doi:${normalizedDoi} in %s`));
+    } else {
+      session.log.debug(
+        `BibTeX not available from doi.org for doi:${normalizedDoi}, trying CSL-JSON`,
+      );
+    }
+  } catch (error) {
+    session.log.debug(
+      `BibTeX from doi.org was malformed for doi:${normalizedDoi}, trying CSL-JSON`,
+    );
+  }
+  if (!data) {
+    try {
+      data = await resolveDOIAsCSLJSON(session, url);
+      if (data) {
+        session.log.debug(toc(`Fetched reference CSL-JSON for doi:${normalizedDoi} in %s`));
+      } else {
+        session.log.debug(`CSL-JSON not available from doi.org for doi:${normalizedDoi}`);
+      }
+    } catch (error) {
+      session.log.debug(`CSL-JSON from doi.org was malformed for doi:${normalizedDoi}`);
+    }
   }
-  const bibtex = await response.text();
-  session.log.debug(toc(`Fetched reference bibtex for doi:${normalizedDoi} in %s`));
-  session.log.debug(`Saving doi bibtex to cache ${cachePath}`);
-  fs.writeFileSync(cachePath, bibtex);
-  return bibtex;
+  if (!data) return undefined;
+  session.log.debug(`Saving DOI CSL-JSON to cache ${cachePath}`);
+  fs.writeFileSync(cachePath, JSON.stringify(data));
+  return data as unknown as CSL[];
 }
 
 /**
- * Fetch doi from doi.org to see if it resolves
+ * Fetch DOI from doi.org to see if it resolves
  */
 export async function doiOrgResolves(session: ISession, doiString: string): Promise<boolean> {
   const normalizedDoi = doi.normalize(doiString);
@@ -99,19 +186,20 @@ export async function getCitation(
   node: GenericNode,
 ): Promise<SingleCitationRenderer | null> {
   if (!doi.validate(doiString)) return null;
-  const bibtex = await getDoiOrgBibtex(session, doiString);
-  if (!bibtex) {
+  const data = await resolveDoiOrg(session, doiString);
+  if (!data) {
     const resolves = await doiOrgResolves(session, doiString);
     const normalizedDoi = doi.normalize(doiString);
     let message: string;
     let note: string | undefined;
     if (resolves) {
-      message = `No bibtex available from doi.org for doi:${normalizedDoi}`;
-      note = `To resolve this error, visit ${doi.buildUrl(normalizedDoi)} and add citation info to .bib file`;
+      message = `Citation data from doi.org was not available or malformed for doi:${normalizedDoi}`;
+      note = `To resolve this error, visit ${doi.buildUrl(doiString)} and add citation info to local BibTeX file`;
     } else {
-      message = `Could not find DOI from link: ${doiString} as ${normalizedDoi}`;
+      message = `Could not find DOI "${doiString}" from doi.org as doi:${normalizedDoi}`;
+      note = 'Please check the DOI and, if correct, add citation info to local BibTeX file';
     }
-    fileWarn(vfile, message, {
+    fileError(vfile, message, {
       node,
       ruleId: RuleId.doiLinkValid,
       note,
@@ -119,18 +207,18 @@ export async function getCitation(
     return null;
   }
   try {
-    const renderer = await getCitations(bibtex);
+    const renderer = await getCitationRenderers(data);
     const id = Object.keys(renderer)[0];
     const render = renderer[id];
     return { id, render };
   } catch (error) {
     fileError(
       vfile,
-      `BibTeX from doi.org was malformed, please edit and add to your local references`,
+      `Citation data from doi.org was malformed, please edit and add to your local references`,
       {
         node,
         ruleId: RuleId.doiLinkValid,
-        note: `\nBibTeX from ${doiString}:\n\n${bibtex}\n`,
+        note: `Citation data from ${doiString}:\n\n${JSON.stringify(data)}\n`,
       },
     );
     return null;
@@ -175,11 +263,12 @@ export async function transformLinkedDOIs(
         else return false;
       }
       doiRenderer[node.url] = cite;
-      renderer[cite.id] = cite.render;
+      const label = cite.render.getLabel();
+      renderer[label] = cite.render;
       const citeNode = node as unknown as Cite;
       citeNode.type = 'cite';
       citeNode.kind = 'narrative';
-      citeNode.label = cite.id;
+      citeNode.label = label;
       if (doi.validate(toText(citeNode.children))) {
         // If the link text is the DOI, update with a citation in a following pass
         citeNode.children = [];
@@ -194,8 +283,9 @@ export async function transformLinkedDOIs(
         else return false;
       }
       doiRenderer[node.label] = cite;
-      renderer[cite.id] = cite.render;
-      node.label = cite.id;
+      const label = cite.render.getLabel();
+      renderer[label] = cite.render;
+      node.label = label;
       return true;
     }),
   ]);
diff --git a/packages/myst-to-jats/src/backmatter.ts b/packages/myst-to-jats/src/backmatter.ts
index 1bbbeb27e..adebfa102 100644
--- a/packages/myst-to-jats/src/backmatter.ts
+++ b/packages/myst-to-jats/src/backmatter.ts
@@ -1,7 +1,7 @@
-import type { CitationRenderer, CitationJson } from 'citation-js-utils';
+import type { CitationRenderer, CSL } from 'citation-js-utils';
 import type { Element, IJatsSerializer } from './types.js';
 
-export function citeToJatsRef(state: IJatsSerializer, key: string, data: CitationJson): Element {
+export function citeToJatsRef(state: IJatsSerializer, key: string, data: CSL): Element {
   const publicationType = !data.type || data.type === 'article-journal' ? 'journal' : data.type;
   const elements: Element[] = [];
   const authors: Element[] | undefined = data.author
diff --git a/packages/mystmd/tests/dois/index.md b/packages/mystmd/tests/dois/index.md
new file mode 100644
index 000000000..ddf0b2592
--- /dev/null
+++ b/packages/mystmd/tests/dois/index.md
@@ -0,0 +1,24 @@
+---
+export:
+  - _build/out.tex
+---
+
+# DOI tests
+
+Bibtex citation with doi: @Vogel2018systemic
+
+Bibtex citation without doi: @Meurer2020framework
+
+Bibtex book citation: @RN1
+
+Normal DOI citation: [](https://doi.org/10.1111/j.1365-246X.2012.05497.x)
+
+Nonexistent DOI citation (errors!): [](https://doi.org/10.1111/j.1365-246X.2012.99999.x)
+
+DOI with with invalid BibTeX: [](10.2903/j.efsa.2019.5779)
+
+DOI with with invalid BibTeX as cite node: @10.2903/j.efsa.2019.5779
+
+DOI with some strange characters: [](https://doi.org/10.1002/(SICI)1096-987X(199709)18:12%3C1450::AID-JCC3%3E3.0.CO;2-I)
+
+Short DOI: [](https://doi.org/cr3qwn)
\ No newline at end of file
diff --git a/packages/mystmd/tests/dois/myst.yml b/packages/mystmd/tests/dois/myst.yml
new file mode 100644
index 000000000..4afb8c940
--- /dev/null
+++ b/packages/mystmd/tests/dois/myst.yml
@@ -0,0 +1,14 @@
+# See docs at: https://mystmd.org/guide/frontmatter
+version: 1
+project:
+  id: 86ea1257-1eaf-440b-9bea-7c610745dc86
+  keywords: []
+  authors: []
+  github: https://github.com/executablebooks/mystjs
+site:
+  template: book-theme
+  nav: []
+  actions:
+    - title: Learn More
+      url: https://mystmd.org/guide
+  domains: []
diff --git a/packages/mystmd/tests/dois/references.bib b/packages/mystmd/tests/dois/references.bib
new file mode 100644
index 000000000..c9bbb2c53
--- /dev/null
+++ b/packages/mystmd/tests/dois/references.bib
@@ -0,0 +1,50 @@
+@article{Vogel2018systemic,
+  author = {Vogel, Hans-J{\" o}rg and Bartke, Stephan and Daedlow, Katrin and Helming, Katharina and K{\" o}gel-Knabner, Ingrid and Lang, Birgit and Rabot, Eva and Russell, David and St{\" o}\ss{}el, Bastian and Weller, Ulrich and Wiesmeier, Martin and Wollschl{\" a}ger, Ute},
+  journal = {SOIL},
+  number = {1},
+  year = {2018},
+  month = {mar 15},
+  pages = {83--92},
+  title = {A systemic approach for modeling soil functions},
+  volume = {4},
+  doi = {10.5194/soil-4-83-2018},
+  issn = {2199-398X},
+  url = {http://dx.doi.org/10.5194/soil-4-83-2018},
+}
+
+@article{Meurer2020framework,
+  author = {Meurer, Katharina and Barron, Jennie and Chenu, Claire and Coucheney, Elsa and Fielding, Matthew and Hallett, Paul and Herrmann, Anke M. and Keller, Thomas and Koestel, John and Larsbo, Mats and Lewan, Elisabet and Or, Dani and Parsons, David and Parvin, Nargish and Taylor, Astrid and Vereecken, Harry and Jarvis, Nicholas},
+  journal = {Global Change Biology},
+  number = {10},
+  year = {2020},
+  month = {aug 23},
+  pages = {5382--5403},
+  title = {A framework for modelling soil structure dynamics induced by biological activity},
+  volume = {26},
+  issn = {1354-1013},
+  url = {http://dx.doi.org/10.1111/gcb.15289},
+}
+
+@book{RN1,
+   author = {IPCC},
+   title = {Climate Change 2021: The Physical Science Basis. Contribution of Working Group I to the Sixth Assessment Report of the Intergovernmental Panel on Climate Change},
+   publisher = {Cambridge University Press},
+   address = {Cambridge, United Kingdom and New York, NY, USA},
+   volume = {In Press},
+   DOI = {10.1017/9781009157896},
+   year = {2021},
+   type = {Book}
+}
+
+@article{Powlson2011Soil,
+  author = {Powlson, D.S. and Gregory, P.J. and Whalley, W.R. and Quinton, J.N. and Hopkins, D.W. and Whitmore, A.P. and Hirsch, P.R. and Goulding, K.W.T.},
+  journal = {Food Policy},
+  year = {2011},
+  month = {1},
+  pages = {S72--S87},
+  title = {Soil management in relation to sustainable agriculture and ecosystem services},
+  volume = {36},
+  doi = {10.1016/j.foodpol.2010.11.025},
+  issn = {0306-9192},
+  url = {http://dx.doi.org/10.1016/j.foodpol.2010.11.025},
+}
\ No newline at end of file
diff --git a/packages/mystmd/tests/endToEnd.spec.ts b/packages/mystmd/tests/endToEnd.spec.ts
index 7b26c0f5a..651dcc352 100644
--- a/packages/mystmd/tests/endToEnd.spec.ts
+++ b/packages/mystmd/tests/endToEnd.spec.ts
@@ -26,28 +26,32 @@ function resolve(relative: string) {
   return path.resolve(__dirname, relative);
 }
 
-describe('End-to-end cli export tests', () => {
-  const cases = loadCases('exports.yml');
-  test.each(cases.map((c): [string, TestCase] => [c.title, c]))(
-    '%s',
-    async (_, { cwd, command, outputs }) => {
-      // Clean expected outputs if they already exist
-      await Promise.all(
-        outputs.map(async (output) => {
-          if (fs.existsSync(resolve(output.path))) {
-            await exec(`rm ${resolve(output.path)}`, { cwd: resolve(cwd) });
-          }
-        }),
-      );
-      // Run CLI command
-      await exec(command, { cwd: resolve(cwd) });
-      // Expect correct output
-      outputs.forEach((output) => {
-        expect(fs.existsSync(resolve(output.path))).toBeTruthy();
-        expect(fs.readFileSync(resolve(output.path), { encoding: 'utf-8' })).toEqual(
-          fs.readFileSync(resolve(output.content), { encoding: 'utf-8' }),
+describe.concurrent(
+  'End-to-end cli export tests',
+  () => {
+    const cases = loadCases('exports.yml');
+    test.each(cases.map((c): [string, TestCase] => [c.title, c]))(
+      '%s',
+      async (_, { cwd, command, outputs }) => {
+        // Clean expected outputs if they already exist
+        await Promise.all(
+          outputs.map(async (output) => {
+            if (fs.existsSync(resolve(output.path))) {
+              await exec(`rm ${resolve(output.path)}`, { cwd: resolve(cwd) });
+            }
+          }),
         );
-      });
-    },
-  );
-});
+        // Run CLI command
+        await exec(command, { cwd: resolve(cwd) });
+        // Expect correct output
+        outputs.forEach((output) => {
+          expect(fs.existsSync(resolve(output.path))).toBeTruthy();
+          expect(fs.readFileSync(resolve(output.path), { encoding: 'utf-8' })).toEqual(
+            fs.readFileSync(resolve(output.content), { encoding: 'utf-8' }),
+          );
+        });
+      },
+    );
+  },
+  { timeout: 15000 },
+);
diff --git a/packages/mystmd/tests/exports.yml b/packages/mystmd/tests/exports.yml
index 1de9a90b3..d638ea391 100644
--- a/packages/mystmd/tests/exports.yml
+++ b/packages/mystmd/tests/exports.yml
@@ -107,3 +107,11 @@ cases:
     outputs:
       - path: include-circular/_build/out.typ
         content: outputs/include-circular.typ
+  - title: Strange DOIs resolve as expected
+    cwd: dois
+    command: myst build --tex
+    outputs:
+      - path: dois/_build/out.tex
+        content: outputs/dois.tex
+      - path: dois/_build/main.bib
+        content: outputs/dois.bib
diff --git a/packages/mystmd/tests/outputs/dois.bib b/packages/mystmd/tests/outputs/dois.bib
new file mode 100644
index 000000000..5afce6796
--- /dev/null
+++ b/packages/mystmd/tests/outputs/dois.bib
@@ -0,0 +1,107 @@
+@article{Vogel2018systemic,
+	author = {Vogel, Hans-J{\" o}rg and Bartke, Stephan and Daedlow, Katrin and Helming, Katharina and K{\" o}gel-Knabner, Ingrid and Lang, Birgit and Rabot, Eva and Russell, David and St{\" o}\ss{}el, Bastian and Weller, Ulrich and Wiesmeier, Martin and Wollschl{\" a}ger, Ute},
+	journal = {SOIL},
+	doi = {10.5194/soil-4-83-2018},
+	issn = {2199-398X},
+	number = {1},
+	year = {2018},
+	month = {mar 15},
+	pages = {83--92},
+	title = {A systemic approach for modeling soil functions},
+	url = {http://dx.doi.org/10.5194/soil-4-83-2018},
+	howpublished = {http://dx.doi.org/10.5194/soil-4-83-2018},
+	volume = {4},
+}
+
+
+@article{Meurer2020framework,
+	author = {Meurer, Katharina and Barron, Jennie and Chenu, Claire and Coucheney, Elsa and Fielding, Matthew and Hallett, Paul and Herrmann, Anke M. and Keller, Thomas and Koestel, John and Larsbo, Mats and Lewan, Elisabet and Or, Dani and Parsons, David and Parvin, Nargish and Taylor, Astrid and Vereecken, Harry and Jarvis, Nicholas},
+	journal = {Global Change Biology},
+	doi = {10.1111/gcb.15289},
+	issn = {1354-1013},
+	number = {10},
+	year = {2020},
+	month = {aug 23},
+	pages = {5382--5403},
+	title = {A framework for modelling soil structure dynamics induced by biological activity},
+	url = {http://dx.doi.org/10.1111/gcb.15289},
+	howpublished = {http://dx.doi.org/10.1111/gcb.15289},
+	volume = {26},
+}
+
+
+@book{RN1,
+	address = {Cambridge, United Kingdom},
+	author = {{IPCC}},
+	doi = {10.1017/9781009157896},
+	year = {2021},
+	publisher = {Cambridge University Press},
+	title = {Climate {Change} 2021: The {Physical} {Science} {Basis}. {Contribution} of {Working} {Group} {I} to the {Sixth} {Assessment} {Report} of the {Intergovernmental} {Panel} on {Climate} {Change}},
+	type = {Book},
+	volume = {In Press},
+}
+
+
+@article{Koch_2012,
+	author = {Koch, Franklin W. and Wiens, Douglas A. and Nyblade, Andrew A. and Shore, Patrick J. and Tibi, Rigobert and Ateba, B. and Tabod, C.T. and Nnange, J. M.},
+	journal = {Geophysical Journal International},
+	doi = {10.1111/j.1365-246x.2012.05497.x},
+	issn = {0956-540X},
+	number = {1},
+	year = {2012},
+	month = {5},
+	pages = {75--86},
+	publisher = {Oxford University Press (OUP)},
+	title = {Upper-mantle anisotropy beneath the {Cameroon} {Volcanic} {Line} and {Congo} {Craton} from shear wave splitting measurements: Anisotropy beneath the {CVL}},
+	url = {http://dx.doi.org/10.1111/j.1365-246X.2012.05497.x},
+	volume = {190},
+}
+
+
+@article{EFSA2019Dietary,
+	address = {IT},
+	author = {{EFSA Panel on Nutrition, Novel Foods and Food Allergens (NDA)} and Turck, Dominique and Castenmiller, Jacqueline and de Henauw, Stefaan and HirschErnst, KarenIldico and Kearney, John and Knutsen, Helle Katrine and Maciuk, Alexandre and Mangelsdorf, Inge and McArdle, Harry J and Pelaez, Carmen and Pentieva, Kristina and Siani, Alfonso and Thies, Frank and Tsabouri, Sophia and Vinceti, Marco and Aggett, Peter and FairweatherTait, Susan and Martin, Ambroise and Przyrembel, Hildegard and de SesmaisonsLecarr{\' e}, Agn{\` e}s and Naska, Androniki},
+	journal = {EFSA Journal},
+	doi = {10.2903/j.efsa.2019.5779},
+	issn = {18314732, 18314732},
+	number = {9},
+	year = {2019},
+	month = {9},
+	title = {Dietary reference values for chloride},
+	url = {https://data.europa.eu/doi/10.2903/j.efsa.2019.5779},
+	howpublished = {https://data.europa.eu/doi/10.2903/j.efsa.2019.5779},
+	volume = {17},
+}
+
+
+@article{Bartels_1997,
+	author = {Bartels, Christian and Karplus, Martin},
+	journal = {Journal of Computational Chemistry},
+	doi = {10.1002/(sici)1096-987x(199709)18:12<1450::aid-jcc3>3.0.co;2-i},
+	issn = {1096-987X},
+	number = {12},
+	year = {1997},
+	month = {9},
+	pages = {1450--1462},
+	publisher = {Wiley},
+	title = {Multidimensional adaptive umbrella sampling: Applications to main chain and side chain peptide conformations},
+	url = {http://dx.doi.org/10.1002/(SICI)1096-987X(199709)18:12%3C1450::AID-JCC3%3E3.0.CO;2-I},
+	volume = {18},
+}
+
+
+@article{PRIESTLEY_1972,
+	author = {PRIESTLEY, C. H. B. and TAYLOR, R. J.},
+	journal = {Monthly Weather Review},
+	doi = {10.1175/1520-0493(1972)100<0081:otaosh>2.3.co;2},
+	issn = {1520-0493},
+	number = {2},
+	year = {1972},
+	month = {2},
+	pages = {81--92},
+	publisher = {American Meteorological Society},
+	title = {On the {Assessment} of {Surface} {Heat} {Flux} and {Evaporation} {Using} {Large}-{Scale} {Parameters}},
+	url = {http://dx.doi.org/10.1175/1520-0493(1972)100%3C0081:OTAOSH%3E2.3.CO;2},
+	volume = {100},
+}
+
diff --git a/packages/mystmd/tests/outputs/dois.tex b/packages/mystmd/tests/outputs/dois.tex
new file mode 100644
index 000000000..edbcd954b
--- /dev/null
+++ b/packages/mystmd/tests/outputs/dois.tex
@@ -0,0 +1,54 @@
+% Created with jtex v.1.0.16
+\documentclass{article}
+\PassOptionsToPackage{short, nodayofweek}{datetime}
+
+\input{curvenote.def}
+
+
+
+% colors for hyperlinks
+\hypersetup{colorlinks=true, allcolors=blue}
+\hypersetup{
+pdftitle={\@title},
+pdfsubject={},
+pdfauthor={\@author},
+pdfkeywords={},
+addtopdfcreator={Written in Curvenote}
+}
+
+\usepackage{curvenote}
+
+\title{DOI tests}
+
+\newdate{articleDate}{10}{4}{2024}
+\date{\displaydate{articleDate}}
+
+\author{}
+
+\begin{document}
+
+\maketitle
+\keywords{}
+
+Bibtex citation with doi: \cite{Vogel2018systemic}
+
+Bibtex citation without doi: \cite{Meurer2020framework}
+
+Bibtex book citation: \cite{RN1}
+
+Normal DOI citation: \cite{Koch_2012}
+
+Nonexistent DOI citation (errors!): \href{https://doi.org/10.1111/j.1365-246X.2012.99999.x}{}
+
+DOI with with invalid BibTeX: \cite{EFSA2019Dietary}
+
+DOI with with invalid BibTeX as cite node: \cite{EFSA2019Dietary}
+
+DOI with some strange characters: \cite{Bartels_1997}
+
+Short DOI: \cite{PRIESTLEY_1972}
+
+\clearpage
+\bibliography{main.bib}
+
+\end{document}