Remove possible redundency in various mixed content contexts

[rockivist]

From emails to me from Ruth Kitchin Tillman:

Each of head01/02/03 follows the following pattern. `

               <zeroOrMore>
                   <choice>
                       <text/>
                       <ref name="m.mixed.basic"/>
                   </choice>
               </zeroOrMore>

`

I think everything inside and including zeroOrMore is made redundant by referencing m.mixed.basic, which is defined as:

`

Just by referencing m.mixed.basic you already get the zeroOrMore, the choice, and the option to have`.

It's similar in <entry> (defined under <row>) where you have:

 `<zeroOrMore>
    <choice>
       <text/>
       <ref name="m.para.content"/>
       </choice>
   </zeroOrMore>`

Where m.para.content is already defined as:

`

   <ref name="m.access.title"/>
   <ref name="e.list"/>

and m.mixed.basic.plus includes. Unlike above, you'd still need the, but the` is included and includes text.

Ruth

[rockivist]

And another email from Ruth:

Both <bibref> and <archref> include the following:

       `<zeroOrMore>
           <choice>
              <ref name="m.mixed.basic.plus.access"/>
           </choice>
       </zeroOrMore>`

m.mixed.basic.plus.access already has both the zeroOrMore and choice.

`

`

...of course, it's possible that this kind of nested choice is a good thing, in which most of my emails shouldn't require any changes. I'm just diagramming it out and it seems redundant. Best, Ruth

[rockivist]

A third one from Ruth:

With this, I've finished going through the entire document. I decided to share all my notes here: bit.ly/EAD3NotesRuth (added about 40 pages to the 65 or so I got from pasting it in). Now I've got my notes for a preliminary EADiva rewrite (doing on a sub-site) to check against the tag library when it goes live/future versions of the schema.

1) <p> & <event> content are both defined as: `

`

while m.para.content already contains both choice & text: `

`

[rockivist]

Implemented. Individual commits are not tagged - too many to tag them all.