feat(cph): implement nested outline manifest and batch/combined export

ADR-0029 — nested outline manifest, supersedes ADR-0008's flat [[parts]]:
- cph-model: recursive loader over manifest.toml containers / element.toml
  leaves; Lesson.parts (pure elements, DFS order) + Lesson.outline (elements
  interleaved with section headings at their DFS-open position); rejects
  ambiguous/incomplete folders and root-vs-container table misplacement
- cph-diag: new DiagCode::ManifestMalformed for carrier-document structure
  errors (discharges an existing TODO)
- cph-typst: augmented manifest now serializes the outline (element/section
  entries) instead of a flat parts array
- render/lib.typ: render-lesson renders section headings at their depth
- examples/TH-141 migrated to 5 nested section containers + 3 root segments,
  byte-identical element order; smoke-verified via cph check/build + pdftotext

ADR-0030 — batch & combined export, extends ADR-0009/0011:
- cph build with no --target batches every declared target (repeatable
  --target for an explicit subset); any target failure => non-zero exit,
  per-target ledger, independent per-target execution
- cph-model: bundle.toml loader (directory + [info]/[targets.*]/ordered
  lessons with per-lesson target overrides)
- cph-typst: augmented bundle manifest (path-prefixed member outlines),
  Engine::{compile_check_bundle,build_bundle_pdf}
- render/lib.typ: render-bundle assembles member lessons under per-lesson
  headings, depth-shifts their own section headings, resets example/lemma
  counters at each lesson boundary by default
- cph-cli: `cph bundle <path> --target <name>` subcommand, same batching
  contract as `cph build`
- new bundle fixtures/tests (cph-model unit + cph-typst through-template PDF
  compile), smoke-verified via a real 2-lesson merged PDF

