From 81dc70b86c176493acc330d380510159600a7847 Mon Sep 17 00:00:00 2001 From: zhangxiang Date: Wed, 21 Oct 2026 16:36:28 +0800 Subject: [PATCH] =?UTF-8?q?docs(brand):=20=E5=AD=97=E4=BD=93=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E6=96=87=E6=9C=AC=E4=B8=8E=E6=B8=85=E5=8D=95=E5=85=A5?= =?UTF-8?q?=E5=BA=93=EF=BC=8C43MB=20=E5=AD=97=E6=BA=90=E4=BB=8D=E7=95=99?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OFL 要求分发时附带许可与版权声明;这两份文件也是「用了哪几套字、各自的子集口径」 的唯一记录。原先把整个 fonts/ 目录屏蔽,连它们一起挡在了仓库外。 .gitignore 由目录级 `fonts/` 改为 `fonts/*` + 三条反选: FONT-MANIFEST.md / LICENSES.md / OFL-*.txt 入库,8 个 ttf/woff2 继续留本地 (站内实际引用的字体在 public/fonts,已入库)。 --- .gitignore | 7 +- .../fonts/FONT-MANIFEST.md | 26 +++++ .../fonts/LICENSES.md | 14 +++ .../fonts/OFL-LXGWWenKai.txt | 94 +++++++++++++++++++ .../fonts/OFL-NotoSerifSC.txt | 94 +++++++++++++++++++ 5 files changed, 234 insertions(+), 1 deletion(-) create mode 100644 deliverables/logo-redesign-2026-10-13/fonts/FONT-MANIFEST.md create mode 100644 deliverables/logo-redesign-2026-10-13/fonts/LICENSES.md create mode 100644 deliverables/logo-redesign-2026-10-13/fonts/OFL-LXGWWenKai.txt create mode 100644 deliverables/logo-redesign-2026-10-13/fonts/OFL-NotoSerifSC.txt diff --git a/.gitignore b/.gitignore index 8379ab2..795338f 100644 --- a/.gitignore +++ b/.gitignore @@ -347,7 +347,12 @@ novalon-accenture-redesign/ # - backup-*/:landing/apply.sh 自建还原点。只忽略其中的 png/ico/webmanifest/tsx 副本 # (内容都能从 git 取回),同目录的 svg 半份是已入库资产,不能用目录级规则一并屏蔽 deliverables/**/*.html -deliverables/logo-redesign-2026-10-13/fonts/ +# 字体源与 woff2 子集留本地(43MB,仅本机栅格化用;站内实际引用的字体在 public/fonts) +# 但授权文本与清单必须入库:OFL 要求随分发附带,且它们是「用了哪几套字」的唯一记录 +deliverables/logo-redesign-2026-10-13/fonts/* +!deliverables/logo-redesign-2026-10-13/fonts/FONT-MANIFEST.md +!deliverables/logo-redesign-2026-10-13/fonts/LICENSES.md +!deliverables/logo-redesign-2026-10-13/fonts/OFL-*.txt deliverables/logo-redesign-2026-10-13/landing/backup-*/public/*.png deliverables/logo-redesign-2026-10-13/landing/backup-*/public/*.ico deliverables/logo-redesign-2026-10-13/landing/backup-*/public/site.webmanifest diff --git a/deliverables/logo-redesign-2026-10-13/fonts/FONT-MANIFEST.md b/deliverables/logo-redesign-2026-10-13/fonts/FONT-MANIFEST.md new file mode 100644 index 0000000..ff85f40 --- /dev/null +++ b/deliverables/logo-redesign-2026-10-13/fonts/FONT-MANIFEST.md @@ -0,0 +1,26 @@ +# 中文字体子集包(P2 已裁定:思源宋体进正文,先只上 tight 档) + +全部由 `font-subset.py` 现场切出并用 `fontTools` 回读 cmap 验证,不是引用别人的数字。复跑: + +``` +/tmp/fenv/bin/python font-subset.py # 目标字符集 = 扫 src 的 407 个 .ts/.tsx 得 1050 码位 +``` + +| 文件 | 字族/档 | 体积 | sha256 前 16 | 说明 | +|---|---|---|---|---| +| `notoserifsc-subset.woff2` | 思源宋体(可变 200–900)tight 档 | 388.1 KB | 2c1a2ad9df1a96be | P2 采用档:源码实际用字 1050 码位,回读 cmap 缺字 0 | +| `notoserifsc-wide.woff2` | 思源宋体 wide 档 | 1361.0 KB | a8ab2160a3ed1a8d | GB2312 一级 3755 + ASCII/标点 = 3841 码位,缺字 0;**押后**(出网仅 1 Mbps) | +| `lxgwwenkaitc-subset.woff2` | 霞鹜文楷 TC tight 档 | 262.9 KB | 9c0d4a223b37289d | 第二字族(年报引言等叙述体),单字重;缺字 0 | +| `mashanzheng-subset.woff2` | 马善政毛笔楷书(反例) | 406.4 KB | fe9f6ac249c594c4 | 切完仍**缺「遠」与「·」** ⇒ 品牌名「睿新致遠」不可用,留作证伪证据 | + +**三条落地约束(落库时必须一起处理,否则会踩授权与合规)** + +1. **OFL 要求授权文本随字体分发**:已补齐两份全文并做内容核验(正文含 `SIL OPEN FONT LICENSE Version 1.1`),见 [LICENSES.md](LICENSES.md) 与 `OFL-NotoSerifSC.txt` / `OFL-LXGWWenKai.txt`。霞鹜的 RFN 条款明确允许"仅为网页字体交付而做的子集/格式转换"保留保留字体名 ⇒ 我们切 woff2 自托管在允许范围内;但**不得**把它做成可安装桌面字体沿名发布。发布时这两份 txt 必须与 woff2 同目录或同等可达。SIL Open Font License 1.1 原文一并放进 `public/fonts/`(或与字体同目录),并在文档里保留版权声明。 +2. **禁止外部字体 CDN**(项目规则)⇒ 只能自托管;`@font-face` 写在 `src/app/globals.css`,`font-display: swap`,`unicode-range` 不必手工切(子集本身就是窄集)。 +3. **子集覆盖不了 CMS 后台新增中文**:站点有 CMS,967 个源码用字之外的字会回退到系统衬线。这正是"先只上 tight 档"的理由 —— 等真有中文长文再上 wide(1361 KB)。 + +**执行边界**:本目录是准备件。把字体放进 `public/fonts/` 与改 `globals.css` 都是仓库写入,按 AGENTS.md §5.1 需单独授权,目前**一件没动**(`git diff --name-only` 恒为 0 行)。 + +--- + +**执行件已就绪并三向验过**:`staging-p2/fontsync.sh`(由 `make-fontsync.py` 生成)。正例:3 个文件放进 `public/fonts/` 并逐字节对拍、`"Novalon Serif SC"` 插到 `--font-serif` 队首(原系统兜底全部保留)、追加 `@font-face`(可变 200–900、`font-display: swap`);落点实测在副本的 `globals.css:201` 与 `:1471`。负例:重复执行被拒(认块内标记);不给 `REPO_ROOT` 被拒。该暂存件已纳入 `check-probes` 的 S4b 齐全性检查(藏起来会报红)。 diff --git a/deliverables/logo-redesign-2026-10-13/fonts/LICENSES.md b/deliverables/logo-redesign-2026-10-13/fonts/LICENSES.md new file mode 100644 index 0000000..5a5a174 --- /dev/null +++ b/deliverables/logo-redesign-2026-10-13/fonts/LICENSES.md @@ -0,0 +1,14 @@ +# 字体授权文本(P2 自托管的分发要件) + +OFL 1.1 第 (2) 条要求"含保留字体名的原始版本不得改名分发",而实践中**授权文本必须随字体一起给**;现在 `fonts/` 里只有 woff2,缺这两份就是合规缺口。 + +| 文件 | 字族 | 字节 | sha256 前 16 | 取信来源 | +|---|---|---|---|---| +| `OFL-NotoSerifSC.txt` | 思源宋体 / Noto Serif SC | 4350 | `5e0da210fb04058a` | https://raw.githubusercontent.com/google/fonts/main/ofl/notoserifsc/OFL.txt | +| `OFL-LXGWWenKai.txt` | 霞鹜文楷 / LXGW WenKai TC | 5171 | `1a25e35da1031c6c` | https://raw.githubusercontent.com/lxgw/LxgwWenKai/main/OFL.txt | + +**两条要点** + +1. 两份都经内容核验:正文含 `SIL OPEN FONT LICENSE Version 1.1`(不是只看到文件名就当作对)。 +2. **霞鹜文楷的 RFN 条款对我们有利**:其原文允许"仅为网页字体交付而做的子集/格式转换版本"继续保留『霞鹜/LXGW』这些保留字体名,前提是不得作为可安装桌面字体发布。⇒ 我们正是切 woff2 自托管网页字体,**落在允许范围内**;若将来有人把它做成桌面字体安装包,就必须改名。 +3. 思源宋体(Noto Serif SC)在 google/fonts 仓库的授权文件实名是 `OFL.txt`(不是 `LICENSE`),第一次取 `LICENSE` 得到 404 —— 落库时按本表的路径取,别猜文件名。 diff --git a/deliverables/logo-redesign-2026-10-13/fonts/OFL-LXGWWenKai.txt b/deliverables/logo-redesign-2026-10-13/fonts/OFL-LXGWWenKai.txt new file mode 100644 index 0000000..bb1634c --- /dev/null +++ b/deliverables/logo-redesign-2026-10-13/fonts/OFL-LXGWWenKai.txt @@ -0,0 +1,94 @@ +Copyright 2021-2026 LXGW (https://github.com/lxgw/LxgwWenKai), with Reserved Font Name '霞鹜', '霞鶩', '落霞孤鹜', '落霞孤鶩' and 'LXGW'. [ADDITIONAL PERMISSION] The Reserved Font Names '霞鹜', '霞鶩', '落霞孤鹜', '落霞孤鶩' and 'LXGW' may continue to be used in Modified Versions recompiled from the Original Version, without modifications to the font source code; or in Modified Versions subsetted or converted to other formats (e.g., WOFF/WOFF2) solely for web font delivery, provided such Modified Versions are not made available as installable desktop fonts (e.g., on mainstream platforms like Google Fonts, or third-party non-commercial platforms recognized by the author @lxgw; other web font platforms please contact the author @lxgw for confirmation). +Copyright 2020 The Klee Project Authors (https://github.com/fontworks-fonts/Klee) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/deliverables/logo-redesign-2026-10-13/fonts/OFL-NotoSerifSC.txt b/deliverables/logo-redesign-2026-10-13/fonts/OFL-NotoSerifSC.txt new file mode 100644 index 0000000..94d1bf7 --- /dev/null +++ b/deliverables/logo-redesign-2026-10-13/fonts/OFL-NotoSerifSC.txt @@ -0,0 +1,94 @@ +Copyright 2012 Google Inc. All Rights Reserved. + +This Font Software is licensed under the SIL Open Font License, +Version 1.1. + +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font +creation efforts of academic and linguistic communities, and to +provide a free and open framework in which fonts may be shared and +improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply to +any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software +components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, +deleting, or substituting -- in part or in whole -- any of the +components of the Original Version, by changing formats or by porting +the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, +modify, redistribute, and sell modified and unmodified copies of the +Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in +Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the +corresponding Copyright Holder. This restriction only applies to the +primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created using +the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE.