Cleaner vocal synth: less static, click-free note transitions

- Jitter reduced (0.3% → 0.1%), shimmer reduced (2% → 0.8%)
- Breath noise halved (0.08 → 0.04), mix 85/15 → 92/8
- 10ms fade in/out on every vocal note prevents clicks
- Smoother syllable transitions

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

CHANGELOG.md

@@ -2,6 +2,128 @@
 
 All notable changes to PyTheory are documented here.
 
+## 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
+  synthesis for: piano (hammer + steel strings + soundboard), bass guitar
+  (thick KS + pickup), flute (breath + tube resonance), trumpet (lip buzz
+  + bell), clarinet (odd harmonics + reed), oboe (double reed + conical
+  bore), marimba (inharmonic bar modes), harpsichord (quill pluck),
+  cello (deep bowed + body), harp (soft pluck + soundboard bloom),
+  upright bass (pizzicato + wooden body), acoustic guitar (KS + body
+  resonance), electric guitar (KS + pickup comb filter), sitar (jawari
+  + chikari), plus organ and bowed strings
+- **Speaker cabinet simulation** — tames distorted guitar fizz
+- **Guitar strumming** — `Part.strum("Am")` with fretboard lookup
+- **Analog oscillator drift** — subtle per-note pitch wobble on synth presets
+- **World percussion:** dhol, dholak, mridangam, djembe, metal kit
+  with 22 new drum patterns
+- **Piano improvements:** brightness scales with pitch, two-stage decay,
+  hammer impact with felt character
+- **Vibrato tuning:** reduced across flute, oboe, trumpet, cello for
+  smoother ensemble sound
+- 27 synth waveforms, 10 envelopes, 40+ instrument presets, 80+ drum patterns
+
+## 0.33.1
+
+- **Electric guitar synth** — Karplus-Strong with magnetic pickup comb filter
+  simulation (single-coil honk, proper sustain)
+- **Speaker cabinet simulation** — steep rolloff above 4-5kHz with presence
+  bump. Makes distorted guitar sound warm instead of fizzy.
+- **6 guitar presets:** electric_guitar, clean_guitar, crunch_guitar,
+  distorted_guitar, orange_crunch, metal_guitar — all with proper cab sim
+- **Sitar synth** — Karplus-Strong with jawari bridge buzz, chikari
+  sympathetic strings, variable damping
+- **Guitar strumming** — `Part.strum("Am", Duration.HALF)` with
+  fretboard fingering lookup, down/up direction, adjustable strum speed
+- **World drums:** dhol (bhangra, chaal), dholak (qawwali, folk),
+  mridangam (adi talam, korvai), djembe (standard, kuku, soli)
+  — all with bandpass-filtered membrane noise for realistic drum head sound
+- **Metal drum kit** — clicky kick, bright snare, tight hats
+  with 4 patterns (double kick, metal blast, metal groove, metal gallop)
+- 15 synth waveforms, 10 envelopes, 40+ instrument presets
+
+## 0.33.0
+
+- **Non-12-TET support** — `TET(n)` factory creates any equal temperament
+- **11 microtonal systems:**
+  - `"shruti"` (22-TET Indian, 10 thaats with proper shruti intervals)
+  - `"maqam"` (24-TET Arabic, quarter-tone Rast/Bayati/Hijaz + 7 more)
+  - `"slendro"` (5-TET gamelan), `"pelog"` (9-TET gamelan with 3 pathet)
+  - `"thai"` (7-TET, 171 cents/step)
+  - `"makam"` (53-TET Turkish Arel-Ezgi-Uzdilek, 9 makams)
+  - `"carnatic"` (72-TET, 10 melakartas)
+  - `"19-tet"`, `"31-tet"` (historical Western)
+  - `"bohlen-pierce"` (13 divisions of the tritave 3:1 — non-octave!)
+- **Just intonation** — `temperament="just"` for pure 5-limit ratios
+- **Historical pitch** — `Score(reference_pitch=415.0)` for Baroque A=415
+- **`Score(system=, temperament=, reference_pitch=)`** flows through to all playback
+- Per-system `c_index` and `period` replace hardcoded constants
+- Fixed all hardcoded `12`s in tone arithmetic
+- Song #22: Greensleeves (Renaissance lute, meantone, A=415)
+- 22 new microtonal tests (819 total)
+
+## 0.32.1
+
+- `Tone("X")` now raises `ValueError` immediately instead of silently accepting invalid names (#39)
+- Support enharmonic spellings: `Cb`, `Fb`, `E#`, `B#` resolve correctly (#40)
+- Support double sharps (`C##`, `Fx`) and double flats (`Dbb`) via semitone arithmetic (#41)
+- Accept unicode music symbols: `♯` `♭` `𝄪` `𝄫`
+
+## 0.32.0
+
+- **8 new synth engine features:**
+  - Filter envelope: per-note lowpass sweep (`filter_amount`, `filter_attack`, `filter_decay`, `filter_sustain`)
+  - Velocity → brightness: harder notes = brighter filter (`vel_to_filter`)
+  - Sub-oscillator: octave-below sine for bass weight (`sub_osc`)
+  - Tremolo: amplitude LFO modulation (`tremolo_depth`, `tremolo_rate`)
+  - Saturation: even-harmonic tape/tube warmth (`saturation`)
+  - Noise layer: per-note breath/air texture (`noise_mix`)
+  - Phaser: swept allpass filter chain (`phaser`, `phaser_rate`)
+  - Configurable FM: `fm_ratio` and `fm_index` params
+- **Highpass filter** (12 dB/oct biquad) on any part
+- **2 new envelopes:** `bowed` (bow attack with sustain), `mallet` (strike with ringing sustain)
+- **Improved `strings_synth`:** additive synthesis with body resonance curve, per-harmonic phase randomization, delayed vibrato onset, bow pressure variation
+- **Instrument preset overhaul:** every preset sanity-checked against real instrument behavior
+  - Mallet instruments (vibraphone, celesta, music box, glockenspiel, tubular bells) now ring properly
+  - Trumpet uses sustaining envelope instead of pluck
+  - Woodwinds have breath noise, brass has velocity brightness
+  - Bass instruments have sub-oscillators, synth presets have filter envelopes
+  - Piano has velocity-to-brightness and subtle hammer noise
+- Signal chain: saturation → tremolo → distortion → chorus → phaser → highpass → lowpass → delay → reverb
+- Song #21: Cinematic Showcase (Orchestral)
+
+## 0.31.0
+
+- 3 new synth engines: Karplus-Strong pluck, Hammond organ, string ensemble with body formants
+- 38 instrument presets: `score.part("lead", instrument="violin")`
+- Keys, strings, woodwinds, brass, plucked, synth, and mallet categories
+- 13 total synth waveforms
+
 ## 0.30.0
 
 - Drums are a real Part — same effects pipeline as any voice

docs/guide/drums.rst

@@ -10,7 +10,7 @@ the genre -- they tell the listener's body how to move before a single
 melodic note is played.
 
 PyTheory includes a complete drum system -- 27 synthesized percussion
-sounds, 58 pattern presets across dozens of genres, and 21 fill presets.
+sounds, 80+ pattern presets across dozens of genres, and 21 fill presets.
 Every sound is generated from waveforms; no samples needed.
 
 Drum Sounds
@@ -145,8 +145,8 @@ Each sound has a dedicated synthesizer:
 Pattern Presets
 ---------------
 
-58 patterns spanning genres from rock to Afro-Cuban to electronic.
-Load them with ``Pattern.preset()``:
+80+ patterns spanning genres from rock to Afro-Cuban to electronic to
+world percussion. Load them with ``Pattern.preset()``:
 
 .. code-block:: pycon
 
@@ -193,9 +193,16 @@ adds syncopation.
 rattling hi-hats of trap, the breakneck tempo of drum and bass. These
 patterns were born in drum machines and they still live there.
 
-**Metal/Punk:** metal, blast beat, punk -- Speed and aggression.
-The blast beat is both feet and both hands going as fast as humanly
-possible. Punk strips everything to its essentials.
+**Metal/Punk:** metal, blast beat, punk, double kick, metal blast,
+metal groove, metal gallop -- Speed and aggression. The blast beat is
+both feet and both hands going as fast as humanly possible. Punk strips
+everything to its essentials. The metal kit adds 3 dedicated sounds
+(double kick, china cymbal, stack) and 4 patterns for extreme metal
+subgenres.
+
+**World Percussion:** tabla, dhol, dholak, mridangam, djembe -- Deep
+traditions from across the globe, each with authentic sound sets and
+idiomatic patterns. See the World Percussion section below for details.
 
 **Other:** funk, hip hop, bo diddley, second line, new orleans, waltz,
 12/8 blues, country, gospel, flamenco -- Everything else. The syncopated
@@ -304,6 +311,128 @@ drum pattern and all named parts are mixed together by ``play_score()``:
 
    play_score(score)
 
+World Percussion
+----------------
+
+PyTheory includes dedicated sound sets and pattern presets for
+traditional percussion instruments from around the world. Each
+instrument has its own synthesized sounds that capture the timbral
+character of the real instrument, plus idiomatic rhythmic patterns
+drawn from their musical traditions.
+
+Tabla
+~~~~~
+
+The tabla is a pair of hand drums from the Indian subcontinent -- the
+smaller, higher-pitched *dayan* and the larger, bass *bayan*. It is
+the rhythmic backbone of Hindustani classical music, and one of the
+most expressive percussion instruments ever created. A single tabla
+player can produce an astonishing range of tones by varying finger
+placement, pressure, and striking technique.
+
+**6 sounds** -- covering the primary tabla strokes (na, tin, tun, ge,
+ke, and ti-ra-ki-ta combinations).
+
+**7 patterns:** teental (16 beats, the most common taal), jhaptaal
+(10 beats), rupak (7 beats), dadra (6 beats), keherwa (8 beats, folk
+and light classical), tabla solo, and tiri kita (fast ornamental
+pattern).
+
+.. code-block:: python
+
+   score = Score("4/4", bpm=80)
+   score.drums("teental", repeats=4)
+
+Dhol
+~~~~
+
+The dhol is a double-headed barrel drum from Punjab, played with
+sticks. It is the driving force behind bhangra music -- loud,
+energetic, and physically impossible to sit still to.
+
+**3 sounds** -- bass stroke, treble stroke, and rimshot.
+
+**2 patterns:** bhangra (the classic bhangra groove) and dhol chaal
+(a processional rhythm).
+
+.. code-block:: python
+
+   score = Score("4/4", bpm=160)
+   score.drums("bhangra", repeats=4)
+
+Dholak
+~~~~~~
+
+The dholak is a smaller, lighter two-headed drum used across South
+Asia in folk music, qawwali, and Bollywood. Played with bare hands,
+it produces a warm, melodic tone.
+
+**3 sounds** -- bass, treble, and slap.
+
+**2 patterns:** qawwali (the rhythmic foundation of Sufi devotional
+music) and dholak folk (a general folk groove).
+
+.. code-block:: python
+
+   score = Score("4/4", bpm=120)
+   score.drums("qawwali", repeats=4)
+
+Mridangam
+~~~~~~~~~
+
+The mridangam is a double-headed drum from South India, the
+rhythmic anchor of Carnatic classical music. Its tuning system is
+extraordinarily precise, and its rhythmic vocabulary is among the
+most mathematically complex in the world.
+
+**4 sounds** -- tha, thom, nam, and din.
+
+**2 patterns:** adi talam (the most common Carnatic talam, 8 beats)
+and mridangam korvai (a rhythmic cadence pattern).
+
+.. code-block:: python
+
+   score = Score("4/4", bpm=90)
+   score.drums("adi talam", repeats=4)
+
+Djembe
+~~~~~~
+
+The djembe is a rope-tuned goblet drum from West Africa, capable of
+producing a wide range of tones from deep bass to sharp slaps. It is
+central to the drum ensemble traditions of Mali, Guinea, and Senegal.
+
+**3 sounds** -- bass (open center strike), tone (edge strike), and
+slap (sharp edge strike).
+
+**3 patterns:** djembe (a basic accompanying rhythm), kuku (a
+traditional rhythm from Guinea associated with fishing), and soli (a
+solo/celebration rhythm).
+
+.. code-block:: python
+
+   score = Score("4/4", bpm=120)
+   score.drums("djembe", repeats=4)
+
+Metal Kit
+~~~~~~~~~
+
+A dedicated percussion kit for extreme metal subgenres, with
+specialized sounds and patterns that go beyond the standard drum kit.
+
+**3 sounds** -- double kick (triggered, tight attack), china cymbal,
+and stack (a short, trashy cymbal choke).
+
+**4 patterns:** double kick (relentless double bass drum pattern),
+metal blast (blast beat with china cymbal accents), metal groove (a
+half-time groove with double kick fills), and metal gallop (the
+classic triplet-feel gallop rhythm).
+
+.. code-block:: python
+
+   score = Score("4/4", bpm=200)
+   score.drums("metal blast", repeats=4)
+
 MIDI Export
 -----------
 

docs/guide/effects.rst

@@ -32,13 +32,27 @@ It's a well-tested order that sounds good by default.
 
 Effects are applied in this fixed order::
 
-    Signal --> Distortion --> Chorus --> Lowpass Filter --> Delay --> Reverb --> Mix
+    Signal --> Saturation --> Tremolo --> Distortion --> Cabinet --> Chorus
+          --> Phaser --> Highpass --> Lowpass --> Delay --> Reverb --> Mix
 
-- **Distortion** first: drives the raw signal before filtering (like
-  plugging a guitar into a fuzz pedal before the amp).
-- **Chorus** second: thickens the distorted signal.
-- **Lowpass** third: shapes the tone (like a tone knob on an amp).
-- **Delay** fourth: echoes the shaped signal (tap delay / tape echo).
+Additionally, these per-note effects are applied before the part effects chain:
+
+- **Sub-oscillator**: octave-below sine mixed in at the oscillator stage
+- **Noise layer**: filtered noise mixed per-note for breath/transients
+- **Filter envelope**: per-note lowpass sweep (attack/decay/sustain)
+- **Velocity → brightness**: harder velocity = brighter filter cutoff
+
+Part-level effects:
+
+- **Saturation** first: subtle even-harmonic warmth (tape/tube color).
+- **Tremolo** second: amplitude LFO modulation.
+- **Distortion** third: drives the signal before filtering.
+- **Cabinet** fourth: speaker cab simulation (rolloff + presence bump).
+- **Chorus** fifth: thickens the signal.
+- **Phaser** sixth: swept allpass notches.
+- **Highpass** seventh: removes low-frequency mud.
+- **Lowpass** eighth: shapes the tone (like a tone knob on an amp).
+- **Delay** ninth: echoes the shaped signal (tap delay / tape echo).
 - **Reverb** last: places everything in a space (room / hall).
 
 Distortion
@@ -83,6 +97,89 @@ Parameters:
        distortion_drive=10.0,
    )
 
+Cabinet Simulation
+------------------
+
+A real guitar amp doesn't just distort the signal -- the speaker
+cabinet shapes the tone dramatically. A 12-inch speaker in a closed
+cabinet rolls off the harsh high frequencies above 5 kHz and adds a
+presence bump around 2--3 kHz that gives the sound its "in the room"
+quality. Without a cabinet, distortion sounds thin and fizzy. With
+one, it sounds like a real amp.
+
+PyTheory's cabinet simulation applies a speaker rolloff curve (lowpass
+at ~5 kHz) combined with a presence resonance bump, placed in the
+signal chain immediately after distortion -- exactly where it sits in
+a real amp.
+
+Parameters:
+
+- ``cabinet``: Wet/dry mix, 0.0--1.0 (default 0, off).
+
+  - 0.3--0.5 = subtle speaker coloring
+  - 0.6--0.8 = classic amp-in-a-room
+  - 1.0 = full cabinet, no dry signal
+
+.. code-block:: python
+
+   # Classic rock amp tone: distortion into cabinet
+   guitar = score.part(
+       "guitar",
+       synth="saw",
+       envelope="pluck",
+       distortion=0.6,
+       distortion_drive=5.0,
+       cabinet=0.8,
+   )
+
+   # Clean amp with just cabinet warmth (no distortion)
+   clean = score.part(
+       "clean",
+       synth="triangle",
+       envelope="pluck",
+       cabinet=0.5,
+   )
+
+Analog Drift
+------------
+
+Real analog synthesizers are never perfectly in tune. The voltage-
+controlled oscillators drift slightly over time as components warm up
+and temperature fluctuates. This imperfection is actually a big part
+of why vintage analog synths sound so appealing -- the subtle pitch
+wandering gives each note a unique, living quality that static digital
+oscillators lack.
+
+The ``analog_drift`` parameter adds slow, random pitch variation to
+each oscillator, modeling this vintage behavior.
+
+Parameters:
+
+- ``analog_drift``: Drift amount, 0.0--1.0 (default 0, off).
+
+  - 0.05--0.1 = subtle warmth (studio-grade analog)
+  - 0.15--0.25 = noticeable drift (vintage gear warming up)
+  - 0.3+ = unstable, wobbly (broken tape machine)
+
+.. code-block:: python
+
+   # Warm vintage pad
+   pad = score.part(
+       "pad",
+       synth="supersaw",
+       envelope="pad",
+       analog_drift=0.1,
+       chorus=0.3,
+   )
+
+   # Lo-fi detuned lead
+   lead = score.part(
+       "lead",
+       synth="saw",
+       envelope="pluck",
+       analog_drift=0.25,
+   )
+
 Chorus
 ------
 
@@ -498,6 +595,221 @@ whole mix will gasp for air:
        delay=0.2,
    )
 
