diff --git a/_guidelines-v4/04-cmn/02-cmnbasics/01-cmnmeasures.md b/_guidelines-v4/04-cmn/02-cmnbasics/01-cmnmeasures.md
index 1fd4b500e52..d24ad92b747 100644
--- a/_guidelines-v4/04-cmn/02-cmnbasics/01-cmnmeasures.md
+++ b/_guidelines-v4/04-cmn/02-cmnbasics/01-cmnmeasures.md
@@ -4,7 +4,7 @@ title: "The Role of the Measure Element"
 version: "v4"
 ---
 
-Arguably, the most important element of the CMN module is the {% include link elem="measure" %} element. It is used as a structural unit inside {% include link elem="section" %} elements and acts as a container for ‘events’ from the {% include link model="model.eventLike" %} class, such as notes, chords and rests as well as ‘control events’ from the {% include link model="model.controlEventLike" %} class, such as slurs and indications of dynamics.
+Arguably, the most important element of the CMN module is the {% include link elem="measure" %} element. It is used as a structural unit inside {% include link elem="section" %} elements and acts as a container for ‘events’ from the {% include link model="eventLike" %} class, such as notes, chords and rests as well as ‘control events’ from the {% include link model="controlEventLike" %} class, such as slurs and indications of dynamics.
 
 The following example demonstrates the use of the {% include link elem="measure" %} element:
 
