v0.36.1: 7 new synths, 9 new demo moods

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

CHANGELOG.md

@@ -2,6 +2,60 @@
 
 All notable changes to PyTheory are documented here.
 
+## 0.36.1
+
+- **7 new instrument synths:** pedal steel guitar, theremin, kalimba/thumb
+  piano, steel drum/pan, accordion (musette reeds), didgeridoo (drone +
+  shifting formants), bagpipes (chanter reed)
+- **9 new demo moods** in ``pytheory demo``: Theremin Noir, Caribbean,
+  Accordion Waltz, Kalimba Dreams, Outback Drone, Highland, Nashville
+  Tears, Tabla Fusion
+- Improved existing songs with dedicated instrument synths
+- 41 synth waveforms, 26+ songs, 21 demo moods
+
+## 0.36.0
+
+- **Banjo synth** — steel strings on drum-head body, nasal twang,
+  fast decay with membrane resonance
+- **Mandolin synth** — paired steel strings (natural chorus from
+  doubled courses), bright body resonance
+- **Ukulele synth** — nylon strings, small mid-heavy body, shorter
+  sustain than guitar
+- **Cajón drums** — bass (woody box thump), slap (snare wire buzz),
+  tap (ghost note). 3 patterns: cajon, cajon rumba, cajon folk
+- **Vocal/formant synth** — LF glottal model, 5 Peterson & Barney
+  formant peaks, jitter/shimmer, consonant onsets, per-note lyrics.
+  Presets: vocal, choir
+- **Granular synthesis** — grain cloud engine with scatter, pitch
+  variation, Hanning windows. Presets: granular_pad, granular_texture
+- **Strum sweep** — subtle grace notes before chord hit for natural
+  strum feel on all fretboard instruments
+- Mandola preset, 34 synth waveforms, 26 songs
+
+## 0.35.0
+
+- **8.5x faster import** — dropped pytuning/sympy, lazy-load scipy.
+  `import pytheory` now takes ~50ms instead of ~480ms (#44)
+- **Proper shruti JI ratios** — 22 positions with 5-limit just intonation
+  (pure 3/2 fifths, 5/4 thirds), not 22-TET approximation
+- **Arabic maqam JI ratios** — Zalzalian 11-limit ratios.
+  Mi↓ (the Rast third) is exactly 27/22 from Do
+- **B#/Cb octave boundary fix** — B#4 = C5, Cb4 = B3 (#45)
+- **Int tone names** — `Tone(0, system=TET(22))` works alongside strings.
+  Wrapping: `Tone(22)` → tone 0, octave+1. `System.tone()` convenience.
+- **Timpani synth** — inharmonic membrane modes, felt mallet, copper kettle
+  resonance, cathedral reverb
+- **Saxophone synth** — conical bore, reed buzz, brass body warmth.
+  4 presets: saxophone, alto_sax, tenor_sax, bari_sax
+- **Part.roll()** — rapid repeated notes with velocity ramp for crescendo/
+  decrescendo rolls on any instrument
+- **Vibrato tuning** — all instruments reduced to 0.001 depth for cleaner
+  ensemble sound
+- **Granular synthesis** — grain cloud engine with scatter, pitch
+  variation, and Hanning-windowed grains. Two presets: granular_pad,
+  granular_texture.
+- 30 synth waveforms, 838 tests
+
 ## 0.34.0
 
 - **16 dedicated instrument synths** — physical modeling and specialized

docs/guide/sequencing.rst

@@ -574,3 +574,107 @@ Define sections with ``score.section()`` and repeat them with
 Use any names you want — ``"intro"``, ``"verse"``, ``"chorus"``,
 ``"bridge"``, ``"drop"``, ``"breakdown"``, ``"outro"``, or anything
 that makes sense for your song. The names are just labels.
+
+Guitar Strumming
+----------------
+
+Any part with a fretboard can strum chords using real fingering
+positions. The ``strum()`` method looks up the chord on the fretboard,
+gets the correct voicing, and plays all strings as a chord.
+
+.. code-block:: python
+
+   from pytheory import Fretboard
+
+   guitar = score.part("guitar", instrument="acoustic_guitar",
+                       fretboard=Fretboard.guitar())
+
+   guitar.strum("Am", Duration.HALF, direction="down")
+   guitar.strum("G", Duration.HALF, direction="up")
+   guitar.strum("F", Duration.WHOLE)
+
+Works with any fretboard instrument — guitar, ukulele, banjo, mandolin.
+Works with any guitar preset — clean, crunch, distorted, orange, metal.
+
+Pitch Bends
+-----------
+
+Bend a note's pitch up or down over its duration. Essential for guitar
+bends, sitar meends, trombone slides, and vocal-style expression.
+
+.. code-block:: python
+
+   # Guitar bend: D up to E (2 semitones)
+   guitar.add("D4", Duration.HALF, bend=2, bend_type="smooth")
+
+   # Release bend: E back down to D
+   guitar.add("E4", Duration.HALF, bend=-2)
+
+   # Blues curl: hold then bend at the end
+   guitar.add("C4", Duration.HALF, bend=1, bend_type="late")
+
+Three bend types:
+
+- ``"smooth"`` — logarithmic (default). Perceptually even pitch change.
+- ``"linear"`` — linear frequency interpolation. Mechanical/synth feel.
+- ``"late"`` — holds the starting pitch for 60%, bends in the last 40%.
+  The classic blues "curl."
+
+Rolls
+-----
+
+Rapid repeated notes with a velocity ramp — perfect for timpani
+rolls, snare rolls, tremolo on any instrument. The velocity ramps
+from ``velocity_start`` to ``velocity_end`` for crescendo or
+decrescendo effects.
+
+.. code-block:: python
+
+   # Timpani crescendo roll
+   timp = score.part("timp", instrument="timpani")
+   timp.roll("C3", Duration.WHOLE, velocity_start=20, velocity_end=110)
+   timp.add("C3", Duration.HALF, velocity=127)  # big accent
+
+   # Snare roll with 32nd notes
+   snare = score.part("snare", synth="noise", envelope="pluck")
+   snare.roll("C4", Duration.HALF, speed=0.125,
+              velocity_start=40, velocity_end=100)
+
+   # Decrescendo (loud to quiet)
+   timp.roll("G2", Duration.WHOLE, velocity_start=100, velocity_end=30)
+
+Parameters:
+
+- ``velocity_start``: Starting velocity (default 40).
+- ``velocity_end``: Ending velocity (default 100).
+- ``speed``: Note subdivision (default ``Duration.SIXTEENTH``).
+  Use ``0.125`` for 32nd notes, ``Duration.EIGHTH`` for 8th notes.
+
+Tuning Systems
+--------------
+
+A Score can use any tuning system and temperament:
+
+.. code-block:: python
+
+   # Baroque harpsichord — meantone tuning, A=415
+   score = Score("4/4", bpm=80, temperament="meantone",
+                 reference_pitch=415.0)
+
+   # Indian classical — 22-shruti system
+   score = Score("4/4", bpm=75, system="shruti")
+
+   # Just intonation — pure intervals
+   score = Score("4/4", bpm=90, temperament="just")
+
+Temperaments: ``"equal"`` (default), ``"pythagorean"``, ``"meantone"``,
+``"just"``.
+
+Custom equal temperaments via the ``TET()`` factory:
+
+.. code-block:: python
+
+   from pytheory import TET
+
+   edo19 = TET(19)  # 19-tone equal temperament
+   score = Score("4/4", bpm=100, system=edo19)

docs/guide/synths.rst

@@ -1,7 +1,7 @@
 Synthesizers
 ============
 
-PyTheory includes 27 built-in waveforms and 10 ADSR envelope presets.
+PyTheory includes 30 built-in waveforms and 10 ADSR envelope presets.
 Every sound is generated from scratch -- no samples or external audio
 files needed.
 
@@ -390,11 +390,11 @@ Dedicated Instrument Synths
 --------------------------
 
 Beyond the classic and physical modeling waveforms, PyTheory includes
-14 dedicated instrument synths. Each one uses tailored synthesis
+17 dedicated instrument synths. Each one uses tailored synthesis
 techniques -- additive harmonics, formant shaping, body resonance
 modeling, and specialized envelopes -- to capture the character of a
 specific acoustic instrument. These are the waveforms that bring the
-total count to 27.
+total count to 30.
 
 Piano Synth
 ~~~~~~~~~~~
@@ -535,6 +535,58 @@ bridge, producing a shimmering, metallic sustain.
 
    sitar = score.part("sitar", synth="sitar_synth")
 
+Timpani Synth
+~~~~~~~~~~~~~
+
+Large kettle drum with definite pitch. Inharmonic membrane modes
+(1.0, 1.5, 1.99, 2.44), felt mallet attack, copper kettle resonance.
+Use ``Part.roll()`` for crescendo timpani rolls.
+
+.. code-block:: python
+
+   timp = score.part("timp", synth="timpani_synth")
+   timp.roll("C3", Duration.WHOLE, velocity_start=20, velocity_end=110)
+
+Saxophone Synth
+~~~~~~~~~~~~~~~
+
+Single reed through a conical brass bore. All harmonics with strong
+mids, reed buzz, and brass body warmth. Four presets: ``saxophone``,
+``alto_sax``, ``tenor_sax``, ``bari_sax``.
+
+.. code-block:: python
+
+   sax = score.part("sax", instrument="tenor_sax")
+
+Granular Synth
+~~~~~~~~~~~~~~
+
+Grain cloud synthesis — chops a source waveform into tiny overlapping
+grains (10-200ms), each windowed and optionally pitch/time scattered.
+Creates textures impossible with other synthesis: frozen tones,
+shimmering clouds, evolving pads, glitchy stutters.
+
+.. code-block:: python
+
+   # Atmospheric granular pad
+   pad = score.part("pad", instrument="granular_pad")
+
+   # Granular with filter envelope sweep + resonance
+   texture = score.part("texture", synth="granular_synth", envelope="pad",
+                        filter_amount=4000, filter_attack=0.5,
+                        filter_decay=1.5, filter_sustain=0.3,
+                        lowpass=600, lowpass_q=3.0,
+                        reverb=0.5, reverb_type="taj_mahal")
+
+Parameters (passed as synth kwargs):
+
+- ``grain_size``: Duration per grain in seconds (default 0.04).
+- ``density``: Grains per second (default 50). Higher = denser cloud.
+- ``scatter``: Random position jitter 0-1 (default 0.5).
+- ``pitch_var``: Per-grain pitch randomization in cents (default 12).
+- ``source``: Base waveform — ``"saw"``, ``"sine"``, ``"triangle"``,
+  ``"square"``, ``"noise"``.
+
 Analog Oscillator Drift
 ~~~~~~~~~~~~~~~~~~~~~~~~
 

docs/index.rst

@@ -77,7 +77,7 @@ What's Inside
   numbers), scale recommendation, modulation, voice leading
 - **Sequencing** — Score, Parts, arpeggiator, legato/glide, velocity,
   swing, humanize, tempo changes, song sections with repeat
