Skip to content

Commit

Permalink
Remove <lyrics>, use <lg> instead
Browse files Browse the repository at this point in the history
Delete model.lyricsLike
Delete <lyrics>
Allow att.lyrics.* on <lg>
Revise <l>
Add <seg>, which allows arbitrary segmentation of text
Disallow model.sylLike within model.textPhraseLike.limited; <seg> can perform the functions this was intended to allow

Fixes #360
  • Loading branch information
pe-ro committed Apr 6, 2017
1 parent d5b3c75 commit 088149b
Showing 1 changed file with 29 additions and 37 deletions.
66 changes: 29 additions & 37 deletions source/specs/mei-source.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11866,15 +11866,6 @@
<memberOf key="model.textPhraseLike.limited"/>
</classes>
</classSpec>
<classSpec ident="model.lyricsLike" module="MEI.lyrics" type="model">
<desc>Groups elements that represent sung text.</desc>
<classes>
<memberOf key="model.measurePart"/>
<memberOf key="model.layerPart.mensural"/>
<memberOf key="model.syllablePart"/>
<memberOf key="model.rdgPart.critapp"/>
</classes>
</classSpec>
<classSpec ident="model.manifestationLike" type="model" module="MEI.frbr">
<desc>Collects manifestationLike elements.</desc>
</classSpec>
Expand Down Expand Up @@ -12206,7 +12197,6 @@
<classes>
<memberOf key="model.rdgPart.critapp"/>
<memberOf key="model.syllablePart"/>
<memberOf key="model.textPhraseLike.limited"/>
</classes>
</classSpec>
<classSpec ident="model.symbolTableLike" module="MEI.usersymbols" type="model">
Expand Down Expand Up @@ -17235,14 +17225,17 @@
standard.</p>
</remarks>
</elementSpec>
<elementSpec ident="lg" module="MEI.text">
<elementSpec ident="lg" module="MEI.shared">
<desc>(line group) – May be used for any section of text that is organized as a group of
lines; however, it is most often used for a group of verse lines functioning as a formal
unit, e.g. a stanza, refrain, verse paragraph, etc.</desc>
<classes>
<memberOf key="att.common"/>
<memberOf key="att.facsimile"/>
<memberOf key="att.lang"/>
<memberOf key="att.lyrics.ges"/>
<memberOf key="att.lyrics.log"/>
<memberOf key="att.lyrics.vis"/>
<memberOf key="att.metadataPointing"/>
<memberOf key="att.xy"/>
<memberOf key="model.lgLike"/>
Expand Down Expand Up @@ -17539,32 +17532,6 @@
</rng:zeroOrMore>
</content>
</elementSpec>
<elementSpec ident="lyrics" module="MEI.lyrics">
<desc>Vocally performed 'text' of a musical composition, such as a song or opera.</desc>
<classes>
<memberOf key="att.common"/>
<memberOf key="att.facsimile"/>
<memberOf key="att.lang"/>
<memberOf key="att.lyrics.log"/>
<memberOf key="att.lyrics.vis"/>
<memberOf key="att.lyrics.ges"/>
<memberOf key="att.lyrics.anl"/>
<memberOf key="model.lyricsLike"/>
</classes>
<content>
<rng:oneOrMore>
<rng:ref name="model.lgLike"/>
</rng:oneOrMore>
</content>
<remarks>
<p>The <att>staff</att> attribute gives the staff to which the lyrics are attached. If there
is more than one layer on that staff, the <att>layer</att> attribute may be used to
indicate the layer from which the rhythm should be taken. Often, automatic text underlay
may rely on the notes of the indicated staff. When this is not desirable, however, the
rhythm of the lyrics may be recorded in the <att>rhythm</att> attribute of the parent <gi
scheme="MEI">verse</gi> element.</p>
</remarks>
</elementSpec>
<elementSpec ident="mapping" module="MEI.usersymbols">
<desc>One or more characters which are related to the parent symbol in some respect, as
specified by the type attribute.</desc>
Expand Down Expand Up @@ -20570,6 +20537,31 @@
objects or annotations.</p>
</remarks>
</elementSpec>
<elementSpec ident="seg" module="MEI.text">
<desc>(arbitrary segment) represents any segmentation of text below the "text component"
level.</desc>
<classes>
<memberOf key="att.common"/>
<memberOf key="att.common.anl"/>
<memberOf key="att.facsimile"/>
<memberOf key="att.lang"/>
<memberOf key="model.textPhraseLike.limited"/>
</classes>
<content>
<rng:zeroOrMore>
<rng:choice>
<rng:text/>
<rng:ref name="model.textPhraseLike"/>
<rng:ref name="model.editLike"/>
<rng:ref name="model.transcriptionLike"/>
</rng:choice>
</rng:zeroOrMore>
</content>
<remarks>
<p>This element is modelled on an element in the Text Encoding Initiative (TEI)
standard.</p>
</remarks>
</elementSpec>
<elementSpec ident="segmentation" module="MEI.header">
<desc>Describes the principles according to which the musical text has been segmented, for
example into movements, sections, etc.</desc>
Expand Down

0 comments on commit 088149b

Please sign in to comment.