+Saturation
+----------
+
+Saturation is the warm, subtle harmonic enhancement of analog tape
+machines and tube preamps. Unlike distortion (which uses ``tanh`` and
+adds harsh odd harmonics), saturation uses a polynomial waveshaper
+that adds even harmonics -- 2nd and 4th -- which the ear perceives as
+warmth and fullness. It's why records mixed through a Neve console
+sound "bigger" than the same mix done in the box.
+
+Parameters:
+
+- ``saturation``: Amount, 0.0--1.0 (default 0, off).
+
+  - 0.05--0.15 = subtle analog warmth (tape machine)
+  - 0.2--0.4 = noticeable color (tube preamp)
+  - 0.5+ = heavy coloring
+
+.. code-block:: python
+
+   # Warm up a bass
+   bass = score.part("bass", synth="saw", saturation=0.2)
+
+   # Glue a string ensemble
+   strings = score.part("strings", instrument="string_ensemble",
+                        saturation=0.1)
+
+Tremolo
+-------
+
+Amplitude modulation by a sine LFO. The classic vibrating-amp sound.
+Essential for vibraphone (the rotating discs in the resonator tubes),
+Rhodes electric piano, and surf guitar. Not to be confused with
+vibrato (pitch modulation).
+
+Parameters:
+
+- ``tremolo_depth``: Modulation depth, 0.0--1.0 (default 0, off).
+- ``tremolo_rate``: LFO speed in Hz (default 5.0).
+
+  - 3--5 Hz = classic tremolo
+  - 5--7 Hz = vibraphone motor speed
+  - 8+ Hz = ring-mod territory
+
+.. code-block:: python
+
+   # Classic Fender amp tremolo
+   guitar = score.part("guitar", synth="saw", envelope="pluck",
+                       tremolo_depth=0.3, tremolo_rate=4.0)
+
+   # Vibraphone with motor
+   vib = score.part("vib", instrument="vibraphone")  # built in
+
+Phaser
+------
+
+A chain of allpass filters whose center frequencies are swept by an
+LFO, creating moving notches in the spectrum. The classic "jet
+engine" or "underwater" effect. Think Small Stone, MXR Phase 90, or
+the intro to "Eruption." Different from chorus -- chorus adds a
+detuned copy, phaser cancels specific frequencies.
+
+Parameters:
+
+- ``phaser``: Wet/dry mix, 0.0--1.0 (default 0, off).
+- ``phaser_rate``: LFO sweep speed in Hz (default 0.5).
+
+  - 0.1--0.3 = slow, lush sweep
+  - 0.5--1.0 = classic phaser
+  - 2.0+ = fast, Leslie-like
+
+.. code-block:: python
+
+   # Slow sweep on a pad
+   pad = score.part("pad", synth="supersaw", envelope="pad",
+                    phaser=0.4, phaser_rate=0.2)
+
+   # Leslie sim on organ (built in)
+   organ = score.part("organ", instrument="organ")
+
+Highpass Filter
+---------------
+
+The opposite of lowpass -- removes low-frequency content below the
+cutoff. Useful for cleaning up mud from pads, keeping multiple bass
+parts from masking each other, or thinning out a sound to sit better
+in a mix.
+
+Parameters:
+
+- ``highpass``: Cutoff frequency in Hz (0 = off).
+
+  - 80--150 Hz = clean up sub rumble
+  - 200--400 Hz = thin out a pad
+  - 500+ Hz = telephone / radio effect
+
+- ``highpass_q``: Resonance / Q factor (default 0.707).
+
+.. code-block:: python
+
+   # Clean up sub rumble from a pad
+   pad = score.part("pad", synth="supersaw", highpass=120)
+
+   # Thin out rhythm guitar to leave room for bass
+   rhythm = score.part("rhythm", synth="saw", highpass=250)
+
+Filter Envelope
+---------------
+
+A per-note lowpass filter whose cutoff sweeps over time. This is the
+core of subtractive synthesis -- the reason a Moog bass goes "bwow"
+instead of "boop." The filter opens on the attack and closes during
+decay, giving each note a distinctive timbral shape.
+
+Parameters:
+
+- ``filter_amount``: Sweep range in Hz (0 = off). How far the filter
+  opens above the base cutoff.
+- ``filter_attack``: Time to reach peak cutoff, in seconds (default 0.01).
+- ``filter_decay``: Time to fall to sustain level (default 0.3).
+- ``filter_sustain``: Sustain level as fraction of amount, 0.0--1.0
+  (default 0.0 = filter closes completely after decay).
+
+.. code-block:: python
+
+   # Classic synth bass "bwow"
+   bass = score.part("bass", instrument="synth_bass")  # built in
+
+   # Acid squelch
+   acid = score.part("acid", instrument="acid_bass")  # built in
+
+   # Custom filter sweep on a lead
+   lead = score.part("lead", synth="saw",
+                     filter_amount=4000, filter_attack=0.01,
+                     filter_decay=0.4, filter_sustain=0.1)
+
+Velocity to Brightness
+~~~~~~~~~~~~~~~~~~~~~~
+
+Real instruments get brighter when played harder. ``vel_to_filter``
+maps note velocity to filter cutoff boost, so louder notes have more
+high-frequency content.
+
+- ``vel_to_filter``: Cutoff boost in Hz at max velocity (default 0, off).
+
+.. code-block:: python
+
+   # Piano: soft = mellow, loud = bright
+   piano = score.part("piano", instrument="piano")  # built in
+
+   # Manual: custom velocity mapping on a lead
+   lead = score.part("lead", synth="saw", vel_to_filter=3000)
+
+Sub-Oscillator
+--------------
+
+An octave-below sine wave mixed in with the main oscillator. Adds
+low-end weight without muddiness -- the sub fills in the fundamental
+while the main oscillator provides harmonic character above.
+
+- ``sub_osc``: Mix level, 0.0--1.0 (default 0, off).
+
+  - 0.1--0.2 = subtle weight (tuba, bass guitar)
+  - 0.3--0.5 = heavy sub (808, synth bass)
+
+.. code-block:: python
+
+   # Fat 808 kick-bass
+   bass = score.part("bass", instrument="808_bass")  # built in
+
+   # Add weight to any part
+   lead = score.part("lead", synth="saw", sub_osc=0.3)
+
+Noise Layer
+-----------
+
+White noise mixed into each note, following the same amplitude
+envelope. Adds breath for woodwinds, hammer/felt noise for piano,
+bow rosin for strings, and attack transients for percussion.
+
+- ``noise_mix``: Mix level, 0.0--1.0 (default 0, off).
+
+  - 0.02--0.04 = subtle texture (strings, piano)
+  - 0.05--0.08 = noticeable breath (woodwinds)
+  - 0.1+ = heavy air/texture
+
+.. code-block:: python
+
+   # Breathy flute
+   flute = score.part("flute", instrument="flute")  # noise_mix=0.08
+
+   # Add air to any synth
+   pad = score.part("pad", synth="supersaw", noise_mix=0.05)
+
+Configurable FM
+---------------
+
+The FM synth now accepts ``fm_ratio`` and ``fm_index`` parameters,
+letting you dial in specific FM timbres instead of using the defaults.
+
+- ``fm_ratio``: Modulator frequency as multiple of carrier (default 2.0).
+  Integer ratios = harmonic timbres; non-integer = metallic/inharmonic.
+- ``fm_index``: Modulation depth (default 3.0). Higher = more harmonics.
+
+.. code-block:: python
+
+   # Warm electric piano (low ratio, low index)
+   ep = score.part("ep", synth="fm", fm_ratio=1.0, fm_index=1.5)
+
+   # Bright metallic bell (high ratio, high index)
+   bell = score.part("bell", synth="fm", fm_ratio=3.5, fm_index=5.0)
+
+   # Glockenspiel
+   glock = score.part("glock", instrument="glockenspiel")  # built in
+
 Automation
 ----------
 
@@ -528,9 +840,10 @@ processes each section independently:
    lead.set(lowpass=4000, distortion=0.7, reverb=0.3)
    lead.arpeggio("Gm", bars=4, pattern="updown", octaves=2)
 
-Any parameter can be automated: ``lowpass``, ``lowpass_q``, ``reverb``,
-``reverb_decay``, ``delay``, ``delay_time``, ``delay_feedback``,
-``distortion``, ``distortion_drive``, ``chorus``, ``volume``.
+Any parameter can be automated: ``lowpass``, ``lowpass_q``, ``highpass``,
+``reverb``, ``reverb_decay``, ``delay``, ``delay_time``, ``delay_feedback``,
+``distortion``, ``distortion_drive``, ``chorus``, ``phaser``, ``phaser_rate``,
+``saturation``, ``tremolo_depth``, ``tremolo_rate``, ``volume``.
 
 LFO Automation
 --------------

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 10 built-in waveforms and 8 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.
 
@@ -233,7 +233,7 @@ shapes the amplitude over time for natural-sounding notes:
 - **Sustain** -- the held volume while the note is on.
 - **Release** -- how quickly it fades to silence after the note ends.
 
-PyTheory includes 8 presets:
+PyTheory includes 10 presets:
 
 .. code-block:: python
 
@@ -247,6 +247,8 @@ PyTheory includes 8 presets:
    play(tone, envelope=Envelope.ORGAN)     # Instant on/off, no shaping
    play(tone, envelope=Envelope.BELL)      # Instant attack, long ring
    play(tone, envelope=Envelope.STRINGS)   # Gradual bow attack
+   play(tone, envelope=Envelope.BOWED)     # Bow bite into sustain
+   play(tone, envelope=Envelope.MALLET)    # Strike with ringing sustain
    play(tone, envelope=Envelope.STACCATO)  # Short and punchy
    play(tone, envelope=Envelope.NONE)      # Raw waveform, no shaping
 
@@ -260,8 +262,10 @@ Name             Character
 ``"pluck"``      Sharp attack, fast decay -- guitar pick, harp
 ``"pad"``        Slow fade in, lush sustain -- strings, synth pads
 ``"organ"``      Instant on/off -- Hammond organ, no shaping
-``"bell"``       Instant attack, long ring -- vibraphone, tubular
+``"bell"``       Instant attack, no sustain -- short metallic ring
 ``"strings"``    Gradual bow attack -- orchestral strings, slow
+``"bowed"``      Bow bite into sustain -- solo strings, brass
+``"mallet"``     Strike with ringing sustain -- vibraphone, celesta
 ``"staccato"``   Short and punchy -- funk stabs, percussive hits
 ``"none"``       Raw waveform, no amplitude shaping at all
 ===============  ================================================
@@ -341,6 +345,313 @@ Reverb is also stereo — the left and right channels get different
 early reflection patterns, so the reverb tail occupies real space
 in the stereo field rather than sitting dead center.
 
+Physical Modeling
+-----------------
+
+Three synths go beyond traditional waveform synthesis into physical
+modeling territory — they simulate how real instruments produce sound.
+
+Karplus-Strong Pluck
+~~~~~~~~~~~~~~~~~~~~
+
+A burst of noise fed into a short delay line. The delay length sets
+the pitch, the feedback filter models the string decaying. This is
+how every physical modeling synth since 1983 does plucked strings.
+It sounds genuinely like a real guitar, harp, or koto.
+
+.. code-block:: python
+
+   guitar = score.part("guitar", synth="pluck_synth")
+   harp = score.part("harp", instrument="harp")  # uses pluck_synth
+
+Hammond Organ
+~~~~~~~~~~~~~
+
+Additive synthesis with drawbar harmonics — sine waves at the
+fundamental plus 2nd, 3rd, 4th, 5th, 6th, and 8th harmonics mixed
+at musical levels. Warm, round, unmistakably organ.
+
+.. code-block:: python
+
+   organ = score.part("organ", synth="organ_synth")
+
+String Ensemble
+~~~~~~~~~~~~~~~
+
+Filtered sawtooth with body resonance formants at ~500 Hz and ~1500 Hz,
+modeling the way a violin or cello body shapes the sound. Warmer and
+more "wooden" than a raw saw wave.
+
+.. code-block:: python
+
+   violin = score.part("violin", synth="strings_synth")
+
+Dedicated Instrument Synths
+--------------------------
+
+Beyond the classic and physical modeling waveforms, PyTheory includes
+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 30.
+
+Piano Synth
+~~~~~~~~~~~
+
+Hammer-strike envelope with body resonance and subtle inharmonicity.
+Models the way a felt hammer excites steel strings inside a wooden
+soundboard.
+
+.. code-block:: python
+
+   piano = score.part("piano", synth="piano_synth")
+
+Bass Guitar Synth
+~~~~~~~~~~~~~~~~~
+
+Plucked string model with finger-damped harmonics and low-end warmth.
+
+.. code-block:: python
+
+   bass = score.part("bass", synth="bass_guitar_synth")
+
+Flute Synth
+~~~~~~~~~~~~
+
+Breathy noise excitation through a resonant tube model, with
+overblowing behavior at higher velocities.
+
+.. code-block:: python
+
+   flute = score.part("flute", synth="flute_synth")
+
+Trumpet Synth
+~~~~~~~~~~~~~
+
+Brass lip-buzz model with spectral brightness that increases with
+velocity, plus a characteristic brassy edge from shaped harmonics.
+
+.. code-block:: python
+
+   trumpet = score.part("trumpet", synth="trumpet_synth")
+
+Clarinet Synth
+~~~~~~~~~~~~~~
+
+Cylindrical bore model producing mostly odd harmonics, giving the
+characteristic hollow, woody tone.
+
+.. code-block:: python
+
+   clarinet = score.part("clarinet", synth="clarinet_synth")
+
+Oboe Synth
+~~~~~~~~~~~
+
+Double-reed model with nasal formant shaping and a buzzy, penetrating
+timbre.
+
+.. code-block:: python
+
+   oboe = score.part("oboe", synth="oboe_synth")
+
+Marimba Synth
+~~~~~~~~~~~~~
+
+Tuned bar model with a soft mallet attack and a warm, resonant decay
+that emphasizes the fundamental.
+
+.. code-block:: python
+
+   marimba = score.part("marimba", synth="marimba_synth")
+
+Harpsichord Synth
+~~~~~~~~~~~~~~~~~
+
+Plucked-string model with a bright, immediate attack and rapid decay
+-- the characteristic "plink" of a quill plucking a string.
+
+.. code-block:: python
+
+   harpsi = score.part("harpsi", synth="harpsichord_synth")
+
+Cello Synth
+~~~~~~~~~~~
+
+Bowed string model with body formants at cello resonance frequencies,
+producing a rich, warm, sustained tone.
+
+.. code-block:: python
+
+   cello = score.part("cello", synth="cello_synth")
+
+Harp Synth
+~~~~~~~~~~
+
+Plucked string with longer sustain and gentle high-frequency rolloff,
+modeling nylon strings on a resonant frame.
+
+.. code-block:: python
+
+   harp = score.part("harp", synth="harp_synth")
+
+Upright Bass Synth
+~~~~~~~~~~~~~~~~~~
+
+Pizzicato double bass with woody body resonance and a thumpy low end.
+
+.. code-block:: python
+
+   bass = score.part("bass", synth="upright_bass_synth")
+
+Acoustic Guitar Synth
+~~~~~~~~~~~~~~~~~~~~~
+
+Steel-string model with pick transient, body resonance, and natural
+string decay.
+
+.. code-block:: python
+
+   guitar = score.part("guitar", synth="acoustic_guitar_synth")
+
+Electric Guitar Synth
+~~~~~~~~~~~~~~~~~~~~~
+
+Magnetic pickup model with brighter harmonics and less body resonance
+than the acoustic, ready for effects processing.
+
+.. code-block:: python
+
+   eguitar = score.part("eguitar", synth="electric_guitar_synth")
+
+Sitar Synth
+~~~~~~~~~~~~
+
+Sympathetic string resonance with the characteristic buzzy "jawari"
+bridge, producing a shimmering, metallic sustain.
+
+.. code-block:: python
+
+   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
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+All waveform synths support the ``analog_drift`` parameter, which adds
+subtle, slow random pitch variation to each oscillator -- modeling the
+voltage instability of vintage analog circuits. This is what makes a
+real Minimoog sound slightly different on every note, and why analog
+synths feel "alive" compared to their digital counterparts.
+
+.. code-block:: python
+
+   # Subtle vintage drift
+   pad = score.part("pad", synth="saw", analog_drift=0.1)
+
+   # More pronounced, wobbly analog character
+   lead = score.part("lead", synth="square", analog_drift=0.3)
+
+Drift values:
+
+- **0.05--0.1** = subtle warmth (studio-grade analog)
+- **0.15--0.25** = noticeable drift (vintage gear warming up)
+- **0.3+** = unstable, wobbly (broken tape machine)
+
+Instrument Presets
+------------------
+
+Instead of choosing synth + envelope + effects manually, use an
+instrument preset — 40+ predefined combinations that approximate real
+instruments:
+
+.. code-block:: python
+
+   piano = score.part("piano", instrument="piano")
+   violin = score.part("violin", instrument="violin")
+   guitar = score.part("guitar", instrument="acoustic_guitar")
+   organ = score.part("organ", instrument="organ")
+   bass = score.part("bass", instrument="upright_bass")
+
+Available instruments:
+
+**Keys**: piano, electric_piano, organ, harpsichord, celesta, music_box
+
+**Strings**: violin, viola, cello, contrabass, string_ensemble
+
+**Woodwinds**: flute, clarinet, oboe, bassoon
+
+**Brass**: trumpet, trombone, french_horn, tuba, brass_ensemble
+
+**Plucked**: acoustic_guitar, electric_guitar, distorted_guitar,
+bass_guitar, upright_bass, harp, sitar, koto
+
+**Synth**: synth_lead, synth_pad, synth_bass, acid_bass, 808_bass
+
+**Percussion**: vibraphone, marimba, xylophone, glockenspiel, tubular_bells
+
+Explicit kwargs override preset defaults:
+
+.. code-block:: python
+
+   # Piano with extra reverb
+   piano = score.part("piano", instrument="piano", reverb=0.5)
+
+   # Violin panned left
+   violin = score.part("v", instrument="violin", pan=-0.4)
+
 Choosing Synth and Envelope Combos
 ----------------------------------
 