-- **Synthesis** — 27 waveforms (including Karplus-Strong pluck, Hammond organ,
+- **Synthesis** — 41 waveforms (including Karplus-Strong pluck, Hammond organ,
   bowed string, and 14 dedicated instrument synths), 10 envelopes, 40+
   instrument presets, configurable FM, sub-oscillator, noise layer, filter
   envelope, velocity-to-brightness, analog oscillator drift, detune, stereo
@@ -87,7 +87,8 @@ What's Inside
   lowpass/highpass (with resonance), distortion, cabinet simulation,
   saturation, chorus, phaser, tremolo, analog drift, sidechain compression,
   automation, LFOs. Master bus compressor/limiter
-- **Instruments** — 25 presets with fingering generation
+- **Instruments** — 49 presets with fingering generation, guitar strumming,
+  pitch bends
 - **Output** — stereo playback, WAV export, MIDI import/export
 - **Interface** — REPL with tab completion, CLI (15 commands), ``pytheory demo``
 - **AI-friendly** — Claude Code can compose

examples/songs.py

@@ -15,7 +15,8 @@ Usage:
 
 import sounddevice as sd
 
-from pytheory import Chord, Key, Pattern, Duration, Score
+from pytheory import Chord, Key, Pattern, Duration, Score, Tone, TonedScale, SYSTEMS
+from pytheory.rhythm import DrumSound, _Hit
 from pytheory.play import render_score, SAMPLE_RATE
 
 
@@ -1199,6 +1200,618 @@ def greensleeves():
     play_song(score, "Greensleeves — Renaissance Lute (Meantone, A=415)")
 
 
+def tabla_solo_yaman():
+    """Tabla solo with tanpura drone, sitar, and Raga Yaman — 22-shruti tuning."""
+    shruti = SYSTEMS["shruti"]
+    score = Score("4/4", bpm=160, system=shruti)
+    h = _Hit
+
+    NA = DrumSound.TABLA_NA
+    TI = DrumSound.TABLA_TIN
+    GE = DrumSound.TABLA_GE
+    DH = DrumSound.TABLA_DHA
+    TT = DrumSound.TABLA_TIT
+    KE = DrumSound.TABLA_KE
+    GB = DrumSound.TABLA_GE_BEND
+
+    # Tanpura drone — Sa + Pa
+    tanpura_sa = score.part("tanpura_sa", synth="strings_synth", envelope="pad",
+                             detune=3, lowpass=1000, volume=0.18,
+                             reverb=0.5, reverb_type="taj_mahal")
+    tanpura_pa = score.part("tanpura_pa", synth="strings_synth", envelope="pad",
+                             detune=3, lowpass=1400, volume=0.14,
+                             reverb=0.5, reverb_type="taj_mahal")
+    sa3 = Tone("Sa", octave=3, system=shruti)
+    pa3 = Tone("Pa", octave=3, system=shruti)
+    for _ in range(16):
+        tanpura_sa.add(sa3, Duration.WHOLE)
+        tanpura_pa.add(pa3, Duration.WHOLE)
+
+    # Quiet sitar — Raga Yaman (Kalyan thaat)
+    sitar = score.part("sitar", instrument="sitar", volume=0.12,
+                        reverb=0.4, reverb_type="taj_mahal")
+    ts = TonedScale(system=shruti, tonic=Tone("Sa", octave=4, system=shruti))
+    y = list(ts["kalyan"].tones)
+    S, R, G, M, P, D, N, S2 = y
+    sitar.rest(Duration.WHOLE)
+    sitar.rest(Duration.WHOLE)
+    for tone, dur, vel in [
+        (S, 3.0, 55), (R, 1.0, 50), (G, 3.0, 58), (R, 1.0, 48),
+        (S, 4.0, 55), (G, 1.0, 50), (M, 1.0, 52), (P, 3.0, 58),
+        (M, 1.0, 48), (G, 1.0, 50), (R, 1.0, 48), (S, 4.0, 55),
+        (P, 2.0, 52), (D, 1.0, 55), (N, 2.0, 58), (S2, 3.0, 60),
+        (N, 1.0, 52), (D, 1.0, 50), (P, 1.0, 52), (G, 1.0, 48),
+        (R, 1.0, 48), (S, 4.0, 55),
+    ]:
+        sitar.add(tone, dur, velocity=vel)
+
+    # 4 bars drone intro (silence for drums)
+    silence = Pattern(name="silence", time_signature="4/4", beats=16.0, hits=[])
+    score.add_pattern(silence, repeats=1)
+
+    # Gentle opening
+    p1 = Pattern(name="gentle", time_signature="4/4", beats=8.0, hits=[
+        h(DH, 0.0, 80), h(NA, 2.0, 60),
+        h(DH, 4.0, 85), h(NA, 5.0, 55), h(NA, 6.0, 60), h(DH, 7.0, 80),
+    ])
+
+    # Building with ghost notes
+    p2 = Pattern(name="build", time_signature="4/4", beats=16.0, hits=[
+        h(DH, 0.0, 95), h(TT, 0.5, 35), h(NA, 1.0, 70), h(TT, 1.5, 30),
+        h(NA, 2.0, 65), h(DH, 3.0, 90),
+        h(DH, 4.0, 100), h(TT, 4.25, 35), h(TT, 4.5, 40), h(NA, 5.0, 75),
+        h(TT, 5.5, 35), h(NA, 6.0, 70), h(TT, 6.5, 30), h(DH, 7.0, 95),
+        h(DH, 8.0, 95), h(TI, 9.0, 70), h(TI, 10.0, 72), h(NA, 11.0, 80),
+        h(TT, 11.25, 40), h(TT, 11.5, 42), h(KE, 11.75, 45),
+        h(TT, 12.0, 50), h(TT, 12.25, 55), h(KE, 12.5, 58), h(NA, 12.75, 70),
+        h(DH, 13.0, 100), h(TT, 13.25, 40), h(TT, 13.5, 45), h(KE, 13.75, 50),
+        h(NA, 14.0, 75), h(KE, 14.25, 50), h(DH, 14.5, 85), h(NA, 14.75, 70),
+        h(DH, 15.0, 110), h(GB, 15.5, 100),
+    ])
+
+    # Full intensity
+    p3 = Pattern(name="fire", time_signature="4/4", beats=16.0, hits=[
+        h(TT, 0.0, 50), h(TT, 0.125, 35), h(TT, 0.25, 45), h(KE, 0.5, 55),
+        h(NA, 0.75, 85),
+        h(DH, 1.0, 115), h(TT, 1.25, 38), h(DH, 1.5, 70), h(NA, 1.75, 60),
+        h(TT, 2.0, 50), h(TT, 2.125, 35), h(TT, 2.25, 48), h(KE, 2.5, 55),
+        h(NA, 2.75, 88),
+        h(DH, 3.0, 115), h(GB, 3.5, 105), h(NA, 3.75, 72),
+        h(NA, 4.0, 115), h(NA, 4.25, 60), h(TT, 4.5, 40), h(NA, 4.75, 105),
+        h(GE, 5.0, 105), h(GE, 5.25, 55), h(GB, 5.5, 95), h(GE, 5.75, 50),
+        h(NA, 6.0, 115), h(TT, 6.125, 30), h(TT, 6.25, 38), h(NA, 6.5, 100),
+        h(TT, 6.625, 32), h(TT, 6.75, 42),
+        h(GB, 7.0, 115), h(KE, 7.25, 52), h(GE, 7.5, 72), h(KE, 7.75, 48),
+        # Tihai
+        h(DH, 8.0, 115), h(NA, 8.25, 78), h(TT, 8.5, 52), h(KE, 8.75, 58),
+        h(DH, 9.0, 105),
+        h(DH, 9.5, 110), h(NA, 9.75, 78), h(TT, 10.0, 52), h(KE, 10.25, 58),
+        h(DH, 10.5, 105),
+        h(DH, 11.0, 120), h(NA, 11.25, 82), h(TT, 11.5, 58), h(KE, 11.75, 62),
+        h(DH, 12.0, 120),
+        # Silence... then finish
+        h(GB, 14.5, 120),
+        h(DH, 15.5, 127), h(DH, 15.75, 127),
+    ])
+
+    score.add_pattern(p1, repeats=1)
+    score.add_pattern(p2, repeats=1)
+    score.add_pattern(p3, repeats=1)
+    score.set_drum_effects(reverb=0.4, reverb_type="taj_mahal")
+
+    play_song(score, "Tabla Solo — Raga Yaman (22-Shruti, Taj Mahal)")
+
+
+def journey():
+    """Journey — piano → orchestra → world → sitar EDM.
+
+    One reverb space (Taj Mahal), tanpura drone throughout. Piano opens
+    alone, cello joins, harp/oboe/flute take over with djembe, sitar
+    arrives over tabla, builds to an EDM section with house drums.
+    """
+    REV = "taj_mahal"
+    score = Score("4/4", bpm=72)
+
+    # ── Drone — runs the entire piece ──
+    tanpura = score.part("tanpura", synth="strings_synth", envelope="pad",
+                          detune=3, lowpass=1000, volume=0.12,
+                          reverb=0.6, reverb_type=REV)
+    for _ in range(40):
+        tanpura.add("A2", Duration.WHOLE)
+
+    # ── Bars 1-8: Piano alone, then cello ──
+    piano = score.part("piano", instrument="piano", volume=0.35,
+                        reverb=0.6, reverb_type=REV)
+    for notes in [
+        ["A2","E3","A3","C4","E4","C4","A3","E3"],
+        ["F2","C3","F3","A3","C4","A3","F3","C3"],
+        ["G2","D3","G3","B3","D4","B3","G3","D3"],
+        ["E2","B2","E3","G#3","B3","G#3","E3","B2"],
+        ["A2","E3","A3","C4","E4","C4","A3","E3"],
+        ["D2","A2","D3","F3","A3","F3","D3","A2"],
+        ["E2","B2","E3","G#3","B3","G#3","E3","B2"],
+        ["A2","E3","A3","C4","E4","A4","E4","C4"],
+    ]:
+        for n in notes:
+            piano.add(n, Duration.EIGHTH, velocity=68)
+
+    cello = score.part("cello", instrument="cello", volume=0.2,
+                        reverb=0.55, reverb_type=REV)
+    cello.rest(Duration.WHOLE)
+    for note, dur, vel in [
+        ("A3", 4.0, 55), ("C4", 4.0, 58),
+        ("B3", 2.0, 52), ("A3", 2.0, 50), ("G3", 4.0, 55),
+        ("F3", 4.0, 52), ("E3", 4.0, 55), ("A3", 4.0, 58),
+    ]:
+        cello.add(note, dur, velocity=vel)
+
+    # ── Bars 9-16: Harp + oboe + flute + djembe ──
+    harp = score.part("harp", instrument="harp", volume=0.28,
+                       reverb=0.6, reverb_type=REV)
+    oboe = score.part("oboe", instrument="oboe", volume=0.22,
+                       reverb=0.55, reverb_type=REV)
+    flute = score.part("flute", instrument="flute", volume=0.18,
+                        reverb=0.55, reverb_type=REV)
+    for _ in range(8):
+        harp.rest(Duration.WHOLE)
+    for notes in [
+        ["A3","C4","E4","A4","C5","E5","A5","E5"],
+        ["D3","F3","A3","D4","F4","A4","D5","A4"],
+        ["E3","G3","B3","E4","G4","B4","E5","B4"],
+        ["A3","C4","E4","A4","E5","C5","A4","E4"],
+        ["F3","A3","C4","F4","A4","C5","F5","C5"],
+        ["E3","G#3","B3","E4","G#4","B4","E5","B4"],
+    ]:
+        for n in notes:
+            harp.add(n, Duration.EIGHTH, velocity=58)
+    for _ in range(9):
+        oboe.rest(Duration.WHOLE)
+    for note, dur, vel in [
+        ("E5", 1.5, 62), ("D5", 0.5, 55), ("C5", 1.0, 58),
+        ("A4", 1.0, 62), ("G4", 1.0, 55), ("A4", 1.5, 58),
+        ("B4", 0.5, 52), ("C5", 2.0, 62), ("A4", 4.0, 58),
+    ]:
+        oboe.add(note, dur, velocity=vel)
+    for _ in range(10):
+        flute.rest(Duration.WHOLE)
+    for note, dur, vel in [
+        ("A5", 2.0, 50), ("G5", 1.0, 45), ("E5", 1.0, 48),
+        ("D5", 2.0, 50), ("C5", 1.0, 45), ("A4", 1.0, 48),
+        ("G4", 2.0, 50), ("A4", 2.0, 52),
+    ]:
+        flute.add(note, dur, velocity=vel)
+
+    # ── Bars 15-20: Sitar + tabla ──
+    sitar = score.part("sitar", instrument="sitar", volume=0.2,
+                        reverb=0.6, reverb_type=REV)
+    for _ in range(14):
+        sitar.rest(Duration.WHOLE)
+    for note, dur, vel in [
+        ("A4", 1.0, 70), ("Bb4", 0.5, 60), ("A4", 0.5, 65),
+        ("C5", 1.5, 75), ("Bb4", 0.5, 60),
+        ("D5", 1.0, 70), ("E5", 1.5, 78),
+        ("F5", 0.5, 62), ("E5", 1.0, 70),
+        ("D5", 0.5, 62), ("C5", 0.5, 65), ("Bb4", 0.5, 58),
+        ("A4", 2.0, 75),
+        ("Bb4", 0.25, 55), ("C5", 0.25, 58), ("D5", 0.25, 62),
+        ("E5", 0.25, 68),
+        ("F5", 0.25, 65), ("G5", 0.25, 70), ("A5", 0.5, 80),
+        ("G5", 0.25, 62), ("F5", 0.25, 58), ("E5", 0.5, 62),
+        ("C5", 0.5, 58), ("Bb4", 0.5, 55), ("A4", 2.0, 75),
+    ]:
+        sitar.add(note, dur, velocity=vel)
+
+    # ── EDM section — sitar over house beat ──
+    # Solo sections: 8+8+8+12 = 36 beats = 9 bars
+    # Total bars before EDM: 8 piano + 6 harp + 6 djembe + 4 tabla + 9 solo = 33
+    edm_start = 33
+    pad = score.part("pad", instrument="synth_pad", volume=0.18,
+                      reverb=0.6, reverb_type=REV,
+                      sidechain=0.6, sidechain_release=0.15)
+    for _ in range(edm_start):
+        pad.rest(Duration.WHOLE)
+    for sym in ["Am", "F", "G", "Em"] * 2:
+        pad.add(Chord.from_symbol(sym), Duration.WHOLE)
+
+    sub = score.part("sub", instrument="808_bass", volume=0.4)
+    for _ in range(edm_start):
+        sub.rest(Duration.WHOLE)
+    for n in ["A1","A1","F1","F1","G1","G1","E1","E1"] * 2:
+        sub.add(n, Duration.HALF)
+
+    sitar2 = score.part("sitar2", instrument="sitar", volume=0.4,
+                         reverb=0.3, reverb_type=REV)
+    for _ in range(edm_start + 2):
+        sitar2.rest(Duration.WHOLE)
+    for note, dur, vel in [
+        ("A4", 0.25, 75), ("C5", 0.25, 78), ("E5", 0.5, 85),
+        ("D5", 0.25, 72), ("C5", 0.25, 70), ("A4", 0.5, 75),
+        ("G4", 0.25, 68), ("A4", 0.25, 72), ("C5", 0.5, 78),
+        ("A4", 0.5, 72),
+        ("E5", 0.5, 82), ("D5", 0.25, 72), ("C5", 0.25, 70),
+        ("A4", 0.5, 75), ("G4", 0.5, 68), ("A4", 1.0, 78),
+    ] * 2:
+        sitar2.add(note, dur, velocity=vel)
+
+    # Drums: djembe bars 9-14, tabla bars 15-20, house bars 21-28
+    DJB = DrumSound.DJEMBE_BASS
+    DJT = DrumSound.DJEMBE_TONE
+    DJS = DrumSound.DJEMBE_SLAP
+    NA = DrumSound.TABLA_NA
+    DH = DrumSound.TABLA_DHA
+    TT = DrumSound.TABLA_TIT
+    GB = DrumSound.TABLA_GE_BEND
+
+    silence = Pattern(name="s", time_signature="4/4", beats=32.0, hits=[])
+    score.add_pattern(silence, repeats=1)
+    p_dj = Pattern(name="dj", time_signature="4/4", beats=8.0, hits=[
+        _Hit(DJB, 0.0, 48), _Hit(DJT, 1.0, 40), _Hit(DJT, 1.5, 35),
+        _Hit(DJS, 2.0, 45), _Hit(DJT, 3.0, 40),
+        _Hit(DJB, 4.0, 52), _Hit(DJT, 5.0, 42), _Hit(DJT, 5.5, 38),
+        _Hit(DJS, 6.0, 48), _Hit(DJT, 6.5, 35), _Hit(DJS, 7.0, 45),
+    ])
+    score.add_pattern(p_dj, repeats=3)
+    p_tab = Pattern(name="tab", time_signature="4/4", beats=8.0, hits=[
+        _Hit(DH, 0.0, 80), _Hit(TT, 0.5, 30), _Hit(NA, 1.0, 65),
+        _Hit(NA, 2.0, 60), _Hit(DH, 3.0, 80),
+        _Hit(DH, 4.0, 85), _Hit(TT, 4.25, 32), _Hit(TT, 4.5, 35),
+        _Hit(NA, 5.0, 68), _Hit(TT, 5.5, 30), _Hit(NA, 6.0, 65),
+        _Hit(DH, 7.0, 85),
+    ])
+    score.add_pattern(p_tab, repeats=2)
+
+    # Tabla solo — everything drops out, just tabla and drone
+    KE = DrumSound.TABLA_KE
+    TI = DrumSound.TABLA_TIN
+    GE = DrumSound.TABLA_GE
+    T3 = 1.0 / 12.0   # 32nd triplet
+    T9 = 1.0 / 9.0    # ninth note
+
+    # Part 1: whisper — space, breath, single hits
+    p_solo1 = Pattern(name="solo1", time_signature="4/4", beats=8.0, hits=[
+        _Hit(DH, 0.0, 78),
+        _Hit(NA, 2.0, 55),
+        _Hit(DH, 4.0, 82),
+        _Hit(TT, 5.0, 30), _Hit(NA, 5.5, 52), _Hit(TT, 6.0, 28),
+        _Hit(DH, 7.0, 78),
+    ])
+    score.add_pattern(p_solo1, repeats=1)
+
+    # Part 2: ghosts emerge — 16th note ghost fills between accents
+    p_solo2 = Pattern(name="solo2", time_signature="4/4", beats=8.0, hits=[
+        _Hit(DH, 0.0, 92), _Hit(TT, 0.25, 32), _Hit(TT, 0.5, 35),
+        _Hit(NA, 1.0, 68), _Hit(TT, 1.25, 30), _Hit(TT, 1.5, 28),
+        _Hit(NA, 2.0, 62), _Hit(TT, 2.5, 32), _Hit(DH, 3.0, 88),
+        _Hit(TT, 3.25, 35), _Hit(TT, 3.5, 38),
+        _Hit(DH, 4.0, 95), _Hit(TT, 4.25, 38), _Hit(TT, 4.5, 42),
+        _Hit(NA, 5.0, 72), _Hit(TT, 5.25, 32), _Hit(TT, 5.5, 35),
+        _Hit(KE, 5.75, 40),
+        _Hit(NA, 6.0, 68), _Hit(TT, 6.25, 35), _Hit(KE, 6.5, 38),
+        _Hit(DH, 7.0, 95), _Hit(GB, 7.5, 88),
+    ])
+    score.add_pattern(p_solo2, repeats=1)
+
+    # Part 3: call and response — dayan vs bayan, dynamics wide open
+    p_solo3 = Pattern(name="solo3", time_signature="4/4", beats=8.0, hits=[
+        # Dayan speaks
+        _Hit(NA, 0.0, 110), _Hit(NA, 0.25, 55), _Hit(TT, 0.5, 38),
+        _Hit(NA, 0.75, 100),
+        # Bayan answers
+        _Hit(GE, 1.0, 100), _Hit(GE, 1.25, 50), _Hit(GB, 1.5, 90),
+        _Hit(GE, 1.75, 45),
+        # Dayan louder
+        _Hit(NA, 2.0, 115), _Hit(TT, 2.125, 30), _Hit(TT, 2.25, 35),
+        _Hit(NA, 2.5, 105), _Hit(TT, 2.625, 32), _Hit(TT, 2.75, 38),
+        # Bayan louder
+        _Hit(GB, 3.0, 112), _Hit(KE, 3.25, 50), _Hit(GE, 3.5, 68),
+        _Hit(KE, 3.75, 45),
+        # Together — explosion
+        _Hit(DH, 4.0, 120), _Hit(TT, 4.25, 45), _Hit(TT, 4.5, 48),
+        _Hit(DH, 5.0, 115), _Hit(TT, 5.25, 42), _Hit(NA, 5.5, 72),
+        # 9-tuplet — the weird one, breaks the grid
+        *[_Hit(TT if i % 2 == 0 else KE, 6.0 + i * T9, 38 + i * 5)
+          for i in range(9)],
+        _Hit(DH, 7.0, 118),
+    ])
+    score.add_pattern(p_solo3, repeats=1)
+
+    # Part 4: blazing — 32nd triplets, cascades, tihai finale
+    p_solo4 = Pattern(name="solo4", time_signature="4/4", beats=12.0, hits=[
+        # 32nd triplet opening flourish
+        *[_Hit(TT, 0.0 + i * T3, 40 + i * 2) for i in range(12)],
+        _Hit(DH, 1.0, 120), _Hit(GB, 1.5, 108),
+        # Rapid alternating hands
+        _Hit(NA, 2.0, 110), _Hit(KE, 2.125, 45), _Hit(NA, 2.25, 105),
+        _Hit(KE, 2.375, 48), _Hit(NA, 2.5, 108), _Hit(KE, 2.625, 50),
+        _Hit(NA, 2.75, 112),
+        _Hit(DH, 3.0, 118),
+        # Another 32nd triplet burst — longer, crescendo
+        *[_Hit(TT, 3.5 + i * T3, 32 + i * 4) for i in range(18)],
+        _Hit(DH, 5.0, 122), _Hit(DH, 5.25, 118), _Hit(GB, 5.5, 115),
+        # 9 against 4 polyrhythm moment
+        _Hit(GE, 6.0, 88), _Hit(GE, 7.0, 85),
+        *[_Hit(NA if i % 3 == 0 else TT, 6.0 + i * (2.0 / 9.0), 42 + (i % 3) * 15)
+          for i in range(9)],
+        # Grand tihai — 3x pattern, each louder
+        _Hit(DH, 8.0, 108), _Hit(NA, 8.25, 72), _Hit(TT, 8.5, 48),
+        _Hit(KE, 8.75, 52), _Hit(DH, 9.0, 100),
+        _Hit(DH, 9.25, 112), _Hit(NA, 9.5, 78), _Hit(TT, 9.75, 52),
+        _Hit(KE, 10.0, 58), _Hit(DH, 10.25, 108),
+        _Hit(DH, 10.5, 120), _Hit(NA, 10.75, 85), _Hit(TT, 11.0, 58),
+        _Hit(KE, 11.25, 62), _Hit(DH, 11.5, 127),
+        # Silence.....
+        # SLAM
+        _Hit(GB, 11.875, 127),
+    ])
+    score.add_pattern(p_solo4, repeats=1)
+
+    score.drums("house", repeats=8)
+    score.set_drum_effects(reverb=0.3, reverb_type=REV)
+
+    play_song(score, "Journey — Piano → World → Sitar EDM (Taj Mahal)")
+
+
+def epic_bhairav():
+    """Epic Bhairav — orchestral + choir + tabla with extended solo finale."""
+    shruti = SYSTEMS["shruti"]
+    score = Score("4/4", bpm=90, system=shruti)
+    REV = "taj_mahal"
+    T3 = 1.0 / 12.0
+    T9 = 1.0 / 9.0
+
+    ts = TonedScale(system=shruti, tonic=Tone("Sa", octave=4, system=shruti))
+    bh = list(ts["bhairav"].tones)
+    S, kR, G, M, P, kD, N, S2 = bh
+
+    NA = DrumSound.TABLA_NA
+    DH = DrumSound.TABLA_DHA
+    TT = DrumSound.TABLA_TIT
+    KE = DrumSound.TABLA_KE
+    GB = DrumSound.TABLA_GE_BEND
+    GE = DrumSound.TABLA_GE
+    DJB = DrumSound.DJEMBE_BASS
+    DJT = DrumSound.DJEMBE_TONE
+    DJS = DrumSound.DJEMBE_SLAP
+
+    # Tanpura
+    tanpura = score.part("tanpura", synth="strings_synth", envelope="pad",
+                          detune=3, lowpass=900, volume=0.14, reverb=0.4, reverb_type=REV)
+    tanpura_pa = score.part("tanpura_pa", synth="strings_synth", envelope="pad",
+                             detune=3, lowpass=1200, volume=0.1, reverb=0.4, reverb_type=REV)
+    sa = Tone("Sa", octave=3, system=shruti)
+    pa = Tone("Pa", octave=3, system=shruti)
+    for _ in range(34):
+        tanpura.add(sa, Duration.WHOLE)
+        tanpura_pa.add(pa, Duration.WHOLE)
+
+    # Timpani
+    timp = score.part("timp", instrument="timpani")
+    timp.roll(Tone("Sa", octave=2, system=shruti), Duration.WHOLE,
+              velocity_start=20, velocity_end=90, speed=0.125)
+    timp.add(Tone("Sa", octave=2, system=shruti), Duration.HALF, velocity=105)
+    timp.rest(Duration.HALF)
+    for _ in range(8):
+        timp.rest(Duration.WHOLE)
+    timp.roll(Tone("Sa", octave=2, system=shruti), Duration.WHOLE,
+              velocity_start=25, velocity_end=115, speed=0.125)
+    timp.add(Tone("Sa", octave=2, system=shruti), Duration.HALF, velocity=120)
+    timp.add(Tone("Pa", octave=2, system=shruti), Duration.HALF, velocity=115)
+
+    # Choir — bar 3
+    choir = score.part("choir", synth="vocal_synth", envelope="pad",
+                        detune=8, spread=0.4, reverb=0.4, reverb_type=REV, volume=0.2)
+    for _ in range(2):
+        choir.rest(Duration.WHOLE)
+    for tone, dur, lyric, vel in [
+        (S, 4.0, "ah", 60), (M, 4.0, "oh", 62), (P, 4.0, "ah", 68),
+        (S, 4.0, "ee", 65), (kD, 4.0, "oh", 70), (P, 4.0, "ah", 72),
+    ]:
+        choir.add(tone, dur, velocity=vel, lyric=lyric)
+
+    # Bansuri — bar 5
+    bansuri = score.part("bansuri", instrument="flute", volume=0.22,
+                          reverb=0.4, reverb_type=REV)
+    for _ in range(4):
+        bansuri.rest(Duration.WHOLE)
+    for tone, dur, vel in [
+        (P, 2.0, 58), (kD, 1.0, 50), (P, 1.0, 55),
+        (M, 2.0, 55), (G, 1.0, 50), (kR, 1.0, 48), (S, 4.0, 58),
+    ]:
+        bansuri.add(tone, dur, velocity=vel)
+
+    # Cello — bar 3
+    cello = score.part("cello", instrument="cello", volume=0.22, reverb=0.4, reverb_type=REV)
+    for _ in range(2):
+        cello.rest(Duration.WHOLE)
+    for name, dur, vel in [
+        ("Sa", 4.0, 55), ("Ma", 4.0, 52), ("Pa", 4.0, 58),
+        ("Sa", 4.0, 55), ("komal Dha", 4.0, 58), ("Pa", 4.0, 55),
+    ]:
+        cello.add(Tone(name, octave=2, system=shruti), dur, velocity=vel)
+
+    # Sitar — bar 9
+    sitar = score.part("sitar", instrument="sitar", volume=0.25, reverb=0.4, reverb_type=REV)
+    for _ in range(8):
+        sitar.rest(Duration.WHOLE)
+    for tone, dur, vel in [
+        (S, 1.0, 72), (kR, 0.5, 62), (S, 0.5, 68), (G, 2.0, 78),
+        (M, 1.0, 72), (P, 2.0, 82), (kD, 0.5, 65), (P, 1.0, 75),
+        (M, 0.5, 65), (G, 0.5, 68), (kR, 0.5, 60), (S, 2.0, 78),
+        (kR, 0.25, 62), (G, 0.25, 65), (M, 0.25, 70), (P, 0.25, 75),
+        (kD, 0.25, 70), (N, 0.25, 78), (S2, 0.5, 88),
+        (N, 0.25, 68), (kD, 0.25, 62), (P, 0.5, 68),
+        (M, 0.5, 62), (G, 0.5, 65), (kR, 0.5, 58), (S, 2.0, 80),
+    ]:
+        sitar.add(tone, dur, velocity=vel)
+
+    # Strings — bar 13
+    strings = score.part("strings", instrument="string_ensemble", volume=0.18,
+                          reverb=0.4, reverb_type=REV)
+    for _ in range(12):
+        strings.rest(Duration.WHOLE)
+    for name, dur, vel in [("Sa", 4.0, 58), ("Ma", 4.0, 62), ("Pa", 4.0, 68), ("Sa", 4.0, 72)]:
+        strings.add(Tone(name, octave=3, system=shruti), dur, velocity=vel)
+
+    # Harp — bar 14
+    harp = score.part("harp", instrument="harp", volume=0.15, reverb=0.4, reverb_type=REV)
+    for _ in range(13):
+        harp.rest(Duration.WHOLE)
+    for name in ["Sa", "komal Ga", "Pa", "Sa", "Pa", "komal Ga", "Sa", "Sa"]:
+        oct = 4 if name == "Sa" and harp.total_beats > 55 else 3
+        harp.add(Tone(name, octave=oct, system=shruti), Duration.EIGHTH, velocity=50)
+
+    # Drums
+    silence = Pattern(name="s", time_signature="4/4", beats=16.0, hits=[])
+    score.add_pattern(silence, repeats=1)
+    p_dj = Pattern(name="dj", time_signature="4/4", beats=8.0, hits=[
+        _Hit(DJB, 0.0, 45), _Hit(DJT, 1.0, 38), _Hit(DJT, 1.5, 32),
+        _Hit(DJS, 2.0, 42), _Hit(DJT, 3.0, 38),
+        _Hit(DJB, 4.0, 50), _Hit(DJT, 5.0, 42), _Hit(DJT, 5.5, 35),
+        _Hit(DJS, 6.0, 48), _Hit(DJT, 6.5, 32), _Hit(DJS, 7.0, 45),
+    ])
+    score.add_pattern(p_dj, repeats=2)
+    p_tab = Pattern(name="tab", time_signature="4/4", beats=8.0, hits=[
+        _Hit(DH, 0.0, 82), _Hit(TT, 0.5, 30), _Hit(NA, 1.0, 65),
+        _Hit(NA, 2.0, 60), _Hit(DH, 3.0, 82),
+        _Hit(DH, 4.0, 88), _Hit(TT, 4.25, 32), _Hit(TT, 4.5, 35),
+        _Hit(NA, 5.0, 68), _Hit(TT, 5.5, 30), _Hit(NA, 6.0, 65),
+        _Hit(DH, 7.0, 88),
+    ])
+    score.add_pattern(p_tab, repeats=3)
+
+    # Extended tabla finale — whisper → ghosts → call/response → blazing
+    p_f1 = Pattern(name="f1", time_signature="4/4", beats=8.0, hits=[
+        _Hit(DH, 0.0, 78), _Hit(NA, 2.0, 55),
+        _Hit(DH, 4.0, 82), _Hit(TT, 5.0, 30), _Hit(NA, 5.5, 52),
+        _Hit(DH, 7.0, 78),
+    ])
+    score.add_pattern(p_f1, repeats=1)
+    p_f2 = Pattern(name="f2", time_signature="4/4", beats=8.0, hits=[
+        _Hit(DH, 0.0, 95), _Hit(TT, 0.25, 35), _Hit(TT, 0.5, 38),
+        _Hit(NA, 1.0, 70), _Hit(TT, 1.25, 30), _Hit(NA, 2.0, 65),
+        _Hit(TT, 2.5, 35), _Hit(DH, 3.0, 90),
+        _Hit(DH, 4.0, 98), _Hit(TT, 4.25, 38), _Hit(TT, 4.5, 42),
+        _Hit(NA, 5.0, 75), _Hit(KE, 5.5, 40), _Hit(NA, 6.0, 70),
+        _Hit(KE, 6.5, 42), _Hit(DH, 7.0, 100), _Hit(GB, 7.5, 92),
+    ])
+    score.add_pattern(p_f2, repeats=1)
+    p_f3 = Pattern(name="f3", time_signature="4/4", beats=8.0, hits=[
+        _Hit(NA, 0.0, 112), _Hit(NA, 0.25, 58), _Hit(TT, 0.5, 40), _Hit(NA, 0.75, 105),
+        _Hit(GE, 1.0, 105), _Hit(GE, 1.25, 52), _Hit(GB, 1.5, 95), _Hit(GE, 1.75, 48),
+        _Hit(NA, 2.0, 115), _Hit(TT, 2.125, 32), _Hit(TT, 2.25, 38),
+        _Hit(NA, 2.5, 108), _Hit(TT, 2.625, 35), _Hit(TT, 2.75, 42),
+        _Hit(GB, 3.0, 115), _Hit(KE, 3.25, 52), _Hit(GE, 3.5, 70),
+        _Hit(DH, 4.0, 118),
+        *[_Hit(TT if i % 2 == 0 else KE, 5.0 + i * T9, 40 + i * 5) for i in range(9)],
+        _Hit(DH, 7.0, 120),
+    ])
+    score.add_pattern(p_f3, repeats=1)
+
+    # Part 3.5: polyrhythm — space and conversation, not density
+    T5 = 4.0 / 5.0
+    p_poly = Pattern(name="poly", time_signature="4/4", beats=16.0, hits=[
+        # Bar 1: single Dha, let reverb ring. Bayan answers.
+        _Hit(DH, 0.0, 95),
+        _Hit(GB, 3.0, 88),
+        # Bar 2: one 5-group phrase, then breathe
+        _Hit(NA, 4.0, 75), _Hit(TT, 4.0 + T5, 42),
+        _Hit(NA, 4.0 + 2*T5, 70), _Hit(TT, 4.0 + 3*T5, 40),
+        _Hit(DH, 4.0 + 4*T5, 88),
+        # Bar 3: bayan, pause, one floating 9-group
+        _Hit(GB, 8.0, 100),
+        _Hit(NA, 9.0, 62),
+        *[_Hit(TT if i % 2 == 0 else KE, 10.0 + i * T9, 35 + i * 4)
+          for i in range(9)],
+        _Hit(DH, 11.0, 105),
+        # Bar 4: simple question-answer into sam
+        _Hit(DH, 12.0, 100), _Hit(NA, 12.5, 62),
+        _Hit(GE, 13.0, 88),
+        _Hit(NA, 14.0, 72), _Hit(TT, 14.25, 40), _Hit(NA, 14.5, 70),
+        _Hit(DH, 15.0, 112), _Hit(GB, 15.5, 105),
+    ])
+    score.add_pattern(p_poly, repeats=1)
+
+    p_f4 = Pattern(name="f4", time_signature="4/4", beats=12.0, hits=[
+        *[_Hit(TT, 0.0 + i * T3, 38 + i * 2) for i in range(12)],
+        _Hit(DH, 1.0, 118), _Hit(GB, 1.5, 110),
+        _Hit(NA, 2.0, 112), _Hit(KE, 2.125, 48), _Hit(NA, 2.25, 108),
+        _Hit(KE, 2.375, 50), _Hit(NA, 2.5, 110), _Hit(KE, 2.625, 52), _Hit(NA, 2.75, 115),
+        _Hit(DH, 3.0, 120),
+        *[_Hit(TT, 3.5 + i * T3, 30 + i * 4) for i in range(18)],
+        _Hit(DH, 5.0, 122), _Hit(DH, 5.25, 118), _Hit(GB, 5.5, 115),
+        _Hit(GE, 6.0, 90), _Hit(GE, 7.0, 88),
+        *[_Hit(NA if i % 3 == 0 else TT, 6.0 + i * (2.0/9.0), 42 + (i%3)*15) for i in range(9)],
+        _Hit(DH, 8.0, 110), _Hit(NA, 8.25, 75), _Hit(TT, 8.5, 50),
+        _Hit(KE, 8.75, 55), _Hit(DH, 9.0, 105),
+        _Hit(DH, 9.25, 115), _Hit(NA, 9.5, 80), _Hit(TT, 9.75, 55),
+        _Hit(KE, 10.0, 60), _Hit(DH, 10.25, 110),
+        _Hit(DH, 10.5, 122), _Hit(NA, 10.75, 85), _Hit(TT, 11.0, 60),
+        _Hit(KE, 11.25, 65), _Hit(DH, 11.5, 127),
+        _Hit(GB, 11.875, 127),
+    ])
+    score.add_pattern(p_f4, repeats=1)
+    score.set_drum_effects(reverb=0.4, reverb_type=REV)
+
+    play_song(score, "Epic Bhairav — Orchestra + Choir + Tabla (22-Shruti JI)")
+
+
+def acoustic_ensemble():
+    """Acoustic Ensemble — guitar, ukulele, mandolin, cajón."""
+    import random
+    from pytheory import Fretboard
+    random.seed(7)
+    score = Score("4/4", bpm=115)
+
+    fb_g = Fretboard.guitar()
+    guitar = score.part("guitar", instrument="acoustic_guitar", fretboard=fb_g,
+                         reverb=0.3, reverb_type="plate", humanize=0.2, pan=-0.3)
+
+    fb_u = Fretboard.ukulele()
+    uke = score.part("uke", instrument="ukulele", fretboard=fb_u,
+                      reverb=0.25, reverb_type="plate", humanize=0.25, pan=0.3)
+
+    fb_m = Fretboard.mandolin()
+    mando = score.part("mando", instrument="mandolin", fretboard=fb_m,
+                        reverb=0.25, reverb_type="plate", humanize=0.2, pan=0.15)
+
+    for sym in ["C", "G", "Am", "F"] * 3:
+        vd = random.randint(75, 95)
+        vu = random.randint(58, 78)
+        guitar.strum(sym, Duration.QUARTER, direction="down", velocity=vd)
+        guitar.strum(sym, Duration.EIGHTH, direction="up", velocity=vu)
+        guitar.strum(sym, Duration.EIGHTH, direction="down", velocity=vd - 8)
+        guitar.strum(sym, Duration.QUARTER, direction="up", velocity=vu)
+        guitar.strum(sym, Duration.QUARTER, direction="down", velocity=vd)
+
+        vd2 = random.randint(65, 88)
+        vu2 = random.randint(50, 72)
+        uke.rest(Duration.EIGHTH)
+        uke.strum(sym, Duration.EIGHTH, direction="up", velocity=vu2)
+        uke.strum(sym, Duration.QUARTER, direction="down", velocity=vd2)
+        uke.strum(sym, Duration.EIGHTH, direction="up", velocity=vu2)
+        uke.strum(sym, Duration.EIGHTH, direction="down", velocity=vd2 - 5)
+        uke.strum(sym, Duration.QUARTER, direction="up", velocity=vu2)
+
+        mando.strum(sym, Duration.EIGHTH, direction="down",
+                    velocity=random.randint(65, 82))
+        mando.strum(sym, Duration.EIGHTH, direction="up",
+                    velocity=random.randint(55, 72))
+        mando.strum(sym, Duration.EIGHTH, direction="down",
+                    velocity=random.randint(65, 82))
+        mando.rest(Duration.EIGHTH)
+        mando.strum(sym, Duration.EIGHTH, direction="up",
+                    velocity=random.randint(55, 72))
+        mando.strum(sym, Duration.EIGHTH, direction="down",
+                    velocity=random.randint(68, 85))
+        mando.strum(sym, Duration.QUARTER, direction="down",
+                    velocity=random.randint(70, 85))
+
+    score.drums("cajon", repeats=6)
+    score.set_drum_effects(reverb=0.15)
+
+    play_song(score, "Acoustic Ensemble — Guitar, Uke, Mandolin, Cajón")
+
+
 SONGS = {
     "1": ("Bossa Nova in A minor", bossa_nova_girl),
     "2": ("Bebop in Bb major", bebop_in_bb),
@@ -1222,6 +1835,10 @@ SONGS = {
     "20": ("Temple Bell (Japanese)", temple_bell),
     "21": ("Cinematic Showcase (Orchestral)", cinematic_showcase),
     "22": ("Greensleeves (Renaissance Lute)", greensleeves),
+    "23": ("Tabla Solo (Raga Yaman)", tabla_solo_yaman),
+    "24": ("Journey (Western → World → Indian)", journey),
+    "25": ("Epic Bhairav (Orchestral + Tabla)", epic_bhairav),
+    "26": ("Acoustic Ensemble (Guitar+Uke+Mando+Cajón)", acoustic_ensemble),
 }
 
 if __name__ == "__main__":
@@ -1235,7 +1852,7 @@ if __name__ == "__main__":
             print(f"    {key:>2}. {name}")
 
         print()
-        choice = input("  Pick a song (1-22, or 'all'): ").strip()
+        choice = input("  Pick a song (1-26, or 'all'): ").strip()
         print()
 
         if choice == "all":

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pytheory"
-version = "0.34.1"
+version = "0.36.1"
 description = "Music Theory for Humans"
 readme = "README.md"
 license = "MIT"
@@ -21,7 +21,6 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-    "pytuning",
     "numeral",
     "sounddevice",
     "scipy",

pytheory/__init__.py

@@ -1,6 +1,6 @@
 """PyTheory: Music Theory for Humans."""
 
-__version__ = "0.34.1"
+__version__ = "0.36.1"
 
 from .tones import Tone, Interval
 from .systems import System, SYSTEMS, TET

pytheory/_statics.py

@@ -1,4 +1,4 @@
-from pytuning import scales
+import math
 
 REFERENCE_A = 440
 
@@ -6,41 +6,59 @@ REFERENCE_A = 440
 # Scientific pitch notation changes octave at C, not A, so this offset
 # is needed for all octave arithmetic.
 C_INDEX = 3
-def _create_just_intonation_scale(n):
-    """5-limit just intonation ratios for 12-tone systems.
 
-    These are the pure frequency ratios derived from the harmonic series —
-    the way intervals "want" to sound before equal temperament imposed
-    compromise. Each ratio is mathematically exact: a perfect fifth is
-    exactly 3/2, a major third is exactly 5/4.
 
-    For non-12 systems, falls back to equal temperament.
+# ── Temperament scale generators (replaces pytuning dependency) ──────────
+
+def _create_edo_scale(n):
+    """N-tone equal division of the octave. Each step = 2^(1/n)."""
+    return [2 ** (i / n) for i in range(n + 1)]
+
+
+def _create_pythagorean_scale(n):
+    """Pythagorean tuning — spiral of pure fifths (3/2 ratio).
+
+    Each tone is generated by stacking perfect fifths and octave-reducing.
     """
-    from fractions import Fraction
+    ratios = [1.0]
+    for i in range(1, n):
+        # Stack fifths: (3/2)^i, then reduce to within one octave
+        r = (3 / 2) ** i
+        while r >= 2.0:
+            r /= 2.0
+        ratios.append(r)
+    ratios.sort()
+    ratios.append(2.0)
+    return ratios
+
+
+def _create_quarter_comma_meantone_scale(n):
+    """Quarter-comma meantone — pure major thirds (5/4), tempered fifths.
+
+    The fifth is narrowed by 1/4 of a syntonic comma so that four
+    fifths make a pure major third (5/4). The meantone fifth =
+    5^(1/4) ≈ 1.49535.
+    """
+    fifth = 5 ** 0.25  # meantone fifth ≈ 1.49535 (vs 1.5 pure)
+    ratios = [1.0]
+    for i in range(1, n):
+        r = fifth ** i
+        while r >= 2.0:
+            r /= 2.0
+        ratios.append(r)
+    ratios.sort()
+    ratios.append(2.0)
+    return ratios
+def _create_just_intonation_scale(n):
+    """5-limit just intonation ratios for 12-tone systems."""
     if n != 12:
-        return scales.create_edo_scale(n)
-    # Standard 5-limit JI ratios (A-based: A=1/1)
-    ratios = [
-        Fraction(1, 1),       # A  — unison
-        Fraction(16, 15),     # A# — minor second
-        Fraction(9, 8),       # B  — major second
-        Fraction(6, 5),       # C  — minor third
-        Fraction(5, 4),       # C# — major third
-        Fraction(4, 3),       # D  — perfect fourth
-        Fraction(45, 32),     # D# — augmented fourth
-        Fraction(3, 2),       # E  — perfect fifth
-        Fraction(8, 5),       # F  — minor sixth
-        Fraction(5, 3),       # F# — major sixth
-        Fraction(9, 5),       # G  — minor seventh
-        Fraction(15, 8),      # G# — major seventh
-        Fraction(2, 1),       # A  — octave
-    ]
-    return [float(r) for r in ratios]
+        return _create_edo_scale(n)
+    return [1, 16/15, 9/8, 6/5, 5/4, 4/3, 45/32, 3/2, 8/5, 5/3, 9/5, 15/8, 2.0]
 
 TEMPERAMENTS = {
-    "equal": scales.create_edo_scale,
-    "pythagorean": scales.create_pythagorean_scale,
-    "meantone": scales.create_quarter_comma_meantone_scale,
+    "equal": _create_edo_scale,
+    "pythagorean": _create_pythagorean_scale,
+    "meantone": _create_quarter_comma_meantone_scale,
     "just": _create_just_intonation_scale,
 }
 
@@ -295,8 +313,51 @@ DEGREES_SHRUTI = [
     ("shadja", ()),                 # Sa (octave)
 ]
 
+# 22-shruti frequency ratios — 5-limit just intonation.
+# These are the REAL shruti intervals, NOT 22-TET approximations.
+# Based on the traditional Pythagorean/harmonic ratios from Indian
+# musicological treatises (Natya Shastra, Sangita Ratnakara).
+#
+# Ordered from Dha (A=1.0) to match our system indexing.
+# Sa is at index 5 (ratio ≈ 6/5 from Dha).
+from fractions import Fraction
+_SHRUTI_RATIOS_FROM_SA = [
+    Fraction(1, 1),       #  0: Sa        — 1/1
+    Fraction(256, 243),   #  1: atikomal Re — Pythagorean limma
+    Fraction(16, 15),     #  2: komal Re   — JI minor second
+    Fraction(10, 9),      #  3: shuddha Re — minor whole tone
+    Fraction(9, 8),       #  4: Re         — major whole tone
+    Fraction(32, 27),     #  5: atikomal Ga — Pythagorean minor 3rd
+    Fraction(6, 5),       #  6: komal Ga   — JI minor 3rd
+    Fraction(5, 4),       #  7: Ga         — JI major 3rd
+    Fraction(81, 64),     #  8: tivra Ga   — Pythagorean major 3rd
+    Fraction(4, 3),       #  9: Ma         — perfect 4th
+    Fraction(27, 20),     # 10: ekashruti Ma
+    Fraction(45, 32),     # 11: tivra Ma   — augmented 4th
+    Fraction(729, 512),   # 12: atitivra Ma — Pythagorean tritone
+    Fraction(3, 2),       # 13: Pa         — perfect 5th
+    Fraction(128, 81),    # 14: atikomal Dha — Pythagorean minor 6th
+    Fraction(8, 5),       # 15: komal Dha  — JI minor 6th
+    Fraction(5, 3),       # 16: shuddha Dha
+    Fraction(27, 16),     # 17: Dha        — Pythagorean major 6th
+    Fraction(16, 9),      # 18: komal Ni   — Pythagorean minor 7th
+    Fraction(9, 5),       # 19: shuddha Ni — JI minor 7th
+    Fraction(15, 8),      # 20: Ni         — JI major 7th
+    Fraction(243, 128),   # 21: tivra Ni   — Pythagorean major 7th
+]
+
+# Rotate to start from Dha (index 17 in the Sa-based list above).
+# Dha = 27/16 from Sa. We divide all ratios by 27/16 and wrap.
+_dha_ratio = _SHRUTI_RATIOS_FROM_SA[17]
+SHRUTI_RATIOS = []
+for i in range(22):
+    sa_idx = (i + 17) % 22  # rotate: Dha=0, komalNi=1, ..., Sa=5, ...
+    r = _SHRUTI_RATIOS_FROM_SA[sa_idx] / _dha_ratio
+    if r < 1:
+        r *= 2  # wrap into the same octave
+    SHRUTI_RATIOS.append(float(r))
+
 # 22-shruti thaat scales with proper microtonal intervals.
-# Each interval is counted in shrutis (22-TET steps).
 # Compare to the 12-TET approximations in INDIAN_SCALES which lose
 # the distinction between 2-shruti and 3-shruti steps.
 SHRUTI_SCALES = {
@@ -341,13 +402,75 @@ SHRUTI_SCALES = {
     ],
 }
 
-# ── 24-TET Arabic maqam system ─────────────────────────────────────────────
-# Arabic maqam uses quarter-tones (half-flat, half-sharp). 24-TET captures
-# these intervals exactly. Each step = 50 cents (vs 100 in 12-TET).
-# The half-flat (♭½) is the defining sound of Arabic music — it's what
-# makes maqam Rast and Bayati sound distinctly Middle Eastern.
+# ── Arabic maqam system ───────────────────────────────────────────────────
+# Arabic maqam uses quarter-tones with specific JI ratios, NOT equal
+# 24-TET divisions. The neutral intervals (quarter-flat, quarter-sharp)
+# are based on ratios involving the 11th partial, as theorized by
+# Zalzal (8th century Baghdad). The quarter-flat E in Rast is 27/22,
+# not simply halfway between Eb and E.
 #
+# 24 positions per octave, but with unequal JI spacing.
 # Ordered from La (=A) to match Western index positions.
+
+# Maqam JI ratios from Do (C). Based on traditional practice:
+# - Standard JI intervals for the 12 chromatic positions
+# - Zalzalian ratios (11-limit) for the quarter-tone positions
+_MAQAM_RATIOS_FROM_DO = [
+    Fraction(1, 1),       #  0: Do       — unison
+    Fraction(33, 32),     #  1: Do↑      — quarter-sharp (~53¢, 33rd harmonic)
+    Fraction(16, 15),     #  2: Reb      — JI minor 2nd
+    Fraction(12, 11),     #  3: Re↓      — Zalzalian neutral 2nd (~151¢)
+    Fraction(9, 8),       #  4: Re       — major whole tone
+    Fraction(11, 9) * Fraction(1, 1),  #  5: Re↑  — undecimal (~347¢... too high)
+    Fraction(6, 5),       #  6: Mib      — JI minor 3rd
+    Fraction(27, 22),     #  7: Mi↓      — Zalzalian neutral 3rd (~355¢) THE Rast note
+    Fraction(5, 4),       #  8: Mi       — JI major 3rd
+    Fraction(4, 3),       #  9: Fa       — perfect 4th
+    Fraction(11, 8),      # 10: Fa↑      — undecimal tritone (~551¢)
+    Fraction(45, 32),     # 11: Fa#      — augmented 4th
+    Fraction(22, 15),     # 12: Sol↓     — neutral (~663¢... adjusted)
+    Fraction(3, 2),       # 13: Sol      — perfect 5th
+    Fraction(99, 64),     # 14: Sol↑     — quarter-sharp 5th
+    Fraction(8, 5),       # 15: Lab      — JI minor 6th
+    Fraction(18, 11),     # 16: La↓      — Zalzalian neutral 6th
+    Fraction(5, 3),       # 17: La       — JI major 6th
+    Fraction(27, 16),     # 18: La↑/Sib↓ — Pythagorean major 6th
+    Fraction(16, 9),      # 19: Sib      — Pythagorean minor 7th
+    Fraction(11, 6),      # 20: Si↓      — undecimal neutral 7th
+    Fraction(15, 8),      # 21: Si       — JI major 7th
+    Fraction(243, 128),   # 22: Si↑      — Pythagorean major 7th
+    Fraction(2, 1) * Fraction(33, 64),  # 23: near-octave (~1049¢)
+]
+
+# Ratios directly from La (A=1/1), each position defined explicitly.
+# Standard JI intervals for chromatic positions, Zalzalian (11-limit)
+# ratios for the quarter-tone positions.
+MAQAM_RATIOS = [
+    1.0,                              #  0: La       — A (unison)
+    float(Fraction(256, 243)),        #  1: La↑      — Pythagorean comma up
+    float(Fraction(16, 15)),          #  2: Sib      — Bb (JI minor 2nd)
+    float(Fraction(12, 11)),          #  3: Si↓      — B quarter-flat (Zalzalian)
+    float(Fraction(9, 8)),            #  4: Si       — B (major 2nd)
+    float(Fraction(6, 5)),            #  5: Do       — C (minor 3rd from A)
+    float(Fraction(11, 9)),           #  6: Do↑      — C quarter-sharp (undecimal)
+    float(Fraction(5, 4)),            #  7: Reb      — Db (major 3rd from A...= JI Db)
+    float(Fraction(9, 7)),            #  8: Re↓      — D quarter-flat (septimal)
+    float(Fraction(4, 3)),            #  9: Re       — D (perfect 4th from A)
+    float(Fraction(11, 8)),           # 10: Re↑      — D quarter-sharp (undecimal)
+    float(Fraction(45, 32)),          # 11: Mib      — Eb (augmented 4th from A)
+    float(Fraction(6, 5) * Fraction(27, 22)),  # 12: Mi↓ — E quarter-flat (Do × 27/22)
+    float(Fraction(3, 2)),            # 13: Mi       — E (perfect 5th from A)
+    float(Fraction(8, 5)),            # 14: Fa       — F (minor 6th from A)
+    float(Fraction(18, 11)),          # 15: Fa↑      — F quarter-sharp (Zalzalian)
+    float(Fraction(5, 3)),            # 16: Fa#      — F# (major 6th from A)
+    float(Fraction(27, 16)),          # 17: Sol↓     — G quarter-flat
+    float(Fraction(16, 9)),           # 18: Sol      — G (minor 7th from A)
+    float(Fraction(11, 6)),           # 19: Sol↑     — G quarter-sharp (undecimal)
+    float(Fraction(15, 8)),           # 20: Lab      — Ab (major 7th from A)
+    float(Fraction(27, 14)),          # 21: La↓      — A quarter-flat (septimal)
+    float(Fraction(243, 128)),        # 22: La½b     — near-octave
+    float(Fraction(2, 1) * Fraction(256, 257)),  # 23: La♮  — near-octave
+]
 TONES_ARABIC_24 = [
     ("La",),                #  0 — A
     ("La↑",),               #  1 — A quarter-sharp

pytheory/cli.py

@@ -299,6 +299,54 @@ def cmd_demo(args):
          "lead": ("trumpet_synth", "bowed", 0.3, 0.2),
          "pad": ("piano_synth", "none", -0.2),
          "bass_lp": 600, "reverb_type": "plate"},
+        {"name": "Theremin Noir", "key": ("A", "minor"), "drums": "hip hop",
+         "fill": "rock", "bpm": 85,
+         "prog": ("i", "iv", "V", "i"),
+         "lead": ("theremin_synth", "pad", 0.4, 0.0),
+         "pad": ("granular_synth", "pad", 0.0),
+         "bass_lp": 300, "reverb_type": "cave"},
+        {"name": "Caribbean", "key": ("C", "major"), "drums": "reggae",
+         "fill": "reggae", "bpm": 110,
+         "prog": ("I", "IV", "V", "IV"),
+         "lead": ("steel_drum_synth", "none", 0.25, 0.3),
+         "pad": ("acoustic_guitar_synth", "none", -0.3),
+         "bass_lp": 500, "reverb_type": "plate"},
+        {"name": "Accordion Waltz", "key": ("D", "minor"), "drums": "waltz",
+         "fill": "jazz", "bpm": 88,
+         "prog": ("i", "iv", "V", "i"),
+         "lead": ("accordion_synth", "organ", 0.2, 0.1),
+         "pad": ("strings_synth", "pad", -0.2),
+         "bass_lp": 500, "reverb_type": "plate"},
+        {"name": "Kalimba Dreams", "key": ("G", "major"), "drums": "cajon folk",
+         "fill": "bossa nova", "bpm": 95,
+         "prog": ("I", "vi", "IV", "V"),
+         "lead": ("kalimba_synth", "none", 0.35, 0.2),
+         "pad": ("piano_synth", "none", -0.2),
+         "bass_lp": 400, "reverb_type": "taj_mahal"},
+        {"name": "Outback Drone", "key": ("E", "minor"), "drums": "djembe",
+         "fill": "afrobeat", "bpm": 70,
+         "prog": ("i", "iv", "i", "V"),
+         "lead": ("didgeridoo_synth", "pad", 0.3, 0.0),
+         "pad": ("granular_synth", "pad", 0.0),
+         "bass_lp": 200, "reverb_type": "cave"},
+        {"name": "Highland", "key": ("A", "minor"), "drums": "flamenco",
+         "fill": "rock", "bpm": 95,
+         "prog": ("i", "iv", "V", "i"),
+         "lead": ("bagpipe_synth", "organ", 0.15, 0.0),
+         "pad": ("strings_synth", "pad", -0.2),
+         "bass_lp": 400, "reverb_type": "cathedral"},
+        {"name": "Nashville Tears", "key": ("G", "major"), "drums": "country",
+         "fill": "rock", "bpm": 85,
+         "prog": ("I", "IV", "V", "IV"),
+         "lead": ("pedal_steel_synth", "strings", 0.35, 0.2),
+         "pad": ("piano_synth", "none", -0.3),
+         "bass_lp": 500, "reverb_type": "spring"},
+        {"name": "Tabla Fusion", "key": ("E", "minor"), "drums": "teental",
+         "fill": "rock", "bpm": 120,
+         "prog": ("i", "iv", "V", "i"),
+         "lead": ("sitar_synth", "none", 0.3, 0.2),
+         "pad": ("vocal_synth", "pad", 0.0),
+         "bass_lp": 400, "reverb_type": "taj_mahal"},
     ]
 
     mood = random.choice(moods)

pytheory/rhythm.py

@@ -195,6 +195,54 @@ INSTRUMENTS = {
         "detune": 12, "lowpass": 3000, "lowpass_q": 1.5,
         "humanize": 0.2,
     },
+    "pedal_steel": {
+        "synth": "pedal_steel_synth", "envelope": "strings",
+        "reverb": 0.3, "reverb_type": "spring",
+        "humanize": 0.15,
+    },
+    "theremin": {
+        "synth": "theremin_synth", "envelope": "pad",
+        "legato": True, "glide": 0.05,
+        "reverb": 0.3, "reverb_type": "plate",
+    },
+    "kalimba": {
+        "synth": "kalimba_synth", "envelope": "none",
+        "reverb": 0.35, "reverb_type": "plate",
+    },
+    "steel_drum": {
+        "synth": "steel_drum_synth", "envelope": "none",
+        "reverb": 0.3, "reverb_type": "plate",
+    },
+    "accordion": {
+        "synth": "accordion_synth", "envelope": "organ",
+        "humanize": 0.15,
+    },
+    "didgeridoo": {
+        "synth": "didgeridoo_synth", "envelope": "pad",
+        "lowpass": 1500,
+        "reverb": 0.4, "reverb_type": "cave",
+    },
+    "bagpipe": {
+        "synth": "bagpipe_synth", "envelope": "organ",
+        "lowpass": 4000,
+    },
+    "banjo": {
+        "synth": "banjo_synth", "envelope": "none",
+        "humanize": 0.2,
+    },
+    "mandolin": {
+        "synth": "mandolin_synth", "envelope": "none",
+        "humanize": 0.2,
+    },
+    "mandola": {
+        "synth": "mandolin_synth", "envelope": "none",
+        "lowpass": 3000,
+        "humanize": 0.2,
+    },
+    "ukulele": {
+        "synth": "ukulele_synth", "envelope": "none",
+        "humanize": 0.2,
+    },
     "koto": {
         "synth": "pluck_synth", "envelope": "none",
         "lowpass": 4000,
@@ -241,6 +289,26 @@ INSTRUMENTS = {
         "vel_to_filter": 3000,
         "analog": 0.3,
     },
+    "granular_pad": {
+        "synth": "granular_synth", "envelope": "pad",
+        "reverb": 0.4, "reverb_type": "cathedral",
+        "analog": 0.3,
+    },
+    "vocal": {
+        "synth": "vocal_synth", "envelope": "strings",
+        "reverb": 0.3, "reverb_type": "hall",
+        "humanize": 0.15,
+    },
+    "choir": {
+        "synth": "vocal_synth", "envelope": "pad",
+        "detune": 8, "spread": 0.4,
+        "reverb": 0.45, "reverb_type": "cathedral",
+    },
+    "granular_texture": {
+        "synth": "granular_synth", "envelope": "none",
+        "reverb": 0.5, "reverb_type": "taj_mahal",
+        "delay": 0.3, "delay_time": 0.4, "delay_feedback": 0.4,
+    },
     "808_bass": {
         "synth": "sine", "envelope": "pluck",
         "distortion": 0.4, "distortion_drive": 2.5,
@@ -275,6 +343,31 @@ INSTRUMENTS = {
         "fm_ratio": 2.0, "fm_index": 3.0,
         "reverb": 0.4, "reverb_type": "cathedral",
     },
+    "timpani": {
+        "synth": "timpani_synth", "envelope": "none",
+        "reverb": 0.4, "reverb_type": "cathedral",
+    },
+
+    # ── Woodwinds (continued) ──
+    "saxophone": {
+        "synth": "saxophone_synth", "envelope": "bowed",
+        "humanize": 0.15, "vel_to_filter": 1500,
+    },
+    "alto_sax": {
+        "synth": "saxophone_synth", "envelope": "bowed",
+        "humanize": 0.15, "vel_to_filter": 1800,
+    },
+    "tenor_sax": {
+        "synth": "saxophone_synth", "envelope": "bowed",
+        "lowpass": 3000,
+        "humanize": 0.15, "vel_to_filter": 1200,
+    },
+    "bari_sax": {
+        "synth": "saxophone_synth", "envelope": "bowed",
+        "lowpass": 2000,
+        "humanize": 0.15, "vel_to_filter": 800,
+        "sub_osc": 0.15,
+    },
 }
 
 
@@ -332,6 +425,7 @@ class Note:
     velocity: int = 100
     bend: float = 0.0
     bend_type: str = "smooth"  # "smooth" (log), "linear", "late"
+    lyric: str = ""  # syllable for vocal synth
 
     @property
     def beats(self) -> float:
@@ -428,10 +522,15 @@ class DrumSound(Enum):
     MRIDANGAM_NAM = 99   # treble ring (valanthalai/right head)
     MRIDANGAM_DIN = 100  # both heads
     MRIDANGAM_THA = 101  # muted treble
+    TABLA_GE_BEND = 108  # bayan with upward pitch bend (palm press)
     # Djembe sounds
     DJEMBE_BASS = 102    # open bass (center of head)
     DJEMBE_TONE = 103    # open tone (edge, fingers together)
     DJEMBE_SLAP = 104    # slap (edge, fingers spread, sharp crack)
+    # Cajon sounds
+    CAJON_BASS = 108     # center of face, deep thump
+    CAJON_SLAP = 109     # top edge, snare wires buzz
+    CAJON_TAP = 110      # light finger tap
     # Metal kit — tighter, punchier, more attack
     METAL_KICK = 105     # clicky, punchy, tight
     METAL_SNARE = 106    # crack, bright, cutting
@@ -1463,6 +1562,50 @@ Pattern._PRESETS["tabla solo"] = dict(
     ],
 )
 
+# ── Cajón patterns ────────────────────────────────────────────────────────
+CB = DrumSound.CAJON_BASS
+CSL = DrumSound.CAJON_SLAP
+CT = DrumSound.CAJON_TAP
+
+# Cajón flamenco — the classic acoustic percussion groove
+Pattern._PRESETS["cajon"] = dict(
+    name="cajon",
+    time_signature="4/4",
+    beats=4.0,
+    hits=[
+        _h(CB, 0.0, 85), _h(CT, 0.5, 35), _h(CT, 0.75, 38),
+        _h(CSL, 1.0, 80), _h(CT, 1.5, 32),
+        _h(CB, 2.0, 82), _h(CT, 2.5, 35), _h(CT, 2.75, 40),
+        _h(CSL, 3.0, 82), _h(CT, 3.25, 30), _h(CT, 3.5, 35),
+    ],
+)
+
+# Cajón rumba — Latin-flavored
+Pattern._PRESETS["cajon rumba"] = dict(
+    name="cajon rumba",
+    time_signature="4/4",
+    beats=4.0,
+    hits=[
+        _h(CB, 0.0, 88), _h(CT, 0.5, 38),
+        _h(CSL, 1.0, 78), _h(CT, 1.25, 32), _h(CB, 1.5, 72),
+        _h(CSL, 2.0, 82), _h(CT, 2.5, 35),
+        _h(CB, 3.0, 75), _h(CSL, 3.5, 80), _h(CT, 3.75, 38),
+    ],
+)
+
+# Cajón singer-songwriter — simple, supportive
+Pattern._PRESETS["cajon folk"] = dict(
+    name="cajon folk",
+    time_signature="4/4",
+    beats=4.0,
+    hits=[
+        _h(CB, 0.0, 80),
+        _h(CSL, 1.0, 72), _h(CT, 1.5, 30),
+        _h(CB, 2.0, 78),
+        _h(CSL, 3.0, 75),
+    ],
+)
+
 # ── Metal kit patterns ────────────────────────────────────────────────────
 MK = DrumSound.METAL_KICK
 MS = DrumSound.METAL_SNARE
@@ -2059,7 +2202,7 @@ class Part:
         self._automation: list[tuple[float, dict]] = []  # (beat, {param: value})
 
     def add(self, tone_or_string, duration=Duration.QUARTER, *, velocity: int = 100,
-            bend: float = 0.0, bend_type: str = "smooth") -> "Part":
+            bend: float = 0.0, bend_type: str = "smooth", lyric: str = "") -> "Part":
         """Add a note. Accepts Tone/Chord objects or note strings like ``"E5"``.
 
         Duration can be a ``Duration`` enum or a raw float (beats).
@@ -2077,7 +2220,7 @@ class Part:
             duration = _RawDuration(duration)
         self.notes.append(Note(tone=tone_or_string, duration=duration,
                                velocity=velocity, bend=bend,
-                               bend_type=bend_type))
+                               bend_type=bend_type, lyric=lyric))
         return self
 
     def set(self, **params) -> "Part":
