From fbc0c614749744b2b4511580c4c39ab1d4117365 Mon Sep 17 00:00:00 2001
From: Fred Atherden <43879983+fred-atherden@users.noreply.github.com>
Date: Fri, 5 Jan 2024 08:54:53 +0000
Subject: [PATCH] Fix permissions check for new model papers
---
src/final-JATS-schematron.sch | 5 ++++-
src/final-JATS-schematron.xsl | 14 +++++++++-----
src/final-package-JATS-schematron.sch | 5 ++++-
src/pre-JATS-schematron.sch | 5 ++++-
src/pre-JATS-schematron.xsl | 14 +++++++++-----
src/schematron.sch | 8 ++++++--
.../permissions-test-1/permissions-test-1.sch | 2 ++
.../permissions-test-16/permissions-test-16.sch | 2 ++
.../permissions-test-2/permissions-test-2.sch | 2 ++
.../permissions-test-3/permissions-test-3.sch | 2 ++
.../permissions-test-6/fail.xml | 4 ++--
.../permissions-test-6/pass.xml | 4 ++--
.../permissions-test-6/permissions-test-6.sch | 4 +++-
.../permissions-test-7/permissions-test-7.sch | 2 ++
.../permissions-test-8/permissions-test-8.sch | 2 ++
test/xspec/schematron.sch | 5 ++++-
16 files changed, 59 insertions(+), 21 deletions(-)
diff --git a/src/final-JATS-schematron.sch b/src/final-JATS-schematron.sch
index cbfad267d9..039d94528a 100644
--- a/src/final-JATS-schematron.sch
+++ b/src/final-JATS-schematron.sch
@@ -2033,6 +2033,9 @@
+
+
+
[permissions-test-1] permissions must contain copyright-statement in CC BY licensed articles.
@@ -2040,7 +2043,7 @@
[permissions-test-3] permissions must contain copyright-holder in CC BY licensed articles.
- [permissions-test-6] copyright-year must match the contents of the year in the pub-date[@publication-format='electronic'][@date-type='publication']. Currently, copyright-year= and pub-date=.
+ [permissions-test-6] copyright-year must match the the year of first reviewed preprint publication under the new model or first publicaiton date in the old model. For this model paper, currently copyright-year= and authoritative pub-date=.
[permissions-test-7] copyright-holder is incorrect. If the article has one author then it should be their surname (or collab name). If it has two authors it should be the surname (or collab name) of the first, then ' and ' and then the surname (or collab name) of the second. If three or more, it should be the surname (or collab name) of the first, and then ' et al'. Currently it's '' when based on the author list it should be ''.
diff --git a/src/final-JATS-schematron.xsl b/src/final-JATS-schematron.xsl
index 61612d87df..a12948d1c5 100644
--- a/src/final-JATS-schematron.xsl
+++ b/src/final-JATS-schematron.xsl
@@ -10337,6 +10337,8 @@
+
+
@@ -10390,19 +10392,21 @@
-
+
-
+
permissions-test-6
https://elifeproduction.slab.com/posts/licensing-and-copyright-rqdavyty#permissions-test-6
error
- [permissions-test-6] copyright-year must match the contents of the year in the pub-date[@publication-format='electronic'][@date-type='publication']. Currently, copyright-year=
+ [permissions-test-6] copyright-year must match the the year of first reviewed preprint publication under the new model or first publicaiton date in the old model. For this
+
+ model paper, currently copyright-year=
- and pub-date=
-
+ and authoritative pub-date=
+
.
diff --git a/src/final-package-JATS-schematron.sch b/src/final-package-JATS-schematron.sch
index a13cba19c7..bf5d1a2423 100644
--- a/src/final-package-JATS-schematron.sch
+++ b/src/final-package-JATS-schematron.sch
@@ -2039,6 +2039,9 @@
+
+
+
permissions must contain copyright-statement in CC BY licensed articles.
@@ -2046,7 +2049,7 @@
permissions must contain copyright-holder in CC BY licensed articles.
- copyright-year must match the contents of the year in the pub-date[@publication-format='electronic'][@date-type='publication']. Currently, copyright-year= and pub-date=.
+ copyright-year must match the the year of first reviewed preprint publication under the new model or first publicaiton date in the old model. For this model paper, currently copyright-year= and authoritative pub-date=.
copyright-holder is incorrect. If the article has one author then it should be their surname (or collab name). If it has two authors it should be the surname (or collab name) of the first, then ' and ' and then the surname (or collab name) of the second. If three or more, it should be the surname (or collab name) of the first, and then ' et al'. Currently it's '' when based on the author list it should be ''.
diff --git a/src/pre-JATS-schematron.sch b/src/pre-JATS-schematron.sch
index 35108a6782..fa44670316 100644
--- a/src/pre-JATS-schematron.sch
+++ b/src/pre-JATS-schematron.sch
@@ -1978,6 +1978,9 @@
+
+
+
[permissions-test-1] permissions must contain copyright-statement in CC BY licensed articles.
@@ -1985,7 +1988,7 @@
[permissions-test-3] permissions must contain copyright-holder in CC BY licensed articles.
- [permissions-test-6] copyright-year must match the contents of the year in the pub-date[@publication-format='electronic'][@date-type='publication']. Currently, copyright-year= and pub-date=.
+ [permissions-test-6] copyright-year must match the the year of first reviewed preprint publication under the new model or first publicaiton date in the old model. For this model paper, currently copyright-year= and authoritative pub-date=.
[permissions-test-7] copyright-holder is incorrect. If the article has one author then it should be their surname (or collab name). If it has two authors it should be the surname (or collab name) of the first, then ' and ' and then the surname (or collab name) of the second. If three or more, it should be the surname (or collab name) of the first, and then ' et al'. Currently it's '' when based on the author list it should be ''.
diff --git a/src/pre-JATS-schematron.xsl b/src/pre-JATS-schematron.xsl
index 07511c70f1..5db07f02b9 100644
--- a/src/pre-JATS-schematron.xsl
+++ b/src/pre-JATS-schematron.xsl
@@ -10224,6 +10224,8 @@
+
+
@@ -10277,19 +10279,21 @@
-
+
-
+
permissions-test-6
https://elifeproduction.slab.com/posts/licensing-and-copyright-rqdavyty#permissions-test-6
error
- [permissions-test-6] copyright-year must match the contents of the year in the pub-date[@publication-format='electronic'][@date-type='publication']. Currently, copyright-year=
+ [permissions-test-6] copyright-year must match the the year of first reviewed preprint publication under the new model or first publicaiton date in the old model. For this
+
+ model paper, currently copyright-year=
- and pub-date=
-
+ and authoritative pub-date=
+
.
diff --git a/src/schematron.sch b/src/schematron.sch
index d9712831e2..0af22ceccb 100644
--- a/src/schematron.sch
+++ b/src/schematron.sch
@@ -2766,6 +2766,10 @@
+
+
+
permissions must contain copyright-holder in CC BY licensed articles.
copyright-year must match the contents of the year in the pub-date[@publication-format='electronic'][@date-type='publication']. Currently, copyright-year= and pub-date=.
+ id="permissions-test-6">copyright-year must match the the year of first reviewed preprint publication under the new model or first publicaiton date in the old model. For this model paper, currently copyright-year= and authoritative pub-date=.
+
+
permissions must contain copyright-statement in CC BY licensed articles.
diff --git a/test/tests/gen/cc-by-permissions-tests/permissions-test-16/permissions-test-16.sch b/test/tests/gen/cc-by-permissions-tests/permissions-test-16/permissions-test-16.sch
index 246aa281fe..2deed5c224 100644
--- a/test/tests/gen/cc-by-permissions-tests/permissions-test-16/permissions-test-16.sch
+++ b/test/tests/gen/cc-by-permissions-tests/permissions-test-16/permissions-test-16.sch
@@ -1294,6 +1294,8 @@
+
+
This article is CC-BY, but one or more of the authors is affiliation with the NIH (). Should it be CC0 instead?
diff --git a/test/tests/gen/cc-by-permissions-tests/permissions-test-2/permissions-test-2.sch b/test/tests/gen/cc-by-permissions-tests/permissions-test-2/permissions-test-2.sch
index 45f74c91f1..53e3e2fba9 100644
--- a/test/tests/gen/cc-by-permissions-tests/permissions-test-2/permissions-test-2.sch
+++ b/test/tests/gen/cc-by-permissions-tests/permissions-test-2/permissions-test-2.sch
@@ -1294,6 +1294,8 @@
+
+
permissions must contain copyright-year in the format 0000 in CC BY licensed articles. Currently it is .
diff --git a/test/tests/gen/cc-by-permissions-tests/permissions-test-3/permissions-test-3.sch b/test/tests/gen/cc-by-permissions-tests/permissions-test-3/permissions-test-3.sch
index 7956f5af75..86e11d1913 100644
--- a/test/tests/gen/cc-by-permissions-tests/permissions-test-3/permissions-test-3.sch
+++ b/test/tests/gen/cc-by-permissions-tests/permissions-test-3/permissions-test-3.sch
@@ -1294,6 +1294,8 @@
+
+
permissions must contain copyright-holder in CC BY licensed articles.
diff --git a/test/tests/gen/cc-by-permissions-tests/permissions-test-6/fail.xml b/test/tests/gen/cc-by-permissions-tests/permissions-test-6/fail.xml
index 0591c3b0a9..9899bdb283 100644
--- a/test/tests/gen/cc-by-permissions-tests/permissions-test-6/fail.xml
+++ b/test/tests/gen/cc-by-permissions-tests/permissions-test-6/fail.xml
@@ -1,7 +1,7 @@
+Test: assert copyright-year = $authoritative-year
+Message: copyright-year must match the the year of first reviewed preprint publication under the new model or first publicaiton date in the old model. For this model paper, currently copyright-year= and authoritative pub-date=. -->
diff --git a/test/tests/gen/cc-by-permissions-tests/permissions-test-6/pass.xml b/test/tests/gen/cc-by-permissions-tests/permissions-test-6/pass.xml
index 509acf96dc..23400f3ec1 100644
--- a/test/tests/gen/cc-by-permissions-tests/permissions-test-6/pass.xml
+++ b/test/tests/gen/cc-by-permissions-tests/permissions-test-6/pass.xml
@@ -1,7 +1,7 @@
+Test: assert copyright-year = $authoritative-year
+Message: copyright-year must match the the year of first reviewed preprint publication under the new model or first publicaiton date in the old model. For this model paper, currently copyright-year= and authoritative pub-date=. -->
diff --git a/test/tests/gen/cc-by-permissions-tests/permissions-test-6/permissions-test-6.sch b/test/tests/gen/cc-by-permissions-tests/permissions-test-6/permissions-test-6.sch
index 7fb9325e20..1625d84c0a 100644
--- a/test/tests/gen/cc-by-permissions-tests/permissions-test-6/permissions-test-6.sch
+++ b/test/tests/gen/cc-by-permissions-tests/permissions-test-6/permissions-test-6.sch
@@ -1294,7 +1294,9 @@
- copyright-year must match the contents of the year in the pub-date[@publication-format='electronic'][@date-type='publication']. Currently, copyright-year= and pub-date=.
+
+
+ copyright-year must match the the year of first reviewed preprint publication under the new model or first publicaiton date in the old model. For this model paper, currently copyright-year= and authoritative pub-date=.
diff --git a/test/tests/gen/cc-by-permissions-tests/permissions-test-7/permissions-test-7.sch b/test/tests/gen/cc-by-permissions-tests/permissions-test-7/permissions-test-7.sch
index 23498ef668..103d9e91f0 100644
--- a/test/tests/gen/cc-by-permissions-tests/permissions-test-7/permissions-test-7.sch
+++ b/test/tests/gen/cc-by-permissions-tests/permissions-test-7/permissions-test-7.sch
@@ -1294,6 +1294,8 @@
+
+
copyright-holder is incorrect. If the article has one author then it should be their surname (or collab name). If it has two authors it should be the surname (or collab name) of the first, then ' and ' and then the surname (or collab name) of the second. If three or more, it should be the surname (or collab name) of the first, and then ' et al'. Currently it's '' when based on the author list it should be ''.
diff --git a/test/tests/gen/cc-by-permissions-tests/permissions-test-8/permissions-test-8.sch b/test/tests/gen/cc-by-permissions-tests/permissions-test-8/permissions-test-8.sch
index 81771f8f1f..e43dd7b629 100644
--- a/test/tests/gen/cc-by-permissions-tests/permissions-test-8/permissions-test-8.sch
+++ b/test/tests/gen/cc-by-permissions-tests/permissions-test-8/permissions-test-8.sch
@@ -1294,6 +1294,8 @@
+
+
copyright-statement must contain a concatenation of '© ', copyright-year, and copyright-holder. Currently it is when according to the other values it should be
diff --git a/test/xspec/schematron.sch b/test/xspec/schematron.sch
index d4ba3344c4..48a58ecaff 100644
--- a/test/xspec/schematron.sch
+++ b/test/xspec/schematron.sch
@@ -2298,6 +2298,9 @@
+
+
+
permissions must contain copyright-statement in CC BY licensed articles.
@@ -2305,7 +2308,7 @@
permissions must contain copyright-holder in CC BY licensed articles.
- copyright-year must match the contents of the year in the pub-date[@publication-format='electronic'][@date-type='publication']. Currently, copyright-year= and pub-date=.
+ copyright-year must match the the year of first reviewed preprint publication under the new model or first publicaiton date in the old model. For this model paper, currently copyright-year= and authoritative pub-date=.
copyright-holder is incorrect. If the article has one author then it should be their surname (or collab name). If it has two authors it should be the surname (or collab name) of the first, then ' and ' and then the surname (or collab name) of the second. If three or more, it should be the surname (or collab name) of the first, and then ' et al'. Currently it's '' when based on the author list it should be ''.