Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Fixed: Beaming section #85

Merged
merged 7 commits into from
May 24, 2024
Merged

Fixed: Beaming section #85

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f2a9b10
Fixed: Beaming section
ahankinson May 23, 2024
ca3ea50
Fixed: Adjust beaming spec
ahankinson May 23, 2024
b11dadd
Merge branch 'main' into fixed-45-beaming
ahankinson May 23, 2024
0e8b9cb
Update v2/index.html
ahankinson May 23, 2024
53c43ac
Remove section from beaming branch
ahankinson May 23, 2024
0cc1599
Update v2/index.html
ahankinson May 24, 2024
0cc7730
Merge branch 'main' into fixed-45-beaming
ahankinson May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 82 additions & 24 deletions v2/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1160,32 +1160,33 @@ <h4>Chords</h4>
</section>
<section>
<h4>Beaming</h4>
<div class="issue" data-number="24"></div>
<div class="issue" data-number="45"></div>
<table class="simple">
<thead>
<tr>
<th>Code</th>
<th>Remarks</th>
</tr>
</thead>
<tbody>
<tr>
<td><code>{</code></td>
<td>beginning of beaming</td>
</tr>
<tr>
<td><code>}</code></td>
<td>end of beaming</td>
</tr>
</tbody>
</table>

<div class="issue" data-number="84"></div>
<p>
Beamed notes are encoded using braces <code>{}</code>.
</p>
<p>
Beam groups MUST start with an opening brace <code>{</code>, and
MUST end with a closing brace, <code>}</code>. Nested beam groups
MUST NOT occur, except as part of a <a>grace note group</a>.
</p>
<p>
Notes with duration values of <code>0</code>, <code>1</code>, <code>2</code>,
<code>4</code>, and <code>9</code> MUST NOT occur within
a beam group. Notes with other duration values MAY occur within
a beam group.
</p>
<p>
Beam groups MUST NOT occur in Mensural encodings.
ahankinson marked this conversation as resolved.
Show resolved Hide resolved
ahankinson marked this conversation as resolved.
Show resolved Hide resolved
</p>
<aside class="example" title="Encoding Beams">
<table class="simple" style="width: 100%">
<thead>
<tr>
<th>Code</th>
<th>Notation</th>
<th>Remarks</th>
</tr>
</thead>
<tbody>
Expand All @@ -1202,6 +1203,20 @@ <h4>Beaming</h4>
<code>{''6E'B8G}{GA}-''C{'3B8..G}</code>
</td>
<td class="notation-result"></td>
<td>Example beam encoding</td>
</tr>
<tr class="notation-example">
<td class="notation-code">
<script type="application/json">
{
"clef": "G-2",
"data": "8{ABqq{''CD}r'AB}"
ahankinson marked this conversation as resolved.
Show resolved Hide resolved
}
</script>
<code>8{ABqq{''CD}r'AB}</code>
</td>
<td class="notation-result"></td>
<td>Beaming with a Grace Note Group</td>
</tr>
</tbody>
</table>
Expand Down Expand Up @@ -1686,18 +1701,44 @@ <h5>Rhythmic sequence</h5>
<div class="issue" data-number="35"></div>
<h4>Change of Clef, Key Signature, Time Signature</h4>
<p>
Use <code>%</code> to change the clef, <code>$</code> to change the key, and <code>@</code> to change
the time signature. Follow this with the new indication (clef, key, or time), followed by a space.
Clefs, key signatures, and time signatures MAY be changed within an incipit.
</p>
<p>
The percent character <code>%</code> MUST be used to indicate a clef change. A clef change MAY occur anywhere
within the music notation section. This character MUST be followed by a clef definition according
to the specifications given in the <a>Clefs</a> section.
</p>
<p>
The dollar character <code>$</code> MUST be used to indicate a key signature change. A key signature
change MAY appear anywhere in the music notation, but SHOULD appear immediately following a
bar line. This character MUST be followed by a key signature definition according to the
specifications given in the <a>Key Signatures</a> section.
</p>
<aside class="note">
<p>
It is not necessary to cancel the previous key signature with naturals when defining
a new key signature.
</p>
</aside>
<p>
The at sign character <code>@</code> MUST be used to indicate a time signature change. A time signature
change MAY appear anywhere in the music notation, but SHOULD appear immediately following a
bar line. This character MUST be followed by a time signature definition according to the
specifications given in the <a>Time Signatures</a> section.
</p>
<p>
The introductory characters are mandatory.
For any change of clef, key signature, time signature, or combination thereof, the change indication
MUST be separated from the notation that follows by a single space character. In the case of multiple
changes at once (for example, a key and a time signature change) the individual change indications
MUST NOT be separated by a space.
ahankinson marked this conversation as resolved.
Show resolved Hide resolved
</p>
<aside class="example" title="Encoding Clef, Key Signature, and Time Signature Changes">
<table class="simple" style="width: 100%">
<thead>
<tr>
<th>Code</th>
<th>Notation</th>
<th>Remarks</th>
</tr>
</thead>
<tbody>
Expand All @@ -1706,13 +1747,30 @@ <h4>Change of Clef, Key Signature, Time Signature</h4>
<script type="application/json">
{
"clef": "G-2",
"data": "%C-1 $bBEA @c '2A-//$xFC 8B-4-2-/@3/2 1C2-//"
"data": "%C-1$bBEA@c '2A-//$xFC 8B-4-2-/@3/2 1C2-//"
}
</script>
<code>'2A-//$xFC 8B-4-2-/@3/2 1C2-//</code>
</td>
<td class="notation-result"></td>
<td>Clef, key signature, and time signature changes</td>
</tr>
<tr class="notation-example">
<td class="notation-code">
<script type="application/json">
{
"clef": "G-2",
"timesig": "4/4",
"keysig": "n",
"data": "4CDEF/$xFC@2/4 CD/EF"
}
</script>
<code>%C-1 $bBEA @c '2A-//$xFC 8B-4-2-/@3/2 1C2-//</code>
<code>4CDEF/$xFC@2/4 CD/EF</code>
</td>
<td class="notation-result"></td>
<td>Clef, key signature, and time signature changes</td>
</tr>

</tbody>
</table>
</aside>
Expand Down
Loading