@@ -2362,7 +2505,7 @@ class Part:
 
     def strum(self, chord_name: str, duration=Duration.QUARTER, *,
               direction: str = "down", velocity: int = 100,
-              strum_time: float = 0.08) -> "Part":
+              strum_time: float = 0.05) -> "Part":
         """Strum a chord using the part's fretboard fingering.
 
         Looks up the chord on the fretboard, gets the fingering, and
@@ -2430,10 +2573,68 @@ class Part:
         from .chords import Chord as ChordClass
         chord_obj = ChordClass(tones=strum_tones)
 
-        self.add(chord_obj, total_beats, velocity=velocity)
+        # Strum sweep: quick individual string hits before the chord.
+        # Only the first 2-3 strings get a tiny grace note, the rest
+        # ring together as the full chord. Gives the strum feel without
+        # sounding like separate plucks.
+        n_strings = len(strum_tones)
+        if strum_time > 0.02 and n_strings >= 3:
+            n_grace = min(2, n_strings - 1)
+            per_grace = strum_time / n_grace
+            grace_vel = max(1, int(velocity * 0.25))
+            for i in range(n_grace):
+                self.add(strum_tones[i], per_grace, velocity=grace_vel)
+            ring = max(0.1, total_beats - strum_time)
+            self.add(chord_obj, ring, velocity=velocity)
+        else:
+            self.add(chord_obj, total_beats, velocity=velocity)
 
         return self
 
+    def roll(self, tone_or_string, duration=Duration.WHOLE, *,
+             velocity_start: int = 40, velocity_end: int = 100,
+             speed=Duration.SIXTEENTH) -> "Part":
+        """Play a roll — rapid repeated notes with velocity ramp.
+
+        Perfect for timpani rolls, snare rolls, tremolo on any
+        instrument. The velocity ramps from ``velocity_start`` to
+        ``velocity_end`` over the duration for crescendo/decrescendo.
+
+        Args:
+            tone_or_string: The note to repeat.
+            duration: Total duration of the roll.
+            velocity_start: Velocity of the first hit (default 40).
+            velocity_end: Velocity of the last hit (default 100).
+            speed: How fast to repeat (default SIXTEENTH notes).
+
+        Returns:
+            Self for chaining.
+
+        Example::
+
+            >>> timp = score.part("timp", instrument="timpani")
+            >>> timp.roll("C3", Duration.WHOLE, velocity_start=30, velocity_end=110)
+        """
+        if hasattr(duration, 'value'):
+            total = duration.value
+        else:
+            total = float(duration)
+        if hasattr(speed, 'value'):
+            step = speed.value
+        else:
+            step = float(speed)
+
+        n_hits = max(1, int(total / step))
+        for i in range(n_hits):
+            frac = i / max(1, n_hits - 1)
+            vel = int(velocity_start + (velocity_end - velocity_start) * frac)
+            vel = max(1, min(127, vel))
+            remaining = total - i * step
+            note_dur = min(step, remaining)
+            if note_dur > 0:
+                self.add(tone_or_string, note_dur, velocity=vel)
+        return self
+
     @property
     def is_drums(self) -> bool:
         """True if this part contains drum hits."""

pytheory/systems.py

@@ -2,8 +2,8 @@ from ._statics import (
     TEMPERAMENTS, TONES, DEGREES, SCALES,
     INDIAN_SCALES, ARABIC_SCALES, JAPANESE_SCALES,
     BLUES_SCALES, GAMELAN_SCALES, SYSTEMS,
-    TONES_SHRUTI, DEGREES_SHRUTI, SHRUTI_SCALES,
-    TONES_ARABIC_24, DEGREES_ARABIC_24, ARABIC_24_SCALES,
+    TONES_SHRUTI, DEGREES_SHRUTI, SHRUTI_SCALES, SHRUTI_RATIOS,
+    TONES_ARABIC_24, DEGREES_ARABIC_24, ARABIC_24_SCALES, MAQAM_RATIOS,
     TONES_SLENDRO, DEGREES_SLENDRO, SLENDRO_SCALES,
     TONES_PELOG, DEGREES_PELOG, PELOG_SCALES,
     TONES_THAI, DEGREES_THAI, THAI_SCALES,
@@ -14,7 +14,7 @@ from ._statics import (
 
 class System:
     def __init__(self, *, tone_names, degrees, scales=None, c_index=None,
-                 period=2.0):
+                 period=2.0, ratios=None):
         self.tone_names = tone_names
 
         self.degrees = degrees
@@ -25,6 +25,11 @@ class System:
         # 3.0 for Bohlen-Pierce (tritave).
         self.period = period
 
+        # Custom frequency ratios: if set, overrides equal temperament.
+        # A list of N floats (one per tone), each relative to the first
+        # tone (1.0). For example, just intonation shruti ratios.
+        self.ratios = ratios
+
         # c_index: the index of the "reference C" in the tone list.
         # For octave arithmetic — scientific pitch changes octave at C.
         # Default 3 for 12-TET western (A=0, A#=1, B=2, C=3).
@@ -214,6 +219,17 @@ class System:
         # descending goes in meta?
         return {"intervals": scale, "hemitonic": hemitonic, "meta": {}}
 
+    def tone(self, name, octave=4):
+        """Create a Tone in this system. Shorthand for ``Tone(name, octave=octave, system=self)``.
+
+        Example::
+
+            >>> edo19 = TET(19)
+            >>> edo19.tone(5, octave=4).frequency
+        """
+        from . import Tone
+        return Tone(name, octave=octave, system=self)
+
     def __repr__(self):
         return f"<System semitones={self.semitones!r}>"
 
@@ -352,9 +368,9 @@ SYSTEMS = {
     "31-tet": TET(31, names=_31TET_NAMES),
     # Microtonal systems with proper intervals (not 12-TET approximations)
     "shruti": System(tone_names=TONES_SHRUTI, degrees=DEGREES_SHRUTI,
-                     scales=SHRUTI_SCALES, c_index=5),
+                     scales=SHRUTI_SCALES, c_index=5, ratios=SHRUTI_RATIOS),
     "maqam": System(tone_names=TONES_ARABIC_24, degrees=DEGREES_ARABIC_24,
-                    scales=ARABIC_24_SCALES, c_index=5),
+                    scales=ARABIC_24_SCALES, c_index=5, ratios=MAQAM_RATIOS),
     "slendro": System(tone_names=TONES_SLENDRO, degrees=DEGREES_SLENDRO,
                       scales=SLENDRO_SCALES, c_index=1),
     "pelog": System(tone_names=TONES_PELOG, degrees=DEGREES_PELOG,

pytheory/tones.py

@@ -26,7 +26,7 @@ class Tone:
 
     def __init__(
         self,
-        name: str,
+        name,
         *,
         alt_names: Optional[list[str]] = None,
         octave: Optional[int] = None,
@@ -36,8 +36,10 @@ class Tone:
         """Initialize a Tone with a name, optional octave, and musical system.
 
         Args:
