fix: respect enumerated

jupyter-book · Nov 20, 2024 · 8abd747 · 8abd747
1 parent e7d866a
commit 8abd747
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/packages/myst-ext-exercise/src/exercise.ts b/packages/myst-ext-exercise/src/exercise.ts
@@ -32,17 +32,24 @@ export const exerciseDirective: DirectiveSpec = {
     if (data.body) {
       children.push(...(data.body as GenericNode[]));
     }
-    const nonumber = (data.options?.nonumber as boolean) ?? false;
+
+    // Let `nonumber` take precedence over enumerated
+    let enumerated: boolean;
+    if (data.options?.nonumber !== undefined) {
+      enumerated = !data.options.nonumber as boolean;
+    } else {
+      enumerated = data.options?.enumerated as boolean;
+    }
     const exercise: GenericNode = {
       type: 'exercise',
       hidden: data.options?.hidden as boolean,
-      enumerated: !nonumber,
+      enumerated,
       children: children as any[],
     };
     addCommonDirectiveOptions(data, exercise);
 
     // Numbered, unlabeled exercises still need a label
-    const backupLabel = nonumber ? undefined : `exercise-${createId()}`;
+    const backupLabel = enumerated ? `exercise-${createId()}` : undefined;
     const rawLabel = (data.options?.label as string) || backupLabel;
     const { label, identifier } = normalizeLabel(rawLabel) || {};
     exercise.label = label;

diff --git a/packages/myst-ext-proof/src/proof.ts b/packages/myst-ext-proof/src/proof.ts
@@ -45,11 +45,18 @@ export const proofDirective: DirectiveSpec = {
     if (data.body) {
       children.push(...(data.body as GenericNode[]));
     }
-    const nonumber = (data.options?.nonumber as boolean) ?? false;
+
+    // Let `nonumber` take precedence over enumerated
+    let enumerated: boolean;
+    if (data.options?.nonumber !== undefined) {
+      enumerated = !data.options.nonumber as boolean;
+    } else {
+      enumerated = data.options?.enumerated as boolean;
+    }
     const proof = {
       type: 'proof',
       kind: data.name !== 'proof' ? data.name.replace('prf:', '') : undefined,
-      enumerated: !nonumber,
+      enumerated,
       children: children as any[],
     };
     addCommonDirectiveOptions(data, proof);