docs/index.rst

@@ -77,12 +77,18 @@ 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** — 10 waveforms, 8 envelopes, detune, stereo pan/spread,
-  58 drum patterns (stereo panned), 21 fills
+- **Synthesis** — 30 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
+  pan/spread, strumming, 80+ drum patterns (stereo panned, including world
+  percussion), 21 fills
 - **Effects** — reverb (algorithmic + 7 convolution IRs, stereo), delay,
-  lowpass (with resonance), distortion, chorus, sidechain compression,
+  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
 
 
@@ -45,18 +46,15 @@ def bossa_nova_girl():
     score = Score("4/4", bpm=140)
     score.drums("bossa nova", repeats=4)
 
-    rhodes = score.part("rhodes", synth="fm", envelope="piano",
+    rhodes = score.part("rhodes", instrument="electric_piano",
                         volume=0.3, pan=-0.3,
-                        reverb=0.4, reverb_decay=1.8, reverb_type="plate",
-                        detune=8, humanize=0.2)
-    lead = score.part("lead", synth="triangle", envelope="pluck",
+                        reverb=0.4, reverb_decay=1.8, reverb_type="plate")
+    lead = score.part("lead", instrument="flute",
                       volume=0.45, pan=0.3,
                       delay=0.25, delay_time=0.32, delay_feedback=0.35,
-                      reverb=0.2, reverb_type="plate",
-                      humanize=0.2)
-    bass = score.part("bass", synth="sine", envelope="pluck",
-                      volume=0.45, pan=0.0, lowpass=600,
-                      humanize=0.15)
+                      reverb=0.2, reverb_type="plate")
+    bass = score.part("bass", instrument="upright_bass",
+                      volume=0.45, pan=0.0, lowpass=600)
 
     for sym in ["Am", "Am", "Dm", "Dm", "E7", "E7", "Am", "Am"]:
         rhodes.add(Chord.from_symbol(sym), Duration.WHOLE)
@@ -90,19 +88,16 @@ def bebop_in_bb():
     score = Score("4/4", bpm=160)
     score.drums("bebop", repeats=8, fill="jazz", fill_every=8)
 
-    rhodes = score.part("rhodes", synth="fm", envelope="piano",
+    rhodes = score.part("rhodes", instrument="electric_piano",
                         volume=0.25, pan=-0.3,
-                        reverb=0.35, reverb_decay=1.2, reverb_type="plate",
-                        detune=8, humanize=0.2)
-    lead = score.part("lead", synth="saw", envelope="pluck",
+                        reverb=0.35, reverb_decay=1.2, reverb_type="plate")
+    lead = score.part("lead", instrument="trumpet",
                       volume=0.4, pan=0.25,
                       lowpass=4000, lowpass_q=1.1,
                       delay=0.15, delay_time=0.19, delay_feedback=0.25,
-                      reverb=0.15, reverb_type="plate",
-                      humanize=0.2)
-    bass = score.part("bass", synth="triangle", envelope="pluck",
-                      volume=0.4, pan=0.0, lowpass=500,
-                      humanize=0.15)
+                      reverb=0.15, reverb_type="plate")
+    bass = score.part("bass", instrument="upright_bass",
+                      volume=0.4, pan=0.0, lowpass=500)
 
     for sym in ["Bb", "Gm", "Cm", "F7"] * 2:
         rhodes.add(Chord.from_symbol(sym), Duration.WHOLE)
@@ -148,14 +143,12 @@ def salsa_descarga():
                       volume=0.2, pan=-0.35,
                       reverb=0.3, reverb_type="plate", lowpass=2000,
                       detune=10, humanize=0.2)
-    lead = score.part("lead", synth="saw", envelope="pluck",
+    lead = score.part("lead", instrument="trumpet",
                       volume=0.4, pan=0.3,
                       delay=0.2, delay_time=0.167, delay_feedback=0.3,
-                      reverb=0.15, reverb_type="plate",
-                      humanize=0.2)
-    bass = score.part("bass", synth="pulse", envelope="pluck",
-                      volume=0.45, pan=0.0, lowpass=500, lowpass_q=1.3,
-                      humanize=0.15)
+                      reverb=0.15, reverb_type="plate")
+    bass = score.part("bass", instrument="synth_bass",
+                      volume=0.45, pan=0.0, lowpass=500, lowpass_q=1.3)
 
     for sym in ["Em7b5", "A7", "Dm7", "Bbmaj7"] * 2:
         pads.add(Chord.from_symbol(sym), Duration.WHOLE)
@@ -191,20 +184,17 @@ def afrobeat_groove():
     score = Score("4/4", bpm=115)
     score.drums("afrobeat", repeats=8, fill="afrobeat", fill_every=8)
 
-    pads = score.part("pads", synth="supersaw", envelope="pad",
+    pads = score.part("pads", instrument="synth_pad",
                       volume=0.2, pan=-0.3,
                       reverb=0.4, reverb_decay=2.0, reverb_type="cathedral",
-                      lowpass=3000, detune=10, spread=0.6,
-                      humanize=0.2)
-    lead = score.part("lead", synth="saw", envelope="pluck",
+                      lowpass=3000)
+    lead = score.part("lead", instrument="trumpet",
                       volume=0.4, pan=0.3,
                       lowpass=3000, lowpass_q=1.0,
                       delay=0.2, delay_time=0.26, delay_feedback=0.3,
-                      reverb=0.15, reverb_type="plate",
-                      humanize=0.2)
-    bass = score.part("bass", synth="sine", envelope="pluck",
-                      volume=0.5, pan=0.0, lowpass=500,
-                      humanize=0.15)
+                      reverb=0.15, reverb_type="plate")
+    bass = score.part("bass", instrument="bass_guitar",
+                      volume=0.5, pan=0.0, lowpass=500)
 
     for sym in ["Em", "Am", "D", "C"] * 2:
         pads.add(Chord.from_symbol(sym), Duration.WHOLE)
@@ -241,14 +231,12 @@ def reggae_one_drop():
                         reverb=0.5, reverb_decay=2.0, reverb_type="cathedral",
                         lowpass=2000, detune=8,
                         humanize=0.2)
-    lead = score.part("lead", synth="triangle", envelope="strings",
+    lead = score.part("lead", instrument="flute",
                       volume=0.4, pan=0.3,
                       delay=0.35, delay_time=0.5625, delay_feedback=0.45,
-                      reverb=0.3, reverb_type="cathedral",
-                      humanize=0.2)
-    bass = score.part("bass", synth="sine", envelope="pluck",
-                      volume=0.55, pan=0.0, lowpass=400, lowpass_q=1.3,
-                      humanize=0.15)
+                      reverb=0.3, reverb_type="cathedral")
+    bass = score.part("bass", instrument="bass_guitar",
+                      volume=0.55, pan=0.0, lowpass=400, lowpass_q=1.3)
 
     for sym in ["G", "C", "D", "C"] * 2:
         chords.add(Chord.from_symbol(sym), Duration.WHOLE)
@@ -286,15 +274,13 @@ def funk_workout():
                         volume=0.25, pan=-0.4,
                         lowpass=2500, reverb=0.15, reverb_type="plate",
                         sidechain=0.4, humanize=0.2)
-    lead = score.part("lead", synth="saw", envelope="pluck",
+    lead = score.part("lead", instrument="synth_lead",
                       volume=0.4, pan=0.35,
                       lowpass=3500, lowpass_q=1.5,
                       delay=0.15, delay_time=0.15, delay_feedback=0.25,
-                      reverb=0.1, reverb_type="plate",
-                      humanize=0.2)
-    bass = score.part("bass", synth="pulse", envelope="pluck",
-                      volume=0.5, pan=0.0, lowpass=600, lowpass_q=1.2,
-                      humanize=0.15)
+                      reverb=0.1, reverb_type="plate")
+    bass = score.part("bass", instrument="synth_bass",
+                      volume=0.5, pan=0.0, lowpass=600, lowpass_q=1.2)
 
     for sym in ["Em", "Am", "D", "B7"] * 2:
         chords.add(Chord.from_symbol(sym), Duration.WHOLE)
@@ -332,18 +318,16 @@ def blues_shuffle():
     score = Score("12/8", bpm=70)
     score.drums("12/8 blues", repeats=6)
 
-    chords = score.part("chords", synth="fm", envelope="piano",
+    chords = score.part("chords", instrument="electric_piano",
                         volume=0.3, pan=-0.3,
-                        reverb=0.3, reverb_decay=1.5, reverb_type="plate",
-                        detune=8, humanize=0.2)
-    lead = score.part("lead", synth="saw", envelope="pluck",
+                        reverb=0.3, reverb_decay=1.5, reverb_type="plate")
+    lead = score.part("lead", instrument="trumpet",
                       volume=0.45, pan=0.25,
                       reverb=0.3, reverb_decay=1.2, reverb_type="plate",
                       delay=0.2, delay_time=0.43, delay_feedback=0.3,
-                      lowpass=3500, humanize=0.2)
-    bass = score.part("bass", synth="sine", envelope="pluck",
-                      volume=0.5, pan=0.0, lowpass=500,
-                      humanize=0.15)
+                      lowpass=3500)
+    bass = score.part("bass", instrument="upright_bass",
+                      volume=0.5, pan=0.0, lowpass=500)
 
     for sym in ["A", "A", "D", "D", "E7", "A"]:
         chords.add(Chord.from_symbol(sym), Duration.DOTTED_HALF)
@@ -381,19 +365,16 @@ def samba_de_janeiro():
     score = Score("4/4", bpm=170)
     score.drums("samba", repeats=8, fill="samba", fill_every=8)
 
-    pads = score.part("pads", synth="supersaw", envelope="pad",
+    pads = score.part("pads", instrument="synth_pad",
                       volume=0.2, pan=-0.3,
                       reverb=0.45, reverb_decay=2.0, reverb_type="plate",
-                      lowpass=4000, detune=10, spread=0.5,
-                      humanize=0.2)
-    lead = score.part("lead", synth="triangle", envelope="pluck",
+                      lowpass=4000)
+    lead = score.part("lead", instrument="flute",
                       volume=0.45, pan=0.3,
                       delay=0.2, delay_time=0.176, delay_feedback=0.3,
-                      reverb=0.15, reverb_type="plate",
-                      humanize=0.2)
-    bass = score.part("bass", synth="sine", envelope="pluck",
-                      volume=0.45, pan=0.0, lowpass=500,
-                      humanize=0.15)
+                      reverb=0.15, reverb_type="plate")
+    bass = score.part("bass", instrument="bass_guitar",
+                      volume=0.45, pan=0.0, lowpass=500)
 
     for sym in ["G", "Em", "Am", "D7"] * 2:
         pads.add(Chord.from_symbol(sym), Duration.WHOLE)
@@ -426,18 +407,15 @@ def jazz_waltz():
     score = Score("3/4", bpm=150)
     score.drums("waltz", repeats=16)
 
-    rhodes = score.part("rhodes", synth="fm", envelope="piano",
+    rhodes = score.part("rhodes", instrument="electric_piano",
                         volume=0.3, pan=-0.3,
-                        reverb=0.4, reverb_decay=2.0, reverb_type="cathedral",
-                        detune=8, humanize=0.2)
-    lead = score.part("lead", synth="triangle", envelope="strings",
+                        reverb=0.4, reverb_decay=2.0, reverb_type="cathedral")
+    lead = score.part("lead", instrument="flute",
                       volume=0.4, pan=0.25,
                       reverb=0.3, reverb_decay=1.5, reverb_type="plate",
-                      delay=0.2, delay_time=0.4, delay_feedback=0.3,
-                      humanize=0.2)
-    bass = score.part("bass", synth="sine", envelope="pluck",
-                      volume=0.4, pan=0.0, lowpass=500,
-                      humanize=0.15)
+                      delay=0.2, delay_time=0.4, delay_feedback=0.3)
+    bass = score.part("bass", instrument="upright_bass",
+                      volume=0.4, pan=0.0, lowpass=500)
 
     for _ in range(2):
         for sym in ["Fmaj7", "Gm", "C7", "Fmaj7"]:
@@ -471,20 +449,19 @@ def house_anthem():
     score = Score("4/4", bpm=124)
     score.drums("house", repeats=8, fill="house", fill_every=8)
 
-    pads = score.part("pads", synth="supersaw", envelope="pad",
+    pads = score.part("pads", instrument="synth_pad",
                       volume=0.25, pan=-0.3,
                       reverb=0.5, reverb_decay=2.5, reverb_type="cathedral",
-                      lowpass=5000, detune=12, spread=0.7,
-                      sidechain=0.6, humanize=0.2)
-    lead = score.part("lead", synth="saw", envelope="staccato",
+                      lowpass=5000,
+                      sidechain=0.6)
+    lead = score.part("lead", instrument="synth_lead",
                       volume=0.35, pan=0.3,
                       lowpass=2000, lowpass_q=2.0,
                       delay=0.2, delay_time=0.242, delay_feedback=0.35,
-                      reverb=0.15, reverb_type="plate",
-                      humanize=0.2)
-    bass = score.part("bass", synth="sine", envelope="pluck",
-                      volume=0.55, pan=0.0, lowpass=300,
-                      sidechain=0.5, humanize=0.15)
+                      reverb=0.15, reverb_type="plate")
+    bass = score.part("bass", instrument="808_bass",
+                      volume=0.55, pan=0.0,
+                      sidechain=0.5)
 
     for sym in ["Cm", "Ab", "Bb", "Cm"] * 2:
         pads.add(Chord.from_symbol(sym), Duration.WHOLE)
@@ -538,14 +515,12 @@ def dub_kingston():
                         reverb=0.6, reverb_decay=2.5, reverb_type="cathedral",
                         lowpass=1500, lowpass_q=0.9, detune=8,
                         humanize=0.2)
-    lead = score.part("lead", synth="triangle", envelope="strings",
+    lead = score.part("lead", instrument="flute",
                       volume=0.4, pan=0.3,
                       delay=0.45, delay_time=0.625, delay_feedback=0.5,
-                      reverb=0.35, reverb_decay=2.0, reverb_type="cathedral",
-                      humanize=0.2)
-    bass = score.part("bass", synth="sine", envelope="pluck",
-                      volume=0.6, pan=0.0, lowpass=400, lowpass_q=1.5,
-                      humanize=0.15)
+                      reverb=0.35, reverb_decay=2.0, reverb_type="cathedral")
+    bass = score.part("bass", instrument="bass_guitar",
+                      volume=0.6, pan=0.0, lowpass=400, lowpass_q=1.5)
     siren = score.part("siren", synth="pwm_slow", envelope="pad",
                        volume=0.15, pan=0.5,
                        reverb=0.7, reverb_decay=3.0, reverb_type="cathedral",
@@ -585,20 +560,20 @@ def techno_minimal():
     score = Score("4/4", bpm=130)
     score.drums("techno", repeats=8, fill="house", fill_every=8)
 
-    pad = score.part("pad", synth="supersaw", envelope="pad",
+    pad = score.part("pad", instrument="synth_pad",
                      volume=0.2, pan=-0.3,
                      reverb=0.5, reverb_decay=3.0, reverb_type="cathedral",
-                     lowpass=3000, detune=12, spread=0.7,
-                     sidechain=0.6, humanize=0.2)
+                     lowpass=3000,
+                     sidechain=0.6)
     lead = score.part("lead", synth="pwm_fast", envelope="staccato",
                       volume=0.35, pan=0.3,
                       lowpass=1500, lowpass_q=3.0,
                       delay=0.3, delay_time=0.231, delay_feedback=0.4,
                       reverb=0.1, reverb_type="plate",
                       humanize=0.2)
-    bass = score.part("bass", synth="sine", envelope="pluck",
-                      volume=0.55, pan=0.0, lowpass=250,
-                      sidechain=0.5, humanize=0.15)
+    bass = score.part("bass", instrument="808_bass",
+                      volume=0.55, pan=0.0,
+                      sidechain=0.5)
 
     for sym in ["Fm", "Db", "Eb", "Fm"] * 2:
         pad.add(Chord.from_symbol(sym), Duration.WHOLE)
@@ -624,18 +599,15 @@ def gospel_shuffle():
     score = Score("4/4", bpm=108)
     score.drums("gospel", repeats=8, fill="buildup", fill_every=8)
 
-    organ = score.part("organ", synth="fm", envelope="organ",
+    organ = score.part("organ", instrument="organ",
                        volume=0.3, pan=-0.3,
-                       reverb=0.45, reverb_decay=2.0, reverb_type="cathedral",
-                       detune=8, humanize=0.2)
-    lead = score.part("lead", synth="triangle", envelope="pluck",
+                       reverb=0.45, reverb_decay=2.0, reverb_type="cathedral")
+    lead = score.part("lead", instrument="flute",
                       volume=0.4, pan=0.3,
                       delay=0.2, delay_time=0.278, delay_feedback=0.3,
-                      reverb=0.2, reverb_type="plate",
-                      humanize=0.2)
-    bass = score.part("bass", synth="sine", envelope="pluck",
-                      volume=0.45, pan=0.0, lowpass=500,
-                      humanize=0.15)
+                      reverb=0.2, reverb_type="plate")
+    bass = score.part("bass", instrument="upright_bass",
+                      volume=0.45, pan=0.0, lowpass=500)
 
     for sym in ["C", "Am", "F", "G"] * 2:
         organ.add(Chord.from_symbol(sym), Duration.WHOLE)
@@ -691,20 +663,18 @@ def dub_delay_madness():
                         volume=0.15, pan=-0.4,
                         reverb=0.7, reverb_decay=3.0, reverb_type="cathedral",
                         lowpass=1200, detune=8, humanize=0.2)