-            name: The note name (e.g. ``"C"``, ``"C#4"``). If the name
-                contains a digit, it is parsed as the octave.
+            name: The note name as a string (``"C"``, ``"C#4"``) or an int
+                for numbered systems (``0``, ``11``). Ints are converted to
+                strings and wrapped to the system's range (e.g. 22 in a
+                22-tone system becomes 0 at octave+1).
             alt_names: Alternate spellings for this tone (e.g. enharmonics).
             octave: The octave number. Overrides any octave parsed from *name*.
             system: The tuning system, either as a string key (``"western"``)
@@ -46,6 +48,23 @@ class Tone:
         if alt_names is None:
             alt_names = []
 
+        # Int tone names: wrap to system range, adjust octave
+        if isinstance(name, int):
+            if isinstance(system, str):
+                from .systems import SYSTEMS
+                _sys = SYSTEMS[system]
+            else:
+                _sys = system
+            n_tones = len(_sys.tone_names)
+            if name < 0 or name >= n_tones:
+                extra_octaves = name // n_tones
+                name = name % n_tones
+                if octave is None:
+                    octave = 4 + extra_octaves
+                else:
+                    octave += extra_octaves
+            name = str(name)
+
         if isinstance(name, str):
             # Normalize unicode music symbols to ASCII equivalents
             name = (name
@@ -70,6 +89,35 @@ class Tone:
                     if octave is None:
                         octave = parsed_octave
 
+        # Octave boundary fix: B#→C should increment octave,
+        # Cb→B should decrement octave (scientific pitch changes at C).
+        # Only applies to Western-style systems with letter names.
+        if octave is not None and name and name[0].isalpha():
+            if isinstance(system, str):
+                from .systems import SYSTEMS
+                _sys_check = SYSTEMS.get(system)
+            else:
+                _sys_check = system
+            if _sys_check is not None:
+                resolved = _sys_check.resolve_name(name)
+                if resolved is not None and resolved != name:
+                    orig_letter = name[0].upper()
+                    res_letter = resolved[0].upper()
+                    # Sharp crossing B→C: B# resolves to C, octave up
+                    if orig_letter == 'B' and res_letter == 'C' and '#' in name:
+                        octave += 1
+                    # Double sharp: A## resolves to B — no boundary cross
+                    # But B## resolves to C# — boundary cross
+                    if orig_letter == 'B' and res_letter not in ('B', 'A') and '##' in name:
+                        octave += 1
+                    # Flat crossing C→B: Cb resolves to B, octave down
+                    if orig_letter == 'C' and res_letter == 'B' and 'b' in name and name != 'C':
+                        octave -= 1
+                    # Double flat: D♭♭ resolves to C — no boundary cross
+                    # But C♭♭ resolves to Bb — boundary cross
+                    if orig_letter == 'C' and res_letter not in ('C', 'D') and 'bb' in name:
+                        octave -= 1
+
         self.name = name
         self.octave = octave
         self.alt_names = alt_names
@@ -762,11 +810,13 @@ class Tone:
         period = getattr(self.system, 'period', 2.0)
         c_idx = getattr(self.system, 'c_index', C_INDEX)
 
-        if period != 2.0 and temperament == "equal":
-            # Non-octave period (e.g. Bohlen-Pierce tritave=3.0):
-            # generate ratios as period^(n/tones) instead of 2^(n/tones)
-            import sympy
-            pitch_scale = [period ** sympy.Rational(i, tones) for i in range(tones + 1)]
+        # Custom ratios override temperament (e.g. shruti just ratios)
+        custom_ratios = getattr(self.system, 'ratios', None)
+        if custom_ratios is not None:
+            pitch_scale = list(custom_ratios) + [period]
+        elif period != 2.0 and temperament == "equal":
+            # Non-octave period (e.g. Bohlen-Pierce tritave=3.0)
+            pitch_scale = [period ** (i / tones) for i in range(tones + 1)]
         else:
             pitch_scale = TEMPERAMENTS[temperament](tones)
         octave = self.octave if self.octave is not None else 4
@@ -783,7 +833,7 @@ class Tone:
         if symbolic:
             return reference_pitch * ratio
         else:
-            result = reference_pitch * ratio
+            result = float(reference_pitch * ratio)
             if precision:
-                return float(result.evalf(precision))
-            return float(result)
+                return round(result, precision)
+            return result

test_pytheory.py

@@ -5320,7 +5320,7 @@ def test_supersaw_wave():
 @needs_portaudio
 def test_all_synths_in_enum():
     from pytheory.play import Synth
-    assert len(Synth) == 27
+    assert len(Synth) == 30
     for s in Synth:
         wave = s(440, n_samples=1000)
         assert len(wave) == 1000
@@ -6827,7 +6827,7 @@ def test_strum_direction():
     p = score.part("g", instrument="acoustic_guitar", fretboard=fb)
     p.strum("G", Duration.QUARTER, direction="down")
     p.strum("G", Duration.QUARTER, direction="up")
-    assert len(p.notes) == 2
+    assert len(p.notes) >= 2  # grace notes + chord per strum
 
 
 # ── World drums ──────────────────────────────────────────────────────────────

uv.lock

@@ -444,15 +444,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", size = 9979, upload-time = "2022-08-14T12:40:09.779Z" },
 ]
 
