Fixed: Specification of clef, keysig, timesig changes

rism-digital · May 23, 2024 · 4329ff2 · 4329ff2
1 parent 2b9363a
commit 4329ff2
Showing 1 changed file with 47 additions and 5 deletions.
diff --git a/v2/index.html b/v2/index.html
@@ -1686,18 +1686,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 introductory characters are mandatory.
+                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>
+                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.
             </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>
@@ -1706,12 +1732,28 @@ <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>