caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-08-13 22:57:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: use label for works instead

Browse Source
This commit is contained in:
xkevio 2025-03-02 19:52:58 +01:00
parent f336214711
commit 667945ef28
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/typst-library/src/model/bibliography.rs
View File

@ -233,9 +233,8 @@ impl Show for Packed<BibliographyElem> {
.at(span)?; .at(span)?;
for (key, prefix, reference) in references { for (key, prefix, reference) in references {
let label = Label::new(PicoStr::intern(key));
let indent = if works.hanging_indent { Some(INDENT.into()) } else { None }; let indent = if works.hanging_indent { Some(INDENT.into()) } else { None };
let entry = BibliographyEntry::new(label, reference.clone()) let entry = BibliographyEntry::new(*key, reference.clone())
.with_prefix(prefix.clone()) .with_prefix(prefix.clone())
.with_indent(indent) .with_indent(indent)
.pack() .pack()
@ -366,6 +365,7 @@ impl Show for Packed<BibliographyEntry> {
const COLUMN_GUTTER: Em = Em::new(0.65); const COLUMN_GUTTER: Em = Em::new(0.65);
let span = self.span(); let span = self.span();
// FIXME: calculate width of longest prefix somehow (+ gap) and use that instead.
if self.prefix(styles).is_some() { if self.prefix(styles).is_some() {
let prefix = self.prefix(styles).unwrap(); let prefix = self.prefix(styles).unwrap();
let body = self.body.clone(); let body = self.body.clone();
@ -621,7 +621,7 @@ pub(super) struct Works {
pub citations: HashMap<Location, SourceResult<Content>>, pub citations: HashMap<Location, SourceResult<Content>>,
/// Lists all references in the bibliography, with optional prefix, or /// Lists all references in the bibliography, with optional prefix, or
/// `None` if the citation style can't be used for bibliographies. /// `None` if the citation style can't be used for bibliographies.
pub references: Option<Vec<(EcoString, Option<Content>, Content)>>, pub references: Option<Vec<(Label, Option<Content>, Content)>>,
/// Whether the bibliography should have hanging indent. /// Whether the bibliography should have hanging indent.
pub hanging_indent: bool, pub hanging_indent: bool,
} }
@ -889,7 +889,7 @@ impl<'a> Generator<'a> {
fn display_references( fn display_references(
&self, &self,
rendered: &hayagriva::Rendered, rendered: &hayagriva::Rendered,
) -> StrResult<Option<Vec<(EcoString, Option<Content>, Content)>>> { ) -> StrResult<Option<Vec<(Label, Option<Content>, Content)>>> {
let Some(rendered) = &rendered.bibliography else { return Ok(None) }; let Some(rendered) = &rendered.bibliography else { return Ok(None) };
// Determine for each citation key where it first occurred, so that we // Determine for each citation key where it first occurred, so that we
@ -920,8 +920,8 @@ impl<'a> Generator<'a> {
// citations can link to them. // citations can link to them.
let backlink = location.variant(k + 1); let backlink = location.variant(k + 1);
// Store the label name for `bibliography.entry`. // Store and create the label for `bibliography.entry`.
let label = EcoString::from(item.key.clone()); let label = Label::new(PicoStr::intern(&item.key));
// Render the first field. // Render the first field.
let mut prefix = item let mut prefix = item