feat: splitting

This commit is contained in:
alexm committed 2026-09-26 01:15:12 -04:00
1 parent 220363d4d3
commit eabc98ad31
29 files changed
+4843 -234

No files matched your search

+5 -18
View File
@@ -30,7 +30,7 @@
use crate::assessment::{AssessmentFile, Form, Placement};
use crate::catalog::Catalog;
use crate::course::{CourseFile, Reference};
use crate::course::CourseFile;
use crate::error::Result;
use crate::item::{Choice, Citation, Item};
use crate::markup;
@@ -427,9 +427,9 @@ fn cite(course: &CourseFile, citation: &Citation) -> String {
let Some(reference) = course.references.get(key) else {
return citation.display();
};
let label = reference.label.as_deref().unwrap_or(key);
let label = reference.label_or(key);
let locator = citation.locator.as_deref().unwrap_or("");
match resolve_url(citation, reference) {
match citation.href(reference) {
Some(url) if !locator.is_empty() => format!("`{label}` [{locator}]({url})"),
Some(url) => format!("`{label}` [{}]({url})", reference.title),
None if !locator.is_empty() => format!("`{label}` {locator}"),
@@ -437,21 +437,6 @@ fn cite(course: &CourseFile, citation: &Citation) -> String {
}
}
/// The URL for a citation: its own `url`, else the reference `base_url` joined with
/// the citation `path`.
fn resolve_url(citation: &Citation, reference: &Reference) -> Option<String> {
if let Some(url) = &citation.url {
return Some(url.clone());
}
let path = citation.path.as_deref()?;
let base = reference.base_url.as_deref()?;
Some(match (base.ends_with('/'), path.starts_with('/')) {
(true, true) => format!("{base}{}", &path[1..]),
(false, false) => format!("{base}/{path}"),
_ => format!("{base}{path}"),
})
}
/// The `## Question N` heading, marking a bonus item.
fn heading(number: usize, placement: &Placement) -> String {
let bonus = if placement.bonus { " (bonus)" } else { "" };
@@ -593,6 +578,7 @@ items:
number: 1,
item: "l11::q-enthalpy-001".into(),
version: None,
stem_digest: None,
fingerprint: None,
points: Some(1.0),
bonus: false,
@@ -608,6 +594,7 @@ items:
number: 2,
item: "l11::q-enthalpy-op-001".into(),
version: None,
stem_digest: None,
fingerprint: None,
points: Some(2.0),
bonus: false,