Merge branch 'main' into version-bump

Cargo.toml

@@ -17,7 +17,7 @@ archive = ["ciborium"]
 csl-json = ["citationberg/json"]
 
 [dependencies]
-citationberg = { git = "https://github.com/typst/citationberg.git", rev = "e3fd3f08e0e16983b7c3514b791b64c704dc2524" }
+citationberg = "0.4.0"
 indexmap = { version = "2.0.2", features = ["serde"] }
 numerals = "0.1.4"
 paste = "1.0.14"
@@ -28,13 +28,13 @@ unic-langid = { version = "0.9.0", features = ["serde"] }
 unicode-segmentation = "1.6.0"
 unscanny = "0.1.0"
 url = { version = "2.4", features = ["serde"] }
-biblatex = { git = "https://github.com/typst/biblatex.git", rev = "06d0c2b10a749fd3b2c799b32077382b796a5609", optional = true }
+biblatex = { version = "0.10.0", optional = true }
 ciborium = { version = "0.2.1", optional = true }
 clap = { version = "4", optional = true, features = ["cargo"] }
 strum = { version = "0.26", features = ["derive"], optional = true }
 
 [dev-dependencies]
-heck = "0.4"
+heck = "0.5"
 serde_json = "1"
 
 [[bin]]

docs/file-format.md

@@ -117,8 +117,9 @@ Parents can also appear as standalone items and can have parents themselves. Thi
 plaque:
     type: Misc
     title: Informational plaque about Jacoby's 1967 photos
-    publisher: Stiftung Reinbeckhallen
-    location: Berlin, Germany
+    publisher:
+	name: Stiftung Reinbeckhallen
+    	location: Berlin, Germany
     date: 2020
     parent:
         type: Artwork
@@ -231,16 +232,16 @@ This section lists all possible fields and data types for them.
 
 |                  |                                                           |
 |------------------|-----------------------------------------------------------|
-| **Data type:**   | formattable string                                        |
+| **Data type:**   | publisher                                                 |
 | **Description:** | publisher of the item                                     |
-| **Example:**     | `publisher: Penguin Books`                                |
+| **Example:**     | `publisher: Penguin Books` or `publisher:<br>    name: Penguin Books<br>    location: London` |
 
 #### `location`
 
 |                  |                                                           |
 |------------------|-----------------------------------------------------------|
 | **Data type:**   | formattable string                                        |
-| **Description:** | location at which the item was published or created       |
+| **Description:** | location at which an entry is physically located or took place. For the location where an item was published, see `publisher`. |
 | **Example:**     | `location: Lahore, Pakistan`                              |
 
 #### `organization`

src/csl/taxonomy.rs

