Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/tgc3

master
ugrnm 8 years ago
commit de1b8ad6e5

@ -0,0 +1 @@
FLOPPYLEFT - 2017

@ -0,0 +1,11 @@
Author: Kimmy Spreeuwenberg
Date: 2017
Title: Rest
Description:
Make a silence.
“There is no such thing as an empty space or an empty time.
There is always something to see, something to hear. In fact,
try as we may to make a silence, we cannot.”
(John Cage, Silence: Lectures and Writings)

@ -1,8 +1,7 @@
#N canvas 280 23 912 793 10;
#N canvas 166 23 912 793 10;
#X obj 98 109 adc~;
#X obj 167 267 tabwrite~ noise;
#X obj 98 131 +~;
#X obj 143 205 /~ 2;
#X msg 209 208 bang;
#X obj 214 136 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
1;
@ -15,10 +14,10 @@
#X coords 0 1 88200 -1 200 140 1 0 0;
#X restore 428 114 graph;
#X obj 313 193 env~;
#X floatatom 325 233 5 0 0 0 - - -, f 5;
#X floatatom 369 228 5 0 0 0 - - -, f 5;
#X obj 161 302 phasor~ 0.5;
#X obj 172 564 +~;
#X floatatom 291 263 5 0 0 0 - - -, f 5;
#X obj 175 525 +~;
#X floatatom 306 267 5 0 0 0 - - -, f 5;
#X obj 132 240 *~;
#X obj 274 322 line~;
#X obj 393 306 env~;
@ -38,97 +37,99 @@
#X obj 742 417 sel 1;
#X obj 211 658 delwrite~ fd 4000;
#X msg 379 442 1800;
#X obj 580 368 > 60;
#X obj 534 370 <= 60;
#X obj 500 368 > 55;
#X obj 454 370 <= 55;
#X obj 420 368 > 50;
#X obj 379 369 <= 50;
#X obj 742 369 > 75;
#X obj 698 370 <= 75;
#X obj 663 370 > 65;
#X obj 614 370 <= 65;
#X obj 318 523 vd~ fd 100;
#X obj 299 39 loadbang;
#X msg 299 68 \; pd dsp 1;
#X obj 98 176 *~ 1;
#X obj 98 151 lop~ 1000;
#X msg 274 300 \$1 40;
#X obj 660 623 pack f f;
#X obj 649 658 print;
#X obj 284 238 >= 80;
#X obj 173 564 /~ 2;
#X obj 98 151 lop~ 2500;
#X msg 422 442 1830;
#X msg 744 442 1900;
#X msg 502 442 1830;
#X msg 582 442 1850;
#X msg 422 442 1810;
#X msg 664 442 1880;
#X obj 318 549 *~ 0.7;
#X msg 664 442 1875;
#X msg 582 442 1865;
#X msg 502 442 1850;
#X obj 742 369 > 90;
#X obj 698 370 <= 90;
#X obj 663 370 > 80;
#X obj 614 370 <= 80;
#X obj 580 368 > 70;
#X obj 534 370 <= 70;
#X obj 500 368 > 60;
#X obj 454 370 <= 60;
#X obj 273 269 &&;
#X msg 274 300 \$1 40;
#X obj 271 238 > 60;
#X obj 98 176 *~ 20;
#X obj 324 238 <= 80;
#X obj 318 523 vd~ fd 200;
#X obj 288 552 *~ 0.95;
#X connect 0 0 2 0;
#X connect 0 1 2 1;
#X connect 2 0 48 0;
#X connect 4 0 1 0;
#X connect 5 0 9 0;
#X connect 6 0 14 0;
#X connect 8 0 6 0;
#X connect 9 0 1 0;
#X connect 11 0 12 0;
#X connect 11 0 51 0;
#X connect 11 0 53 0;
#X connect 13 0 8 0;
#X connect 14 0 33 0;
#X connect 14 0 7 0;
#X connect 14 0 7 1;
#X connect 14 0 18 0;
#X connect 16 0 1 0;
#X connect 17 0 16 1;
#X connect 18 0 20 0;
#X connect 18 0 35 0;
#X connect 18 0 36 0;
#X connect 18 0 37 0;
#X connect 18 0 38 0;
#X connect 18 0 39 0;
#X connect 18 0 40 0;
#X connect 18 0 41 0;
#X connect 18 0 42 0;
#X connect 18 0 43 0;
#X connect 18 0 44 0;
#X connect 18 0 51 1;
#X connect 19 0 45 0;
#X connect 21 0 31 0;
#X connect 22 0 34 0;
#X connect 23 0 57 0;
#X connect 24 0 23 0;
#X connect 25 0 55 0;
#X connect 26 0 25 0;
#X connect 27 0 56 0;
#X connect 28 0 27 0;
#X connect 29 0 58 0;
#X connect 30 0 29 0;
#X connect 31 0 19 0;
#X connect 32 0 54 0;
#X connect 34 0 31 0;
#X connect 35 0 28 0;
#X connect 36 0 26 1;
#X connect 37 0 26 0;
#X connect 38 0 24 1;
#X connect 39 0 24 0;
#X connect 40 0 22 0;
#X connect 41 0 32 0;
#X connect 42 0 30 1;
#X connect 2 0 39 0;
#X connect 3 0 1 0;
#X connect 4 0 8 0;
#X connect 5 0 13 0;
#X connect 7 0 5 0;
#X connect 8 0 1 0;
#X connect 10 0 11 0;
#X connect 10 0 55 0;
#X connect 10 0 57 0;
#X connect 12 0 7 0;
#X connect 13 0 38 0;
#X connect 15 0 1 0;
#X connect 16 0 15 1;
#X connect 17 0 19 0;
#X connect 17 0 34 0;
#X connect 17 0 35 0;
#X connect 17 0 45 0;
#X connect 17 0 46 0;
#X connect 17 0 47 0;
#X connect 17 0 48 0;
#X connect 17 0 49 0;
#X connect 17 0 50 0;
#X connect 17 0 51 0;
#X connect 17 0 52 0;
#X connect 18 0 58 0;
#X connect 20 0 30 0;
#X connect 21 0 33 0;
#X connect 22 0 40 0;
#X connect 23 0 22 0;
#X connect 24 0 44 0;
#X connect 25 0 24 0;
#X connect 26 0 43 0;
#X connect 27 0 26 0;
#X connect 28 0 42 0;
#X connect 29 0 28 0;
#X connect 30 0 18 0;
#X connect 31 0 41 0;
#X connect 33 0 30 0;
#X connect 34 0 23 0;
#X connect 35 0 21 0;
#X connect 36 0 37 0;
#X connect 36 0 8 0;
#X connect 38 0 6 0;
#X connect 38 0 6 1;
#X connect 38 0 32 0;
#X connect 38 0 17 0;
#X connect 39 0 56 0;
#X connect 40 0 30 0;
#X connect 41 0 30 0;
#X connect 42 0 30 0;
#X connect 43 0 30 0;
#X connect 44 0 28 1;
#X connect 45 0 59 0;
#X connect 46 0 47 0;
#X connect 46 0 9 0;
#X connect 48 0 11 0;
#X connect 48 0 16 0;
#X connect 50 0 17 0;
#X connect 51 0 52 0;
#X connect 53 0 15 0;
#X connect 53 0 50 0;
#X connect 54 0 31 0;
#X connect 55 0 31 0;
#X connect 56 0 31 0;
#X connect 57 0 31 0;
#X connect 58 0 31 0;
#X connect 59 0 14 1;
#X connect 44 0 30 0;
#X connect 45 0 31 0;
#X connect 46 0 29 1;
#X connect 47 0 29 0;
#X connect 48 0 27 1;
#X connect 49 0 27 0;
#X connect 50 0 25 1;
#X connect 51 0 25 0;
#X connect 52 0 23 1;
#X connect 53 0 54 0;
#X connect 54 0 16 0;
#X connect 55 0 14 0;
#X connect 55 0 53 0;
#X connect 56 0 10 0;
#X connect 56 0 15 0;
#X connect 57 0 53 1;
#X connect 58 0 59 0;
#X connect 59 0 13 1;

