From 3437df1d235b21e7269a1ef1db6508601675991e Mon Sep 17 00:00:00 2001 From: Fred Atherden <43879983+fred-atherden@users.noreply.github.com> Date: Wed, 28 Feb 2024 09:02:18 +0000 Subject: [PATCH] Assessment keyword check changes --- src/dl-schematron.sch | 4 +- src/dl-schematron.xsl | 24 +- src/final-JATS-schematron.sch | 4 +- src/final-JATS-schematron.xsl | 23 +- src/final-package-JATS-schematron.sch | 4 +- src/pre-JATS-schematron.sch | 4 +- src/pre-JATS-schematron.xsl | 23 +- src/schematron.sch | 7 +- .../ed-report-kwd-group-2.sch | 2 +- .../ed-report-kwd-group-2/fail.xml | 7 +- .../ed-report-kwd-group-2/pass.xml | 5 +- .../ed-report-kwd-group-3.sch | 1303 +++++++++++++++++ .../ed-report-kwd-group-3/fail.xml | 26 + .../ed-report-kwd-group-3/pass.xml | 25 + test/xspec/schematron.sch | 5 +- test/xspec/schematron.xspec | 10 + 16 files changed, 1455 insertions(+), 21 deletions(-) create mode 100644 test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-3/ed-report-kwd-group-3.sch create mode 100644 test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-3/fail.xml create mode 100644 test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-3/pass.xml diff --git a/src/dl-schematron.sch b/src/dl-schematron.sch index 900e25a21c..9fa2b45707 100644 --- a/src/dl-schematron.sch +++ b/src/dl-schematron.sch @@ -1491,8 +1491,10 @@ kwd-group in must have the attribute kwd-group-type with the value 'claim-importance' or 'evidence-strength'. This one does not. + + type kwd-group has keywords: . This is not permitted, please check which single importance keyword should be used. - type kwd-group has keywords: . This is unusual, please check this is correct. + type kwd-group has keywords: . This is unusual, please check this is correct. diff --git a/src/dl-schematron.xsl b/src/dl-schematron.xsl index c4b43737e0..33039aad1d 100644 --- a/src/dl-schematron.xsl +++ b/src/dl-schematron.xsl @@ -2990,9 +2990,29 @@ + + + + ed-report-kwd-group-3 + dl-ar + error + + + + + + + type kwd-group has + + keywords: + + . This is not permitted, please check which single importance keyword should be used. + + + - - + + ed-report-kwd-group-2 dl-ar warning diff --git a/src/final-JATS-schematron.sch b/src/final-JATS-schematron.sch index f0970ecdcc..57d246ec9c 100644 --- a/src/final-JATS-schematron.sch +++ b/src/final-JATS-schematron.sch @@ -4053,8 +4053,10 @@ [ed-report-kwd-group-1] kwd-group in must have the attribute kwd-group-type with the value 'claim-importance' or 'evidence-strength'. This one does not. + + [ed-report-kwd-group-3] type kwd-group has keywords: . This is not permitted, please check which single importance keyword should be used. - [ed-report-kwd-group-2] type kwd-group has keywords: . This is unusual, please check this is correct. + [ed-report-kwd-group-2] type kwd-group has keywords: . This is unusual, please check this is correct. diff --git a/src/final-JATS-schematron.xsl b/src/final-JATS-schematron.xsl index 5a51709144..f48417bcde 100644 --- a/src/final-JATS-schematron.xsl +++ b/src/final-JATS-schematron.xsl @@ -23621,9 +23621,28 @@ + + + + ed-report-kwd-group-3 + dl-ar + error + + + + [ed-report-kwd-group-3] + + type kwd-group has + + keywords: + + . This is not permitted, please check which single importance keyword should be used. + + + - - + + ed-report-kwd-group-2 dl-ar warning diff --git a/src/final-package-JATS-schematron.sch b/src/final-package-JATS-schematron.sch index 21a13f4467..315b6bc3d2 100644 --- a/src/final-package-JATS-schematron.sch +++ b/src/final-package-JATS-schematron.sch @@ -4059,8 +4059,10 @@ kwd-group in must have the attribute kwd-group-type with the value 'claim-importance' or 'evidence-strength'. This one does not. + + type kwd-group has keywords: . This is not permitted, please check which single importance keyword should be used. - type kwd-group has keywords: . This is unusual, please check this is correct. + type kwd-group has keywords: . This is unusual, please check this is correct. diff --git a/src/pre-JATS-schematron.sch b/src/pre-JATS-schematron.sch index 76292e54cf..7123e2f6f9 100644 --- a/src/pre-JATS-schematron.sch +++ b/src/pre-JATS-schematron.sch @@ -3998,8 +3998,10 @@ [ed-report-kwd-group-1] kwd-group in must have the attribute kwd-group-type with the value 'claim-importance' or 'evidence-strength'. This one does not. + + [ed-report-kwd-group-3] type kwd-group has keywords: . This is not permitted, please check which single importance keyword should be used. - [ed-report-kwd-group-2] type kwd-group has keywords: . This is unusual, please check this is correct. + [ed-report-kwd-group-2] type kwd-group has keywords: . This is unusual, please check this is correct. diff --git a/src/pre-JATS-schematron.xsl b/src/pre-JATS-schematron.xsl index 0127314a12..f30d65911d 100644 --- a/src/pre-JATS-schematron.xsl +++ b/src/pre-JATS-schematron.xsl @@ -23489,9 +23489,28 @@ + + + + ed-report-kwd-group-3 + dl-ar + error + + + + [ed-report-kwd-group-3] + + type kwd-group has + + keywords: + + . This is not permitted, please check which single importance keyword should be used. + + + - - + + ed-report-kwd-group-2 dl-ar warning diff --git a/src/schematron.sch b/src/schematron.sch index ee1d1bafe7..d94113363b 100644 --- a/src/schematron.sch +++ b/src/schematron.sch @@ -7188,8 +7188,13 @@ else self::*/local-name() = $allowed-p-blocks" role="error" flag="dl-ar" id="ed-report-kwd-group-1">kwd-group in must have the attribute kwd-group-type with the value 'claim-importance' or 'evidence-strength'. This one does not. + + type kwd-group has keywords: . This is not permitted, please check which single importance keyword should be used. - type kwd-group has keywords: . This is unusual, please check this is correct. diff --git a/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-2/ed-report-kwd-group-2.sch b/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-2/ed-report-kwd-group-2.sch index 2acb11134b..2e119fa715 100644 --- a/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-2/ed-report-kwd-group-2.sch +++ b/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-2/ed-report-kwd-group-2.sch @@ -1291,7 +1291,7 @@ - + type kwd-group has keywords: . This is unusual, please check this is correct. diff --git a/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-2/fail.xml b/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-2/fail.xml index 037e5c514a..1c55ef3bf4 100644 --- a/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-2/fail.xml +++ b/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-2/fail.xml @@ -1,6 +1,6 @@
@@ -12,17 +12,14 @@ Message: type kwd-group has keywords: . This is unusual, please check this is Noteworthy - Flawed - boooring :yawning_face: Compelling Incomplete - Gorgeous :heart_eyes: -

