linked-rolls 0.29.0 → 0.30.0

package/lib/RollCopy.d.ts

@@ -274,8 +274,10 @@ export interface RollCopy extends WithType<'RollCopy'>, WithId {
      */
     conditions: RollConditionAssignment[];
     /**
-     * A short siglum to identify the copy, e.g. "W1" or "S2". A copy
-     * without one is named by its keeper.
+     * A short siglum to identify the copy, e.g. "St1" or "Wi1": letters
+     * for the collection the copy was read in, and a number counting the
+     * copies of the roll held there. A copy without one is named by its
+     * keeper.
      * @see reo:siglum
      */
     siglum?: string;

package/lib/Version.d.ts

@@ -66,7 +66,11 @@ export interface VersionCreation {
  */
 export interface Version extends WithId, WithType<'Version'> {
     /**
-     * A short siglum to identify the version, e.g. "A", "B1", "B2_rev", etc.
+     * A short siglum to identify the version, e.g. "A" or "B2". A siglum
+     * is given once and not changed: its letter names the line the version
+     * was first recognised in, its number counts the versions admitted to
+     * that line. Where later work places the version elsewhere in the
+     * stemma, `basedOn` changes and the siglum stays.
      * @see reo:siglum
      */
     siglum: string;

package/lib/editionOps.js

@@ -637,6 +637,19 @@ export const removeVersion = (view, versionId) => {
 };
 /** Takes the symbols out of the version's own insertions, and the edits that had nothing else. */
 export const removeSymbols = (versionId, symbolIds) => onVersion(versionId, version => dropInsertions(version, new Set(symbolIds)));
+/**
+ * The siglum for a version derived from this one: the line the siglum
+ * names, and the next number free in it. A number already given stays
+ * given, whatever the stemma does later.
+ */
+const nextInLine = (versions, siglum) => {
+    const [line] = siglum.match(/^\D*/) ?? [siglum];
+    const numbers = versions.flatMap(other => {
+        const match = other.siglum.match(/^(\D*)(\d*)$/);
+        return match && match[1] === line ? [Number(match[2] || 1)] : [];
+    });
+    return `${line}${Math.max(1, ...numbers) + 1}`;
+};
 /** Moves the edits into a new version based on this one. */
 export const deriveVersion = (versionId, editIds) => onVersion(versionId, (version, draft) => {
     const chosen = new Set(editIds);
@@ -646,7 +659,7 @@ export const deriveVersion = (versionId, editIds) => onVersion(versionId, (versi
     draft.versions.push({
         type: 'Version',
         id: v4(),
-        siglum: `${version.siglum}_derived`,
+        siglum: nextInLine(draft.versions, version.siglum),
         system: stateOf(version).system,
         basedOn: [assignReference(versionId)],
         edits: moved,

package/lib/schema.json

@@ -2271,7 +2271,7 @@
                     "ontology": "crm:P138i has representation"
                 },
                 "siglum": {
-                    "description": "A short siglum to identify the copy, e.g. \"W1\" or \"S2\". A copy without one is named by its keeper.",
+                    "description": "A short siglum to identify the copy, e.g. \"St1\" or \"Wi1\": letters for the collection the copy was read in, and a number counting the copies of the roll held there. A copy without one is named by its keeper.",
                     "type": "string",
                     "ontology": "reo:siglum"
                 },
@@ -2446,7 +2446,7 @@
                     "type": "array"
                 },
                 "siglum": {
-                    "description": "A short siglum to identify the version, e.g. \"A\", \"B1\", \"B2_rev\", etc.",
+                    "description": "A short siglum to identify the version, e.g. \"A\" or \"B2\". A siglum is given once and not changed: its letter names the line the version was first recognised in, its number counts the versions admitted to that line. Where later work places the version elsewhere in the stemma, `basedOn` changes and the siglum stays.",
                     "type": "string",
                     "ontology": "reo:siglum"
                 },

package/package.json

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