Merge branch 'main' of github.com:Bubobubobubobubo/Topos

package.json

@@ -39,7 +39,7 @@
     "tone": "^14.8.49",
     "unique-names-generator": "^4.7.1",
     "vite-plugin-markdown": "^2.1.0",
-    "zifferjs": "^0.0.18",
+    "zifferjs": "^0.0.19",
     "zzfx": "^1.2.0"
   }
 }

src/documentation/ziffers.ts

@@ -23,13 +23,14 @@ The basic Ziffer notation is entirely written in JavaScript strings (_e.g_ <ic>"
 | **Pitches**   | <ic>0-9</ic> <ic>{10 11 21}</ic> | Numbers or escaped numbers in curly brackets |
 | **Duration** | <ic>a b c</ic> to <ic>z</ic> | Each letter of the alphabet is a rhythm (see table) |
 | **Duration**  | <ic>0.25</ic> = <ic>q</ic>, <ic>0.5</ic> = <ic>h</ic> | Floating point numbers can also be used as durations |
+| **Subdivision** | <ic>[1 [2 3]]</ic> | Durations can be subdivided using square brackets |
 | **Octave**    | <ic>^ _</ic> | <ic>^</ic> for octave up and <ic>_</ic> for octave down |
 | **Accidentals** | <ic># b</ic> | Sharp and flats, just like with regular music notation :smile: |
 | **Rest**      |  <ic>r</ic> | Rest / silences |
+| **Repeat**    | <ic>:1-9</ic> | Repeat the item 1-9 times  |
 
 **Note:** Some features are still unsupported. For full syntax see article about <a href="https://zenodo.org/record/7841945" target="_blank">Ziffers</a>.
 
-
 ${makeExample(
   "Pitches from 0 to 9",
   `
@@ -78,6 +79,27 @@ z1('e 0 s 1 b2 3 e 0 s 1 b2 4')
   false
 )}
 
+${makeExample(
+  "Repeat items n-times",
+  `
+z1('e 0:4 2:2 4:2 (0 4):2')
+  .scale('major').sound('sine')
+  .fmi(usine(.5)).fmh(2)
+  .delay(0.5).delayt(1.25)
+  .sustain(0.1).out()
+`,
+  false
+)}
+
+${makeExample(
+  "Subdivided durations",
+  `
+z1('w [0 [5 [3 7]]] h [0 4]')
+  .scale('major').sound('sine')
+  .fmi(usine(.5)).fmh(2).out()
+`,
+  false
+)}
 
 ## Algorithmic operations
 

yarn.lock

@@ -1451,10 +1451,10 @@ yaml@^2.1.1:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b"
   integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==
 
-zifferjs@^0.0.18:
-  version "0.0.18"
-  resolved "https://registry.yarnpkg.com/zifferjs/-/zifferjs-0.0.18.tgz#e8a5cb5cfef77c098899a12450380b04f0100841"
-  integrity sha512-qixh6tb6wpMx/iFM1uGeDQVi6oaURPwP553Gc75pgZLIvapoXnnJIn23f8fAEgxwTdI+EkqLEZZLa57sDxj0PA==
+zifferjs@^0.0.19:
+  version "0.0.19"
+  resolved "https://registry.yarnpkg.com/zifferjs/-/zifferjs-0.0.19.tgz#a3e1fc04b12cef1f59a78f3d23229b072d9f0a60"
+  integrity sha512-mdrfac/ryDF1MEC1iMCV9KTj36AXNVsiDoYiDEA5ZCYFuHqfzS5s2aCh2iK6teyRKTIagE2IvZCrsTacB5GBBg==
 
 zzfx@^1.2.0:
   version "1.2.0"