-    bass = score.part("bass", synth="sine", envelope="pluck",
-                      volume=0.6, pan=0.0, lowpass=350, lowpass_q=1.5,
-                      humanize=0.15)
+    bass = score.part("bass", instrument="bass_guitar",
+                      volume=0.6, pan=0.0, lowpass=350, lowpass_q=1.5)
     siren = score.part("siren", synth="pwm_slow", envelope="pad",
                        volume=0.12, pan=0.5,
                        reverb=0.8, reverb_decay=4.0, reverb_type="cathedral",
                        delay=0.4, delay_time=0.88, delay_feedback=0.6,
                        lowpass=900, detune=10)
     # Melodica stabs — sparse, lots of delay
-    melodica = score.part("melodica", synth="triangle", envelope="pluck",
+    melodica = score.part("melodica", instrument="flute",
                           volume=0.35, pan=0.3,
                           delay=0.6, delay_time=0.66, delay_feedback=0.55,
-                          reverb=0.5, reverb_decay=2.5, reverb_type="cathedral",
-                          humanize=0.2)
+                          reverb=0.5, reverb_decay=2.5, reverb_type="cathedral")
 
     for sym in ["Em", "Em", "Am", "Am", "Em", "Em", "Bm", "Em"]:
         chords.add(Chord.from_symbol(sym), Duration.WHOLE)
@@ -741,19 +711,16 @@ def drum_and_bass():
     score = Score("4/4", bpm=174)
     score.drums("drum and bass", repeats=8, fill="buildup", fill_every=8)
 
-    pads = score.part("pads", synth="supersaw", envelope="pad",
+    pads = score.part("pads", instrument="synth_pad",
                       volume=0.25, pan=-0.3,
                       reverb=0.5, reverb_decay=2.5, reverb_type="plate",
-                      lowpass=4000, detune=10, spread=0.6,
-                      humanize=0.2)
-    lead = score.part("lead", synth="triangle", envelope="strings",
+                      lowpass=4000)
+    lead = score.part("lead", instrument="flute",
                       volume=0.4, pan=0.3,
                       delay=0.3, delay_time=0.172, delay_feedback=0.4,
-                      reverb=0.25, reverb_type="plate",
-                      humanize=0.2)
-    bass = score.part("bass", synth="sine", envelope="pluck",
-                      volume=0.55, pan=0.0, lowpass=300,
-                      humanize=0.15)
+                      reverb=0.25, reverb_type="plate")
+    bass = score.part("bass", instrument="808_bass",
+                      volume=0.55, pan=0.0)
 
     for sym in ["Am", "F", "C", "G"] * 2:
         pads.add(Chord.from_symbol(sym), Duration.WHOLE)
@@ -787,25 +754,24 @@ def drake_vibes():
     score = Score("4/4", bpm=68)
     score.drums("trap", repeats=8, fill="trap", fill_every=8)
 
-    pads = score.part("pads", synth="supersaw", envelope="pad",
+    pads = score.part("pads", instrument="synth_pad",
                       volume=0.2, pan=-0.25,
                       reverb=0.5, reverb_decay=3.0, reverb_type="cathedral",
-                      lowpass=2500, detune=12, spread=0.6,
-                      sidechain=0.4, humanize=0.2)
-    bells = score.part("bells", synth="fm", envelope="bell",
+                      lowpass=2500,
+                      sidechain=0.4)
+    bells = score.part("bells", instrument="vibraphone",
                        volume=0.3, pan=0.4,
                        reverb=0.4, reverb_decay=2.0, reverb_type="plate",
-                       delay=0.25, delay_time=0.44, delay_feedback=0.35,
-                       humanize=0.2)
+                       delay=0.25, delay_time=0.44, delay_feedback=0.35)
     lead = score.part("lead", synth="pwm_slow", envelope="strings",
                       volume=0.35, pan=-0.2,
                       reverb=0.3, reverb_type="cathedral", lowpass=2000,
                       delay=0.2, delay_time=0.88, delay_feedback=0.3,
                       humanize=0.2)
-    bass = score.part("bass", synth="sine", envelope="pluck",
-                      volume=0.6, pan=0.0, lowpass=200, lowpass_q=1.8,
+    bass = score.part("bass", instrument="808_bass",
+                      volume=0.6, pan=0.0,
                       distortion=0.4, distortion_drive=2.0,
-                      sidechain=0.3, humanize=0.15)
+                      sidechain=0.3)
 
     for sym in ["Ebm", "B", "Gb", "Db"] * 2:
         pads.add(Chord.from_symbol(sym), Duration.WHOLE)
