Skip to content
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

some final updates #120

Merged
merged 2 commits into from
Feb 7, 2025
Merged

some final updates #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9224dd
some final updates
rettinghaus Feb 7, 2025
ca47c21
updates with keeping analytical markup
rettinghaus Feb 7, 2025
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
6 changes: 3 additions & 3 deletions _tests/artic/artic-002.mei
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-model href="https://music-encoding.org/schema/5.0/mei-all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
<?xml-model href="https://music-encoding.org/schema/5.0/mei-all.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
<mei xmlns="http://www.music-encoding.org/ns/mei" meiversion="5.0">
<?xml-model href="https://music-encoding.org/schema/5.1/mei-all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
<?xml-model href="https://music-encoding.org/schema/5.1/mei-all.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
<mei xmlns="http://www.music-encoding.org/ns/mei" meiversion="5.1">
<meiHead>
<fileDesc>
<titleStmt>
Expand Down
8 changes: 4 additions & 4 deletions _tests/clef/clef-006.mei
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<measure n="1">
<staff n="1">
<layer n="1">
<note dur="1" oct="3" pname="g">
<note xml:id="n6iio2o" dur="1" oct="3" pname="g">
<verse>
<syl>Sol!</syl>
</verse>
Expand All @@ -70,7 +70,7 @@
</staff>
<staff n="2">
<layer n="1">
<note dur="1" oct="3" pname="g">
<note xml:id="n1uirdzn" dur="1" oct="3" pname="g">
<verse>
<syl>Sol!</syl>
</verse>
Expand All @@ -81,12 +81,12 @@
<measure right="dbl" n="2">
<staff n="1">
<layer n="1">
<mRest fermata="above" />
<mRest xml:id="m1hab2jh" fermata="above" />
</layer>
</staff>
<staff n="2">
<layer n="1">
<mRest fermata="above" />
<mRest xml:id="m1jo4cik" fermata="above" />
</layer>
</staff>
</measure>
Expand Down
4 changes: 2 additions & 2 deletions _tests/fermata/fermata-002.mei
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
<fermata staff="1" startid="#chord-000000067789064" form="inv" shape="angular" place="below" />
<fermata staff="1" startid="#rest-000000131319457" form="norm" shape="square" place="above" />
<fermata staff="1" startid="#rest-000000070546468" form="inv" shape="square" place="above" />
<fermata staff="1" tstamp="5.000000" place="above" />
<fermata staff="1" tstamp="5.000000" place="below" />
<fermata staff="1" tstamp="5" place="above" />
<fermata staff="1" tstamp="5" place="below" />
</measure>
<measure right="end" n="2">
<staff n="1">
Expand Down
10 changes: 5 additions & 5 deletions _tests/mensural/mensural-004.mei
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-model href="https://music-encoding.org/schema/5.0/mei-Mensural.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
<?xml-model href="https://music-encoding.org/schema/5.0/mei-Mensural.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
<mei xmlns="http://www.music-encoding.org/ns/mei" meiversion="5.0">
<?xml-model href="https://music-encoding.org/schema/5.1/mei-all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
<?xml-model href="https://music-encoding.org/schema/5.1/mei-all.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
<mei xmlns="http://www.music-encoding.org/ns/mei" meiversion="5.1">
<meiHead>
<fileDesc>
<titleStmt>
Expand Down Expand Up @@ -31,7 +31,7 @@
<score>
<scoreDef>
<staffGrp>
<staffDef n="1" lines="5" clef.shape="G" clef.line="2" notationtype="mensural.black" />
<staffDef n="1" notationtype="mensural.black" lines="5" clef.shape="G" clef.line="2" />
</staffGrp>
</scoreDef>
<section>
Expand All @@ -56,4 +56,4 @@
</mdiv>
</body>
</music>
</mei>
</mei>
6 changes: 3 additions & 3 deletions _tests/mensural/mensural-007.mei
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-model href="https://music-encoding.org/schema/5.0/mei-Mensural.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
<?xml-model href="https://music-encoding.org/schema/5.0/mei-Mensural.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
<mei xmlns="http://www.music-encoding.org/ns/mei" meiversion="5.0">
<?xml-model href="https://music-encoding.org/schema/5.1/mei-all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
<?xml-model href="https://music-encoding.org/schema/5.1/mei-all.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
<mei xmlns="http://www.music-encoding.org/ns/mei" meiversion="5.1">
<meiHead>
<fileDesc>
<titleStmt>
Expand Down
72 changes: 36 additions & 36 deletions _tests/mensural/mensural-008.mei
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-model href="https://music-encoding.org/schema/5.0/mei-all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
<?xml-model href="https://music-encoding.org/schema/5.0/mei-all.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
<mei xmlns="http://www.music-encoding.org/ns/mei" meiversion="5.0">
<?xml-model href="https://music-encoding.org/schema/5.1/mei-all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
<?xml-model href="https://music-encoding.org/schema/5.1/mei-all.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
<mei xmlns="http://www.music-encoding.org/ns/mei" meiversion="5.1">
<meiHead>
<fileDesc>
<titleStmt>
Expand Down Expand Up @@ -34,72 +34,72 @@
<score>
<scoreDef>
<staffGrp n="1" symbol="bracket">
<staffDef clef.line="3" clef.shape="C" lines="5" modusmaior="2" modusminor="2" n="1" notationtype="mensural" prolatio="2" tempus="3">
<staffDef n="1" notationtype="mensural" lines="5" clef.shape="C" clef.line="3" modusmaior="2" modusminor="2" prolatio="2" tempus="3">
<label>default</label>
</staffDef>
<staffDef clef.line="3" clef.shape="C" lines="5" modusmaior="2" modusminor="2" n="2" notationtype="mensural" prolatio="2" tempus="3">
<staffDef n="2" notationtype="mensural" lines="5" clef.shape="C" clef.line="3" modusmaior="2" modusminor="2" prolatio="2" tempus="3">
<label>dotOfPerf</label>
</staffDef>
<staffDef clef.line="3" clef.shape="C" lines="5" modusmaior="2" modusminor="2" n="3" notationtype="mensural" prolatio="2" tempus="3">
<staffDef n="3" notationtype="mensural" lines="5" clef.shape="C" clef.line="3" modusmaior="2" modusminor="2" prolatio="2" tempus="3">
<label>smallNote</label>
</staffDef>
<staffDef clef.line="3" clef.shape="C" lines="5" modusmaior="2" modusminor="2" n="4" notationtype="mensural" prolatio="2" tempus="3">
<staffDef n="4" notationtype="mensural" lines="5" clef.shape="C" clef.line="3" modusmaior="2" modusminor="2" prolatio="2" tempus="3">
<label>ref</label>
</staffDef>
</staffGrp>
</scoreDef>
<section>
<staff n="1">
<layer n="1">
<mensur modusmaior="2" modusminor="2" prolatio="2" tempus="3" sign="O" dot="false"/>
<mensur modusmaior="2" modusminor="2" prolatio="2" tempus="3" dot="false" sign="O" />
<!-- 1 Semibreve - Imperfection a.p.p. -->
<note dur="brevis" oct="4" pname="c" color="violet"/>
<note dur="semibrevis" oct="4" pname="c"/>
<barLine form="dashed"/>
<note dur="brevis" oct="4" pname="c"/>
<barLine form="dashed"/>
<note dur="brevis" oct="4" pname="c" color="violet" />
<note dur="semibrevis" oct="4" pname="c" />
<barLine form="dashed" />
<note dur="brevis" oct="4" pname="c" />
<barLine form="dashed" />
</layer>
</staff>
<staff n="2">
<layer n="1">
<mensur modusmaior="2" modusminor="2" prolatio="2" tempus="3" sign="O" dot="false"/>
<mensur modusmaior="2" modusminor="2" prolatio="2" tempus="3" dot="false" sign="O" />
<!-- 1 Semibreve - EXCEPTION: Dot of Division - Imperfection a.p.a. -->
<note dur="brevis" oct="4" pname="c"/>
<dot/>
<barLine form="dashed"/>
<note dur="semibrevis" oct="4" pname="c"/>
<note dur="brevis" oct="4" pname="c" color="violet"/>
<barLine form="dashed"/>
<note dur="brevis" oct="4" pname="c" />
<dot />
<barLine form="dashed" />
<note dur="semibrevis" oct="4" pname="c" />
<note dur="brevis" oct="4" pname="c" color="violet" />
<barLine form="dashed" />
</layer>
</staff>
<staff n="3">
<layer n="1">
<mensur modusmaior="2" modusminor="2" prolatio="2" tempus="3" sign="O" dot="false"/>
<mensur modusmaior="2" modusminor="2" prolatio="2" tempus="3" dot="false" sign="O" />
<!-- 1 Semibreve - EXCEPTION: Start with Short Note - Imperfection a.p.a. -->
<note dur="semibrevis" oct="4" pname="c"/>
<note dur="brevis" oct="4" pname="c" color="violet"/>
<barLine form="dashed"/>
<rest dur="brevis"/>
<barLine form="dashed"/>
<note dur="semibrevis" oct="4" pname="c" />
<note dur="brevis" oct="4" pname="c" color="violet" />
<barLine form="dashed" />
<rest dur="brevis" />
<barLine form="dashed" />
</layer>
</staff>
<staff n="4">
<layer n="1">
<mensur modusmaior="2" modusminor="2" prolatio="2" tempus="3" sign="O" dot="false"/>
<mensur modusmaior="2" modusminor="2" prolatio="2" tempus="3" dot="false" sign="O" />
<!-- reference -->
<note dur="semibrevis" oct="4" pname="c"/>
<note dur="semibrevis" oct="4" pname="c"/>
<note dur="semibrevis" oct="4" pname="c"/>
<barLine form="dashed"/>
<note dur="semibrevis" oct="4" pname="c"/>
<note dur="semibrevis" oct="4" pname="c"/>
<note dur="semibrevis" oct="4" pname="c"/>
<barLine form="dashed"/>
<note dur="semibrevis" oct="4" pname="c" />
<note dur="semibrevis" oct="4" pname="c" />
<note dur="semibrevis" oct="4" pname="c" />
<barLine form="dashed" />
<note dur="semibrevis" oct="4" pname="c" />
<note dur="semibrevis" oct="4" pname="c" />
<note dur="semibrevis" oct="4" pname="c" />
<barLine form="dashed" />
</layer>
</staff>
</section>
</score>
</mdiv>
</body>
</music>
</mei>
</mei>
2 changes: 1 addition & 1 deletion _tests/phrase/phrase-001.mei
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</layer>
</staff>
<slur staff="1" startid="#note-000000180893861" endid="#note-000000090536214" />
<dir place="above" staff="1" tstamp="2.000000">a tempo</dir>
<dir place="above" staff="1" tstamp="2">a tempo</dir>
<phrase staff="1" startid="#note-000000034369893" endid="#note-000000110366772" />
</measure>
<measure n="2">
Expand Down
Loading