Skip to content

Commit

Permalink
solkattu: add korvai, clean up others
Browse files Browse the repository at this point in the history
  • Loading branch information
Evan Laforge committed May 21, 2023
1 parent 7dff619 commit 9755ff1
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 39 deletions.
39 changes: 20 additions & 19 deletions Solkattu/All.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,11 @@ scores = map Korvai.inferMetadataS
, setLocation ("Solkattu.Score.Mridangam2023",43,"e_sai_shiv_4") $ Single Solkattu.Score.Mridangam2023.e_sai_shiv_4
, setLocation ("Solkattu.Score.Mridangam2023",60,"e_sai_shiv_5") $ Single Solkattu.Score.Mridangam2023.e_sai_shiv_5
, setLocation ("Solkattu.Score.Mridangam2023",71,"e_sai_shiv_7") $ Single Solkattu.Score.Mridangam2023.e_sai_shiv_7
, setLocation ("Solkattu.Score.Mridangam2023",82,"e_sai_shiv_11") $ Single Solkattu.Score.Mridangam2023.e_sai_shiv_11
, setLocation ("Solkattu.Score.Mridangam2023",93,"e_sai_shiv_12") $ Single Solkattu.Score.Mridangam2023.e_sai_shiv_12
, setLocation ("Solkattu.Score.Mridangam2023",108,"e_shankar_prasad_1") $ Single Solkattu.Score.Mridangam2023.e_shankar_prasad_1
, setLocation ("Solkattu.Score.Mridangam2023",129,"mohra_bs") $ Single Solkattu.Score.Mridangam2023.mohra_bs
, setLocation ("Solkattu.Score.Mridangam2023",82,"e_sai_shiv_9") $ Single Solkattu.Score.Mridangam2023.e_sai_shiv_9
, setLocation ("Solkattu.Score.Mridangam2023",97,"e_sai_shiv_11") $ Single Solkattu.Score.Mridangam2023.e_sai_shiv_11
, setLocation ("Solkattu.Score.Mridangam2023",108,"e_sai_shiv_12") $ Single Solkattu.Score.Mridangam2023.e_sai_shiv_12
, setLocation ("Solkattu.Score.Mridangam2023",123,"e_shankar_prasad_1") $ Single Solkattu.Score.Mridangam2023.e_shankar_prasad_1
, setLocation ("Solkattu.Score.Mridangam2023",144,"mohra_bs") $ Single Solkattu.Score.Mridangam2023.mohra_bs
, setLocation ("Solkattu.Score.MridangamSarva",19,"kir1") $ Single Solkattu.Score.MridangamSarva.kir1
, setLocation ("Solkattu.Score.MridangamSarva",24,"kir2") $ Single Solkattu.Score.MridangamSarva.kir2
, setLocation ("Solkattu.Score.MridangamSarva",44,"kir3") $ Single Solkattu.Score.MridangamSarva.kir3
Expand Down Expand Up @@ -271,19 +272,19 @@ scores = map Korvai.inferMetadataS
, setLocation ("Solkattu.Score.Solkattu2018",823,"e_sarva1_tisra") $ Single Solkattu.Score.Solkattu2018.e_sarva1_tisra
, setLocation ("Solkattu.Score.Solkattu2018",841,"e_adi_tisra_misra2") $ Single Solkattu.Score.Solkattu2018.e_adi_tisra_misra2
, setLocation ("Solkattu.Score.Solkattu2018",898,"e_adi_tisra") $ Single Solkattu.Score.Solkattu2018.e_adi_tisra
, setLocation ("Solkattu.Score.Solkattu2018",951,"c_18_08_03") $ Single Solkattu.Score.Solkattu2018.c_18_08_03
, setLocation ("Solkattu.Score.Solkattu2018",967,"c_18_08_03_misra") $ Single Solkattu.Score.Solkattu2018.c_18_08_03_misra
, setLocation ("Solkattu.Score.Solkattu2018",984,"adi_tani2") $ Single Solkattu.Score.Solkattu2018.adi_tani2
, setLocation ("Solkattu.Score.Solkattu2018",1018,"adi_tani2_misra") $ Single Solkattu.Score.Solkattu2018.adi_tani2_misra
, setLocation ("Solkattu.Score.Solkattu2018",1046,"adi_muktayi") $ Single Solkattu.Score.Solkattu2018.adi_muktayi
, setLocation ("Solkattu.Score.Solkattu2018",1069,"adi_muktayi_misra") $ Single Solkattu.Score.Solkattu2018.adi_muktayi_misra
, setLocation ("Solkattu.Score.Solkattu2018",1088,"misra_trikalam") $ Single Solkattu.Score.Solkattu2018.misra_trikalam
, setLocation ("Solkattu.Score.Solkattu2018",1134,"c_18_09_25") $ Single Solkattu.Score.Solkattu2018.c_18_09_25
, setLocation ("Solkattu.Score.Solkattu2018",1148,"c_18_09_25_misra") $ Single Solkattu.Score.Solkattu2018.c_18_09_25_misra
, setLocation ("Solkattu.Score.Solkattu2018",1162,"c_18_10_06") $ Single Solkattu.Score.Solkattu2018.c_18_10_06
, setLocation ("Solkattu.Score.Solkattu2018",1173,"c_18_10_22") $ Single Solkattu.Score.Solkattu2018.c_18_10_22
, setLocation ("Solkattu.Score.Solkattu2018",1187,"c_18_10_29") $ Single Solkattu.Score.Solkattu2018.c_18_10_29
, setLocation ("Solkattu.Score.Solkattu2018",1205,"tisra_mohra") $ Single Solkattu.Score.Solkattu2018.tisra_mohra
, setLocation ("Solkattu.Score.Solkattu2018",953,"c_18_08_03") $ Single Solkattu.Score.Solkattu2018.c_18_08_03
, setLocation ("Solkattu.Score.Solkattu2018",969,"c_18_08_03_misra") $ Single Solkattu.Score.Solkattu2018.c_18_08_03_misra
, setLocation ("Solkattu.Score.Solkattu2018",986,"adi_tani_farans") $ Single Solkattu.Score.Solkattu2018.adi_tani_farans
, setLocation ("Solkattu.Score.Solkattu2018",1020,"adi_tani2_misra") $ Single Solkattu.Score.Solkattu2018.adi_tani2_misra
, setLocation ("Solkattu.Score.Solkattu2018",1048,"adi_muktayi") $ Single Solkattu.Score.Solkattu2018.adi_muktayi
, setLocation ("Solkattu.Score.Solkattu2018",1071,"adi_muktayi_misra") $ Single Solkattu.Score.Solkattu2018.adi_muktayi_misra
, setLocation ("Solkattu.Score.Solkattu2018",1090,"misra_trikalam") $ Single Solkattu.Score.Solkattu2018.misra_trikalam
, setLocation ("Solkattu.Score.Solkattu2018",1136,"c_18_09_25") $ Single Solkattu.Score.Solkattu2018.c_18_09_25
, setLocation ("Solkattu.Score.Solkattu2018",1150,"c_18_09_25_misra") $ Single Solkattu.Score.Solkattu2018.c_18_09_25_misra
, setLocation ("Solkattu.Score.Solkattu2018",1164,"c_18_10_06") $ Single Solkattu.Score.Solkattu2018.c_18_10_06
, setLocation ("Solkattu.Score.Solkattu2018",1175,"c_18_10_22") $ Single Solkattu.Score.Solkattu2018.c_18_10_22
, setLocation ("Solkattu.Score.Solkattu2018",1189,"c_18_10_29") $ Single Solkattu.Score.Solkattu2018.c_18_10_29
, setLocation ("Solkattu.Score.Solkattu2018",1207,"tisra_mohra") $ Single Solkattu.Score.Solkattu2018.tisra_mohra
, setLocation ("Solkattu.Score.Solkattu2019",14,"c_19_04_15") $ Single Solkattu.Score.Solkattu2019.c_19_04_15
, setLocation ("Solkattu.Score.Solkattu2019",44,"c_19_06_17") $ Single Solkattu.Score.Solkattu2019.c_19_06_17
, setLocation ("Solkattu.Score.Solkattu2019",65,"c_19_07_15") $ Single Solkattu.Score.Solkattu2019.c_19_07_15
Expand Down Expand Up @@ -317,6 +318,6 @@ scores = map Korvai.inferMetadataS
, setLocation ("Solkattu.Score.Tabla2023",85,"tukra3_otaan") $ Single Solkattu.Score.Tabla2023.tukra3_otaan
, setLocation ("Solkattu.Score.Tabla2023",91,"tukra4") $ Single Solkattu.Score.Tabla2023.tukra4
, setLocation ("Solkattu.Score.Tabla2023",97,"tukra5") $ Single Solkattu.Score.Tabla2023.tukra5
, setLocation ("Solkattu.Score.Tabla2023",106,"tukra6") $ Single Solkattu.Score.Tabla2023.tukra6
, setLocation ("Solkattu.Score.Tabla2023",112,"awantika") $ Single Solkattu.Score.Tabla2023.awantika
, setLocation ("Solkattu.Score.Tabla2023",108,"tukra6") $ Single Solkattu.Score.Tabla2023.tukra6
, setLocation ("Solkattu.Score.Tabla2023",114,"awantika") $ Single Solkattu.Score.Tabla2023.awantika
]
17 changes: 16 additions & 1 deletion Solkattu/Score/Mridangam2023.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,25 @@ e_sai_shiv_7 = date 2023 4 4 $
, r2 $ sd $ "nddn" & su "o/o/o/o/" . "nddn"
]

