From 1a7fa309a03b74c59a4aeee51ffaa7592b8222ed Mon Sep 17 00:00:00 2001
From: Fred Atherden <43879983+fred-atherden@users.noreply.github.com>
Date: Tue, 20 Feb 2024 15:57:21 +0000
Subject: [PATCH] Add check for paragraphs only containing inline graphic(s)
---
src/final-JATS-schematron.sch | 3 +
src/final-JATS-schematron.xsl | 12 +
src/final-package-JATS-schematron.sch | 3 +
src/pre-JATS-schematron.sch | 3 +
src/pre-JATS-schematron.xsl | 12 +
src/schematron.sch | 7 +
.../gen/p-text-tests/final-p-test-8/fail.xml | 11 +
.../final-p-test-8/final-p-test-8.sch | 1303 +++++++++++++++++
.../gen/p-text-tests/final-p-test-8/pass.xml | 9 +
.../gen/p-text-tests/pre-p-test-8/fail.xml | 11 +
.../gen/p-text-tests/pre-p-test-8/pass.xml | 9 +
.../pre-p-test-8/pre-p-test-8.sch | 1303 +++++++++++++++++
test/xspec/schematron.sch | 3 +
test/xspec/schematron.xspec | 20 +
14 files changed, 2709 insertions(+)
create mode 100644 test/tests/gen/p-text-tests/final-p-test-8/fail.xml
create mode 100644 test/tests/gen/p-text-tests/final-p-test-8/final-p-test-8.sch
create mode 100644 test/tests/gen/p-text-tests/final-p-test-8/pass.xml
create mode 100644 test/tests/gen/p-text-tests/pre-p-test-8/fail.xml
create mode 100644 test/tests/gen/p-text-tests/pre-p-test-8/pass.xml
create mode 100644 test/tests/gen/p-text-tests/pre-p-test-8/pre-p-test-8.sch
diff --git a/src/final-JATS-schematron.sch b/src/final-JATS-schematron.sch
index e4e1a2f6c0..42080b112b 100644
--- a/src/final-JATS-schematron.sch
+++ b/src/final-JATS-schematron.sch
@@ -2518,6 +2518,9 @@
[p-test-3] p element contains - The spacing is incorrect.
+
+
+ [final-p-test-8] p element contains one or more inline-graphics and no other text, which is not permitted.
diff --git a/src/final-JATS-schematron.xsl b/src/final-JATS-schematron.xsl
index e18059b6d6..79110d71a3 100644
--- a/src/final-JATS-schematron.xsl
+++ b/src/final-JATS-schematron.xsl
@@ -13521,6 +13521,18 @@
+
+
+
+
+ final-p-test-8
+ error
+
+
+
+ [final-p-test-8] p element contains one or more inline-graphics and no other text, which is not permitted.
+
+
diff --git a/src/final-package-JATS-schematron.sch b/src/final-package-JATS-schematron.sch
index 305841ec52..b48790f7bb 100644
--- a/src/final-package-JATS-schematron.sch
+++ b/src/final-package-JATS-schematron.sch
@@ -2524,6 +2524,9 @@
p element contains - The spacing is incorrect.
+
+
+ p element contains one or more inline-graphics and no other text, which is not permitted.
diff --git a/src/pre-JATS-schematron.sch b/src/pre-JATS-schematron.sch
index 000c837016..cfb89c94e8 100644
--- a/src/pre-JATS-schematron.sch
+++ b/src/pre-JATS-schematron.sch
@@ -2463,6 +2463,9 @@
[p-test-3] p element contains - The spacing is incorrect.
+ [pre-p-test-8] p element contains one or more inline-graphics and no other text, which is not permitted. Are the image(s) equations or content that should otherwise be captured in a machine readable way?
+
+
diff --git a/src/pre-JATS-schematron.xsl b/src/pre-JATS-schematron.xsl
index da68d15ba2..06e7a145be 100644
--- a/src/pre-JATS-schematron.xsl
+++ b/src/pre-JATS-schematron.xsl
@@ -13406,6 +13406,18 @@
+
+
+
+
+ pre-p-test-8
+ warning
+
+
+
+ [pre-p-test-8] p element contains one or more inline-graphics and no other text, which is not permitted. Are the image(s) equations or content that should otherwise be captured in a machine readable way?
+
+
diff --git a/src/schematron.sch b/src/schematron.sch
index 6b0da9bc80..16c9531c11 100644
--- a/src/schematron.sch
+++ b/src/schematron.sch
@@ -3801,6 +3801,13 @@
role="error"
id="p-test-3">p element contains - The spacing is incorrect.
+ p element contains one or more inline-graphics and no other text, which is not permitted. Are the image(s) equations or content that should otherwise be captured in a machine readable way?
+
+ p element contains one or more inline-graphics and no other text, which is not permitted.
diff --git a/test/tests/gen/p-text-tests/final-p-test-8/fail.xml b/test/tests/gen/p-text-tests/final-p-test-8/fail.xml
new file mode 100644
index 0000000000..40c037bf2d
--- /dev/null
+++ b/test/tests/gen/p-text-tests/final-p-test-8/fail.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/tests/gen/p-text-tests/final-p-test-8/final-p-test-8.sch b/test/tests/gen/p-text-tests/final-p-test-8/final-p-test-8.sch
new file mode 100644
index 0000000000..af5d176f55
--- /dev/null
+++ b/test/tests/gen/p-text-tests/final-p-test-8/final-p-test-8.sch
@@ -0,0 +1,1303 @@
+
+ eLife Schematron
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ cite
+
+
+
+
+
+
+
+
+
+
+ box
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ roman
+
+
+
+
+
+
+
+
+
+
+
+
+
+ roman
+
+
+
+
+
+
+ italic
+
+
+
+
+
+
+
+
+
+
+
+
+
+ italic
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ p element contains one or more inline-graphics and no other text, which is not permitted.
+
+
+
+
+ p[not(inline-formula or disp-formula or code)] must be present.
+
+
+
\ No newline at end of file
diff --git a/test/tests/gen/p-text-tests/final-p-test-8/pass.xml b/test/tests/gen/p-text-tests/final-p-test-8/pass.xml
new file mode 100644
index 0000000000..d65a04ddb8
--- /dev/null
+++ b/test/tests/gen/p-text-tests/final-p-test-8/pass.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ some text
+
+
\ No newline at end of file
diff --git a/test/tests/gen/p-text-tests/pre-p-test-8/fail.xml b/test/tests/gen/p-text-tests/pre-p-test-8/fail.xml
new file mode 100644
index 0000000000..561686b473
--- /dev/null
+++ b/test/tests/gen/p-text-tests/pre-p-test-8/fail.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/tests/gen/p-text-tests/pre-p-test-8/pass.xml b/test/tests/gen/p-text-tests/pre-p-test-8/pass.xml
new file mode 100644
index 0000000000..aee13cef78
--- /dev/null
+++ b/test/tests/gen/p-text-tests/pre-p-test-8/pass.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ some text
+
+
\ No newline at end of file
diff --git a/test/tests/gen/p-text-tests/pre-p-test-8/pre-p-test-8.sch b/test/tests/gen/p-text-tests/pre-p-test-8/pre-p-test-8.sch
new file mode 100644
index 0000000000..b5442926bb
--- /dev/null
+++ b/test/tests/gen/p-text-tests/pre-p-test-8/pre-p-test-8.sch
@@ -0,0 +1,1303 @@
+
+ eLife Schematron
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ cite
+
+
+
+
+
+
+
+
+
+
+ box
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ roman
+
+
+
+
+
+
+
+
+
+
+
+
+
+ roman
+
+
+
+
+
+
+ italic
+
+
+
+
+
+
+
+
+
+
+
+
+
+ italic
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ p element contains one or more inline-graphics and no other text, which is not permitted. Are the image(s) equations or content that should otherwise be captured in a machine readable way?
+
+
+
+
+ p[not(inline-formula or disp-formula or code)] must be present.
+
+
+
\ No newline at end of file
diff --git a/test/xspec/schematron.sch b/test/xspec/schematron.sch
index 00f5a15444..a3e9ebeb8e 100644
--- a/test/xspec/schematron.sch
+++ b/test/xspec/schematron.sch
@@ -2970,6 +2970,9 @@
p element contains - The spacing is incorrect.
+ p element contains one or more inline-graphics and no other text, which is not permitted. Are the image(s) equations or content that should otherwise be captured in a machine readable way?
+
+ p element contains one or more inline-graphics and no other text, which is not permitted.
diff --git a/test/xspec/schematron.xspec b/test/xspec/schematron.xspec
index fc0ebfc35b..dfc3244dcc 100644
--- a/test/xspec/schematron.xspec
+++ b/test/xspec/schematron.xspec
@@ -4129,6 +4129,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+