diff options
| -rw-r--r-- | docs/src/general/changelog.md | 3 | ||||
| -rw-r--r-- | library/src/meta/bibliography.rs | 28 | ||||
| -rw-r--r-- | tests/typ/meta/bibliography.typ | 6 |
3 files changed, 19 insertions, 18 deletions
diff --git a/docs/src/general/changelog.md b/docs/src/general/changelog.md index d5d6a9da..4d8c4867 100644 --- a/docs/src/general/changelog.md +++ b/docs/src/general/changelog.md @@ -12,6 +12,9 @@ description: | - `typst fonts` to list all fonts - **Breaking:** Manual counters now start at zero. Read the "How to step" section [here]($func/counter) for more details +- **Breaking:** Renamed the `{"author-date"}` and `{"author-title"}` + [bibliography styles]($func/bibliography.style) to `{"chicago-author-date"}` + and `{"chicago-author-title"}` - Added support for clipping in [boxes]($func/box.clip) and [blocks]($func/block.clip) - Added [`polygon`]($func/polygon) function for drawing polygons diff --git a/library/src/meta/bibliography.rs b/library/src/meta/bibliography.rs index 8dac28db..635f1d8c 100644 --- a/library/src/meta/bibliography.rs +++ b/library/src/meta/bibliography.rs @@ -218,7 +218,7 @@ pub enum BibliographyStyle { Apa, /// The Chicago Author Date style. Based on the 17th edition of the Chicago /// Manual of Style, Chapter 15. - AuthorDate, + ChicagoAuthorDate, /// The style of the Institute of Electrical and Electronics Engineers. /// Based on the 2018 IEEE Reference Guide. Ieee, @@ -231,10 +231,10 @@ impl BibliographyStyle { /// The default citation style for this bibliography style. pub fn default_citation_style(self) -> CitationStyle { match self { - Self::Apa => CitationStyle::AuthorDate, - Self::AuthorDate => CitationStyle::AuthorDate, + Self::Apa => CitationStyle::ChicagoAuthorDate, + Self::ChicagoAuthorDate => CitationStyle::ChicagoAuthorDate, Self::Ieee => CitationStyle::Numerical, - Self::Mla => CitationStyle::AuthorDate, + Self::Mla => CitationStyle::ChicagoAuthorDate, } } } @@ -294,7 +294,7 @@ pub struct CiteElem { /// /// #bibliography( /// "works.bib", - /// style: "author-date", + /// style: "chicago-author-date", /// ) /// ``` #[default(true)] @@ -354,14 +354,14 @@ pub enum CitationStyle { /// A simple alphanumerical style. For example, the output could be Rass97 /// or MKG+21. Alphanumerical, + /// Citations that just consist of the entry keys. + Keys, /// The Chicago Author Date style. Based on the 17th edition of the Chicago /// Manual of Style, Chapter 15. - AuthorDate, - /// A Chicago-like author-title format. Results could look like this: + ChicagoAuthorDate, + /// The Chicago-like author-title format. Results could look like this: /// Prokopov, “It Is Fast or It Is Wrong”. - AuthorTitle, - /// Citations that just consist of the entry keys. - Keys, + ChicagoAuthorTitle, } impl CitationStyle { @@ -458,10 +458,12 @@ fn create( CitationStyle::Alphanumerical => { Box::new(style::Alphanumerical::new()) } - CitationStyle::AuthorDate => { + CitationStyle::ChicagoAuthorDate => { Box::new(style::ChicagoAuthorDate::new()) } - CitationStyle::AuthorTitle => Box::new(style::AuthorTitle::new()), + CitationStyle::ChicagoAuthorTitle => { + Box::new(style::AuthorTitle::new()) + } CitationStyle::Keys => Box::new(style::Keys::new()), }; } @@ -515,7 +517,7 @@ fn create( let bibliography_style: Box<dyn style::BibliographyStyle> = match style { BibliographyStyle::Apa => Box::new(style::Apa::new()), - BibliographyStyle::AuthorDate => Box::new(style::ChicagoAuthorDate::new()), + BibliographyStyle::ChicagoAuthorDate => Box::new(style::ChicagoAuthorDate::new()), BibliographyStyle::Ieee => Box::new(style::Ieee::new()), BibliographyStyle::Mla => Box::new(style::Mla::new()), }; diff --git a/tests/typ/meta/bibliography.typ b/tests/typ/meta/bibliography.typ index 82cd3a58..e25c5410 100644 --- a/tests/typ/meta/bibliography.typ +++ b/tests/typ/meta/bibliography.typ @@ -1,10 +1,6 @@ // Test citations and bibliographies. --- -// Error: 15-25 parsing failed at ../assets/files/bad.bib:5: wrong number of digits -#bibliography("/bad.bib") - ---- // Test ambiguous reference. = Introduction <arrgh> // Error: 1-7 label occurs in the document and its bibliography @@ -20,7 +16,7 @@ See also #cite("arrgh", "distress", [p. 22]), @arrgh[p. 4], and @distress[p. 5]. --- // Test unconventional order. #set page(width: 200pt) -#bibliography("/works.bib", title: [Works to be cited], style: "author-date") +#bibliography("/works.bib", title: [Works to be cited], style: "chicago-author-date") #line(length: 100%) #[#set cite(brackets: false) As described by @netwok], |