From 1bb16dd6db5bcf580163c8874b83838b5fd8d09d Mon Sep 17 00:00:00 2001 From: cflmy Date: Thu, 15 Oct 2026 20:37:24 +0800 Subject: [PATCH] release: Marqdo 1.4.1 View annot leaders mid-to-mid SVG, frame chip id unify; bump CLI/wasm/ext. Co-authored-by: Cursor --- .github/workflows/release.yml | 2 ++ CHANGELOG.md | 26 ++++++++++++++++++++++++++ Cargo.lock | 4 ++-- Cargo.toml | 2 +- README.md | 9 +++++---- crates/marqdo-wasm/Cargo.toml | 2 +- debian/changelog | 7 +++++++ ext/VERSION | 2 +- public/features/03-view-and-docs.mq.md | 2 +- public/features/03-view与文档.mq.md | 2 +- 10 files changed, 47 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c320846..c6e0683 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -126,6 +126,8 @@ jobs: ## Marqdo ${{ github.ref_name }} ### 亮点 / Highlights + - **v1.4.1**:view 标注连线——SVG mid→mid(underline 底中 → chip 顶中)· 帧 chip id 对齐 · L→R 密度 + - **v1.4.1**: View annot leaders — SVG mid→mid (mark bottom-center → chip top-center), frame chip id unify, L→R density - **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` · 静态站同源 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cc441c..2b9955c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,32 @@ ### Changed +## v1.4.1 — 2026-10-15 + +### Highlights + +**view 叙述标注连线**:Browse / `view output` 中 underline→chip 改为 SVG 正交连线(描述底边中点 → 轨道 → 短竖线 → 值顶边中点);同跨度多帧 chip 共用 annot id;可见 chip 按锚点 L→R;帧切换后重算密度。设计:[view-prose-annot-gaps.md](doc/design/view-prose-annot-gaps.md)。 + +```bash +git checkout v1.4.1 && cargo build --release +marqdo view public/00-welcome.mq.md --no-open +marqdo view output public -o /tmp/mq-public +# Ubuntu: sudo apt update && sudo apt install marqdo +marqdo ext add web # CDN latest → 1.4.1 +``` + +**核心表面 Δ(Core surface Δ)**:**无增删**——19 个核心构造不变。本版为 **Runtime / Tooling**(view 标注几何与帧 chip 对齐),不触碰语言标记。 + +### Added +- 设计缺口文档 [view-prose-annot-gaps.md](doc/design/view-prose-annot-gaps.md):叙述 fence 卡、帧感知 chip 密度、L-leader 几何约定。 + +### Fixed +- view L-leader:id 与 mark 错配、chip 逆序交叉、border 无色变黑碎段、横线穿过 chip 文字;现为 mid→mid SVG path。 +- 叙述 fence / 代码卡单层渲染;静态页隐藏 Run;主文函数引用 call chip + leader。 + +### Changed +- CLI / wasm / `ext/VERSION` **同步 1.4.1**。 + ## v1.4.0 — 2026-10-15 ### Highlights diff --git a/Cargo.lock b/Cargo.lock index eba7bf6..b38fa5a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -572,7 +572,7 @@ checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" [[package]] name = "marqdo" -version = "1.4.0" +version = "1.4.1" dependencies = [ "anyhow", "assert_cmd", @@ -603,7 +603,7 @@ dependencies = [ [[package]] name = "marqdo-wasm" -version = "1.4.0" +version = "1.4.1" dependencies = [ "marqdo", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index 71749cd..e7fc6b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marqdo" -version = "1.4.0" +version = "1.4.1" edition = "2021" license = "Apache-2.0" description = "Marqdo — Markdown markers as an interpreted programming language" diff --git a/README.md b/README.md index e4562e1..2fc46e2 100644 --- a/README.md +++ b/README.md @@ -149,8 +149,9 @@ marqdo catalog public -o .marqdo --- -## 现状(v1.4.0) +## 现状(v1.4.1) +- **view 标注连线(v1.4.1)**:underline→chip SVG mid→mid(底边中点→轨道→短竖线→顶边中点)· 帧 chip 共用 id · L→R 密度 · [view-prose-annot-gaps.md](doc/design/view-prose-annot-gaps.md) - **叙述统一 / 公式 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) @@ -178,7 +179,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.4.0) +### 如何使用最新 Marqdo(v1.4.1) **安装解释器(任选其一)** @@ -193,7 +194,7 @@ marqdo catalog public -o .marqdo ```bash # 1) 源码安装(跟 tag 或 main) git clone https://github.com/cflmy/marqdo.git && cd marqdo -git checkout v1.4.0 # 或留在 main +git checkout v1.4.1 # 或留在 main cargo build --release export PATH="$PWD/target/release:$PATH" marqdo version @@ -232,7 +233,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.4.0 +# https://github.com/cflmy/marqdo/releases/tag/v1.4.1 ``` 开发期也可用 `cargo run -- …` 代替已安装的 `marqdo`: diff --git a/crates/marqdo-wasm/Cargo.toml b/crates/marqdo-wasm/Cargo.toml index dd54231..f16146a 100644 --- a/crates/marqdo-wasm/Cargo.toml +++ b/crates/marqdo-wasm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marqdo-wasm" -version = "1.4.0" +version = "1.4.1" edition = "2021" license = "Apache-2.0" description = "Marqdo interpreter as WebAssembly (browser host bridge)" diff --git a/debian/changelog b/debian/changelog index 538c20e..9435cbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +marqdo (1.4.1-1ppa1) noble; urgency=medium + + * Marqdo 1.4.1: View annot leaders — SVG mid-to-mid (mark bottom-center + to chip top-center), unify frame chip ids, L-to-R chip density. + + -- cflmy Thu, 15 Oct 2026 20:40:00 +0800 + marqdo (1.4.0-1ppa1) noble; urgency=medium * Marqdo 1.4.0: Prose-unified control flow — block formula % marqdo: var=, diff --git a/ext/VERSION b/ext/VERSION index 88c5fb8..347f583 100644 --- a/ext/VERSION +++ b/ext/VERSION @@ -1 +1 @@ -1.4.0 +1.4.1 diff --git a/public/features/03-view-and-docs.mq.md b/public/features/03-view-and-docs.mq.md index dfb1d9c..7bb374f 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.4.0 document surface + inferred params). +Milestone: `marqdo view` and `view output` (v1.4.1 mid→mid annot leaders + document surface). Local: `marqdo view public` diff --git a/public/features/03-view与文档.mq.md b/public/features/03-view与文档.mq.md index c08a837..9bc3dcf 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.4.0 文档面 + 推断形参)。 +里程碑:`marqdo view` 与 `view output`(v1.4.1 mid→mid 标注连线 + 文档面)。 本地浏览:`marqdo view public`