From 061cb6f0fa133dbaf3fb62821bc34604be5da736 Mon Sep 17 00:00:00 2001
From: Chris Markiewicz <effigies@gmail.com>
Date: Sat, 24 Jun 2023 04:58:40 +0200
Subject: [PATCH 1/3] ENH: Permit CITATION.cff as strict alternative to Authors
 field

---
 src/schema/rules/checks/dataset.yaml    | 12 ++++++++++++
 src/schema/rules/files/common/core.yaml |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/src/schema/rules/checks/dataset.yaml b/src/schema/rules/checks/dataset.yaml
index 4012eca8fb..fd5ab61511 100644
--- a/src/schema/rules/checks/dataset.yaml
+++ b/src/schema/rules/checks/dataset.yaml
@@ -62,3 +62,15 @@ UnknownVersion:
     - path == 'dataset_description.json'
   checks:
     - intersects([json.BIDSVersion], schema.meta.versions)
+
+SingleSourceAuthors:
+  issue:
+    code: AUTHORS_AND_CITATION_FILE_MUTUALLY_EXCLUSIVE
+    level: error
+    message: |
+      CITATION.cff file found. The "Authors" field of dataset_description.json
+      must be removed to avoid inconsistency.
+  selectors:
+    - path == 'CITATION.cff'
+  checks:
+    - '!("Authors" in dataset.dataset_description)'
diff --git a/src/schema/rules/files/common/core.yaml b/src/schema/rules/files/common/core.yaml
index cacc3e0c41..2fad28f430 100644
--- a/src/schema/rules/files/common/core.yaml
+++ b/src/schema/rules/files/common/core.yaml
@@ -5,6 +5,9 @@
 dataset_description:
   level: required
   path: dataset_description.json
+CITATION:
+  level: optional
+  path: CITATION.cff
 README:
   level: recommended
   stem: README

From d19363ef240bd19f9a998566a03c61b5274e31e7 Mon Sep 17 00:00:00 2001
From: Chris Markiewicz <effigies@gmail.com>
Date: Sat, 24 Jun 2023 19:33:33 +0000
Subject: [PATCH 2/3] ENH: Add CITATION schema file and recommend preference
 over dataset_description

---
 src/modality-agnostic-files.md | 15 +++++++++++++++
 src/schema/objects/files.yaml  |  8 ++++++++
 2 files changed, 23 insertions(+)

diff --git a/src/modality-agnostic-files.md b/src/modality-agnostic-files.md
index d598f76e38..b424ef52b6 100644
--- a/src/modality-agnostic-files.md
+++ b/src/modality-agnostic-files.md
@@ -167,6 +167,21 @@ A guide for using macros can be found at
 -->
 {{ MACROS___render_text("objects.files.README.description") }}
 
+### `CITATION.cff`
+
+<!-- This block generates a file tree.
+A guide for using macros can be found at
+ https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
+-->
+{{ MACROS___render_text("objects.files.CITATION.description") }}
+
+For most redundant fields between `CITATION.cff` and `dataset_description.json`,
+the `CITATION.cff` SHOULD take precedence.
+To avoid inconsistency, metadata present in `CITATION.cff` SHOULD NOT be
+be included in `dataset_description.json`, with the exception of `Name` and
+`DatasetDOI`, to ensure that `CITATION.cff`-unaware tools can generate
+references to the dataset.
+
 ### `CHANGES`
 
 <!-- This block generates a description.
diff --git a/src/schema/objects/files.yaml b/src/schema/objects/files.yaml
index cf2d902a4b..8adb534619 100644
--- a/src/schema/objects/files.yaml
+++ b/src/schema/objects/files.yaml
@@ -12,6 +12,14 @@ CHANGES:
     [CPAN Changelog convention](https://metacpan.org/pod/release/HAARG/CPAN-Changes-0.400002/lib/\
     CPAN/Changes/Spec.pod).
     The `CHANGES` file MUST be either in ASCII or UTF-8 encoding.
+CITATION:
+  display_name: CITATION.cff
+  file_type: regular
+  description: |
+    A description of the citation information for the dataset, following the
+    [Citation File Format](https://citation-file-format.github.io/) specification.
+    This file permits more detailed and structured descriptions than
+    [dataset_description.json](SPEC_ROOT/glossary.md#dataset_description-files).
 LICENSE:
   display_name: License
   file_type: regular

From 598a6c0749aef0180143b92937d079d9883b9c2e Mon Sep 17 00:00:00 2001
From: Chris Markiewicz <effigies@gmail.com>
Date: Wed, 12 Jul 2023 15:11:57 -0400
Subject: [PATCH 3/3] SCHEMA: Warn on other duplicated fields

---
 src/modality-agnostic-files.md       |  5 +++++
 src/schema/rules/checks/dataset.yaml | 15 +++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/modality-agnostic-files.md b/src/modality-agnostic-files.md
index b424ef52b6..fda6643276 100644
--- a/src/modality-agnostic-files.md
+++ b/src/modality-agnostic-files.md
@@ -181,6 +181,11 @@ To avoid inconsistency, metadata present in `CITATION.cff` SHOULD NOT be
 be included in `dataset_description.json`, with the exception of `Name` and
 `DatasetDOI`, to ensure that `CITATION.cff`-unaware tools can generate
 references to the dataset.
+In particular, if `CITATION.cff` is present,
+the `"Authors"` field of `dataset_description.json` MUST be omitted,
+and the `"HowToAcknowledge"`, `"License"` and `"ReferencesAndLinks"` SHOULD be omitted
+in favor of the `CITATION.cff` fields `message`/`preferred-citation`, `license` and
+`references`.
 
 ### `CHANGES`
 
diff --git a/src/schema/rules/checks/dataset.yaml b/src/schema/rules/checks/dataset.yaml
index fd5ab61511..999de949cf 100644
--- a/src/schema/rules/checks/dataset.yaml
+++ b/src/schema/rules/checks/dataset.yaml
@@ -74,3 +74,18 @@ SingleSourceAuthors:
     - path == 'CITATION.cff'
   checks:
     - '!("Authors" in dataset.dataset_description)'
+
+SingleSourceCitationFields:
+  issue:
+    code: SINGLE_SOURCE_CITATION_FIELDS
+    level: warning
+    message: |
+      CITATION.cff file found. The "HowToAckowledge", "License",
+      and "ReferencesAndLinks" fields of dataset_description.json
+      should be removed to avoid inconsistency.
+  selectors:
+    - path == 'CITATION.cff'
+  checks:
+    - '!("HowToAcknowledge" in dataset.dataset_description)'
+    - '!("License" in dataset.dataset_description)'
+    - '!("ReferencesAndLinks" in dataset.dataset_description)'