From f2a9b1018ab0bc385e886d75c2a1a6ebe43f1f0f Mon Sep 17 00:00:00 2001 From: Andrew Hankinson Date: Thu, 23 May 2024 11:12:32 +0200 Subject: [PATCH 1/5] Fixed: Beaming section - Disallows nested beams - Clarified allowed values within beams - Disallows beam groups in mensural notation Fixes #45 Fixes #84 Refs #24 --- v2/index.html | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/v2/index.html b/v2/index.html index 5b388ce..9c6a551 100644 --- a/v2/index.html +++ b/v2/index.html @@ -1160,32 +1160,36 @@

Chords

Beaming

+
- - - - - - - - - - - - - - - - - -
CodeRemarks
{beginning of beaming
}end of beaming
- +
+

+ Beamed notes are encoded using braces {}. +

+

+ Beam groups MUST start with an opening brace {, and + MUST end with a closing brace, }. Nested beam groups + MUST NOT occur. +

+

+ Notes with duration values of 0, 1, 2, + 4, and 9 MUST NOT occur within + a beam group. Notes with other duration values MAY occur within + a beam group. +

+

+ Rests SHOULD NOT occur within a beam group. +

+

+ Beam groups MUST NOT occur in Mensural encodings. +

@@ -1620,11 +1630,36 @@
Rhythmic sequence

Change of Clef, Key Signature, Time Signature

- Use % to change the clef, $ to change the key, and @ 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. +

+

+ The percent character % 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 Clefs section.

- The introductory characters are mandatory. + The dollar character $ 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 Key Signatures section. +

+ +

+ The at sign character @ 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 Time Signatures section. +

+

+ 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.

From 0e8b9cb2add3c95aac1c8bc62a66704d32232f5e Mon Sep 17 00:00:00 2001 From: Andrew Hankinson Date: Thu, 23 May 2024 17:02:35 +0200 Subject: [PATCH 3/5] Update v2/index.html Co-authored-by: Laurent Pugin --- v2/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2/index.html b/v2/index.html index 5702aa3..b4e10bb 100644 --- a/v2/index.html +++ b/v2/index.html @@ -1210,7 +1210,7 @@

Beaming

8{ABqq{''CD}r'AB} From 53c43acf86ccbaef01f9d154ab99e00c92c3cbcc Mon Sep 17 00:00:00 2001 From: Andrew Hankinson Date: Thu, 23 May 2024 17:07:03 +0200 Subject: [PATCH 4/5] Remove section from beaming branch --- v2/index.html | 79 --------------------------------------------------- 1 file changed, 79 deletions(-) diff --git a/v2/index.html b/v2/index.html index b4e10bb..9d49039 100644 --- a/v2/index.html +++ b/v2/index.html @@ -1696,85 +1696,6 @@
Rhythmic sequence
-
-
-
-

Change of Clef, Key Signature, Time Signature

-

- Clefs, key signatures, and time signatures MAY be changed within an incipit. -

-

- The percent character % 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 Clefs section. -

-

- The dollar character $ 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 Key Signatures section. -

- -

- The at sign character @ 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 Time Signatures section. -

-

- 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. -

- -
From 0cc15998ce6d48d037619f7b7c000e4c357d19f8 Mon Sep 17 00:00:00 2001 From: Andrew Hankinson Date: Fri, 24 May 2024 10:11:43 +0200 Subject: [PATCH 5/5] Update v2/index.html Co-authored-by: Laurent Pugin --- v2/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2/index.html b/v2/index.html index 9d49039..111dcb3 100644 --- a/v2/index.html +++ b/v2/index.html @@ -1178,7 +1178,7 @@

Beaming

a beam group.

- Beam groups MUST NOT occur in Mensural encodings. + Beam groups SHOULD NOT occur in Mensural encodings.