diff --git a/_guidelines-v4/04-cmn/02-cmnbasics/02-cmndefs.md b/_guidelines-v4/04-cmn/02-cmnbasics/02-cmndefs.md
index 05e1f349a0f..5cbb42e0262 100644
--- a/_guidelines-v4/04-cmn/02-cmnbasics/02-cmndefs.md
+++ b/_guidelines-v4/04-cmn/02-cmnbasics/02-cmndefs.md
@@ -57,7 +57,7 @@ There are a number of additional elements that can be used as children of {% inc
 {% include desc elem="meterSig" %}
 {% include desc elem="meterSigGrp" %}
 
-With the exception of {% include link elem="label" %}, these elements may also occur within the flow of musical events captured in a {% include link elem="layer" %}, since they are members of {% include link model="model.eventLike" %}. In the layer context they function as milestones and affect all following content assigned to the layer (even in subsequent measures) until their information is again overridden either by the same element bearing different information or a {% include link elem="staffDef" %} or {% include link elem="scoreDef" %}. In this context, it is also possible to combine them with the elements described in chapters {% include link id="critApp" %} and {% include link id="editTrans" %} of these Guidelines.
+With the exception of {% include link elem="label" %}, these elements may also occur within the flow of musical events captured in a {% include link elem="layer" %}, since they are members of {% include link model="eventLike" %}. In the layer context they function as milestones and affect all following content assigned to the layer (even in subsequent measures) until their information is again overridden either by the same element bearing different information or a {% include link elem="staffDef" %} or {% include link elem="scoreDef" %}. In this context, it is also possible to combine them with the elements described in chapters {% include link id="critApp" %} and {% include link id="editTrans" %} of these Guidelines.
 
 Such flexibility as this may require close inspection of an encoding to retrieve the correct definitions for a given staff. As a general rule, the closest preceding and most specific element provides this information: For example, a {% include link elem="keySig" %} in the preceding measure is more relevant than a {% include link elem="staffDef" %} at the beginning of the section, which is more relevant than a {% include link elem="scoreDef" %} at the beginning of the score. However, a section-specific {% include link elem="scoreDef" %} that provides only information about the meter does not override the more specific information about key signature gathered from a {% include link elem="staffDef" %} for a transposing instrument.
 
diff --git a/_guidelines-v4/04-cmn/02-cmnbasics/04-cmnnoteschords/01-cmnnotes/01-cmnnotesbasic.md b/_guidelines-v4/04-cmn/02-cmnbasics/04-cmnnoteschords/01-cmnnotes/01-cmnnotesbasic.md
index c1ff1d71263..609fa2e3d95 100644
--- a/_guidelines-v4/04-cmn/02-cmnbasics/04-cmnnoteschords/01-cmnnotes/01-cmnnotesbasic.md
+++ b/_guidelines-v4/04-cmn/02-cmnbasics/04-cmnnoteschords/01-cmnnotes/01-cmnnotesbasic.md
@@ -20,22 +20,16 @@ The usual CMN-specific values for **@dur** are:
 
 {:.gloss}
 **1**: whole note
-
 {:.gloss}
 **2**: half note
-
 {:.gloss}
 **4**: quarter note
-
 {:.gloss}
 **8**: eighth note
-
 {:.gloss}
 **16**: sixteenth note
-
 {:.gloss}
-**…**: 
-
+**…**
 {:.gloss}
 **2048**: 2048th note
 
@@ -43,7 +37,6 @@ Additionally, the following two values borrowed from mensural notation are allow
 
 {:.gloss}
 **breve**: double whole
-
 {:.gloss}
 **long**: quadruple whole
 
diff --git a/_guidelines-v4/04-cmn/02-cmnbasics/05-cmntstamp.md b/_guidelines-v4/04-cmn/02-cmnbasics/05-cmntstamp.md
index 71caa0771ae..339a7ad7898 100644
--- a/_guidelines-v4/04-cmn/02-cmnbasics/05-cmntstamp.md
+++ b/_guidelines-v4/04-cmn/02-cmnbasics/05-cmntstamp.md
@@ -10,4 +10,4 @@ The timestamp (**@tstamp**) of a musical event is calculated in relation to the
 
 For expressing durations, MEI offers the **@dur** attribute. This attribute is described in section {% include link id="cmnNotesBasic" %}.
 
-For ‘spanning’ elements like slurs, which are members of the {% include link model="model.controlEventLike" %} class, it is often more intuitive to record two timestamps – one for the onset of the event and one for its termination. Because the termination of the event may be in a succeeding measure, the second timestamp (**@tstamp2**) has a slightly different datatype than the one marking the initiation of the event. Its datatype is constrained to values following the formula "*xm + y*", where *x* is the number of full measures that this particular feature lasts (or the number of bar lines crossed) and *y* is the timestamp in the target measure where the feature ends. The timestamp is expressed using the same logic as described above. For example, a value of "0m+3" in 4/4 time indicates that the element bearing this attribute, a slur for example, ends on beat 3 of the same measure where it started. A value of "1m+1.5" would indicate an end on the second eighth note of the following measure. In 6/8 time, the value "2m+3" means that the feature ends two measures later on the third eighth note.
+For ‘spanning’ elements like slurs, which are members of the {% include link model="controlEventLike" %} class, it is often more intuitive to record two timestamps – one for the onset of the event and one for its termination. Because the termination of the event may be in a succeeding measure, the second timestamp (**@tstamp2**) has a slightly different datatype than the one marking the initiation of the event. Its datatype is constrained to values following the formula "*xm + y*", where *x* is the number of full measures that this particular feature lasts (or the number of bar lines crossed) and *y* is the timestamp in the target measure where the feature ends. The timestamp is expressed using the same logic as described above. For example, a value of "0m+3" in 4/4 time indicates that the element bearing this attribute, a slur for example, ends on beat 3 of the same measure where it started. A value of "1m+1.5" would indicate an end on the second eighth note of the following measure. In 6/8 time, the value "2m+3" means that the feature ends two measures later on the third eighth note.
diff --git a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/01-cmnbeams.md b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/01-cmnbeams.md
index 4059a33f343..4f9a4c40581 100644
--- a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/01-cmnbeams.md
+++ b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/01-cmnbeams.md
@@ -24,23 +24,23 @@ From the 19th century onwards, it became quite common to break secondary beams t
 
 In the music of the second half of the 20th century, it is quite common to indicate acceleration or deceleration using converging beams as in the image below:
 
-The encoding of such a beam is accomplished using the **@rend** attribute of the beam, which allows the following values:
+The encoding of such a beam is accomplished using the **@form** attribute of the beam, which allows the following values:
 
 {:.gloss}
-**acc**: The secondary beams start in their usual position and gradually converge until they meet with the primary beam on the last note (or, the first eighth note under the beam). 
+**acc**: The secondary beams start in their usual position and gradually converge until they meet with the primary beam on the last note (or, the first eighth note under the beam).
 
 {:.gloss}
-**rit**: The secondary beams gradually diverge until they reach their regular distance. 
+**rit**: The secondary beams gradually diverge until they reach their regular distance.
 
 {:.gloss}
 **mixed**: The secondary beams diverge and converge arbitrarily.
 
 {:.gloss}
-**norm**: The beam is rendered as usual (default). 
+**norm**: The beam is rendered as usual (default).
 
 {% include mei example="cmn/cmn-sample109.xml" valid="" %}
 
-The duration of notes, rests, or chords under a beam which carries the **@rend** attribute with a value of 'acc', 'rit', or 'mixed' must be treated specially. The first and last contained elements must specify a duration which matches the number of beams displayed at the point of these events. In the case of a 'mixed' beam, each event at the point of change in the number of secondary beams must carry a **@dur** attribute. Beams like this may be encoded thusly:
+The duration of notes, rests, or chords under a beam which carries the **@form** attribute with a value of 'acc', 'rit', or 'mixed' must be treated specially. The first and last contained elements must specify a duration which matches the number of beams displayed at the point of these events. In the case of a 'mixed' beam, each event at the point of change in the number of secondary beams must carry a **@dur** attribute. Beams like this may be encoded thusly:
 
 {% include figure img="modules/cmn/beamAcc-Rit.png" caption="Accelerando beams" %}
 {% include mei example="cmn/cmn-sample110.xml" valid="" %}
diff --git a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/03-cmndynam.md b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/03-cmndynam.md
index 33ed85bcc23..d59b6d14178 100644
--- a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/03-cmndynam.md
+++ b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/03-cmndynam.md
@@ -7,7 +7,7 @@ version: "v4"
 Common Music Notation provides two different methodologies for expressing the volume of a note, phrase, section, etc. The first is a verbal instruction providing such information in human language, possibly in an abbreviated form. An example is the word *piano*, indicating a quiet volume, often abbreviated as *p*. In MEI, verbal instructions like this are encoded using the {% include link elem="dynam" %} element from the Shared module (see chapter {% include link id="shared" %}):
 {% include mei example="cmn/cmn-sample125.xml" valid="" %}
 
-By convention, {% include link elem="dynam" %} elements, like {% include link elem="slur" %} and other elements belonging to the {% include link model="model.controlEventLike" %} class, are encoded at the end of the {% include link elem="measure" %} to which they belong. This requires {% include link elem="dynam" %} to be assigned to a certain {% include link elem="staff" %} using the **@staff** attribute, whose value refers to the target element's **@n** attribute. In the absence of other information, all layers within the staff are assumed to have the same dynamic marking.
+By convention, {% include link elem="dynam" %} elements, like {% include link elem="slur" %} and other elements belonging to the {% include link model="controlEventLike" %} class, are encoded at the end of the {% include link elem="measure" %} to which they belong. This requires {% include link elem="dynam" %} to be assigned to a certain {% include link elem="staff" %} using the **@staff** attribute, whose value refers to the target element's **@n** attribute. In the absence of other information, all layers within the staff are assumed to have the same dynamic marking.
 
 {% include mei example="cmn/cmn-sample126.xml" valid="" %}
 
@@ -45,7 +45,7 @@ All musical elements affected by the {% include link elem="dynam" %} may be expl
 
 It is recommended that the list of references in **@plist** include all participants in the dynamic marking, including the first and last notes as in the preceding example, even though they are duplicated by **@startid** and **@endid** attributes.
 
-In addition to verbal instructions, Common Music Notation uses graphical symbols to indicate ‘continuous’ dynamics. These crescendo and decrescendo (or diminuendo) symbols are encoded in MEI using the {% include link elem="hairpin" %} element. It also is a member of the {% include link model="model.controlEventLike" %} class, which means it too is used just before the close of a {% include link elem="measure" %} element, following the encoding of all staves. The required attribute **@form** specifies the direction of the symbol by taking one of two possible values: *cres* (growing louder) or *dim* (getting softer).
+In addition to verbal instructions, Common Music Notation uses graphical symbols to indicate ‘continuous’ dynamics. These crescendo and decrescendo (or diminuendo) symbols are encoded in MEI using the {% include link elem="hairpin" %} element. It also is a member of the {% include link model="controlEventLike" %} class, which means it too is used just before the close of a {% include link elem="measure" %} element, following the encoding of all staves. The required attribute **@form** specifies the direction of the symbol by taking one of two possible values: *cres* (growing louder) or *dim* (getting softer).
 
 {% include mei example="cmn/cmn-sample138.xml" valid="" %}
 
diff --git a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/04-cmntuplets.md b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/04-cmntuplets.md
index 33ed4ad5bba..d74c3423d27 100644
--- a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/04-cmntuplets.md
+++ b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/04-cmntuplets.md
@@ -8,7 +8,7 @@ Tuplets indicate a localized change of meter; that is, a given duration in the r
 
 The relation of the tuplet to the underlying meter is specified using the **@num** and **@numbase** attributes, where **@num** specifies the number of replacing notes and **@numbase** specifies the number of notes *of the same duration* to be replaced. For example, when three eighth notes replace one quarter note in common time, **@num** takes a value of "3", whereas **@numbase** reads "2", because a quarter note in common time is normally divided into two eighths. When three quarters replace two in the same meter, **@numbase** also reads "2". The combination of these attributes may be read as "3 in the time of 2" in either case.
 
-The duration of the entire tuplet may be encoded using the usual ‘power of 2’ values, e.g., 1, 2, 4, etc., in the **@dur** attribute, and the **@dots** attribute, if necessary.
+The duration of the entire tuplet may be encoded using the usual ‘power of 2’ values, e.g., 1, 2, 4, etc., in the **@dur** attribute if necessary.
 
 {% include mei example="cmn/cmn-sample140.xml" valid="" %}
 
@@ -20,5 +20,5 @@ In addition to {% include link elem="note" %} elements, {% include link elem="tu
 
 The {% include link elem="tuplet" %} element may also be used for repetition of the same pitch; that is, a single note or chord may be the only content of the tuplet. In some cases, optical music recognition software may treat these instances as bowed tremolandi due to the knowledge of the complete semantics of the notation at the time of recognition. However, marking these as tuplets is the recommended practice.
 
-In some situations, a tuplet is made up of events in different measures. As this raises the issue of non-concurrent hierarchies, it is not possible to encode such situations with the {% include link elem="tuplet" %} element described above. Therefore, MEI offers the {% include link elem="tupletSpan" %} element, which is member of the {% include link model="model.controlEventLike" %} class. It is nested inside of {% include link elem="measure" %}, following all the measure's {% include link elem="staff" %} children. It uses the same attributes as {% include link elem="tuplet" %} to describe tuplets, but instead of nesting all affected notes inside itself, it references the **@xml:id** values of all affected notes in its **@plist** attribute and the initial and terminal notes of the tuplet using **@startid** and **@endid** attributes. This configuration allows tuplets to cross measure boundaries. The following example demonstrates a typical example of such hierarchy-crossing tuplets:
+In some situations, a tuplet is made up of events in different measures. As this raises the issue of non-concurrent hierarchies, it is not possible to encode such situations with the {% include link elem="tuplet" %} element described above. Therefore, MEI offers the {% include link elem="tupletSpan" %} element, which is member of the {% include link model="controlEventLike" %} class. It is nested inside of {% include link elem="measure" %}, following all the measure's {% include link elem="staff" %} children. It uses the same attributes as {% include link elem="tuplet" %} to describe tuplets, but instead of nesting all affected notes inside itself, it references the **@xml:id** values of all affected notes in its **@plist** attribute and the initial and terminal notes of the tuplet using **@startid** and **@endid** attributes. This configuration allows tuplets to cross measure boundaries. The following example demonstrates a typical example of such hierarchy-crossing tuplets:
 {% include mei example="cmn/cmn-sample141.xml" valid="" %}
diff --git a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/05-cmnartic/01-cmnarpeggliss.md b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/05-cmnartic/01-cmnarpeggliss.md
index 5048e084e72..5b3e6f948aa 100644
--- a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/05-cmnartic/01-cmnarpeggliss.md
+++ b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/05-cmnartic/01-cmnarpeggliss.md
@@ -4,7 +4,7 @@ title: "Arpeggio and Glissando"
 version: "v4"
 ---
 
-In CMN, the notes of a chord are sometimes performed successively rather than simultaneously. This behavior, called arpeggiation, is normally indicated using a wavy line preceding the chord. MEI offers the {% include link elem="arpeg" %} element to describe arpeggios. This element is a member of the {% include link model="model.controlEventLike" %} class and, like other members of this class, uses the **@staff**, **@layer** and **@tstamp** or the **@startid** and **@endid** attributes to connect it to the affected chord.
+In CMN, the notes of a chord are sometimes performed successively rather than simultaneously. This behavior, called arpeggiation, is normally indicated using a wavy line preceding the chord. MEI offers the {% include link elem="arpeg" %} element to describe arpeggios. This element is a member of the {% include link model="controlEventLike" %} class and, like other members of this class, uses the **@staff**, **@layer** and **@tstamp** or the **@startid** and **@endid** attributes to connect it to the affected chord.
 
 {% include mei example="cmn/cmn-sample142.xml" valid="" %}
 
@@ -23,4 +23,4 @@ For arpeggios that involve chords spanning multiple staves as a continuous arpeg
 
 Whereas an arpeggio ‘staggers’ the onset times of the notes of a chord, a glissando denotes a situation where the pitch ‘slides’ from one note to another. It makes no difference whether this slide produces distinct intermediate pitches (as on the piano) or not (as on the trombone), though the latter is sometimes referred to as portamento. The visual appearance of a glissando, which MEI encodes as {% include link elem="gliss" %}, is normally a line connecting the two most distant notes in the glissando.
 
-The {% include link elem="gliss" %} element is a member of the {% include link model="model.controlEventLike" %} class and therefore, like other control events, it occurs inside a measure after the staves and uses its **@staff**, **@layer**, **@tstamp**, **@tstamp2**, **@startid** and **@endid** attributes to connect it to the affected notes or chords. It is a semantic error not to specify a starting point attribute. The visual appearance of the indicating line may be recorded in the **@rend** attribute. Any text accompanying the line, such as "gliss.", may be provided in the **@text** attribute.
+The {% include link elem="gliss" %} element is a member of the {% include link model="controlEventLike" %} class and therefore, like other control events, it occurs inside a measure after the staves and uses its **@staff**, **@layer**, **@tstamp**, **@tstamp2**, **@startid** and **@endid** attributes to connect it to the affected notes or chords. It is a semantic error not to specify a starting point attribute. The visual appearance of the indicating line may be recorded in the **@line.form** and **@line.width** attributes. Any text accompanying the line, such as "gliss.", may be provided in the **@text** attribute.
diff --git a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/05-cmnartic/03-cmntrem.md b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/05-cmnartic/03-cmntrem.md
index 797d0ac4e15..a41f050d381 100644
--- a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/05-cmnartic/03-cmntrem.md
+++ b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/05-cmnartic/03-cmntrem.md
@@ -6,7 +6,7 @@ version: "v4"
 
 CMN has two slightly different concepts which are both called tremolo. The first is a rapid repetition of a single pitch or chord, whereas the second is a rapid alternation between two different notes or chords. In addition, either species of tremolo may be measured or unmeasured. A measured tremolo is an abbreviation for written-out notation; that is, the tremolo is intended to be perceived as notes with distinct rhythmic values. On the other hand, in an unmeasured tremolo no specific number of alternations is intended.
 
-For the repetition of a single note or chord, MEI offers the {% include link elem="bTrem" %} (bowed tremolo) element, which is a member of the {% include link model="model.eventLike.cmn" %} class, meaning it is encoded following the normal course of musical events within a {% include link elem="layer" %}. It holds exactly one {% include link elem="note" %} or {% include link elem="chord" %} element that is to be repeated.
+For the repetition of a single note or chord, MEI offers the {% include link elem="bTrem" %} (bowed tremolo) element, which is a member of the {% include link model="eventLike.cmn" %} class, meaning it is encoded following the normal course of musical events within a {% include link elem="layer" %}. It holds exactly one {% include link elem="note" %} or {% include link elem="chord" %} element that is to be repeated.
 
 {% include figure img="ExampleImages/btrem-a-20100510.png" caption="Bowed tremolandi" %}
 {% include mei example="cmn/cmn-sample147.xml" valid="" %}
diff --git a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/05-cmnartic/04-cmnfermata.md b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/05-cmnartic/04-cmnfermata.md
index 5acf0ae5060..64b6111a633 100644
--- a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/05-cmnartic/04-cmnfermata.md
+++ b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/05-cmnartic/04-cmnfermata.md
@@ -10,7 +10,7 @@ In MEI, fermatas may be encoded using an attribute on {% include link elem="note
 
 {% include mei example="cmn/cmn-sample151.xml" valid="" %}
 
-However, if there is further information about the fermata that should be addressed in the encoding, MEI offers the {% include link elem="fermata" %} element. This element, which is a member of the {% include link model="model.controlEventLike" %} class and therefore requires the use of such attributes as **@staff**, **@layer**, **@tstamp** and **@startid**, allows specification of the orientation of the fermata using its **@form** attribute. In addition, the **@shape** attribute may be used to indicate whether the fermata is rendered as a semicircle ("curved"), semisquare ("square"), or triangle ("angular"). If the fermata should be rendered using some other symbol, a user-defined symbol may be referred to using an **@altsym** or **@extsym** attribute.
+However, if there is further information about the fermata that should be addressed in the encoding, MEI offers the {% include link elem="fermata" %} element. This element, which is a member of the {% include link model="controlEventLike" %} class and therefore requires the use of such attributes as **@staff**, **@layer**, **@tstamp** and **@startid**, allows specification of the orientation of the fermata using its **@form** attribute. In addition, the **@shape** attribute may be used to indicate whether the fermata is rendered as a semicircle ("curved"), semisquare ("square"), or triangle ("angular"). If the fermata should be rendered using some other symbol, a user-defined symbol may be referred to using an **@altsym** or **@extsym** attribute.
 
 {% include mei example="cmn/cmn-sample152.xml" valid="" %}
 {% include mei example="cmn/cmn-sample153.xml" valid="" %}
diff --git a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/06-cmninstr/01-cmnbreath.md b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/06-cmninstr/01-cmnbreath.md
index 07b446f5d26..bb19cdd6808 100644
--- a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/06-cmninstr/01-cmnbreath.md
+++ b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/06-cmninstr/01-cmnbreath.md
@@ -4,7 +4,7 @@ title: "Breath Marks"
 version: "v4"
 ---
 
-A breath mark indicates a point at which the performer of a wind instrument or singer may breathe. It is sometimes also used to indicate a short pause or break for instruments *not* requiring breath, which allows it to also serve as a guide to phrasing. In MEI, breath marks are encoded using the {% include link elem="breath" %} element, which is a member of {% include link model="model.controlEventLike" %}. It is a semantic error not to specify a starting point attribute.
+A breath mark indicates a point at which the performer of a wind instrument or singer may breathe. It is sometimes also used to indicate a short pause or break for instruments *not* requiring breath, which allows it to also serve as a guide to phrasing. In MEI, breath marks are encoded using the {% include link elem="breath" %} element, which is a member of {% include link model="controlEventLike" %}. It is a semantic error not to specify a starting point attribute.
 
 {% include mei example="cmn/cmn-sample154.xml" valid="" %}
 
diff --git a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/06-cmninstr/02-cmnharp.md b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/06-cmninstr/02-cmnharp.md
index 732828b2f9a..51184818a41 100644
--- a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/06-cmninstr/02-cmnharp.md
+++ b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/06-cmninstr/02-cmnharp.md
@@ -6,7 +6,7 @@ version: "v4"
 
 Modern harps have seven pedals which allow adjustment of their strings to different pitches. The settings for these pedals occur at the beginning of the harp notation and/or whenever it is necessary to change the harp's tuning. These settings may be rendered using letter pitches (in the order of the pedals from left to right) or in a diagrammatic fashion, such as the form invented by Carlos Salzedo.
 
-In MEI, harp pedal settings are encoded using the {% include link elem="harpPedal" %} element. It is a member of the {% include link model="model.controlEventLike" %} class and is therefore placed within {% include link elem="measure" %}, following all {% include link elem="staff" %} children. The **@staff** and **@layer** attributes may be used to assign it to a certain {% include link elem="staff" %} or {% include link elem="layer" %}. Either a **@tstamp** or **@startid** attribute must be used to indicate the placement within the measure (see {% include link id="cmnTstamp" %} and {% include link id="ptrRef" %} for further details about those linking mechanisms).
+In MEI, harp pedal settings are encoded using the {% include link elem="harpPedal" %} element. It is a member of the {% include link model="controlEventLike" %} class and is therefore placed within {% include link elem="measure" %}, following all {% include link elem="staff" %} children. The **@staff** and **@layer** attributes may be used to assign it to a certain {% include link elem="staff" %} or {% include link elem="layer" %}. Either a **@tstamp** or **@startid** attribute must be used to indicate the placement within the measure (see {% include link id="cmnTstamp" %} and {% include link id="ptrRef" %} for further details about those linking mechanisms).
 
 The musical intention of the element is described using the **@c**, **@d**, **@e**, **@f**, **@g**, **@a** and **@b** attributes, which affect the corresponding strings of the harp. All of these attributes may take the values "*f*" (flat), "*s*" (sharp) or "*n*" (natural), where "n" is the default value, which is assumed when one of these attributes is not specified.
 
diff --git a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/06-cmninstr/03-cmnpedal.md b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/06-cmninstr/03-cmnpedal.md
index cf32de9c016..b9cdcbde39e 100644
--- a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/06-cmninstr/03-cmnpedal.md
+++ b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/06-cmninstr/03-cmnpedal.md
@@ -4,7 +4,7 @@ title: "Piano Pedal"
 version: "v4"
 ---
 
-Music for piano also often includes indications of the use of pedals. In MEI, these symbols are encoded using the {% include link elem="pedal" %} element. As a member of the {% include link model="model.controlEventLike" %} class, it is located within {% include link elem="measure" %} and refers to a staff, layer and timestamp using the **@staff**, **@layer** and **@tstamp** attributes. Alternatively, the **@startid** attribute may be used to identify a {% include link elem="note" %} or {% include link elem="chord" %} to which the mark should be assigned.
+Music for piano also often includes indications of the use of pedals. In MEI, these symbols are encoded using the {% include link elem="pedal" %} element. As a member of the {% include link model="controlEventLike" %} class, it is located within {% include link elem="measure" %} and refers to a staff, layer and timestamp using the **@staff**, **@layer** and **@tstamp** attributes. Alternatively, the **@startid** attribute may be used to identify a {% include link elem="note" %} or {% include link elem="chord" %} to which the mark should be assigned.
 
 The meaning of the mark is captured using the **@dir** attribute, which provides the following values:
 
diff --git a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/08-cmndir.md b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/08-cmndir.md
index 1a642e03f47..4115dab7fc8 100644
--- a/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/08-cmndir.md
+++ b/_guidelines-v4/04-cmn/03-cmnadditionalmeasurecontent/08-cmndir.md
@@ -8,7 +8,7 @@ In CMN scores, there is often a large number of natural language instructions. S
 
 A tempo or character indication is often provided above the topmost staff of the first measure of a score, movement, or section. This indication, such as "Allegro moderato" or "Andante maestoso", may be regarded as a label. Though it is possible to label the movement, etc. using a **@label** attribute attached to the enclosing structural entity (that is, on {% include link elem="mdiv" %} or {% include link elem="section" %}), it is often required to capture the exact position, spelling, or other features of the label as found in the underlying source material. In these cases, an element is necessary.
 
-Labels which address the tempo at which the music should be performed should be encoded using the {% include link elem="tempo" %} element, which is a specialized form of {% include link elem="dir" %}. {% include link elem="tempo" %} is a member of the {% include link model="model.controlEventLike" %} class and as such occurs as a child of {% include link elem="measure" %}, following all {% include link elem="staff" %} children. Its **@staff**, **@layer** and **@tstamp** attributes are used to ensure correct semantic positioning, and **@place** indicates a visual position with respect to the staff.
+Labels which address the tempo at which the music should be performed should be encoded using the {% include link elem="tempo" %} element, which is a specialized form of {% include link elem="dir" %}. {% include link elem="tempo" %} is a member of the {% include link model="controlEventLike" %} class and as such occurs as a child of {% include link elem="measure" %}, following all {% include link elem="staff" %} children. Its **@staff**, **@layer** and **@tstamp** attributes are used to ensure correct semantic positioning, and **@place** indicates a visual position with respect to the staff.
 
 {% include mei example="cmn/cmn-sample159.xml" valid="" %}
 
diff --git a/_includes/v4/examples/cmn/cmn-sample090.xml b/_includes/v4/examples/cmn/cmn-sample090.xml
index cc2cc355ca4..42c4e28d6d6 100644
--- a/_includes/v4/examples/cmn/cmn-sample090.xml
+++ b/_includes/v4/examples/cmn/cmn-sample090.xml
@@ -1,18 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <section>
-   <measure n="1">
-      <staff n="1">
-         <layer>
-            <chord dur="1">
-               <note oct="5" pname="c"></note>
-               <note oct="4" pname="g"></note>
-               <note oct="4" pname="e"></note>
-            </chord>
-         </layer>
-      </staff>
-      <staff n="2">
-         <layer>
-            <note dur="1" oct="3" pname="c"></note>
-         </layer>
-      </staff>
-   </measure>
-</section>
\ No newline at end of file
+  <measure n="1">
+    <staff n="1">
+      <layer>
+        <chord dur="1">
+          <note oct="5" pname="c"/>
+          <note oct="4" pname="g"/>
+          <note oct="4" pname="e"/>
+        </chord>
+      </layer>
+    </staff>
+    <staff n="2">
+      <layer>
+        <note dur="1" oct="3" pname="c"/>
+      </layer>
+    </staff>
+  </measure>
+</section>
diff --git a/_includes/v4/examples/cmn/cmn-sample091.xml b/_includes/v4/examples/cmn/cmn-sample091.xml
index cc2cc355ca4..3ec88a761b4 100644
--- a/_includes/v4/examples/cmn/cmn-sample091.xml
+++ b/_includes/v4/examples/cmn/cmn-sample091.xml
@@ -1,18 +1,18 @@
 <section>
-   <measure n="1">
-      <staff n="1">
-         <layer>
-            <chord dur="1">
-               <note oct="5" pname="c"></note>
-               <note oct="4" pname="g"></note>
-               <note oct="4" pname="e"></note>
-            </chord>
-         </layer>
-      </staff>
-      <staff n="2">
-         <layer>
-            <note dur="1" oct="3" pname="c"></note>
-         </layer>
-      </staff>
-   </measure>
-</section>
\ No newline at end of file
+  <measure n="1">
+    <staff n="1">
+      <layer>
+        <chord dur="1">
+          <note oct="5" pname="c"/>
+          <note oct="4" pname="g"/>
+          <note oct="4" pname="e"/>
+        </chord>
+      </layer>
+    </staff>
+    <staff n="2">
+      <layer>
+        <note dur="1" oct="3" pname="c"/>
+      </layer>
+    </staff>
+  </measure>
+</section>
diff --git a/_includes/v4/examples/cmn/cmn-sample092.xml b/_includes/v4/examples/cmn/cmn-sample092.xml
index 18ec024909a..5b8b77f4de4 100644
--- a/_includes/v4/examples/cmn/cmn-sample092.xml
+++ b/_includes/v4/examples/cmn/cmn-sample092.xml
@@ -1,11 +1,11 @@
-<staffDef n="3" xml:id="cmn_staffDef1"></staffDef>
+<staffDef n="3" xml:id="cmn_staffDef1"/>
 <!-- later in the file: -->
 <staff def="#cmn_staffDef1">
-   <!-- @def refers to staffDef with this identifier -->
-   <!-- staff content -->
+  <!-- @def refers to staffDef with this identifier -->
+  <!-- staff content -->
 </staff>
 <!-- or: -->
 <staff n="3">
-   <!-- @n refers to staffDef with this numeric label -->
-   <!-- staff content -->
-</staff>
\ No newline at end of file
+  <!-- @n refers to staffDef with this numeric label -->
+  <!-- staff content -->
+</staff>
diff --git a/_includes/v4/examples/cmn/cmn-sample093.xml b/_includes/v4/examples/cmn/cmn-sample093.xml
index c968f973b1e..5ba00e426e1 100644
--- a/_includes/v4/examples/cmn/cmn-sample093.xml
+++ b/_includes/v4/examples/cmn/cmn-sample093.xml
@@ -1,3 +1,3 @@
 <staffDef>
-   <layerDef n="1" xml:id="cmn_layerDef1"></layerDef>
-</staffDef>
\ No newline at end of file
+  <layerDef n="1" xml:id="cmn_layerDef1"/>
+</staffDef>
diff --git a/_includes/v4/examples/cmn/cmn-sample094.xml b/_includes/v4/examples/cmn/cmn-sample094.xml
index f3784946734..913ef0de06d 100644
--- a/_includes/v4/examples/cmn/cmn-sample094.xml
+++ b/_includes/v4/examples/cmn/cmn-sample094.xml
@@ -1,13 +1,13 @@
 <section xml:id="cmn_staffDef1">
-   <staff def="#cmn_staffDef1">
-      <layer def="#cmn_layerDef1">
-         <!-- layer content -->
-      </layer>
-   </staff>
-   <!-- OR: -->
-   <staff n="3">
-      <layer n="1">
-         <!-- layer content -->
-      </layer>
-   </staff>
-</section>
\ No newline at end of file
+  <staff def="#cmn_staffDef1">
+    <layer def="#cmn_layerDef1">
+      <!-- layer content -->
+    </layer>
+  </staff>
+  <!-- OR: -->
+  <staff n="3">
+    <layer n="1">
+      <!-- layer content -->
+    </layer>
+  </staff>
+</section>
diff --git a/_includes/v4/examples/cmn/cmn-sample095.xml b/_includes/v4/examples/cmn/cmn-sample095.xml
index 6a03dabe248..d2899bbd1ef 100644
--- a/_includes/v4/examples/cmn/cmn-sample095.xml
+++ b/_includes/v4/examples/cmn/cmn-sample095.xml
@@ -1 +1 @@
-<scoreDef key.sig="3f" meter.count="4" meter.sym="common" meter.unit="4"></scoreDef>
\ No newline at end of file
+<scoreDef key.sig="3f" meter.count="4" meter.sym="common" meter.unit="4"/>
diff --git a/_includes/v4/examples/cmn/cmn-sample096.xml b/_includes/v4/examples/cmn/cmn-sample096.xml
index cd4fbd08c6a..a18feca8417 100644
--- a/_includes/v4/examples/cmn/cmn-sample096.xml
+++ b/_includes/v4/examples/cmn/cmn-sample096.xml
@@ -1 +1 @@
-<staffDef clef.dis="8" clef.dis.place="below" clef.line="2" clef.shape="G"></staffDef>
\ No newline at end of file
+<staffDef clef.dis="8" clef.dis.place="below" clef.line="2" clef.shape="G"/>
diff --git a/_includes/v4/examples/cmn/cmn-sample097.xml b/_includes/v4/examples/cmn/cmn-sample097.xml
index bbac4afa5ba..902dcdbd40d 100644
--- a/_includes/v4/examples/cmn/cmn-sample097.xml
+++ b/_includes/v4/examples/cmn/cmn-sample097.xml
@@ -1,11 +1,11 @@
 <scoreDef meter.count="6" meter.unit="8">
-   <staffGrp>
-      <!-- Piccolo sounds 12 semitones higher than written (and encoded in MEI). -->
-      <staffDef clef.line="2" clef.shape="G" key.mode="major" key.sig="4f" label="Piccolo" label.abbr="Picc." lines="5" n="1" trans.diat="0" trans.semi="12" xml:id="cmn.P1"></staffDef>
-      <staffDef clef.line="2" clef.shape="G" key.mode="major" key.sig="4f" label="Flute" label.abbr="Fl." lines="5" n="2" xml:id="cmn.P2"></staffDef>
-      <staffDef clef.line="2" clef.shape="G" key.mode="major" key.sig="4f" label="Oboe" label.abbr="Ob." lines="5" n="3" xml:id="cmn.P3"></staffDef>
-      <staffDef clef.line="4" clef.shape="F" key.mode="major" key.sig="4f" label="Bassoon" label.abbr="Bsn." lines="5" n="4" xml:id="cmn.P4"></staffDef>
-      <!-- Clarinet sounds a minor third (two diatonic steps or three semitones) higher than written.  -->
-      <staffDef clef.line="2" clef.shape="G" key.mode="major" key.sig="1f" label="Clarinet in E♭" label.abbr="E♭ Cl." lines="5" n="5" trans.diat="2" trans.semi="3" xml:id="cmn.P5"></staffDef>
-   </staffGrp>
-</scoreDef>
\ No newline at end of file
+  <staffGrp>
+    <!-- Piccolo sounds 12 semitones higher than written (and encoded in MEI). -->
+    <staffDef clef.line="2" clef.shape="G" key.mode="major" key.sig="4f" label="Piccolo" label.abbr="Picc." lines="5" n="1" trans.diat="0" trans.semi="12" xml:id="cmn.P1"/>
+    <staffDef clef.line="2" clef.shape="G" key.mode="major" key.sig="4f" label="Flute" label.abbr="Fl." lines="5" n="2" xml:id="cmn.P2"/>
+    <staffDef clef.line="2" clef.shape="G" key.mode="major" key.sig="4f" label="Oboe" label.abbr="Ob." lines="5" n="3" xml:id="cmn.P3"/>
+    <staffDef clef.line="4" clef.shape="F" key.mode="major" key.sig="4f" label="Bassoon" label.abbr="Bsn." lines="5" n="4" xml:id="cmn.P4"/>
+    <!-- Clarinet sounds a minor third (two diatonic steps or three semitones) higher than written.  -->
+    <staffDef clef.line="2" clef.shape="G" key.mode="major" key.sig="1f" label="Clarinet in E♭" label.abbr="E♭ Cl." lines="5" n="5" trans.diat="2" trans.semi="3" xml:id="cmn.P5"/>
+  </staffGrp>
+</scoreDef>
diff --git a/_includes/v4/examples/cmn/cmn-sample098.xml b/_includes/v4/examples/cmn/cmn-sample098.xml
index e81479a0983..3732f03f96e 100644
--- a/_includes/v4/examples/cmn/cmn-sample098.xml
+++ b/_includes/v4/examples/cmn/cmn-sample098.xml
@@ -1 +1 @@
-<note dur="4" oct="4" pname="c"></note>
\ No newline at end of file
+<note dur="4" oct="4" pname="c"/>
diff --git a/_includes/v4/examples/cmn/cmn-sample099.xml b/_includes/v4/examples/cmn/cmn-sample099.xml
index 65e3a4ee22e..3bf13d2477d 100644
--- a/_includes/v4/examples/cmn/cmn-sample099.xml
+++ b/_includes/v4/examples/cmn/cmn-sample099.xml
@@ -1 +1 @@
-<note dots="1" dur="4" oct="4" pname="c"></note>
\ No newline at end of file
+<note dots="1" dur="4" oct="4" pname="c"/>
diff --git a/_includes/v4/examples/cmn/cmn-sample100.xml b/_includes/v4/examples/cmn/cmn-sample100.xml
index 022861592e3..590a48394d9 100644
--- a/_includes/v4/examples/cmn/cmn-sample100.xml
+++ b/_includes/v4/examples/cmn/cmn-sample100.xml
@@ -1,8 +1,8 @@
 <beam>
-   <note dur="8" oct="5" pname="d" stem.dir="down"></note>
-   <note dur="8" grace="acc" oct="5" pname="e" stem.dir="up"></note>
-   <note dur="8" oct="5" pname="d" stem.dir="down"></note>
-   <note accid="s" dur="8" grace="acc" oct="5" pname="c" stem.dir="up"></note>
-   <note dur="8" oct="5" pname="d" stem.dir="down"></note>
-   <note dur="8" oct="4" pname="b" stem.dir="down"></note>
-</beam>
\ No newline at end of file
+  <note dur="8" oct="5" pname="d" stem.dir="down"/>
+  <note dur="8" grace="acc" oct="5" pname="e" stem.dir="up"/>
+  <note dur="8" oct="5" pname="d" stem.dir="down"/>
+  <note accid="s" dur="8" grace="acc" oct="5" pname="c" stem.dir="up"/>
+  <note dur="8" oct="5" pname="d" stem.dir="down"/>
+  <note dur="8" oct="4" pname="b" stem.dir="down"/>
+</beam>
diff --git a/_includes/v4/examples/cmn/cmn-sample101.xml b/_includes/v4/examples/cmn/cmn-sample101.xml
index 6e42b9e49f4..9e9b30d4b2f 100644
--- a/_includes/v4/examples/cmn/cmn-sample101.xml
+++ b/_includes/v4/examples/cmn/cmn-sample101.xml
@@ -1,15 +1,15 @@
 <measure>
-   <staff n="1">
-      <layer n="1">
-         <note dur="2" oct="4" pname="d" stem.with="below"></note>
-      </layer>
-   </staff>
-   <staff n="2">
-      <layer n="1">
-         <chord dur="2" stem.with="above">
-            <note accid="n" oct="3" pname="b"></note>
-            <note oct="3" pname="f"></note>
-         </chord>
-      </layer>
-   </staff>
-</measure>
\ No newline at end of file
+  <staff n="1">
+    <layer n="1">
+      <note dur="2" oct="4" pname="d" stem.with="below"/>
+    </layer>
+  </staff>
+  <staff n="2">
+    <layer n="1">
+      <chord dur="2" stem.with="above">
+        <note accid="n" oct="3" pname="b"/>
+        <note oct="3" pname="f"/>
+      </chord>
+    </layer>
+  </staff>
+</measure>
diff --git a/_includes/v4/examples/cmn/cmn-sample102.xml b/_includes/v4/examples/cmn/cmn-sample102.xml
index d611c3472bc..c414dc36112 100644
--- a/_includes/v4/examples/cmn/cmn-sample102.xml
+++ b/_includes/v4/examples/cmn/cmn-sample102.xml
@@ -1,17 +1,17 @@
 <measure>
-   <staff n="1">
-      <layer n="1">
-         <chord dur="2">
-            <note oct="4" pname="d"></note>
-            <note accid="n" oct="3" pname="b" staff="2"></note>
-            <note oct="3" pname="f" staff="2"></note>
-         </chord>
-      </layer>
-   </staff>
-   <staff n="2">
-      <layer n="1">
-         <!-- the time used by the notes on staff 2 filled with non-sounding "space" -->
-         <space dur="2"></space>
-      </layer>
-   </staff>
-</measure>
\ No newline at end of file
+  <staff n="1">
+    <layer n="1">
+      <chord dur="2">
+        <note oct="4" pname="d"/>
+        <note accid="n" oct="3" pname="b" staff="2"/>
+        <note oct="3" pname="f" staff="2"/>
+      </chord>
+    </layer>
+  </staff>
+  <staff n="2">
+    <layer n="1">
+      <!-- the time used by the notes on staff 2 filled with non-sounding "space" -->
+      <space dur="2"/>
+    </layer>
+  </staff>
+</measure>
diff --git a/_includes/v4/examples/cmn/cmn-sample103.xml b/_includes/v4/examples/cmn/cmn-sample103.xml
index 316c84a157f..1327d258fb1 100644
--- a/_includes/v4/examples/cmn/cmn-sample103.xml
+++ b/_includes/v4/examples/cmn/cmn-sample103.xml
@@ -1,5 +1,5 @@
 <staff>
-   <layer>
-      <mRest cutout="cutout"></mRest>
-   </layer>
-</staff>
\ No newline at end of file
+  <layer>
+    <mRest cutout="cutout"/>
+  </layer>
+</staff>
diff --git a/_includes/v4/examples/cmn/cmn-sample104.xml b/_includes/v4/examples/cmn/cmn-sample104.xml
index 58d77de62aa..c05a0c1c117 100644
--- a/_includes/v4/examples/cmn/cmn-sample104.xml
+++ b/_includes/v4/examples/cmn/cmn-sample104.xml
@@ -1,5 +1,5 @@
 <staff>
-   <layer>
-      <multiRest num="9"></multiRest>
-   </layer>
-</staff>
\ No newline at end of file
+  <layer>
+    <multiRest num="9"/>
+  </layer>
+</staff>
diff --git a/_includes/v4/examples/cmn/cmn-sample105.xml b/_includes/v4/examples/cmn/cmn-sample105.xml
index 0ca05befb25..5478a2efce7 100644
--- a/_includes/v4/examples/cmn/cmn-sample105.xml
+++ b/_includes/v4/examples/cmn/cmn-sample105.xml
@@ -1,7 +1,7 @@
 <measure n="2">
-   <staff>
-      <layer>
-         <mSpace></mSpace>
-      </layer>
-   </staff>
-</measure>
\ No newline at end of file
+  <staff>
+    <layer>
+      <mSpace/>
+    </layer>
+  </staff>
+</measure>
diff --git a/_includes/v4/examples/cmn/cmn-sample106.xml b/_includes/v4/examples/cmn/cmn-sample106.xml
index 7bb40ab021a..41a90853ece 100644
--- a/_includes/v4/examples/cmn/cmn-sample106.xml
+++ b/_includes/v4/examples/cmn/cmn-sample106.xml
@@ -1,6 +1,6 @@
 <layer>
-   <beam>
-      <note dur="8"></note>
-      <note dur="8"></note>
-   </beam>
-</layer>
\ No newline at end of file
+  <beam>
+    <note dur="8"/>
+    <note dur="8"/>
+  </beam>
+</layer>
diff --git a/_includes/v4/examples/cmn/cmn-sample107.xml b/_includes/v4/examples/cmn/cmn-sample107.xml
index c1e02d089c9..3a4cd855d1a 100644
--- a/_includes/v4/examples/cmn/cmn-sample107.xml
+++ b/_includes/v4/examples/cmn/cmn-sample107.xml
@@ -1,11 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <layer>
-   <!--...-->
-   <beam>
-      <note dur="16"></note>
-      <note dur="32"></note>
-      <note dur="32"></note>
-      <note dots="1" dur="16"></note>
-      <note dur="32"></note>
-   </beam>
-   <!-- ...-->
-</layer>
\ No newline at end of file
+  <!-- … -->
+  <beam>
+    <note dur="16"/>
+    <note dur="32"/>
+    <note dur="32"/>
+    <note dots="1" dur="16"/>
+    <note dur="32"/>
+  </beam>
+  <!-- … -->
+</layer>
diff --git a/_includes/v4/examples/cmn/cmn-sample108.xml b/_includes/v4/examples/cmn/cmn-sample108.xml
index f19cd203c11..b17c024a8bd 100644
--- a/_includes/v4/examples/cmn/cmn-sample108.xml
+++ b/_includes/v4/examples/cmn/cmn-sample108.xml
@@ -1,15 +1,15 @@
 <layer>
-   <beam>
-      <note dots="1" dur="8"></note>
-      <note dur="16"></note>
-   </beam>
-   <beam>
-      <note dur="32"></note>
-      <note dur="32"></note>
-      <note breaksec="1" dur="16"></note>
-      <note dur="32"></note>
-      <note dur="32"></note>
-      <note dur="32"></note>
-      <note dur="32"></note>
-   </beam>
-</layer>
\ No newline at end of file
+  <beam>
+    <note dots="1" dur="8"/>
+    <note dur="16"/>
+  </beam>
+  <beam>
+    <note dur="32"/>
+    <note dur="32"/>
+    <note breaksec="1" dur="16"/>
+    <note dur="32"/>
+    <note dur="32"/>
+    <note dur="32"/>
+    <note dur="32"/>
+  </beam>
+</layer>
diff --git a/_includes/v4/examples/cmn/cmn-sample109.xml b/_includes/v4/examples/cmn/cmn-sample109.xml
index 7dcd1aa4849..532ead303b5 100644
--- a/_includes/v4/examples/cmn/cmn-sample109.xml
+++ b/_includes/v4/examples/cmn/cmn-sample109.xml
@@ -1,12 +1,12 @@
 <layer>
-   <!-- … -->
-   <beam rend="acc">
-      <note dur="8"></note>
-      <note></note>
-      <note></note>
-      <note></note>
-      <note></note>
-      <note dur="32"></note>
-   </beam>
-   <!-- … -->
-</layer>
\ No newline at end of file
+  <!-- … -->
+  <beam rend="acc">
+    <note dur="8"/>
+    <note/>
+    <note/>
+    <note/>
+    <note/>
+    <note dur="32"/>
+  </beam>
+  <!-- … -->
+</layer>
diff --git a/_includes/v4/examples/cmn/cmn-sample110.xml b/_includes/v4/examples/cmn/cmn-sample110.xml
index baf503b631d..a87d095f1f1 100644
--- a/_includes/v4/examples/cmn/cmn-sample110.xml
+++ b/_includes/v4/examples/cmn/cmn-sample110.xml
@@ -1,21 +1,21 @@
 <layer>
-   <!-- … -->
-   <beam rend="mixed">
-      <note dur="8"></note>
-      <note dur="8"></note>
-      <note></note>
-      <note></note>
-      <note></note>
-      <note dur="32"></note>
-   </beam>
-   <beam rend="mixed">
-      <note dur="32"></note>
-      <note></note>
-      <note></note>
-      <note></note>
-      <note></note>
-      <note dur="8"></note>
-      <note dur="8"></note>
-   </beam>
-   <!-- … -->
-</layer>
\ No newline at end of file
+  <!-- … -->
+  <beam rend="mixed">
+    <note dur="8"/>
+    <note dur="8"/>
+    <note/>
+    <note/>
+    <note/>
+    <note dur="32"/>
+  </beam>
+  <beam rend="mixed">
+    <note dur="32"/>
+    <note/>
+    <note/>
+    <note/>
+    <note/>
+    <note dur="8"/>
+    <note dur="8"/>
+  </beam>
+  <!-- … -->
+</layer>
diff --git a/_includes/v4/examples/cmn/cmn-sample111.xml b/_includes/v4/examples/cmn/cmn-sample111.xml
index 6da065d2952..b3d14734dbb 100644
--- a/_includes/v4/examples/cmn/cmn-sample111.xml
+++ b/_includes/v4/examples/cmn/cmn-sample111.xml
@@ -1,10 +1,10 @@
 <staff n="2">
-   <layer>
-      <beam>
-         <note dur="16" oct="3" pname="g"></note>
-         <note pname="b"></note>
-         <note oct="4" pname="d" staff="1"></note>
-         <note pname="f" staff="1"></note>
-      </beam>
-   </layer>
-</staff>
\ No newline at end of file
+  <layer>
+    <beam>
+      <note dur="16" oct="3" pname="g"/>
+      <note pname="b"/>
+      <note oct="4" pname="d" staff="1"/>
+      <note pname="f" staff="1"/>
+    </beam>
+  </layer>
+</staff>
diff --git a/_includes/v4/examples/cmn/cmn-sample112.xml b/_includes/v4/examples/cmn/cmn-sample112.xml
index 5cf45cab3ee..c8fe26498e0 100644
--- a/_includes/v4/examples/cmn/cmn-sample112.xml
+++ b/_includes/v4/examples/cmn/cmn-sample112.xml
@@ -1,20 +1,22 @@
 <measure>
-   <staff n="1">
-      <layer>
-         <beam beam.with="below">
-            <space dur="8"></space>
-            <note oct="4" pname="d"></note>
-            <note pname="f"></note>
-         </beam>
-      </layer>
-   </staff>
-   <staff n="2">
-      <layer>
-         <beam beam.with="above">
-            <note dur="16" oct="3" pname="g"></note>
-            <note pname="b"></note>
-            <space dur="8"></space>
-         </beam>
-      </layer>
-   </staff>
-</measure>
\ No newline at end of file
+  <staff n="1">
+    <layer>
+      <beam beam.with="below">
+        <space dur="8">
+        </space>
+        <note oct="4" pname="d"/>
+        <note pname="f"/>
+      </beam>
+    </layer>
+  </staff>
+  <staff n="2">
+    <layer>
+      <beam beam.with="above">
+        <note dur="16" oct="3" pname="g"/>
+        <note pname="b"/>
+        <space dur="8">
+        </space>
+      </beam>
+    </layer>
+  </staff>
+</measure>
diff --git a/_includes/v4/examples/cmn/cmn-sample113.xml b/_includes/v4/examples/cmn/cmn-sample113.xml
index c7237f7cf8d..c5d2e62b8c0 100644
--- a/_includes/v4/examples/cmn/cmn-sample113.xml
+++ b/_includes/v4/examples/cmn/cmn-sample113.xml
@@ -1 +1 @@
-<beamSpan endid="#note4" plist="#note1 #note2 #note3 #note4" startid="#note1"></beamSpan>
\ No newline at end of file
+<beamSpan endid="#note4" plist="#note1 #note2 #note3 #note4" startid="#note1"/>
diff --git a/_includes/v4/examples/cmn/cmn-sample114.xml b/_includes/v4/examples/cmn/cmn-sample114.xml
index 88555a462e5..840968c78e0 100644
--- a/_includes/v4/examples/cmn/cmn-sample114.xml
+++ b/_includes/v4/examples/cmn/cmn-sample114.xml
@@ -1,4 +1,4 @@
 <layer>
-   <note dur="2" oct="4" pname="f" tie="i"></note>
-   <note dots="1" dur="4" oct="4" pname="f" tie="t"></note>
-</layer>
\ No newline at end of file
+  <note dur="2" oct="4" pname="f" tie="i"/>
+  <note dots="1" dur="4" oct="4" pname="f" tie="t"/>
+</layer>
diff --git a/_includes/v4/examples/cmn/cmn-sample115.xml b/_includes/v4/examples/cmn/cmn-sample115.xml
index 0515bbf0e92..e150adb9926 100644
--- a/_includes/v4/examples/cmn/cmn-sample115.xml
+++ b/_includes/v4/examples/cmn/cmn-sample115.xml
@@ -1,37 +1,37 @@
 <measure n="1">
-   <!-- staff 1 omitted -->
-   <staff n="2">
-      <layer n="1">
-         <chord dur="16">
-            <note oct="2" pname="f"></note>
-            <note oct="1" pname="f"></note>
-         </chord>
-         <beam>
-            <note oct="2" pname="f" tie="i"></note>
-            <note oct="2" pname="a" tie="i"></note>
-            <note oct="3" pname="c" tie="i"></note>
-         </beam>
-         <chord dur="4">
-            <note oct="3" pname="f" tie="i"></note>
-            <note oct="3" pname="c" tie="m"></note>
-            <note oct="2" pname="a" tie="m"></note>
-            <note oct="2" pname="f" tie="m"></note>
-         </chord>
-      </layer>
-   </staff>
+  <!-- staff 1 omitted -->
+  <staff n="2">
+    <layer n="1">
+      <chord dur="16">
+        <note oct="2" pname="f"/>
+        <note oct="1" pname="f"/>
+      </chord>
+      <beam>
+        <note oct="2" pname="f" tie="i"/>
+        <note oct="2" pname="a" tie="i"/>
+        <note oct="3" pname="c" tie="i"/>
+      </beam>
+      <chord dur="4">
+        <note oct="3" pname="f" tie="i"/>
+        <note oct="3" pname="c" tie="m"/>
+        <note oct="2" pname="a" tie="m"/>
+        <note oct="2" pname="f" tie="m"/>
+      </chord>
+    </layer>
+  </staff>
 </measure>
 <measure n="2">
-   <!-- staff 1 omitted -->
-   <staff n="2">
-      <layer n="1">
-         <chord dur="16">
-            <note oct="3" pname="f" tie="t"></note>
-            <note oct="3" pname="c" tie="t"></note>
-            <note oct="2" pname="a" tie="t"></note>
-            <note oct="2" pname="f" tie="t"></note>
-         </chord>
-         <!-- ... -->
-      </layer>
-   </staff>
+  <!-- staff 1 omitted -->
+  <staff n="2">
+    <layer n="1">
+      <chord dur="16">
+        <note oct="3" pname="f" tie="t"/>
+        <note oct="3" pname="c" tie="t"/>
+        <note oct="2" pname="a" tie="t"/>
+        <note oct="2" pname="f" tie="t"/>
+      </chord>
+      <!-- … -->
+    </layer>
+  </staff>
 </measure>
-<!-- measures 3 and 4 omitted -->
\ No newline at end of file
+<!-- measures 3 and 4 omitted -->
diff --git a/_includes/v4/examples/cmn/cmn-sample116.xml b/_includes/v4/examples/cmn/cmn-sample116.xml
index 9072018959c..fa922487a2c 100644
--- a/_includes/v4/examples/cmn/cmn-sample116.xml
+++ b/_includes/v4/examples/cmn/cmn-sample116.xml
@@ -1,14 +1,14 @@
 <staff>
-   <layer>
-      <chord dur="4" tie="i">
-         <note pname="f"></note>
-         <note pname="c"></note>
-         <note pname="a"></note>
-      </chord>
-      <chord dur="4" tie="t">
-         <note pname="f"></note>
-         <note pname="c"></note>
-         <note pname="a"></note>
-      </chord>
-   </layer>
-</staff>
\ No newline at end of file
+  <layer>
+    <chord dur="4" tie="i">
+      <note pname="f"/>
+      <note pname="c"/>
+      <note pname="a"/>
+    </chord>
+    <chord dur="4" tie="t">
+      <note pname="f"/>
+      <note pname="c"/>
+      <note pname="a"/>
+    </chord>
+  </layer>
+</staff>
diff --git a/_includes/v4/examples/cmn/cmn-sample117.xml b/_includes/v4/examples/cmn/cmn-sample117.xml
index b506158d166..328c8d33fda 100644
--- a/_includes/v4/examples/cmn/cmn-sample117.xml
+++ b/_includes/v4/examples/cmn/cmn-sample117.xml
@@ -1,14 +1,14 @@
 <staff>
-   <layer>
-      <chord dur="4">
-         <note pname="f" tie="i"></note>
-         <note pname="c" tie="i"></note>
-         <note pname="a" tie="i"></note>
-      </chord>
-      <chord dur="4">
-         <note pname="f" tie="t"></note>
-         <note pname="c" tie="t"></note>
-         <note pname="a" tie="t"></note>
-      </chord>
-   </layer>
-</staff>
\ No newline at end of file
+  <layer>
+    <chord dur="4">
+      <note pname="f" tie="i"/>
+      <note pname="c" tie="i"/>
+      <note pname="a" tie="i"/>
+    </chord>
+    <chord dur="4">
+      <note pname="f" tie="t"/>
+      <note pname="c" tie="t"/>
+      <note pname="a" tie="t"/>
+    </chord>
+  </layer>
+</staff>
diff --git a/_includes/v4/examples/cmn/cmn-sample118.xml b/_includes/v4/examples/cmn/cmn-sample118.xml
index 94d0464c7e4..cc68aa34188 100644
--- a/_includes/v4/examples/cmn/cmn-sample118.xml
+++ b/_includes/v4/examples/cmn/cmn-sample118.xml
@@ -1,5 +1,5 @@
 <layer>
-   <note accid="s" dur="4" oct="4" pname="f" slur="i1"></note>
-   <note dur="4" oct="4" pname="g" slur="m1"></note>
-   <note dur="4" oct="4" pname="a" slur="t1"></note>
-</layer>
\ No newline at end of file
+  <note accid="s" dur="4" oct="4" pname="f" slur="i1"/>
+  <note dur="4" oct="4" pname="g" slur="m1"/>
+  <note dur="4" oct="4" pname="a" slur="t1"/>
+</layer>
diff --git a/_includes/v4/examples/cmn/cmn-sample119.xml b/_includes/v4/examples/cmn/cmn-sample119.xml
index 671eb516e97..3910a3a93f1 100644
--- a/_includes/v4/examples/cmn/cmn-sample119.xml
+++ b/_includes/v4/examples/cmn/cmn-sample119.xml
@@ -1,12 +1,12 @@
 <staff>
-   <layer>
-      <note dur="2" oct="4" pname="g" slur="i1"></note>
-      <note dur="8" oct="4" pname="a" slur="i2"></note>
-      <note dur="8" oct="4" pname="g" slur="t2"></note>
-      <note accid="s" dur="4" oct="4" pname="f" slur="t1"></note>
-   </layer>
-   <layer>
-      <note dots="1" dur="2" oct="3" pname="b" slur="i1"></note>
-      <note dur="4" oct="4" pname="d" slur="t1"></note>
-   </layer>
-</staff>
\ No newline at end of file
+  <layer>
+    <note dur="2" oct="4" pname="g" slur="i1"/>
+    <note dur="8" oct="4" pname="a" slur="i2"/>
+    <note dur="8" oct="4" pname="g" slur="t2"/>
+    <note accid="s" dur="4" oct="4" pname="f" slur="t1"/>
+  </layer>
+  <layer>
+    <note dots="1" dur="2" oct="3" pname="b" slur="i1"/>
+    <note dur="4" oct="4" pname="d" slur="t1"/>
+  </layer>
+</staff>
diff --git a/_includes/v4/examples/cmn/cmn-sample120.xml b/_includes/v4/examples/cmn/cmn-sample120.xml
index 1a7c500da3b..5d36c357ead 100644
--- a/_includes/v4/examples/cmn/cmn-sample120.xml
+++ b/_includes/v4/examples/cmn/cmn-sample120.xml
@@ -1,12 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <staff>
-   <layer>
-      <note dur="2" oct="4" pname="g" slur="i1"></note>
-      <note dur="8" oct="4" pname="a" slur="m1 i2"></note>
-      <note dur="8" oct="4" pname="g" slur="m1 t2"></note>
-      <note accid="s" dur="4" oct="4" pname="f" slur="t1"></note>
-   </layer>
-   <layer>
-      <note dots="1" dur="2" oct="3" pname="b" slur="i1"></note>
-      <note dur="4" oct="4" pname="d" slur="t1"></note>
-   </layer>
-</staff>
\ No newline at end of file
+  <layer>
+    <note dur="2" oct="4" pname="g" slur="i1"/>
+    <note dur="8" oct="4" pname="a" slur="m1 i2"/>
+    <note dur="8" oct="4" pname="g" slur="m1 t2"/>
+    <note accid="s" dur="4" oct="4" pname="f" slur="t1"/>
+  </layer>
+  <layer>
+    <note dots="1" dur="2" oct="3" pname="b" slur="i1"/>
+    <note dur="4" oct="4" pname="d" slur="t1"/>
+  </layer>
+</staff>
diff --git a/_includes/v4/examples/cmn/cmn-sample121.xml b/_includes/v4/examples/cmn/cmn-sample121.xml
index c2634c76eb3..a242374718d 100644
--- a/_includes/v4/examples/cmn/cmn-sample121.xml
+++ b/_includes/v4/examples/cmn/cmn-sample121.xml
@@ -1,16 +1,16 @@
 <measure>
-   <staff>
-      <layer>
-         <note dur="4" oct="4" pname="g" slur="i1"></note>
-         <note dur="8" oct="4" pname="a" slur="m1"></note>
-         <note dur="8" oct="4" pname="g" slur="m1"></note>
-         <note accid="s" dur="4" oct="4" pname="f" slur="m1"></note>
-      </layer>
-   </staff>
-   <staff>
-      <layer>
-         <note dots="1" dur="2" oct="3" pname="b"></note>
-         <note dur="4" oct="4" pname="d" slur="t1"></note>
-      </layer>
-   </staff>
-</measure>
\ No newline at end of file
+  <staff>
+    <layer>
+      <note dur="4" oct="4" pname="g" slur="i1"/>
+      <note dur="8" oct="4" pname="a" slur="m1"/>
+      <note dur="8" oct="4" pname="g" slur="m1"/>
+      <note accid="s" dur="4" oct="4" pname="f" slur="m1"/>
+    </layer>
+  </staff>
+  <staff>
+    <layer>
+      <note dots="1" dur="2" oct="3" pname="b"/>
+      <note dur="4" oct="4" pname="d" slur="t1"/>
+    </layer>
+  </staff>
+</measure>
diff --git a/_includes/v4/examples/cmn/cmn-sample122.xml b/_includes/v4/examples/cmn/cmn-sample122.xml
index 1c535fe5613..faf811026ab 100644
--- a/_includes/v4/examples/cmn/cmn-sample122.xml
+++ b/_includes/v4/examples/cmn/cmn-sample122.xml
@@ -1,13 +1,13 @@
 <measure>
-   <staff n="1">
-      <layer>
-         <note dur="4" oct="5" pname="c"></note>
-         <note dur="4" oct="4" pname="f"></note>
-         <note dur="4" oct="4" pname="g"></note>
-         <note dur="4" oct="4" pname="c"></note>
-      </layer>
-   </staff>
-   <slur></slur>
-   <tempo></tempo>
-   <dynam></dynam>
-</measure>
\ No newline at end of file
+  <staff n="1">
+    <layer>
+      <note dur="4" oct="5" pname="c"/>
+      <note dur="4" oct="4" pname="f"/>
+      <note dur="4" oct="4" pname="g"/>
+      <note dur="4" oct="4" pname="c"/>
+    </layer>
+  </staff>
+  <slur/>
+  <tempo/>
+  <dynam/>
+</measure>
diff --git a/_includes/v4/examples/cmn/cmn-sample123.xml b/_includes/v4/examples/cmn/cmn-sample123.xml
index b1b0890d26c..62e82f5d019 100644
--- a/_includes/v4/examples/cmn/cmn-sample123.xml
+++ b/_includes/v4/examples/cmn/cmn-sample123.xml
@@ -1 +1 @@
-<slur layer="1" staff="1"></slur>
\ No newline at end of file
+<slur layer="1" staff="1"/>
diff --git a/_includes/v4/examples/cmn/cmn-sample124.xml b/_includes/v4/examples/cmn/cmn-sample124.xml
index 919cb0b3fc7..b8ddc372d3c 100644
--- a/_includes/v4/examples/cmn/cmn-sample124.xml
+++ b/_includes/v4/examples/cmn/cmn-sample124.xml
@@ -1 +1 @@
-<slur layer="1" staff="1" tstamp="1" tstamp2="0m+4"></slur>
\ No newline at end of file
+<slur layer="1" staff="1" tstamp="1" tstamp2="0m+4"/>
diff --git a/_includes/v4/examples/cmn/cmn-sample127.xml b/_includes/v4/examples/cmn/cmn-sample127.xml
index f1ec5e728ab..76aaffaf4af 100644
--- a/_includes/v4/examples/cmn/cmn-sample127.xml
+++ b/_includes/v4/examples/cmn/cmn-sample127.xml
@@ -1,4 +1,4 @@
 <measure>
-   <dynam layer="1" tstamp="1">p</dynam>
-   <dynam layer="2" tstamp="1">mf</dynam>
-</measure>
\ No newline at end of file
+  <dynam layer="1" tstamp="1">p</dynam>
+  <dynam layer="2" tstamp="1">mf</dynam>
+</measure>
diff --git a/_includes/v4/examples/cmn/cmn-sample128.xml b/_includes/v4/examples/cmn/cmn-sample128.xml
index 3b7ac69d8f0..5416a98ab92 100644
--- a/_includes/v4/examples/cmn/cmn-sample128.xml
+++ b/_includes/v4/examples/cmn/cmn-sample128.xml
@@ -1 +1 @@
-<dynam layer="1" place="above" staff="2" tstamp="1" val="84">f</dynam>
\ No newline at end of file
+<dynam layer="1" place="above" staff="2" tstamp="1" val="84">f</dynam>
diff --git a/_includes/v4/examples/cmn/cmn-sample130.xml b/_includes/v4/examples/cmn/cmn-sample130.xml
index db2c14acf70..26af3f9bc62 100644
--- a/_includes/v4/examples/cmn/cmn-sample130.xml
+++ b/_includes/v4/examples/cmn/cmn-sample130.xml
@@ -1,16 +1,16 @@
 <measure>
-   <staff n="1">
+  <staff n="1">
+    <!-- content omitted -->
+  </staff>
+  <staff n="2">
+    <layer n="1">
+      <note dur="2" oct="4" pname="c" stem.mod="2slash"/>
+      <note dur="2" oct="4" pname="e" stem.mod="2slash"/>
+    </layer>
+    <layer n="2">
       <!-- content omitted -->
-   </staff>
-   <staff n="2">
-      <layer n="1">
-         <note dur="2" oct="4" pname="c" stem.mod="2slash"></note>
-         <note dur="2" oct="4" pname="e" stem.mod="2slash"></note>
-      </layer>
-      <layer n="2">
-         <!-- content omitted -->
-      </layer>
-   </staff>
-   <dynam layer="1" place="above" staff="2" tstamp="1">p</dynam>
-   <dynam layer="1" place="above" staff="2" tstamp="2.5">cresc. poco a poco</dynam>
-</measure>
\ No newline at end of file
+    </layer>
+  </staff>
+  <dynam layer="1" place="above" staff="2" tstamp="1">p</dynam>
+  <dynam layer="1" place="above" staff="2" tstamp="2.5">cresc. poco a poco</dynam>
+</measure>
diff --git a/_includes/v4/examples/cmn/cmn-sample131.xml b/_includes/v4/examples/cmn/cmn-sample131.xml
index e4f0f2e1f20..bd344f39e37 100644
--- a/_includes/v4/examples/cmn/cmn-sample131.xml
+++ b/_includes/v4/examples/cmn/cmn-sample131.xml
@@ -1,2 +1,2 @@
-
-<!-- using the tstamp2 attribute --><dynam place="above" staff="2" tstamp="2.5" tstamp2="1m+1">cresc. poco a poco</dynam>
\ No newline at end of file
+<!-- using the tstamp2 attribute -->
+<dynam place="above" staff="2" tstamp="2.5" tstamp2="1m+1">cresc. poco a poco</dynam>
diff --git a/_includes/v4/examples/cmn/cmn-sample132.xml b/_includes/v4/examples/cmn/cmn-sample132.xml
index 3919bfaad38..c1ec8b16e5b 100644
--- a/_includes/v4/examples/cmn/cmn-sample132.xml
+++ b/_includes/v4/examples/cmn/cmn-sample132.xml
@@ -1,2 +1,2 @@
-
-<!-- using the endid attribute --><dynam endid="ID_of_ending_note" place="above" staff="2" tstamp="2.5">cresc. poco a poco</dynam>
\ No newline at end of file
+<!-- using the endid attribute -->
+<dynam endid="ID_of_ending_note" place="above" staff="2" tstamp="2.5">cresc. poco a poco</dynam>
diff --git a/_includes/v4/examples/cmn/cmn-sample133.xml b/_includes/v4/examples/cmn/cmn-sample133.xml
index 85a11277134..283acc43810 100644
--- a/_includes/v4/examples/cmn/cmn-sample133.xml
+++ b/_includes/v4/examples/cmn/cmn-sample133.xml
@@ -1,2 +1,2 @@
-
-<!-- tstamp attribute indicates starting point, dur attribute marks the end --><dynam place="above" staff="2" tstamp="2.5" tstamp2="1m+1">cresc. poco a poco</dynam>
\ No newline at end of file
+<!-- tstamp attribute indicates starting point, dur attribute marks the end -->
+<dynam place="above" staff="2" tstamp="2.5" tstamp2="1m+1">cresc. poco a poco</dynam>
diff --git a/_includes/v4/examples/cmn/cmn-sample134.xml b/_includes/v4/examples/cmn/cmn-sample134.xml
index 7ca9ce2368e..b95c8396542 100644
--- a/_includes/v4/examples/cmn/cmn-sample134.xml
+++ b/_includes/v4/examples/cmn/cmn-sample134.xml
@@ -1,2 +1,2 @@
-
-<!-- tstamp attribute indicates starting point, endid attribute marks the end --><dynam endid="ID of last note" place="above" staff="2" tstamp="2.5">cresc. poco a poco</dynam>
\ No newline at end of file
+<!-- tstamp attribute indicates starting point, endid attribute marks the end -->
+<dynam endid="ID of last note" place="above" staff="2" tstamp="2.5">cresc. poco a poco</dynam>
diff --git a/_includes/v4/examples/cmn/cmn-sample135.xml b/_includes/v4/examples/cmn/cmn-sample135.xml
index 2b5b46e2c4f..3ac5b66a357 100644
--- a/_includes/v4/examples/cmn/cmn-sample135.xml
+++ b/_includes/v4/examples/cmn/cmn-sample135.xml
@@ -1,2 +1,2 @@
-
-<!-- startid attribute indicates starting point, tstamp2 attribute marks the end --><dynam place="above" staff="2" startid="ID_of_starting_note" tstamp2="1m+1">cresc. poco a poco</dynam>
\ No newline at end of file
+<!-- startid attribute indicates starting point, tstamp2 attribute marks the end -->
+<dynam place="above" staff="2" startid="ID_of_starting_note" tstamp2="1m+1">cresc. poco a poco</dynam>
diff --git a/_includes/v4/examples/cmn/cmn-sample136.xml b/_includes/v4/examples/cmn/cmn-sample136.xml
index 0d3618fa096..626d67d6f45 100644
--- a/_includes/v4/examples/cmn/cmn-sample136.xml
+++ b/_includes/v4/examples/cmn/cmn-sample136.xml
@@ -1,2 +1,2 @@
-
-<!-- startid attribute indicates starting point, endid attribute marks the end --><dynam endid="ID_of_ending_note" place="above" staff="2" startid="ID_of_starting_note">cresc. poco a poco</dynam>
\ No newline at end of file
+<!-- startid attribute indicates starting point, endid attribute marks the end -->
+<dynam endid="ID_of_ending_note" place="above" staff="2" startid="ID_of_starting_note">cresc. poco a poco</dynam>
diff --git a/_includes/v4/examples/cmn/cmn-sample138.xml b/_includes/v4/examples/cmn/cmn-sample138.xml
index 300241fe326..36a7b6a6b2f 100644
--- a/_includes/v4/examples/cmn/cmn-sample138.xml
+++ b/_includes/v4/examples/cmn/cmn-sample138.xml
@@ -1 +1 @@
-<hairpin form="cres"></hairpin>
\ No newline at end of file
+<hairpin form="cres"/>
diff --git a/_includes/v4/examples/cmn/cmn-sample139.xml b/_includes/v4/examples/cmn/cmn-sample139.xml
index 5c14e453459..e1b62e774bd 100644
--- a/_includes/v4/examples/cmn/cmn-sample139.xml
+++ b/_includes/v4/examples/cmn/cmn-sample139.xml
@@ -1 +1 @@
-<hairpin form="cres" layer="1" place="above" staff="2" tstamp="2.5" tstamp2="1m+1"></hairpin>
\ No newline at end of file
+<hairpin form="cres" layer="1" place="above" staff="2" tstamp="2.5" tstamp2="1m+1"/>
diff --git a/_includes/v4/examples/cmn/cmn-sample140.xml b/_includes/v4/examples/cmn/cmn-sample140.xml
index 22619613aa1..4475513ae13 100644
--- a/_includes/v4/examples/cmn/cmn-sample140.xml
+++ b/_includes/v4/examples/cmn/cmn-sample140.xml
@@ -1,8 +1,8 @@
 <layer>
-   <tuplet dur="2" num="3" numbase="2">
-      <note dur="4" oct="4" pname="g"></note>
-      <note accid="s" dur="4" oct="4" pname="f"></note>
-      <note dur="4" oct="4" pname="g"></note>
-   </tuplet>
-   <note dur="2" oct="4" pname="d"></note>
-</layer>
\ No newline at end of file
+  <tuplet dur="2" num="3" numbase="2">
+    <note dur="4" oct="4" pname="g"/>
+    <note accid="s" dur="4" oct="4" pname="f"/>
+    <note dur="4" oct="4" pname="g"/>
+  </tuplet>
+  <note dur="2" oct="4" pname="d"/>
+</layer>
diff --git a/_includes/v4/examples/cmn/cmn-sample141.xml b/_includes/v4/examples/cmn/cmn-sample141.xml
index cc94307a803..7ff27f4a34c 100644
--- a/_includes/v4/examples/cmn/cmn-sample141.xml
+++ b/_includes/v4/examples/cmn/cmn-sample141.xml
@@ -1 +1 @@
-<tupletSpan endid="#note4" plist="#note1 #note2 #note3 #note4" startid="#note1"></tupletSpan>
\ No newline at end of file
+<tupletSpan endid="#note4" plist="#note1 #note2 #note3 #note4" startid="#note1"/>
diff --git a/_includes/v4/examples/cmn/cmn-sample142.xml b/_includes/v4/examples/cmn/cmn-sample142.xml
index 5a38408d604..b16d3b4afd0 100644
--- a/_includes/v4/examples/cmn/cmn-sample142.xml
+++ b/_includes/v4/examples/cmn/cmn-sample142.xml
@@ -1,16 +1,16 @@
 <measure>
-   <staff n="1">
-      <!-- content omitted -->
-   </staff>
-   <staff n="2">
-      <layer>
-         <note dur="4"></note>
-         <note dur="4"></note>
-         <chord dur="4">
-            <!-- notes omitted -->
-         </chord>
-         <note></note>
-      </layer>
-   </staff>
-   <arpeg staff="2" tstamp="3"></arpeg>
-</measure>
\ No newline at end of file
+  <staff n="1">
+    <!-- content omitted -->
+  </staff>
+  <staff n="2">
+    <layer>
+      <note dur="4"/>
+      <note dur="4"/>
+      <chord dur="4">
+        <!-- notes omitted -->
+      </chord>
+      <note/>
+    </layer>
+  </staff>
+  <arpeg staff="2" tstamp="3"/>
+</measure>
diff --git a/_includes/v4/examples/cmn/cmn-sample143.xml b/_includes/v4/examples/cmn/cmn-sample143.xml
index 7010d67aaa0..096dd19ec23 100644
--- a/_includes/v4/examples/cmn/cmn-sample143.xml
+++ b/_includes/v4/examples/cmn/cmn-sample143.xml
@@ -1,2 +1,2 @@
-
-<!-- default visualization and performance --><arpeg staff="2" tstamp="3"></arpeg>
\ No newline at end of file
+<!-- default visualization and performance -->
+<arpeg staff="2" tstamp="3"/>
diff --git a/_includes/v4/examples/cmn/cmn-sample144.xml b/_includes/v4/examples/cmn/cmn-sample144.xml
index d53e2ba0088..ab502f10117 100644
--- a/_includes/v4/examples/cmn/cmn-sample144.xml
+++ b/_includes/v4/examples/cmn/cmn-sample144.xml
@@ -1,2 +1,2 @@
-
-<!-- downward arpeggio with arrow added to visual symbol --><arpeg arrow="true" order="down" staff="2" tstamp="3"></arpeg>
\ No newline at end of file
+<!-- downward arpeggio with arrow added to visual symbol -->
+<arpeg arrow="true" order="down" staff="2" tstamp="3"/>
diff --git a/_includes/v4/examples/cmn/cmn-sample145.xml b/_includes/v4/examples/cmn/cmn-sample145.xml
index aebc4237a9e..116cc21f175 100644
--- a/_includes/v4/examples/cmn/cmn-sample145.xml
+++ b/_includes/v4/examples/cmn/cmn-sample145.xml
@@ -1,2 +1,2 @@
-
-<!-- default rendition with (redundant) arrow added to the top of the visual symbol --><arpeg arrow="true" staff="2" tstamp="3"></arpeg>
\ No newline at end of file
+<!-- default rendition with (redundant) arrow added to the top of the visual symbol -->
+<arpeg arrow="true" staff="2" tstamp="3"></arpeg>
diff --git a/_includes/v4/examples/cmn/cmn-sample146.xml b/_includes/v4/examples/cmn/cmn-sample146.xml
index 19ce4b59e12..4ecd187cd5d 100644
--- a/_includes/v4/examples/cmn/cmn-sample146.xml
+++ b/_includes/v4/examples/cmn/cmn-sample146.xml
@@ -1,2 +1,2 @@
-
-<!-- downward arpeggio with no visual indication of order --><arpeg order="down" staff="2" tstamp="3"></arpeg>
\ No newline at end of file
+<!-- downward arpeggio with no visual indication of order -->
+<arpeg order="down" staff="2" tstamp="3"/>
diff --git a/_includes/v4/examples/cmn/cmn-sample153.xml b/_includes/v4/examples/cmn/cmn-sample153.xml
index 72eeb07089e..db8a5dc4a6a 100644
--- a/_includes/v4/examples/cmn/cmn-sample153.xml
+++ b/_includes/v4/examples/cmn/cmn-sample153.xml
@@ -1 +1 @@
-<fermata altsym="#myFermata.1" place="above" staff="2" tstamp="5"></fermata>
\ No newline at end of file
+<fermata altsym="#myFermata.1" place="above" staff="2" tstamp="5"/>
diff --git a/_includes/v4/examples/cmn/cmn-sample154.xml b/_includes/v4/examples/cmn/cmn-sample154.xml
index f63f8baaee0..34f5e91c713 100644
--- a/_includes/v4/examples/cmn/cmn-sample154.xml
+++ b/_includes/v4/examples/cmn/cmn-sample154.xml
@@ -1,9 +1,9 @@
 <measure>
-   <staff n="1">
-      <layer>
-         <note dur="2" oct="3" pname="g" syl="Wald,"></note>
-         <note dur="4" oct="3" pname="c" syl="so"></note>
-      </layer>
-   </staff>
-   <breath staff="1" tstamp="1.5"></breath>
-</measure>
\ No newline at end of file
+  <staff n="1">
+    <layer>
+      <note dur="2" oct="3" pname="g" syl="Wald,"/>
+      <note dur="4" oct="3" pname="c" syl="so"/>
+    </layer>
+  </staff>
+  <breath staff="1" tstamp="1.5"/>
+</measure>
diff --git a/_includes/v4/examples/cmn/cmn-sample155.xml b/_includes/v4/examples/cmn/cmn-sample155.xml
index 9a17a5130df..48a29acc099 100644
--- a/_includes/v4/examples/cmn/cmn-sample155.xml
+++ b/_includes/v4/examples/cmn/cmn-sample155.xml
@@ -1,4 +1,4 @@
 <measure>
-   <!-- staves omitted -->
-   <harpPedal a="f" b="f" e="f" staff="2" tstamp="1"></harpPedal>
-</measure>
\ No newline at end of file
+  <!-- staves omitted -->
+  <harpPedal a="f" b="f" e="f" staff="2" tstamp="1"/>
+</measure>
diff --git a/_includes/v4/examples/cmn/cmn-sample156.xml b/_includes/v4/examples/cmn/cmn-sample156.xml
index 23262debf85..66ea3c2bb5d 100644
--- a/_includes/v4/examples/cmn/cmn-sample156.xml
+++ b/_includes/v4/examples/cmn/cmn-sample156.xml
@@ -1,4 +1,4 @@
 <measure>
-   <!-- staves omitted -->
-   <pedal dir="down" staff="2" tstamp="1"></pedal>
-</measure>
\ No newline at end of file
+  <!-- staves omitted -->
+  <pedal dir="down" staff="2" tstamp="1"/>
+</measure>
diff --git a/_includes/v4/examples/cmn/cmn-sample157.xml b/_includes/v4/examples/cmn/cmn-sample157.xml
index 21df523c7fb..b78bd51ae53 100644
--- a/_includes/v4/examples/cmn/cmn-sample157.xml
+++ b/_includes/v4/examples/cmn/cmn-sample157.xml
@@ -1,16 +1,16 @@
 <measure>
-   <staff n="1">
-      <!-- first staff, without ossia -->
-   </staff>
-   <ossia>
-      <staff>
-         <!-- alternative content on reduced-size staff -->
-      </staff>
-      <staff n="2">
-         <!-- original content on regular staff -->
-      </staff>
-   </ossia>
-   <staff n="3">
-      <!-- third staff, without ossia -->
-   </staff>
-</measure>
\ No newline at end of file
+  <staff n="1">
+    <!-- first staff, without ossia -->
+  </staff>
+  <ossia>
+    <staff>
+      <!-- alternative content on reduced-size staff -->
+    </staff>
+    <staff n="2">
+      <!-- original content on regular staff -->
+    </staff>
+  </ossia>
+  <staff n="3">
+    <!-- third staff, without ossia -->
+  </staff>
+</measure>
diff --git a/_includes/v4/examples/cmn/cmn-sample158.xml b/_includes/v4/examples/cmn/cmn-sample158.xml
index b7ff97c2ae3..a27e0fe1ee1 100644
--- a/_includes/v4/examples/cmn/cmn-sample158.xml
+++ b/_includes/v4/examples/cmn/cmn-sample158.xml
@@ -1,18 +1,18 @@
 <measure>
-   <staff n="1">
-      <!-- content omitted -->
-   </staff>
-   <staff n="2">
-      <ossia>
-         <layer n="1">
-            <!-- original content in regular layer -->
-         </layer>
-         <layer>
-            <!-- alternative content in separate layer -->
-         </layer>
-      </ossia>
-   </staff>
-   <staff n="3">
-      <!-- content omitted -->
-   </staff>
-</measure>
\ No newline at end of file
+  <staff n="1">
+    <!-- content omitted -->
+  </staff>
+  <staff n="2">
+    <ossia>
+      <layer n="1">
+        <!-- original content in regular layer -->
+      </layer>
+      <layer>
+        <!-- alternative content in separate layer -->
+      </layer>
+    </ossia>
+  </staff>
+  <staff n="3">
+    <!-- content omitted -->
+  </staff>
+</measure>
diff --git a/_includes/v4/examples/cmn/cmn-sample159.xml b/_includes/v4/examples/cmn/cmn-sample159.xml
index a36e2ef3de2..8ce5d541f71 100644
--- a/_includes/v4/examples/cmn/cmn-sample159.xml
+++ b/_includes/v4/examples/cmn/cmn-sample159.xml
@@ -1,4 +1,4 @@
 <measure n="1">
-   <!-- all staves omitted -->
-   <tempo place="above" staff="1" tstamp="1">Allegro moderato</tempo>
-</measure>
\ No newline at end of file
+  <!-- all staves omitted -->
+  <tempo place="above" staff="1" tstamp="1">Allegro moderato</tempo>
+</measure>
diff --git a/_includes/v4/examples/cmn/cmn-sample160.xml b/_includes/v4/examples/cmn/cmn-sample160.xml
index e9bc220d1d8..6e8b3a10e9b 100644
--- a/_includes/v4/examples/cmn/cmn-sample160.xml
+++ b/_includes/v4/examples/cmn/cmn-sample160.xml
@@ -1,14 +1,14 @@
 <measure>
-   <staff n="1">
-      <!-- content omitted -->
-   </staff>
-   <staff n="2">
-      <!-- content omitted -->
-   </staff>
-   <staff n="3">
-      <!-- content omitted -->
-   </staff>
-   <reh place="above" staff="1" tstamp="1">
-      <rend rend="box">37</rend>
-   </reh>
-</measure>
\ No newline at end of file
+  <staff n="1">
+    <!-- content omitted -->
+  </staff>
+  <staff n="2">
+    <!-- content omitted -->
+  </staff>
+  <staff n="3">
+    <!-- content omitted -->
+  </staff>
+  <reh place="above" staff="1" tstamp="1">
+    <rend rend="box">37</rend>
+  </reh>
+</measure>
diff --git a/_includes/v4/examples/cmn/cmn-sample161.xml b/_includes/v4/examples/cmn/cmn-sample161.xml
index b5e78319f9b..4f13a1ca408 100644
--- a/_includes/v4/examples/cmn/cmn-sample161.xml
+++ b/_includes/v4/examples/cmn/cmn-sample161.xml
@@ -1,4 +1,4 @@
 <measure>
-   <reh place="above" staff="1" tstamp="1">A</reh>
-   <reh place="below" staff="7 11" tstamp="1">A</reh>
-</measure>
\ No newline at end of file
+  <reh place="above" staff="1" tstamp="1">A</reh>
+  <reh place="below" staff="7 11" tstamp="1">A</reh>
+</measure>
diff --git a/_includes/v4/examples/cmn/cmn-sample162.xml b/_includes/v4/examples/cmn/cmn-sample162.xml
index 3b1485ffb21..1466a7b150c 100644
--- a/_includes/v4/examples/cmn/cmn-sample162.xml
+++ b/_includes/v4/examples/cmn/cmn-sample162.xml
@@ -1,40 +1,40 @@
 <section>
-   <measure>
-      <staff>
-         <layer>
-            <beam>
-               <note dur="8" oct="4" pname="f"></note>
-               <note dur="16" pname="a"></note>
-               <note oct="5" pname="c"></note>
-               <note dur="8" oct="4" pname="a"></note>
-            </beam>
-            <beam>
-               <note dur="8" oct="5" pname="c"></note>
-               <note oct="4" pname="a"></note>
-               <note pname="g"></note>
-            </beam>
-         </layer>
-      </staff>
-   </measure>
-   <measure>
-      <staff>
-         <layer>
-            <mRpt></mRpt>
-         </layer>
-      </staff>
-   </measure>
-   <measure>
-      <staff>
-         <layer>
-            <mRpt></mRpt>
-         </layer>
-      </staff>
-   </measure>
-   <measure>
-      <staff>
-         <layer>
-            <mRpt></mRpt>
-         </layer>
-      </staff>
-   </measure>
-</section>
\ No newline at end of file
+  <measure>
+    <staff>
+      <layer>
+        <beam>
+          <note dur="8" oct="4" pname="f"/>
+          <note dur="16" pname="a"/>
+          <note oct="5" pname="c"/>
+          <note dur="8" oct="4" pname="a"/>
+        </beam>
+        <beam>
+          <note dur="8" oct="5" pname="c"/>
+          <note oct="4" pname="a"/>
+          <note pname="g"/>
+        </beam>
+      </layer>
+    </staff>
+  </measure>
+  <measure>
+    <staff>
+      <layer>
+        <mRpt/>
+      </layer>
+    </staff>
+  </measure>
+  <measure>
+    <staff>
+      <layer>
+        <mRpt/>
+      </layer>
+    </staff>
+  </measure>
+  <measure>
+    <staff>
+      <layer>
+        <mRpt/>
+      </layer>
+    </staff>
+  </measure>
+</section>
diff --git a/_includes/v4/examples/cmn/cmn-sample163.xml b/_includes/v4/examples/cmn/cmn-sample163.xml
index 5816923d411..11c6c512ee2 100644
--- a/_includes/v4/examples/cmn/cmn-sample163.xml
+++ b/_includes/v4/examples/cmn/cmn-sample163.xml
@@ -1,30 +1,35 @@
 <section>
-   <measure>
-      <staff n="1">
-         <!-- omitted -->
-      </staff>
-      <staff n="2">
-         <layer n="1">
-            <!-- omitted -->
-         </layer>
-         <layer n="2">
-            <chord dur="2" stem.mod="1slash">
-               <note oct="2" pname="g"></note>
-               <note oct="1" pname="b"></note>
-            </chord>
-            <halfmRpt></halfmRpt>
-         </layer>
-      </staff>
-   </measure>
-   <measure>
-      <staff n="1">
-         <!-- omitted -->
-      </staff>
-      <staff n="2">
-         <layer n="2">
-            <halfmRpt></halfmRpt>
-            <halfmRpt></halfmRpt>
-         </layer>
-      </staff>
-   </measure>
-</section>
\ No newline at end of file
+  <measure>
+    <staff n="1">
+      <!-- omitted -->
+    </staff>
+    <staff n="2">
+      <layer n="1">
+        <!-- omitted -->
+      </layer>
+      <layer n="2">
+        <chord dur="2" stem.mod="1slash">
+          <note oct="2" pname="g">
+          </note>
+          <note oct="1" pname="b">
+          </note>
+        </chord>
+        <halfmRpt/>
+      </layer>
+    </staff>
+  </measure>
+  <measure>
+    <staff n="1">
+      <!-- omitted -->
+    </staff>
+    <staff n="2">
+      <layer n="1">
+        <!-- omitted -->
+      </layer>
+      <layer n="2">
+        <halfmRpt/>
+        <halfmRpt/>
+      </layer>
+    </staff>
+  </measure>
+</section>