@ -0,0 +1,135 @@
#N canvas 166 23 912 793 10;
#X obj 98 109 adc~;
#X obj 167 267 tabwrite~ noise;
#X obj 98 131 +~;
#X msg 209 208 bang;
#X obj 214 136 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
1;
#X obj 161 361 tabread4~ noise;
#X obj 154 696 dac~;
#X obj 161 334 *~ 88200;
#X obj 198 170 metro 2000;
#N canvas 0 22 450 278 (subpatch) 0;
#X array noise 88200 float 2;
#X coords 0 1 88200 -1 200 140 1 0 0;
#X restore 428 114 graph;
#X obj 313 193 env~;
#X floatatom 369 228 5 0 0 0 - - -, f 5;
#X obj 161 302 phasor~ 0.5;
#X obj 175 525 +~;
#X floatatom 306 267 5 0 0 0 - - -, f 5;
#X obj 132 240 *~;
#X obj 274 322 line~;
#X obj 393 306 env~;
#X obj 318 499 line~;
#X floatatom 497 321 5 0 0 0 - - -, f 5;
#X floatatom 280 453 5 0 0 0 - - -, f 5;
#X obj 379 419 sel 1;
#X obj 420 417 sel 1;
#X obj 421 395 &&;
#X obj 500 417 sel 1;
#X obj 501 395 &&;
#X obj 580 417 sel 1;
#X obj 581 395 &&;
#X obj 662 417 sel 1;
#X obj 663 395 &&;
#X msg 318 477 \$1 2000;
#X obj 742 417 sel 1;
#X obj 211 658 delwrite~ fd 4000;
#X msg 379 442 1800;
#X obj 420 368 > 50;
#X obj 379 369 <= 50;
#X obj 299 39 loadbang;
#X msg 299 68 \; pd dsp 1;
#X obj 173 564 /~ 2;
#X obj 98 151 lop~ 2500;
#X msg 422 442 1830;
#X msg 744 442 1900;
#X msg 664 442 1875;
#X msg 582 442 1865;
#X msg 502 442 1850;
#X obj 742 369 > 90;
#X obj 698 370 <= 90;
#X obj 663 370 > 80;
#X obj 614 370 <= 80;
#X obj 580 368 > 70;
#X obj 534 370 <= 70;
#X obj 500 368 > 60;
#X obj 454 370 <= 60;
#X obj 273 269 &&;
#X obj 271 238 > 60;
#X obj 98 176 *~ 20;
#X obj 324 238 <= 80;
#X obj 318 523 vd~ fd 200;
#X obj 288 552 *~ 0.95;
#X msg 274 300 \$1 200;
#X connect 0 0 2 0;
#X connect 2 0 39 0;
#X connect 3 0 1 0;
#X connect 4 0 8 0;
#X connect 5 0 13 0;
#X connect 7 0 5 0;
#X connect 8 0 1 0;
#X connect 10 0 11 0;
#X connect 10 0 54 0;
#X connect 10 0 56 0;
#X connect 12 0 7 0;
#X connect 13 0 38 0;
#X connect 15 0 1 0;
#X connect 16 0 15 1;
#X connect 17 0 19 0;
#X connect 17 0 34 0;
#X connect 17 0 35 0;
#X connect 17 0 45 0;
#X connect 17 0 46 0;
#X connect 17 0 47 0;
#X connect 17 0 48 0;
#X connect 17 0 49 0;
#X connect 17 0 50 0;
#X connect 17 0 51 0;
#X connect 17 0 52 0;
#X connect 18 0 57 0;
#X connect 20 0 30 0;
#X connect 21 0 33 0;
#X connect 22 0 40 0;
#X connect 23 0 22 0;
#X connect 24 0 44 0;
#X connect 25 0 24 0;
#X connect 26 0 43 0;
#X connect 27 0 26 0;
#X connect 28 0 42 0;
#X connect 29 0 28 0;
#X connect 30 0 18 0;
#X connect 31 0 41 0;
#X connect 33 0 30 0;
#X connect 34 0 23 0;
#X connect 35 0 21 0;
#X connect 36 0 37 0;
#X connect 36 0 8 0;
#X connect 38 0 6 0;
#X connect 38 0 6 1;
#X connect 38 0 32 0;
#X connect 38 0 17 0;
#X connect 39 0 55 0;
#X connect 40 0 30 0;
#X connect 41 0 30 0;
#X connect 42 0 30 0;
#X connect 43 0 30 0;
#X connect 44 0 30 0;
#X connect 45 0 31 0;
#X connect 46 0 29 1;
#X connect 47 0 29 0;
#X connect 48 0 27 1;
#X connect 49 0 27 0;
#X connect 50 0 25 1;
#X connect 51 0 25 0;
#X connect 52 0 23 1;
#X connect 53 0 59 0;
#X connect 54 0 14 0;
#X connect 54 0 53 0;
#X connect 55 0 10 0;
#X connect 55 0 15 0;
#X connect 56 0 53 1;
#X connect 57 0 58 0;
#X connect 58 0 13 1;
#X connect 59 0 16 0;

File diff suppressed because it is too large Load Diff

Binary file not shown.

@ -4,10 +4,10 @@
<script language="javascript" type="text/javascript" src="libraries/p5.js"></script>
<script language="javascript" type="text/javascript" src="libraries/p5.min.js"></script>
<!-- uncomment lines below to include extra p5 libraries -->
<script language="javascript" src="libraries/p5.dom.js"></script>
<script language="javascript" src="libraries/p5.sound.js"></script>
<script language="javascript" src="libraries/p5.dom.min.js"></script>
<script language="javascript" src="libraries/p5.sound.min.js"></script>
<script language="javascript" type="text/javascript" src="sketch.js"></script>
<!-- this line removes any default padding and style. you might only need one of these values set. -->
<style> body {padding: 0; margin: 0;} </style>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.

@ -4,9 +4,9 @@
<link rel="stylesheet" type="text/css" href="style.css">
<script language="javascript" type="text/javascript" src="libraries/p5.js"></script>
<script language="javascript" src="libraries/p5.dom.js"></script>
<script language="javascript" src="libraries/p5.sound.js"></script>
<script language="javascript" type="text/javascript" src="../fine-line/libraries/p5.min.js"></script>
<script language="javascript" src="../fine-line/libraries/p5.dom.min.js"></script>
<script language="javascript" src="../fine-line/libraries/p5.sound.min.js"></script>
<script language="javascript" type="text/javascript" src="sketch.js"></script>
<title>The fine line</title>
@ -24,9 +24,9 @@
<div class="links">
<li>
<ul><a href="">Existencialism and Spirituality</a></ul>
<ul><a href="">Explanation of the project</a></ul>
<ul><a href="">Score to find the line</a></ul>
<ul><a href="essay.html">Existencialism and Spirituality</a></ul>
<ul><a href="explanation.html">Explanation of the project</a></ul>
<ul><a href="score.html">Score to find the line</a></ul>
<ul><a href="../fine-line/index.html">The fine line</a></ul>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -19,6 +19,14 @@ h1{
font-size: 70px;
}
a{
text-decoration: none;
color:black;
}
#wrap{

