diff --git a/show/dance2015/curves/song16.markers b/show/dance2015/curves/song16.markers --- a/show/dance2015/curves/song16.markers +++ b/show/dance2015/curves/song16.markers @@ -1,3 +1,10 @@ +97.401549668 'q' +145.352185987 'q' +169.247342273 'w' +234.36851597 'q' +313.097752395 'q' +369.192612144 'q' 457.258955 'q' 574.235607 'w' 606.967462 'w' +637.126092861 'w' diff --git a/show/dance2015/sessions/curvecalc/default.n3 b/show/dance2015/sessions/curvecalc/default.n3 --- a/show/dance2015/sessions/curvecalc/default.n3 +++ b/show/dance2015/sessions/curvecalc/default.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:currentSong . + ns1:currentSong . diff --git a/show/dance2015/sessions/keyboardcomposer/fixed.n3 b/show/dance2015/sessions/keyboardcomposer/fixed.n3 --- a/show/dance2015/sessions/keyboardcomposer/fixed.n3 +++ b/show/dance2015/sessions/keyboardcomposer/fixed.n3 @@ -9,6 +9,6 @@ ns1:windowGeometry "393x724+1321+62" . a ns1:SubSetting ; - ns1:level 5.5e-01 ; + ns1:level 3.2e-01 ; ns1:sub . diff --git a/show/dance2015/song16.n3 b/show/dance2015/song16.n3 --- a/show/dance2015/song16.n3 +++ b/show/dance2015/song16.n3 @@ -17,7 +17,8 @@ , , , - ; + , + ; ns1:effect , , , @@ -25,6 +26,7 @@ , , , + , , , , @@ -79,6 +81,9 @@ a ns1:Curve ; rdfs:label "full" . + a ns1:Curve ; + rdfs:label "cyc" . + a ns1:Effect ; rdfs:label "widered" ; ns1:code "env = ", @@ -116,6 +121,11 @@ ns1:code "env = ", "out = * env" . + a ns1:Effect ; + rdfs:label "cyc" ; + ns1:code "env = ", + "out = * env" . + a ns1:Effect, ; rdfs:label "mid chase" ; diff --git a/show/dance2015/song16/curve-11.n3 b/show/dance2015/song16/curve-11.n3 --- a/show/dance2015/song16/curve-11.n3 +++ b/show/dance2015/song16/curve-11.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 25.76 0 27.76 1 47.76 1 49.76 0 67.81 0 74.75 0.4316 82.08 0.4316 101.8 0 614.8 0 624.2 1" . + ns1:points "0 0 35.32 0 35.38 1 62.52 1 63.64 0 66.19 0 67.09 0.4316 87.83 0.4316 90.84 0.1777 93.1 0 101.8 0 113.5 0 114.4 0.9458 130.7 1 142.6 0.94 143.3 0 614.8 0 624.2 1 636.8 1 637.2 0 670.5 0 671 1 715.7 1 716.6 0" . diff --git a/show/dance2015/song16/curve-12.n3 b/show/dance2015/song16/curve-12.n3 --- a/show/dance2015/song16/curve-12.n3 +++ b/show/dance2015/song16/curve-12.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 6.229 0 8.999 1 52.12 1 58.22 0.04998 74.12 0 227.5 0 231.3 0.4565 309.7 0.4522 359.1 0 706.8 0" . + ns1:points "0 0 2.998 0 5.768 1 52.12 1 58.22 0.04998 74.12 0 227.5 0 231.3 0.4565 309.7 0.4522 359.1 0 706.8 0" . diff --git a/show/dance2015/song16/curve-13.n3 b/show/dance2015/song16/curve-13.n3 --- a/show/dance2015/song16/curve-13.n3 +++ b/show/dance2015/song16/curve-13.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 54.99 0 56.99 1 76.99 1 78.99 0" . + ns1:points "0 0 3.661 0 6.271 1 37.83 1 53.58 1 56.99 1 105.4 1 107.4 0 142.5 0 143.3 1 233.3 1 234.9 0" . diff --git a/show/dance2015/song16/curve-14.n3 b/show/dance2015/song16/curve-14.n3 --- a/show/dance2015/song16/curve-14.n3 +++ b/show/dance2015/song16/curve-14.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 85.53 0 87.66 0.7394 119 0.7021 121.7 0" . + ns1:points "0 0 85.53 0 87.66 0.7394 92.57 0.7336 97.26 0.2057 97.51 0.906 98.2 0.8461 119.2 0.8777 121.7 0 312.9 0 313.4 0.4872 333.7 0.4855 367.5 0.4921 371.8 0 450.1 0 454.6 0" . diff --git a/show/dance2015/song16/curve-15.n3 b/show/dance2015/song16/curve-15.n3 --- a/show/dance2015/song16/curve-15.n3 +++ b/show/dance2015/song16/curve-15.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 108.5 0 110.5 0.4735 142.3 0.4735 144.3 0 495.6 0 558.8 0.6779 576.9 0 584.6 0 609.7 0 637 0 722.3 0" . + ns1:points "0 0 108.5 0 110.5 0.5724 141.8 0.5639 144.3 0 495.6 0 532 0.2817 538.2 0.7652 560 0.7855 576.9 0 584.6 0 609.7 0 636.2 0 636.5 0 636.6 1 660.5 1 666.4 0.9984 668.7 0 722.3 0" . diff --git a/show/dance2015/song16/curve-16.n3 b/show/dance2015/song16/curve-16.n3 --- a/show/dance2015/song16/curve-16.n3 +++ b/show/dance2015/song16/curve-16.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 138.8 0 140.8 1 227.8 1 229.8 0 302.5 0 325.8 0.1755 446.2 0.2351 460.8 0 709.8 0" . + ns1:points "0 0 146.3 0 147.7 0.4415 234.2 0.5531 234.6 0 302.5 0 325.8 0.1755 366.4 0.1976 367.3 1 452.5 1 452.6 0 709.8 0" . diff --git a/show/dance2015/song16/curve-17.n3 b/show/dance2015/song16/curve-17.n3 --- a/show/dance2015/song16/curve-17.n3 +++ b/show/dance2015/song16/curve-17.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 130.3 0 161.5 0.5061 231.5 0.5401 235.9 0 287.3 0 305 0.1977 449.5 0.2196 454.2 0 613.3 0 621.3 0 659 0.4708 669.5 0.5106 673.1 0.367" . + ns1:points "0 0 66.59 0 66.9 0.3666 67.93 0.3852 86.71 0.3556 90.86 0 159.2 0 167.4 0.5221 234.5 0.5401 234.9 0 310.4 0 314.4 0.5252 443.6 0.5808 451.9 0.5868 452 0 551 0 555.7 0.6919 573.7 0.6683 574.2 0 613.3 0 621.3 0 639.3 0 663.2 0.1861 668.3 0.2393 671.1 0" . diff --git a/show/dance2015/song16/curve-18.n3 b/show/dance2015/song16/curve-18.n3 --- a/show/dance2015/song16/curve-18.n3 +++ b/show/dance2015/song16/curve-18.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 227.6 0 229.6 1 309.9 1 311.9 0" . + ns1:points "0 0 232 0 234 1 309.9 1 311.9 0" . diff --git a/show/dance2015/song16/curve-19.n3 b/show/dance2015/song16/curve-19.n3 --- a/show/dance2015/song16/curve-19.n3 +++ b/show/dance2015/song16/curve-19.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 286 0 288 1 453.7 1 455.7 0" . + ns1:points "0 0 232.5 0 234.5 1 314.2 1 318.6 0 368.3 0 371.7 1 451.2 1 451.3 0" . diff --git a/show/dance2015/song16/curve-20.n3 b/show/dance2015/song16/curve-20.n3 --- a/show/dance2015/song16/curve-20.n3 +++ b/show/dance2015/song16/curve-20.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 314.9 0 316.9 1 457.5 1 459.5 0 611 0 618.8 1 683.6 1" . + ns1:points "0 0 312.4 0 315.5 1.029 366.7 1.029 366.8 0 611 0 618.8 1 636.9 1 637.3 0 670.6 0 671 1 715.7 1 716.5 0" . diff --git a/show/dance2015/song16/curve-21.n3 b/show/dance2015/song16/curve-21.n3 --- a/show/dance2015/song16/curve-21.n3 +++ b/show/dance2015/song16/curve-21.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 457.6 0 459.6 1 574.1 1 574.2 0 604.2 0 605.2 1" . + ns1:points "0 0 312.8 0.005319 313.4 1 366.8 1 366.9 0 453.7 0 455.7 1 536.3 1 545.2 0 567.2 0 574.2 0 604.2 0 605.2 1 636.9 1 637.2 0 670.6 0 671 1 715.6 1 716.5 0" . diff --git a/show/dance2015/song16/curve-23.n3 b/show/dance2015/song16/curve-23.n3 --- a/show/dance2015/song16/curve-23.n3 +++ b/show/dance2015/song16/curve-23.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 692.7 0 694.8 0.5426 715.3 0.5186 717.3 0.9121 723.6 0.8989 726 0" . + ns1:points "0 0 63.68 0 65.1 0 65.53 0.133 65.57 1 66.85 0.09575 67.08 0 68.95 0 111.6 0 112.2 0.07979 112.4 0.9647 114 0.3516 115.6 0 692.3 0 692.9 0.07979 693.1 1 693.6 0.5728 694.1 0.2098 698.5 0.4653 715.3 0.5186 715.8 0.03392 716 0.9787 717.7 0.1279 717.9 1 718.5 0.8811 723.9 0.9149 726 0" . diff --git a/show/dance2015/song16/curve-24.n3 b/show/dance2015/song16/curve-24.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song16/curve-24.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 452.9 0 482.6 0 513.3 1 536.9 0.01263 545 0 614.2 0 614.6 1 636.8 1 637.2 0" . +