Merge branch 'main' into tadeu/sd-3347-feature-render-word-style-underlines

Author: caio-pizzol

.github/workflows/superdoc-oss-sync-to-labs.yml

@@ -0,0 +1,37 @@
+name: Notify Labs of OSS changes
+
+on:
+  push:
+    branches:
+      - nick/sync
+
+permissions:
+  contents: read
+
+concurrency:
+  group: superdoc-oss-sync-dispatch
+  cancel-in-progress: false
+
+jobs:
+  dispatch:
+    name: Dispatch to Labs
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: Create Labs App token
+        id: labs-token
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+          owner: superdoc-dev
+          repositories: labs
+
+      - name: Dispatch superdoc-oss-sync to Labs
+        env:
+          GH_TOKEN: ${{ steps.labs-token.outputs.token }}
+        run: |
+          gh api repos/superdoc-dev/labs/dispatches \
+            -f event_type=superdoc-oss-sync \
+            -F client_payload[sha]='${{ github.sha }}' \
+            -F client_payload[ref]='${{ github.ref_name }}'

README.md

@@ -184,6 +184,7 @@ Special thanks to these community members who have contributed code to SuperDoc:
 <a href="https://github.com/msviderok"><img src="https://github.com/msviderok.png" width="50" height="50" alt="msviderok" title="Myroslav Sviderok" /></a>
 <a href="https://github.com/sergiogomes"><img src="https://github.com/sergiogomes.png" width="50" height="50" alt="sergiogomes" title="Sérgio Paulo Gomes" /></a>
 <a href="https://github.com/wookieb"><img src="https://github.com/wookieb.png" width="50" height="50" alt="wookieb" title="Łukasz Kużyński" /></a>
+<a href="https://github.com/xy200303"><img src="https://github.com/xy200303.png" width="50" height="50" alt="xy200303" title="小云" /></a>
 
 Want to see your avatar here? Check the [Contributing Guide](CONTRIBUTING.md) to get started.
 

demos/nextjs-ssr/.gitignore

@@ -39,3 +39,4 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
+public/fonts/

demos/nextjs-ssr/copy-fonts.mjs

@@ -0,0 +1,21 @@
+// Copy SuperDoc's bundled metric-compatible font substitutes into public/fonts/ so they
+// are served at /fonts/ (the default asset base). Without this, the bundled .woff2 404
+// and SuperDoc paginates against a browser fallback. Runs as `predev`/`prebuild`.
+//
+// A real Next.js consumer would copy from `node_modules/@superdoc/font-system/assets/`
+// (or set `fonts.assetBaseUrl` to wherever they serve them); this example copies from the
+// workspace build for a self-contained demo.
+import { cpSync, existsSync } from 'node:fs';
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const here = dirname(fileURLToPath(import.meta.url));
+const src = resolve(here, '../../packages/superdoc/dist/fonts');
+const dst = resolve(here, 'public/fonts');
+
+if (existsSync(src)) {
+  cpSync(src, dst, { recursive: true });
+  console.log('[nextjs-ssr] copied bundled fonts -> public/fonts/');
+} else {
+  console.warn(`[nextjs-ssr] bundled fonts not found at ${src}; run \`pnpm build:superdoc\` first`);
+}

demos/nextjs-ssr/package.json

@@ -3,7 +3,9 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
+    "predev": "node copy-fonts.mjs",
     "dev": "next dev --turbopack",
+    "prebuild": "node copy-fonts.mjs",
     "build": "next build",
     "start": "next start",
     "lint": "next lint"

examples/getting-started/cdn/setup.mjs

@@ -2,7 +2,7 @@
 // so `index.html` is self-contained and can be served with `npx serve .`.
 // Run before `dev` or the Playwright smoke test.
 