The terms in use are noteworthy but flawed. And the data is compelling, but incomplete.

+

The terms in use are noteworthy. And the data is compelling, but incomplete.

diff --git a/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-2/pass.xml b/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-2/pass.xml index 7254a84782..df8a6a1197 100644 --- a/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-2/pass.xml +++ b/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-2/pass.xml @@ -1,6 +1,6 @@
@@ -16,11 +16,10 @@ Message: type kwd-group has keywords: . This is unusual, please check this is Compelling - Incomplete -

The terms in use are noteworthy but flawed. And the data is compelling, but incomplete.

+

The terms in use are noteworthy. And the data is compelling.

diff --git a/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-3/ed-report-kwd-group-3.sch b/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-3/ed-report-kwd-group-3.sch new file mode 100644 index 0000000000..83ab2481f2 --- /dev/null +++ b/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-3/ed-report-kwd-group-3.sch @@ -0,0 +1,1303 @@ + + eLife Schematron + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + cite + + + + + + + + + + + box + + + + + + + + + + + + + + + + + + + + + roman + + + + + + + + + + + + + + roman + + + + + + + italic + + + + + + + + + + + + + + italic + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + type kwd-group has keywords: . This is not permitted, please check which single importance keyword should be used. + + + + + sub-article[@article-type='editor-report']/front-stub/kwd-group must be present. + + + \ No newline at end of file diff --git a/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-3/fail.xml b/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-3/fail.xml new file mode 100644 index 0000000000..727e158810 --- /dev/null +++ b/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-3/fail.xml @@ -0,0 +1,26 @@ + + + +
+ + + 10.7554/eLife.1234567890.4.sa0 + + eLife assessment + + + Noteworthy + Important + + + Compelling + + + +

The terms in use are noteworthy and important. And the data is compelling.

+ +
+
+
\ No newline at end of file diff --git a/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-3/pass.xml b/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-3/pass.xml new file mode 100644 index 0000000000..9571f148f1 --- /dev/null +++ b/test/tests/gen/ed-report-kwd-group/ed-report-kwd-group-3/pass.xml @@ -0,0 +1,25 @@ + + + +
+ + + 10.7554/eLife.1234567890.4.sa0 + + eLife assessment + + + Noteworthy + + + Compelling + + + +

The terms in use are noteworthy. And the data is compelling.

+ +
+
+
\ No newline at end of file diff --git a/test/xspec/schematron.sch b/test/xspec/schematron.sch index e9c70df0de..e0f047959d 100644 --- a/test/xspec/schematron.sch +++ b/test/xspec/schematron.sch @@ -5171,8 +5171,11 @@ kwd-group in must have the attribute kwd-group-type with the value 'claim-importance' or 'evidence-strength'. This one does not. + + + type kwd-group has keywords: . This is not permitted, please check which single importance keyword should be used. - + type kwd-group has keywords: . This is unusual, please check this is correct. diff --git a/test/xspec/schematron.xspec b/test/xspec/schematron.xspec index 14885ad0e8..6476b7638f 100644 --- a/test/xspec/schematron.xspec +++ b/test/xspec/schematron.xspec @@ -9469,6 +9469,16 @@ + + + + + + + + + +