diff --git a/.cursor/skills/marqdo/SKILL.md b/.cursor/skills/marqdo/SKILL.md index 14e30e6..7fab659 100644 --- a/.cursor/skills/marqdo/SKILL.md +++ b/.cursor/skills/marqdo/SKILL.md @@ -113,10 +113,10 @@ printf '%s\n' '{"id":5,"method":"repair_targets","params":{"code":"contract.arg_ | `****` / whole-line `**` / `*None*` | Return `None` and end function body | | Lone `---` / `***` | Markdown thematic break (skip; not function end) | | GFM table after empty RHS bind | Collection; get with `[key](coll)` (preferred) or legacy `` `m`[^key] `` | -| `- [item](coll)` | Foreach (unchanged) | | `` ```lang `` | Foreign code block (via `lib/foreign`); bind with `` `name` = `` then fence | | `$$` + `% marqdo: var=name` | Block formula bind (TeX comment; prefer over empty RHS) | | `- [item](coll)` | Foreach (**preferred**, nestable). Sugar: `- 对`coll`的每一项`item`` / `- for each `item` in `coll`` | +| `![marqdo-out](path)` | Image writeback form (validated stem.ext / URL); text writeback stays HTML comment | | `` `"text"` `` | Quoted string (`\n` `\t` `\\` `\"`; `` `var` `` inside); bare tokens unescaped | | Unmarked prose | Comment | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 894570c..c320846 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -126,6 +126,8 @@ jobs: ## Marqdo ${{ github.ref_name }} ### 亮点 / Highlights + - **v1.4.0**:叙述统一——`% marqdo: var=` · 臂/循环体叙述 · foreach 中英糖 · 图片自写回 · view 推断形参 + - **v1.4.0**: Prose-unified control flow — formula meta bind, arm/loop narrative, foreach sugar, image writeback, inferred-param view - **v1.3.3**:view 文档面 Structure——叙述保真 · 标记面 · 调用/循环帧 · `#mq-view-trace` · 静态站同源 - **v1.3.3**: Browse document-surface Structure — narration, markers, call/loop frames, `#mq-view-trace`, static site parity - **v1.3.0**:Engineering Knowledge Compiler——L0–L4 · `reuse`/`find`/`duplicate` · Agent preflight(REUSE→ADAPT→CREATE) diff --git a/CHANGELOG.md b/CHANGELOG.md index 889c5ef..1cc441c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,37 @@ ### Changed +## v1.4.0 — 2026-10-15 + +### Highlights + +**叙述统一 + 公式 meta + 图片自写回**:块公式 `% marqdo: var=`;分支/循环体与函数体同权叙述;foreach 中英糖;自写回图片 `![marqdo-out](…)`(扩展名校验)与 view/静态站同源标记;view 展示推断形参实值;欢迎页迁到 v0.3 叙述面。 + +```bash +git checkout v1.4.0 && cargo build --release +marqdo run tests/markup-v03/formula-meta-var.mq.md +marqdo run tests/markup-v03/foreach-narrative.mq.md +marqdo view tests/view/document-annot-demo.mq.md --no-open +# Ubuntu: sudo apt update && sudo apt install marqdo +marqdo ext add web # CDN latest → 1.4.0 +``` + +**核心表面 Δ(Core surface Δ)**:**无增删**——19 个核心构造不变。Language 层在既有 `formula` / `branch-list` / `loop-list` 上扩展语义(块公式 TeX 注释绑定、臂/循环体叙述、foreach 糖);Runtime:自写回图片形态 + view 推断形参展示。设计:[fence-meta-and-control-prose.md](doc/design/fence-meta-and-control-prose.md) · [stdlib-writeback.md](doc/design/stdlib-writeback.md)。 + +### Added +- **块公式 meta 绑定**:`$$` 内 `% marqdo: var=`(剥离后解析;可无空 RHS);金样 `tests/markup-v03/formula-meta-var.mq.md`。 +- **控制流叙述统一**:臂/循环体 `parse_indented_body` 与函数体同权;分支条件行支持叙述前缀与行内 `**…**`;foreach 糖 `- 对…的每一项…` / `- for each … in …`。 +- **图片自写回**:路径/URL 且扩展名合法 → `![marqdo-out](…)`;文本仍 HTML 注释;view / `view output` 同源样式卡与 ``。 +- **view 推断形参实值**:Browse 展示 body-inferred 参数绑定值;欢迎页 EN/ZH 迁 v0.3 叙述。 + +### Fixed +- `ext/net/url.encode`:经 `lib/net` 包装,不再直接 `host_*`(金样 `ext_mq_md_never_calls_host`)。 +- PPA 源包:`ppa-build-source.sh` 本地 `.orig` 已在 build-area 时跳过重复 `cp`。 +- view:嵌套调用欢迎页与公式/代码卡渲染清理。 + +### Changed +- CLI / wasm / `ext/VERSION` **同步 1.4.0**;词法评论段遇有序分支臂 / 循环头 / 图片自写回标记时断开,避免吞掉控制流行。 + ## v1.3.3 — 2026-10-15 ### Highlights diff --git a/Cargo.lock b/Cargo.lock index 4cb3f8d..eba7bf6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -572,7 +572,7 @@ checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" [[package]] name = "marqdo" -version = "1.3.3" +version = "1.4.0" dependencies = [ "anyhow", "assert_cmd", @@ -603,7 +603,7 @@ dependencies = [ [[package]] name = "marqdo-wasm" -version = "1.3.3" +version = "1.4.0" dependencies = [ "marqdo", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index 139ea02..71749cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marqdo" -version = "1.3.3" +version = "1.4.0" edition = "2021" license = "Apache-2.0" description = "Marqdo — Markdown markers as an interpreted programming language" diff --git a/README.md b/README.md index 48e330d..e4562e1 100644 --- a/README.md +++ b/README.md @@ -149,8 +149,9 @@ marqdo catalog public -o .marqdo --- -## 现状(v1.3.3) +## 现状(v1.4.0) +- **叙述统一 / 公式 meta / 图片自写回(v1.4.0)**:`% marqdo: var=` 块公式绑定 · 臂/循环体叙述与 foreach 中英糖 · `![marqdo-out](…)` 图片自写回 · view 推断形参实值 · [fence-meta-and-control-prose.md](doc/design/fence-meta-and-control-prose.md) · [stdlib-writeback.md](doc/design/stdlib-writeback.md) - **view 文档面(v1.3.3)**:Browse Structure 叙述保真 · 标记面 · 分支/循环帧下拉 · AI `#mq-view-trace` · 静态 `view output` / gh-pages 同源 · [view-document-annotations.md](doc/design/view-document-annotations.md) - **Engineering Knowledge(v1.3.0)**:EKC L0–L4 · `marqdo knowledge|find|reuse|duplicate|verify|…` · Agent `preflight` / REUSE→ADAPT→CREATE · [engineering-knowledge.md](doc/design/engineering-knowledge.md) - **Web Artifact(v1.2.0 · ADR 0007)**:Document/Endpoint 一等公民(`type: web|endpoint`)· facade `page`/`route`/`serve`/`render`/`inspect`/`use` · Resource 拆到 `ext/data`/`security`/`net` · 统一 View 表 · 破坏性移除 `compose_*`/`configure` @@ -177,7 +178,7 @@ marqdo catalog public -o .marqdo - **浏览器 Marqdo(WASM)**:`marqdo wasm build` + 官方 bridge 自启(作者零业务 JS;桥内可含列表/路由/storage/ws/文件/Canvas/音频/Observer/拖放);`lib/browser` + GFM;`web.client_embed`;示例 [browser-hello](examples/browser-hello/) · [browser-app](examples/browser-app/) · [browser-media](examples/browser-media/) · [web-client-site](examples/web-client-site/)([ADR 0002](doc/adr/0002-browser-marqdo-wasm.md) · [D](doc/roadmap/browser-wasm-d.md) · [E](doc/roadmap/browser-wasm-e.md) · [F](doc/roadmap/browser-wasm-f.md)) - 选型:[ADR 0001 — Rust](doc/adr/0001-implementation-language.md) · [ADR 0002 — 浏览器 WASM](doc/adr/0002-browser-marqdo-wasm.md)(C0–C5 完结,见 [roadmap/browser-wasm.md](doc/roadmap/browser-wasm.md))· [ADR 0003 — 异步效应](doc/adr/0003-browser-async-effects.md) -### 如何使用最新 Marqdo(v1.3.3) +### 如何使用最新 Marqdo(v1.4.0) **安装解释器(任选其一)** @@ -192,7 +193,7 @@ marqdo catalog public -o .marqdo ```bash # 1) 源码安装(跟 tag 或 main) git clone https://github.com/cflmy/marqdo.git && cd marqdo -git checkout v1.3.3 # 或留在 main +git checkout v1.4.0 # 或留在 main cargo build --release export PATH="$PWD/target/release:$PATH" marqdo version @@ -231,7 +232,7 @@ marqdo wasm build # → dist/wasm/ … 见 examples/browser-hello/ # 6) Releases:Windows exe/zip/vsix;Linux CLI zip + native `.so` zip -# https://github.com/cflmy/marqdo/releases/tag/v1.3.3 +# https://github.com/cflmy/marqdo/releases/tag/v1.4.0 ``` 开发期也可用 `cargo run -- …` 代替已安装的 `marqdo`: diff --git a/crates/marqdo-wasm/Cargo.toml b/crates/marqdo-wasm/Cargo.toml index 34df868..dd54231 100644 --- a/crates/marqdo-wasm/Cargo.toml +++ b/crates/marqdo-wasm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marqdo-wasm" -version = "1.3.3" +version = "1.4.0" edition = "2021" license = "Apache-2.0" description = "Marqdo interpreter as WebAssembly (browser host bridge)" diff --git a/debian/changelog b/debian/changelog index 6a3764f..538c20e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +marqdo (1.4.0-1ppa1) noble; urgency=medium + + * Marqdo 1.4.0: Prose-unified control flow — block formula % marqdo: var=, + arm/loop narrative + foreach sugar, image writeback ![marqdo-out](...), + view inferred-param values; welcome pages on v0.3 prose surface. + + -- cflmy Wed, 15 Oct 2026 15:53:00 +0800 + marqdo (1.3.3-1ppa1) noble; urgency=medium * Marqdo 1.3.3: Browse document-surface Structure — narration-preserving diff --git a/ext/VERSION b/ext/VERSION index 31e5c84..88c5fb8 100644 --- a/ext/VERSION +++ b/ext/VERSION @@ -1 +1 @@ -1.3.3 +1.4.0 diff --git a/public/features/03-view-and-docs.mq.md b/public/features/03-view-and-docs.mq.md index 0e19f4d..dfb1d9c 100644 --- a/public/features/03-view-and-docs.mq.md +++ b/public/features/03-view-and-docs.mq.md @@ -5,7 +5,7 @@ description: Local browse and static export from the interpreter # main -Milestone: `marqdo view` and `view output` (v1.3.3 document surface). +Milestone: `marqdo view` and `view output` (v1.4.0 document surface + inferred params). Local: `marqdo view public` diff --git a/public/features/03-view与文档.mq.md b/public/features/03-view与文档.mq.md index 00c8e61..c08a837 100644 --- a/public/features/03-view与文档.mq.md +++ b/public/features/03-view与文档.mq.md @@ -5,7 +5,7 @@ description: 本地浏览与静态导出由解释器生成 # main -里程碑:`marqdo view` 与 `view output`(v1.3.3 文档面)。 +里程碑:`marqdo view` 与 `view output`(v1.4.0 文档面 + 推断形参)。 本地浏览:`marqdo view public`