e_sai_shiv_9 :: Korvai
e_sai_shiv_9 = date 2023 4 16 $
exercise $ source "https://www.youtube.com/watch?v=yKv1GveMB94" $
comment "double strokes" $ korvaiS1 adi $
tdtn (__8 . r4 takadinnataka)
. tdtn (__6 . r3 takadinnataka)
. tdtn (__4 . r2 takadinnataka)
. tdtn (__ . takadinnataka)
. tdtn (__ . "kook")
. tdtn (__ . "ko")
. sd (g "ppkkoonn") . sd (g "pkon")
where
tdtn = g • prefixes tadithomnam
takadinnataka = "kooknk"

e_sai_shiv_11 :: Korvai
e_sai_shiv_11 = date 2023 3 20 $
exercise $ source "https://www.youtube.com/watch?v=9l_RlC54pNU" $
korvaiS adi
comment "meetu clarity" $ korvaiS adi
[ seqs 4 . seqs 2 . seqs 1 . tri123 (od.__4) ending
]
where
Expand Down
12 changes: 7 additions & 5 deletions Solkattu/Score/Solkattu2018.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ adi_tani = tani
, K e_sarva1_tisra
, K e_adi_tisra
, K c_18_08_03
, K adi_tani2
, K adi_tani_farans
, Comment "mohra"
, K SolkattuMohra.c_mohra
, K adi_muktayi
Expand Down Expand Up @@ -928,7 +928,7 @@ e_adi_tisra = exercise $ date 2018 7 30 $ sudhindra $
dinnakttk = group $ din.na.kttk
trktkt3 = tri trktkt
trktkt = named "4npkt" $ trkt.kttk
takadinnakttk = group $ taka.dinnakttk
takadinnakttk = group $ taka.din.na.kttk
-- TODO this uses trkt.kttk instead of trktkt above because being a group
-- will prevent the full din_trktkt match.
din_trktkt = din.__.trkt.kttk.tarikitadiku
Expand All @@ -938,7 +938,9 @@ e_adi_tisra = exercise $ date 2018 7 30 $ sudhindra $
, (tarikitadiku, n.p.k.t.p.k.t.p.k.t.p.k)
, (tang.__.gu, od.__.o)
, (dinnakttk, o.n.k.t.o.k)
, (taka, o.k)
-- , (taka, o.k)
-- TODO why doesn't match taka+dinnakttk?
, (taka.dinnakttk, o.k.o.n.k.t.o.k)
-- High speed variant of trktkt drops the tha.
-- Say din.__.tari.kita.kita.taka,
-- play din.__.nang.__.kita.kita.taka
Expand Down Expand Up @@ -981,8 +983,8 @@ c_18_08_03_misra = date 2019 2 26 $ ganesh $
, (din.gu, od.lt o)
]

