From c2b1d63c1e0a8cec94d55072a610158e7759fa4f Mon Sep 17 00:00:00 2001
From: Fred Atherden <43879983+fred-atherden@users.noreply.github.com>
Date: Thu, 29 Feb 2024 09:13:04 +0000
Subject: [PATCH] Remove collection pub check
---
src/final-JATS-schematron.sch | 4 +-
src/final-JATS-schematron.xsl | 12 -
src/final-package-JATS-schematron.sch | 4 +-
src/pre-JATS-schematron.sch | 4 +-
src/pre-JATS-schematron.xsl | 12 -
src/schematron.sch | 6 +-
.../test-pub-collection-presence/fail.xml | 147 --
.../test-pub-collection-presence/pass.xml | 149 --
.../test-pub-collection-presence.sch | 1311 -----------------
test/xspec/schematron.sch | 4 +-
test/xspec/schematron.xspec | 10 -
11 files changed, 5 insertions(+), 1658 deletions(-)
delete mode 100644 test/tests/gen/test-article-metadata/test-pub-collection-presence/fail.xml
delete mode 100644 test/tests/gen/test-article-metadata/test-pub-collection-presence/pass.xml
delete mode 100644 test/tests/gen/test-article-metadata/test-pub-collection-presence/test-pub-collection-presence.sch
diff --git a/src/final-JATS-schematron.sch b/src/final-JATS-schematron.sch
index 5b7c100ee4..fc6c92d4a6 100644
--- a/src/final-JATS-schematron.sch
+++ b/src/final-JATS-schematron.sch
@@ -1433,9 +1433,7 @@
[test-title-group-presence] title-group containing article-title must be present.
- [test-epub-date] There must be a child pub-date[@publication-format='electronic'][@date-type='publication'] in article-meta.
-
- [test-pub-collection-presence] There must be a child pub-date[@pub-type='collection'] in article-meta.
+ [test-epub-date] There must be a child pub-date[@publication-format='electronic'][@date-type='publication'] in article-meta.
[test-volume-presence] There must be a child volume in article-meta.
diff --git a/src/final-JATS-schematron.xsl b/src/final-JATS-schematron.xsl
index ddb5a3953c..b5b24a706e 100644
--- a/src/final-JATS-schematron.xsl
+++ b/src/final-JATS-schematron.xsl
@@ -6605,18 +6605,6 @@
-
-
-
- test-pub-collection-presence
- error
-
-
-
- [test-pub-collection-presence] There must be a child pub-date[@pub-type='collection'] in article-meta.
-
-
-
diff --git a/src/final-package-JATS-schematron.sch b/src/final-package-JATS-schematron.sch
index f207ee8d02..f76fa3005e 100644
--- a/src/final-package-JATS-schematron.sch
+++ b/src/final-package-JATS-schematron.sch
@@ -1439,9 +1439,7 @@
title-group containing article-title must be present.
- There must be a child pub-date[@publication-format='electronic'][@date-type='publication'] in article-meta.
-
- There must be a child pub-date[@pub-type='collection'] in article-meta.
+ There must be a child pub-date[@publication-format='electronic'][@date-type='publication'] in article-meta.
There must be a child volume in article-meta.
diff --git a/src/pre-JATS-schematron.sch b/src/pre-JATS-schematron.sch
index e47fc8f646..2aeb20bda9 100644
--- a/src/pre-JATS-schematron.sch
+++ b/src/pre-JATS-schematron.sch
@@ -1378,9 +1378,7 @@
[test-title-group-presence] title-group containing article-title must be present.
- [test-epub-date] There must be a child pub-date[@publication-format='electronic'][@date-type='publication'] in article-meta.
-
- [test-pub-collection-presence] There must be a child pub-date[@pub-type='collection'] in article-meta.
+ [test-epub-date] There must be a child pub-date[@publication-format='electronic'][@date-type='publication'] in article-meta.
[test-volume-presence] There must be a child volume in article-meta.
diff --git a/src/pre-JATS-schematron.xsl b/src/pre-JATS-schematron.xsl
index 7098017380..b562bc1c90 100644
--- a/src/pre-JATS-schematron.xsl
+++ b/src/pre-JATS-schematron.xsl
@@ -6525,18 +6525,6 @@
-
-
-
- test-pub-collection-presence
- error
-
-
-
- [test-pub-collection-presence] There must be a child pub-date[@pub-type='collection'] in article-meta.
-
-
-
diff --git a/src/schematron.sch b/src/schematron.sch
index 09d9ffc05f..b409d5187c 100644
--- a/src/schematron.sch
+++ b/src/schematron.sch
@@ -1585,11 +1585,7 @@
There must be a child pub-date[@publication-format='electronic'][@date-type='publication'] in article-meta.
-
- There must be a child pub-date[@pub-type='collection'] in article-meta.
+ id="test-epub-date">There must be a child pub-date[@publication-format='electronic'][@date-type='publication'] in article-meta.
-
-
-
-
-
- 00000
- 10.7554/eLife.00000
-
-
- Research Article
-
-
- Computational and Systems Biology
-
-
- Neuroscience
-
-
-
- Statistical context dictates the relationship between feedback-related EEG
- signals and learning
-
-
-
-
- Zoolander
- Derek
-
- https://orcid.org/0000-0000-0000-000X
- zoolander.d@bluesteelmodelling.com
- 1
-
-
-
-
- Hansel
-
- 1
-
-
-
- The Derek Zoolander School for Kids Who Can't Read Good and Want to Do Other Stuff Good Too
-
- New York
-
- United States
-
-
-
-
-
- Mugatu
-
- Reviewing Editor
-
- University of Oxford
- United Kingdom
-
-
-
-
- Mugatu
-
- Senior Editor
-
- University of Oxford
- United Kingdom
-
-
-
-
- 2019
-
-
- 8
- e0000
-
-
- 19
- 03
- 2019
-
-
- 12
- 08
- 2019
-
-
-
- © 2019, Zoolander and Hansel
- 2019
- Zoolander and Hansel
-
-
- http://creativecommons.org/licenses/by/4.0/
- This article is distributed under the terms of the Creative
- Commons Attribution License, which permits unrestricted use and
- redistribution provided that the original author and source are credited.
-
-
-
-
- 10.7554/eLife.00000.001
- ...
-
-
- learning
- modelling
- blue steel
- Bayesian inference
-
-
- Research organism
- Human
-
-
-
-
-
- http://dx.doi.org/10.13039/100000025
- National Institute of Mental Health
-
-
- BS000000
-
-
- Zoolander
- Derek
-
-
-
- The funders had no role in study design, data collection and
- interpretation, or the decision to submit the work for publication.
-
-
-
- Author impact statement
- ...
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/tests/gen/test-article-metadata/test-pub-collection-presence/pass.xml b/test/tests/gen/test-article-metadata/test-pub-collection-presence/pass.xml
deleted file mode 100644
index ae048969bc..0000000000
--- a/test/tests/gen/test-article-metadata/test-pub-collection-presence/pass.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-
-
-
-
-
-
- 00000
- 10.7554/eLife.00000
-
-
- Research Article
-
-
- Computational and Systems Biology
-
-
- Neuroscience
-
-
-
- Statistical context dictates the relationship between feedback-related EEG
- signals and learning
-
-
-
-
- Zoolander
- Derek
-
- https://orcid.org/0000-0000-0000-000X
- zoolander.d@bluesteelmodelling.com
- 1
-
-
-
-
- Hansel
-
- 1
-
-
-
- The Derek Zoolander School for Kids Who Can't Read Good and Want to Do Other Stuff Good Too
-
- New York
-
- United States
-
-
-
-
-
- Mugatu
-
- Reviewing Editor
-
- University of Oxford
- United Kingdom
-
-
-
-
- Mugatu
-
- Senior Editor
-
- University of Oxford
- United Kingdom
-
-
-
-
- 2019
-
-
- 2019
-
- 8
- e0000
-
-
- 19
- 03
- 2019
-
-
- 12
- 08
- 2019
-
-
-
- © 2019, Zoolander and Hansel
- 2019
- Zoolander and Hansel
-
-
- http://creativecommons.org/licenses/by/4.0/
- This article is distributed under the terms of the Creative
- Commons Attribution License, which permits unrestricted use and
- redistribution provided that the original author and source are credited.
-
-
-
-
- 10.7554/eLife.00000.001
- ...
-
-
- learning
- modelling
- blue steel
- Bayesian inference
-
-
- Research organism
- Human
-
-
-
-
-
- http://dx.doi.org/10.13039/100000025
- National Institute of Mental Health
-
-
- BS000000
-
-
- Zoolander
- Derek
-
-
-
- The funders had no role in study design, data collection and
- interpretation, or the decision to submit the work for publication.
-
-
-
- Author impact statement
- ...
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/tests/gen/test-article-metadata/test-pub-collection-presence/test-pub-collection-presence.sch b/test/tests/gen/test-article-metadata/test-pub-collection-presence/test-pub-collection-presence.sch
deleted file mode 100644
index fd5163882d..0000000000
--- a/test/tests/gen/test-article-metadata/test-pub-collection-presence/test-pub-collection-presence.sch
+++ /dev/null
@@ -1,1311 +0,0 @@
-
- eLife Schematron
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- cite
-
-
-
-
-
-
-
-
-
-
- box
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- roman
-
-
-
-
-
-
-
-
-
-
-
-
-
- roman
-
-
-
-
-
-
- italic
-
-
-
-
-
-
-
-
-
-
-
-
-
- italic
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- There must be a child pub-date[@pub-type='collection'] in article-meta.
-
-
-
-
- article/front/article-meta must be present.
-
-
-
\ No newline at end of file
diff --git a/test/xspec/schematron.sch b/test/xspec/schematron.sch
index aa7fa01c18..46dc2fab18 100644
--- a/test/xspec/schematron.sch
+++ b/test/xspec/schematron.sch
@@ -1467,9 +1467,7 @@
title-group containing article-title must be present.
- There must be a child pub-date[@publication-format='electronic'][@date-type='publication'] in article-meta.
-
- There must be a child pub-date[@pub-type='collection'] in article-meta.
+ There must be a child pub-date[@publication-format='electronic'][@date-type='publication'] in article-meta.
There must be a child volume in article-meta.
diff --git a/test/xspec/schematron.xspec b/test/xspec/schematron.xspec
index 5873d6517c..70168b0873 100644
--- a/test/xspec/schematron.xspec
+++ b/test/xspec/schematron.xspec
@@ -265,16 +265,6 @@
-
-
-
-
-
-
-
-
-
-