chore: UK -> US
Pipeline / check (pull_request) Failing after 12m31s
Pipeline / docs (pull_request) Skipped
Pipeline / nightly (pull_request) Skipped
Pipeline / release (pull_request) Skipped

This commit is contained in:
alexm committed 2026-11-16 13:10:36 -05:00
1 parent 67528817f5
commit 18c48ac3e3
21 files changed
+51 -51

No files matched your search

+10 -10
View File
@@ -26,7 +26,7 @@
//! Since 2.1 a lecture is more than its objectives and readings, and
//! [`page_markdown`] renders all of it, in the order the specification gives:
//! the lecture's description; each objective with its description and its
//! targets (by ceiling, each labelled with the course's own level name and
//! targets (by ceiling, each labeled with the course's own level name and
//! followed by its explanation); the terms new in this lecture, then the ones
//! from earlier lectures; the equations its targets turn on; the numbers to
//! know; the common mistakes; the readings, with minutes; and the materials.
@@ -44,7 +44,7 @@ use crate::course::{CourseFile, Reading, ReadingRole, Reference};
use crate::error::{Error, Result};
use crate::taxonomy::Level;
/// Which flavour of Markdown to emit.
/// Which flavor of Markdown to emit.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
pub enum Style {
/// Pandoc definition lists with `<br>` before the objective line, which is
@@ -288,7 +288,7 @@ fn by_level<'a>(course: &CourseFile, ids: &[&'a str]) -> Vec<(Option<Level>, Vec
///
/// * `course` - the loaded course file.
/// * `lecture` - the lecture id.
/// * `style` - which flavour to emit.
/// * `style` - which flavor to emit.
///
/// # Returns
///
@@ -342,7 +342,7 @@ pub fn objectives_markdown(course: &CourseFile, lecture: &str, style: Style) ->
/// # Arguments
///
/// * `text` - the objective or target text.
/// * `style` - which flavour to emit.
/// * `style` - which flavor to emit.
///
/// # Returns
///
@@ -360,7 +360,7 @@ fn bullet(text: &str, style: Style) -> String {
///
/// * `course` - the loaded course file.
/// * `lecture` - the lecture id, such as `L1.1`.
/// * `style` - which flavour to emit.
/// * `style` - which flavor to emit.
///
/// # Returns
///
@@ -401,7 +401,7 @@ pub fn readings_markdown(course: &CourseFile, lecture: &str, style: Style) -> Re
///
/// * `course` - the course, for resolving references and placeholders.
/// * `reading` - the reading.
/// * `style` - which flavour to emit.
/// * `style` - which flavor to emit.
/// * `number` - the position of an objective on this page, if it has one.
///
/// # Returns
@@ -481,7 +481,7 @@ fn entry(
/// * `reading` - the reading.
/// * `key` - its citation key.
/// * `reference` - the cited work.
/// * `style` - which flavour to emit.
/// * `style` - which flavor to emit.
///
/// # Returns
///
@@ -509,7 +509,7 @@ pub const DEFAULT_GLOSSARY_HREF: &str = "glossary.html";
/// How to render a lecture page or the glossary page.
#[derive(Debug, Clone)]
pub struct PageOptions {
/// Which flavour of Markdown to emit. Quarto gives each glossary entry an
/// Which flavor of Markdown to emit. Quarto gives each glossary entry an
/// anchor and links to it on the same page when it is there; Plain links
/// every entry to the glossary page.
pub style: Style,
@@ -675,7 +675,7 @@ impl Needs {
///
/// * `course` - the loaded course file.
/// * `lecture` - the lecture id.
/// * `options` - the Markdown flavour and the glossary page's address.
/// * `options` - the Markdown flavor and the glossary page's address.
///
/// # Returns
///
@@ -1053,7 +1053,7 @@ fn materials_section(page: &Page<'_>, lecture: &crate::course::Lecture) -> Strin
/// # Arguments
///
/// * `course` - the loaded course file.
/// * `options` - the Markdown flavour. Links between entries stay on this
/// * `options` - the Markdown flavor. Links between entries stay on this
/// page.
///
/// # Returns
+1 -1
View File
@@ -337,7 +337,7 @@ pub fn student(
));
}
// What meeting the target looks like, which is what to
// practise towards.
// practice toward.
if let Some(explanation) = course
.learning_targets
.get(target)
+2 -2
View File
@@ -277,7 +277,7 @@ pub enum StimulusMode {
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(deny_unknown_fields)]
pub struct Fields {
/// The item's global id, `bank::item`. Useful printed in small grey type on a
/// The item's global id, `bank::item`. Useful printed in small gray type on a
/// review copy; never wanted on a student form.
#[serde(default = "yes")]
pub uid: bool,
@@ -438,7 +438,7 @@ pub struct RenderConfig {
/// Anything else you want the template to see, carried through untouched.
///
/// This is the escape hatch that keeps the crate out of your layout
/// decisions. Tier colours, a `show-solutions` flag, a font stack, a watermark
/// decisions. Tier colors, a `show-solutions` flag, a font stack, a watermark
/// string: put it here and read it from `extra` in the template.
#[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
pub extra: BTreeMap<String, serde_yaml_ng::Value>,
+2 -2
View File
@@ -6,7 +6,7 @@
//!
//! The same arrangement the exam export uses: this module decides what the
//! template is told, the template decides what it looks like, and the two meet at
//! a marker comment. Nothing here knows about page size or colour.
//! a marker comment. Nothing here knows about page size or color.
//!
//! Two slots are filled, both already defined for the exam path:
//!
@@ -149,7 +149,7 @@ impl Meta {
out.insert("generator", generator);
out.insert("policy", policy);
// `students-tested` is the honest name: it is how many people sat this
// assessment, which is not the enrolment. `class-size` stays as an alias
// assessment, which is not the enrollment. `class-size` stays as an alias
// so a template forked before this change keeps working.
out.insert("students-tested", Value::Int(self.n_students as i64));
out.insert("class-size", Value::Int(self.n_students as i64));
+4 -4
View File
@@ -911,7 +911,7 @@
#explain[
Where the class sits on each kind of thinking. A drop from one level to the
next is expected; a cliff is worth reading as a gap in what was practised
next is expected; a cliff is worth reading as a gap in what was practiced
rather than in what was taught.
]
@@ -1052,7 +1052,7 @@
#explain[
One row per question, in the order they were numbered. Option letters are the
bank's, not any one form's. See the guide above for what p, r, and D mean; the
r column is colour-coded against the conventional cut points.
r column is color-coded against the conventional cut points.
#{
let dropped = cb-data.at("dropped-questions", default: ())
if dropped.len() > 0 [
@@ -1146,7 +1146,7 @@
// healthy item looks like on this exam, and the place to check a query about a
// question nothing was wrong with. The flagged ones are already called out by
// name in the triage lists above, so nothing is lost by putting them back among
// their neighbours here.
// their neighbors here.
// Dropped items come from their own list, since they carry no statistics and
// belong in none of the tables above. They belong here: the option spread is
// the evidence that justified dropping them, and re-running the report after a
@@ -1341,7 +1341,7 @@
None of these #n #plural(n, "expectation", "expectations") rests on prior
data, so they are predictions rather than calibrations. A prediction that
misses is a fact about the prediction: it does not flag the item, and it is
summarised here instead of appearing #n times in the tables above. Once
summarized here instead of appearing #n times in the tables above. Once
`coursebank calibrate` has written statistics back into the bank, a
subsequent miss means the cohort or the teaching moved, and it will be
flagged.
@@ -281,7 +281,7 @@
#let prose-pad = 1.5cm
// The same right edge for prose that already sits in a gutter, so a note body
// lines up with the explanation above it. One centimetre is the 2.8em of number
// lines up with the explanation above it. One centimeter is the 2.8em of number
// column plus gutter at the default body size.
#let prose-pad-inset = prose-pad - 1cm
@@ -973,7 +973,7 @@
let parts = ()
// Both tiers. The target is what this question actually asked, which is the
// thing to practise; the objective is the row it counted toward in the table
// thing to practice; the objective is the row it counted toward in the table
// above, which is how a student tells whether one slip cost them a claim. The
// objective is absent when the two would be the same sentence.
let measured = q.at("measured", default: ())
@@ -988,8 +988,8 @@
let target = [
#text(weight: "bold")[This question asked you to:] #markup(m.target)
]
// What meeting the target looks like: the account to practise
// towards, from the target's own explanation.
// What meeting the target looks like: the account to practice
// toward, from the target's own explanation.
let explanation = m.at("explanation", default: none)
let lines = (target,)
if explanation != none {