Verification: cargo fmt/clippy/test clean across the workspace (68 tests);
real cph check/build/bundle runs against TH-141 and a bundle fixture, PDF
content inspected via pdftotext.
This commit is contained in:
2026-08-04 20:31:05 +08:00
committed by 洪佳荣
parent e0bd6120ec
commit 9927d38c18
165 changed files with 2638 additions and 691 deletions
+46 -32
View File
@@ -1,4 +1,4 @@
// DEFAULT STUDENT TEMPLATE (framework default; ADR-0011).
// DEFAULT STUDENT TEMPLATE (framework default; ADR-0011, outline shape ADR-0029).
//
// This is a *real, editable* file that lives in an engineering file at
// `exports/student.typ`. The framework compiles it AS THE MAIN FILE with the
@@ -15,15 +15,16 @@
// its own virtual root — an include inside cph-render would resolve against the
// PACKAGE, not the engineering root. A `/<part.path>/<field>.typ` written HERE
// (this template lives under `--root`) resolves against `--root`. So the
// template loads content and hands cph-render an already-assembled `parts` array.
// template loads content and hands cph-render an already-assembled `outline`
// array (elements interleaved with section headings, ADR-0029).
//
// OPEN CONTRACT POINT — optional-content presence. typst has no "does this file
// exist" primitive (a missing `include` is a hard compile error). So the
// template CANNOT probe disk the way the old Rust driver did for lemma `proof`.
// It relies on the manifest declaring which optional content fields are present,
// via a per-part `fields` array listing the content fields that exist on disk
// via a per-element `fields` array listing the content fields that exist on disk
// (the engine knows this — it walks the part dir). Required fields are loaded
// unconditionally; optional fields load only if listed in `fields`. If a part
// unconditionally; optional fields load only if listed in `fields`. If an element
// omits `fields`, optional content is skipped (conservative). The exact shape of
// this declaration is for the manifest/Rust contract to pin.
@@ -35,38 +36,51 @@
// Read the injected manifest (a path string relative to typst --root).
#let manifest = toml(sys.inputs.manifest)
#let info = manifest.at("info", default: (:))
#let raw-parts = manifest.at("parts", default: ())
#let raw-outline = manifest.at("outline", default: ())
// Assemble each part: include its content fields (computed absolute paths,
// resolved against --root) and read scalar fields from <path>/element.toml.
// `part-fields` (from cph-render) is the single source of truth for kind->fields.
#let parts = raw-parts.map(raw => {
let kind = raw.at("kind", default: none)
let path = raw.at("path", default: none)
let spec = part-fields.at(kind, default: (content: (), optional-content: (), scalars: ()))
// Which optional content fields are present on disk (manifest-declared).
let present = raw.at("fields", default: ())
let part = (kind: kind)
// Assemble each outline entry:
// - an "element" entry: include its content fields (computed absolute paths,
// resolved against --root) and read scalar fields from <path>/element.toml.
// `part-fields` (from cph-render) is the single source of truth for
// kind->fields.
// - a "section" entry (ADR-0029): pass its title/depth straight through — no
// content to load, it is a heading.
#let outline = raw-outline.map(raw => {
if raw.at("type", default: "element") == "section" {
(
entry-type: "section",
kind: raw.at("kind", default: none),
title: raw.at("title", default: ""),
depth: raw.at("depth", default: 1),
)
} else {
let kind = raw.at("kind", default: none)
let path = raw.at("path", default: none)
let spec = part-fields.at(kind, default: (content: (), optional-content: (), scalars: ()))
// Which optional content fields are present on disk (manifest-declared).
let present = raw.at("fields", default: ())
let entry = (entry-type: "element", kind: kind)
// Required content fields: <path>/<field>.typ (absolute, root-relative).
for field in spec.content {
part.insert(field, include "/" + path + "/" + field + ".typ")
}
// Optional content fields: only when the manifest says the file exists.
for field in spec.optional-content {
if field in present {
part.insert(field, include "/" + path + "/" + field + ".typ")
// Required content fields: <path>/<field>.typ (absolute, root-relative).
for field in spec.content {
entry.insert(field, include "/" + path + "/" + field + ".typ")
}
}
// Scalar fields come from <path>/element.toml.
if spec.scalars.len() > 0 {
let element = toml("/" + path + "/element.toml")
for field in spec.scalars {
let v = element.at(field, default: none)
if v != none and v != "" { part.insert(field, v) }
// Optional content fields: only when the manifest says the file exists.
for field in spec.optional-content {
if field in present {
entry.insert(field, include "/" + path + "/" + field + ".typ")
}
}
// Scalar fields come from <path>/element.toml.
if spec.scalars.len() > 0 {
let element = toml("/" + path + "/element.toml")
for field in spec.scalars {
let v = element.at(field, default: none)
if v != none and v != "" { entry.insert(field, v) }
}
}
entry
}
part
})
// Presentation: per-level heading numbering. Default (一、 / 1.1 / 1.1.1) comes
@@ -74,6 +88,6 @@
#render-lesson(
info: info,
target: target,
parts: parts,
outline: outline,
heading-numbering: default-heading-numbering,
)
+38 -29
View File
@@ -1,4 +1,4 @@
// DEFAULT TEACHER TEMPLATE (framework default; ADR-0011).
// DEFAULT TEACHER TEMPLATE (framework default; ADR-0011, outline shape ADR-0029).
//
// Lives in an engineering file at `exports/teacher.typ`. Compiled AS MAIN with
// the manifest injected:
@@ -18,38 +18,47 @@
// Read the injected manifest (a path string relative to typst --root).
#let manifest = toml(sys.inputs.manifest)
#let info = manifest.at("info", default: (:))
#let raw-parts = manifest.at("parts", default: ())
#let raw-outline = manifest.at("outline", default: ())
// Assemble each part: include its content fields (computed absolute paths,
// resolved against --root) and read scalar fields from <path>/element.toml.
// `part-fields` (from cph-render) is the single source of truth for kind->fields.
#let parts = raw-parts.map(raw => {
let kind = raw.at("kind", default: none)
let path = raw.at("path", default: none)
let spec = part-fields.at(kind, default: (content: (), optional-content: (), scalars: ()))
// Which optional content fields are present on disk (manifest-declared).
let present = raw.at("fields", default: ())
let part = (kind: kind)
// Assemble each outline entry: an "element" entry includes its content fields
// and reads scalars from element.toml; a "section" entry (ADR-0029) passes
// title/depth straight through as a heading, no content to load.
#let outline = raw-outline.map(raw => {
if raw.at("type", default: "element") == "section" {
(
entry-type: "section",
kind: raw.at("kind", default: none),
title: raw.at("title", default: ""),
depth: raw.at("depth", default: 1),
)
} else {
let kind = raw.at("kind", default: none)
let path = raw.at("path", default: none)
let spec = part-fields.at(kind, default: (content: (), optional-content: (), scalars: ()))
// Which optional content fields are present on disk (manifest-declared).
let present = raw.at("fields", default: ())
let entry = (entry-type: "element", kind: kind)
// Required content fields: <path>/<field>.typ (absolute, root-relative).
for field in spec.content {
part.insert(field, include "/" + path + "/" + field + ".typ")
}
// Optional content fields: only when the manifest says the file exists.
for field in spec.optional-content {
if field in present {
part.insert(field, include "/" + path + "/" + field + ".typ")
// Required content fields: <path>/<field>.typ (absolute, root-relative).
for field in spec.content {
entry.insert(field, include "/" + path + "/" + field + ".typ")
}
}
// Scalar fields come from <path>/element.toml.
if spec.scalars.len() > 0 {
let element = toml("/" + path + "/element.toml")
for field in spec.scalars {
let v = element.at(field, default: none)
if v != none and v != "" { part.insert(field, v) }
// Optional content fields: only when the manifest says the file exists.
for field in spec.optional-content {
if field in present {
entry.insert(field, include "/" + path + "/" + field + ".typ")
}
}
// Scalar fields come from <path>/element.toml.
if spec.scalars.len() > 0 {
let element = toml("/" + path + "/element.toml")
for field in spec.scalars {
let v = element.at(field, default: none)
if v != none and v != "" { entry.insert(field, v) }
}
}
entry
}
part
})
// Presentation: per-level heading numbering. Default (一、 / 1.1 / 1.1.1) comes
@@ -57,6 +66,6 @@
#render-lesson(
info: info,
target: target,
parts: parts,
outline: outline,
heading-numbering: default-heading-numbering,
)
+18 -142
View File
@@ -6,161 +6,37 @@ name = "TH-141_表面张力的严肃理论"
title = "TH-141:表面张力的严肃理论"
author = "范式教育教研组"
[[parts]]
[[children]]
kind = "segment"
path = "segments/开场对照导言"
[[parts]]
[[children]]
kind = "segment"
path = "segments/胡克唯象模型回顾"
[[parts]]
[[children]]
kind = "segment"
path = "segments/液面拉伸的本质"
[[parts]]
kind = "segment"
path = "segments/液气界面导言"
[[children]]
kind = "section"
path = "液气界面"
[[parts]]
kind = "segment"
path = "segments/微观建模的共同骨架"
[[children]]
kind = "section"
path = "固气界面"
[[parts]]
kind = "lemma"
path = "lemmas/量纲分析估计"
[[children]]
kind = "section"
path = "固液界面"
[[parts]]
kind = "segment"
path = "segments/缺键模型导言"
[[children]]
kind = "section"
path = "σTp态函数建模"
[[parts]]
kind = "lemma"
path = "lemmas/缺键模型一般公式"
[[parts]]
kind = "example"
path = "examples/41届复赛三-2-缺键模型"
[[parts]]
kind = "lemma"
path = "lemmas/Stefan极简估算"
[[parts]]
kind = "lemma"
path = "lemmas/立方格子下zeta具体值"
[[parts]]
kind = "segment"
path = "segments/LJ积分导言"
[[parts]]
kind = "lemma"
path = "lemmas/LJ对势积分标度"
[[parts]]
kind = "segment"
path = "segments/固气界面导言"
[[parts]]
kind = "segment"
path = "segments/表面能γ与表面应力f"
[[parts]]
kind = "lemma"
path = "lemmas/拉伸固体的总应力"
[[parts]]
kind = "lemma"
path = "lemmas/缺键模型迁移到固气"
[[parts]]
kind = "lemma"
path = "lemmas/固体表面能的晶面各向异性"
[[parts]]
kind = "segment"
path = "segments/不同物质γ量级对比"
[[parts]]
kind = "segment"
path = "segments/固液界面导言"
[[parts]]
kind = "segment"
path = "segments/固液界面能的物理图像"
[[parts]]
kind = "lemma"
path = "lemmas/Dupré关系"
[[parts]]
kind = "lemma"
path = "lemmas/Girifalco-Good公式"
[[parts]]
kind = "segment"
path = "segments/Fowkes极性修正"
[[parts]]
kind = "segment"
path = "segments/三相接触导言"
[[parts]]
kind = "lemma"
path = "lemmas/Young方程"
[[parts]]
kind = "lemma"
path = "lemmas/GGZ浸润判据"
[[parts]]
kind = "segment"
path = "segments/浸润全谱与高低能表面"
[[parts]]
kind = "segment"
path = "segments/σT建模导言"
[[parts]]
kind = "segment"
path = "segments/微观派Lm下降"
[[parts]]
kind = "lemma"
path = "lemmas/Eötvös规则"
[[parts]]
kind = "lemma"
path = "lemmas/Guggenheim-Katayama改良"
[[parts]]
kind = "lemma"
path = "lemmas/表面熵热力学关系"
[[parts]]
kind = "segment"
path = "segments/σTp态函数导言"
[[parts]]
kind = "segment"
path = "segments/σ作为态函数的图像"
[[parts]]
kind = "example"
path = "examples/41届复赛三-1-混注石油"
[[parts]]
kind = "segment"
path = "segments/收束导言"
[[parts]]
kind = "segment"
path = "segments/各模型对水的预测对照"
[[parts]]
kind = "segment"
path = "segments/算不准背后的真实物理"
[[children]]
kind = "section"
path = "收束"
# Export targets (ADR-0009/0011): each target is a build producing a typed
# artifact, run as an ordered list of typed steps. A `typst-compile` step names a
@@ -0,0 +1,34 @@
[group]
title = "σTp 态函数建模"
[[children]]
kind = "segment"
path = "segments/σT建模导言"
[[children]]
kind = "segment"
path = "segments/微观派Lm下降"
[[children]]
kind = "lemma"
path = "lemmas/Eötvös规则"
[[children]]
kind = "lemma"
path = "lemmas/Guggenheim-Katayama改良"
[[children]]
kind = "lemma"
path = "lemmas/表面熵热力学关系"
[[children]]
kind = "segment"
path = "segments/σTp态函数导言"
[[children]]
kind = "segment"
path = "segments/σ作为态函数的图像"
[[children]]
kind = "example"
path = "examples/41届复赛三-1-混注石油"
@@ -0,0 +1,26 @@
[group]
title = "固气界面"
[[children]]
kind = "segment"
path = "segments/固气界面导言"
[[children]]
kind = "segment"
path = "segments/表面能γ与表面应力f"
[[children]]
kind = "lemma"
path = "lemmas/拉伸固体的总应力"
[[children]]
kind = "lemma"
path = "lemmas/缺键模型迁移到固气"
[[children]]
kind = "lemma"
path = "lemmas/固体表面能的晶面各向异性"
[[children]]
kind = "segment"
path = "segments/不同物质γ量级对比"
@@ -0,0 +1,38 @@
[group]
title = "固液界面"
[[children]]
kind = "segment"
path = "segments/固液界面导言"
[[children]]
kind = "segment"
path = "segments/固液界面能的物理图像"
[[children]]
kind = "lemma"
path = "lemmas/Dupré关系"
[[children]]
kind = "lemma"
path = "lemmas/Girifalco-Good公式"
[[children]]
kind = "segment"
path = "segments/Fowkes极性修正"
[[children]]
kind = "segment"
path = "segments/三相接触导言"
[[children]]
kind = "lemma"
path = "lemmas/Young方程"
[[children]]
kind = "lemma"
path = "lemmas/GGZ浸润判据"
[[children]]
kind = "segment"
path = "segments/浸润全谱与高低能表面"
+14
View File
@@ -0,0 +1,14 @@
[group]
title = "收束"
[[children]]
kind = "segment"
path = "segments/收束导言"
[[children]]
kind = "segment"
path = "segments/各模型对水的预测对照"
[[children]]
kind = "segment"
path = "segments/算不准背后的真实物理"
@@ -0,0 +1,42 @@
[group]
title = "液气界面"
[[children]]
kind = "segment"
path = "segments/液气界面导言"
[[children]]
kind = "segment"
path = "segments/微观建模的共同骨架"
[[children]]
kind = "lemma"
path = "lemmas/量纲分析估计"
[[children]]
kind = "segment"
path = "segments/缺键模型导言"
[[children]]
kind = "lemma"
path = "lemmas/缺键模型一般公式"
[[children]]
kind = "example"
path = "examples/41届复赛三-2-缺键模型"
[[children]]
kind = "lemma"
path = "lemmas/Stefan极简估算"
[[children]]
kind = "lemma"
path = "lemmas/立方格子下zeta具体值"
[[children]]
kind = "segment"
path = "segments/LJ积分导言"
[[children]]
kind = "lemma"
path = "lemmas/LJ对势积分标度"