From 0ba9603cd48d45f76c6c30318ef5fcbe087043e8 Mon Sep 17 00:00:00 2001 From: Fred Atherden <43879983+fred-atherden@users.noreply.github.com> Date: Fri, 26 Jan 2024 15:10:28 +0000 Subject: [PATCH] chore: Update table cell check messages --- src/final-JATS-schematron.sch | 4 ++-- src/final-JATS-schematron.xsl | 8 ++++++-- src/final-package-JATS-schematron.sch | 4 ++-- src/pre-JATS-schematron.sch | 4 ++-- src/pre-JATS-schematron.xsl | 8 ++++++-- src/schematron.sch | 4 ++-- .../pre-clintrial-conformance-9/pass.xml | 2 +- test/tests/gen/td-child-tests/td-child-test/fail.xml | 2 +- test/tests/gen/td-child-tests/td-child-test/pass.xml | 2 +- .../gen/td-child-tests/td-child-test/td-child-test.sch | 2 +- test/tests/gen/th-child-tests/th-child-test-1/fail.xml | 2 +- test/tests/gen/th-child-tests/th-child-test-1/pass.xml | 2 +- .../th-child-tests/th-child-test-1/th-child-test-1.sch | 2 +- test/xspec/schematron.sch | 4 ++-- 14 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/final-JATS-schematron.sch b/src/final-JATS-schematron.sch index d3259bd2d2..45671cf90d 100644 --- a/src/final-JATS-schematron.sch +++ b/src/final-JATS-schematron.sch @@ -3071,11 +3071,11 @@ - [td-child-test] td cannot contain . Only the following elements are allowed - 'bold', 'italic', 'sup', 'sub', 'sc', 'ext-link', 'xref', 'break', 'named-content', 'monospace', 'code','inline-graphic','underline', and 'inline-formula'. + [td-child-test] td cannot contain . Only the following elements are allowed - . - [th-child-test-1] th cannot contain . Only the following elements are allowed - 'bold', 'italic', 'sup', 'sub', 'sc', 'underline', 'ext-link', 'xref', 'break', 'named-content', 'monospace', 'code', 'inline-graphic', and 'inline-formula'. + [th-child-test-1] th cannot contain . Only the following elements are allowed - . [th-child-test-2] The content of this th element is entirely in emphasis - . Is this correct? diff --git a/src/final-JATS-schematron.xsl b/src/final-JATS-schematron.xsl index e99ccdc924..534b77669a 100644 --- a/src/final-JATS-schematron.xsl +++ b/src/final-JATS-schematron.xsl @@ -17175,7 +17175,9 @@ [td-child-test] td cannot contain - . Only the following elements are allowed - 'bold', 'italic', 'sup', 'sub', 'sc', 'ext-link', 'xref', 'break', 'named-content', 'monospace', 'code','inline-graphic','underline', and 'inline-formula'. + . Only the following elements are allowed - + + . @@ -17206,7 +17208,9 @@ [th-child-test-1] th cannot contain - . Only the following elements are allowed - 'bold', 'italic', 'sup', 'sub', 'sc', 'underline', 'ext-link', 'xref', 'break', 'named-content', 'monospace', 'code', 'inline-graphic', and 'inline-formula'. + . Only the following elements are allowed - + + . diff --git a/src/final-package-JATS-schematron.sch b/src/final-package-JATS-schematron.sch index e5b4f75d11..eaac8f0a52 100644 --- a/src/final-package-JATS-schematron.sch +++ b/src/final-package-JATS-schematron.sch @@ -3077,11 +3077,11 @@ - td cannot contain . Only the following elements are allowed - 'bold', 'italic', 'sup', 'sub', 'sc', 'ext-link', 'xref', 'break', 'named-content', 'monospace', 'code','inline-graphic','underline', and 'inline-formula'. + td cannot contain . Only the following elements are allowed - . - th cannot contain . Only the following elements are allowed - 'bold', 'italic', 'sup', 'sub', 'sc', 'underline', 'ext-link', 'xref', 'break', 'named-content', 'monospace', 'code', 'inline-graphic', and 'inline-formula'. + th cannot contain . Only the following elements are allowed - . The content of this th element is entirely in emphasis - . Is this correct? diff --git a/src/pre-JATS-schematron.sch b/src/pre-JATS-schematron.sch index 4f1edc9801..49c8577e9e 100644 --- a/src/pre-JATS-schematron.sch +++ b/src/pre-JATS-schematron.sch @@ -3016,11 +3016,11 @@ - [td-child-test] td cannot contain . Only the following elements are allowed - 'bold', 'italic', 'sup', 'sub', 'sc', 'ext-link', 'xref', 'break', 'named-content', 'monospace', 'code','inline-graphic','underline', and 'inline-formula'. + [td-child-test] td cannot contain . Only the following elements are allowed - . - [th-child-test-1] th cannot contain . Only the following elements are allowed - 'bold', 'italic', 'sup', 'sub', 'sc', 'underline', 'ext-link', 'xref', 'break', 'named-content', 'monospace', 'code', 'inline-graphic', and 'inline-formula'. + [th-child-test-1] th cannot contain . Only the following elements are allowed - . [th-child-test-2] The content of this th element is entirely in emphasis - . Is this correct? diff --git a/src/pre-JATS-schematron.xsl b/src/pre-JATS-schematron.xsl index 98da489583..91599f5963 100644 --- a/src/pre-JATS-schematron.xsl +++ b/src/pre-JATS-schematron.xsl @@ -17053,7 +17053,9 @@ [td-child-test] td cannot contain - . Only the following elements are allowed - 'bold', 'italic', 'sup', 'sub', 'sc', 'ext-link', 'xref', 'break', 'named-content', 'monospace', 'code','inline-graphic','underline', and 'inline-formula'. + . Only the following elements are allowed - + + . @@ -17084,7 +17086,9 @@ [th-child-test-1] th cannot contain - . Only the following elements are allowed - 'bold', 'italic', 'sup', 'sub', 'sc', 'underline', 'ext-link', 'xref', 'break', 'named-content', 'monospace', 'code', 'inline-graphic', and 'inline-formula'. + . Only the following elements are allowed - + + . diff --git a/src/schematron.sch b/src/schematron.sch index eeab361b4f..2b8cbc06cb 100644 --- a/src/schematron.sch +++ b/src/schematron.sch @@ -5052,7 +5052,7 @@ else self::*/local-name() = $allowed-p-blocks" td cannot contain . Only the following elements are allowed - 'bold', 'italic', 'sup', 'sub', 'sc', 'ext-link', 'xref', 'break', 'named-content', 'monospace', 'code','inline-graphic','underline', and 'inline-formula'. + id="td-child-test">td cannot contain . Only the following elements are allowed - . @@ -5061,7 +5061,7 @@ else self::*/local-name() = $allowed-p-blocks" th cannot contain . Only the following elements are allowed - 'bold', 'italic', 'sup', 'sub', 'sc', 'underline', 'ext-link', 'xref', 'break', 'named-content', 'monospace', 'code', 'inline-graphic', and 'inline-formula'. + id="th-child-test-1">th cannot contain . Only the following elements are allowed - . - + \ No newline at end of file diff --git a/test/tests/gen/td-child-tests/td-child-test/fail.xml b/test/tests/gen/td-child-tests/td-child-test/fail.xml index 1241665709..94a0faf210 100644 --- a/test/tests/gen/td-child-tests/td-child-test/fail.xml +++ b/test/tests/gen/td-child-tests/td-child-test/fail.xml @@ -1,7 +1,7 @@ +Message: td cannot contain . Only the following elements are allowed - . -->