regen.mde 0.2.2 → 0.8.0

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "regen.mde",
-  "version": "0.2.2",
-  "description": "Convert DOCX to Markdown with tables, images, and KaTeX-readable Word equations.",
+  "version": "0.8.0",
+  "description": "Convert between DOCX/PPTX and Markdown — Word OMML equations to KaTeX TeX on the way in, LaTeX to native OMML on the way out.",
   "bin": {
     "build-corpus": "bin/build-corpus.js",
     "build-corpus-editor": "bin/build-corpus-editor.js",
-    "regen.mde": "bin/build-corpus-editor.js",
-    "regen.mdeditor": "bin/build-corpus-editor.js",
+    "mdeditor": "bin/build-corpus-editor.js",
+    "regen-mde": "bin/build-corpus-editor.js",
     "regen-mdeditor": "bin/build-corpus-editor.js",
     "regen-mdeditor-install": "bin/regen-mdeditor-install.js",
     "regen-mdeditor-uninstall": "bin/regen-mdeditor-uninstall.js",
@@ -17,8 +17,8 @@
     "desktop/BuildCorpusEditor/*.cs",
     "desktop/BuildCorpusEditor/*.csproj",
     "desktop/BuildCorpusEditor/*.manifest",
-    "dist/release/regen.mde-*-win-x64-setup.exe",
-    "dist/release/regen.mde-*-win-x64.zip",
+    "dist/release/regen-mde-*-win-x64-setup.exe",
+    "dist/release/regen-mde-*-win-x64.zip",
     "dist/windows-editor/",
     "editor-web/",
     "installer/",
@@ -41,12 +41,15 @@
     "test:editor": "powershell.exe -NoProfile -ExecutionPolicy Bypass -File scripts/run-required-tests.ps1 -Suite Editor",
     "test:required": "powershell.exe -NoProfile -ExecutionPolicy Bypass -File scripts/run-required-tests.ps1 -Suite Auto",
     "test:all": "powershell.exe -NoProfile -ExecutionPolicy Bypass -File scripts/run-required-tests.ps1 -Suite All",
+    "release": "node scripts/release-dual.mjs",
     "prepack": "npm run editor:windows && npm run editor:package",
     "postinstall": "node bin/postinstall.js",
     "preuninstall": "node bin/postinstall.js --uninstall",
     "test": "node bin/build-corpus.js --help && node bin/validate-katex.js README.md"
   },
   "dependencies": {
+    "@codemirror/lang-markdown": "^6.5.0",
+    "@codemirror/theme-one-dark": "^6.1.3",
     "@tiptap/extension-bubble-menu": "^3.23.1",
     "@tiptap/extension-floating-menu": "^3.23.1",
     "@tiptap/extension-image": "^3.23.1",
@@ -60,6 +63,7 @@
     "@tiptap/extension-task-list": "^3.23.1",
     "@tiptap/react": "^3.23.1",
     "@tiptap/starter-kit": "^3.23.1",
+    "@uiw/react-codemirror": "^4.25.9",
     "katex": "^0.16.22",
     "marked": "^15.0.12",
     "react": "^19.2.6",

package/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "build-corpus"
-version = "0.2.0"
-description = "Convert DOCX to Markdown with tables, images, and KaTeX-readable Word equations."
+version = "0.8.0"
+description = "Convert between DOCX/PPTX and Markdown — Word OMML equations to KaTeX TeX inbound, LaTeX to native OMML outbound."
 readme = "README.md"
 requires-python = ">=3.10"
 license = "Apache-2.0"
@@ -16,7 +16,8 @@ keywords = ["docx", "markdown", "omml", "katex", "word", "converter"]
 dependencies = [
   "omml2latex>=0.1.1",
   "Pillow>=10.0.0",
-  "python-docx>=1.1.2"
+  "python-docx>=1.1.2",
+  "latex2mathml>=3.77"
 ]
 
 [project.optional-dependencies]

package/requirements.txt

@@ -1,4 +1,5 @@
-omml2latex>=0.1.1
-boto3>=1.34
-Pillow>=10.0.0
-python-docx>=1.1.2
+omml2latex>=0.1.1
+boto3>=1.34
+Pillow>=10.0.0
+python-docx>=1.1.2
+latex2mathml>=3.77

package/scripts/build-windows-editor.ps1

@@ -1,47 +1,47 @@
-[CmdletBinding()]
-param(
-  [string]$Root = ""
-)
-
-$ErrorActionPreference = "Stop"
-
-if ([string]::IsNullOrWhiteSpace($Root)) {
-  $Root = (Resolve-Path (Join-Path $PSScriptRoot "..")).Path
-}
-
-function Invoke-Checked {
-  param([string]$FilePath, [string[]]$Arguments)
-  Write-Host "+ $FilePath $($Arguments -join ' ')" -ForegroundColor DarkGray
-  Push-Location $Root
-  try {
-    & $FilePath @Arguments
-    $exitCode = if ($LASTEXITCODE -is [int]) { $LASTEXITCODE } else { 0 }
-  } finally {
-    Pop-Location
-  }
-  if ($exitCode -ne 0) {
-    throw "Command failed with exit code ${exitCode}: $FilePath $($Arguments -join ' ')"
-  }
-}
-
-Invoke-Checked "npm" @("run", "editor:build")
-
-Get-Process BuildCorpusEditor -ErrorAction SilentlyContinue | Stop-Process -Force
-
-Invoke-Checked "dotnet" @(
-  "publish",
-  "desktop\BuildCorpusEditor\BuildCorpusEditor.csproj",
-  "-c", "Release",
-  "-r", "win-x64",
-  "--self-contained", "false",
-  "-o", "dist\windows-editor"
-)
-
-$exe = Join-Path $Root "dist\windows-editor\BuildCorpusEditor.exe"
-if (-not (Test-Path -LiteralPath $exe)) {
-  throw "Expected executable missing: $exe"
-}
-
-Remove-Item -LiteralPath (Join-Path $Root "dist\windows-editor\BuildCorpusEditor.exe.WebView2") -Recurse -Force -ErrorAction SilentlyContinue
-
-Write-Host "Built $exe" -ForegroundColor Green
+[CmdletBinding()]
+param(
+  [string]$Root = ""
+)
+
+$ErrorActionPreference = "Stop"
+
+if ([string]::IsNullOrWhiteSpace($Root)) {
+  $Root = (Resolve-Path (Join-Path $PSScriptRoot "..")).Path
+}
+
+function Invoke-Checked {
+  param([string]$FilePath, [string[]]$Arguments)
+  Write-Host "+ $FilePath $($Arguments -join ' ')" -ForegroundColor DarkGray
+  Push-Location $Root
+  try {
+    & $FilePath @Arguments
+    $exitCode = if ($LASTEXITCODE -is [int]) { $LASTEXITCODE } else { 0 }
+  } finally {
+    Pop-Location
+  }
+  if ($exitCode -ne 0) {
+    throw "Command failed with exit code ${exitCode}: $FilePath $($Arguments -join ' ')"
+  }
+}
+
+Invoke-Checked "npm" @("run", "editor:build")
+
+Get-Process BuildCorpusEditor -ErrorAction SilentlyContinue | Stop-Process -Force
+
+Invoke-Checked "dotnet" @(
+  "publish",
+  "desktop\BuildCorpusEditor\BuildCorpusEditor.csproj",
+  "-c", "Release",
+  "-r", "win-x64",
+  "--self-contained", "false",
+  "-o", "dist\windows-editor"
+)
+
+$exe = Join-Path $Root "dist\windows-editor\BuildCorpusEditor.exe"
+if (-not (Test-Path -LiteralPath $exe)) {
+  throw "Expected executable missing: $exe"
+}
+
+Remove-Item -LiteralPath (Join-Path $Root "dist\windows-editor\BuildCorpusEditor.exe.WebView2") -Recurse -Force -ErrorAction SilentlyContinue
+
+Write-Host "Built $exe" -ForegroundColor Green

package/scripts/package-windows-editor.ps1

@@ -1,90 +1,90 @@
-[CmdletBinding()]
-param(
-  [string]$Root = "",
-  [string]$Version = ""
-)
-
-$ErrorActionPreference = "Stop"
-
-if ([string]::IsNullOrWhiteSpace($Root)) {
-  $Root = (Resolve-Path (Join-Path $PSScriptRoot "..")).Path
-}
-
-if ([string]::IsNullOrWhiteSpace($Version)) {
-  $pkg = Get-Content -Raw -LiteralPath (Join-Path $Root "package.json") | ConvertFrom-Json
-  $Version = $pkg.version
-}
-
-$releaseRoot = Join-Path $Root "dist\release"
-$stage = Join-Path $releaseRoot "regen.mde-$Version-win-x64"
-$app = Join-Path $stage "app"
-$zip = Join-Path $releaseRoot "regen.mde-$Version-win-x64.zip"
-$setupExe = Join-Path $releaseRoot "regen.mde-$Version-win-x64-setup.exe"
-
-Remove-Item -LiteralPath $stage -Recurse -Force -ErrorAction SilentlyContinue
-Remove-Item -LiteralPath $zip -Force -ErrorAction SilentlyContinue
-Remove-Item -LiteralPath $setupExe -Force -ErrorAction SilentlyContinue
-New-Item -ItemType Directory -Force -Path $app | Out-Null
-
-Copy-Item -Path (Join-Path $Root "dist\windows-editor\*") -Destination $app -Recurse -Force
-Remove-Item -LiteralPath (Join-Path $app "BuildCorpusEditor.exe.WebView2") -Recurse -Force -ErrorAction SilentlyContinue
-Copy-Item -LiteralPath (Join-Path $Root "bin") -Destination $app -Recurse -Force
-Copy-Item -LiteralPath (Join-Path $Root "src") -Destination $app -Recurse -Force
-Copy-Item -LiteralPath (Join-Path $Root "requirements.txt") -Destination $app -Force
-Copy-Item -LiteralPath (Join-Path $Root "pyproject.toml") -Destination $app -Force
-Copy-Item -LiteralPath (Join-Path $Root "package.json") -Destination $app -Force
-Copy-Item -LiteralPath (Join-Path $Root "package-lock.json") -Destination $app -Force
-
-Copy-Item -LiteralPath (Join-Path $Root "installer\install-regen-mde.ps1") -Destination $stage -Force
-
-$readme = @"
-regen.mde for Windows
-=====================
-
-Install:
-  Right-click install-regen-mde.ps1 and choose "Run with PowerShell"
-
-After install:
-  Open the Windows Start menu and search for "regen.mde".
-  Right-click .md or .docx files and choose "Open in regen.mde".
-  Use "Uninstall regen.mde" from the Start menu to remove the app and shell verbs.
-
-Requirements:
-  Windows with Microsoft Edge WebView2 runtime
-  Node.js on PATH
-  Python 3 on PATH with the Build Corpus Python requirements installed
-
-The installer copies the app to:
-  %LOCALAPPDATA%\Programs\regen.mde
-"@
-Set-Content -LiteralPath (Join-Path $stage "README-INSTALL.txt") -Value $readme -Encoding UTF8
-
-Compress-Archive -Path (Join-Path $stage "*") -DestinationPath $zip -Force
-
-if (-not (Test-Path -LiteralPath $zip)) {
-  throw "Package zip was not created: $zip"
-}
-
-$makensis = @(
-  "C:\Program Files (x86)\NSIS\makensis.exe",
-  "C:\Program Files (x86)\NSIS\Bin\makensis.exe"
-) | Where-Object { Test-Path -LiteralPath $_ } | Select-Object -First 1
-
-if ($makensis) {
-  & $makensis `
-    "/DVERSION=$Version" `
-    "/DAPP_SOURCE=$app" `
-    "/DOUT_FILE=$setupExe" `
-    (Join-Path $Root "installer\regen-mde.nsi")
-  if ($LASTEXITCODE -ne 0) {
-    throw "NSIS installer build failed with exit code $LASTEXITCODE"
-  }
-  if (-not (Test-Path -LiteralPath $setupExe)) {
-    throw "Installer exe was not created: $setupExe"
-  }
-  Write-Host "Packaged $setupExe"
-} else {
-  Write-Warning "NSIS makensis.exe was not found; skipped setup EXE package."
-}
-
-Write-Host "Packaged $zip"
+[CmdletBinding()]
+param(
+  [string]$Root = "",
+  [string]$Version = ""
+)
+
+$ErrorActionPreference = "Stop"
+
+if ([string]::IsNullOrWhiteSpace($Root)) {
+  $Root = (Resolve-Path (Join-Path $PSScriptRoot "..")).Path
+}
+
+if ([string]::IsNullOrWhiteSpace($Version)) {
+  $pkg = Get-Content -Raw -LiteralPath (Join-Path $Root "package.json") | ConvertFrom-Json
+  $Version = $pkg.version
+}
+
+$releaseRoot = Join-Path $Root "dist\release"
+$stage = Join-Path $releaseRoot "regen-mde-$Version-win-x64"
+$app = Join-Path $stage "app"
+$zip = Join-Path $releaseRoot "regen-mde-$Version-win-x64.zip"
+$setupExe = Join-Path $releaseRoot "regen-mde-$Version-win-x64-setup.exe"
+
+Remove-Item -LiteralPath $stage -Recurse -Force -ErrorAction SilentlyContinue
+Remove-Item -LiteralPath $zip -Force -ErrorAction SilentlyContinue
+Remove-Item -LiteralPath $setupExe -Force -ErrorAction SilentlyContinue
+New-Item -ItemType Directory -Force -Path $app | Out-Null
+
+Copy-Item -Path (Join-Path $Root "dist\windows-editor\*") -Destination $app -Recurse -Force
+Remove-Item -LiteralPath (Join-Path $app "BuildCorpusEditor.exe.WebView2") -Recurse -Force -ErrorAction SilentlyContinue
+Copy-Item -LiteralPath (Join-Path $Root "bin") -Destination $app -Recurse -Force
+Copy-Item -LiteralPath (Join-Path $Root "src") -Destination $app -Recurse -Force
+Copy-Item -LiteralPath (Join-Path $Root "requirements.txt") -Destination $app -Force
+Copy-Item -LiteralPath (Join-Path $Root "pyproject.toml") -Destination $app -Force
+Copy-Item -LiteralPath (Join-Path $Root "package.json") -Destination $app -Force
+Copy-Item -LiteralPath (Join-Path $Root "package-lock.json") -Destination $app -Force
+
+Copy-Item -LiteralPath (Join-Path $Root "installer\install-regen-mde.ps1") -Destination $stage -Force
+
+$readme = @"
+regen-mde for Windows
+=====================
+
+Install:
+  Right-click install-regen-mde.ps1 and choose "Run with PowerShell"
+
+After install:
+  Open the Windows Start menu and search for "regen-mde".
+  Right-click .md or .docx files and choose "Open in regen-mde".
+  Use "Uninstall regen-mde" from the Start menu to remove the app and shell verbs.
+
+Requirements:
+  Windows with Microsoft Edge WebView2 runtime
+  Node.js on PATH
+  Python 3 on PATH with the Build Corpus Python requirements installed
+
+The installer copies the app to:
+  %LOCALAPPDATA%\Programs\regen-mde
+"@
+Set-Content -LiteralPath (Join-Path $stage "README-INSTALL.txt") -Value $readme -Encoding UTF8
+
+Compress-Archive -Path (Join-Path $stage "*") -DestinationPath $zip -Force
+
+if (-not (Test-Path -LiteralPath $zip)) {
+  throw "Package zip was not created: $zip"
+}
+
+$makensis = @(
+  "C:\Program Files (x86)\NSIS\makensis.exe",
+  "C:\Program Files (x86)\NSIS\Bin\makensis.exe"
+) | Where-Object { Test-Path -LiteralPath $_ } | Select-Object -First 1
+
+if ($makensis) {
+  & $makensis `
+    "/DVERSION=$Version" `
+    "/DAPP_SOURCE=$app" `
+    "/DOUT_FILE=$setupExe" `
+    (Join-Path $Root "installer\regen-mde.nsi")
+  if ($LASTEXITCODE -ne 0) {
+    throw "NSIS installer build failed with exit code $LASTEXITCODE"
+  }
+  if (-not (Test-Path -LiteralPath $setupExe)) {
+    throw "Installer exe was not created: $setupExe"
+  }
+  Write-Host "Packaged $setupExe"
+} else {
+  Write-Warning "NSIS makensis.exe was not found; skipped setup EXE package."
+}
+
+Write-Host "Packaged $zip"

package/scripts/release-dual.mjs

@@ -0,0 +1,105 @@
+#!/usr/bin/env node
+// Dual-channel release for build-corpus: keep the npm package (package.json)
+// and the PyPI package (pyproject.toml) on the SAME version, then optionally
+// publish both and tag once.
+//
+// Usage:
+//   node scripts/release-dual.mjs <version|--patch|--minor|--major> [--publish] [--dry-run]
+//
+//   node scripts/release-dual.mjs 0.3.1            # set both manifests to 0.3.1 (no publish)
+//   node scripts/release-dual.mjs --patch          # bump patch in both
+//   node scripts/release-dual.mjs --minor --publish# bump, build, publish npm + PyPI, tag
+//   node scripts/release-dual.mjs --patch --dry-run# show what would change, touch nothing
+//
+// Publishing requires credentials in the environment / config:
+//   - npm:  a logged-in npm (npm whoami) or NPM_TOKEN in ~/.npmrc
+//   - PyPI: TWINE_USERNAME=__token__ and TWINE_PASSWORD=<pypi-token>, or ~/.pypirc
+// The script never reads secrets itself — it defers to npm/twine.
+
+import { readFileSync, writeFileSync } from "node:fs";
+import { spawnSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
+import path from "node:path";
+
+const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
+const pkgPath = path.join(root, "package.json");
+const pyPath = path.join(root, "pyproject.toml");
+
+const args = process.argv.slice(2);
+const dryRun = args.includes("--dry-run");
+const publish = args.includes("--publish");
+const versionArg = args.find((a) => !a.startsWith("--"));
+const bumpFlag = ["--patch", "--minor", "--major"].find((f) => args.includes(f));
+
+function die(message) {
+  console.error(`release-dual: ${message}`);
+  process.exit(1);
+}
+
+function run(command, commandArgs, opts = {}) {
+  console.log(`$ ${command} ${commandArgs.join(" ")}`);
+  if (dryRun) return 0;
+  const result = spawnSync(command, commandArgs, { stdio: "inherit", cwd: root, shell: false, ...opts });
+  if (result.error) die(`${command} failed: ${result.error.message}`);
+  if ((result.status ?? 1) !== 0) die(`${command} exited ${result.status}`);
+  return 0;
+}
+
+function bumpSemver(current, kind) {
+  const match = /^(\d+)\.(\d+)\.(\d+)$/.exec(current);
+  if (!match) die(`current version "${current}" is not plain semver`);
+  let [major, minor, patch] = match.slice(1).map(Number);
+  if (kind === "--major") { major += 1; minor = 0; patch = 0; }
+  else if (kind === "--minor") { minor += 1; patch = 0; }
+  else { patch += 1; }
+  return `${major}.${minor}.${patch}`;
+}
+
+// --- resolve target version ---
+const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
+const currentVersion = pkg.version;
+
+let nextVersion;
+if (versionArg) {
+  if (!/^\d+\.\d+\.\d+$/.test(versionArg)) die(`"${versionArg}" is not a valid semver`);
+  nextVersion = versionArg;
+} else if (bumpFlag) {
+  nextVersion = bumpSemver(currentVersion, bumpFlag);
+} else {
+  die("provide a version (e.g. 0.3.1) or a bump flag (--patch/--minor/--major)");
+}
+
+console.log(`build-corpus: ${currentVersion} -> ${nextVersion}${dryRun ? " (dry-run)" : ""}`);
+
+// --- write package.json ---
+pkg.version = nextVersion;
+if (!dryRun) writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`);
+console.log(`  package.json   version = ${nextVersion}`);
+
+// --- write pyproject.toml (only the [project] version line) ---
+const pyText = readFileSync(pyPath, "utf8");
+const pyNext = pyText.replace(/^(version\s*=\s*)"[^"]+"/m, `$1"${nextVersion}"`);
+if (pyNext === pyText) die("could not find a version line in pyproject.toml");
+if (!dryRun) writeFileSync(pyPath, pyNext);
+console.log(`  pyproject.toml version = ${nextVersion}`);
+
+if (!publish) {
+  console.log("\nVersions synced. Re-run with --publish to build, publish, and tag.");
+  process.exit(0);
+}
+
+// --- publish PyPI: build sdist+wheel, upload with twine ---
+console.log("\n== PyPI ==");
+run("python3", ["-m", "build"]);
+run("python3", ["-m", "twine", "upload", "dist/*.whl", "dist/*.tar.gz"]);
+
+// --- publish npm ---
+console.log("\n== npm ==");
+run("npm", ["publish"]);
+
+// --- tag once ---
+console.log("\n== git ==");
+run("git", ["add", "package.json", "pyproject.toml"]);
+run("git", ["commit", "-m", `release: v${nextVersion} (npm + PyPI)`]);
+run("git", ["tag", `v${nextVersion}`]);
+console.log(`\nDone. Push with: git push && git push origin v${nextVersion}`);

package/scripts/run-corpus.ps1

@@ -1,28 +1,28 @@
-param(
-  [Parameter(Mandatory=$true)]
-  [string]$Source,
-
-  [string]$Out = ".tmp\corpus",
-
-  [ValidateSet("assets", "base64", "s3")]
-  [string]$Images = "assets",
-
-  [string]$Config = ""
-)
-
-$ErrorActionPreference = "Stop"
-$root = Split-Path -Parent $PSScriptRoot
-$buildCorpus = Join-Path $root "bin\build-corpus.js"
-$katex = Join-Path $root "bin\validate-katex.js"
-$assetValidator = Join-Path $root "src\build_corpus\validate_assets.py"
-
-$args = @($buildCorpus, $Source, "--out", $Out, "--images", $Images)
-if ($Config) {
-  $args += @("--config", $Config)
-}
-
-node @args
-node $katex $Out | Set-Content -Path (Join-Path $Out "katex-report.json") -Encoding UTF8
-py -3 $assetValidator $Out | Set-Content -Path (Join-Path $Out "asset-report.json") -Encoding UTF8
-
-Write-Host "Corpus test passed: $Out"
+param(
+  [Parameter(Mandatory=$true)]
+  [string]$Source,
+
+  [string]$Out = ".tmp\corpus",
+
+  [ValidateSet("assets", "base64", "s3")]
+  [string]$Images = "assets",
+
+  [string]$Config = ""
+)
+
+$ErrorActionPreference = "Stop"
+$root = Split-Path -Parent $PSScriptRoot
+$buildCorpus = Join-Path $root "bin\build-corpus.js"
+$katex = Join-Path $root "bin\validate-katex.js"
+$assetValidator = Join-Path $root "src\build_corpus\validate_assets.py"
+
+$args = @($buildCorpus, $Source, "--out", $Out, "--images", $Images)
+if ($Config) {
+  $args += @("--config", $Config)
+}
+
+node @args
+node $katex $Out | Set-Content -Path (Join-Path $Out "katex-report.json") -Encoding UTF8
+py -3 $assetValidator $Out | Set-Content -Path (Join-Path $Out "asset-report.json") -Encoding UTF8
+
+Write-Host "Corpus test passed: $Out"