Merge branch 'master' of https://github.com/msDesc/consolidated-tei-s…

…chema
msDesc · Jan 15, 2024 · 57cf5d0 · 57cf5d0
2 parents 34f8837 + 6551cd0
commit 57cf5d0
Show file tree

Hide file tree

Showing 8 changed files with 578 additions and 523 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,6 @@ The direct URLs for validating (e.g. to paste into an `xml-model` declaration or
 
 Also provided is documentation, including details of the customization and guidelines for people using it to encode manuscript descriptions. [HTML](https://msdesc.github.io/consolidated-tei-schema/msdesc.html) and [PDF](https://msdesc.github.io/consolidated-tei-schema/msdesc.pdf) versions are available (generated from the ODD file.)
 
-The repository also contains templates that may be used as starting points by cataloguers. [template.xml](/template.xml) is for manuscripts comprising a single codicological unit, and [template-msPart.xml](/template-msPart.xml) is for manuscripts comprising more than one codicological unit.
+The repository also contains templates that may be used as starting points by cataloguers. [template.xml](/template.xml) is for manuscripts comprising a single codicological unit, and [template-msPart.xml](/template-msPart.xml) is for manuscripts comprising more than one codicological unit. Both are also provided in simplified forms that may be more suitable for beginning cataloguers and teaching use.
 
 Finally, this repository is additionally the location for library files used by XSL and XQuery scripts in the catalogue repositories to process the TEI (e.g. converting into HTML, generating indexes for [Blacklight](http://projectblacklight.org/)-based web sites.
diff --git a/alternatives/document.xsd b/alternatives/document.xsd
@@ -3,7 +3,7 @@
   <xs:import namespace="http://www.w3.org/2001/XInclude" schemaLocation="xinclude.xsd"/>
   <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
   <!--
-    Schema generated from ODD source 2023-07-21T08:55:05Z. .
+    Schema generated from ODD source 2023-11-20T15:36:59Z. .
     TEI Edition: Version 4.6.0. Last updated on
             4th April 2023, revision f18deffba
     TEI Edition Location: https://www.tei-c.org/Vault/P5/Version 4.6.0/

diff --git a/alternatives/msdesc.dtd b/alternatives/msdesc.dtd
@@ -1,6 +1,6 @@
 
 <!--
-DTD generated from ODD source 2023-07-21T08:53:51Z. .[https://creativecommons.org/licenses/by/4.0/] Creative Commons Attribution 4.0 International
+DTD generated from ODD source 2023-11-20T15:37:44Z. .[https://creativecommons.org/licenses/by/4.0/] Creative Commons Attribution 4.0 International
 TEI Edition: Version 4.6.0. Last updated on
         4th April 2023, revision f18deffba
 TEI Edition Location: https://www.tei-c.org/Vault/P5/Version 4.6.0/

diff --git a/docs/msdesc.html b/docs/msdesc.html
diff --git a/docs/msdesc.pdf b/docs/msdesc.pdf
diff --git a/msdesc.odd b/msdesc.odd
@@ -5190,6 +5190,20 @@
                             </constraint>
                         </constraintSpec>
 
+                        <!-- Warn about empty dimension elements -->
+                        <constraintSpec ident="emptyDimensions.warn" scheme="schematron">
+                            <constraint>
+                                <sch:rule 
+                                    context="tei:height|tei:width">
+                                    <sch:assert 
+                                        test="string-length(normalize-space(string())) gt 0"
+                                        role="warn">
+                                        For dimensions the website displays the content of height and width elements. Attribute values are not displayed. Empty elements will not display correctly.
+                                    </sch:assert>
+                                </sch:rule>
+                            </constraint>
+                        </constraintSpec>
+
                     </classSpec>
 
 

diff --git a/msdesc.rng b/msdesc.rng
diff --git a/msdesc2html.xsl b/msdesc2html.xsl
@@ -2205,6 +2205,27 @@
             </ul>
         </div>
     </xsl:template>
+
+    <!-- Basic support for biblStruct -->
+    <xsl:template match="additional/listBibl/biblStruct">
+        <span class="{name()}">
+            <i><xsl:value-of select=".//title"/></i>
+            <xsl:text>, </xsl:text>
+            <xsl:for-each select=".//author">
+                <xsl:value-of select="surname"/>
+                <xsl:text>, </xsl:text>
+                <xsl:value-of select="forename"/>
+            </xsl:for-each>
+            <xsl:if test=".//imprint">
+                <xsl:text> (</xsl:text>
+                <xsl:value-of select="string-join(.//imprint/*, ', ')"/>
+                <xsl:text>)</xsl:text>
+            </xsl:if>
+        </span>
+    </xsl:template>
+
+    <!-- Block other children of biblStruct besides the basic ones used above -->
+    <xsl:template match="additional/listBibl/biblStruct/*"/>
 
     <xsl:template match="additional/surrogates">
         <div class="surrogates">