typst: article / margin layout

.github/workflows/actions/quarto-dev/action.yml

@@ -12,6 +12,22 @@ runs:
         restore-keys: |
           ${{ runner.os }}-deno_std-2-
 
+    - name: Install Rust for typst-gather
+      uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: "1.81"
+
+    - name: Cache Cargo dependencies
+      uses: actions/cache@v4
+      with:
+        path: |
+          ~/.cargo/registry
+          ~/.cargo/git
+          package/typst-gather/target
+        key: ${{ runner.os }}-cargo-typst-gather-${{ hashFiles('package/typst-gather/Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-cargo-typst-gather-
+
     - name: Configure Quarto (.sh)
       if: runner.os != 'Windows'
       shell: bash
@@ -33,13 +49,13 @@ runs:
     - name: Basic dev mode sanity check
       shell: pwsh
       run: |
-        If ( "$(quarto --version)" -ne "99.9.9") { 
+        If ( "$(quarto --version)" -ne "99.9.9") {
           echo "Unexpected version detected: $(quarto --version)"
-          Exit 1 
+          Exit 1
         }
-        If ( $(quarto --paths | Select-String -Pattern "package[/\\]+dist[/\\]+share") -ne $null ) { 
+        If ( $(quarto --paths | Select-String -Pattern "package[/\\]+dist[/\\]+share") -ne $null ) {
           echo "Unexpected package/dist/share path detected: $(quarto --paths)"
-          Exit 1 
+          Exit 1
         }
         # check if configure is modifying some files as it should not
         $modifiedFiles = git diff --name-only

.github/workflows/create-release.yml

@@ -133,6 +133,11 @@ jobs:
         if: ${{ inputs.publish-release }}
         uses: ./.github/workflows/actions/prevent-rerun
 
+      - name: Install Rust for typst-gather
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: "1.81"
+
       - name: Configure
         run: |
           ./configure.sh
@@ -261,6 +266,11 @@ jobs:
         if: ${{ inputs.publish-release }}
         uses: ./.github/workflows/actions/prevent-rerun
 
+      - name: Install Rust for typst-gather
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: "1.81"
+
       - name: Configure
         run: |
           ./configure.sh
@@ -360,10 +370,11 @@ jobs:
         if: ${{ inputs.publish-release }}
         uses: ./.github/workflows/actions/prevent-rerun
 
-      - name: Configure Rust Tools
-        run: |
-          rustup.exe toolchain install 1.63.0 --component rustfmt --component clippy --no-self-update
-          rustup.exe default 1.63.0
+      - name: Install Rust for typst-gather and launcher
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: "1.81"
+
       - name: Configure
         run: |
           .\configure.cmd
@@ -389,6 +400,7 @@ jobs:
             ./package/pkg-working/bin/tools/x86_64/esbuild.exe
             ./package/pkg-working/bin/tools/x86_64/dart-sass/src/dart.exe
             ./package/pkg-working/bin/tools/x86_64/deno_dom/plugin.dll
+            ./package/pkg-working/bin/tools/x86_64/typst-gather.exe
             ./package/pkg-working/bin/tools/pandoc.exe
             ./package/pkg-working/bin/quarto.js
         env:
@@ -491,6 +503,11 @@ jobs:
         if: ${{ inputs.publish-release }}
         uses: ./.github/workflows/actions/prevent-rerun
 
+      - name: Install Rust for typst-gather
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: "1.81"
+
       - name: Configure
         run: |
           ./configure.sh

configure.cmd

@@ -89,6 +89,16 @@ IF EXIST !QUARTO_BIN_PATH!\quarto.cmd (
 ECHO NOTE: To use quarto please use quarto.cmd (located in this folder) or add the following path to your PATH
 ECHO !QUARTO_BIN_PATH!
 
+REM Build typst-gather if cargo is available
+where cargo >nul 2>nul
+if %ERRORLEVEL% EQU 0 (
+  ECHO Building typst-gather...
+  cargo build --release --manifest-path package\typst-gather\Cargo.toml
+) else (
+  ECHO Note: Rust/cargo not found, skipping typst-gather build
+  ECHO Install Rust to use 'quarto call typst-gather'
+)
+
 endlocal & set QUARTO_BIN_DEV=%QUARTO_BIN_PATH%
 
 GOTO :eof

configure.sh

@@ -102,3 +102,12 @@ else
   export QUARTO_DENO_EXTRA_OPTIONS="--reload"
 	quarto --version
 fi
+
+# Build typst-gather if cargo is available
+if command -v cargo &> /dev/null; then
+  echo "Building typst-gather..."
+  cargo build --release --manifest-path package/typst-gather/Cargo.toml
+else
+  echo "Note: Rust/cargo not found, skipping typst-gather build"
+  echo "Install Rust to use 'quarto call typst-gather'"
+fi

package/src/common/prepare-dist.ts

@@ -100,6 +100,30 @@ export async function prepareDist(
     }
   }
 
+  // Stage typst-gather binary if it exists (built by configure.sh)
+  // Only stage if the build machine architecture matches the target architecture
+  // (cross-compilation is not currently supported)
+  const buildArch = Deno.build.arch === "aarch64" ? "aarch64" : "x86_64";
+  if (buildArch === config.arch) {
+    const typstGatherBinaryName = config.os === "windows" ? "typst-gather.exe" : "typst-gather";
+    const typstGatherSrc = join(
+      config.directoryInfo.root,
+      "package/typst-gather/target/release",
+      typstGatherBinaryName,
+    );
+    if (existsSync(typstGatherSrc)) {
+      info("\nStaging typst-gather binary");
+      const typstGatherDest = join(targetDir, config.arch, typstGatherBinaryName);
+      ensureDirSync(join(targetDir, config.arch));
+      copySync(typstGatherSrc, typstGatherDest, { overwrite: true });
+      info(`Copied ${typstGatherSrc} to ${typstGatherDest}`);
+    } else {
+      info("\nNote: typst-gather binary not found, skipping staging");
+    }
+  } else {
+    info(`\nNote: Skipping typst-gather staging (build arch ${buildArch} != target arch ${config.arch})`);
+  }
+
   // build quarto-preview.js
   info("Building Quarto Web UI");
   const result = buildQuartoPreviewJs(config.directoryInfo.src, undefined, true);

package/typst-gather/.gitignore

@@ -0,0 +1 @@
+/target