Re-added the "head" element, which was missing, though still referenced (at the moment) for EAC-CPF (generalContext structureOrGenealogy) as "element.head.optional"; while removed from those elements that include "head" next to the block formatting elements in EAD3, the element is still kept with "identificationData" and the numbered and unnumbered "c" elements.
On the other hand "num" is to be removed (same as the other mixed content element from EAD3) and replaced by "referringString". I have therefore removed the model "model.mixed-content-plus-num.optional".
Also included a comment that "abbreviation" can be deleted.
Added "element.head.optional" to "identificationData" and the numbered and unnumbered "c" elements
Changed the mixed content model for "physFacet" and "unitTitle" from "model.mixed-content-plus-num.optional" to "model.mixed-content.optional"
Changed the attribute group "attribute-group.global-plus-lang-and-script-and-localType-pair.optional" to "attribute-group.global-plus-base-lang-and-script.optional" for "identificationDataNote", i.e. removing "localType" and "localTypeDeclaration"
Changed the definition of formattingExtension from "element.formattingExtension.optional" to "element.formattingExtension" as this had resulted in "formattingExtension" being specifically defined as optional in "findAidDesc", while it should be defined as the other sub-elements of "findAidDesc".
Also renamed the reference in the model "model.narrative-group.optional" accordingly and changed the occurrence of "formattingExtension" from zeroOrMore to optional
Added the choice between "p" and "formattingExtension" to "descriptionOfComponents"
Re-added the "head" element, which was missing, though still referenced (at the moment) for EAC-CPF (generalContext structureOrGenealogy) as "element.head.optional"; while removed from those elements that include "head" next to the block formatting elements in EAD3, the element is still kept with "identificationData" and the numbered and unnumbered "c" elements.
On the other hand "num" is to be removed (same as the other mixed content element from EAD3) and replaced by "referringString". I have therefore removed the model "model.mixed-content-plus-num.optional".
Also included a comment that "abbreviation" can be deleted.
Added "element.head.optional" to "identificationData" and the numbered and unnumbered "c" elements
Changed the mixed content model for "physFacet" and "unitTitle" from "model.mixed-content-plus-num.optional" to "model.mixed-content.optional"
Changed the attribute group "attribute-group.global-plus-lang-and-script-and-localType-pair.optional" to "attribute-group.global-plus-base-lang-and-script.optional" for "identificationDataNote", i.e. removing "localType" and "localTypeDeclaration"
Changed the definition of formattingExtension from "element.formattingExtension.optional" to "element.formattingExtension" as this had resulted in "formattingExtension" being specifically defined as optional in "findAidDesc", while it should be defined as the other sub-elements of "findAidDesc".
Also renamed the reference in the model "model.narrative-group.optional" accordingly and changed the occurrence of "formattingExtension" from zeroOrMore to optional
Added the choice between "p" and "formattingExtension" to "descriptionOfComponents"