adi_tani2 :: Korvai
adi_tani2 = date 2018 8 3 $ sudhindra $ korvaiS adi mridangam
adi_tani_farans :: Korvai
adi_tani_farans = date 2018 8 3 $ sudhindra $ korvaiS adi mridangam
[ restD 4 . su (tri_ (tam.__4) nakatiku)
, r2 $ r2 (din.__.gu.trkt.tk) . dim.__.tat.__
, r2 $ din.__.gu . tri_ (dim.__) (trkt.tk)
Expand Down
30 changes: 16 additions & 14 deletions Solkattu/Score/Tabla2023.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@ import Solkattu.Dsl.Bol


qaida1 :: Korvai
qaida1 = qaida $ akash $ korvaiS kehrwa $ map sd
[ "dha dha trkt dha dha tu na taa taa trkt dha dha tu na"
qaida1 = qaida $ akash $ korvaiS tintal $ map sd
[ r2 "dha dha trkt dha dha tu na taa taa trkt dha dha tu na"
-- palta 1
, "dha dha trkt dha dha trkt dha dha trkt dha dha tu na"
, "taa taa trkt taa taa trkt dha dha trkt dha dha tu na"
. "taa taa trkt taa taa trkt dha dha trkt dha dha tu na"
-- palta 2
, "dha dha dha trkt dha trkt dha dha trkt dha dha tu na"
, "taa taa taa trkt taa trkt dha dha trkt dha dha tu na"
. "taa taa taa trkt taa trkt dha dha trkt dha dha tu na"
-- palta 3
, "dha dha trkt dha trkt dha dha dha trkt dha dha tu na"
, "taa taa trkt taa trkt taa dha dha trkt dha dha tu na"
. "taa taa trkt taa trkt taa dha dha trkt dha dha tu na"
-- palta 4
, "dha dha trkt trkt trkt dha dha trkt dha dha tu na"
, "taa taa trkt trkt trkt dha dha trkt dha dha tu na"
. "taa taa trkt trkt trkt dha dha trkt dha dha tu na"
-- palta 5
, "trkt trkt dha dha trkt dha dha trkt dha dha tu na"
, "trkt trkt taa taa trkt dha dha trkt dha dha tu na"
. "trkt trkt taa taa trkt dha dha trkt dha dha tu na"
, tri_ (dha.__8) (g "dha dha trkt dha dha tu na taa taa trkt dha dha tu na")
-- , "dha dha trkt dha dha tu na taa taa trkt dha dha tu na"
-- . "dha _ _ _ _ _ _ _ dha dha trkt dha dha tu na"
Expand All @@ -37,20 +37,20 @@ qaida1 = qaida $ akash $ korvaiS kehrwa $ map sd
]

qaida2 :: Korvai
qaida2 = qaida $ akash $ korvaiS kehrwa $ map sd
[ "dha trkt tk dha trkt tk taa trkt tk dha trkt tk"
qaida2 = qaida $ akash $ korvaiS tintal $ map sd
[ r2 "dha trkt tk dha trkt tk taa trkt tk dha trkt tk"
, "dha trkt tk dha trkt tk dha trkt tk tu na kt tk"
, "taa trkt tk taa trkt tk dha trkt tk tu na kt tk"
. "taa trkt tk taa trkt tk dha trkt tk tu na kt tk"

-- palta
, "dha dha trkt dha trkt tk dha trkt tk tu na kt tk"
, "taa taa trkt taa trkt tk dha trkt tk tu na kt tk"
. "taa taa trkt taa trkt tk dha trkt tk tu na kt tk"
, "dha trkt trkt dha trkt dha trkt tk tu na kt tk"
, "taa trkt trkt taa trkt dha trkt tk tu na kt tk"
. "taa trkt trkt taa trkt dha trkt tk tu na kt tk"
, "trkt trkt dha trkt tk dha trkt tk tu na kt tk"
, "trkt trkt taa trkt tk dha trkt tk tu na kt tk"
. "trkt trkt taa trkt tk dha trkt tk tu na kt tk"
, "dha trkt tk _ trkt tk dha trkt tk tu na kt tk"
, "taa trkt tk _ trkt tk dha trkt tk tu na kt tk"
. "taa trkt tk _ trkt tk dha trkt tk tu na kt tk"

, tri_ (dha.__)
(g $ "dha trkt tk tu na kt tk taa trkt tk tu na kt tk"
Expand Down Expand Up @@ -102,6 +102,8 @@ tukra5 = tukra $ akash $ korvaiS1 tintal $
. "dha ge tette katta gadigene"
. "dha _ tuna kat _"
. r3 "dhati dha _"
-- this doesn't line up...
. __M (15 * 4)

tukra6 :: Korvai
tukra6 = tukra $ akash $ korvaiS1 tintal $ nadai 3 $
Expand Down

0 comments on commit 9755ff1

Please sign in to comment.