#52: fix mixed-nomenclature model

plazi · Jan 30, 2023 · 1bf401e · 1bf401e
1 parent 579648f
commit 1bf401e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/taxpubcustom-elements-NS0-v1.ent b/taxpubcustom-elements-NS0-v1.ent
@@ -7,7 +7,7 @@ Delivered as file "taxpubcustom-elements-NS0-v1.ent"                       -->
 <!-- =============================================================  -->
 
 
-<!ELEMENT	tp:taxon-treatment 		(tp:treatment-meta?, tp:nomenclature , (tp:treatment-sec | tp:taxon-treatment)*, ref-list?  ) >
+<!ELEMENT	tp:taxon-treatment 		(tp:treatment-meta?, (tp:nomenclature | tp:mixed-nomenclature) , (tp:treatment-sec | tp:taxon-treatment)*, ref-list?  ) >
 <!ATTLIST 	tp:taxon-treatment
 					%jats-common-atts;
 					auth-code		CDATA			#IMPLIED 
@@ -48,8 +48,8 @@ Delivered as file "taxpubcustom-elements-NS0-v1.ent"                       -->
 -->
 
 
-<!ELEMENT	tp:mixed-nomenclature  	    %mixed-nomenclature-model;	>
-<!ATTLIST 	tp:nomenclature
+<!ELEMENT	tp:mixed-nomenclature  	%mixed-nomenclature-model;  	>
+<!ATTLIST 	tp:mixed-nomenclature
 					%jats-common-atts; >
 <!--
 ~tp:mixed-nomenclature~

diff --git a/taxpubcustom-models-NS0-v1.ent b/taxpubcustom-models-NS0-v1.ent
@@ -662,10 +662,10 @@ Delivered as file "taxpubcustom-models-NS0-v1.ent"                       -->
 -->
 
 <!--                    CONTENT MODEL FOR MIXED-NOMENCLATURE SEC      -->
-<!--
-<!ENTITY % mixed-nomenclature-model     "(sec-meta?, label?, tp:taxon-name | tp:taxon-authority? | tp:taxon-status? | xref | tp:nomenclature-citation-list* | 
-                                                    (tp:type-genus | tp:type-species)? | tp:taxon-type-location? | x)*)" >
--->				
+
+<!ENTITY % mixed-nomenclature-model     "(#PCDATA | tp:taxon-name | tp:taxon-authority | tp:taxon-status | xref | tp:nomenclature-citation-list | 
+                                          tp:type-genus | tp:type-species | tp:taxon-type-location)*" >
+
 <!--                    CONTENT MODEL FOR NOMENCLATURE SEC      -->
 <!ENTITY % nomenclature-model           "(sec-meta?, label?, tp:taxon-name, x?, tp:taxon-authority?, x?, tp:taxon-status?, x?, tp:taxon-identifier*, xref* , x?, tp:nomenclature-citation-list*, x?,
                                                         (tp:type-genus | tp:type-species)?, x?, tp:taxon-type-location?, x?)" >

diff --git a/test-v1.xml b/test-v1.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE tp:taxon-treatment SYSTEM "file:/Users/thc4/Github/TaxPub/tax-treatment-NS0-v1.dtd">
+<tp:taxon-treatment xmlns:tp="http://www.plazi.org/taxpub">
+
+</tp:taxon-treatment>