@@ -858,14 +824,14 @@ def neon_grid():
     score._drum_pattern_beats = max(score._drum_pattern_beats, 32.0)
 
     sky = score.part(
-        "sky", synth="supersaw", envelope="pad",
+        "sky", instrument="synth_pad",
         volume=0.18, pan=0.0,
         detune=30, spread=1.0,
         reverb=0.6, reverb_decay=3.5,
         chorus=0.3, sidechain=0.5,
     )
     acid_l = score.part(
-        "acid_l", synth="saw", envelope="pad",
+        "acid_l", instrument="acid_bass",
         volume=0.35, pan=-0.7,
         legato=True, glide=0.025,
         distortion=0.9, distortion_drive=12.0,
@@ -875,7 +841,7 @@ def neon_grid():
     acid_l.lfo("lowpass", rate=0.5, min=400, max=3000, bars=8, shape="sine")
 
     acid_r = score.part(
-        "acid_r", synth="saw", envelope="pad",
+        "acid_r", instrument="acid_bass",
         volume=0.3, pan=0.7,
         legato=True, glide=0.02,
         distortion=0.85, distortion_drive=10.0,
@@ -885,7 +851,7 @@ def neon_grid():
     acid_r.lfo("lowpass", rate=0.33, min=500, max=2500, bars=8, shape="triangle")
 
     sub = score.part(
-        "sub", synth="sine", envelope="pluck",
+        "sub", instrument="808_bass",
         volume=0.55, pan=0.0,
         lowpass=160, sidechain=0.85, sidechain_release=0.08,
     )
@@ -896,12 +862,12 @@ def neon_grid():
         detune=15, spread=0.7,
     )
     bell_l = score.part(
-        "bell_l", synth="fm", envelope="bell",
+        "bell_l", instrument="vibraphone",
         volume=0.1, pan=-1.0,
         reverb=0.7, reverb_decay=3.0,
     )
     bell_r = score.part(
-        "bell_r", synth="fm", envelope="bell",
+        "bell_r", instrument="vibraphone",
         volume=0.1, pan=1.0,
         reverb=0.7, reverb_decay=3.0,
         delay=0.2, delay_time=0.8, delay_feedback=0.4,
@@ -1026,14 +992,14 @@ def dance_party():
             score._drum_hits.append(_Hit(DrumSound.KICK, bar * 4.0 + beat, 120))
     score._drum_pattern_beats = max(score._drum_pattern_beats, 32.0)
 
-    bass = score.part("bass", synth="square", envelope="pluck",
+    bass = score.part("bass", instrument="synth_bass",
                       volume=0.45, lowpass=500, lowpass_q=1.3,
                       sidechain=0.75, sidechain_release=0.12)
-    sparkle = score.part("sparkle", synth="fm", envelope="bell",
+    sparkle = score.part("sparkle", instrument="vibraphone",
                          volume=0.3, pan=0.4, reverb=0.3, reverb_decay=1.5,
                          delay=0.2, delay_time=0.234, delay_feedback=0.3)
-    chords_part = score.part("chords", synth="supersaw", envelope="pad",
-                             volume=0.2, detune=12, spread=0.7,
+    chords_part = score.part("chords", instrument="synth_pad",
+                             volume=0.2,
                              reverb=0.4, reverb_type="plate", sidechain=0.7)
     fun = score.part("fun", synth="square", envelope="staccato",
                      volume=0.2, pan=-0.5, delay=0.15, delay_time=0.117,
@@ -1080,14 +1046,13 @@ def temple_bell():
     score = Score("4/4", bpm=65)
     score.drums("bolero", repeats=8)
 
-    koto = score.part("koto", synth="triangle", envelope="pluck",
+    koto = score.part("koto", instrument="koto",
                       volume=0.45, pan=0.2,
-                      reverb=0.5, reverb_type="taj_mahal",
-                      humanize=0.3)
+                      reverb=0.5, reverb_type="taj_mahal")
     drone = score.part("drone", synth="sine", envelope="pad",
                        volume=0.15, reverb=0.6, reverb_type="taj_mahal",
                        chorus=0.15, chorus_rate=0.2)
-    bell = score.part("bell", synth="fm", envelope="bell",
+    bell = score.part("bell", instrument="vibraphone",
                       volume=0.1, pan=-0.6,
                       reverb=0.8, reverb_type="taj_mahal")
 
@@ -1116,6 +1081,476 @@ def temple_bell():
     play_song(score)
 
 
+def cinematic_showcase():
+    """Cinematic orchestral showcase — tubular bells, strings, organ, harp, acid bass."""
+    score = Score("4/4", bpm=100)
+
+    # Tubular bells — dramatic intro
+    bells = score.part("bells", instrument="tubular_bells",
+                       reverb=0.5, reverb_type="cathedral")
+    bells.add("A3", Duration.WHOLE)
+    for _ in range(7):
+        bells.rest(Duration.WHOLE)
+
+    # String ensemble — lush wide pad
+    strings = score.part("strings", instrument="string_ensemble",
+                         reverb=0.4, reverb_type="hall")
+    strings.rest(Duration.WHOLE)
+    for sym in ["Am", "F", "C", "G", "Dm", "Am", "E"]:
+        strings.add(Chord.from_symbol(sym), Duration.WHOLE)
+
+    # Cello — deep foundation
+    cello = score.part("cello", instrument="cello",
+                       reverb=0.3, reverb_type="hall")
+    cello.rest(Duration.WHOLE)
+    for n in ["A2", "F2", "C3", "G2", "D3", "A2", "E2"]:
+        cello.add(n, Duration.WHOLE)
+
+    # Violin — legato melody enters bar 3
+    violin = score.part("violin", instrument="violin",
+                        reverb=0.25, reverb_type="hall", legato=True)
+    violin.rest(Duration.WHOLE)
+    violin.rest(Duration.WHOLE)
+    for note, dur in [
+        ("E5", Duration.HALF), ("C5", Duration.HALF),
+        ("D5", Duration.QUARTER), ("E5", Duration.QUARTER), ("G5", Duration.HALF),
+        ("A5", Duration.HALF), ("G5", Duration.QUARTER), ("E5", Duration.QUARTER),
+        ("F5", Duration.WHOLE),
+        ("E5", Duration.HALF), ("D5", Duration.HALF),
+        ("C5", Duration.HALF), ("B4", Duration.HALF),
+        ("A4", Duration.WHOLE),
+    ]:
+        violin.add(note, dur)
+
+    # Organ — enters halfway, cathedral weight
+    organ = score.part("organ", instrument="organ",
+                       reverb=0.3, reverb_type="cathedral")
+    for _ in range(4):
+        organ.rest(Duration.WHOLE)
+    for sym in ["Dm", "Am", "E", "Am"]:
+        organ.add(Chord.from_symbol(sym), Duration.WHOLE)
+
+    # Harp — arpeggiated flourishes bars 3-4
+    harp = score.part("harp", instrument="harp")
+    harp.rest(Duration.WHOLE)
+    harp.rest(Duration.WHOLE)
+    for n in ["A3", "C4", "E4", "A4", "C5", "E5", "A5", "E5",
+              "G3", "B3", "D4", "G4", "B4", "D5", "G5", "D5"]:
+        harp.add(n, Duration.EIGHTH)
+    for _ in range(4):
+        harp.rest(Duration.WHOLE)
+
+    # Vibraphone — shimmer in last bars with delay
+    vib = score.part("vib", instrument="vibraphone",
+                     delay=0.25, delay_time=0.375, delay_feedback=0.35)
+    for _ in range(5):
+        vib.rest(Duration.WHOLE)
+    for note, dur in [
+        ("E5", Duration.QUARTER), ("D5", Duration.QUARTER),
+        ("C5", Duration.QUARTER), ("A4", Duration.QUARTER),
+        ("B4", Duration.HALF), ("E5", Duration.HALF),
+        ("A5", Duration.WHOLE),
+    ]:
+        vib.add(note, dur)
+
+    # Acid bass — gritty texture bars 4-5
+    acid = score.part("acid", instrument="acid_bass")
+    for _ in range(3):
+        acid.rest(Duration.WHOLE)
+    for n in ["C2", "C2", "E2", "G2", "G2", "G2", "A2", "E2",
+              "D2", "D2", "F2", "A2", "A2", "A2", "E2", "E2"]:
+        acid.add(n, Duration.EIGHTH)
+    for _ in range(2):
+        acid.rest(Duration.WHOLE)
+
+    # Half time drums
+    score.drums("half time", repeats=8)
+
+    play_song(score, "Cinematic Showcase — A minor")
+
+
+def greensleeves():
+    """Greensleeves — Renaissance lute, meantone tuning, A=415 Hz."""
+    score = Score("3/4", bpm=120, temperament="meantone", reference_pitch=415.0)
+
+    lute = score.part("lute", instrument="acoustic_guitar",
+                      reverb=0.3, reverb_type="taj_mahal")
+
+    melody = [
+        ("A4", 1.0, 80),
+        ("C5", 2.0, 85),   ("D5", 1.0, 80),
+        ("E5", 3.0, 90),
+        ("F5", 1.0, 75),   ("E5", 2.0, 85),
+        ("D5", 1.0, 80),
+        ("B4", 3.0, 85),
+        ("G4", 1.0, 70),   ("B4", 2.0, 80),
+        ("C5", 1.0, 75),
+        ("A4", 3.0, 85),
+        ("A4", 1.0, 70),   ("A4", 2.0, 75),
+        ("G#4", 1.0, 70),
+        ("A4", 2.0, 80),   ("B4", 1.0, 75),
+        ("G4", 3.0, 85),
+        ("E4", 1.0, 70),
+        ("A4", 3.0, 90),
+    ]
+
+    for note, dur, vel in melody:
+        lute.add(note, dur, velocity=vel)
+
+    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.5, 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.35, 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.4, 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.45, reverb_type=REV)
+    oboe = score.part("oboe", instrument="oboe", volume=0.22,
+                       reverb=0.4, reverb_type=REV)
+    flute = score.part("flute", instrument="flute", volume=0.18,
+                        reverb=0.4, 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.35, 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.45, 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)")
+
+
 SONGS = {
     "1": ("Bossa Nova in A minor", bossa_nova_girl),
     "2": ("Bebop in Bb major", bebop_in_bb),
@@ -1137,6 +1572,10 @@ SONGS = {
     "18": ("Glass and Silk (Sine+Triangle)", glass_and_silk),
     "19": ("Dance Party at the Reitz House", dance_party),
     "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),
 }
 
 if __name__ == "__main__":
@@ -1150,7 +1589,7 @@ if __name__ == "__main__":
             print(f"    {key:>2}. {name}")
 
         print()
-        choice = input("  Pick a song (1-20, or 'all'): ").strip()
+        choice = input("  Pick a song (1-24, or 'all'): ").strip()
         print()
 
         if choice == "all":

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pytheory"
-version = "0.30.0"
+version = "0.35.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,9 +1,9 @@
 """PyTheory: Music Theory for Humans."""
 
-__version__ = "0.30.0"
+__version__ = "0.35.1"
 
 from .tones import Tone, Interval
-from .systems import System, SYSTEMS
+from .systems import System, SYSTEMS, TET
 from .scales import TonedScale, Key, PROGRESSIONS
 from .chords import Chord, Fretboard, analyze_progression
 from .charts import CHARTS, Fingering, charts_for_fretboard
@@ -21,7 +21,7 @@ Scale = TonedScale
 __all__ = [
     "Tone", "Note", "Interval", "Scale", "TonedScale", "Key",
     "PROGRESSIONS", "Chord", "Fretboard", "Fingering", "analyze_progression",
-    "System", "SYSTEMS", "CHARTS", "charts_for_fretboard",
+    "System", "SYSTEMS", "TET", "CHARTS", "charts_for_fretboard",
     "play", "save", "save_midi", "play_progression", "play_pattern",
     "play_score", "Synth", "Envelope",
     "Duration", "TimeSignature", "RhythmNote", "Rest", "Score", "Part",

pytheory/_statics.py

@@ -1,4 +1,4 @@
-from pytuning import scales
+import math
 
 REFERENCE_A = 440
 
@@ -6,10 +6,60 @@ REFERENCE_A = 440
 # Scientific pitch notation changes octave at C, not A, so this offset
 # is needed for all octave arithmetic.
 C_INDEX = 3
+
+
+# ── 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.
+    """
+    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 _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,
 }
 
 TONES = {
@@ -220,6 +270,547 @@ INDIAN_SCALES = {
     }
 }
 
+# ── 22-shruti Indian system ──────────────────────────────────────────────────
+# The shruti system divides the octave into 22 microtonal steps, capturing
+# the melodic nuances that 12-TET cannot represent. Each of the 7 swaras
+# has multiple shruti positions (e.g. komal Re at shruti 2, shuddha Re at
+# shruti 4). 22-TET is the standard equal-tempered approximation.
+#
+# Ordered from Dha (=A) to match Western index positions (Sa at index 5 ≈ C).
+TONES_SHRUTI = [
+    ("Dha",),               #  0 — A  — shuddha dhaivat (reference = 440 Hz)
+    ("atikomal Ni",),       #  1 — shruti between Dha and komal Ni
+    ("komal Ni",),          #  2 — Bb — komal nishad
+    ("shuddha Ni",),        #  3 — between komal Ni and Ni
+    ("Ni",),                #  4 — B  — shuddha (kakali) nishad
+    ("Sa",),                #  5 — C  — shadja (tonic)
+    ("atikomal Re",),       #  6 — shruti between Sa and komal Re
+    ("komal Re",),          #  7 — Db — komal rishabh
+    ("shuddha Re",),        #  8 — between komal Re and Re
+    ("Re",),                #  9 — D  — chatushruti rishabh
+    ("atikomal Ga",),       # 10 — shruti between Re and komal Ga
+    ("komal Ga",),          # 11 — Eb — komal gandhar
+    ("Ga",),                # 12 — E  — antara gandhar
+    ("tivra Ga",),          # 13 — shruti between Ga and Ma
+    ("Ma",),                # 14 — F  — shuddha madhyam
+    ("ekashruti Ma",),      # 15 — shruti between Ma and tivra Ma
+    ("tivra Ma",),          # 16 — F# — tivra madhyam
+    ("atitivra Ma",),       # 17 — shruti between tivra Ma and Pa
+    ("Pa",),                # 18 — G  — pancham
+    ("atikomal Dha",),      # 19 — shruti between Pa and komal Dha
+    ("komal Dha",),         # 20 — Ab — komal dhaivat
+    ("shuddha Dha",),       # 21 — shruti between komal Dha and Dha
+]
+
+DEGREES_SHRUTI = [
+    ("shadja", ("bilawal",)),       # Sa — tonic
+    ("rishabh", ("marwa",)),        # Re
+    ("gandhar", ("bhairavi",)),     # Ga
+    ("madhyam", ("kalyan",)),       # Ma
+    ("pancham", ("kafi",)),         # Pa
+    ("dhaivat", ("asavari",)),      # Dha
+    ("nishad", ("khamaj",)),        # Ni
+    ("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.
+# Compare to the 12-TET approximations in INDIAN_SCALES which lose
+# the distinction between 2-shruti and 3-shruti steps.
+SHRUTI_SCALES = {
+    "chromatic": (22, {}),
+    "thaat": [
+        7,
+        {
+            # Bilawal (≈ Ionian) — Sa Re Ga Ma Pa Dha Ni
+            "bilawal": {"intervals": (4, 3, 2, 4, 4, 3, 2)},
+            # Khamaj (≈ Mixolydian) — Sa Re Ga Ma Pa Dha komal-Ni
+            "khamaj": {"intervals": (4, 3, 2, 4, 4, 1, 4)},
+            # Kafi (≈ Dorian) — Sa Re komal-Ga Ma Pa Dha komal-Ni
+            "kafi": {"intervals": (4, 2, 3, 4, 4, 1, 4)},
+            # Asavari (≈ Aeolian) — Sa Re komal-Ga Ma Pa komal-Dha komal-Ni
+            "asavari": {"intervals": (4, 2, 3, 4, 2, 3, 4)},
+            # Bhairavi (≈ Phrygian) — Sa komal-Re komal-Ga Ma Pa komal-Dha komal-Ni
+            "bhairavi": {"intervals": (2, 4, 3, 4, 2, 3, 4)},
+            # Bhairav — Sa komal-Re Ga Ma Pa komal-Dha Ni (unique to Indian music)
+            "bhairav": {"intervals": (2, 5, 2, 4, 2, 5, 2)},
+            # Kalyan (≈ Lydian) — Sa Re Ga tivra-Ma Pa Dha Ni
+            "kalyan": {"intervals": (4, 3, 4, 2, 4, 3, 2)},
+            # Marwa — Sa komal-Re Ga tivra-Ma Pa Dha Ni (unique)
+            "marwa": {"intervals": (2, 5, 4, 2, 4, 3, 2)},
+            # Poorvi — Sa komal-Re Ga tivra-Ma Pa komal-Dha Ni (unique)
+            "poorvi": {"intervals": (2, 5, 4, 2, 2, 5, 2)},
+            # Todi — Sa komal-Re komal-Ga tivra-Ma Pa komal-Dha Ni (unique)
+            "todi": {"intervals": (2, 4, 5, 2, 2, 5, 2)},
+        },
+    ],
+    "pentatonic": [
+        5,
+        {
+            # Bhupali (≈ major pentatonic) — Sa Re Ga Pa Dha
+            "bhupali": {"intervals": (4, 3, 6, 4, 5)},
+            # Malkauns — Sa komal-Ga Ma komal-Dha komal-Ni
+            "malkauns": {"intervals": (6, 3, 4, 5, 4)},
+            # Durga — Sa Re Ma Pa Dha
+            "durga": {"intervals": (4, 5, 4, 4, 5)},
+            # Bhairavi pentatonic — Sa komal-Re Ma Pa komal-Ni
+            "bhairavi pentatonic": {"intervals": (2, 7, 4, 2, 7)},
+        },
+    ],
+}
+
+# ── 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
+    ("Sib",),               #  2 — Bb
+    ("Si↓",),               #  3 — B quarter-flat
+    ("Si",),                #  4 — B
+    ("Do",),                #  5 — C
+    ("Do↑",),               #  6 — C quarter-sharp
+    ("Reb",),               #  7 — Db
+    ("Re↓",),               #  8 — D quarter-flat
+    ("Re",),                #  9 — D
+    ("Re↑",),               # 10 — D quarter-sharp
+    ("Mib",),               # 11 — Eb
+    ("Mi↓",),               # 12 — E quarter-flat
+    ("Mi",),                # 13 — E
+    ("Fa",),                # 14 — F
+    ("Fa↑",),               # 15 — F quarter-sharp
+    ("Fa#",),               # 16 — F#
+    ("Sol↓",),              # 17 — G quarter-flat
+    ("Sol",),               # 18 — G
+    ("Sol↑",),              # 19 — G quarter-sharp
+    ("Lab",),               # 20 — Ab
+    ("La↓",),               # 21 — A quarter-flat
+    ("La½b",),              # 22 — between Ab and A (rarely used)
+    ("La♮",),               # 23 — enharmonic A (rarely used)
+]
+
+DEGREES_ARABIC_24 = [
+    ("tonic", ()),
+    ("second", ()),
+    ("third", ()),
+    ("fourth", ()),
+    ("fifth", ()),
+    ("sixth", ()),
+    ("seventh", ()),
+    ("octave", ()),
+]
+
+# 24-TET maqam scales with true quarter-tone intervals.
+# Each step = 1 quarter-tone (50 cents). A 12-TET semitone = 2 steps.
+ARABIC_24_SCALES = {
+    "chromatic": (24, {}),
+    "maqam": [
+        7,
+        {
+            # Rast — the foundational maqam. E and B are quarter-flat.
+            # Do Re Mi↓ Fa Sol La Si↓ Do
+            "rast": {"intervals": (4, 3, 3, 4, 4, 3, 3)},
+            # Bayati — starts on D with quarter-flat 2nd.
+            # Re Mi↓ Fa Sol La Sib Do Re
+            "bayati": {"intervals": (3, 3, 4, 4, 2, 4, 4)},
+            # Saba — similar to Bayati with flattened 4th
+            "saba": {"intervals": (3, 3, 2, 6, 2, 4, 4)},
+            # Sikah — starts on E quarter-flat
+            "sikah": {"intervals": (3, 4, 3, 4, 3, 4, 3)},
+            # Hijaz — augmented 2nd (6 quarter-tones) between 2nd and 3rd
+            "hijaz": {"intervals": (2, 6, 2, 4, 2, 4, 4)},
+            # Nahawand (≈ harmonic minor)
+            "nahawand": {"intervals": (4, 2, 4, 4, 2, 6, 2)},
+            # Ajam (≈ major)
+            "ajam": {"intervals": (4, 4, 2, 4, 4, 4, 2)},
+            # Kurd (≈ Phrygian)
+            "kurd": {"intervals": (2, 4, 4, 4, 2, 4, 4)},
+            # Nikriz — augmented 2nd between 3rd and 4th
+            "nikriz": {"intervals": (4, 2, 6, 2, 4, 2, 4)},
+            # Jiharkah — like Rast but with natural B
+            "jiharkah": {"intervals": (4, 4, 2, 4, 4, 3, 3)},
+        },
+    ],
+}
+
+# ── 5-TET Gamelan Slendro ────────────────────────────────────────────────────
+# Slendro is a 5-tone equal temperament — each step is 240 cents.
+# The actual tuning varies between gamelans (each set is unique), but
+# 5-TET is the theoretical ideal that all slendro tunings approximate.
+# Ordered from nem (≈A) to loosely match Western indexing.
+TONES_SLENDRO = [
+    ("nem",),       # 0 — 6 (≈A)
+    ("ji",),        # 1 — 1 (≈C)
+    ("ro",),        # 2 — 2 (≈D)
+    ("lu",),        # 3 — 3 (≈F)
+    ("mo",),        # 4 — 5 (≈G)
+]
+
+DEGREES_SLENDRO = [
+    ("nem", ()), ("ji", ()), ("ro", ()), ("lu", ()), ("mo", ()),
+]
+
+SLENDRO_SCALES = {
+    "chromatic": (5, {}),
+    "pentatonic": [5, {
+        # The full slendro IS the pentatonic — all 5 tones
+        "slendro": {"intervals": (1, 1, 1, 1, 1)},
+    }],
+}
+
+# ── 9-TET Gamelan Pelog ─────────────────────────────────────────────────────
+# Pelog uses 7 tones from a roughly 9-step division of the octave.
+# 9-TET (133 cents/step) approximates the unequal pelog intervals.
+# The 3 pathet (modes) select 5 tones from the 7.
+TONES_PELOG = [
+    ("nem",),       # 0 — 6
+    ("pi",),        # 1 — 7
+    ("ji",),        # 2 — 1
+    ("ro",),        # 3 — 2
+    ("lu",),        # 4 — 3
+    ("pat",),       # 5 — 4
+    ("barang",),    # 6 — complementary
+    ("mo",),        # 7 — 5
+    ("nem+",),      # 8 — auxiliary
+]
+
+DEGREES_PELOG = [
+    ("nem", ()), ("pi", ()), ("ji", ()), ("ro", ()),
+    ("lu", ()), ("pat", ()), ("barang", ()), ("mo", ()), ("nem+", ()),
+]
+
+PELOG_SCALES = {
+    "chromatic": (9, {}),
+    "heptatonic": [7, {
+        # Full pelog — 7 tones from 9 steps
+        "pelog": {"intervals": (1, 2, 1, 1, 2, 1, 1)},
+    }],
+    "pentatonic": [5, {
+        # Pathet nem — the most common mode
+        "pelog nem": {"intervals": (1, 2, 2, 2, 2)},
+        # Pathet lima
+        "pelog lima": {"intervals": (1, 2, 2, 1, 3)},
+        # Pathet barang
+        "pelog barang": {"intervals": (2, 1, 2, 2, 2)},
+    }],
+}
+
+# ── 7-TET Thai classical ────────────────────────────────────────────────────
+# Thai classical music divides the octave into 7 exactly equal steps
+# (~171 cents each). This is unique — no Western equivalent exists.
+# The 7 tones are numbered 1-7 in Thai theory.
+TONES_THAI = [
+    ("do",),        # 0 — 1st degree
+    ("re",),        # 1 — 2nd
+    ("mi",),        # 2 — 3rd
+    ("fa",),        # 3 — 4th
+    ("sol",),       # 4 — 5th
+    ("la",),        # 5 — 6th
+    ("si",),        # 6 — 7th
+]
+
+DEGREES_THAI = [
+    ("thang 1", ()), ("thang 2", ()), ("thang 3", ()),
+    ("thang 4", ()), ("thang 5", ()), ("thang 6", ()), ("thang 7", ()),
+]
+
+THAI_SCALES = {
+    "chromatic": (7, {}),
+    "pentatonic": [5, {
+        # The standard Thai pentatonic — 5 of 7 equal steps
+        "thai pentatonic": {"intervals": (1, 1, 2, 1, 2)},
+        # Alternate selection
+        "thai pentatonic 2": {"intervals": (2, 1, 1, 2, 1)},
+    }],
+    "heptatonic": [7, {
+        # The full 7-TET scale
+        "thai": {"intervals": (1, 1, 1, 1, 1, 1, 1)},
+    }],
+}
+
+# ── 53-TET Turkish makam (Arel-Ezgi-Uzdilek) ───────────────────────────────
+# The gold standard for Turkish music theory. 53-TET has nearly perfect
+# fifths (31 steps = 701.89 cents vs 701.96 just) and excellent thirds.
+# A comma (1 step) = 22.6 cents. The basic intervals:
+#   Bakiye (B) = 4 commas ≈ 90 cents (like a limma)
+#   Küçük mücenneb (S) = 5 commas ≈ 113 cents
+#   Büyük mücenneb (K) = 8 commas ≈ 181 cents
+#   Tanini (T) = 9 commas ≈ 204 cents (like a whole tone)
+TONES_TURKISH = [
+    ("La",),                #  0 — A (Dügah reference)
+    ("La+1",),              #  1
+    ("La+2",),              #  2
+    ("La+3",),              #  3
+    ("Sib",),               #  4 — Bb (4 commas from A)
+    ("Sib+1",),             #  5
+    ("Sib+2",),             #  6
+    ("Sib+3",),             #  7
+    ("Sib+4",),             #  8
+    ("Si",),                #  9 — B
+    ("Si+1",),              # 10
+    ("Si+2",),              # 11
+    ("Si+3",),              # 12
+    ("Do",),                # 13 — C (Rast)
+    ("Do+1",),              # 14
+    ("Do+2",),              # 15
+    ("Do+3",),              # 16
+    ("Do+4",),              # 17
+    ("Reb",),               # 18 — Db
+    ("Reb+1",),             # 19
+    ("Reb+2",),             # 20
+    ("Reb+3",),             # 21
+    ("Re",),                # 22 — D (Dügah)
+    ("Re+1",),              # 23
+    ("Re+2",),              # 24
+    ("Re+3",),              # 25
+    ("Re+4",),              # 26
+    ("Mib",),               # 27 — Eb
+    ("Mib+1",),             # 28
+    ("Mib+2",),             # 29
+    ("Mib+3",),             # 30
+    ("Mi",),                # 31 — E (Segah)
+    ("Mi+1",),              # 32
+    ("Mi+2",),              # 33
+    ("Mi+3",),              # 34
+    ("Mi+4",),              # 35
+    ("Fa",),                # 36 — F
+    ("Fa+1",),              # 37
+    ("Fa+2",),              # 38
+    ("Fa+3",),              # 39
+    ("Fa#",),               # 40 — F#
+    ("Fa#+1",),             # 41
+    ("Fa#+2",),             # 42
+    ("Fa#+3",),             # 43
+    ("Sol",),               # 44 — G (Neva)
+    ("Sol+1",),             # 45
+    ("Sol+2",),             # 46
+    ("Sol+3",),             # 47
+    ("Lab",),               # 48 — Ab
+    ("Lab+1",),             # 49
+    ("Lab+2",),             # 50
+    ("Lab+3",),             # 51
+    ("Lab+4",),             # 52
+]
+
+DEGREES_TURKISH = [(f"perde {i+1}", ()) for i in range(53)]
+
+# Turkish makam scales in 53-TET commas.
+# T=9 commas (whole tone), S=5 (small), K=8 (large), B=4 (limma)
+TURKISH_SCALES = {
+    "chromatic": (53, {}),
+    "makam": [
+        7,
+        {
+            # Rast — the foundational makam. Uses segah (≈ neutral 3rd)
+            # T + T + S + T + T + T + S = 9+9+5+9+9+9+4 = 53...
+            # Actually: 9+8+5+9+9+8+5 = 53
+            "rast": {"intervals": (9, 8, 5, 9, 9, 8, 5)},
+            # Nihavend (≈ harmonic minor)
+            "nihavend": {"intervals": (9, 4, 9, 9, 4, 13, 5)},
+            # Hicaz — the augmented 2nd makam
+            "hicaz": {"intervals": (5, 12, 5, 9, 4, 9, 9)},
+            # Ussak — one of the most common makams
+            "ussak": {"intervals": (8, 5, 9, 9, 8, 5, 9)},
+            # Huseyni
+            "huseyni": {"intervals": (8, 5, 9, 9, 5, 8, 9)},
+            # Kurdi (≈ Phrygian)
+            "kurdi": {"intervals": (4, 9, 9, 9, 4, 9, 9)},
+            # Segah — starts on the neutral 3rd
+            "segah": {"intervals": (5, 9, 9, 8, 5, 9, 8)},
+            # Saba — descending differs from ascending
+            "saba": {"intervals": (8, 5, 4, 14, 4, 9, 9)},
+            # Hüzzam
+            "huzzam": {"intervals": (5, 9, 8, 5, 9, 8, 9)},
+        },
+    ],
+}
+
+# ── 72-TET Carnatic (South Indian) ───────────────────────────────────────────
+# The 72 melakarta system classifies all possible 7-note scales with
+# fixed Sa and Pa. 72-TET (16.67 cents/step) captures the srutis used
+# in Carnatic music with high precision. Each 12-TET semitone = 6 steps.
+#
+# Tone names: 12 swaras × 6 microtonal variants each.
+# Main swaras at positions: Sa=0, Ri1=6, Ri2=12, Ga1=12, Ga2=18,
+# Ma1=30, Ma2=36, Pa=42, Da1=48, Da2=54, Ni1=60, Ni2=66
+TONES_CARNATIC = []
+_SWARA_NAMES = [
+    "Sa", "atikomal Ri", "komal Ri", "shuddha Ri",
+    "Ri", "tivra Ri", "komal Ga", "atikomal Ga",
+    "Ga", "shuddha Ga", "tivra Ga", "antara Ga",
+    "komal Ma", "shuddha Ma", "Ma", "tivra shuddha Ma",
+    "ekashruti Ma", "chatushruti Ma", "tivra Ma", "atitivra Ma",
+    "prati Ma", "tivratara Ma", "atikomal Pa-", "komal Pa-",
+    "shuddha Pa-", "Pa-", "Pa-+1", "Pa-+2",
+    "Pa-+3", "Pa-+4", "Pa", "Pa+1",
+    "Pa+2", "Pa+3", "Pa+4", "Pa+5",
+    "komal Da", "atikomal Da", "Da-", "shuddha Da-",
+    "Da", "shuddha Da", "tivra Da", "atitivra Da",
+    "komal Ni", "atikomal Ni", "Ni-", "shuddha Ni-",
+    "Ni", "shuddha Ni", "tivra Ni", "chatushruti Ni",
+    "kakali Ni", "atikakali Ni",
+]
+# Generate 72 tone names: use standard names for the 12 main positions,
+# numbered variants for the intermediates
+for i in range(72):
+    main_pos = i // 6  # which semitone group (0-11)
+    micro = i % 6      # microtonal position within group
+    _base_names = ["Sa", "komal Ri", "Ri", "komal Ga", "Ga", "Ma",
+                   "tivra Ma", "Pa", "komal Da", "Da", "komal Ni", "Ni"]
+    if micro == 0:
+        TONES_CARNATIC.append((_base_names[main_pos],))
+    else:
+        TONES_CARNATIC.append((f"{_base_names[main_pos]}+{micro}",))
+
+DEGREES_CARNATIC = [(f"swara {i+1}", ()) for i in range(72)]
+
+# A selection of important melakartas in 72-TET intervals.
+# Each step = 1/72 of an octave ≈ 16.67 cents.
+CARNATIC_SCALES = {
+    "chromatic": (72, {}),
+    "melakarta": [
+        7,
+        {
+            # Kanakangi (melakarta 1) — Sa Ri1 Ga1 Ma1 Pa Da1 Ni1
+            "kanakangi": {"intervals": (6, 6, 18, 12, 6, 6, 18)},
+            # Shankarabharanam (melakarta 29) — Sa Ri2 Ga3 Ma1 Pa Da2 Ni3
+            # The Carnatic equivalent of the major scale
+            "shankarabharanam": {"intervals": (12, 12, 6, 12, 12, 12, 6)},
+            # Kalyani (melakarta 65) — Sa Ri2 Ga3 Ma2 Pa Da2 Ni3
+            # Carnatic Lydian equivalent
+            "kalyani": {"intervals": (12, 12, 12, 6, 12, 12, 6)},
+            # Kharaharapriya (melakarta 22) — Sa Ri2 Ga2 Ma1 Pa Da2 Ni2
+            # Carnatic Dorian equivalent
+            "kharaharapriya": {"intervals": (12, 6, 12, 12, 12, 6, 12)},
+            # Hanumathodi (melakarta 8) — Sa Ri1 Ga2 Ma1 Pa Da1 Ni2
+            # Carnatic Phrygian equivalent
+            "hanumathodi": {"intervals": (6, 12, 12, 12, 6, 12, 12)},
+            # Natabhairavi (melakarta 20) — Sa Ri2 Ga2 Ma1 Pa Da1 Ni2
+            # Natural minor equivalent
+            "natabhairavi": {"intervals": (12, 6, 12, 12, 6, 12, 12)},
+            # Mayamalavagowla (melakarta 15) — Sa Ri1 Ga3 Ma1 Pa Da1 Ni3
+            # The "lesson scale" — first raga taught to students
+            "mayamalavagowla": {"intervals": (6, 18, 6, 12, 6, 18, 6)},
+            # Simhendramadhyamam (melakarta 57) — Sa Ri2 Ga3 Ma2 Pa Da1 Ni3
+            "simhendramadhyamam": {"intervals": (12, 12, 12, 6, 6, 18, 6)},
+            # Charukesi (melakarta 26) — Sa Ri2 Ga3 Ma1 Pa Da1 Ni2
+            "charukesi": {"intervals": (12, 12, 6, 12, 6, 12, 12)},
+            # Harikambhoji (melakarta 28) — Sa Ri2 Ga3 Ma1 Pa Da2 Ni2
+            # Mixolydian equivalent
+            "harikambhoji": {"intervals": (12, 12, 6, 12, 12, 6, 12)},
+        },
+    ],
+}
+
 # Arabic maqam scales (12-TET approximations).
 # True maqam uses quarter-tones; these are the closest 12-tone equivalents.
 ARABIC_SCALES = {

pytheory/cli.py

@@ -230,7 +230,7 @@ def cmd_demo(args):
         {"name": "Bossa Nova", "key": ("A", "minor"), "drums": "bossa nova",
          "fill": "bossa nova", "bpm": 140,
          "prog": ("i", "iv", "V", "i"),
-         "lead": ("triangle", "strings", 0.2, -0.1),
+         "lead": ("pluck_synth", "none", 0.2, -0.1),
          "pad": ("fm", "pad", -0.2),
          "bass_lp": 600, "reverb_type": "plate"},
         {"name": "Jazz Club", "key": ("Bb", "major"), "drums": "jazz",
@@ -254,8 +254,8 @@ def cmd_demo(args):
         {"name": "Reggae", "key": ("G", "major"), "drums": "reggae",
          "fill": "reggae", "bpm": 80,
          "prog": ("I", "IV", "V", "IV"),
-         "lead": ("triangle", "strings", 0.25, 0.15),
-         "pad": ("pwm_slow", "pad", -0.3),
+         "lead": ("pluck_synth", "none", 0.25, 0.15),
+         "pad": ("organ_synth", "organ", -0.3),
          "bass_lp": 400, "reverb_type": "cathedral"},
         {"name": "Funk", "key": ("E", "minor"), "drums": "funk",
          "fill": "funk", "bpm": 100,
@@ -272,9 +272,33 @@ def cmd_demo(args):
         {"name": "Temple", "key": ("E", "minor"), "drums": "bolero",
          "fill": "bossa nova", "bpm": 65,
          "prog": ("i", "iv", "V", "i"),
-         "lead": ("triangle", "pluck", 0.3, 0.2),
-         "pad": ("sine", "pad", 0.0),
+         "lead": ("pluck_synth", "none", 0.3, 0.2),
+         "pad": ("strings_synth", "pad", 0.0),
          "bass_lp": 200, "reverb_type": "taj_mahal"},
+        {"name": "Classical", "key": ("D", "minor"), "drums": "bolero",
+         "fill": "bossa nova", "bpm": 72,
+         "prog": ("i", "iv", "V", "i"),
+         "lead": ("flute_synth", "strings", 0.35, 0.2),
+         "pad": ("cello_synth", "bowed", -0.2),
+         "bass_lp": 400, "reverb_type": "cathedral"},
+        {"name": "Harpsichord Suite", "key": ("A", "minor"), "drums": "bolero",
+         "fill": "bossa nova", "bpm": 92,
+         "prog": ("i", "iv", "V", "i"),
+         "lead": ("harpsichord_synth", "none", 0.2, 0.1),
+         "pad": ("strings_synth", "pad", -0.3),
+         "bass_lp": 500, "reverb_type": "plate"},
+        {"name": "Bhangra", "key": ("G", "minor"), "drums": "bhangra",
+         "fill": "rock", "bpm": 140,
+         "prog": ("i", "iv", "V", "i"),
+         "lead": ("sitar_synth", "none", 0.3, 0.2),
+         "pad": ("strings_synth", "pad", 0.0),
+         "bass_lp": 400, "reverb_type": "taj_mahal"},
+        {"name": "Jazz Trio", "key": ("F", "major"), "drums": "swing",
+         "fill": "jazz", "bpm": 100,
+         "prog": ("I", "vi", "ii", "V"),
+         "lead": ("trumpet_synth", "bowed", 0.3, 0.2),
+         "pad": ("piano_synth", "none", -0.2),
+         "bass_lp": 600, "reverb_type": "plate"},
     ]
 
     mood = random.choice(moods)

pytheory/systems.py

@@ -2,18 +2,58 @@ from ._statics import (
     TEMPERAMENTS, TONES, DEGREES, SCALES,
     INDIAN_SCALES, ARABIC_SCALES, JAPANESE_SCALES,
     BLUES_SCALES, GAMELAN_SCALES, SYSTEMS,
+    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,
+    TONES_TURKISH, DEGREES_TURKISH, TURKISH_SCALES,
+    TONES_CARNATIC, DEGREES_CARNATIC, CARNATIC_SCALES,
 )
 
 
 class System:
-    def __init__(self, *, tone_names, degrees, scales=None):
+    def __init__(self, *, tone_names, degrees, scales=None, c_index=None,
+                 period=2.0, ratios=None):
         self.tone_names = tone_names
 
         self.degrees = degrees
         self._scales = scales
 
+        # Period: the frequency ratio of one "octave" in this system.
+        # 2.0 for standard octave-based systems.
+        # 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).
+        # For non-12-TET systems, this is the index of the tone nearest C,
+        # or 0 if no C equivalent exists.
+        if c_index is not None:
+            self.c_index = c_index
+        else:
+            # Try to find C in the tone names, fall back to 0
+            self.c_index = 0
+            for i, names in enumerate(tone_names):
+                if "C" in names:
+                    self.c_index = i
+                    break
+
         if scales is None:
-            self._scales = SCALES[self.semitones]
+            n = self.semitones
+            if n in SCALES:
+                self._scales = SCALES[n]
+            else:
+                # Generate chromatic scale for unknown sizes
+                self._scales = {
+                    "chromatic": (n, {}),
+                }
 
     @property
     def semitones(self):
@@ -25,13 +65,56 @@ class System:
         return tuple([Tone.from_tuple(tone) for tone in self.tone_names])
 
     def resolve_name(self, name: str) -> str | None:
-        """Resolve a note name (including flats) to the canonical name.
+        """Resolve a note name (including flats, double sharps/flats) to the canonical name.
+
+        Handles enharmonic equivalents:
+        - Standard names and their alternates (e.g. Bb, C#)
+        - Double sharps (C## = D, F## = G)
+        - Double flats (Dbb = C, Ebb = D)
 
         Returns the primary name if found, or None if not recognized.
         """
+        # Direct lookup first
         for names in self.tone_names:
             if name in names:
                 return names[0]
+
+        # Handle double sharps (e.g. C## → D, F## → G)
+        if name.endswith('##') and len(name) >= 3:
+            base = name[:-2]
+            base_idx = self._name_to_index(base)
+            if base_idx is not None:
+                resolved_idx = (base_idx + 2) % len(self.tone_names)
+                return self.tone_names[resolved_idx][0]
+
+        # Handle double flats (e.g. Dbb → C, Ebb → D)
+        if name.endswith('bb') and len(name) >= 3 and name[0] != 'b':
+            base = name[:-2]
+            base_idx = self._name_to_index(base)
+            if base_idx is not None:
+                resolved_idx = (base_idx - 2) % len(self.tone_names)
+                return self.tone_names[resolved_idx][0]
+
+        # Handle single sharps/flats on natural notes (e.g. Cb → B, E# → F)
+        if len(name) == 2:
+            base = name[0]
+            modifier = name[1]
+            base_idx = self._name_to_index(base)
+            if base_idx is not None:
+                if modifier == '#':
+                    resolved_idx = (base_idx + 1) % len(self.tone_names)
+                    return self.tone_names[resolved_idx][0]
+                elif modifier == 'b':
+                    resolved_idx = (base_idx - 1) % len(self.tone_names)
+                    return self.tone_names[resolved_idx][0]
+
+        return None
+
+    def _name_to_index(self, name: str) -> int | None:
+        """Return the index of a tone name, or None if not found."""
+        for i, names in enumerate(self.tone_names):
+            if name in names:
+                return i
         return None
 
 
@@ -136,14 +219,173 @@ 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}>"
 
+
+def TET(n, *, names=None, reference_index=0, period=2.0):
+    """Create an N-tone equal temperament system.
+
+    Each step divides the period into *n* equal parts. The frequency
+    ratio between adjacent tones is ``period^(1/n)``.
+
+    For standard tunings the period is 2.0 (octave). For exotic systems
+    like Bohlen-Pierce, set ``period=3.0`` (tritave).
+
+    Args:
+        n: Number of equal divisions of the octave (e.g. 19, 24, 31, 53).
+        names: Optional list of *n* tone name strings. If omitted,
+            tones are numbered ``"0"`` through ``"n-1"``.
+        reference_index: Index of the tone that corresponds to A440
+            (default 0, meaning tone "0" = A4 = 440 Hz).
+
+    Returns:
+        A :class:`System` instance.
+
+    Example::
+
+        >>> edo19 = TET(19)
+        >>> from pytheory import Tone
+        >>> t = Tone("0", octave=4, system=edo19)
+        >>> t.frequency  # 440.0 Hz (tone 0 = A4)
+        440.0
+
+        >>> edo31 = TET(31)
+        >>> t = Tone("18", octave=4, system=edo31)
+        >>> t.frequency  # 18 steps above A in 31-TET
+    """
+    if names is not None:
+        if len(names) != n:
+            raise ValueError(f"Expected {n} names, got {len(names)}")
+        tone_names = [(name,) for name in names]
+    else:
+        tone_names = [(str(i),) for i in range(n)]
+
+    # Degrees: numbered, with no modal names
+    degrees = [(f"degree {i+1}", ()) for i in range(n)]
+
+    # Scales: chromatic (all steps = 1) plus MOS scales for common EDOs
+    scale_data = {
+        "chromatic": (n, {}),
+    }
+
+    # Add well-known scales for specific EDOs
+    if n == 19:
+        # 19-TET: major and minor have different step sizes
+        # Major: 3 3 2 3 3 3 2 (sums to 19)
+        # Minor: 3 2 3 3 2 3 3
+        scale_data["heptatonic"] = [7, {
+            "major": {"intervals": (3, 3, 2, 3, 3, 3, 2)},
+            "minor": {"intervals": (3, 2, 3, 3, 2, 3, 3)},
+            "harmonic minor": {"intervals": (3, 2, 3, 3, 2, 4, 2)},
+        }]
+        scale_data["pentatonic"] = [5, {
+            "major pentatonic": {"intervals": (3, 3, 5, 3, 5)},
+            "minor pentatonic": {"intervals": (5, 3, 3, 5, 3)},
+        }]
+    elif n == 24:
+        # 24-TET (quarter-tone): standard 12-TET scales with doubled steps
+        scale_data["heptatonic"] = [7, {
+            "major": {"intervals": (4, 4, 2, 4, 4, 4, 2)},
+            "minor": {"intervals": (4, 2, 4, 4, 2, 4, 4)},
+        }]
+    elif n == 31:
+        # 31-TET: excellent approximation of quarter-comma meantone
+        # Major: 5 5 3 5 5 5 3 (sums to 31)
+        # Minor: 5 3 5 5 3 5 5
+        scale_data["heptatonic"] = [7, {
+            "major": {"intervals": (5, 5, 3, 5, 5, 5, 3)},
+            "minor": {"intervals": (5, 3, 5, 5, 3, 5, 5)},
+            "harmonic minor": {"intervals": (5, 3, 5, 5, 3, 7, 3)},
+        }]
+        scale_data["pentatonic"] = [5, {
+            "major pentatonic": {"intervals": (5, 5, 8, 5, 8)},
+            "minor pentatonic": {"intervals": (8, 5, 5, 8, 5)},
+        }]
+    elif n == 53:
+        # 53-TET: nearly perfect fifths and thirds
+        # Major: 9 9 4 9 9 9 4 (sums to 53)
+        scale_data["heptatonic"] = [7, {
+            "major": {"intervals": (9, 9, 4, 9, 9, 9, 4)},
+            "minor": {"intervals": (9, 4, 9, 9, 4, 9, 9)},
+        }]
+
+    # Find C equivalent for c_index (reference_index is A, C is 3 steps in 12-TET)
+    # Proportionally: C is 3/12 of the way around from A
+    c_idx = round(n * 3 / 12) if n != 12 else 3
+
+    return System(
+        tone_names=tone_names,
+        degrees=degrees,
+        scales=scale_data,
+        c_index=c_idx,
+        period=period,
+    )
+
+
+# ── 19-TET named system ──
+# Traditional note names for 19-TET: all 12 western notes plus
+# 7 quarter-tone positions (enharmonic splits)
+_19TET_NAMES = [
+    "A", "A#", "Bb", "B", "B#",
+    "C", "C#", "Db", "D", "D#",
+    "Eb", "E", "E#", "F", "F#",
+    "Gb", "G", "G#", "Ab",
+]
+
+# ── 31-TET named system ──
+# Adriaan Fokker's naming: sharps and flats are distinct pitches
+_31TET_NAMES = [
+    "A", "A↑", "A#", "Bb", "B↓",
+    "B", "B↑", "C", "C↑", "C#",
+    "Db", "D↓", "D", "D↑", "D#",
+    "Eb", "E↓", "E", "E↑", "E#",
+    "F", "F↑", "F#", "Gb", "G↓",
+    "G", "G↑", "G#", "Ab", "A↓",
+    "A♮",  # enharmonic return (distinct from "A" by a diesis)
+]
+
+
 SYSTEMS = {
     "western": System(tone_names=TONES["western"], degrees=DEGREES["western"]),
-    "indian": System(tone_names=TONES["indian"], degrees=DEGREES["indian"], scales=INDIAN_SCALES[12]),
-    "arabic": System(tone_names=TONES["arabic"], degrees=DEGREES["arabic"], scales=ARABIC_SCALES[12]),
+    "indian": System(tone_names=TONES["indian"], degrees=DEGREES["indian"], scales=INDIAN_SCALES[12], c_index=3),
+    "arabic": System(tone_names=TONES["arabic"], degrees=DEGREES["arabic"], scales=ARABIC_SCALES[12], c_index=3),
     "japanese": System(tone_names=TONES["japanese"], degrees=DEGREES["japanese"], scales=JAPANESE_SCALES[12]),
     "blues": System(tone_names=TONES["blues"], degrees=DEGREES["blues"], scales=BLUES_SCALES[12]),
-    "gamelan": System(tone_names=TONES["gamelan"], degrees=DEGREES["gamelan"], scales=GAMELAN_SCALES[12]),
+    "gamelan": System(tone_names=TONES["gamelan"], degrees=DEGREES["gamelan"], scales=GAMELAN_SCALES[12], c_index=3),
+    "19-tet": TET(19, names=_19TET_NAMES),
+    "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, ratios=SHRUTI_RATIOS),
+    "maqam": System(tone_names=TONES_ARABIC_24, degrees=DEGREES_ARABIC_24,
+                    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,
+                    scales=PELOG_SCALES, c_index=2),
+    "thai": System(tone_names=TONES_THAI, degrees=DEGREES_THAI,
+                   scales=THAI_SCALES, c_index=0),
+    "makam": System(tone_names=TONES_TURKISH, degrees=DEGREES_TURKISH,
+                    scales=TURKISH_SCALES, c_index=13),
+    "carnatic": System(tone_names=TONES_CARNATIC, degrees=DEGREES_CARNATIC,
+                       scales=CARNATIC_SCALES, c_index=18),  # Sa ≈ C, 18 steps from A
+    # Bohlen-Pierce: 13 equal divisions of the tritave (3:1).
+    # Genuinely alien — no octaves, no fifths, built on 3:5:7 harmonics.
+    # Used by composers like Heinz Bohlen, Kees van Prooijen, Georg Hajdu.
+    "bohlen-pierce": TET(13, period=3.0, names=[
+        "A", "B", "C", "D", "E", "F", "G",
+        "H", "J", "K", "L", "M", "N",
+    ]),
 }

pytheory/tones.py

@@ -26,17 +26,20 @@ class Tone:
 
     def __init__(
         self,
-        name: str,
+        name,
         *,
         alt_names: Optional[list[str]] = None,
         octave: Optional[int] = None,
         system: Union[str, object] = "western",
+        _validate: bool = True,
     ) -> None:
         """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"``)
@@ -45,16 +48,75 @@ class Tone:
         if alt_names is None:
             alt_names = []
 
-        if isinstance(name, str):
-            try:
-                parsed_octave = int("".join([c for c in filter(str.isdigit, name)]))
-            except ValueError:
-                parsed_octave = None
-
-            if parsed_octave is not None:
-                name = name.replace(str(parsed_octave), "")
+        # 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 = parsed_octave
+                    octave = 4 + extra_octaves
+                else:
+                    octave += extra_octaves
+            name = str(name)
+
+        if isinstance(name, str):
+            # Normalize unicode music symbols to ASCII equivalents
+            name = (name
+                    .replace('\u266f', '#')   # ♯ → #
+                    .replace('\u266d', 'b')   # ♭ → b
+                    .replace('\U0001d12a', '##')  # 𝄪 → ##
+                    .replace('\U0001d12b', 'bb')  # 𝄫 → bb
+                    )
+            # Normalize 'x' / 'X' as double sharp (only after letter name)
+            if len(name) >= 2 and name[1] in ('x', 'X') and name[0].isalpha():
+                name = name[0] + '##' + name[2:]
+
+            # Only parse trailing digits as octave (e.g. "C4" → "C", octave=4).
+            # Digits embedded in the name (e.g. "Mib+1") are NOT octaves.
+            # Numeric pitch class names ("0", "11") are also left alone.
+            if name and name[0].isalpha():
+                import re as _re
+                m = _re.search(r'(\d+)$', name)
+                if m:
+                    parsed_octave = int(m.group(1))
+                    name = name[:m.start()]
+                    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
@@ -68,6 +130,13 @@ class Tone:
             self.system_name = None
             self._system = system
 
+        # Validate tone name against the system early (fixes #39).
+        if _validate and self.system.resolve_name(name) is None:
+            raise ValueError(
+                f"Unknown tone name: {name!r}. "
+                f"Not found in the {system!r} system."
+            )
+
     @property
     def exists(self) -> bool:
         """True if this tone's name is found in the associated system."""
@@ -335,17 +404,20 @@ class Tone:
         Returns:
             A new ``Tone`` instance.
         """
-        try:
-            octave = int("".join([c for c in filter(str.isdigit, s)]))
-        except ValueError:
-            octave = None
-
-        tone = s.replace(str(octave), "") if octave else s
+        import re as _re
+        octave = None
+        tone = s
+        # Only parse trailing digits as octave
+        if s and s[0].isalpha():
+            m = _re.search(r'(\d+)$', s)
+            if m:
+                octave = int(m.group(1))
+                tone = s[:m.start()]
 
         if system:
             return klass(name=tone, octave=octave, system=system)
         else:
-            return klass(name=tone, octave=octave)
+            return klass(name=tone, octave=octave, _validate=False)
 
     @classmethod
     def from_tuple(klass, t: tuple[str, ...]) -> Tone:
@@ -381,19 +453,20 @@ class Tone:
         import math
         if hz <= 0:
             raise ValueError("Frequency must be positive")
-        # Semitones from A4
-        semitones_from_a4 = 12 * math.log2(hz / REFERENCE_A)
-        semitones = round(semitones_from_a4)
-        # A4 is index 0 in the Western system, octave 4
-        # Convert to absolute position from C0
-        a4_from_c0 = ((0 - C_INDEX) % 12) + (4 * 12)  # = 57
-        abs_pos = a4_from_c0 + semitones
-        octave = abs_pos // 12
-        relative = abs_pos % 12
-        index = (relative + C_INDEX) % 12
         if isinstance(system, str):
             from .systems import SYSTEMS
             system = SYSTEMS[system]
+        n = len(system.tone_names)
+        c_idx = getattr(system, 'c_index', C_INDEX)
+        # Steps from A4 in this EDO
+        steps_from_a4 = n * math.log2(hz / REFERENCE_A)
+        steps = round(steps_from_a4)
+        # A4 is index 0, octave 4. Convert to absolute position from C0.
+        a4_from_c0 = ((0 - c_idx) % n) + (4 * n)
+        abs_pos = a4_from_c0 + steps
+        octave = abs_pos // n
+        relative = abs_pos % n
+        index = (relative + c_idx) % n
         return klass.from_index(index, octave=octave, system=system)
 
     @classmethod
@@ -409,13 +482,19 @@ class Tone:
             >>> Tone.from_midi(69)
             <Tone A4>
         """
+        if isinstance(system, str):
+            from .systems import SYSTEMS
+            system = SYSTEMS[system]
+        # MIDI is a 12-TET standard. Convert to Hz and use from_frequency
+        # for non-12 systems.
+        n = len(system.tone_names)
+        if n != 12:
+            hz = REFERENCE_A * (2 ** ((note_number - 69) / 12))
+            return klass.from_frequency(hz, system=system)
         adjusted = note_number - 12  # MIDI C0=12
         octave = adjusted // 12
         relative = adjusted % 12
         index = (relative + C_INDEX) % 12
-        if isinstance(system, str):
-            from .systems import SYSTEMS
-            system = SYSTEMS[system]
         return klass.from_index(index, octave=octave, system=system)
 
     @classmethod
@@ -434,10 +513,27 @@ class Tone:
         """
         tone_names = system.tone_names[i]
         if prefer_flats and len(tone_names) > 1:
-            tone = tone_names[1]  # flat spelling (e.g. "Bb")
+            # Find the first flat spelling (contains 'b' but isn't just 'B')
+            tone = tone_names[0]  # fallback to primary
+            for tn in tone_names[1:]:
+                if 'b' in tn and tn != 'B':
+                    tone = tn
+                    break
         else:
-            tone = tone_names[0]  # sharp spelling (e.g. "A#")
-        return klass(name=tone, octave=octave, system=system)
+            tone = tone_names[0]  # primary spelling
+        # Bypass parsing and validation — name comes from a known system index
+        obj = klass.__new__(klass)
+        obj.name = tone
+        obj.octave = octave
+        obj.alt_names = list(tone_names[1:]) if len(tone_names) > 1 else []
+        obj._frequency = None
+        if isinstance(system, str):
+            obj.system_name = system
+            obj._system = None
+        else:
+            obj.system_name = None
+            obj._system = system
+        return obj
 
     @property
     def _index(self) -> int:
@@ -453,7 +549,15 @@ class Tone:
             canonical = self.system.resolve_name(self.name)
             if canonical is None:
                 raise ValueError(f"Tone {self.name!r} not found in system")
-            return self.system.tones.index(canonical)
+            # Use _name_to_index for direct lookup (avoids creating Tone objects)
+            idx = self.system._name_to_index(canonical)
+            if idx is not None:
+                return idx
+            # Fallback: linear search through tone_names
+            for i, names in enumerate(self.system.tone_names):
+                if canonical in names:
+                    return i
+            raise ValueError(f"Tone {self.name!r} not found in system")
         except AttributeError:
             raise ValueError("Tone index cannot be referenced without a system!")
 
@@ -467,19 +571,21 @@ class Tone:
         octave = self.octave or 0
 
         try:
-            mod = len(self.system.tones)
+            mod = len(self.system.tone_names)
         except AttributeError:
             raise ValueError(
                 "Tone math can only be computed with an associated system!"
             )
 
-        # Convert to absolute semitones from C0
-        note_from_c0 = ((self._index - C_INDEX) % mod) + (octave * mod)
+        c_idx = getattr(self.system, 'c_index', C_INDEX)
+
+        # Convert to absolute steps from C0
+        note_from_c0 = ((self._index - c_idx) % mod) + (octave * mod)
         note_from_c0 += interval
 
         new_octave = note_from_c0 // mod
         relative = note_from_c0 % mod
-        new_index = (relative + C_INDEX) % mod
+        new_index = (relative + c_idx) % mod
 
         return (new_index, new_octave)
 
@@ -530,9 +636,10 @@ class Tone:
             'octave'
         """
         semitones = abs(self - other)
-        octaves = semitones // 12
-        remainder = semitones % 12
-        name = self._INTERVAL_NAMES.get(remainder, f"{remainder} semitones")
+        n = len(self.system.tones)
+        octaves = semitones // n
+        remainder = semitones % n
+        name = self._INTERVAL_NAMES.get(remainder, f"{remainder} steps")
         if octaves == 0:
             return name
         if remainder == 0:
@@ -555,6 +662,12 @@ class Tone:
         """
         if self.octave is None:
             return None
+        n = len(self.system.tones)
+        if n != 12:
+            # Non-12-TET: approximate MIDI via frequency
+            import math
+            hz = self.pitch()
+            return round(69 + 12 * math.log2(hz / REFERENCE_A))
         semitones_from_c0 = ((self._index - C_INDEX) % 12) + (self.octave * 12)
         return semitones_from_c0 + 12  # MIDI C0 = 12 (C-1 = 0)
 
@@ -596,42 +709,43 @@ class Tone:
         return 1200 * math.log2(f2 / f1)
 
     def circle_of_fifths(self) -> list[Tone]:
-        """The 12 tones of the circle of fifths starting from this tone.
+        """The circle of fifths starting from this tone.
 
-        Each step ascends by a perfect fifth (7 semitones). After 12
-        steps you return to the starting tone. The circle of fifths
-        is the backbone of Western harmony — it determines key
-        signatures, chord relationships, and modulation paths.
-
-        Clockwise = add sharps: C → G → D → A → E → B → F# → ...
-        Counter-clockwise = add flats (see ``circle_of_fourths``).
+        Each step ascends by a perfect fifth (7 semitones in 12-TET).
+        After N steps (where N = number of tones in the system) you
+        return to the starting tone. The circle of fifths is the
+        backbone of Western harmony — it determines key signatures,
+        chord relationships, and modulation paths.
 
         Returns:
-            A list of 12 Tones.
+            A list of Tones (12 for Western, N for other systems).
         """
+        n = len(self.system.tones)
+        # Perfect fifth: the closest approximation to 3:2 ratio
+        fifth = round(n * 7 / 12)  # 7 in 12-TET, 11 in 19-TET, 18 in 31-TET
         tones: list[Tone] = []
         t = self
-        for _ in range(12):
+        for _ in range(n):
             tones.append(t)
-            t = t.add(7)
+            t = t.add(fifth)
         return tones
 
     def circle_of_fourths(self) -> list[Tone]:
-        """The 12 tones of the circle of fourths starting from this tone.
+        """The circle of fourths starting from this tone.
 
-        Each step ascends by a perfect fourth (5 semitones) — the
-        reverse direction of the circle of fifths.
-
-        Clockwise = add flats: C → F → Bb → Eb → Ab → ...
+        Each step ascends by a perfect fourth — the reverse direction
+        of the circle of fifths.
 
         Returns:
-            A list of 12 Tones.
+            A list of Tones (12 for Western, N for other systems).
         """
+        n = len(self.system.tones)
+        fourth = round(n * 5 / 12)  # 5 in 12-TET, 8 in 19-TET, 13 in 31-TET
         tones: list[Tone] = []
         t = self
-        for _ in range(12):
+        for _ in range(n):
             tones.append(t)
-            t = t.add(5)
+            t = t.add(fourth)
         return tones
 
     @property
@@ -687,26 +801,39 @@ class Tone:
         precision: Optional[int] = None,
     ) -> float:
         try:
-            tones = len(self.system.tones)
+            tones = len(self.system.tone_names)
         except AttributeError:
             raise ValueError("Pitches can only be computed with an associated system!")
 
-        pitch_scale = TEMPERAMENTS[temperament](tones)
+        # Period ratio: 2.0 for standard octave-based systems,
+        # 3.0 for Bohlen-Pierce (tritave), configurable per system.
+        period = getattr(self.system, 'period', 2.0)
+        c_idx = getattr(self.system, 'c_index', C_INDEX)
+
+        # 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
 
-        note_from_c0 = ((self._index - C_INDEX) % tones) + (octave * tones)
-        a4_from_c0 = ((0 - C_INDEX) % tones) + (4 * tones)  # A4
+        note_from_c0 = ((self._index - c_idx) % tones) + (octave * tones)
+        a4_from_c0 = ((0 - c_idx) % tones) + (4 * tones)  # A4
 
         diff = note_from_c0 - a4_from_c0
         octave_shift = diff // tones
         within_octave = diff % tones
 
-        ratio = pitch_scale[within_octave] * (2 ** octave_shift)
+        ratio = pitch_scale[within_octave] * (period ** octave_shift)
 
         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

@@ -68,9 +68,16 @@ def test_tone_system():
 
 def test_tone_exists():
     c4 = Tone(name="C", octave=4, system="western")
-    invalid_tone = Tone(name="H", octave=4, system="western")
     assert c4.exists is True
-    assert invalid_tone.exists is False
+
+
+def test_tone_invalid_raises():
+    """Invalid tone names raise ValueError at construction time (fixes #39)."""
+    import pytest
+    with pytest.raises(ValueError, match="Unknown tone name"):
+        Tone(name="H", octave=4, system="western")
+    with pytest.raises(ValueError, match="Unknown tone name"):
+        Tone("X")
 
 
 def test_tone_names_method():
@@ -4248,7 +4255,7 @@ def test_parallel_modes_g_major():
 @needs_portaudio
 def test_envelope_enum_presets():
     from pytheory.play import Envelope
-    assert len(Envelope) == 8
+    assert len(Envelope) == 10
     for e in Envelope:
         a, d, s, r = e.value
         assert a >= 0
@@ -4839,10 +4846,11 @@ def test_solfege_no_octave():
     assert t.solfege == "Do"
 
 
-def test_solfege_unknown_returns_name():
-    """A non-standard name should be returned unchanged."""
-    t = Tone(name="X", system="western")
-    assert t.solfege == "X"
+def test_solfege_unknown_raises():
+    """A non-standard name should raise ValueError at construction (fixes #39)."""
+    import pytest
+    with pytest.raises(ValueError, match="Unknown tone name"):
+        Tone(name="X", system="western")
 
 
 # ── Rhythm / Duration system ────────────────────────────────────────────────
@@ -5312,7 +5320,7 @@ def test_supersaw_wave():
 @needs_portaudio
 def test_all_synths_in_enum():
     from pytheory.play import Synth
-    assert len(Synth) == 13
+    assert len(Synth) == 30
     for s in Synth:
         wave = s(440, n_samples=1000)
         assert len(wave) == 1000
@@ -6459,11 +6467,8 @@ def test_instrument_piano():
     from pytheory import Score, Duration
     score = Score("4/4", bpm=120)
     p = score.part("p", instrument="piano")
-    assert p.synth == "fm"
-    assert p.envelope == "piano"
-    assert p.detune == 5
-    assert p.lowpass == 6000
-    assert p.chorus_mix == 0.1
+    assert p.synth == "piano_synth"
+    assert p.vel_to_filter == 3000
 
 
 def test_instrument_violin():
@@ -6471,20 +6476,18 @@ def test_instrument_violin():
     score = Score("4/4", bpm=120)
     p = score.part("v", instrument="violin")
     assert p.synth == "strings_synth"
-    assert p.envelope == "strings"
+    assert p.envelope == "bowed"
     assert p.humanize == 0.15
     assert p.lowpass == 5000
+    assert p.detune == 2
 
 
 def test_instrument_override():
     from pytheory import Score
     score = Score("4/4", bpm=120)
-    # Explicit synth overrides the preset's "fm"
+    # Explicit synth overrides the preset
     p = score.part("p", instrument="piano", synth="saw")
     assert p.synth == "saw"
-    # Other preset values still apply
-    assert p.envelope == "piano"
-    assert p.detune == 5
 
 
 def test_instrument_unknown_raises():
@@ -6512,7 +6515,7 @@ def test_instrument_effects():
     assert p.reverb_mix == 0.3
     assert p.reverb_type == "plate"
     assert p.synth == "fm"
-    assert p.envelope == "bell"
+    assert p.envelope == "mallet"
 
 
 def test_instrument_808_bass():
@@ -6525,3 +6528,387 @@ def test_instrument_808_bass():
     assert p.lowpass_q == 1.5
     assert p.synth == "sine"
     assert p.envelope == "pluck"
+
+
+# ── Non-12-TET / Microtonal systems ─────────────────────────────────────────
+
+from pytheory import TET
+
+
+def test_tet_factory_creates_system():
+    edo17 = TET(17)
+    assert len(edo17.tone_names) == 17
+    assert edo17.semitones == 17
+
+
+def test_tet_factory_numbered_tones():
+    edo17 = TET(17)
+    t = Tone("0", octave=4, system=edo17)
+    assert t.frequency == pytest.approx(440.0, rel=1e-3)
+    # One octave up
+    t_up = t.add(17)
+    assert t_up.frequency == pytest.approx(880.0, rel=1e-3)
+
+
+def test_tet_factory_custom_names():
+    names = ["A", "B", "C", "D", "E"]
+    edo5 = TET(5, names=names)
+    assert len(edo5.tone_names) == 5
+    t = Tone("A", octave=4, system=edo5)
+    assert t.frequency == pytest.approx(440.0, rel=1e-3)
+
+
+def test_tet_factory_wrong_name_count():
+    with pytest.raises(ValueError):
+        TET(5, names=["A", "B", "C"])
+
+
+def test_19tet_system():
+    sys19 = SYSTEMS["19-tet"]
+    assert sys19.semitones == 19
+    a = Tone("A", octave=4, system=sys19)
+    assert a.frequency == pytest.approx(440.0, rel=1e-3)
+    # Octave should double
+    a5 = a.add(19)
+    assert a5.frequency == pytest.approx(880.0, rel=1e-3)
+
+
+def test_19tet_scale():
+    sys19 = SYSTEMS["19-tet"]
+    ts = TonedScale(system=sys19, tonic=Tone("C", octave=4, system=sys19))
+    major = ts["major"]
+    assert len(major.tones) == 8  # 7 + octave
+
+
+def test_31tet_system():
+    sys31 = SYSTEMS["31-tet"]
+    assert sys31.semitones == 31
+    a = Tone("A", octave=4, system=sys31)
+    assert a.frequency == pytest.approx(440.0, rel=1e-3)
+
+
+def test_shruti_system():
+    shruti = SYSTEMS["shruti"]
+    assert shruti.semitones == 22
+    sa = Tone("Sa", octave=4, system=shruti)
+    # Sa should be near C4 (261.63 Hz) — not exact due to 22-TET
+    assert 250 < sa.frequency < 270
+
+
+def test_shruti_octave():
+    shruti = SYSTEMS["shruti"]
+    sa4 = Tone("Sa", octave=4, system=shruti)
+    sa5 = sa4.add(22)
+    assert sa5.frequency == pytest.approx(sa4.frequency * 2, rel=1e-3)
+
+
+def test_shruti_bhairav_scale():
+    shruti = SYSTEMS["shruti"]
+    ts = TonedScale(system=shruti, tonic=Tone("Sa", octave=4, system=shruti))
+    bhairav = ts["bhairav"]
+    names = [t.name for t in bhairav.tones]
+    assert names[0] == "Sa"
+    assert "komal Re" in names  # the microtonal komal Re
+    assert len(bhairav.tones) == 8
+
+
+def test_maqam_system():
+    maqam = SYSTEMS["maqam"]
+    assert maqam.semitones == 24
+    do = Tone("Do", octave=4, system=maqam)
+    assert 250 < do.frequency < 270
+
+
+def test_maqam_rast_has_quarter_tones():
+    maqam = SYSTEMS["maqam"]
+    ts = TonedScale(system=maqam, tonic=Tone("Do", octave=4, system=maqam))
+    rast = ts["rast"]
+    names = [t.name for t in rast.tones]
+    # Rast should contain quarter-tone positions
+    assert any("↓" in n or "↑" in n for n in names)
+
+
+def test_slendro_system():
+    slendro = SYSTEMS["slendro"]
+    assert slendro.semitones == 5
+    ji = Tone("ji", octave=4, system=slendro)
+    # 5 steps = octave
+    ji_up = ji.add(5)
+    assert ji_up.frequency == pytest.approx(ji.frequency * 2, rel=1e-3)
+
+
+def test_pelog_system():
+    pelog = SYSTEMS["pelog"]
+    assert pelog.semitones == 9
+    ts = TonedScale(system=pelog, tonic=Tone("ji", octave=4, system=pelog))
+    full_pelog = ts["pelog"]
+    assert len(full_pelog.tones) == 8
+
+
+def test_thai_system():
+    thai = SYSTEMS["thai"]
+    assert thai.semitones == 7
+    do = Tone("do", octave=4, system=thai)
+    # 7 steps = octave
+    do_up = do.add(7)
+    assert do_up.frequency == pytest.approx(do.frequency * 2, rel=1e-3)
+
+
+def test_turkish_makam_system():
+    makam = SYSTEMS["makam"]
+    assert makam.semitones == 53
+    ts = TonedScale(system=makam, tonic=Tone("Do", octave=4, system=makam))
+    rast = ts["rast"]
+    assert len(rast.tones) == 8
+
+
+def test_carnatic_system():
+    carnatic = SYSTEMS["carnatic"]
+    assert carnatic.semitones == 72
+    ts = TonedScale(system=carnatic, tonic=Tone("Sa", octave=4, system=carnatic))
+    shankarabharanam = ts["shankarabharanam"]
+    assert len(shankarabharanam.tones) == 8
+
+
+def test_circle_of_fifths_19tet():
+    sys19 = SYSTEMS["19-tet"]
+    c = Tone("C", octave=4, system=sys19)
+    cof = c.circle_of_fifths()
+    assert len(cof) == 19  # should cycle through all 19 tones
+
+
+def test_circle_of_fifths_western_unchanged():
+    """Existing 12-TET circle of fifths should not be affected."""
+    c = Tone("C", octave=4, system="western")
+    cof = c.circle_of_fifths()
+    assert len(cof) == 12
+    assert cof[0].name == "C"
+    assert cof[1].name == "G"
+
+
+def test_from_frequency_non12():
+    sys19 = SYSTEMS["19-tet"]
+    t = Tone.from_frequency(440.0, system=sys19)
+    assert t.name == "A"
+    assert t.octave == 4
+
+
+def test_score_system_param():
+    """Score passes system to parts for string→Tone resolution."""
+    from pytheory import Score, Duration
+    shruti = SYSTEMS["shruti"]
+    score = Score("4/4", bpm=120, system=shruti)
+    p = score.part("test", synth="sine")
+    assert p._system is shruti
+    # String "Sa" should resolve via shruti system, not western
+    p.add(Tone("Sa", octave=4, system=shruti), Duration.QUARTER)
+    assert len(p.notes) == 1
+
+
+def test_interval_to_non12():
+    sys19 = SYSTEMS["19-tet"]
+    a = Tone("A", octave=4, system=sys19)
+    a5 = a.add(19)
+    result = a.interval_to(a5)
+    assert "octave" in result
+
+
+# ── Dedicated instrument synths ──────────────────────────────────────────────
+
+def test_all_dedicated_synths_render():
+    """Every dedicated synth waveform produces valid audio."""
+    from pytheory.play import (piano_wave, bass_guitar_wave, flute_wave,
+                                trumpet_wave, clarinet_wave, oboe_wave,
+                                marimba_wave, harpsichord_wave, cello_wave,
+                                harp_wave, upright_bass_wave,
+                                acoustic_guitar_wave, electric_guitar_wave,
+                                sitar_wave, SAMPLE_RATE)
+    synths = [piano_wave, bass_guitar_wave, flute_wave, trumpet_wave,
+              clarinet_wave, oboe_wave, marimba_wave, harpsichord_wave,
+              cello_wave, harp_wave, upright_bass_wave,
+              acoustic_guitar_wave, electric_guitar_wave, sitar_wave]
+    for fn in synths:
+        wave = fn(440, n_samples=11025)
+        assert len(wave) == 11025
+        assert wave.dtype == numpy.int16
+        assert numpy.abs(wave).max() > 0
+
+
+def test_piano_brightness_scales():
+    """High-pitched piano should be brighter (more high harmonics)."""
+    from pytheory.play import piano_wave
+    low = piano_wave(130, n_samples=22050)   # C3
+    high = piano_wave(1047, n_samples=22050)  # C6
+    # Both should produce valid audio
+    assert numpy.abs(low).max() > 0
+    assert numpy.abs(high).max() > 0
+
+
+def test_acoustic_guitar_body_resonance():
+    """Acoustic guitar should produce richer spectrum than raw pluck."""
+    from pytheory.play import acoustic_guitar_wave, pluck_wave
+    ag = acoustic_guitar_wave(220, n_samples=22050)
+    pk = pluck_wave(220, n_samples=22050)
+    assert len(ag) == len(pk) == 22050
+
+
+def test_cello_has_vibrato():
+    """Cello synth should produce pitch variation (vibrato)."""
+    from pytheory.play import cello_wave
+    wave = cello_wave(220, n_samples=44100)
+    assert len(wave) == 44100
+    assert numpy.abs(wave).max() > 0
+
+
+# ── Cabinet simulation ───────────────────────────────────────────────────────
+
+def test_cabinet_reduces_highs():
+    """Cabinet sim should reduce high-frequency content."""
+    from pytheory.play import _apply_cabinet
+    # White noise has flat spectrum
+    noise = numpy.random.uniform(-1, 1, 44100).astype(numpy.float32)
+    cabbed = _apply_cabinet(noise, brightness=0.5)
+    # RMS of cabbed should be lower (energy removed by filters)
+    assert numpy.sqrt(numpy.mean(cabbed ** 2)) < numpy.sqrt(numpy.mean(noise ** 2))
+
+
+def test_cabinet_brightness_param():
+    """Higher brightness = more high-frequency content passes through."""
+    from pytheory.play import _apply_cabinet
+    noise = numpy.random.uniform(-1, 1, 44100).astype(numpy.float32)
+    dark = _apply_cabinet(noise, brightness=0.0)
+    bright = _apply_cabinet(noise, brightness=1.0)
+    # Bright should have more energy than dark
+    assert numpy.sqrt(numpy.mean(bright ** 2)) > numpy.sqrt(numpy.mean(dark ** 2))
+
+
+# ── Analog drift ─────────────────────────────────────────────────────────────
+
+def test_analog_drift_varies_pitch():
+    """Analog drift should make repeated renders slightly different."""
+    from pytheory import Score, Duration
+    score1 = Score("4/4", bpm=120)
+    p1 = score1.part("t", synth="saw", analog=0.5)
+    p1.add("C4", Duration.QUARTER)
+    p1.add("C4", Duration.QUARTER)
+    # With analog > 0, each C4 gets a random pitch offset
+    # This is hard to test deterministically, just verify it renders
+    from pytheory.play import render_score
+    buf = render_score(score1)
+    assert len(buf) > 0
+
+
+# ── Guitar strumming ─────────────────────────────────────────────────────────
+
+def test_strum_requires_fretboard():
+    """Strumming without a fretboard should raise ValueError."""
+    from pytheory import Score, Duration
+    score = Score("4/4", bpm=120)
+    p = score.part("g", synth="saw")
+    with pytest.raises(ValueError, match="fretboard"):
+        p.strum("Am", Duration.QUARTER)
+
+
+def test_strum_adds_notes():
+    """Strumming should add notes to the part."""
+    from pytheory import Score, Duration, Fretboard
+    score = Score("4/4", bpm=120)
+    fb = Fretboard.guitar()
+    p = score.part("g", instrument="acoustic_guitar", fretboard=fb)
+    p.strum("Am", Duration.HALF)
+    assert len(p.notes) > 0
+
+
+def test_strum_direction():
+    """Both down and up strums should work."""
+    from pytheory import Score, Duration, Fretboard
+    score = Score("4/4", bpm=120)
+    fb = Fretboard.guitar()
+    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
+
+
+# ── World drums ──────────────────────────────────────────────────────────────
+
+def test_tabla_sounds_render():
+    """All tabla drum sounds should produce valid audio."""
+    from pytheory.play import _render_drum_hit
+    from pytheory.rhythm import DrumSound
+    for sound in [DrumSound.TABLA_NA, DrumSound.TABLA_TIN, DrumSound.TABLA_GE,
+                  DrumSound.TABLA_DHA, DrumSound.TABLA_TIT, DrumSound.TABLA_KE]:
+        wave = _render_drum_hit(sound.value, 22050)
+        assert len(wave) == 22050
+        assert wave.dtype == numpy.float32
+
+
+def test_dhol_sounds_render():
+    from pytheory.play import _render_drum_hit
+    from pytheory.rhythm import DrumSound
+    for sound in [DrumSound.DHOL_DAGGA, DrumSound.DHOL_TILLI, DrumSound.DHOL_BOTH]:
+        wave = _render_drum_hit(sound.value, 22050)
+        assert len(wave) == 22050
+
+
+def test_mridangam_sounds_render():
+    from pytheory.play import _render_drum_hit
+    from pytheory.rhythm import DrumSound
+    for sound in [DrumSound.MRIDANGAM_THAM, DrumSound.MRIDANGAM_NAM,
+                  DrumSound.MRIDANGAM_DIN, DrumSound.MRIDANGAM_THA]:
+        wave = _render_drum_hit(sound.value, 22050)
+        assert len(wave) == 22050
+
+
+def test_djembe_sounds_render():
+    from pytheory.play import _render_drum_hit
+    from pytheory.rhythm import DrumSound
+    for sound in [DrumSound.DJEMBE_BASS, DrumSound.DJEMBE_TONE, DrumSound.DJEMBE_SLAP]:
+        wave = _render_drum_hit(sound.value, 22050)
+        assert len(wave) == 22050
+
+
+def test_metal_kit_sounds_render():
+    from pytheory.play import _render_drum_hit
+    from pytheory.rhythm import DrumSound
+    for sound in [DrumSound.METAL_KICK, DrumSound.METAL_SNARE, DrumSound.METAL_HAT]:
+        wave = _render_drum_hit(sound.value, 22050)
+        assert len(wave) == 22050
+
+
+def test_tabla_pattern_presets():
+    """All tabla patterns should load without error."""
+    from pytheory.rhythm import Pattern
+    for name in ["teental", "jhaptaal", "rupak", "dadra",
+                 "keherwa", "tabla solo", "tiri kita"]:
+        p = Pattern.preset(name)
+        assert p.beats > 0
+
+
+def test_world_drum_pattern_presets():
+    """All world drum patterns should load."""
+    from pytheory.rhythm import Pattern
+    for name in ["bhangra", "dhol chaal", "qawwali", "dholak folk",
+                 "adi talam", "mridangam korvai", "djembe", "kuku", "soli",
+                 "double kick", "metal blast", "metal groove", "metal gallop"]:
+        p = Pattern.preset(name)
+        assert p.beats > 0
+
+
+# ── Guitar presets with cabinet sim ──────────────────────────────────────────
+
+def test_guitar_presets_have_cabinet():
+    """Distorted guitar presets should have cabinet simulation."""
+    from pytheory import Score
+    for preset in ["distorted_guitar", "orange_crunch", "metal_guitar"]:
+        score = Score("4/4", bpm=120)
+        p = score.part("g", instrument=preset)
+        assert p.cabinet > 0, f"{preset} should have cabinet sim"
+
+
+def test_clean_guitar_preset():
+    from pytheory import Score
+    score = Score("4/4", bpm=120)
+    p = score.part("g", instrument="clean_guitar")
+    assert p.synth == "electric_guitar_synth"
+    assert p.cabinet > 0

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.30.0"
+version = "0.35.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"