From 41321fd05fd09658269725ef86caaff3e45237d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?= Date: Mon, 19 Oct 2026 19:19:04 -0400 Subject: [PATCH 1/6] CI: release from GitHub Actions to GitHub releases The release workflow moves from .gitea to .github: macOS on the macos-signing runner, Windows and Linux (WSL) on ely-windows. The persistent clones fetch from GitHub. ci.sh creates or reuses the tag's release through GitHub's API and replaces a rerun's assets of the same name; the update manifests point at GitHub's download URLs. Co-Authored-By: Claude --- {.gitea => .github}/workflows/release.yml | 24 ++++++++------ packaging/macos/release.sh | 2 +- scripts/ci.sh | 39 +++++++++++++---------- 3 files changed, 38 insertions(+), 27 deletions(-) rename {.gitea => .github}/workflows/release.yml (68%) diff --git a/.gitea/workflows/release.yml b/.github/workflows/release.yml similarity index 68% rename from .gitea/workflows/release.yml rename to .github/workflows/release.yml index 18520ce..d40d166 100644 --- a/.gitea/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,18 +1,21 @@ # A tag builds, packages and uploads all three platforms. +# Tags only: no pull request ever reaches the self-hosted runners. name: release on: push: tags: ['v*'] +permissions: + contents: write jobs: macos: # A GUI-session agent: daemons see no login keychain. - runs-on: macos-signing + runs-on: [self-hosted, macos-signing] timeout-minutes: 720 steps: - name: Build, package and upload for macOS shell: bash env: - ELY_RELEASE_TOKEN: ${{ secrets.GITEA_TOKEN }} + ELY_RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }} # The dev clone's engines: LibreOffice from scratch outlasts the runner. ELY_SHARE: /Users/zacharyzhang/Documents/GitHub/ElyOfficeSuite ELY_PATH: /Users/zacharyzhang/.cargo/bin:/opt/homebrew/bin @@ -21,42 +24,45 @@ jobs: ELY_NOTARY_PROFILE: ${{ vars.ELY_NOTARY_PROFILE }} run: | dir=$HOME/ely-ci/ElyOffice - [ -d "$dir/.git" ] || git clone https://git.zacharyzhang.com/ZacharyZhang-NY/ElyOffice.git "$dir" + [ -d "$dir/.git" ] || git clone https://github.com/ELY-Open-Source/ElyOffice.git "$dir" + git -C "$dir" remote set-url origin https://github.com/ELY-Open-Source/ElyOffice.git git -C "$dir" fetch --force --tags origin git -C "$dir" checkout --force "${{ github.sha }}" "$dir/scripts/ci.sh" macos "${{ github.ref_name }}" windows: - runs-on: windows + runs-on: [self-hosted, ely-windows] timeout-minutes: 360 steps: - name: Build, package and upload for Windows shell: bash env: - ELY_RELEASE_TOKEN: ${{ secrets.GITEA_TOKEN }} + ELY_RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }} ELY_SHARE: /c/Users/zhang/Documents/Github/ElyOffice ELY_PATH: /c/Program Files/CMake/bin:/c/Users/zhang/AppData/Local/Microsoft/WinGet/Packages/Ninja-build.Ninja_Microsoft.Winget.Source_8wekyb3d8bbwe run: | dir=$HOME/ely-ci/ElyOffice - [ -d "$dir/.git" ] || git clone https://git.zacharyzhang.com/ZacharyZhang-NY/ElyOffice.git "$dir" + [ -d "$dir/.git" ] || git clone https://github.com/ELY-Open-Source/ElyOffice.git "$dir" + git -C "$dir" remote set-url origin https://github.com/ELY-Open-Source/ElyOffice.git git -C "$dir" fetch --force --tags origin git -C "$dir" checkout --force "${{ github.sha }}" "$dir/scripts/ci.sh" windows "${{ github.ref_name }}" linux: # WSL on the Windows runner keeps a built kernel. - runs-on: windows + runs-on: [self-hosted, ely-windows] needs: windows timeout-minutes: 360 steps: - name: Build, package and upload for Linux shell: bash env: - ELY_RELEASE_TOKEN: ${{ secrets.GITEA_TOKEN }} + ELY_RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }} WSLENV: ELY_RELEASE_TOKEN run: | wsl -d Ubuntu --exec bash -lc ' set -euo pipefail dir=$HOME/ely-ci/ElyOffice - [ -d "$dir/.git" ] || git clone https://git.zacharyzhang.com/ZacharyZhang-NY/ElyOffice.git "$dir" + [ -d "$dir/.git" ] || git clone https://github.com/ELY-Open-Source/ElyOffice.git "$dir" + git -C "$dir" remote set-url origin https://github.com/ELY-Open-Source/ElyOffice.git git -C "$dir" fetch --force --tags origin git -C "$dir" checkout --force "${{ github.sha }}" ELY_SHARE=$HOME/Documents/Github/ElyOffice "$dir/scripts/ci.sh" linux "${{ github.ref_name }}" diff --git a/packaging/macos/release.sh b/packaging/macos/release.sh index ac7a6db..7016a08 100755 --- a/packaging/macos/release.sh +++ b/packaging/macos/release.sh @@ -7,7 +7,7 @@ batch=${1:-1} dist=${ELY_DIST:-$root/dist} version=$(awk -F'"' '/^version = / { print $2; exit }' "$root/Cargo.toml") arch=$(uname -m) -releases=https://git.zacharyzhang.com/ZacharyZhang-NY/ElyOffice/releases +releases=https://github.com/ELY-Open-Source/ElyOffice/releases [ -z "${ELY_NOTARY_PROFILE:-}" ] || [ -n "${ELY_SIGN_IDENTITY:-}" ] || { echo "release.sh: notarizing needs ELY_SIGN_IDENTITY, a Developer ID" >&2 exit 1 diff --git a/scripts/ci.sh b/scripts/ci.sh index c117394..981cf3a 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -10,7 +10,7 @@ version=$(awk -F'"' '/^version = / { print $2; exit }' "$root/Cargo.toml") echo "ci.sh: tag $tag is not v$version" >&2 exit 1 } -: "${ELY_RELEASE_TOKEN:?the Gitea token that uploads}" +: "${ELY_RELEASE_TOKEN:?the GitHub token that uploads}" if [ "$os" = macos ]; then : "${ELY_SIGN_IDENTITY:?the Developer ID Application certificate}" : "${ELY_NOTARY_PROFILE:?the notarytool keychain profile}" @@ -72,13 +72,14 @@ if [ "$os" = linux ]; then fi # The tag's release, made by whichever platform comes first. -api=https://git.zacharyzhang.com/api/v1/repos/ZacharyZhang-NY/ElyOffice -auth="Authorization: token $ELY_RELEASE_TOKEN" -release_id() { curl -fsS -H "$auth" "$api/releases/tags/$tag" | python3 -c 'import json, sys; print(json.load(sys.stdin)["id"])'; } +repo=ELY-Open-Source/ElyOffice +api=https://api.github.com/repos/$repo +auth=(-H "Authorization: Bearer $ELY_RELEASE_TOKEN" -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28") +release_id() { curl -fsS "${auth[@]}" "$api/releases/tags/$tag" | python3 -c 'import json, sys; print(json.load(sys.stdin)["id"])' | tr -d '\r'; } if ! id=$(release_id 2>/dev/null); then body="{\"tag_name\": \"$tag\", \"name\": \"Ely Office $version\"}" - # Another platform may make it first; the read decides. - curl -fsS -H "$auth" -H "Content-Type: application/json" -d "$body" "$api/releases" >/dev/null || true + # Another platform may make it first (422); the read decides. + curl -fsS "${auth[@]}" -H "Content-Type: application/json" -d "$body" "$api/releases" >/dev/null || true id=$(release_id) fi names=() @@ -92,19 +93,23 @@ for file in "$dist"/*; do fi names+=("$name") done -# Rebuilt bytes differ; never mix them with earlier uploads. -have=$(curl -fsS -H "$auth" "$api/releases/$id/assets" | python3 -c 'import json, sys; print("\n".join(a["name"] for a in json.load(sys.stdin)))') -taken=() -for name in "${names[@]}"; do - if grep -qxF "$name" <<<"$have"; then taken+=("$name"); fi +# Each asset's id and name, a page of 100 at a time; Windows Python writes CRLF. +have= +for ((page = 1; ; page++)); do + got=$(curl -fsS "${auth[@]}" "$api/releases/$id/assets?per_page=100&page=$page" | + python3 -c 'import json, sys; print("\n".join("%s\t%s" % (a["id"], a["name"]) for a in json.load(sys.stdin)))' | tr -d '\r') + [ -n "$got" ] || break + have+=$got$'\n' done -if [ ${#taken[@]} -gt 0 ]; then - echo "ci.sh: already on $tag; delete them, then rerun: ${taken[*]}" >&2 - exit 1 -fi +# Rebuilt bytes replace a rerun's earlier upload; other platforms' files stay. +cd "$dist" for name in "${names[@]}"; do - file=$dist/$name + for old in $(awk -F'\t' -v name="$name" '$2 == name { print $1 }' <<<"$have"); do + echo "ci.sh: replacing $name" + curl -fsS "${auth[@]}" -X DELETE "$api/releases/assets/$old" >/dev/null + done echo "ci.sh: uploading $name" - curl -fsS -H "$auth" -F "attachment=@$file" "$api/releases/$id/assets?name=$name" >/dev/null + curl -fsS "${auth[@]}" -H "Content-Type: application/octet-stream" --data-binary "@$name" \ + "https://uploads.github.com/repos/$repo/releases/$id/assets?name=$name" >/dev/null done echo "ci.sh: $os uploaded to $tag" From 6b28c54e33d9352491c25834e5be11957ca76cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?= Date: Mon, 19 Oct 2026 19:21:30 -0400 Subject: [PATCH 2/6] Site: releases and source on GitHub; the Mac build is notarized The worker reads the newest release and download counts from GitHub's API, with an optional GITHUB_TOKEN secret for the rate limit. Download links go to GitHub's latest release, and the source link wears the GitHub mark. The "not notarized" notice goes: macOS builds are signed and notarized now. Co-Authored-By: Claude --- site/e2e/text.spec.ts | 23 +++-------------------- site/src/icons.ts | 2 +- site/src/main.ts | 6 +++--- site/src/release.ts | 4 ++-- site/src/text.ts | 2 -- site/worker/index.ts | 36 ++++++++++++++++++++---------------- 6 files changed, 29 insertions(+), 44 deletions(-) diff --git a/site/e2e/text.spec.ts b/site/e2e/text.spec.ts index 8df5c61..90d1671 100644 --- a/site/e2e/text.spec.ts +++ b/site/e2e/text.spec.ts @@ -1,7 +1,7 @@ import { DOWNLOADS, expect, test, VERSION, type Page } from "./fixtures.ts"; import { TEXT, word, type Key, type Lang } from "../src/text.ts"; -const REPO = "https://git.zacharyzhang.com/ZacharyZhang-NY/ElyOffice"; +const REPO = "https://github.com/ELY-Open-Source/ElyOffice"; const APPS = ["ElyDoc", "ElyTable", "ElyShow", "ElyPDF", "ElyTree", "ElyMark"]; const RELEASES = `${REPO}/releases/latest`; @@ -114,10 +114,10 @@ test.describe("English locale", () => { }); test("a failed version read shows as an error", async ({ page }) => { - await page.route("**/release.json", (r) => r.fulfill({ status: 502, body: "Gitea answered 500" })); + await page.route("**/release.json", (r) => r.fulfill({ status: 502, body: "GitHub answered 500" })); await page.goto("/"); await expect.poll(() => errors.length).toBe(1); - expect(errors[0]).toContain("Gitea answered 500"); + expect(errors[0]).toContain("GitHub answered 500"); await expect(page.locator("#download h2")).toHaveText("Ely Office"); for (const c of await page.locator("[data-t=count]").all()) await expect(c).toBeHidden(); errors = []; @@ -174,20 +174,3 @@ test("the hero links share one baseline in either language", async ({ browser }) await page.close(); } }); - -test("the download area tells how to open an unnotarized app", async ({ browser }) => { - for (const [locale, words] of [ - ["en-US", ["System Settings", "Privacy & Security", "Open Anyway"]], - ["zh-CN", ["系统设置", "隐私与安全性", "仍要打开"]], - ] as const) { - const page = await browser.newPage({ locale, reducedMotion: "reduce" }); - await page.goto("/"); - const steps = page.locator("#download [data-t=unsigned]"); - await expect(steps).toBeVisible(); - for (const word of words) await expect(steps).toContainText(word); - await page.locator(".lang").click(); - await expect(steps).toBeVisible(); - await expect(steps).not.toContainText(words[0]); - await page.close(); - } -}); diff --git a/site/src/icons.ts b/site/src/icons.ts index 7af811f..25efa4b 100644 --- a/site/src/icons.ts +++ b/site/src/icons.ts @@ -3,7 +3,7 @@ import { said, type Key } from "./text.ts"; const ICONS = { download: ``, - gitea: ``, + github: ``, }; /** A link with `icon` before its keyed text. */ diff --git a/site/src/main.ts b/site/src/main.ts index 1fd28fa..6898bd4 100644 --- a/site/src/main.ts +++ b/site/src/main.ts @@ -11,7 +11,7 @@ import { said, speak, word, type Lang } from "./text.ts"; import { RELEASES, latest } from "./release.ts"; import { iconLink } from "./icons.ts"; -const REPO = "https://git.zacharyzhang.com/ZacharyZhang-NY/ElyOffice"; +const REPO = "https://github.com/ELY-Open-Source/ElyOffice"; const app = document.querySelector("#app"); if (!app) throw new Error("index.html has no #app"); @@ -19,7 +19,7 @@ if (!app) throw new Error("index.html has no #app"); const hero = document.createElement("header"); const title = document.createElement("h1"); title.textContent = "Ely Office"; -const source = iconLink("gitea", "source", REPO); +const source = iconLink("github", "source", REPO); const download = iconLink("download", "get", RELEASES); const links = document.createElement("div"); links.className = "links"; @@ -40,7 +40,7 @@ const count = said("p", "count"); count.hidden = true; const get = said("a", "get"); get.href = RELEASES; -footer.append(version, count, said("p", "platforms"), said("p", "needs"), said("p", "unsigned"), get); +footer.append(version, count, said("p", "platforms"), said("p", "needs"), get); const toggle = said("button", "other"); toggle.className = "lang"; diff --git a/site/src/release.ts b/site/src/release.ts index 23dbc44..7277b73 100644 --- a/site/src/release.ts +++ b/site/src/release.ts @@ -1,5 +1,5 @@ -// Gitea redirects this to the newest release. -export const RELEASES = "https://git.zacharyzhang.com/ZacharyZhang-NY/ElyOffice/releases/latest"; +// GitHub redirects this to the newest release. +export const RELEASES = "https://github.com/ELY-Open-Source/ElyOffice/releases/latest"; export type Release = { version: string; downloads: number }; diff --git a/site/src/text.ts b/site/src/text.ts index 3796a0f..4339b7c 100644 --- a/site/src/text.ts +++ b/site/src/text.ts @@ -15,7 +15,6 @@ const en = { download: "Download", platforms: "Out now for macOS, Windows and Linux.", needs: "macOS 14 or later, Apple silicon.", - unsigned: "Not notarized. If macOS blocks the app, open System Settings › Privacy & Security and click Open Anyway.", get: "Download", count: "{n} downloads so far.", source: "Source", @@ -53,7 +52,6 @@ const zh: typeof en = { download: "下载", platforms: "macOS、Windows 与 Linux 版已发布。", needs: "macOS 14 或更新，Apple 芯片。", - unsigned: "未经公证。macOS 拦下应用时，打开“系统设置 › 隐私与安全性”，点“仍要打开”。", get: "前往下载", count: "已下载 {n} 次。", source: "源码", diff --git a/site/worker/index.ts b/site/worker/index.ts index 081630d..4c8fbc7 100644 --- a/site/worker/index.ts +++ b/site/worker/index.ts @@ -1,34 +1,38 @@ // Answers /release.json with the newest release and downloads. -const REPO = "https://git.zacharyzhang.com/api/v1/repos/ZacharyZhang-NY/ElyOffice"; -const PAGE = 50; +const REPO = "https://api.github.com/repos/ELY-Open-Source/ElyOffice"; +const PAGE = 100; type Cached = RequestInit & { cf: { cacheTtl: number; cacheEverything: boolean } }; type Asset = { name: string; download_count: number }; type Release = { tag_name: string; assets: Asset[] }; +// A token lifts GitHub's limit for the shared egress addresses: `wrangler secret put GITHUB_TOKEN`. +type Env = { GITHUB_TOKEN?: string }; -const init: Cached = { - headers: { accept: "application/json", "user-agent": "ely-office-site" }, - cf: { cacheTtl: 300, cacheEverything: true }, -}; - -async function read(path: string): Promise { +async function read(env: Env, path: string): Promise { + const headers: Record = { + accept: "application/vnd.github+json", + "user-agent": "ely-office-site", + "x-github-api-version": "2022-11-28", + }; + if (env.GITHUB_TOKEN) headers.authorization = `Bearer ${env.GITHUB_TOKEN}`; + const init: Cached = { headers, cf: { cacheTtl: 300, cacheEverything: true } }; const res = await fetch(`${REPO}${path}`, init); - if (!res.ok) throw new Error(`Gitea answered ${res.status} for ${path}`); + if (!res.ok) throw new Error(`GitHub answered ${res.status} for ${path}`); return (await res.json()) as T; } /** The newest release's version, without the v. */ -async function version(): Promise { - const { tag_name: tag } = await read("/releases/latest"); - if (!/^v\d+\.\d+\.\d+$/.test(tag)) throw new Error(`Gitea's latest tag is ${JSON.stringify(tag)}`); +async function version(env: Env): Promise { + const { tag_name: tag } = await read(env, "/releases/latest"); + if (!/^v\d+\.\d+\.\d+$/.test(tag)) throw new Error(`GitHub's latest tag is ${JSON.stringify(tag)}`); return tag.slice(1); } /** Downloads of every release; update manifests are checks, not downloads. */ -async function downloads(): Promise { +async function downloads(env: Env): Promise { let total = 0; for (let page = 1; ; page++) { - const releases = await read(`/releases?limit=${PAGE}&page=${page}`); + const releases = await read(env, `/releases?per_page=${PAGE}&page=${page}`); for (const { assets } of releases) { for (const a of assets) { if (!Number.isInteger(a.download_count)) throw new Error(`${a.name} has no download count`); @@ -40,9 +44,9 @@ async function downloads(): Promise { } export default { - async fetch(): Promise { + async fetch(_request: Request, env: Env): Promise { try { - const [v, n] = await Promise.all([version(), downloads()]); + const [v, n] = await Promise.all([version(env), downloads(env)]); return Response.json({ version: v, downloads: n }, { headers: { "cache-control": "public, max-age=300" } }); } catch (e) { return new Response(String(e), { status: 502 }); From a06c9b299dfcce00786cf7dc6fc9d8d4623a5a4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?= Date: Mon, 19 Oct 2026 19:22:12 -0400 Subject: [PATCH 3/6] Docs: the code lives on GitHub under ELY-Open-Source CONTRIBUTING opens pull requests from a GitHub fork; the Linux packages' homepage is the GitHub repository; agents.md records the move. Co-Authored-By: Claude --- CONTRIBUTING.md | 13 +++++-------- agents.md | 3 ++- packaging/linux/package.sh | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 08aca76..844c1e5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,15 +1,12 @@ # Contributing -## Opening a pull request on git.zacharyzhang.com +## Opening a pull request on GitHub -Forking is disabled on this server. Open pull requests with AGit instead: - -1. Register an account at https://git.zacharyzhang.com -2. Clone, commit your changes, then push to a `refs/for/` ref: +1. Fork https://github.com/ELY-Open-Source/ElyOffice and clone your fork: ```bash - git clone https://git.zacharyzhang.com/ZacharyZhang-NY/ElyOffice.git - git push origin HEAD:refs/for/main -o topic= -o title="" -o description="" + git clone https://github.com//ElyOffice.git ``` -3. To update the pull request, push again with the same `topic`. +2. Commit your changes on a branch and push it to your fork. +3. Open a pull request against `main`. To update it, push to the same branch. diff --git a/agents.md b/agents.md index a083d56..c343d76 100644 --- a/agents.md +++ b/agents.md @@ -180,7 +180,7 @@ tests/scripts/windows-installer.sh 假应用的安装程序：所选目录原 tests/scripts/types.sh packaging/types.tsv 的文件类型在 Linux 桌面项、Windows 安装程序与 macOS 文档类型里一致，从不设为默认 tests/scripts/layout.sh 真窗口：六个应用在 640、800、1100 宽下无元素越出窗口左右，留截图（需辅助功能与屏幕录制权限） tests/scripts/ooxml.py <用例> <文件> 不经 LibreOffice 读 DOCX、XLSX、PPTX 并按自算的预期核对（往返用例调用） -cd site && pnpm deploy 官网构建并经 wrangler 发到 Cloudflare Workers（静态资源，另有 `site/worker` 只答 `/release.json`：Gitea API 的最新版本与全部发布的下载总数（不计更新清单 `.json`），缓存 5 分钟；下载链接指向 `releases/latest`），地址 https://ely-office.zhangyanghaha0407.workers.dev +cd site && pnpm deploy 官网构建并经 wrangler 发到 Cloudflare Workers（静态资源，另有 `site/worker` 只答 `/release.json`：GitHub API 的最新版本与全部发布的下载总数（不计更新清单 `.json`），缓存 5 分钟；下载链接指向 `releases/latest`），地址 https://ely-office.zhangyanghaha0407.workers.dev cd site && pnpm test && pnpm e2e 官网单测（几何、道路连通）与 Playwright 端到端（悬停、聚焦、按压、命中归属） cd site/video/scenes && npm run verify 发布视频：群像与离场两个渲染器在切场处屏幕角点一致，离场全程各屏播自己的录屏帧（真页面渲染） cargo check --workspace @@ -321,3 +321,4 @@ cargo run -p ely-doc 启动一个应用（ElyDoc 先 cargo build -p ely - 2026-10-18：Word 公式（R8.2，Gitea #9）。附件 math.docx 的六类公式逐类核对（本机无 Word，以文件所写为准）：键盘输入、OMML（内核转为公式对象）、MathType（OLE，显示随带的 WMF 预览）、上下标、图片原本就对；差别在两处根因。其一，运行的 `w:position`（升降）原先只给文字，图片与 OLE 公式所在的运行失去它（25 张图片与一个 ½ 浮在行上）：补丁 `0049-writer-inline-objects-move-with-their-run.patch` 把它作为固定升降写到对象的锚字符上（按锚字符自己的字号换算百分比，不扩展到其后的文字），版面让“作为字符”的对象随锚字符的固定升降移动（vertAlign 的自动上下标不动对象，同原样）；各导出本就写出锚字符的升降，DOCX 往返仍为 `w:position`。其二，EQ 域原先只认 `\o`、`\s\do` 与注音，其余（如分数 `\f`）整个消失：补丁 `0050-writer-eq-field-parser.patch`（读法）与 `0051-writer-eq-fields-as-formulas.patch`（导入）把 EQ 域转为公式对象：`\f` 分数、`\r` 根式、`\s` 上下标、`\b` 括号、`\l` 列表、`\a` 阵列、`\i` 积分与求和求积；`\x` 与 `\o` 只留内容（无框、无叠印），`\d` 只前移，`\ai`、`\di` 只是行距（不升降），开关不分大小写；每个命令字符保留其运行的上下标（Word 照此画），同一段上下标里字样变了仍是一个上下标；斜体字母写成标识符（StarMath 与 OMML 都画成斜体，DOCX 往返不丢），斜体的数字与符号写成 `ital` 文字，存为 DOCX 后成正体（OMML 无此写法，已知限制）；没有底的上下标以空文字为底（空的底在 OMML 里是占位符，重开成 ``）；公式取域的字号；读不通的命令以其域代码显示为文字，不消失。只有整个域是 `\s\do N(文字)` 时照原样成为下移的文字，其余都经读法（原先小写的 `\s\do` 读到第一个括号即止，其后丢失）。`client/tests/word.rs` 以 `tests/fixtures/office/word.docx`（由 `.work/r8/gen/eq.py` 生成，不入库）核对公式文本（含开头的空格、大写开关、读不通的域、字样变化的下标、`\ai`、`\di`、小写 `\s\do` 的尾部与嵌套）、DOCX 往返后的斜体、下标与无占位符、锚字符的升降与图块里图片低于文字（去掉版面的升降即失败）。审查三轮：第 3 轮的四处已修并以上述测试核对，未再审查（每条至多三轮）。仍与 Word 不同：编辑区里公式与图片四周有内核的辅助框线（`ShowBoundaries`，视图辅助，不印出）；DOCX 另存后重开行距变宽，因内核导出改写文档默认字体与段距，与公式无关。 - 2026-10-18：工作表过多时标签条（R8.3，Gitea #8）。组件库 `navigation::Tabs` 横排时可横向滚动（滚轮同样），标签可窄于自然宽度；所选标签在所选或标签条宽度变了时滚入视口，在绘制时以刚排好的宽度判定（原先只在首帧滚一次，其后右栏打开、标签条变窄，所选标签被挤出视口）；手动滚动保留到二者之一再变；横排的标签至多与标签条同宽，名字过长以省略号结尾（组件库 e56a343、3a68d1b、7d704d9，同批带入上游列外壳拖动的四个提交）。ElyTable 的标签条随之收缩，添加按钮留在其旁；标签条的状态按工作簿各记一份（元素 id 带标签号），切到另一工作簿时其所选标签照样滚入。`navigation/tests/tabs.rs` 以 30 个标签核对：首帧滚到所选、滚轮回到第一个、新选的滚入、变窄后所选仍在末端（去掉按宽度判定即失败）、长名的所选标签整个在标签条内（去掉宽度上限即失败）；ElyTable 的 `tests/strip.rs` 以 `sheets::strip` 画两个各有 30 张表、都选第 30 张的工作簿，滚回开头后来回切换，所选标签每次都在标签条内（两个工作簿共用一个 id 即失败）。Windows 真窗口（`.work/r8/strip3.png`）：30 张表、第 30 张为当前，1100 宽时标签条末端为它。 - 2026-10-18：ElyMark 公式（R8.4，用户定两项都做）。行内公式照块公式由 RaTeX 排版（原只显示着色的 TeX 原文）：gpui 的文本里放不进图片，组件库 `render/math_text.rs` 把每个行内公式换成等宽的不断行空格（U+00A0，按字体量出个数），排好的公式居中画在其上，行高随最高的公式撑开；空格串与词一样整个折到下一行，画在其所在行（折行处的序号 gpui 读作上一行末）；按下与右键所在的字节经换算读回公式的原文；排不出的公式照旧显示 TeX 原文，其后以危险色写出 RaTeX 给的原因与位置，记警告（不含公式）。`\(…\)` 读作行内公式，`\[…\]` 读作块公式（ChatGPT 等常写的分隔符；GitHub 不认，Typora 默认不认）：解析前逐字节把成对的分隔符换成 `$`（长度不变，位置照旧对得上）。成对只在同一段落、标题或单元格里（跨列表项、CR 空行不成对）；不跨代码、公式、HTML 标签、链接地址与引用标签、图片、脚注引用，``、`` 之间（含嵌套；交叉闭合照可视的读法关闭与重开）的文字照原文；`\\(` 不换。公式里与段落里另有的 `$`（含 `\$`）解析时暂写成文本里没有的控制字节，解析后还原，不与换上的 `$` 配对；相邻的两个公式之间暂插一个空格，解析后去掉，仍是两个公式。公式节点的范围是整对分隔符，值是写下的 TeX 原文。独占一段的 `\[…\]` 为块公式（段首可有一至三个空格）。组件库公开 `documents::markdown_tree`，ElyMark 的 HTML、PDF、纯文本导出都经它解析（`markdown_options` 不再公开），纯文本里独占一段的公式照块公式写其 TeX。同时查出（组件库 e095f06）：RaTeX 的 SVG 以 pt 定尺寸，usvg 按 px 量墨迹，两者差 4/3，每个公式的画面右侧与下方多出约四分之一的空白（块公式因此偏左）、导出的公式比正文大 4/3；现生成时即把根改为 px。`markdown/tex/tests.rs` 与 `tree/tests.rs` 核对分隔符的各种情形（相邻、`\$`、链接地址、``、跨块），`math_text.rs` 的窗口测试核对公式排进并读回原文、折到第二行的公式画在第二行首（改回按起点定位即失败）、排不出的公式写出原因（组件库 a20e712、5fba7b3、de961eb），`math/tests.rs` 核对画面与公式同宽（改回 pt 即失败），ElyMark 的 `visual.rs` 核对导出与纯文本。Windows 真窗口（`.work/r8/mark/visual2.png`）：`$…$`、`\(…\)` 排在行内，`\[…\]` 居中成块，行内代码与转义的 `\\(` 照原文。 +- 2026-10-19（用户定）：代码与发布从 Gitea 搬到 GitHub 组织 ELY-Open-Source（`ELY-Open-Source/ElyOffice`；组件库 `ELY-Open-Source/Ely-GPUI-Components`，Cargo 的 git 依赖与 `fetch-references.sh` 随之改址，钉的提交不变；Kigi CLI 同在此组织）。历史、标签与发布已迁过，Gitea 停用，GitHub 是唯一的家。发布由 `.github/workflows/release.yml` 在推送 `v*` 标签时运行（只此一种触发，拉取请求到不了自托管机器）：macOS 在 `[self-hosted, macos-signing]`（Mac mini 的图形会话，Developer ID 签名并公证），Windows 与 Linux（WSL）在 `[self-hosted, ely-windows]`；各机的常驻克隆 `$HOME/ely-ci/ElyOffice` 从 GitHub 拉取。`scripts/ci.sh` 经 GitHub API 按标签取发布、没有就建（`GITHUB_TOKEN`，`contents: write`），同名文件先删再传：重跑只换本平台的文件。更新检查读 `api.github.com/repos/ELY-Open-Source/ElyOffice/releases/latest` 的 `.json`，清单的下载地址为 `github.com/ELY-Open-Source/ElyOffice/releases/download/v<版本>/<文件>`；0.1.8 及以前装好的应用仍查 Gitea，需手动装一次新版。官网 worker 读 GitHub API（可选机密 `GITHUB_TOKEN` 避开共享出口地址的限流），下载与源码链接指向 GitHub（GitHub 标志）；macOS 版已公证，去掉“未经公证”的提示。发布视频的源文件与成片里仍是 Gitea 地址，未改未重渲染。 diff --git a/packaging/linux/package.sh b/packaging/linux/package.sh index ccb373e..9fb42fe 100755 --- a/packaging/linux/package.sh +++ b/packaging/linux/package.sh @@ -192,7 +192,7 @@ release: 1 maintainer: ZacharyZhang vendor: ZacharyZhang description: $name, part of Ely Office -homepage: https://git.zacharyzhang.com/ZacharyZhang-NY/ElyOffice +homepage: https://github.com/ELY-Open-Source/ElyOffice license: AGPL-3.0-or-later contents: - src: $appdir/usr From 1d74bbc417db3f7f02160d9401701b4d9155b887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?= Date: Mon, 19 Oct 2026 19:22:39 -0400 Subject: [PATCH 4/6] Updates and the component library come from GitHub The update check reads the latest release from GitHub's API; its JSON has the same tag_name and assets[].browser_download_url the reader expects. Ely-GPUI-Components is fetched from ELY-Open-Source at the same pinned commits. Co-Authored-By: Claude --- Cargo.lock | 2 +- Cargo.toml | 2 +- crates/ely-ui/src/updates.rs | 2 +- scripts/fetch-references.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d0d5b82..45ba0be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1986,7 +1986,7 @@ dependencies = [ [[package]] name = "ely-gpui-component" version = "0.1.1" -source = "git+https://git.zacharyzhang.com/ZacharyZhang-NY/Ely-GPUI-Components?rev=de961eb164c1c88797ea35f0860aba9d18c95e4f#de961eb164c1c88797ea35f0860aba9d18c95e4f" +source = "git+https://github.com/ELY-Open-Source/Ely-GPUI-Components?rev=de961eb164c1c88797ea35f0860aba9d18c95e4f#de961eb164c1c88797ea35f0860aba9d18c95e4f" dependencies = [ "alacritty_terminal", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index 7bc562b..f2a8f2d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ jiff = "0.2" anyhow = "1" directories = "6" dunce = "1" -ely-gpui-component = { git = "https://git.zacharyzhang.com/ZacharyZhang-NY/Ely-GPUI-Components", rev = "de961eb164c1c88797ea35f0860aba9d18c95e4f" } +ely-gpui-component = { git = "https://github.com/ELY-Open-Source/Ely-GPUI-Components", rev = "de961eb164c1c88797ea35f0860aba9d18c95e4f" } env_logger = "0.11" gpui = { package = "gpui-pre", version = "=0.3.8", default-features = false, features = ["stacker"] } gpui_platform = { package = "gpui-pre-platform", version = "=0.3.8", features = ["font-kit", "wayland", "x11"] } diff --git a/crates/ely-ui/src/updates.rs b/crates/ely-ui/src/updates.rs index c02d3bc..61cc1d1 100644 --- a/crates/ely-ui/src/updates.rs +++ b/crates/ely-ui/src/updates.rs @@ -18,7 +18,7 @@ use gpui::{ }; /// The release server's newest release, listed by its API. -const LATEST: &str = "https://git.zacharyzhang.com/api/v1/repos/ZacharyZhang-NY/ElyOffice/releases/latest"; +const LATEST: &str = "https://api.github.com/repos/ELY-Open-Source/ElyOffice/releases/latest"; /// The argument that runs this binary as the installer. const INSTALL: &str = "--ely-install-update"; diff --git a/scripts/fetch-references.sh b/scripts/fetch-references.sh index d1fc72a..9ca51e4 100755 --- a/scripts/fetch-references.sh +++ b/scripts/fetch-references.sh @@ -36,7 +36,7 @@ fetch() { # name url rev [sparse paths...] echo "fetch $name $rev" } -fetch Ely-GPUI-Components https://git.zacharyzhang.com/ZacharyZhang-NY/Ely-GPUI-Components.git 5a53c08c844210ea80c6a92aec708e2de8ffa721 +fetch Ely-GPUI-Components https://github.com/ELY-Open-Source/Ely-GPUI-Components.git 5a53c08c844210ea80c6a92aec708e2de8ffa721 fetch zed https://github.com/zed-industries/zed.git 1a28cff4b409169bac058bca40dfbfeb7621d19b fetch libreoffice-core https://github.com/LibreOffice/core.git 8221e31b3ac356a1623c672912a3d2b492f7e3d1 \ include/LibreOfficeKit libreofficekit desktop/source/lib desktop/inc \ From 271468d0e527f3a668142caf5e65c1ee1526e9b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?= Date: Mon, 19 Oct 2026 19:31:09 -0400 Subject: [PATCH 5/6] Relicense Ely Office's own code from AGPL-3.0 to MIT LICENSE is the MIT text, copyright Yang Zhang; the workspace crates, the docs and the site say MIT. Bundled engines keep their licences: LibreOffice (MPL-2.0), Git (GPL-2.0) and MuPDF (AGPL-3.0), which ElyPDF links, so the Linux packages name both, e.g. "MIT AND AGPL-3.0-or-later". Co-Authored-By: Claude --- Cargo.toml | 2 +- LICENSE | 682 ++----------------------------------- PRD.md | 2 +- agents.md | 1 + docs/licenses.md | 4 +- packaging/linux/package.sh | 9 +- site/src/text.ts | 4 +- 7 files changed, 36 insertions(+), 668 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f2a8f2d..3aeba0b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ exclude = ["engines", "reference"] version = "0.1.8" edition = "2024" rust-version = "1.95" -license = "AGPL-3.0-or-later" +license = "MIT" publish = false [workspace.dependencies] diff --git a/LICENSE b/LICENSE index dba13ed..f43f70a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,661 +1,21 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. +MIT License + +Copyright (c) 2026 Yang Zhang + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/PRD.md b/PRD.md index f00299d..a47668c 100644 --- a/PRD.md +++ b/PRD.md @@ -756,7 +756,7 @@ Doc、Table、Show 的 PDF 输出由 LOK 完成，不要求安装 ElyPDF。ElyMa ### 21.1 自有代码默认许可 -本 PRD 对新增应用代码采用 AGPL-3.0-or-later 作为发行默认，便于与 MuPDF 的开源使用路线保持一致。Ely GPUI Components 继续保留现有 MIT/Apache-2.0 许可，不因被应用使用而改写其许可证。[S1] +本 PRD 对新增应用代码采用 MIT 作为发行默认（用户 2026-10-19 定，原为 AGPL-3.0-or-later）。MIT 只管 Ely 的自有代码：链接 MuPDF 的 ElyPDF 发行包整体仍须按 MuPDF 的 AGPL 条款提供对应源码。Ely GPUI Components 继续保留现有 MIT/Apache-2.0 许可，不因被应用使用而改写其许可证。[S1] 第三方代码保持原许可证。不得把 LibreOffice、Git 或其他依赖的版权声明统一替换成 Ely 的声明。最终发行须按实际链接、进程调用、修改和打包方式审查，进程隔离不作为免除许可义务的依据。 diff --git a/agents.md b/agents.md index c343d76..819ac89 100644 --- a/agents.md +++ b/agents.md @@ -322,3 +322,4 @@ cargo run -p ely-doc 启动一个应用（ElyDoc 先 cargo build -p ely - 2026-10-18：工作表过多时标签条（R8.3，Gitea #8）。组件库 `navigation::Tabs` 横排时可横向滚动（滚轮同样），标签可窄于自然宽度；所选标签在所选或标签条宽度变了时滚入视口，在绘制时以刚排好的宽度判定（原先只在首帧滚一次，其后右栏打开、标签条变窄，所选标签被挤出视口）；手动滚动保留到二者之一再变；横排的标签至多与标签条同宽，名字过长以省略号结尾（组件库 e56a343、3a68d1b、7d704d9，同批带入上游列外壳拖动的四个提交）。ElyTable 的标签条随之收缩，添加按钮留在其旁；标签条的状态按工作簿各记一份（元素 id 带标签号），切到另一工作簿时其所选标签照样滚入。`navigation/tests/tabs.rs` 以 30 个标签核对：首帧滚到所选、滚轮回到第一个、新选的滚入、变窄后所选仍在末端（去掉按宽度判定即失败）、长名的所选标签整个在标签条内（去掉宽度上限即失败）；ElyTable 的 `tests/strip.rs` 以 `sheets::strip` 画两个各有 30 张表、都选第 30 张的工作簿，滚回开头后来回切换，所选标签每次都在标签条内（两个工作簿共用一个 id 即失败）。Windows 真窗口（`.work/r8/strip3.png`）：30 张表、第 30 张为当前，1100 宽时标签条末端为它。 - 2026-10-18：ElyMark 公式（R8.4，用户定两项都做）。行内公式照块公式由 RaTeX 排版（原只显示着色的 TeX 原文）：gpui 的文本里放不进图片，组件库 `render/math_text.rs` 把每个行内公式换成等宽的不断行空格（U+00A0，按字体量出个数），排好的公式居中画在其上，行高随最高的公式撑开；空格串与词一样整个折到下一行，画在其所在行（折行处的序号 gpui 读作上一行末）；按下与右键所在的字节经换算读回公式的原文；排不出的公式照旧显示 TeX 原文，其后以危险色写出 RaTeX 给的原因与位置，记警告（不含公式）。`\(…\)` 读作行内公式，`\[…\]` 读作块公式（ChatGPT 等常写的分隔符；GitHub 不认，Typora 默认不认）：解析前逐字节把成对的分隔符换成 `$`（长度不变，位置照旧对得上）。成对只在同一段落、标题或单元格里（跨列表项、CR 空行不成对）；不跨代码、公式、HTML 标签、链接地址与引用标签、图片、脚注引用，``、`` 之间（含嵌套；交叉闭合照可视的读法关闭与重开）的文字照原文；`\\(` 不换。公式里与段落里另有的 `$`（含 `\$`）解析时暂写成文本里没有的控制字节，解析后还原，不与换上的 `$` 配对；相邻的两个公式之间暂插一个空格，解析后去掉，仍是两个公式。公式节点的范围是整对分隔符，值是写下的 TeX 原文。独占一段的 `\[…\]` 为块公式（段首可有一至三个空格）。组件库公开 `documents::markdown_tree`，ElyMark 的 HTML、PDF、纯文本导出都经它解析（`markdown_options` 不再公开），纯文本里独占一段的公式照块公式写其 TeX。同时查出（组件库 e095f06）：RaTeX 的 SVG 以 pt 定尺寸，usvg 按 px 量墨迹，两者差 4/3，每个公式的画面右侧与下方多出约四分之一的空白（块公式因此偏左）、导出的公式比正文大 4/3；现生成时即把根改为 px。`markdown/tex/tests.rs` 与 `tree/tests.rs` 核对分隔符的各种情形（相邻、`\$`、链接地址、``、跨块），`math_text.rs` 的窗口测试核对公式排进并读回原文、折到第二行的公式画在第二行首（改回按起点定位即失败）、排不出的公式写出原因（组件库 a20e712、5fba7b3、de961eb），`math/tests.rs` 核对画面与公式同宽（改回 pt 即失败），ElyMark 的 `visual.rs` 核对导出与纯文本。Windows 真窗口（`.work/r8/mark/visual2.png`）：`$…$`、`\(…\)` 排在行内，`\[…\]` 居中成块，行内代码与转义的 `\\(` 照原文。 - 2026-10-19（用户定）：代码与发布从 Gitea 搬到 GitHub 组织 ELY-Open-Source（`ELY-Open-Source/ElyOffice`；组件库 `ELY-Open-Source/Ely-GPUI-Components`，Cargo 的 git 依赖与 `fetch-references.sh` 随之改址，钉的提交不变；Kigi CLI 同在此组织）。历史、标签与发布已迁过，Gitea 停用，GitHub 是唯一的家。发布由 `.github/workflows/release.yml` 在推送 `v*` 标签时运行（只此一种触发，拉取请求到不了自托管机器）：macOS 在 `[self-hosted, macos-signing]`（Mac mini 的图形会话，Developer ID 签名并公证），Windows 与 Linux（WSL）在 `[self-hosted, ely-windows]`；各机的常驻克隆 `$HOME/ely-ci/ElyOffice` 从 GitHub 拉取。`scripts/ci.sh` 经 GitHub API 按标签取发布、没有就建（`GITHUB_TOKEN`，`contents: write`），同名文件先删再传：重跑只换本平台的文件。更新检查读 `api.github.com/repos/ELY-Open-Source/ElyOffice/releases/latest` 的 `.json`，清单的下载地址为 `github.com/ELY-Open-Source/ElyOffice/releases/download/v<版本>/<文件>`；0.1.8 及以前装好的应用仍查 Gitea，需手动装一次新版。官网 worker 读 GitHub API（可选机密 `GITHUB_TOKEN` 避开共享出口地址的限流），下载与源码链接指向 GitHub（GitHub 标志）；macOS 版已公证，去掉“未经公证”的提示。发布视频的源文件与成片里仍是 Gitea 地址，未改未重渲染。 +- 2026-10-19（用户定）：自有代码由 AGPL-3.0-or-later 改为 MIT（`LICENSE`，Copyright (c) 2026 Yang Zhang；工作区 `Cargo.toml`、Linux 包的许可字段、`docs/licenses.md`、官网）。第三方照旧：LibreOffice 与 `patches/libreoffice` 为 MPL-2.0 等，Git 为 GPL-2.0，MuPDF 为 AGPL-3.0；ElyPDF 链接 MuPDF，其发行包整体仍须按 AGPL 履行，Linux 包的许可字段据此写为 `MIT AND <引擎许可>`。 diff --git a/docs/licenses.md b/docs/licenses.md index 1745e44..69479e6 100644 --- a/docs/licenses.md +++ b/docs/licenses.md @@ -4,7 +4,7 @@ ## 自有代码 -Ely Office 的自有代码以 AGPL-3.0-or-later 发布，全文在仓库根的 `LICENSE`，并随每个应用包放在 `Resources/Licenses/LICENSE`。组件库 Ely-GPUI-Components 保留其 MIT/Apache-2.0。 +Ely Office 的自有代码以 MIT 发布，全文在仓库根的 `LICENSE`，并随每个应用包放在 `Resources/Licenses/LICENSE`。随包的引擎不随之改许可：ElyPDF 链接的 MuPDF 是 AGPL-3.0，ElyPDF 的发行包整体须按 AGPL 履行（对应源码见上游源码包）；ElyDoc、ElyTable、ElyShow 的 LibreOffice 仍为 MPL-2.0 等；ElyTree 带的 Git 仍为 GPL-2.0。组件库 Ely-GPUI-Components 保留其 MIT/Apache-2.0。 ## 每个发行版附带 @@ -12,7 +12,7 @@ Ely Office 的自有代码以 AGPL-3.0-or-later 发布，全文在仓库根的 ` | --- | --- | --- | | `ElyOffice-<版本>-source.tar.gz` | 自有源码、`Cargo.lock`、`rust-toolchain.toml`、上游补丁（`patches/libreoffice`、`patches/mupdf`）、构建与取上游的脚本（各上游钉在提交，脚本里写明地址与散列）、测试、文档 | `packaging/macos/release.sh` | | `ElyOffice-<版本>-upstream-source.tar.gz` | 实际编译的 MuPDF 源码（钉住的提交加我们的补丁，AGPL）与随包 Git 的源码（v2.56.0，GPLv2） | 同上；`tests/scripts/release-macos.sh` 核对其中是打过补丁的 MuPDF | -| 各应用包 `Resources/Licenses/` | Ely 的 AGPL 全文；`rust-crates.txt`（链进该应用各二进制的全部 crate 与其许可文件，无许可文件的取标准文本并写明作者）；所带引擎的许可与通知（见下） | `packaging/licenses.sh`，缺任何一份即打包失败 | +| 各应用包 `Resources/Licenses/` | Ely 的 MIT 全文；`rust-crates.txt`（链进该应用各二进制的全部 crate 与其许可文件，无许可文件的取标准文本并写明作者）；所带引擎的许可与通知（见下） | `packaging/licenses.sh`，缺任何一份即打包失败 | ## 第三方，按应用 diff --git a/packaging/linux/package.sh b/packaging/linux/package.sh index 9fb42fe..9390c27 100755 --- a/packaging/linux/package.sh +++ b/packaging/linux/package.sh @@ -18,6 +18,13 @@ row=$(awk -F'\t' -v slug="$slug" '$1 == slug { print $2 "\t" $3 }' "$root/packag } name=${row%%$'\t'*} categories=${row##*$'\t'} +# Ely's own code is MIT; a bundled engine keeps its licence. +case $slug in + ely-doc | ely-table | ely-show) license="MIT AND MPL-2.0" ;; + ely-pdf) license="MIT AND AGPL-3.0-or-later" ;; + ely-tree) license="MIT AND GPL-2.0-only" ;; + *) license=MIT ;; +esac # The types it opens, from packaging/types.tsv; none drops the line. mimes=$(awk -F'\t' -v slug="$slug" '$1 == slug && !seen[$3]++ { printf "%s;", $3 }' "$root/packaging/types.tsv") desktop_entry() { @@ -193,7 +200,7 @@ maintainer: ZacharyZhang vendor: ZacharyZhang description: $name, part of Ely Office homepage: https://github.com/ELY-Open-Source/ElyOffice -license: AGPL-3.0-or-later +license: $license contents: - src: $appdir/usr dst: /opt/ely-office/$slug diff --git a/site/src/text.ts b/site/src/text.ts index 4339b7c..af90a46 100644 --- a/site/src/text.ts +++ b/site/src/text.ts @@ -10,7 +10,7 @@ const en = { ElyTree: "Stage lines, commit, read the graph. Git without a terminal.", ElyMark: "Markdown as you read it. Math and diagrams in place.", offline: "Works with the network off.", - open: "Open source, under the AGPL.", + open: "Open source, under the MIT licence.", local: "Your files stay in your folders.", download: "Download", platforms: "Out now for macOS, Windows and Linux.", @@ -47,7 +47,7 @@ const zh: typeof en = { ElyTree: "按行暂存、提交、看提交图。不用终端的 Git。", ElyMark: "写的就是看到的 Markdown。公式与图表就地显示。", offline: "断网照常工作。", - open: "开源，AGPL 许可。", + open: "开源，MIT 许可。", local: "文件留在你自己的文件夹里。", download: "下载", platforms: "macOS、Windows 与 Linux 版已发布。", From 0e0415fdbe6a795cc105060ff35a01091340c3b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?= Date: Mon, 19 Oct 2026 19:37:59 -0400 Subject: [PATCH 6/6] Site: the download count adds Gitea's history to GitHub's Gitea holds the downloads made before the move, so the worker sums both hosts' asset download counts (update manifests excluded). Gitea is read with the same five-minute cache and a five-second limit; when it is down or answers oddly, the count is GitHub's alone. Downloads stay on GitHub only. Co-Authored-By: Claude --- agents.md | 2 +- site/test/worker.test.ts | 63 ++++++++++++++++++++++++++++++++++++++++ site/worker/index.ts | 62 ++++++++++++++++++++++++++++++++------- 3 files changed, 116 insertions(+), 11 deletions(-) create mode 100644 site/test/worker.test.ts diff --git a/agents.md b/agents.md index 819ac89..4e3defd 100644 --- a/agents.md +++ b/agents.md @@ -180,7 +180,7 @@ tests/scripts/windows-installer.sh 假应用的安装程序：所选目录原 tests/scripts/types.sh packaging/types.tsv 的文件类型在 Linux 桌面项、Windows 安装程序与 macOS 文档类型里一致，从不设为默认 tests/scripts/layout.sh 真窗口：六个应用在 640、800、1100 宽下无元素越出窗口左右，留截图（需辅助功能与屏幕录制权限） tests/scripts/ooxml.py <用例> <文件> 不经 LibreOffice 读 DOCX、XLSX、PPTX 并按自算的预期核对（往返用例调用） -cd site && pnpm deploy 官网构建并经 wrangler 发到 Cloudflare Workers（静态资源，另有 `site/worker` 只答 `/release.json`：GitHub API 的最新版本与全部发布的下载总数（不计更新清单 `.json`），缓存 5 分钟；下载链接指向 `releases/latest`），地址 https://ely-office.zhangyanghaha0407.workers.dev +cd site && pnpm deploy 官网构建并经 wrangler 发到 Cloudflare Workers（静态资源，另有 `site/worker` 只答 `/release.json`：GitHub API 的最新版本与全部发布的下载总数，加上 Gitea 上迁移前的下载（Gitea 不通时只计 GitHub；都不计更新清单 `.json`），缓存 5 分钟；下载链接指向 `releases/latest`），地址 https://ely-office.zhangyanghaha0407.workers.dev cd site && pnpm test && pnpm e2e 官网单测（几何、道路连通）与 Playwright 端到端（悬停、聚焦、按压、命中归属） cd site/video/scenes && npm run verify 发布视频：群像与离场两个渲染器在切场处屏幕角点一致，离场全程各屏播自己的录屏帧（真页面渲染） cargo check --workspace diff --git a/site/test/worker.test.ts b/site/test/worker.test.ts new file mode 100644 index 0000000..ffc3327 --- /dev/null +++ b/site/test/worker.test.ts @@ -0,0 +1,63 @@ +import { afterEach, test } from "node:test"; +import assert from "node:assert/strict"; +import worker from "../worker/index.ts"; + +const real = globalThis.fetch; +afterEach(() => { + globalThis.fetch = real; +}); + +const github = { + tag_name: "v0.1.9", + assets: [ + { name: "ElyDoc-0.1.9-arm64.dmg", download_count: 3 }, + { name: "ely-doc.json", download_count: 50 }, + ], +}; +const gitea = [ + { tag_name: "v0.1.8", assets: [{ name: "ElyDoc-0.1.8-arm64.dmg", download_count: 40 }, { name: "ely-doc.json", download_count: 900 }] }, + { tag_name: "v0.1.7", assets: [{ name: "ElyDoc-0.1.7-arm64.dmg", download_count: 7 }] }, +]; + +/** Answers GitHub with `github` and Gitea with `old`. */ +function hosts(old: () => Response) { + globalThis.fetch = (async (input: RequestInfo | URL) => { + const url = String(input); + if (url.startsWith("https://git.zacharyzhang.com/")) return old(); + if (url.endsWith("/releases/latest")) return Response.json(github); + return Response.json([github]); + }) as typeof fetch; +} + +async function answer() { + const warn = console.warn; + console.warn = () => {}; + try { + const res = await worker.fetch(new Request("https://office.elygpui.com/release.json"), {}); + assert.equal(res.status, 200); + return await res.json(); + } finally { + console.warn = warn; + } +} + +test("downloads add Gitea's history to GitHub's, without manifests", async () => { + hosts(() => Response.json(gitea)); + assert.deepEqual(await answer(), { version: "0.1.9", downloads: 3 + 40 + 7 }); +}); + +test("an unreachable, failing or odd Gitea leaves GitHub's count", async () => { + const cases: (() => Response)[] = [ + () => { + throw new TypeError("fetch failed"); + }, + () => new Response("down", { status: 502 }), + () => new Response("", { status: 200 }), + () => Response.json({ message: "not found" }), + () => Response.json([{ tag_name: "v0.1.8", assets: [{ name: "ElyDoc.dmg" }] }]), + ]; + for (const old of cases) { + hosts(old); + assert.deepEqual(await answer(), { version: "0.1.9", downloads: 3 }); + } +}); diff --git a/site/worker/index.ts b/site/worker/index.ts index 4c8fbc7..7b55004 100644 --- a/site/worker/index.ts +++ b/site/worker/index.ts @@ -1,6 +1,11 @@ // Answers /release.json with the newest release and downloads. const REPO = "https://api.github.com/repos/ELY-Open-Source/ElyOffice"; +// The old home keeps the downloads made before the move. +const GITEA = "https://git.zacharyzhang.com/api/v1/repos/ZacharyZhang-NY/ElyOffice"; const PAGE = 100; +const GITEA_PAGE = 50; +// A slow Gitea must not hold up the page. +const GITEA_WAIT = 5000; type Cached = RequestInit & { cf: { cacheTtl: number; cacheEverything: boolean } }; type Asset = { name: string; download_count: number }; @@ -8,6 +13,8 @@ type Release = { tag_name: string; assets: Asset[] }; // A token lifts GitHub's limit for the shared egress addresses: `wrangler secret put GITHUB_TOKEN`. type Env = { GITHUB_TOKEN?: string }; +const cf = { cacheTtl: 300, cacheEverything: true }; + async function read(env: Env, path: string): Promise { const headers: Record = { accept: "application/vnd.github+json", @@ -15,12 +22,23 @@ async function read(env: Env, path: string): Promise { "x-github-api-version": "2022-11-28", }; if (env.GITHUB_TOKEN) headers.authorization = `Bearer ${env.GITHUB_TOKEN}`; - const init: Cached = { headers, cf: { cacheTtl: 300, cacheEverything: true } }; + const init: Cached = { headers, cf }; const res = await fetch(`${REPO}${path}`, init); if (!res.ok) throw new Error(`GitHub answered ${res.status} for ${path}`); return (await res.json()) as T; } +async function readGitea(path: string): Promise { + const init: Cached = { + headers: { accept: "application/json", "user-agent": "ely-office-site" }, + cf, + signal: AbortSignal.timeout(GITEA_WAIT), + }; + const res = await fetch(`${GITEA}${path}`, init); + if (!res.ok) throw new Error(`Gitea answered ${res.status} for ${path}`); + return (await res.json()) as T; +} + /** The newest release's version, without the v. */ async function version(env: Env): Promise { const { tag_name: tag } = await read(env, "/releases/latest"); @@ -28,26 +46,50 @@ async function version(env: Env): Promise { return tag.slice(1); } -/** Downloads of every release; update manifests are checks, not downloads. */ +/** Downloads of `releases`; update manifests are checks, not downloads. */ +function counted(releases: Release[]): number { + let total = 0; + for (const { assets } of releases) { + for (const a of assets) { + if (!Number.isInteger(a.download_count)) throw new Error(`${a.name} has no download count`); + if (!a.name.endsWith(".json")) total += a.download_count; + } + } + return total; +} + +/** Downloads of every GitHub release. */ async function downloads(env: Env): Promise { let total = 0; for (let page = 1; ; page++) { const releases = await read(env, `/releases?per_page=${PAGE}&page=${page}`); - for (const { assets } of releases) { - for (const a of assets) { - if (!Number.isInteger(a.download_count)) throw new Error(`${a.name} has no download count`); - if (!a.name.endsWith(".json")) total += a.download_count; - } - } + total += counted(releases); if (releases.length < PAGE) return total; } } +/** Downloads of every Gitea release; 0 when Gitea is down, slow or odd. */ +async function giteaDownloads(): Promise { + try { + let total = 0; + for (let page = 1; ; page++) { + const releases = await readGitea(`/releases?limit=${GITEA_PAGE}&page=${page}`); + if (!Array.isArray(releases)) throw new Error("Gitea listed no releases"); + total += counted(releases); + if (releases.length < GITEA_PAGE) return total; + } + } catch (e) { + // The page shows GitHub's count alone. + console.warn(`no Gitea downloads: ${e}`); + return 0; + } +} + export default { async fetch(_request: Request, env: Env): Promise { try { - const [v, n] = await Promise.all([version(env), downloads(env)]); - return Response.json({ version: v, downloads: n }, { headers: { "cache-control": "public, max-age=300" } }); + const [v, n, old] = await Promise.all([version(env), downloads(env), giteaDownloads()]); + return Response.json({ version: v, downloads: n + old }, { headers: { "cache-control": "public, max-age=300" } }); } catch (e) { return new Response(String(e), { status: 502 }); }