-import { copyFileSync, existsSync } from 'node:fs';
+import { copyFileSync, cpSync, existsSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -19,16 +19,26 @@ const assets = [
   [sampleSource, resolve(here, 'test_file.docx')],
 ];
 
+// The bundled metric-compatible substitutes ship as separate assets under dist/fonts/.
+// The CDN build auto-detects `./fonts/` relative to superdoc.min.js, so the example must
+// serve them beside the script (here/fonts/) or every .woff2 404s.
+const fontsSrc = resolve(dist, 'fonts');
+const fontsDst = resolve(here, 'fonts');
+
 const missing = assets.filter(([src]) => !existsSync(src));
-if (missing.length) {
+if (missing.length || !existsSync(fontsSrc)) {
   console.error('[cdn-example/setup] Build the SuperDoc bundle first:');
   console.error('  pnpm --filter superdoc build');
   console.error('Missing files:');
   for (const [src] of missing) console.error('  ' + src);
+  if (!existsSync(fontsSrc)) console.error('  ' + fontsSrc + ' (bundled font assets)');
   process.exit(1);
 }
 
 for (const [src, dst] of assets) {
   copyFileSync(src, dst);
   console.log('[cdn-example/setup] copied', dst.replace(here + '/', ''));
 }
+
+cpSync(fontsSrc, fontsDst, { recursive: true });
+console.log('[cdn-example/setup] copied fonts/ (bundled substitute pack)');

examples/getting-started/laravel/.gitignore

@@ -22,3 +22,4 @@ composer.lock
 /.nova
 /.vscode
 /.zed
+/public/fonts/

examples/getting-started/laravel/copy-fonts.mjs

@@ -0,0 +1,20 @@
+// Copy SuperDoc's bundled metric-compatible font substitutes into public/fonts/ so Laravel
+// serves them at /fonts/ (the default asset base). Without this, the bundled .woff2 404 and
+// SuperDoc paginates against a browser fallback. Runs before `vite build` in `start`.
+//
+// A real Laravel app would copy from `node_modules/@superdoc/font-system/assets/` (or set
+// `fonts.assetBaseUrl`); this example copies from the workspace build for a self-contained demo.
+import { cpSync, existsSync } from 'node:fs';
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const here = dirname(fileURLToPath(import.meta.url));
+const src = resolve(here, '../../../packages/superdoc/dist/fonts');
+const dst = resolve(here, 'public/fonts');
+
+if (existsSync(src)) {
+  cpSync(src, dst, { recursive: true });
+  console.log('[laravel] copied bundled fonts -> public/fonts/');
+} else {
+  console.warn(`[laravel] bundled fonts not found at ${src}; run \`pnpm build:superdoc\` first`);
+}

examples/getting-started/laravel/package.json

@@ -3,9 +3,9 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "build": "vite build",
-    "dev": "concurrently \"php artisan serve --host=0.0.0.0 --port=8000\" \"vite\"",
-    "start": "vite build && php artisan serve --host=127.0.0.1 --port=8000"
+    "build": "node copy-fonts.mjs && vite build",
+    "dev": "node copy-fonts.mjs && concurrently \"php artisan serve --host=0.0.0.0 --port=8000\" \"vite\"",
+    "start": "node copy-fonts.mjs && vite build && php artisan serve --host=127.0.0.1 --port=8000"
   },
   "dependencies": {
     "concurrently": "^9.0.0",

packages/layout-engine/contracts/src/index.ts

@@ -2008,6 +2008,8 @@ export type Page = {
    * (in later phases) by body pagination itself.
    */
   footnoteLedger?: FootnotePageLedger;
+  /** Numeric page number after section numbering restart/offset. Used for OOXML odd/even parity. */
+  displayNumber?: number;
   numberText?: string;
   size?: { w: number; h: number };
   orientation?: 'portrait' | 'landscape';
@@ -2235,6 +2237,7 @@ export type HeaderFooterType = 'default' | 'first' | 'even' | 'odd';
 export type HeaderFooterPage = {
   number: number;
   fragments: Fragment[];
+  displayNumber?: number;
   numberText?: string;
   /**
    * Optional page-local block clones backing this page's resolved fragments.