@@ -3,7 +3,8 @@ use std::cmp;
 use std::str::FromStr;
 
 use crate::types::{
-    ChunkedString, Date, EntryType, MaybeTyped, Numeric, Person, PersonRole, StringChunk,
+    ChunkedString, Date, EntryType, MaybeTyped, Numeric, Person, PersonRole, Publisher,
+    StringChunk,
 };
 use crate::{Entry, PageRanges};
 use citationberg::taxonomy::{
@@ -309,11 +310,12 @@ impl EntryLike for Entry {
             StandardVariable::OriginalPublisher => entry
                 .get_original()
                 .and_then(|e| e.publisher())
-                .map(|f| f.select(form))
+                .and_then(Publisher::name)
+                .map(|n| n.select(form))
                 .map(Cow::Borrowed),
             StandardVariable::OriginalPublisherPlace => entry
                 .get_original()
-                .and_then(|e| e.publisher().and_then(|_| e.location()))
+                .and_then(|e| e.publisher().and_then(|p| p.location()))
                 .map(|f| f.select(form))
                 .map(Cow::Borrowed),
             StandardVariable::OriginalTitle => entry
@@ -330,11 +332,12 @@ impl EntryLike for Entry {
             }
             StandardVariable::Publisher => entry
                 .map(|e| e.publisher())
-                .map(|f| f.select(form))
+                .and_then(Publisher::name)
+                .map(|n| n.select(form))
                 .map(Cow::Borrowed),
             StandardVariable::PublisherPlace => entry
-                .map(|e| if e.publisher().is_some() { Some(e) } else { None })
-                .and_then(|e| e.location())
+                .map(|e| e.publisher())
+                .and_then(|p| p.location())
                 .map(|f| f.select(form))
                 .map(Cow::Borrowed),
             StandardVariable::References => None,

src/interop.rs

@@ -446,16 +446,18 @@ impl TryFrom<&tex::Entry> for Entry {
             item.set_url(QualifiedUrl { value: url, visit_date: date });
         }
 
-        if let Some(location) = map_res(entry.location())?.map(|d| d.into()) {
+        if let Some(publisher_name) =
+            map_res(entry.publisher())?.map(|pubs| comma_list(&pubs))
+        {
+            let location = map_res(entry.location())?.map(|d| d.into());
+            let publisher = Publisher::new(Some(publisher_name), location);
             if let Some(parent) = book(&mut item, parent) {
-                parent.set_location(location);
+                parent.set_publisher(publisher);
             } else {
-                item.set_location(location);
+                item.set_publisher(publisher);
             }
-        }
-
-        if let Some(publisher) = map_res(entry.publisher())?.map(|pubs| comma_list(&pubs))
-        {
+        } else if let Some(location) = map_res(entry.location())?.map(|d| d.into()) {
+            let publisher = Publisher::new(None, Some(location));
             if let Some(parent) = book(&mut item, parent) {
                 parent.set_publisher(publisher);
             } else {

src/lib.rs

@@ -505,9 +505,9 @@ entry! {
     #[serde(serialize_with = "serialize_one_or_many_opt")]
     #[serde(deserialize_with = "deserialize_one_or_many_opt")]
     "affiliated" => affiliated: Vec<PersonsWithRoles> | [PersonsWithRoles],
-    /// Publisher of the item.
-    "publisher" => publisher: FormatString,
-    /// Physical location at which the item was published or created.
+    /// Publisher of the item, which may have a name and a location.
+    "publisher" => publisher: Publisher,
+    /// Physical location at which an entry is physically located or took place.
     "location" => location: FormatString,
     /// Organization at/for which the item was created.
     "organization" => organization: FormatString,

src/types/mod.rs

@@ -411,6 +411,59 @@ impl Display for QualifiedUrl {
     }
 }
 
+derive_or_from_str! {
+    /// A publisher, possibly with a location.
+    #[derive(Clone, Debug, PartialEq, Eq, Hash)]
+    pub struct Publisher where "FormatString string or dictionary with \"name\" and \"location\"" {
+        /// Publisher of the item.
+        name: Option<FormatString>,
+        /// Physical location at which the item was published or created.
+        location: Option<FormatString>,
+    }
+}
+
+impl Serialize for Publisher {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        if let Some(location) = &self.location {
+            let mut map = serializer.serialize_map(Some(2))?;
+            map.serialize_entry("name", &self.name)?;
+            map.serialize_entry("location", location)?;
+            map.end()
+        } else {
+            self.name.serialize(serializer)
+        }
+    }
+}
+
+impl Publisher {
+    /// Create a new publisher.
+    pub fn new(name: Option<FormatString>, location: Option<FormatString>) -> Self {
+        Self { name, location }
+    }
+
+    /// Publisher of the item.
+    pub fn name(&self) -> Option<&FormatString> {
+        self.name.as_ref()
+    }
+
+    /// Physical location at which the item was published or created.
+    pub fn location(&self) -> Option<&FormatString> {
+        self.location.as_ref()
+    }
+}
+
+impl FromStr for Publisher {
+    type Err = ChunkedStrParseError;
+
+    /// Creates a new publisher with `s` as its name and no location.
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(Publisher::new(Some(FormatString::from_str(s)?), None))
+    }
+}
+
 /// A set of serial numbers like DOIs, ISBNs, or ISSNs.
 /// Keys should be lowercase.
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Hash)]