linked-rolls 0.34.0 → 0.36.0

package/lib/RollCopy.d.ts

@@ -34,6 +34,11 @@ export interface GeneralRollCondition extends ConditionState<'general'> {
  * to a roll copy, annotatable with a belief about its certainty.
  */
 export type RollConditionAssignment = ObjectAssumption<GeneralRollCondition | PaperStretch>;
+/**
+ * The keeper a copy is held by, as an object assumption, so that the
+ * statement can carry the belief it rests on and the reasons for it.
+ */
+export type KeeperAssignment = ObjectAssumption<Agent>;
 export declare const rollConditions: readonly ['general', 'paper-stretch'];
 /**
  * A shift correction applied to a roll copy to align it
@@ -283,10 +288,13 @@ export interface RollCopy extends WithType<'RollCopy'>, WithId {
     siglum?: string;
     /**
      * The institution or person holding this copy. Left out where it is
-     * not known, as for a copy known only from a recording.
+     * not known, as for a copy known only from a recording. An object
+     * assumption, so that a keeper read off a file header or adopted
+     * from a letter can say where it comes from. Who held the copy
+     * before is not stated here: P50 names the current keeper.
      * @see crm:P50 has current keeper
      */
-    keeper?: Agent;
+    keeper?: KeeperAssignment;
     /**
      * The physical features found on this copy, with shift
      * and stretch already applied when `ops` says so.

package/lib/notes.d.ts

@@ -4,6 +4,7 @@ export type NotePart = {
 } | {
     type: 'reference';
     id: string;
+    label?: string;
 };
 /** The note in the pieces it is shown in: stretches of text and what they refer to. */
 export declare const partsOfNote: (note: string) => NotePart[];
@@ -11,7 +12,8 @@ export declare const partsOfNote: (note: string) => NotePart[];
 export declare const referencesInNote: (note: string) => string[];
 /**
  * The note as it reads, with every reference resolved to the name the
- * edition gives that entity. A reference nothing answers to keeps its id,
- * so that the gap is visible rather than silent.
+ * edition gives that entity, or to the words the note puts in its place.
+ * A reference nothing answers to keeps its id, so that the gap is visible
+ * rather than silent.
  */
 export declare const resolveNote: (note: string, nameOf: (id: string) => string | undefined) => string;

package/lib/notes.js

@@ -1,10 +1,15 @@
 /**
- * A note refers to a version or a copy instead of naming it, so that a
- * label the stemma decides is never written into the prose. A reference
- * reads `{{<id>}}`, where the id is the entity's, and is resolved when
- * the note is shown.
+ * A note refers to an entity instead of naming it, so that a label the
+ * stemma decides is never written into the prose. A reference reads
+ * `{{<id>}}`, where the id is the entity's, and is resolved when the note
+ * is shown.
+ *
+ * An entity the edition gives no name to, a perforation or an edit, needs
+ * the note's own words to stand in the sentence: `{{<id>|die Stanzung bei
+ * 7364,7 mm}}`. The name wins where the edition has one, so a siglum
+ * still follows the stemma and a written-out label cannot freeze it.
  */
-const reference = /\{\{\s*([^{}\s]+)\s*\}\}/g;
+const reference = /\{\{\s*([^{}|\s]+)\s*(?:\|([^{}]*))?\}\}/g;
 /** The note in the pieces it is shown in: stretches of text and what they refer to. */
 export const partsOfNote = (note) => {
     const parts = [];
@@ -13,7 +18,8 @@ export const partsOfNote = (note) => {
         const at = match.index ?? 0;
         if (at > read)
             parts.push({ type: 'text', text: note.slice(read, at) });
-        parts.push({ type: 'reference', id: match[1] });
+        const label = match[2]?.trim();
+        parts.push({ type: 'reference', id: match[1], ...(label && { label }) });
         read = at + match[0].length;
     }
     if (read < note.length)
@@ -24,9 +30,10 @@ export const partsOfNote = (note) => {
 export const referencesInNote = (note) => partsOfNote(note).flatMap(part => part.type === 'reference' ? [part.id] : []);
 /**
  * The note as it reads, with every reference resolved to the name the
- * edition gives that entity. A reference nothing answers to keeps its id,
- * so that the gap is visible rather than silent.
+ * edition gives that entity, or to the words the note puts in its place.
+ * A reference nothing answers to keeps its id, so that the gap is visible
+ * rather than silent.
  */
 export const resolveNote = (note, nameOf) => partsOfNote(note)
-    .map(part => part.type === 'text' ? part.text : nameOf(part.id) ?? part.id)
+    .map(part => part.type === 'text' ? part.text : nameOf(part.id) ?? part.label ?? part.id)
     .join('');

package/lib/schema.json

@@ -932,6 +932,10 @@
             "type": "object",
             "ontology": "crminf:I5 Inference Making"
         },
+        "KeeperAssignment": {
+            "$ref": "#/definitions/ObjectAssumption%3CAgent%3E",
+            "description": "The keeper a copy is held by, as an object assumption, so that the statement can carry the belief it rests on and the reasons for it."
+        },
         "Margins<\"mm\">": {
             "description": "The margins on the treble and bass sides of the roll, in the unit the scan was measured in.",
             "properties": {
@@ -1400,6 +1404,60 @@
             ],
             "description": "An object assumption wraps a complex object with an optional annotation. Used for structured values (e.g. persons, conditions) whose properties may be uncertain."
         },
+        "ObjectAssumption<Agent>": {
+            "description": "An object assumption wraps a complex object with an optional annotation. Used for structured values (e.g. persons, conditions) whose properties may be uncertain.",
+            "properties": {
+                "@annotation": {
+                    "description": "An optional annotation expressing a belief about this assumption. Uses the JSON-LD-star `@annotation` mechanism to attach epistemic metadata (certainty and reasons) to any triple.",
+                    "properties": {
+                        "belief": {
+                            "$ref": "#/definitions/Belief",
+                            "description": "The belief held about the annotated statement.",
+                            "ontology": "crminf:J4i is subject of"
+                        },
+                        "@id": {
+                            "description": "A unique identifier for this object.",
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "belief",
+                        "@id"
+                    ],
+                    "type": "object"
+                },
+                "name": {
+                    "description": "The name, e.g. \"Grünfeld, Alfred\", \"Wien\", \"M. Welte & Söhne\".",
+                    "type": "string",
+                    "ontology": "rdfs:label"
+                },
+                "role": {
+                    "$ref": "#/definitions/AgentRole",
+                    "description": "The role of the agent in the context of the edition.",
+                    "ontology": "crm:P2 has type"
+                },
+                "sameAs": {
+                    "description": "Authority records for the same thing: GND, Wikidata, geonames or similar.",
+                    "examples": [
+                        "https://d-nb.info/gnd/116888652"
+                    ],
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array",
+                    "ontology": "owl:sameAs"
+                },
+                "@id": {
+                    "description": "A unique identifier for this object.",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "sameAs"
+            ],
+            "type": "object"
+        },
         "ObjectAssumption<ConditionState<\"general\">>": {
             "description": "An object assumption wraps a complex object with an optional annotation. Used for structured values (e.g. persons, conditions) whose properties may be uncertain.",
             "properties": {
@@ -2192,8 +2250,8 @@
                     "ontology": "crm:P56 bears feature"
                 },
                 "keeper": {
-                    "$ref": "#/definitions/Agent",
-                    "description": "The institution or person holding this copy. Left out where it is not known, as for a copy known only from a recording.",
+                    "$ref": "#/definitions/KeeperAssignment",
+                    "description": "The institution or person holding this copy. Left out where it is not known, as for a copy known only from a recording. An object assumption, so that a keeper read off a file header or adopted from a letter can say where it comes from. Who held the copy before is not stated here: P50 names the current keeper.",
                     "ontology": "crm:P50 has current keeper"
                 },
                 "measurements": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linked-rolls",
-  "version": "0.34.0",
+  "version": "0.36.0",
   "description": "Digital editions of piano rolls: import, collation, editorial assumptions, JSON-LD export, and emulation through a reproducing system",
   "license": "MIT",
   "repository": {