Merge pull request #382 from citation-file-format/upstream-schema-cha…

…nges pulled in CFF 1.3.0 schema changes from upstream
citation-file-format · Feb 12, 2024 · 5295f87 · 5295f87
2 parents 3f630cc + f96215a
commit 5295f87
Showing 1 changed file with 32 additions and 12 deletions.
diff --git a/src/cffconvert/schemas/1.3.0/schema.json b/src/cffconvert/schemas/1.3.0/schema.json
@@ -303,6 +303,10 @@
                     "$ref": "#/$defs/address",
                     "description": "The entity's address."
                 },
+                "affiliation": {
+                    "$ref": "#/$defs/strictish-string",
+                    "description": "The entity's affiliation."
+                },
                 "alias": {
                     "$ref": "#/$defs/alias",
                     "description": "The entity's alias."
@@ -351,6 +355,10 @@
                     "$ref": "#/$defs/region",
                     "description": "The entity's region."
                 },
+                "ror": {
+                    "$ref": "#/$defs/ror",
+                    "description": "The entity's Research Organization Registry (ROR) identifier."
+                },
                 "tel": {
                     "$ref": "#/$defs/tel",
                     "description": "The entity's telephone number."
@@ -1152,7 +1160,7 @@
         "orcid": {
             "description": "Identifier for an author, see https://orcid.org.",
             "format": "uri",
-            "pattern": "https://orcid\\.org/[0-9]{4}-[0-9]{4}-[0-9]{4}-[0-9]{3}[0-9X]{1}",
+            "pattern": "^https://orcid\\.org/[0-9]{4}-[0-9]{4}-[0-9]{4}-[0-9]{3}[0-9X]{1}$",
             "type": "string"
         },
         "person": {
@@ -1297,7 +1305,7 @@
                     },
                     "minItems": 1,
                     "type": "array",
-                    "uniqueItems": true
+                    "uniqueItems": false
                 },
                 "collection-doi": {
                     "$ref": "#/$defs/doi",
@@ -1332,7 +1340,7 @@
                     },
                     "minItems": 1,
                     "type": "array",
-                    "uniqueItems": true
+                    "uniqueItems": false
                 },
                 "copyright": {
                     "$ref": "#/$defs/strictish-string",
@@ -1392,7 +1400,7 @@
                     },
                     "minItems": 1,
                     "type": "array",
-                    "uniqueItems": true
+                    "uniqueItems": false
                 },
                 "editors-series": {
                     "description": "The editor(s) of a series in which a work has been published.",
@@ -1408,7 +1416,7 @@
                     },
                     "minItems": 1,
                     "type": "array",
-                    "uniqueItems": true
+                    "uniqueItems": false
                 },
                 "end": {
                     "description": "The end page of the work.",
@@ -1637,7 +1645,7 @@
                     },
                     "minItems": 1,
                     "type": "array",
-                    "uniqueItems": true
+                    "uniqueItems": false
                 },
                 "repository": {
                     "$ref": "#/$defs/url",
@@ -1680,7 +1688,7 @@
                     },
                     "minItems": 1,
                     "type": "array",
-                    "uniqueItems": true
+                    "uniqueItems": false
                 },
                 "start": {
                     "description": "The start page of the work.",
@@ -1731,7 +1739,7 @@
                     },
                     "minItems": 1,
                     "type": "array",
-                    "uniqueItems": true
+                    "uniqueItems": false
                 },
                 "type": {
                     "description": "The type of the work.",
@@ -1843,6 +1851,18 @@
             "$ref": "#/$defs/strictish-string",
             "description": "A region."
         },
+        "ror": {
+            "$comment": "Regex from 'https://github.com/ror-community/ror-schema/blob/a985c6e97293c0ebcc50aae89a2092c557c1dbec/ror_schema_v2_0.json#L116'",
+            "description": "An identifier for a research organization. See https://ror.org/ for more information.",
+            "examples": [
+                "https://ror.org/04bwf3e34",
+                "https://ror.org/00rbjv475"
+            ],
+            "maxLength": 25,
+            "minLength": 25,
+            "pattern": "^https://ror.org/0[0-9|a-z]{8}$",
+            "type": "string"
+        },
         "strictish-string": {
             "description": "String of length greater than 1 character, with a regular expression to avoid leading spaces, trailing spaces, or middle double spaces",
             "minLength": 1,
@@ -1868,7 +1888,7 @@
         },
         "url": {
             "format": "uri",
-            "pattern": "^(https|http|ftp|sftp)://.+",
+            "pattern": "^(https|http|ftp|sftp)://\\S+$",
             "type": "string"
         },
         "version": {
@@ -1905,7 +1925,7 @@
             },
             "minItems": 1,
             "type": "array",
-            "uniqueItems": true
+            "uniqueItems": false
         },
         "cff-version": {
             "description": "The version of CFF used for providing the citation metadata.",
@@ -1932,7 +1952,7 @@
             },
             "minItems": 1,
             "type": "array",
-            "uniqueItems": true
+            "uniqueItems": false
         },
         "contributors": {
             "description": "The contributor(s) to a work.",
@@ -1948,7 +1968,7 @@
             },
             "minItems": 1,
             "type": "array",
-            "uniqueItems": true
+            "uniqueItems": false
         },
         "date-released": {
             "$ref": "#/$defs/date",