-[[package]]
-name = "mpmath"
-version = "1.3.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/e0/47/dd32fa426cc72114383ac549964eecb20ecfd886d1e5ccf5340b55b02f57/mpmath-1.3.0.tar.gz", hash = "sha256:7a28eb2a9774d00c7bc92411c19a89209d5da7c4c9a9e227be8330a23a25b91f", size = 508106, upload-time = "2023-03-07T16:47:11.061Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/43/e3/7d92a15f894aa0c9c4b49b8ee9ac9850d6e63b03c9c32c0367a13ae62209/mpmath-1.3.0-py3-none-any.whl", hash = "sha256:a0b2b9fe80bbcd81a6647ff13108738cfb482d481d826cc0e02f5b35e5c88d2c", size = 536198, upload-time = "2023-03-07T16:47:09.197Z" },
-]
-
 [[package]]
 name = "myst-parser"
 version = "4.0.1"
@@ -707,11 +698,10 @@ wheels = [
 
 [[package]]
 name = "pytheory"
-version = "0.34.1"
+version = "0.36.1"
 source = { editable = "." }
 dependencies = [
     { name = "numeral" },
-    { name = "pytuning" },
     { name = "scipy", version = "1.15.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" },
     { name = "scipy", version = "1.17.1", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" },
     { name = "sounddevice" },
@@ -732,7 +722,6 @@ docs = [
 [package.metadata]
 requires-dist = [
     { name = "numeral" },
-    { name = "pytuning" },
     { name = "scipy" },
     { name = "sounddevice" },
 ]
@@ -744,19 +733,6 @@ docs = [
     { name = "sphinx" },
 ]
 
-[[package]]
-name = "pytuning"
-version = "0.7.3"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "numpy", version = "2.2.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" },
-    { name = "numpy", version = "2.4.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" },
-    { name = "sympy" },
-]
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/26/59/e2c2fc91688f788587fb387ef6120c9a1ad3a8b88771fba9fc6a9c9a969d/PyTuning-0.7.3-py3-none-any.whl", hash = "sha256:db0b1231c012c1cf6a3c73aa7d791b4cff79a72f2ec6535f159c873fe302214b", size = 108174, upload-time = "2023-09-02T21:11:00.657Z" },
-]
-
 [[package]]
 name = "pyyaml"
 version = "6.0.3"
@@ -1151,18 +1127,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/52/a7/d2782e4e3f77c8450f727ba74a8f12756d5ba823d81b941f1b04da9d033a/sphinxcontrib_serializinghtml-2.0.0-py3-none-any.whl", hash = "sha256:6e2cb0eef194e10c27ec0023bfeb25badbbb5868244cf5bc5bdc04e4464bf331", size = 92072, upload-time = "2024-07-29T01:10:08.203Z" },
 ]
 
-[[package]]
-name = "sympy"
-version = "1.14.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "mpmath" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/83/d3/803453b36afefb7c2bb238361cd4ae6125a569b4db67cd9e79846ba2d68c/sympy-1.14.0.tar.gz", hash = "sha256:d3d3fe8df1e5a0b42f0e7bdf50541697dbe7d23746e894990c030e2b05e72517", size = 7793921, upload-time = "2025-04-27T18:05:01.611Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/a2/09/77d55d46fd61b4a135c444fc97158ef34a095e5681d0a6c10b75bf356191/sympy-1.14.0-py3-none-any.whl", hash = "sha256:e091cc3e99d2141a0ba2847328f5479b05d94a6635cb96148ccb3f34671bd8f5", size = 6299353, upload-time = "2025-04-27T18:04:59.103Z" },
-]
-
 [[package]]
 name = "tomli"
 version = "2.4.0"