@ -1,16 +1,9 @@
#N canvas 136 23 897 545 10;
#X floatatom 166 153 5 0 0 0 - - -;
#X floatatom 282 159 5 0 0 0 - - -;
#X obj 54 -92 tgl 15 0 empty empty empty 17 7 0 10 -262130 -1 -1 1
1;
#X msg 54 -54 \; pd dsp \$1;
#X obj 267 -7 OSC/unpackOSC;
#X obj 267 -46 iemnet/udpreceive 9001;
#X obj 267 33 OSC/routeOSC /dot;
#N canvas 143 176 897 545 10;
#X floatatom 166 153 5 0 0 0 - - -, f 5;
#X floatatom 282 159 5 0 0 0 - - -, f 5;
#X obj 190 121 unpack f f;
#N canvas 0 22 450 278 (subpatch) 0;
#X array waveform 11 float 1;
#A 0 -1 -1 -1 -1 -1 -1 -1 -0.333333 0 0.333333 -1;
#N canvas 0 50 450 278 (subpatch) 0;
#X array waveform 11 float 0;
#X coords 0 1 10 -1 200 140 1 0 0;
#X restore 494 188 graph;
#X obj 224 247 tabwrite waveform;
@ -21,11 +14,11 @@
#X obj 488 116 tabread waveform;
#X obj 543 23 + 1;
#X obj 505 21 i;
#X obj 504 -39 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
#X obj 504 -39 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
1;
#X msg 534 78 0;
#X floatatom 483 72 5 0 0 0 - - -;
#X floatatom 424 254 5 0 0 0 - - -;
#X floatatom 483 72 5 0 0 0 - - -, f 5;
#X floatatom 424 254 5 0 0 0 - - -, f 5;
#X obj 535 54 select 10;
#X obj 204 325 *~ 10;
#X obj 416 207 + 1;
@ -34,33 +27,39 @@
#X obj 364 370 line~;
#X msg 364 342 \$1 10;
#X obj 337 295 expr 100 + (100 * $f1);
#X connect 2 0 3 0;
#X connect 4 0 6 0;
#X connect 5 0 4 0;
#X connect 6 0 7 0;
#X connect 7 0 0 0;
#X connect 7 0 10 0;
#X connect 7 1 1 0;
#X connect 7 1 11 1;
#X connect 10 0 11 0;
#X connect 10 1 9 1;
#X obj 267 -45 udpreceive 9001;
#X obj 267 -6 unpackOSC;
#X obj 267 33 routeOSC /dot;
#X obj 111 -112 loadbang;
#X msg 54 -54 \; pd dsp 1;
#X connect 2 0 0 0;
#X connect 2 0 5 0;
#X connect 2 1 1 0;
#X connect 2 1 6 1;
#X connect 5 0 6 0;
#X connect 5 1 4 1;
#X connect 6 0 4 0;
#X connect 7 0 8 0;
#X connect 7 0 8 1;
#X connect 9 0 18 0;
#X connect 10 0 11 1;
#X connect 11 0 10 0;
#X connect 11 0 14 0;
#X connect 11 0 9 0;
#X connect 12 0 13 0;
#X connect 12 0 13 1;
#X connect 14 0 23 0;
#X connect 15 0 16 1;
#X connect 16 0 15 0;
#X connect 16 0 19 0;
#X connect 16 0 14 0;
#X connect 16 0 21 0;
#X connect 17 0 24 0;
#X connect 18 0 16 1;
#X connect 21 0 18 0;
#X connect 22 0 12 0;
#X connect 11 0 16 0;
#X connect 12 0 19 0;
#X connect 13 0 11 1;
#X connect 16 0 13 0;
#X connect 17 0 7 0;
#X connect 18 0 15 0;
#X connect 18 0 23 0;
#X connect 19 0 11 0;
#X connect 20 0 17 0;
#X connect 22 0 21 0;
#X connect 23 0 22 0;
#X connect 23 0 20 0;
#X connect 23 0 28 0;
#X connect 24 0 16 0;
#X connect 25 0 22 0;
#X connect 27 0 26 0;
#X connect 28 0 27 0;
#X connect 28 0 25 0;
#X connect 24 0 25 0;
#X connect 25 0 26 0;
#X connect 26 0 2 0;
#X connect 27 0 28 0;
#X connect 27 0 19 0;

@ -1,7 +1,8 @@
#!/usr/bin/env python
from __future__ import print_function
import numpy as np
import cv2, math
import cv2, math, sys
# import video
from picamera.array import PiRGBArray
from picamera import PiCamera
@ -10,7 +11,8 @@ import OSC
# from pythonosc import udp_client
import time
# MESSAGES NEED TO GO TO STDERR
print ("1.HELLO FROM PYTHON stderr", file=sys.stderr)
# def draw_flow(img, flow, step=4): # size grid
# h, w = img.shape[:2]
# y, x = np.mgrid[step/2:h:step, step/2:w:step].reshape(2,-1)
@ -45,7 +47,7 @@ def send_flow0(img, flow, step=4): # size grid
dy = y2 - y1
m = int(math.sqrt( (dx*dx) + (dy*dy) ))
if m>2:
print ("dot", (normx, normy))
print ("dot", (normx, normy), file=sys.stderr)
msg = OSC.OSCMessage()
msg.setAddress("/dot")
#msg.append(dx)
@ -53,7 +55,11 @@ def send_flow0(img, flow, step=4): # size grid
#msg.append(m)
msg.append(normx)
msg.append(normy)
try:
client.send(msg)
except OSC.OSCClientError:
print ("Unable to send OSC", file=sys.stderr)
# client.send_message("/franc", m)
@ -78,6 +84,7 @@ if __name__ == '__main__':
# connect camera
# cam = video.create_capture("0:size=160x120") #canvas size in pixels
print ("Starting camera", file=sys.stderr)
cam = PiCamera()
framesize = (160, 128)
cam.resolution = framesize
@ -86,10 +93,17 @@ if __name__ == '__main__':
# allow the camera to warmup
time.sleep(0.25)
print ("Starting main camera loop", file=sys.stderr)
# connect to pd
# Init OSC
while True:
try:
client = OSC.OSCClient()
client.connect(('127.0.0.1', 9001)) # first argument is the IP of the host, second argument is the port to use
break
except OSC.OSCClientError:
print ("Unable to connect via OSC to pd, trying again in 5", file=sys.stderr)
time.sleep(5)
prevgray = None
for frame in cam.capture_continuous(rawCapture, format="bgr", use_video_port=True):

