Skip to content

Commit

Permalink
Initial fix for schema and updating stylesheets
Browse files Browse the repository at this point in the history
  • Loading branch information
@joeytakeda
joeytakeda committed Feb 20, 2025
1 parent f0e0289 commit 2f89dce
Show file tree
Hide file tree
Showing 6 changed files with 659 additions and 1,550 deletions.
2 changes: 1 addition & 1 deletion Stylesheets
Submodule Stylesheets updated 518 files
4 changes: 2 additions & 2 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@
<arg line="-s:${schemaDir}/lim.expanded.odd"/>
<arg line="-o:${schemaDir}/lim.rng"/>
</java>
<!-- <!-\-And now adjust the RNG to allow person elements in any order-\->
<!--And now adjust the RNG to allow person elements in any order-->
<move file="${schemaDir}/lim.rng" tofile="${schemaDir}/lim.rng.tmp"/>
<java jar="${saxon}" fork="true">
<arg line="-xsl:${basedir}/code/schema/fix_rng.xsl"/>
<arg line="-s:${schemaDir}/lim.rng.tmp"/>
<arg line="-o:${schemaDir}/lim.rng"/>
</java>-->
</java>
</target>


Expand Down
58 changes: 37 additions & 21 deletions schema/lim.full.odd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@
<memberOf key="model.publicationStmtPart.detail"/>
<memberOf key="att.datable.w3c" mode="add"/>
<memberOf key="att.global.rendition" mode="add"/>
<memberOf key="lim.att.global.fragmentable" mode="add"/>
</classes>

</elementSpec><elementSpec ident="del" module="core" mode="change">
Expand Down Expand Up @@ -1176,8 +1177,11 @@
</constraintSpec>
</elementSpec><elementSpec ident="settingDesc" module="corpus" mode="change">
<content>
<elementRef key="setting" minOccurs="1" maxOccurs="unbounded"/>
<elementRef key="note" minOccurs="0" maxOccurs="1"/>
<sequence>
<elementRef key="setting" minOccurs="1" maxOccurs="unbounded"/>
<elementRef key="note" minOccurs="0" maxOccurs="1"/>
</sequence>

</content>
</elementSpec>
<moduleRef key="header" include="abstract catDesc catRef category change correspAction correspContext correspDesc creation encodingDesc extent fileDesc handNote idno langUsage language listChange listPrefixDef notesStmt prefixDef profileDesc projectDesc publicationStmt rendition revisionDesc sourceDesc tagsDecl taxonomy teiHeader textClass titleStmt"/><elementSpec ident="change" mode="change" module="header">
Expand Down Expand Up @@ -1255,9 +1259,10 @@
</sequence>
<elementRef key="locus" minOccurs="1" maxOccurs="2"/>
</alternate>
<elementRef key="abstact" minOccurs="0" maxOccurs="1"/>
<elementRef key="abstract" minOccurs="0" maxOccurs="1"/>
<elementRef key="langUsage" minOccurs="0" maxOccurs="1"/>
<elementRef key="limItem"/>
<elementRef key="handNotes" minOccurs="0" maxOccurs="1"/>
</sequence>
<elementRef key="catRef"/>
</alternate>
Expand Down Expand Up @@ -2417,9 +2422,12 @@
<memberOf key="att.docStatus" mode="delete"/>
</classes>
<content>
<elementRef key="objectName" minOccurs="0" maxOccurs="1"/>
<elementRef key="note" minOccurs="0" maxOccurs="1"/>
<elementRef key="linkGrp" minOccurs="0" maxOccurs="1"/>
<sequence>
<elementRef key="objectName" minOccurs="0" maxOccurs="1"/>
<elementRef key="note" minOccurs="0" maxOccurs="1"/>
<elementRef key="linkGrp" minOccurs="0" maxOccurs="1"/>
</sequence>

</content>
<remarks mode="add">
<p>Our use of object is not TEI conformant, but the break is fairly
Expand All @@ -2431,14 +2439,17 @@
<memberOf key="att.global.linking" mode="add"/>
</classes>
<content>
<!--Orgs must have an orgName-->
<elementRef key="orgName" minOccurs="1" maxOccurs="unbounded"/>
<!--Also needs a note-->
<elementRef key="note" minOccurs="0" maxOccurs="1"/>
<!--And may include a ptrGrp-->
<elementRef key="linkGrp" minOccurs="0" maxOccurs="1"/>
<!--And may have a list of suborganizations below it-->
<elementRef key="listOrg" minOccurs="0" maxOccurs="1"/>
<sequence>
<!--Orgs must have an orgName-->
<elementRef key="orgName" minOccurs="1" maxOccurs="unbounded"/>
<!--Also needs a note-->
<elementRef key="note" minOccurs="0" maxOccurs="1"/>
<!--And may include a ptrGrp-->
<elementRef key="linkGrp" minOccurs="0" maxOccurs="1"/>
<!--And may have a list of suborganizations below it-->
<elementRef key="listOrg" minOccurs="0" maxOccurs="1"/>
</sequence>

</content>
<attList>
<attDef ident="xml:id" mode="change" usage="req">
Expand Down Expand Up @@ -2496,9 +2507,12 @@
<memberOf key="att.global.linking" mode="add"/>
</classes>
<content>
<macroRef key="lim.personMacro"/>
<!--Add linkGrp optionally only for person, not persona-->
<elementRef key="linkGrp" minOccurs="0" maxOccurs="1"/>
<sequence>
<macroRef key="lim.personMacro"/>
<!--Add linkGrp optionally only for person, not persona-->
<elementRef key="linkGrp" minOccurs="0" maxOccurs="1"/>
</sequence>

</content>
<constraintSpec ident="person.constraints" scheme="schematron">
<desc>Various constraints for the different models for contributors and non-contributors.</desc>
Expand Down Expand Up @@ -2539,10 +2553,12 @@
<memberOf key="att.global.linking" mode="add"/>
</classes>
<content>
<elementRef key="placeName" minOccurs="0" maxOccurs="unbounded"/>
<elementRef key="location" minOccurs="0" maxOccurs="1"/>
<elementRef key="note" minOccurs="0" maxOccurs="1"/>
<elementRef key="linkGrp" minOccurs="0" maxOccurs="1"/>
<sequence>
<elementRef key="placeName" minOccurs="0" maxOccurs="unbounded"/>
<elementRef key="location" minOccurs="0" maxOccurs="1"/>
<elementRef key="note" minOccurs="0" maxOccurs="1"/>
<elementRef key="linkGrp" minOccurs="0" maxOccurs="1"/>
</sequence>
</content>
<constraintSpec ident="place.mustHaveProperId" scheme="schematron">
<desc>All people must have a proper id.</desc>
Expand Down
Loading

0 comments on commit 2f89dce

Please sign in to comment.