From de7a6643fb5b788a799759d812120f63d45a20a3 Mon Sep 17 00:00:00 2001 From: Fred Atherden <43879983+fred-atherden@users.noreply.github.com> Date: Tue, 5 Mar 2024 16:51:05 +0000 Subject: [PATCH] Add removed pub-dates --- src/final-JATS-schematron.sch | 6 + src/final-JATS-schematron.xsl | 51 + src/final-package-JATS-schematron.sch | 6 + src/pre-JATS-schematron.sch | 6 + src/schematron.sch | 12 + .../final-pub-date-test-10/fail.xml | 15 + .../final-pub-date-test-10.sch | 1303 +++++++++++++++++ .../final-pub-date-test-10/pass.xml | 15 + .../final-pub-date-test-8/fail.xml | 15 + .../final-pub-date-test-8.sch | 1303 +++++++++++++++++ .../final-pub-date-test-8/pass.xml | 15 + .../final-pub-date-test-9/fail.xml | 15 + .../final-pub-date-test-9.sch | 1303 +++++++++++++++++ .../final-pub-date-test-9/pass.xml | 15 + test/xspec/schematron.sch | 6 + test/xspec/schematron.xspec | 30 + 16 files changed, 4116 insertions(+) create mode 100644 test/tests/gen/pub-date-tests/final-pub-date-test-10/fail.xml create mode 100644 test/tests/gen/pub-date-tests/final-pub-date-test-10/final-pub-date-test-10.sch create mode 100644 test/tests/gen/pub-date-tests/final-pub-date-test-10/pass.xml create mode 100644 test/tests/gen/pub-date-tests/final-pub-date-test-8/fail.xml create mode 100644 test/tests/gen/pub-date-tests/final-pub-date-test-8/final-pub-date-test-8.sch create mode 100644 test/tests/gen/pub-date-tests/final-pub-date-test-8/pass.xml create mode 100644 test/tests/gen/pub-date-tests/final-pub-date-test-9/fail.xml create mode 100644 test/tests/gen/pub-date-tests/final-pub-date-test-9/final-pub-date-test-9.sch create mode 100644 test/tests/gen/pub-date-tests/final-pub-date-test-9/pass.xml diff --git a/src/final-JATS-schematron.sch b/src/final-JATS-schematron.sch index e2d12501fc..9ebcc45bf3 100644 --- a/src/final-JATS-schematron.sch +++ b/src/final-JATS-schematron.sch @@ -1931,6 +1931,12 @@ [pub-date-test-6] pub-date must have the attribute publication-format. [pub-date-test-7] pub-date must have the attribute date-type. + + [final-pub-date-test-8] pub-date must contain day in the format 00. Currently it is ''. + + [final-pub-date-test-9] pub-date must contain month in the format 00. Currently it is ''. + + [final-pub-date-test-10] pub-date must contain year in the format 0000. Currently it is ''. diff --git a/src/final-JATS-schematron.xsl b/src/final-JATS-schematron.xsl index 39dd0b1b12..d651cc3a9e 100644 --- a/src/final-JATS-schematron.xsl +++ b/src/final-JATS-schematron.xsl @@ -9680,6 +9680,57 @@ + + + + + + + final-pub-date-test-8 + error + + + + [final-pub-date-test-8] pub-date must contain day in the format 00. Currently it is ' + + '. + + + + + + + + + + final-pub-date-test-9 + error + + + + [final-pub-date-test-9] pub-date must contain month in the format 00. Currently it is ' + + '. + + + + + + + + + + final-pub-date-test-10 + error + + + + [final-pub-date-test-10] pub-date must contain year in the format 0000. Currently it is ' + + '. + + + diff --git a/src/final-package-JATS-schematron.sch b/src/final-package-JATS-schematron.sch index 8a1ed9ff7d..546d79dbb6 100644 --- a/src/final-package-JATS-schematron.sch +++ b/src/final-package-JATS-schematron.sch @@ -1937,6 +1937,12 @@ pub-date must have the attribute publication-format. pub-date must have the attribute date-type. + + pub-date must contain day in the format 00. Currently it is ''. + + pub-date must contain month in the format 00. Currently it is ''. + + pub-date must contain year in the format 0000. Currently it is ''. diff --git a/src/pre-JATS-schematron.sch b/src/pre-JATS-schematron.sch index c96e17c18f..322b140992 100644 --- a/src/pre-JATS-schematron.sch +++ b/src/pre-JATS-schematron.sch @@ -1876,6 +1876,12 @@ [pub-date-test-6] pub-date must have the attribute publication-format. [pub-date-test-7] pub-date must have the attribute date-type. + + + + + + diff --git a/src/schematron.sch b/src/schematron.sch index c9c4ae2e25..256fb3190c 100644 --- a/src/schematron.sch +++ b/src/schematron.sch @@ -2561,6 +2561,18 @@ pub-date must have the attribute date-type. + + pub-date must contain day in the format 00. Currently it is ''. + + pub-date must contain month in the format 00. Currently it is ''. + + pub-date must contain year in the format 0000. Currently it is ''. diff --git a/test/tests/gen/pub-date-tests/final-pub-date-test-10/fail.xml b/test/tests/gen/pub-date-tests/final-pub-date-test-10/fail.xml new file mode 100644 index 0000000000..64cf82dfa4 --- /dev/null +++ b/test/tests/gen/pub-date-tests/final-pub-date-test-10/fail.xml @@ -0,0 +1,15 @@ + + + +
+ + + 22 + 10 + The year of our Lord and Saviour + + +
+
\ No newline at end of file diff --git a/test/tests/gen/pub-date-tests/final-pub-date-test-10/final-pub-date-test-10.sch b/test/tests/gen/pub-date-tests/final-pub-date-test-10/final-pub-date-test-10.sch new file mode 100644 index 0000000000..df02ac8f01 --- /dev/null +++ b/test/tests/gen/pub-date-tests/final-pub-date-test-10/final-pub-date-test-10.sch @@ -0,0 +1,1303 @@ + + eLife Schematron + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + cite + + + + + + + + + + + box + + + + + + + + + + + + + + + + + + + + + roman + + + + + + + + + + + + + + roman + + + + + + + italic + + + + + + + + + + + + + + italic + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + pub-date must contain year in the format 0000. Currently it is ''. + + + + + pub-date must be present. + + + \ No newline at end of file diff --git a/test/tests/gen/pub-date-tests/final-pub-date-test-10/pass.xml b/test/tests/gen/pub-date-tests/final-pub-date-test-10/pass.xml new file mode 100644 index 0000000000..a37e6fcc53 --- /dev/null +++ b/test/tests/gen/pub-date-tests/final-pub-date-test-10/pass.xml @@ -0,0 +1,15 @@ + + + +
+ + + 22 + 10 + 2023 + + +
+
\ No newline at end of file diff --git a/test/tests/gen/pub-date-tests/final-pub-date-test-8/fail.xml b/test/tests/gen/pub-date-tests/final-pub-date-test-8/fail.xml new file mode 100644 index 0000000000..54a9ef6a40 --- /dev/null +++ b/test/tests/gen/pub-date-tests/final-pub-date-test-8/fail.xml @@ -0,0 +1,15 @@ + + + +
+ + + Tuesday + 10 + 2023 + + +
+
\ No newline at end of file diff --git a/test/tests/gen/pub-date-tests/final-pub-date-test-8/final-pub-date-test-8.sch b/test/tests/gen/pub-date-tests/final-pub-date-test-8/final-pub-date-test-8.sch new file mode 100644 index 0000000000..1f30dbad7a --- /dev/null +++ b/test/tests/gen/pub-date-tests/final-pub-date-test-8/final-pub-date-test-8.sch @@ -0,0 +1,1303 @@ + + eLife Schematron + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + cite + + + + + + + + + + + box + + + + + + + + + + + + + + + + + + + + + roman + + + + + + + + + + + + + + roman + + + + + + + italic + + + + + + + + + + + + + + italic + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + pub-date must contain day in the format 00. Currently it is ''. + + + + + pub-date must be present. + + + \ No newline at end of file diff --git a/test/tests/gen/pub-date-tests/final-pub-date-test-8/pass.xml b/test/tests/gen/pub-date-tests/final-pub-date-test-8/pass.xml new file mode 100644 index 0000000000..be6a724b40 --- /dev/null +++ b/test/tests/gen/pub-date-tests/final-pub-date-test-8/pass.xml @@ -0,0 +1,15 @@ + + + +
+ + + 22 + 10 + 2023 + + +
+
\ No newline at end of file diff --git a/test/tests/gen/pub-date-tests/final-pub-date-test-9/fail.xml b/test/tests/gen/pub-date-tests/final-pub-date-test-9/fail.xml new file mode 100644 index 0000000000..ab5fb80c32 --- /dev/null +++ b/test/tests/gen/pub-date-tests/final-pub-date-test-9/fail.xml @@ -0,0 +1,15 @@ + + + +
+ + + 22 + October + 2023 + + +
+
\ No newline at end of file diff --git a/test/tests/gen/pub-date-tests/final-pub-date-test-9/final-pub-date-test-9.sch b/test/tests/gen/pub-date-tests/final-pub-date-test-9/final-pub-date-test-9.sch new file mode 100644 index 0000000000..a31f3f06ea --- /dev/null +++ b/test/tests/gen/pub-date-tests/final-pub-date-test-9/final-pub-date-test-9.sch @@ -0,0 +1,1303 @@ + + eLife Schematron + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + cite + + + + + + + + + + + box + + + + + + + + + + + + + + + + + + + + + roman + + + + + + + + + + + + + + roman + + + + + + + italic + + + + + + + + + + + + + + italic + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + pub-date must contain month in the format 00. Currently it is ''. + + + + + pub-date must be present. + + + \ No newline at end of file diff --git a/test/tests/gen/pub-date-tests/final-pub-date-test-9/pass.xml b/test/tests/gen/pub-date-tests/final-pub-date-test-9/pass.xml new file mode 100644 index 0000000000..d7a81803fb --- /dev/null +++ b/test/tests/gen/pub-date-tests/final-pub-date-test-9/pass.xml @@ -0,0 +1,15 @@ + + + +
+ + + 22 + 10 + 2023 + + +
+
\ No newline at end of file diff --git a/test/xspec/schematron.sch b/test/xspec/schematron.sch index d921b15de7..24a90a98d1 100644 --- a/test/xspec/schematron.sch +++ b/test/xspec/schematron.sch @@ -2140,6 +2140,12 @@ pub-date must have the attribute publication-format. pub-date must have the attribute date-type. + + pub-date must contain day in the format 00. Currently it is ''. + + pub-date must contain month in the format 00. Currently it is ''. + + pub-date must contain year in the format 0000. Currently it is ''.
diff --git a/test/xspec/schematron.xspec b/test/xspec/schematron.xspec index c40eb015ce..ee38790f93 100644 --- a/test/xspec/schematron.xspec +++ b/test/xspec/schematron.xspec @@ -2025,6 +2025,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +