Merge pull request #3 from FAtherden-eLife/appendices

Appendices
fred-atherden · Mar 16, 2020 · 07622bc · 07622bc
2 parents 295a868 + 196084a
commit 07622bc
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/src/support.sch b/src/support.sch
@@ -207,6 +207,8 @@
                 or name()='article-id'
                 or name()='article-meta'
                 or name()='article-title'
+                or name()='app'
+                or name()='app-group'
                 or name()='attrib'
                 or name()='author-notes'
                 or name()='award-group'
@@ -491,6 +493,14 @@
         </rule>
     </pattern>
 
+    <pattern id="app-group_child">
+        <rule context="app-group/*">
+            <assert id="app-group_child-assert-1" test="name()='app'" role="warn">
+                &lt;<name/>&gt; in &lt;app-group&gt; is ignored.
+            </assert>
+        </rule>
+    </pattern>
+
     <pattern id="attrib_parent">
         <rule context="attrib">
             <let name="parent" value="name(..)"/>
@@ -835,6 +845,7 @@
             <assert id="fig_parent-assert-1" test="
                 $parent='body'
                 or $parent='sec'
+                or $parent='app'
                 " role="warn">
                 &lt;<name/>&gt; in &lt;<value-of select="$parent"/>&gt; is ignored.
             </assert>
@@ -934,6 +945,7 @@
                 $parent='body'
                 or $parent='fig'
                 or $parent='sec'
+                or $parent='app'
                 " role="warn">
                 &lt;<name/>&gt; in &lt;<value-of select="$parent"/>&gt; is ignored.
             </assert>
@@ -1352,6 +1364,7 @@
                 or $parent='sec'
                 or $parent='fn'
                 or $parent='list-item'
+                or $parent='app'
             " role="warn">
                 &lt;<name/>&gt; in &lt;<value-of select="$parent"/>&gt; is ignored.
             </assert>
@@ -1816,6 +1829,7 @@
             <assert id="title_parent-assert-1" test="
                 $parent='abstract'
                 or $parent='ack'
+                or $parent='app'
                 or $parent='caption'
                 or $parent='def-list'
                 or $parent='fn-group'

diff --git a/tests/xspec/support.xspec b/tests/xspec/support.xspec
@@ -134,7 +134,12 @@
     </x:scenario>
     <x:scenario label="app-group">
       <x:context href="../cases/app-group.xml"/>
-      <x:expect-assert id="element-whitelist-assert-1" role="warn"/>
+      <x:expect-assert id="app-group_child-assert-1" role="warn"/>
+      <x:expect-assert id="app-group_child-assert-1" role="warn"/>
+      <x:expect-assert id="app-group_child-assert-1" role="warn"/>
+      <x:expect-assert id="app-group_child-assert-1" role="warn"/>
+      <x:expect-assert id="app-group_child-assert-1" role="warn"/>
+      <x:expect-assert id="app-group_child-assert-1" role="warn"/>
       <x:expect-assert id="content-type-assert-1" role="warn"/>
       <x:expect-assert id="fig_parent-assert-1" role="warn"/>
       <x:expect-assert id="graphic_parent-assert-1" role="warn"/>
@@ -145,13 +150,8 @@
     </x:scenario>
     <x:scenario label="app">
       <x:context href="../cases/app.xml"/>
-      <x:expect-assert id="element-whitelist-assert-1" role="warn"/>
       <x:expect-assert id="content-type-assert-1" role="warn"/>
-      <x:expect-assert id="fig_parent-assert-1" role="warn"/>
-      <x:expect-assert id="graphic_parent-assert-1" role="warn"/>
-      <x:expect-assert id="p-assert-1" role="warn"/>
       <x:expect-assert id="ref-list_parent-assert-1" role="warn"/>
-      <x:expect-assert id="title_parent-assert-1" role="warn"/>
     </x:scenario>
     <x:scenario label="array">
       <x:context href="../cases/array.xml"/>