{python.marimo} syntax

Author: gordonwoodhull

_extensions/marimo/marimo-engine.js

@@ -406,7 +406,7 @@ function delay(ms, options = {}) {
 
 // src/marimo-engine.ts
 var quarto;
-var MARIMO_CELL_REGEX = /^\s*(```+)\s*(?:python\s+\{\.|\{\.python\.|\{)(marimo)( *[ ,].*)?\}\s*$/;
+var MARIMO_CELL_REGEX = /^\s*(```+)\s*\{?(python)(?:\s+\{\.|\.)marimo( *[ ,].*)?\}\s*$/;
 async function executePython(command, args = [], stdin = "") {
   const cmd = new Deno.Command(command, {
     args,
@@ -532,7 +532,7 @@ var marimoEngineDiscovery = {
     return false;
   },
   claimsLanguage: (language) => {
-    return language === "marimo";
+    return language === "python";
   },
   canFreeze: false,
   generatesFigures: true,
@@ -603,6 +603,7 @@ var marimoEngineDiscovery = {
           const processedCells = [];
           let marimoIndex = 0;
           for (const cell of chunks.cells) {
+            console.log("is marimo", cell, isMarimoCell(cell));
             if (isMarimoCell(cell)) {
               if (marimoIndex < marimoExecution.outputs.length) {
                 const output = marimoExecution.outputs[marimoIndex];

src/marimo-engine.ts

@@ -25,11 +25,12 @@ import type {
 
 let quarto: QuartoAPI;
 
-// Matches {marimo}, python {.marimo}, and {.python.marimo} syntax
+// Matches
+// ```python {.marimo}
+// ```{python.marimo}
 // Group 1: backticks (```+)
-// Group 2: language ("marimo")
-// Does NOT match {.marimo} alone (requires python prefix for dot syntax)
-const MARIMO_CELL_REGEX = /^\s*(```+)\s*(?:python\s+\{\.|\{\.python\.|\{)(marimo)( *[ ,].*)?\}\s*$/;
+// Group 2: language ("python")
+const MARIMO_CELL_REGEX = /^\s*(```+)\s*\{?(python)(?:\s+\{\.|\.)marimo( *[ ,].*)?\}\s*$/;
 
 // Type for marimo cell output from extract.py
 interface MarimoOutput {
@@ -215,7 +216,7 @@ const marimoEngineDiscovery: ExecutionEngineDiscovery = {
   },
 
   claimsLanguage: (language: string) => {
-    return language === "marimo";
+    return language === "python";
   },
 
   canFreeze: false,

tutorials/example-pdf.qmd

@@ -15,7 +15,7 @@ extract-media: _site/media
 
 # PDF Output
 
-```{.python.marimo}
+```{python.marimo}
 check = """
 Quarto can handle images and tables in PDF output, but not rich HTML outputs.
 Here's an example of what can be acccomplished with the `marimo` exports to pdf.
@@ -39,7 +39,7 @@ import matplotlib.pyplot as plt
 plt.plot([1, 2])
 ```
 
-```{.python.marimo}
+```{python.marimo}
 plt.plot([1, 2])
 plt.gca()
 ```
@@ -57,7 +57,7 @@ df = pd.DataFrame({
 df
 ```
 
-```{.python.marimo}
+```{python.marimo}
 df = pd.DataFrame({
     'A': [1, 2, 3],
     'B': [4, 5, 6]
@@ -67,14 +67,14 @@ df
 
 ## Text / Markdown
 
-```{.python.marimo}
+```{python.marimo}
 f"""You can also include text or markdown in the PDF output.
 Which can be useful for embedding computed values like the fact
 that this was rendered by Marimo {mo.__version__} on {datetime.datetime.now()}.
 """
 ```
 
-```{.python.marimo}
+```{python.marimo}
 try:
     import matplotlib
     import matplotlib.pyplot as plt
@@ -90,6 +90,6 @@ if not missing_packages:
 ```
 
 
-```{.python.marimo}
+```{python.marimo}
 import marimo as mo
 ```