@ -0,0 +1 @@
<svg id="step_S_" data-name="step (S)" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><defs><style>.cls-1{fill:#fff;}.cls-2,.cls-3{fill:none;stroke-miterlimit:10;stroke-width:4px;}.cls-2{stroke:#2e3192;}.cls-3{stroke:#c1272d;}</style></defs><title>choreology-Bump</title><g id="_1_Basic_Turn-2" data-name="1 Basic Turn"><rect class="cls-1" width="150" height="150"/><polyline id="A2_basic_turn" data-name="A2 basic turn" class="cls-2" points="17.48 48.21 32.95 61 71 61"/><path id="A2_basic_turn-2" data-name="A2 basic turn" class="cls-3" d="M17.75,100.64l15-12.74,42.37,2.43s6,0.25,6,6-6,6-6,6-6-.21-6-6,6-6,6-6l42.31-2.47L132.5,75.07"/></g></svg>

After

Width:  |  Height:  |  Size: 658 B

@ -0,0 +1 @@
<svg id="step_S_" data-name="step (S)" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><defs><style>.cls-1{fill:#fff;}.cls-2,.cls-4{fill:none;stroke-miterlimit:10;stroke-width:4px;}.cls-2{stroke:#c1272d;}.cls-3{fill:#c1272d;}.cls-4{stroke:#2e3192;}.cls-5{fill:#2e3192;}</style></defs><title>choreology-Bump</title><g id="_10_Chicken_Walks-2" data-name="10 Chicken Walks"><rect class="cls-1" width="150" height="150"/><path id="A2_basic_turn" data-name="A2 basic turn" class="cls-2" d="M75.05,132.5l12.82-15L90.3,75s0.25-6,6-6,6,6,6,6-0.21,6-6,6-6-6-6-6L87.83,32.61,75,17.5"/><circle class="cls-3" cx="88.5" cy="45.95" r="4"/><polyline class="cls-2" points="71.01 53.53 88.72 45.95 106.35 53.53 88.63 45.95"/><polyline id="A2_basic_turn-2" data-name="A2 basic turn" class="cls-4" points="62 58 62 101.91 61.65 102 46.56 89.47"/><circle class="cls-5" cx="62" cy="79.35" r="4"/><polyline class="cls-4" points="79.27 71.77 61.55 79.35 43.93 71.77 61.64 79.35"/></g></svg>

After

Width:  |  Height:  |  Size: 976 B

@ -0,0 +1 @@
<svg id="step_S_" data-name="step (S)" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><defs><style>.cls-1{fill:#fff;}.cls-2,.cls-3{fill:none;stroke-miterlimit:10;stroke-width:4px;}.cls-2{stroke:#c1272d;}.cls-3{stroke:#2e3192;}</style></defs><title>choreology-Bump</title><g id="_2_Follow-2" data-name="2 Follow"><rect class="cls-1" width="150" height="150"/><path id="A3_follow" data-name="A3 follow" class="cls-2" d="M103.87,132.9l-12.77-15L93.53,75.4s0.25-6,6-6,6,6,6,6-0.21,6-6,6-6-6-6-6L91.05,33,78.24,17.9"/><path id="A3_follow-2" data-name="A3 follow" class="cls-3" d="M46.13,132.9l12.77-15L56.47,75.4s-0.25-6-6-6-6,6-6,6,0.21,6,6,6,6-6,6-6L58.95,33,71.76,17.9"/></g></svg>

After

Width:  |  Height:  |  Size: 689 B

@ -0,0 +1 @@
<svg id="step_S_" data-name="step (S)" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><defs><style>.cls-1{fill:#fff;}.cls-2,.cls-3,.cls-4{fill:none;stroke-miterlimit:10;}.cls-2,.cls-4{stroke:#c1272d;}.cls-2,.cls-3{stroke-width:4px;}.cls-3{stroke:#2e3192;}.cls-4{stroke-width:3px;}</style></defs><title>choreology-Bump</title><g id="_3_American_Spin-2" data-name="3 American Spin"><rect class="cls-1" width="150" height="150"/><path id="A2_basic_turn" data-name="A2 basic turn" class="cls-2" d="M17.56,100.24l15-12.77L75.06,89.9s6,0.25,6,6-6,6-6,6-6-.21-6-6,6-6,6-6l42.4-2.47,15.11-12.81"/><polyline id="A2_basic_turn-2" data-name="A2 basic turn" class="cls-3" points="17.82 48.18 32.79 61 72 61"/><path class="cls-4" d="M97.81,99.11a8.63,8.63,0,1,0-4.44-3.66"/><polyline class="cls-4" points="101.57 103.27 97.89 99.11 102.55 95.99"/></g></svg>

After

Width:  |  Height:  |  Size: 854 B

@ -0,0 +1 @@
<svg id="step_S_" data-name="step (S)" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#c1272d;}.cls-3,.cls-5{fill:none;stroke-miterlimit:10;stroke-width:4px;}.cls-3{stroke:#c1272d;}.cls-4{fill:#2e3192;}.cls-5{stroke:#2e3192;}</style></defs><title>choreology-Bump</title><g id="_4_Bump-2" data-name="4 Bump"><rect class="cls-1" width="150" height="150"/><circle class="cls-2" cx="70" cy="80.41" r="4"/><polyline id="A2_basic_turn" data-name="A2 basic turn" class="cls-3" points="82.82 134.25 70 119.33 70 80"/><circle class="cls-4" cx="70" cy="69.6" r="4"/><polyline id="A2_basic_turn-2" data-name="A2 basic turn" class="cls-5" points="82.82 15.26 70 30.68 70 69"/></g></svg>

After

Width:  |  Height:  |  Size: 727 B

@ -0,0 +1 @@
<svg id="step_S_" data-name="step (S)" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><defs><style>.cls-1{fill:#fff;}.cls-2,.cls-5{fill:none;stroke-miterlimit:10;stroke-width:4px;}.cls-2{stroke:#c1272d;}.cls-3{fill:#c1272d;}.cls-4{fill:#2e3192;}.cls-5{stroke:#2e3192;}</style></defs><title>choreology-Bump</title><g id="_5_Stop_and_Go-2" data-name="5 Stop and Go"><rect class="cls-1" width="150" height="150"/><path id="A2_basic_turn" data-name="A2 basic turn" class="cls-2" d="M17.59,100.31l15-12.76L75,90s6,0.25,6,6-6,6-6,6-6-.21-6-6,6-6,6-6l42.36-2.47,15.09-12.8"/><circle class="cls-3" cx="55.7" cy="89.04" r="4"/><circle class="cls-4" cx="56.65" cy="61" r="4"/><polyline id="A2_basic_turn-2" data-name="A2 basic turn" class="cls-5" points="17.26 48.19 32.8 61 56 61"/></g></svg>

After

Width:  |  Height:  |  Size: 793 B

@ -0,0 +1 @@
<svg id="step_S_" data-name="step (S)" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><defs><style>.cls-1{fill:#fff;}.cls-2,.cls-3{fill:none;stroke-miterlimit:10;stroke-width:4px;}.cls-2{stroke:#c1272d;}.cls-3{stroke:#2e3192;}</style></defs><title>choreology-Bump</title><g id="_6_Windmill-2" data-name="6 Windmill"><rect class="cls-1" width="150" height="150"/><path id="A2_basic_turn" data-name="A2 basic turn" class="cls-2" d="M48.81,102L36.08,86.87s0-39,38.87-38.87"/><path id="A2_basic_turn-2" data-name="A2 basic turn" class="cls-3" d="M113.92,48.1l-12.35,15s0,39-38.87,38.87"/></g></svg>

After

Width:  |  Height:  |  Size: 604 B

@ -0,0 +1 @@
<svg id="step_S_" data-name="step (S)" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><defs><style>.cls-1{fill:#fff;}.cls-2,.cls-3{fill:none;stroke-miterlimit:10;stroke-width:4px;}.cls-2{stroke:#2e3192;}.cls-3{stroke:#c1272d;}</style></defs><title>choreology-Bump</title><g id="_7_Spanish_Arms-2" data-name="7 Spanish Arms"><rect class="cls-1" width="150" height="150"/><polyline id="A2_basic_turn" data-name="A2 basic turn" class="cls-2" points="95.81 25.14 83 40.25 83 125"/><path id="A2_basic_turn-2" data-name="A2 basic turn" class="cls-3" d="M66.6,124.91l-12.76-15,2.43-42.43s0.25-6,6-6,6,6,6,6-0.21,6-6,6-6-6-6-6L53.8,25.09"/></g></svg>

After

Width:  |  Height:  |  Size: 652 B

@ -0,0 +1 @@
<svg id="step_S_" data-name="step (S)" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#c1272d;}.cls-3,.cls-5{fill:none;stroke-miterlimit:10;stroke-width:4px;}.cls-3{stroke:#c1272d;}.cls-4{fill:#2e3192;}.cls-5{stroke:#2e3192;}</style></defs><title>choreology-Bump</title><g id="_8_Hucklebuck-2" data-name="8 Hucklebuck"><rect class="cls-1" width="150" height="150"/><circle class="cls-2" cx="74.96" cy="86.82" r="4"/><polyline class="cls-3" points="57.33 94.4 75.04 86.82 92.67 94.4 74.96 86.82"/><circle class="cls-4" cx="74.96" cy="63.18" r="4"/><polyline class="cls-5" points="92.67 55.6 74.96 63.18 57.33 55.6 75.04 63.18"/></g></svg>

After

Width:  |  Height:  |  Size: 690 B

@ -0,0 +1 @@
<svg id="step_S_" data-name="step (S)" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><defs><style>.cls-1{fill:#fff;}.cls-2,.cls-3,.cls-4,.cls-5{fill:none;stroke-miterlimit:10;}.cls-2,.cls-4{stroke:#c1272d;}.cls-2,.cls-3{stroke-width:3px;}.cls-3,.cls-5{stroke:#2e3192;}.cls-3{stroke-dasharray:30 30;}.cls-4,.cls-5{stroke-width:4px;}</style></defs><title>choreology-Bump</title><g id="_9_Whip-2" data-name="9 Whip"><rect class="cls-1" width="150" height="150"/><path class="cls-2" d="M95.18,82.63L95.7,82.8a8.51,8.51,0,0,0,6.75-.81,8.62,8.62,0,1,0-12-3.5c0.16,0.31.26,0.47,0.26,0.47"/><path class="cls-3" d="M95.22,82.64s0.18,0.07.51,0.17a8.6,8.6,0,0,0,1.5.3A8.69,8.69,0,0,0,102.47,82a8.62,8.62,0,1,0-12-3.51l0.26,0.47"/><polyline class="cls-2" points="98.78 86.79 95.11 82.63 99.76 79.51"/><polyline class="cls-3" points="98.78 86.78 95.11 82.63 99.75 79.51"/><polyline id="A2_basic_turn" data-name="A2 basic turn" class="cls-4" points="43.51 94.8 58.31 82 85 82"/><polyline id="A2_basic_turn-2" data-name="A2 basic turn" class="cls-5" points="43.45 55.2 58.39 68 85 68"/></g></svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -1,27 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 300 300" style="enable-background:new 0 0 300 300;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;stroke:#FFFFFF;stroke-width:0.495;stroke-miterlimit:10;}
.st0{fill:none;}
.st1{fill:#FFFFFF;}
</style>
<g>
<path d="M29.3,188.4c0,0,1.2,1.6,0.6,3.6s-2.9,8.7-2.9,8.7l0.8,8.3l4.1-8.3l2.2-7.2l-2-5.1H29.3z"/>
<path d="M270.3,188.6c0,0-1.2,1.6-0.6,3.6c0.6,1.9,2.9,8.7,2.9,8.7l-0.8,8.3l-4.1-8.3l-2.2-7.2l2-5.1H270.3z"/>
<path d="M164.8,141.5c0,0-3.7-2.3-6-4.9c-2.3-2.6-2.6-5.5-2.6-5.5v-15.9c0-12.2-0.9-11.9-3.2-14.2c-2.3-2.3-3.3-4.4-3.3-4.4
s-1,2.1-3.3,4.4c-2.3,2.3-3.2,2-3.2,14.2v15.9c0,0-0.4,2.9-2.6,5.5c-2.3,2.6-6,4.9-6,4.9l-1.7,17.7l2.9,1.3v0.5c0,0,1-1.7,4.3-1.7
c3.3,0,2.5,3.1,2.5,3.7V180c0,0,0.4,13,3.4,18.6c0,0,1.9-0.9,3.5-0.9c1.6,0,3.5,0.9,3.5,0.9c3.1-5.6,3.4-18.6,3.4-18.6v-16.9
c0-0.6-0.7-3.7,2.5-3.7c3.3,0,4.3,1.7,4.3,1.7v-0.5l3-1.3L164.8,141.5z"/>
<line x1="149.7" y1="97.7" x2="149.7" y2="89.8"/>
<path d="M146.9,198.7c0,0-5.5-0.5-10.1,0.6c0,0,5.2,0.7,8.3,0.7C146.4,200.1,146.9,198.7,146.9,198.7"/>
<path d="M151.6,198.7c0,0,5.5-0.5,10.1,0.6c0,0-5.2,0.7-8.3,0.7C152.2,200.1,151.6,198.7,151.6,198.7"/>
<path d="M145.9,200.1c0,0,0.9,5.2,3.3,7.6c0,0,3-3.6,3.4-7.5c0.4-3.9,0,0.2,0,0.2s0.2-2.1-2.8-2.1S145.9,200.1,145.9,200.1"/>
<path d="M135.9,140.8v19.7l-104,40.2v-10.1c0,0-0.8-2.3-1.6-2.2c-0.8,0.1-2.3-0.3-2.3-0.3s-1.1-1.1,1.9-2.3
C32.9,184.6,122.4,148,135.9,140.8"/>
<path d="M163.7,141v19.7l104,40.1v-10.1c0,0,0.8-2.3,1.6-2.2c0.8,0.1,2.3-0.3,2.3-0.3s1.1-1.1-1.9-2.3
C266.7,184.8,177.2,148.2,163.7,141"/>
<path d="M153,127.9c0,1.3-1.5,2.4-3.3,2.4c-1.8,0-3.3-1.1-3.3-2.4c0-1.3,1.5-2.4,3.3-2.4C151.5,125.5,153,126.5,153,127.9"/>
<line class="st0" x1="135.2" y1="136.5" x2="135.2" y2="172.3"/>
<line class="st0" x1="165.2" y1="136.5" x2="165.2" y2="172.3"/>
<g id="Layer_2">
</g>
<g id="Layer_1">
<path class="st0" d="M152.6,199.8c0,0-0.1,0-0.1-0.1c0.1,0.2,0.1,0.3,0.1,0.4c0,0,0,0,0,0C152.6,200.1,152.6,200,152.6,199.8z"/>
<path d="M30.3,188.4c-0.2,0-0.4,0-0.6,0h-0.4c0,0,1.2,1.6,0.6,3.6c-0.6,2-2.9,8.7-2.9,8.7l0.8,8.3l4.1-8.3v-10.1
C31.9,190.6,31.1,188.3,30.3,188.4z"/>
<path d="M269.7,192.2c-0.6-2,0.6-3.6,0.6-3.6H269c-0.7,0.4-1.3,2.1-1.3,2.1v10.1l0,0l0,0.1l4.1,8.3l0.8-8.3
C272.6,200.9,270.3,194.1,269.7,192.2z"/>
<path d="M135,141.3c0,0-0.1,0-0.1,0.1C134.9,141.3,134.9,141.3,135,141.3L135,141.3z"/>
<path d="M146.3,199.5c0.4-0.4,0.6-0.8,0.6-0.8s-5.5-0.5-10.1,0.6c0,0,5.2,0.7,8.3,0.7C145.7,200,146.1,199.8,146.3,199.5
C146.3,199.5,146.3,199.5,146.3,199.5z"/>
<path d="M152.8,198.6c0,0.2-0.1,0.8-0.1,1.2c0.2,0.1,0.5,0.2,0.7,0.1c3.1,0,8.3-0.7,8.3-0.7C158.4,198.5,154.6,198.5,152.8,198.6z"
/>
<path d="M152.5,199.8c0,0,0.1,0.1,0.1,0.1c0.1-0.7,0.1-1.1,0.1-1.2c-0.7,0-1.1,0.1-1.1,0.1C152.2,199,152.4,199.4,152.5,199.8z"/>
<path d="M152.6,200.2C152.6,200.2,152.6,200.2,152.6,200.2c0,0.1,0,0.2,0,0.2s0-0.2,0.1-0.5c0,0,0,0,0,0
C152.6,200,152.6,200.1,152.6,200.2z"/>
<path d="M152.8,198.6C152.8,198.6,152.8,198.6,152.8,198.6C152.8,198.5,152.8,198.5,152.8,198.6z"/>
<path d="M151.6,198.7C151.6,198.7,151.6,198.7,151.6,198.7c-0.4-0.2-1-0.4-1.8-0.4c-1.9,0-2.9,0.7-3.5,1.2c0,0,0,0,0,0
c-0.3,0.3-0.4,0.6-0.4,0.6s0.9,5.2,3.3,7.6c0,0,3-3.6,3.4-7.5c0-0.1,0-0.3-0.1-0.4C151.9,199.4,151.6,198.7,151.6,198.7z"/>
<path d="M146.3,199.5C146.3,199.5,146.3,199.5,146.3,199.5C146.3,199.5,146.3,199.5,146.3,199.5z"/>
<path d="M152.5,199.8c-0.1-0.4-0.4-0.8-0.9-1.1c0,0,0,0,0,0S151.9,199.4,152.5,199.8z"/>
<path d="M152.8,198.6c0,0.2-0.1,0.5-0.1,1.2c0,0,0,0,0,0C152.7,199.4,152.7,198.9,152.8,198.6C152.8,198.6,152.8,198.6,152.8,198.6
z"/>
<path d="M32.1,188.4h-1.8c0.8-0.1,1.6,2.2,1.6,2.2v10.1l2.2-7.2L32.1,188.4z"/>
<path d="M30.3,188.4h-0.6C29.9,188.4,30.1,188.4,30.3,188.4z"/>
<path d="M134.8,141.3c-16.5,8.3-102,43.3-104.9,44.5c-3,1.2-1.9,2.3-1.9,2.3s0.9,0.2,1.7,0.3h0.6h1.8l2,5.1l-2.2,7.2L135,160.9
v-0.7v-18.8C134.9,141.3,134.9,141.3,134.8,141.3z"/>
<path d="M267.7,190.7c0,0,0.6-1.7,1.3-2.1h-1.5l-2,5.1l2.2,7.1l0,0V190.7z"/>
<path d="M269.7,185.9c-2.9-1.1-86.2-35.1-104.3-44v7.8v9.9v1.7l102.2,39.4l-2.2-7.1l2-5.1h1.5c0.1-0.1,0.2-0.1,0.3-0.1
c0.8,0.1,2.3-0.3,2.3-0.3S272.7,187.1,269.7,185.9z"/>
<path d="M164.8,141.6L164.8,141.6c0-0.1-3.7-2.4-6-5c-2.3-2.6-2.6-5.5-2.6-5.5v-15.9c0-12.2-0.9-11.9-3.2-14.2s-3.3-4.4-3.3-4.4
s-1,2.1-3.3,4.4c-2.3,2.3-3.2,2-3.2,14.2v15.9c0,0-0.4,2.9-2.6,5.5c-1.6,1.8-3.9,3.5-5.2,4.3v0.1v19.3v0.3l0.4-0.1v0.5
c0,0,1-1.7,4.3-1.7c3.3,0,2.5,3.1,2.5,3.7v17c0,0,0.4,13,3.4,18.6c0,0,1.9-0.9,3.5-0.9c1.6,0,3.5,0.9,3.5,0.9
c3.1-5.6,3.4-18.6,3.4-18.6v-16.9c0-0.6-0.7-3.7,2.5-3.7c3.3,0,4.3,1.7,4.3,1.7v-0.5l0.5-0.2v0.3l1.3,0.5v-1.3v-16.4v-1.8
C164.9,141.6,164.9,141.6,164.8,141.6z M149.7,130.3c-1.8,0-3.3-1.1-3.3-2.4c0-1.3,1.5-2.4,3.3-2.4s3.3,1,3.3,2.4
C153,129.2,151.5,130.3,149.7,130.3z"/>
<path d="M149.7,125.5c-1.8,0-3.3,1.1-3.3,2.4c0,1.3,1.5,2.4,3.3,2.4s3.3-1.1,3.3-2.4C153,126.5,151.5,125.5,149.7,125.5z"/>
<path class="st1" d="M135.4,141L135.4,141c-0.2,0-0.4,0.2-0.5,0.2v0C135.1,141.2,135.3,141.1,135.4,141z"/>
<path class="st1" d="M135,160.1"/>
<path class="st1" d="M135.4,141c-0.2,0.1-0.3,0.2-0.5,0.3"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

@ -1,20 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 300 300" style="enable-background:new 0 0 300 300;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;stroke:#FFFFFF;stroke-width:0.5;stroke-miterlimit:10;}
</style>
<g>
<polygon points="155.7,188.5 237.8,208.4 237.8,225 156,225 "/>
<polygon points="136.7,188.5 54.6,208.4 54.6,225 136.5,225 "/>
<path d="M156.2,95.2c1.6,0.4,36.8,10.9,36.8,10.9v10.7h-36.6l-0.6-21.2"/>
<path d="M136.9,95.2c-1.6,0.4-36.8,10.9-36.8,10.9v10.7h36.6l0.6-21.2"/>
<path d="M136,93c0,0,1.5-34.3,10.4-34.3c8.9,0,10.5,34.8,10.5,34.8"/>
<g id="Layer_2">
</g>
<g id="Layer_1">
<g>
<rect x="141" y="230.2" width="11.1" height="3.3"/>
<rect x="135.9" y="92.7" width="21" height="137.9"/>
<rect x="135.9" y="92.7" class="st0" width="21" height="137.9"/>
<rect x="144.3" y="186.4" width="5.2" height="43.8"/>
<rect x="144.3" y="186.4" class="st0" width="5.2" height="43.8"/>
<path d="M193,106.1c0,0-28.4-8.5-35.3-10.5v21.2H193V106.1z"/>
<path d="M100.1,106.1v10.7h35V95.7C127.8,97.8,100.1,106.1,100.1,106.1z"/>
<path d="M146.4,58.7c-8,0-10,27.5-10.3,33.3h20.8C156.4,85.2,154.2,58.7,146.4,58.7z"/>
<g>
<polygon points="237.8,208.4 157.7,189 157.7,225 237.8,225 "/>
<polygon points="54.6,208.4 54.6,225 135.1,225 135.1,188.9 "/>
</g>
<rect x="144.5" y="186.9" width="4.7" height="42.3"/>
<path d="M136.3,93.2v137.4h20.5V93.2H136.3z M149.8,230.5H144v-44.3h5.7V230.5z"/>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 970 B

@ -2,25 +2,18 @@
<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 300 300" style="enable-background:new 0 0 300 300;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;stroke:#000000;stroke-width:0.5;stroke-miterlimit:10;}
.st1{fill:none;stroke:#FFFFFF;stroke-width:0.495;stroke-miterlimit:10;}
.st2{fill:none;stroke:#FFFFFF;stroke-width:0.499;stroke-miterlimit:10;}
</style>
<path d="M162.3,117.2c0.5-4.4,1-9.4,1-17.2c0-7.1-2.4-10.6-4.4-12.4c-0.7-0.6-1.3-1-1.9-1.3v0.5v-0.5c-1.2-0.6-2.2-0.8-2.4-0.8
c-0.2,0-2.3,0.3-4.4,2.1c-2.9,2.5-4.4,6.8-4.4,12.3c0,7.7,0.5,12.7,1,17.1c0.4,3.6,0.7,6.8,0.7,10.7v6.3h14.1v-6.3
C161.6,123.9,161.9,120.8,162.3,117.2z"/>
<polygon points="147.4,146.8 147.7,146.8 147.7,164.2 147.4,164.1 147.4,173.8 161.6,173.8 161.6,164.1 160.8,164.2 160.8,146.8
161.6,146.9 161.6,134.8 147.4,134.8 "/>
<path d="M147.4,203.5c0,0.1,0.4,9.9,3.3,14.3h6.9c2.5-3.8,3.2-13.5,3.2-13.6l0.7-12.9v-16.8h-14.1V203.5z"/>
<polygon points="160.8,164.5 161.6,164.5 161.6,146.6 160.8,146.6 "/>
<polygon points="147.7,146.6 147.4,146.6 147.4,164.5 147.7,164.5 "/>
<path d="M283.6,155.8l-0.8,0v0C283.3,155.8,283.6,155.8,283.6,155.8z"/>
<g>
<line class="st0" x1="151.1" y1="78.8" x2="151.1" y2="86.9"/>
<line class="st0" x1="157" y1="78.8" x2="157" y2="86.9"/>
<polygon points="160.8,146.6 282.8,148.7 282.8,159.8 160.8,164.5 "/>
<polygon points="147.7,146.6 25.7,148.7 25.7,159.8 147.7,164.5 "/>
<path d="M154.6,85.3c0,0-9.1,0.9-9.1,14.7s1.7,19,1.7,27.8v63.5v12.2c0,0,0.4,10.1,3.4,14.5h7.2c2.6-3.8,3.3-13.8,3.3-13.8
l0.7-12.9v-63.5c0-8.8,1.7-13.9,1.7-27.8S154.6,85.3,154.6,85.3"/>
<path class="st1" d="M154.6,85.3c0,0-9.1,0.9-9.1,14.7s1.7,19,1.7,27.8v63.5v12.2c0,0,0.4,10.1,3.4,14.5h7.2
c2.6-3.8,3.3-13.8,3.3-13.8l0.7-12.9v-63.5c0-8.8,1.7-13.9,1.7-27.8S154.6,85.3,154.6,85.3"/>
<path d="M162.3,160c1,0.4,121.3-4.2,121.3-4.2"/>
<path class="st2" d="M162.3,160c1,0.4,121.3-4.2,121.3-4.2"/>
<path d="M146.6,160c-1,0.4-121.3-4.2-121.3-4.2"/>
<path class="st2" d="M146.6,160c-1,0.4-121.3-4.2-121.3-4.2"/>
<line class="st1" x1="147.2" y1="134.1" x2="162.1" y2="134.1"/>
<line class="st1" x1="146.8" y1="174.5" x2="161.9" y2="174.5"/>
<path d="M162,146.6v17.8l120.8-4.7v-4c-10.5,1.1-119.7,5.2-120.5,4.2l120.5-4.2v-7.1L162,146.6z"/>
</g>
<path d="M25.3,155.8c0,0,0.1,0,0.4,0v0L25.3,155.8z"/>
<path d="M147,146.6l-121.3,2.1l0,6.7l120.9,4.2c-1,0.8-113.4-3.5-120.9-3.7v4l121.3,4.7L147,146.6z"/>
</svg>

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

@ -1,28 +1,20 @@
<!DOCTYPE html>
<html lang="en">
<head>
<link href="https://fonts.googleapis.com/css?family=Roboto+Mono|Source+Code+Proo|Ubuntu" rel="stylesheet">
<link rel="stylesheet" href="style.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js" type="text/javascript"></script>
<script src="autoscroll.js" type="text/javascript"></script>
<script src="jquery-3.2.0.min.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta charset="UTF-8">
<title>Drone</title>
</head>
<body>
<header>
<div class="title"><span>Table of contents from the <br>National Couterterrorism Center's (NCC) <br> <a href="https://theintercept.com/document/2014/07/23/march-2013-watchlisting-guidance/" target="_blank">'Watchlisting Guidance'</a></span>
</div>
<p class="instructions">
<span class="shoes">Please remove your shoes, put your head back and enjoy the sound of drones!</span>
</p>
<div class="title">Drone Oddity <br>#1</div>
<p class="instructions">Please remove your shoes, put your head back and enjoy the sound of&nbsp;drones!</p>
</header>
<div class="transcript" id="transcroll">
<embed id="watchlist" scrolling="yes" src="txt/watchlist.txt" height="500px"></embed>
<embed id="watchlist" scrolling="yes" src="watchlist.txt" height="500px"></embed>
</div><!-- /end transcript -->
<div><a href="http://www.warrug.com"></a>Buy war rugs here...</div>
@ -31,8 +23,15 @@
<img src="img/drone2.svg" alt="">
<img src="img/drone3.svg" alt="">
<script type="text/javascript">
$('#transcroll,body,html').animate({ scrollTop: $('body').height() }, 100000);
<footer>
<div class="subtitle">
This score was composed from the structure of the <a href="https://theintercept.com/document/2014/07/23/march-2013-watchlisting-guidance/" target="_blank">'Watchlisting Guidance'</a> document written by the National Counterterrorism Center (NCC)
</div>
</footer>
<script type="text/javascript">
$('#transcroll,body,html').animate({ scrollTop: $('body').height() }, 300000);
</script>
</body>

@ -5,58 +5,59 @@
background-position: center;
background-size: 100%;
font-family: 'Roboto Mono', monospace;
margin: 0 !important;
}
header{}
.title {text-align: center;
font-size: 45px;
margin-top: 50px;
color: black;
font-weight: 700;
margin-left: 20px;
margin-right:20px;
}
.title a {color:black;
text-decoration: underline;}
a{text-decoration: none;
}
.title span{
background-color: rgba(255,255,255,.9);
}
.subtitle{font-size: 50px;
@font-face {
font-family: 'Roboto Mono', monospace;
src: url(RobotoMono-Regular.ttf);
}
header{
height: 400px;
background: black; /* For browsers that do not support gradients */
background: -webkit-linear-gradient(black, transparent); /* For Safari 5.1 to 6.0 */
background: -o-linear-gradient(black, transparent); /* For Opera 11.1 to 12.0 */
background: -moz-linear-gradient(black, transparent); /* For Firefox 3.6 to 15 */
background: linear-gradient(black, transparent); /* Standard syntax (must be last) */
margin:-10px;
padding-top: 60px;
}
.title {
padding-top: 40px;
text-align: center;
font-weight: 100;
color: black;
}
.shoes{font-size: 20px;
font-style: normal;}
.subtitle span{
background-color: rgba(255,255,255,.8);
font-size: 70px;
color: white;
margin:auto;
font-weight: 700;;
padding: 6px;
}
.instructions span{background-color: rgba(0,0,20,.85)}
.title a {
color:black;
text-decoration: underline;}
a{ text-decoration: none;}
.instructions{
max-width: 300px;
line-height: 22px
font-size: 30px;
margin-bottom: 20px;
font-weight: 100;
text-align: center;
max-width: 39%;
line-height: 26px;
font-size: 20px;
padding: 10px;
margin: auto;
font-weight: 500;
color: white;
font-style: italic;}
audio{
width: 100%;
margin-bottom: -5px;}
}
.wrap{width: 100%;
}
.transcript{
width:40%;
margin:auto;
height:5500px;
overflow: hidden;
border: 4px solid;
}
.title-transcript{
margin-top: 0;
margin-bottom: 0;
@ -75,11 +76,31 @@
height:5500px;
width: 100%;
}
footer{
height: 400px;
background: black; /* For browsers that do not support gradients */
background: -webkit-linear-gradient(transparent, black); /* For Safari 5.1 to 6.0 */
background: -o-linear-gradient(transparent, black); /* For Opera 11.1 to 12.0 */
background: -moz-linear-gradient(transparent, black); /* For Firefox 3.6 to 15 */
background: linear-gradient(transparent, black); /* Standard syntax (must be last) */
margin:-10px;
padding: 20px;
}
.subtitle{
text-align: center;
font-size: 40px;
color: white;
font-weight: 700;;
}
.subtitle a{
text-decoration: none;
color: white;
}
embed::-webkit-scrollbar-track
{
/*border: 1px solid black;
*/ background-color: #F5F5F5;
background-color: #F5F5F5;
}
embed::-webkit-scrollbar
@ -95,12 +116,19 @@ embed::-webkit-scrollbar-thumb
/*////////mobile///////*/
@media screen and (max-width:767px) {
.title{font-size: 35px;}
.transcript{
.title{font-size: 30 px;
max-width: 90%;}
.instructions{max-width: 90%;}
.transcript{
margin-top: 50px;
width:90%;
height: 500px;
height: 6555px;
}
.transcript embed{height: 6555px;}
.header{margin-bottom: 20px;}
.footer{height: 600px;}
.subtitle{
margin-top: 40px;
font-size: 26px;}
}/*end of 767*/

@ -1,383 +0,0 @@
Chapter 1
section 1
sub 1
foot 1
sub 2
foot 1
foot 2
sub 3
sub 4
section 2
sub 1
foot 1
sub 2
foot 1
foot 2
sub 3
foot 1
sub 4
sub 5
foot 1
foot 2
subsub 1
sub 6
sub 7
foot 1
sub 8
sub 9
sub 10
foot 1
subsub 1
subsub 2
subsubsub 1
subsubsub 2
subsubsub 3
sub 11
sub 12
sub 13
foot 1
foot 2
sub 14
foot 1
section 3
sub 1
foot 1
subsub 1
subsub 2
subsub 3
subsub 4
sub 2
section 4
sub 1
foot 1
sub 2
foot 1
sub 3
section 5
sub 1
subsub 1
subsub 2
foot 1
section 6
sub 1
sub 2
sub 3
sub 4
sub 5
foot 1
sub 6
foot 1
sub 7
sub 8
sub 9
foot 1
section 7
sub 1
sub 2
foot 1
sub 3
sub 4
section 8
sub 1
sub 2
sub 3
subsub 1
subsub 2
subsub 3
foot 1
sub 4
sub 5
foot 1
sub 6
subsub 1
subsub 2
subsub 3
subsub 4
foot 1
subsub 5
subsub 6
subsub 7
subsub 8
subsub 9
sub 7
sub 8
sub 9
section 9
sub 1
foot 1
sub 2
subsub 1
subsub 2
subsub 3
foot 1
subsub 4
sub 3
sub 4
sub 5
sub 6
subsub 1
subsub 2
sub 7
subsub 1
subsub 2
foot 1
subsubsub 1
foot 1
subsubsub 2
subsubsub 3
subsubsub 4
subsubsub 5
sub 8
sub 9
foot 1
sub 10
foot 1
subsub 1
foot 1
subsub 2
subsubsub 1
subsubsubsub 1
subsubsubsub 2
subsubsubsub 3
subsubsubsub 4
subsubsubsub 5
subsubsubsub 6
subsubsubsub 7
subsubsub 2
sub 11
sub 12
subsub 1
censored 2
subsub 2
subsub 3
subsub 4
sub 13
subsub 1
subsubsub 1
subsubsub 2
subsubsub 3
subsubsub 4
subsub 2
subsub 3
subsub 4
subsub 5
subsub 6
sub 14
sub 15
sub 16
section 10
sub 1
sub 2
sub 3
subsub 1
subsub 2
subsub 3
foot 1
sub 4
sub 5
section 11
sub 1
sub 2
foot 1
sub 3
sub 4
sub 5
section 12
sub 1
Chapter 2
section 1
sub 1
section 2
sub 1
subsub1
sub 2
sub 3
sub 4
subsub 1
subsub 2
subsubsub 1
subsubsub 2
subsubsub 3
subsubsub 4
foot 1
subsubsub 5
foot 1
subsubsub 6
subsub 3
foot 1
subsubsub 1
subsubsub 2
subsubsub 3
subsubsub 4
subsubsub 5
subsubsub 6
subsubsub 7
subsubsub 8
subsubsub 9
subsubsub 10
section 3
sub 1
sub 2
subsub 1
subsub 2
subsub 3
subsub 4
subsub 5
subsub 6
subsub 7
Chapter 3
section 1
sub 1
sub 2
section 2
sub 1
sub 2
sub 3
sub 4
sub 5
sub 6
sub 7
subsub 1
subsub 2
subsub 3
subsub 4
section 3
sub 1
subsub 1
subsub 2
sub 2
subsub 1
subsub 2
subsub 3
subsub 4
section 4
sub 1
subsub 1
sub 2
subsub 1
subsub 2
subsub 3
subsub 4
subsubsub 1
subsubsubsub 1
subsubsubsub 2
subsubsubsub 3
subsubsubsub 4
subsub 5
subsubsub 1
subsub 6
subsub 7
subsub 8
subsubsub 1
subsub 9
subsubsub 1
subsub 10
subsub 11
subsub 12
subsub 13
section 5
sub 1
subsub 1
subsubsub 1
subsubsubsub 1
subsubsubsub 2
subsubsub 2
subsubsub 3
subsub 2
subsub 3
subsub 4
subsub 5
subsub 6
subsubsub 1
subsubsub 2
subsubsub 3
subsubsub 4
subsubsub 5
subsub 7
section 6
sub 1
subsub 1
subsubsub 1
subsubsub 2
subsubsub 3
subsubsub 4
subsub 2
subsub 3
sub 2
subsub 1
sub 3
subsub 1
subsubsub 1
subsubsub 2
subsub 2
section 7
sub 1
subsub 1
subsub 2
subsub 3
subsub 4
subsub 5
subsub 6
subsub 7
subsub 8
subsub 9
subsub 10
subsub 11
subsub 12
subsub 13
subsub 15
subsub 16
subsub 17
subsub 18
subsub 19
subsub 20
subsub 21
subsub 22
subsub 23
subsub 24
subsub 25
subsub 26
subsub 27
subsub 28
subsub 29
subsub 30
subsub 31
subsub 32
subsub 33
subsub 34
subsub 35
subsub 36
subsub 37
subsub 38
subsub 39
subsub 40
subsub 41
subsub 42
subsub 43
subsub 44
subsub 45
subsub 46
Chapter 4

@ -1,15 +1,17 @@
#! /usr/bin/env python
import re, subprocess, random
import re, subprocess, random, os
from time import sleep
# requires: espeak to be installed
devnull = open(os.devnull, 'w')
# requires: espeak and aplay (alsa-utils) to be installed
dic={
"narrator": "en-us",
"Pilot": "klatt",
"Sensor": "whisper",
"MC": "pt",
"Jag25": "mb-us2",
"Pilot": "m4",
"Sensor": "m7",
"MC": "m2",
"Jag25": "m6",
"Unknown": "f1"
}
@ -17,33 +19,25 @@ f=open("transcripts-drone-attack.txt","r")
txt=f.readlines()
p= re.compile(r"^(\d\d\:\d\d) \((.*?)\)\: (.*)") # regex for capturing groups: time, character, sentence
for line in txt:
print line
if p.findall(line):
time,char,sentence = (p.findall(line))[0]
print char.upper()
voice=dic[char]
# play time
subprocess.call(["espeak", time +" "+char, "-v", dic['narrator'], "-p", "20"]) # narrator speaks: time and character
subprocess.call(["espeak", time +" "+char, "-v", dic['narrator'], "-p", "20"], stdout=devnull, stderr=devnull) # narrator speaks: time and character
sleep(0.5) #short pause before sentence
print sentence
if "*expletive*" in sentence: #"*expletive*" in sentence is True:
sentence_parts=re.split(r"(\*\w+\*)", sentence)
print sentence_parts
for part in sentence_parts:
if part == '*expletive*':
print 'EXPLETIVE', part
subprocess.call(["aplay", 'swear.wav'])
subprocess.call(["aplay", 'swear.wav'], stdout=devnull, stderr=devnull)
else:
print 'SPEECH', part
subprocess.call(["espeak", part, "-v", voice]) # character speaks: his
subprocess.call(["espeak", part, "-v", voice], stdout=devnull, stderr=devnull) # character speaks: his
sleep(float(random.randint(1,10))/100)
else:
subprocess.call(["espeak", sentence, "-v", voice]) # character speaks: his
subprocess.call(["espeak", sentence, "-v", voice], stdout=devnull, stderr=devnull) # character speaks: his
#
else: # line w/out time or character (narrator)
print "NARRATOR"
subprocess.call(["espeak", line, "-v", dic['narrator'], "-p", "20"])
subprocess.call(["espeak", line, "-v", dic['narrator'], "-p", "20"], stdout=devnull, stderr=devnull)
sleep(1) # make pause after each text line

@ -1,5 +1,5 @@
00:59 (Pilot): Can you zoom in a little bit man, *expletive* let em take a look
00:59 (Sensor): at least 4 in *expletive* the back of the pickup
00:59 (Pilot): Can you zoom in a little bit man, let em take a look
00:59 (Sensor): at least 4 in the back of the pickup
00:59 (Pilot): what about the guy under the north arrow, does it look like he is hold'n something across his chest
00:59 (Sensor): yea it's kind of weird how they all have a cold spot on their chest
00:59 (Pilot): It's what they've been doing here lately, they wrap their *expletive* up in their man dresses so you can't PID it
@ -84,3 +84,10 @@ CLASSIFIED
CLASSIFIED
CLASSIFIED
04:07 (Sensor) : We're gonna look like we're gonna be looking at 421.
04:07 (Pilot) : Yeah
04:07 (Sensor) : For a hostile intent and... initial plan without seeing how they break up, follow the largest group.
04:07 (Pilot) : Yeah, sounds good. When it all comes down, if everybody is running in their separate direction, I don't care if you just follow one guy, you know like whatever you decide to do I'm with you on it.

Loading…
Cancel
Save