Skip to content

Feature schema ref #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bwbohl wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Feature schema ref #15

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
63ed7a9
make change of schemaRef optional and parametrizeable
bwbohl Jul 8, 2015
d7d5e0e
fix typo
bwbohl Jul 8, 2015
0ec3b1c
changed repository reference
bwbohl Jul 23, 2015
47d5d3d
retain old schemaRef if no new value is given
bwbohl Jul 23, 2015
cb0449c
add latest schema ref and verify @meiversion.num
bwbohl Jul 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 33 additions & 10 deletions 04 MEI cleaning/improveMusic.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,16 @@

<xd:doc scope="component">
<xd:desc>
<xd:p>Define output method as UTH-8 encoded XML with identation.</xd:p>
<xd:p>Define output method as UTF-8 encoded XML with identation.</xd:p>
</xd:desc>
</xd:doc>
<xsl:output method="xml" indent="yes" encoding="UTF-8"/>

<xd:doc scope="component">
<xd:desc>The newSchemaRef parameter defines a new URL for RNG and Schematron schemata; if empty the existing schemaRef will be retained</xd:desc>
</xd:doc>
<xsl:param name="newSchemaRef">https://raw.githubusercontent.com/music-encoding/music-encoding/MEI2013_v2.1.1/schemata/mei-all.rng</xsl:param>

<xd:doc scope="component">
<xd:desc>
<xd:p>Parameter for mdiv id</xd:p>
Expand Down Expand Up @@ -206,6 +211,17 @@
</xsl:copy>
</xsl:template>

<xd:doc scope="component">
<xd:desc>
<xd:p>this template takes care that mei:mei element holds meiversion.num</xd:p>
</xd:desc>
</xd:doc>
<xsl:template match="@meiversion.num" mode="lastRun">
<xsl:attribute name="meiversion.num">
<xsl:value-of select="tokenize(substring-after($newSchemaRef,'MEI2013_v'),'/')[1]"/>
</xsl:attribute>
</xsl:template>

<xd:doc scope="component">
<xd:desc>
<xd:p>mei:pb elements are to be excluded from the result, as notation program specific page breaks are irrelevant for the project.</xd:p>
Expand Down Expand Up @@ -748,7 +764,7 @@
<xsl:element name="changeDesc" namespace="http://www.music-encoding.org/ns/mei">
<xsl:variable name="text">
Content of <xsl:value-of select="$fileName"/> processed with <xsl:element name="ref" namespace="http://www.music-encoding.org/ns/mei">
<xsl:attribute name="target" select="concat('https://github.com/Freischuetz-Digital/Tools/blob/',$FreiDi-Tools_version,'/04%20MEI%20cleaning/improveMusic.xsl')"/>improveMusic.xsl</xsl:element> from Freischütz Digital Tools <xsl:value-of select="$FreiDi-Tools_version"/> in order to resolve mei:bTrems, mei:fTrems, intermediary mei:scoreDefs and mei:staffDef, transform mei:artic and mei:accid to respective attributes, etc.</xsl:variable>
<xsl:attribute name="target" select="concat('https://github.com/Detmolder-Hoftheater/Tools/blob/',$FreiDi-Tools_version,'/04%20MEI%20cleaning/improveMusic.xsl')"/>improveMusic.xsl</xsl:element> from Freischütz Digital Tools <xsl:value-of select="$FreiDi-Tools_version"/> in order to resolve mei:bTrems, mei:fTrems, intermediary mei:scoreDefs and mei:staffDef, transform mei:artic and mei:accid to respective attributes, etc.</xsl:variable>

<xsl:element name="p" namespace="http://www.music-encoding.org/ns/mei">
<xsl:value-of select="normalize-space($text)"/>
Expand Down Expand Up @@ -783,15 +799,22 @@
</xd:doc>
<xsl:template match="processing-instruction('xml-model')" mode="lastRun">
<xsl:choose>
<xsl:when test="contains(.,'relaxng')">
<xsl:processing-instruction name="xml-model">href="../../../schemata/rng/freidi-schema-musicSource.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"</xsl:processing-instruction>
</xsl:when>
<xsl:when test="contains(.,'schematron')">
<xsl:processing-instruction name="xml-model">href="../../../schemata/rng/freidi-schema-musicSource.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"</xsl:processing-instruction>
<xsl:when test="$newSchemaRef!=''">
<xsl:choose>
<xsl:when test="contains(.,'relaxng')">
<xsl:processing-instruction name="xml-model"><xsl:text>href="</xsl:text><xsl:value-of select="$newSchemaRef"/><xsl:text>" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"</xsl:text></xsl:processing-instruction>
</xsl:when>
<xsl:when test="contains(.,'schematron')">
<xsl:processing-instruction name="xml-model"><xsl:text>href="</xsl:text><xsl:value-of select="$newSchemaRef"/><xsl:text>" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"</xsl:text></xsl:processing-instruction>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates select="." mode="#current"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates select="." mode="#current"/>
</xsl:otherwise>
<xsl:otherwise>
<xsl:copy/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>

Expand Down