Skip to content

Commit

Permalink
Deprecate key.sig
Browse files Browse the repository at this point in the history
Revert changes to att.keySig.log and att.keySigDefault.log made earlier
Remove data.KEYSIGTOKEN

Fixes #434
  • Loading branch information
pe-ro committed May 25, 2017
1 parent 277b94e commit cc20180
Showing 1 changed file with 4 additions and 32 deletions.
36 changes: 4 additions & 32 deletions source/specs/mei-source.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1900,16 +1900,6 @@
</rng:data>
</content>
</macroSpec>
<macroSpec ident="data.KEYSIGTOKEN" module="MEI" type="dt">
<desc>A token describing the pitch name, inflection, and octave number of an altered pitch in
a key signature.</desc>
<content>
<rng:data type="token">
<rng:param name="pattern"
>[a-g][0-9](s|f|ss|x|ff|xs|sx|ts|tf|n|nf|ns|su|sd|fu|fd|nu|nd|1qf|3qf|1qs|3qs)</rng:param>
</rng:data>
</content>
</macroSpec>
<macroSpec ident="data.LAYERSCHEME" module="MEI" type="dt">
<desc>Indicates how stems should be drawn when more than one layer is present and stem
directions are not indicated on the notes/chords themselves. '1' indicates that there is
Expand Down Expand Up @@ -6737,26 +6727,17 @@
<classSpec ident="att.keySig.log" module="MEI.shared" type="atts">
<desc>Logical domain attributes.</desc>
<attList>
<attDef ident="fifths" usage="opt">
<desc>Indicates where the key lies in the circle of fifths.</desc>
<datatype>
<rng:ref name="data.KEYFIFTHS"/>
</datatype>
</attDef>
<attDef ident="sig" usage="opt">
<desc>Written key signature.</desc>
<datatype maxOccurs="unbounded">
<rng:ref name="data.KEYSIGTOKEN"/>
<rng:ref name="data.KEYFIFTHS"/>
</datatype>
</attDef>
</attList>
<remarks>
<p>Mixed key signatures, e.g. those consisting of a mixture of flats and sharps (Read, p.
143, ex. 9-39), and key signatures with unorthodox placement of the accidentals (Read, p.
141) can be encoded using the <att>key.sig</att> attribute or the <gi scheme="MEI"
>keySig</gi> element. Each token in <att>key.sig</att> contains a pitch name,
accidental, and octave, 'e5f' for example, that indicate what key accidentals should be
rendered and where they should be placed.</p>
141) can be encoded using the <gi scheme="MEI">keySig</gi> element.</p>
</remarks>
</classSpec>
<classSpec ident="att.keySig.vis" module="MEI.visual" type="atts">
Expand Down Expand Up @@ -6803,26 +6784,17 @@
<desc>Used by staffDef and scoreDef to provide default values for attributes in the logical
domain that are related to key signatures.</desc>
<attList>
<attDef ident="key.fifths" usage="opt">
<desc>Indicates where the key lies in the circle of fifths.</desc>
<datatype>
<rng:ref name="data.KEYFIFTHS"/>
</datatype>
</attDef>
<attDef ident="key.sig" usage="opt">
<desc>Written key signature.</desc>
<datatype maxOccurs="unbounded">
<rng:ref name="data.KEYSIGTOKEN"/>
<rng:ref name="data.KEYFIFTHS"/>
</datatype>
</attDef>
</attList>
<remarks>
<p>Mixed key signatures, e.g. those consisting of a mixture of flats and sharps (Read, p.
143, ex. 9-39), and key signatures with unorthodox placement of the accidentals (Read, p.
141) can be encoded using the <att>key.sig</att> attribute or the <gi scheme="MEI"
>keySig</gi> element. Each token in <att>key.sig</att> contains a pitch name,
accidental, and octave, 'e5f' for example, that indicate what key accidentals should be
rendered and where they should be placed.</p>
141) can be encoded using the <gi scheme="MEI">keySig</gi> element.</p>
</remarks>
</classSpec>
<classSpec ident="att.keySigDefault.vis" module="MEI.visual" type="atts">
Expand Down

0 comments on commit cc20180

Please sign in to comment.