diff --git a/show/dance2006/curves/03-birdie-black b/show/dance2006/curves/03-birdie-black --- a/show/dance2006/curves/03-birdie-black +++ b/show/dance2006/curves/03-birdie-black @@ -1,6 +1,6 @@ --4 0 -125.384170788 0 -125.384170788 1 -144.009525589 1 -144.009525589 0 -180.792653061 0 +-4.0 0.0 +125.384170788 0.0 +125.384170788 1.0 +147.926840563 1 +150.445114475 0 +180.792653061 0.0 diff --git a/show/dance2006/curves/03-birdie-finish b/show/dance2006/curves/03-birdie-finish --- a/show/dance2006/curves/03-birdie-finish +++ b/show/dance2006/curves/03-birdie-finish @@ -1,5 +1,5 @@ -4.0 0.0 -166.466811906 0 +166.466811906 0.0 168.916374187 0.879432624113 175.877447562 0.964539007092 177.479309843 0.0 diff --git a/show/dance2006/curves/03-birdie-shar b/show/dance2006/curves/03-birdie-shar --- a/show/dance2006/curves/03-birdie-shar +++ b/show/dance2006/curves/03-birdie-shar @@ -1,6 +1,6 @@ --4 0 --1.44122395061 0 +-4.0 0.0 +-1.44122395061 0.0 1.77966304471 0.943160365325 29.9136407127 0.912750650543 -41.658972123 0 -180.792653061 0 +41.658972123 0.0 +180.792653061 0.0 diff --git a/show/dance2006/curves/03-birdie-song b/show/dance2006/curves/03-birdie-song --- a/show/dance2006/curves/03-birdie-song +++ b/show/dance2006/curves/03-birdie-song @@ -2,11 +2,11 @@ -2.05480602809 0.0 3.41409675282 0.381652125108 28.8463909332 0.445890096433 -38.6861179559 1 -127.566220723 1 -131.540668818 0.0287769784173 +38.6861179559 1.0 +127.566220723 1.0 +130.856693188 0.0410469170676 139.801286428 0.0359712230216 144.399177363 1.0 -175.931656727 1 +175.931656727 1.0 177.847459089 0.0 180.792653061 0.0 diff --git a/show/dance2006/curves/04-steppin-finish b/show/dance2006/curves/04-steppin-finish --- a/show/dance2006/curves/04-steppin-finish +++ b/show/dance2006/curves/04-steppin-finish @@ -1,6 +1,6 @@ -4.0 0.0 128.423860495 0.0 130.486235492 1.0 -139.630128021 1 +139.630128021 1.0 141.593718312 0.0 143.855056689 0.0 diff --git a/show/dance2006/curves/04-steppin-song b/show/dance2006/curves/04-steppin-song --- a/show/dance2006/curves/04-steppin-song +++ b/show/dance2006/curves/04-steppin-song @@ -1,6 +1,6 @@ -4.0 0.0 --1.36219478368 0.0 +-0.398089601719 0 2.37392949254 1.0 -139.737988808 1 +139.737988808 1.0 141.986994551 0.0 143.855056689 0.0 diff --git a/show/dance2006/curves/05-shirley-finish b/show/dance2006/curves/05-shirley-finish --- a/show/dance2006/curves/05-shirley-finish +++ b/show/dance2006/curves/05-shirley-finish @@ -1,6 +1,6 @@ -4.0 0.0 -225.826370475 0.0 -228.485814585 1.0 +227.380894064 0 +229.137711574 1 238.539810612 1.0 241.296551458 0.0 243.580997732 0.0 diff --git a/show/dance2006/curves/05-shirley-song b/show/dance2006/curves/05-shirley-song --- a/show/dance2006/curves/05-shirley-song +++ b/show/dance2006/curves/05-shirley-song @@ -1,6 +1,6 @@ -4.0 0.0 -1.38785868553 0.00446428571429 3.53778856148 1.0 -238.794547617 1 +238.794547617 1.0 241.610738834 0.0 243.580997732 0.0 diff --git a/show/dance2006/curves/06-dukes-finish b/show/dance2006/curves/06-dukes-finish --- a/show/dance2006/curves/06-dukes-finish +++ b/show/dance2006/curves/06-dukes-finish @@ -1,6 +1,6 @@ -4.0 0.0 -231.600857297 0 -236.417767999 1 -249.579059995 1 +231.600857297 0.0 +236.417767999 1.0 +249.579059995 1.0 252.091350052 0.0 254.466666667 0.0 diff --git a/show/dance2006/curves/06-dukes-song b/show/dance2006/curves/06-dukes-song --- a/show/dance2006/curves/06-dukes-song +++ b/show/dance2006/curves/06-dukes-song @@ -1,6 +1,6 @@ -4.0 0.0 -1.40105680317 0.0 2.88339938353 1.0 -249.540258869 1 +249.540258869 1.0 252.23874945 0.0 254.466666667 0.0 diff --git a/show/dance2006/curves/06-dukes-start b/show/dance2006/curves/06-dukes-start --- a/show/dance2006/curves/06-dukes-start +++ b/show/dance2006/curves/06-dukes-start @@ -1,9 +1,9 @@ --4 0 --1.32972185036 0 +-4.0 0.0 +-1.32972185036 0.0 1.25220883534 0.878787878788 17.9768674699 0.94696969697 85.6570281124 0.933962264151 88.0016064257 0.924528301887 -237.42939759 1 -246.338795181 0 -254.466666667 0 +237.42939759 1.0 +246.338795181 0.0 +254.466666667 0.0 diff --git a/show/dance2006/curves/06-dukes-two b/show/dance2006/curves/06-dukes-two --- a/show/dance2006/curves/06-dukes-two +++ b/show/dance2006/curves/06-dukes-two @@ -1,14 +1,14 @@ --4 0 -14.9897010263 0 -23.5980663394 1 +-4.0 0.0 +14.9897010263 0.0 +23.5980663394 1.0 84.875502008 0.981132075472 87.6889959839 0.27358490566 133.173815261 0.22641509434 -162.246586345 1 +162.246586345 1.0 187.724337349 0.981132075472 200.541365462 0.619147449336 212.420562249 0.571977638015 223.830843373 0.962264150943 -249.671376865 1 -252.594718096 0 -254.466666667 0 +249.671376865 1.0 +252.594718096 0.0 +254.466666667 0.0 diff --git a/show/dance2006/curves/07-chicago-blue b/show/dance2006/curves/07-chicago-blue --- a/show/dance2006/curves/07-chicago-blue +++ b/show/dance2006/curves/07-chicago-blue @@ -1,5 +1,5 @@ --4 0 -332.469656429 0 -332.61135122 1 -362.194632214 0 -379.76 0 +-4.0 0.0 +332.469656429 0.0 +332.61135122 1.0 +362.194632214 0.0 +379.76 0.0 diff --git a/show/dance2006/curves/07-chicago-cool2 b/show/dance2006/curves/07-chicago-cool2 --- a/show/dance2006/curves/07-chicago-cool2 +++ b/show/dance2006/curves/07-chicago-cool2 @@ -6,8 +6,9 @@ 220.639362293 0.375 303.868824047 0.40625 309.185080317 0.890625 330.876238029 0.915254237288 -331.031756702 0 -333.292998895 0 +331.031756702 0.0 +333.292998895 0.0 +345.941007606 0.205128205128 374.875660429 1.0 377.65216053 0.0 379.76 0.0 diff --git a/show/dance2006/curves/07-chicago-event b/show/dance2006/curves/07-chicago-event --- a/show/dance2006/curves/07-chicago-event +++ b/show/dance2006/curves/07-chicago-event @@ -1,4 +1,5 @@ -4.0 0.0 +0.0541599732262 0.0 85.1884815797 0.602739726027 87.111104249 0.369863013699 88.3345914022 0.205479452055 diff --git a/show/dance2006/curves/07-chicago-finish b/show/dance2006/curves/07-chicago-finish --- a/show/dance2006/curves/07-chicago-finish +++ b/show/dance2006/curves/07-chicago-finish @@ -1,7 +1,8 @@ -4.0 0.0 -333.572204158 0 -334.499060601 0.150943396226 -343.660432677 0.4375 +333.572204158 0.0 +334.499060601 0.0 +341.599137687 0.0 +343.093878917 0.638114764537 360.074556762 0.426339285714 364.634276628 1.0 374.674167686 1.0 diff --git a/show/dance2006/curves/07-chicago-hot b/show/dance2006/curves/07-chicago-hot --- a/show/dance2006/curves/07-chicago-hot +++ b/show/dance2006/curves/07-chicago-hot @@ -3,8 +3,9 @@ 89.5575159446 0.0 99.0536002466 0.875 205.795241633 0.859375 212.26603379 1.0 -331.000652967 1 -331.109516038 0 +331.000652967 1.0 +331.109516038 0.0 +343.760005708 0.0 374.659418092 1.0 377.588452513 0.0 379.76 0.0 diff --git a/show/dance2006/curves/07-chicago-red b/show/dance2006/curves/07-chicago-red --- a/show/dance2006/curves/07-chicago-red +++ b/show/dance2006/curves/07-chicago-red @@ -1,6 +1,6 @@ --4 0 -330.580752551 0 -331.047308569 1 -332.568151588 1 -332.623447116 0 -379.76 0 +-4.0 0.0 +330.580752551 0.0 +331.047308569 1.0 +332.568151588 1.0 +332.623447116 0.0 +379.76 0.0 diff --git a/show/dance2006/curves/11-mix-black b/show/dance2006/curves/11-mix-black --- a/show/dance2006/curves/11-mix-black +++ b/show/dance2006/curves/11-mix-black @@ -1,6 +1,6 @@ -4.0 0.0 -245.79760232 0 -249.803186743 1 -284.105004009 1 -286.852892065 0 +245.79760232 0.0 +249.803186743 1.0 +284.105004009 1.0 +286.852892065 0.0 317.802789116 0.0 diff --git a/show/dance2006/curves/11-mix-centercircle b/show/dance2006/curves/11-mix-centercircle --- a/show/dance2006/curves/11-mix-centercircle +++ b/show/dance2006/curves/11-mix-centercircle @@ -4,8 +4,8 @@ 202.927633239 0.0 205.302935889 0.0 207.859352198 0.0 209.801705134 0.02 -240.98440843 0 +240.98440843 0.0 249.181504293 0.389830508475 -249.600243719 0 -266.267318183 0 +249.600243719 0.0 +266.267318183 0.0 317.802789116 0.0 diff --git a/show/dance2006/curves/11-mix-colorblink b/show/dance2006/curves/11-mix-colorblink --- a/show/dance2006/curves/11-mix-colorblink +++ b/show/dance2006/curves/11-mix-colorblink @@ -1,6 +1,6 @@ -4.0 0.0 -49.2962252337 0.0 -50.994803426 1.0 +46.6394121546 0 +48.4340197353 1 83.2675995972 1.0 85.6314337347 0.0 143.141281769 0.0 @@ -19,13 +19,13 @@ 181.49996221 0.0 207.559509488 0.225618227285 224.956780516 0.203389830508 228.039844461 0.0677966101695 -230.91846731 0 +230.91846731 0.0 235.190818561 0.423728813559 244.490575352 0.853848291192 -250.037550075 1 -250.950051267 0 -260.799584569 0 -264.289576684 1 +250.037550075 1.0 +250.950051267 0.0 +260.799584569 0.0 +264.289576684 1.0 305.084606022 1.0 312.880490115 1.0 314.81782277 0.0 diff --git a/show/dance2006/curves/11-mix-fill b/show/dance2006/curves/11-mix-fill --- a/show/dance2006/curves/11-mix-fill +++ b/show/dance2006/curves/11-mix-fill @@ -9,11 +9,11 @@ 143.662496003 0.483870967742 146.14275505 0.283333333333 176.47396009 0.321004123211 184.260420409 0.0 -227.679731776 0 -231.877749613 0 -242.998857896 0 -248.500990262 0 -260.489363048 0 +227.679731776 0.0 +231.877749613 0.0 +242.998857896 0.0 +248.500990262 0.0 +260.489363048 0.0 262.519175285 0.246236304839 279.859256042 0.297741935484 299.494195871 0.0 diff --git a/show/dance2006/curves/11-mix-finish b/show/dance2006/curves/11-mix-finish --- a/show/dance2006/curves/11-mix-finish +++ b/show/dance2006/curves/11-mix-finish @@ -1,7 +1,7 @@ -4.0 0.0 297.592408513 0.0 298.09779964 0.247706422018 -300.103681857 1 +300.103681857 1.0 313.091069751 1.0 314.944170552 0.0 317.802789116 0.0 diff --git a/show/dance2006/curves/11-mix-left b/show/dance2006/curves/11-mix-left --- a/show/dance2006/curves/11-mix-left +++ b/show/dance2006/curves/11-mix-left @@ -1,10 +1,10 @@ -4.0 0.0 -93.6315008532 0.0508474576271 -94.0952559141 1 +92.6128377588 0 +94.0952559141 1.0 99.1248225451 0.966101694915 100.401404578 0.0 -103.215404359 0 -103.884428003 1 +103.215404359 0.0 +103.884428003 1.0 108.93886934 1.0 115.248000158 1.0 168.26342476 1.0 diff --git a/show/dance2006/curves/11-mix-right b/show/dance2006/curves/11-mix-right --- a/show/dance2006/curves/11-mix-right +++ b/show/dance2006/curves/11-mix-right @@ -4,11 +4,11 @@ 86.990734458 1.0 92.7695496603 1.0 94.1775748017 0.0169491525424 99.2697568125 0.0 -100.140017379 1 +100.140017379 1.0 104.292047697 1.0 -105.493125373 0.0689655172414 -108.232067875 0.327586206897 +105.602267847 0.421906693712 +106.849596533 0.518762677485 109.220618694 0.98275862069 168.652343783 1.0 -179.204610049 0 +179.204610049 0.0 317.802789116 0.0 diff --git a/show/dance2006/curves/11-mix-strobe b/show/dance2006/curves/11-mix-strobe --- a/show/dance2006/curves/11-mix-strobe +++ b/show/dance2006/curves/11-mix-strobe @@ -1,7 +1,7 @@ -4.0 0.0 -178.622268729 0 +178.622268729 0.0 181.859487449 0.934426229508 226.685754395 0.93321358887 232.946019564 0.396551724138 -235.740205645 0 +235.740205645 0.0 317.802789116 0.0 diff --git a/show/dance2006/curves/16-mix-back b/show/dance2006/curves/16-mix-back --- a/show/dance2006/curves/16-mix-back +++ b/show/dance2006/curves/16-mix-back @@ -1,6 +1,6 @@ --4 0 -203.397571593 0 -205.651192921 1 -226.168173016 1 -230.518326787 0 -443.436281179 0 +-4.0 0.0 +203.397571593 0.0 +205.651192921 1.0 +217.924622632 1.0 +223.573071432 0.0 +443.436281179 0.0 diff --git a/show/dance2006/curves/16-mix-black b/show/dance2006/curves/16-mix-black --- a/show/dance2006/curves/16-mix-black +++ b/show/dance2006/curves/16-mix-black @@ -1,2 +1,2 @@ --4 0 -443.436281179 0 +-4.0 0.0 +443.436281179 0.0 diff --git a/show/dance2006/curves/16-mix-blue b/show/dance2006/curves/16-mix-blue --- a/show/dance2006/curves/16-mix-blue +++ b/show/dance2006/curves/16-mix-blue @@ -7,7 +7,7 @@ 107.126683327 0.260869565217 107.206458364 0.195652173913 107.5681052 0.0652173913043 108.217828559 0.434782608696 -108.773594652 1 +108.773594652 1.0 111.072349445 1.0 184.933662519 1.0 189.34761424 0.0 diff --git a/show/dance2006/curves/16-mix-can b/show/dance2006/curves/16-mix-can --- a/show/dance2006/curves/16-mix-can +++ b/show/dance2006/curves/16-mix-can @@ -1,6 +1,6 @@ -4.0 0.0 -226.504300882 0.0 -241.609387438 0.62962962963 +230.339101425 0 +237.658501578 0.601851851852 292.232574034 0.777777777778 428.280443689 0.611111111111 437.925067546 0.0 diff --git a/show/dance2006/curves/16-mix-ch1 b/show/dance2006/curves/16-mix-ch1 --- a/show/dance2006/curves/16-mix-ch1 +++ b/show/dance2006/curves/16-mix-ch1 @@ -1,10 +1,11 @@ --4.30969356435 0 -0.0583282177205 0 +-4.30969356435 0.0 +0.0583282177205 0.0 4.91019405921 0.45652173913 14.9236193065 0.45652173913 18.2270173263 0.760869565217 -45.8929757416 0.739130434783 -87.126848753 0.717391304348 -97.639248507 0 -106.857648415 0 -443.436281179 0 +46.4280200482 0.739130434783 +65.9625228966 0.952380952381 +86.5918044464 0.907867494824 +97.639248507 0.0 +106.857648415 0.0 +443.436281179 0.0 diff --git a/show/dance2006/curves/16-mix-ch2 b/show/dance2006/curves/16-mix-ch2 --- a/show/dance2006/curves/16-mix-ch2 +++ b/show/dance2006/curves/16-mix-ch2 @@ -1,9 +1,9 @@ --4 0 -4.60050049486 0 -106.157622463 0 +-4.0 0.0 +4.60050049486 0.0 +106.157622463 0.0 107.988459568 0.761904761905 160.813494851 0.761904761905 188.88082845 0.619047619048 -193.259964636 0 -202.656861036 0 -443.436281179 0 +193.259964636 0.0 +202.656861036 0.0 +443.436281179 0.0 diff --git a/show/dance2006/curves/16-mix-greem b/show/dance2006/curves/16-mix-greem --- a/show/dance2006/curves/16-mix-greem +++ b/show/dance2006/curves/16-mix-greem @@ -1,2 +1,2 @@ --4 0 -443.436281179 0 +-4.0 0.0 +443.436281179 0.0 diff --git a/show/dance2006/curves/16-mix-hot b/show/dance2006/curves/16-mix-hot --- a/show/dance2006/curves/16-mix-hot +++ b/show/dance2006/curves/16-mix-hot @@ -11,9 +11,9 @@ 105.275902463 0.108695652174 105.674777649 0.0869565217391 106.29702294 0.326086956522 107.014998275 0.826086956522 -107.302188409 1 +107.302188409 1.0 107.667380802 0.717391304348 -108.473108678 0 +108.473108678 0.0 117.455446891 0.0 124.81911882 0.0645161290323 127.699326003 0.225806451613 @@ -39,8 +39,8 @@ 174.166668543 0.387096774194 179.159027659 0.387096774194 186.700316333 0.0 206.925200875 0.0 -219.540191478 0.182432432432 -235.942965989 0.883333333333 +230.206304703 0.0277777777778 +237.173348208 1 272.598584502 0.586206896552 297.50545026 0.816091954023 426.864511409 0.862068965517 diff --git a/show/dance2006/curves/16-mix-left b/show/dance2006/curves/16-mix-left --- a/show/dance2006/curves/16-mix-left +++ b/show/dance2006/curves/16-mix-left @@ -1,6 +1,6 @@ --4 0 -201.464169917 0 -201.597091282 1 -202.370451952 1 -202.654420323 0 -443.436281179 0 +-4.0 0.0 +201.464169917 0.0 +201.597091282 1.0 +202.370451952 1.0 +202.654420323 0.0 +443.436281179 0.0 diff --git a/show/dance2006/curves/16-mix-right b/show/dance2006/curves/16-mix-right --- a/show/dance2006/curves/16-mix-right +++ b/show/dance2006/curves/16-mix-right @@ -1,6 +1,6 @@ --4 0 -202.630252802 0 -202.81755109 1 -203.615079281 1 -204.056136538 0 -443.436281179 0 +-4.0 0.0 +202.630252802 0.0 +202.81755109 1.0 +203.615079281 1.0 +204.056136538 0.0 +443.436281179 0.0 diff --git a/show/dance2006/curves/16-mix-strobedim b/show/dance2006/curves/16-mix-strobedim --- a/show/dance2006/curves/16-mix-strobedim +++ b/show/dance2006/curves/16-mix-strobedim @@ -1,6 +1,6 @@ -4.0 0.0 184.829860993 0.0 193.996841195 1.0 -225.849904762 1.0 -230.718310407 0.0 +218.846703394 1.0 +223.886849672 0.0 443.436281179 0.0 diff --git a/show/dance2006/curves/17-entertainment-finish b/show/dance2006/curves/17-entertainment-finish --- a/show/dance2006/curves/17-entertainment-finish +++ b/show/dance2006/curves/17-entertainment-finish @@ -1,5 +1,5 @@ -4.0 0.0 -107.07656583 0 +107.07656583 0.0 116.294833976 1.0 127.082640585 1.0 129.983563371 0.0 diff --git a/show/dance2006/curves/17-entertainment-song b/show/dance2006/curves/17-entertainment-song --- a/show/dance2006/curves/17-entertainment-song +++ b/show/dance2006/curves/17-entertainment-song @@ -1,5 +1,5 @@ -4.0 0.0 --0.278670476183 0 +-0.278670476183 0.0 0.654113392442 1.0 127.082640585 1.0 130.164871045 0.0 diff --git a/show/dance2006/curves/17-entertainment-stages b/show/dance2006/curves/17-entertainment-stages --- a/show/dance2006/curves/17-entertainment-stages +++ b/show/dance2006/curves/17-entertainment-stages @@ -1,6 +1,6 @@ -4.0 0.0 -94.3811470557 0 -101.69956621 1.0 +88.014693849 0.0214285714286 +97.7584285106 1 127.626563607 0.986013986014 130.164871045 0.0 132.249909297 0.0 diff --git a/show/dance2006/subterms/03-birdie b/show/dance2006/subterms/03-birdie --- a/show/dance2006/subterms/03-birdie +++ b/show/dance2006/subterms/03-birdie @@ -1,4 +1,4 @@ song03 song(t) finish finish(t) -blacklight black(t) +blacklight black(t) > 0 shar shar(t) diff --git a/show/dance2006/subterms/07-chicago b/show/dance2006/subterms/07-chicago --- a/show/dance2006/subterms/07-chicago +++ b/show/dance2006/subterms/07-chicago @@ -6,3 +6,6 @@ cyc cyc(t) hottest hot(t) redstage red(t) deepblues blue(t) +scoop-wide hats(t) * .7 +zip_blues +zip_blue blue(t)