# HG changeset patch # User Rob Canning # Date 1406127380 -3600 # Node ID 74367de56cbfcfa67e54883866b71d09f2af2b1a # Parent af432b335bf0cc5b3195098dd29f873604b06825 added svg prefiew and better UI layout diff -r af432b335bf0 -r 74367de56cbf nodescore.js --- a/nodescore.js Sun Jul 20 14:33:53 2014 +0100 +++ b/nodescore.js Wed Jul 23 15:56:20 2014 +0100 @@ -157,7 +157,15 @@ } // if not already started start the chronometer and sequencer - function startChr(socket) { chronCtrl(1,100); step(seqA);step(seqB); step(seqC); step(seqD); } + function startChr(socket) { + chronCtrl(1,100); + // these seq[A-D] arrays come from scoreB.js and then become the seq variable + step(seqA); + step(seqB); + step(seqC); + step(seqD); + } + // stop the chronometer function stopChr() { console.log("stop chron"); chronCtrl(0); } @@ -177,23 +185,25 @@ requirejs(['scoreB'],function(scoreB) {}); var sequencerState=0; - var numberoftransects=3 - var order=8 + var numberoftransects=3; + var order=8; var countdowntick=function(seq){ var unit=seq.units[seq.transect%numberoftransects][seq.counter]; var unitlast=seq.units[seq.transect%numberoftransects][seq.counter-1]; var voice=seq.voice; - var tempoms = Math.floor(60000/seq.mm) - var timemultiplier=1000 + var tempoms = Math.floor(60000/seq.mm); + var timemultiplier=1000; var outcount=4; var incount=4; var dur=srcsqr[Math.floor(unit/order)][unit%order] + 4 var time = dur; var ztime=time; var totaltime=time + initPage=function(seq){ // initiate first page here - socket.emit("pageIni", voice, unit, time, seq.mm,seq.counter,seq.nextunit ); - socket.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,seq.nextunit ); + var nextunit=seq.units[seq.transect%numberoftransects][seq.counter+1]; + socket.emit("pageIni", voice, unit, time, seq.mm,seq.counter,nextunit ); + socket.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,nextunit ); } function sequenCer() { @@ -205,7 +215,8 @@ seq.counter = (seq.counter + 1) % (order) //increment the transect if ( seq.counter==0 ){ seq.transect += 1 } - socket.broadcast.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,seq.nextunit); + var nextunit=seq.units[seq.transect%numberoftransects][seq.counter+1]; + socket.broadcast.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,nextunit); clearInterval(pulse) step(seq); } @@ -254,9 +265,9 @@ // decrement the time ztime -= 1 - -// this shows undefined counter output - bug related -// console.log(counter) + + // this shows undefined counter output - bug related + // console.log(counter) } var pulse = setInterval(sequenCer, tempoms); diff -r af432b335bf0 -r 74367de56cbf www/martin/css/nodescore-tablet.css --- a/www/martin/css/nodescore-tablet.css Sun Jul 20 14:33:53 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,493 +0,0 @@ -body{ - background-color: black; - color: white; - font: 12px Helvetica, Arial; - padding:0px; - margin-top:2px; - margin-left:0px; - height:100%; -} - - -h3,h4,h5,h6 { - width: 400px; - background-color: white; - display: inline; - color: #666; - z-index: 2; -} - -h1{ background-color: black; color:white;font: 44px Helvetica, Arial; } -h2{ font: 28px Helvetica, Arial; color:white} -h3{ font: 12px Helvetica, Arial; color:white } -h4{ background-color: black; font: 19px Helvetica, Arial; - text-align: center; margin-left:auto; margin-right:auto; color:white} - -a:link { color:#666;} -a:visited { color: #666;} -a:hover { color: black; background-color:orange; } -a:active { color: black;background-color:white; } - -ul, li, h4, h3, h2, h1, p{ - padding:0; - margin:0; - list-style:none; -} - -.outermaster{ - float:right; - !margin-top:50px; - height: 580px; - width: 1020px; - border-radius: 15px; - position: absolute; - top:90px; - left: 3200px; - +filter: invert(100%); - margin: 0 auto; -} - - -#live{ - width: 100%; - text-align: center; - border-radius: 15px; - background-color:black; - border: 0px solid blue; - position: absolute; - color: white; - top: 0px; - +filter: invert(100%); - z-index:1111; - margin-left: 0px; - padding:0px; -} - -.xunit{ -display:block; -background:black; -width: 155px; -height: 70px; -padding: 5px 5px 5px 5px; -float: left; -} - -.precd{ -height:70px; -color:white; -} - -#info{ -position: absolute; -border: 0px solid red; -border-radius:15px; -top: 450px; -!padding: 5px 5px 5px 5px; -height: 135px; -width: 100%; -} - -#comms{ - border-radius: 15px; - height: 120px; - width: 250px; - margin: 0px; - border: 1px solid gray; - color: black; - float:left; - padding: 5px 5px 5px 5px; -} - -#xcomms{ - border-radius: 15px; - height: 120px; - width: 250px; - margin: 0px; - border: 1px solid gray; - color: black; - padding: 5px 5px 5px 5px; -} - -#midfoot{ - !margin-left:auto; margin-right:auto; - border-radius: 15px; - height: 120px; - width: 30%; - margin: 0px; - margin-left:6%; - border: 1px solid gray; - padding: 5px 5px 5px 5px ; - background: black; - opacity:1; - float:left; -} - -#preview{ - border-radius: 15px; - height: 120px; - width: 30%; - margin: 0px; - border: 1px solid gray; - padding: 5px 5px 5px 5px ; - color: black; - !overflow:hidden; - float:right; - font-size:1em; -} -#preview img{margin-top:15px; width:300px; background:transparent; position: relative; top:-20px;} - -#timeinfo{ - border-radius: 15px; - height:80px; - width: 95%; - margin: 0px; - padding: 5px 5px 5px 5px ; - background: transparent; - position:relative; - top:30px; -} - -#remainingtime{ - padding:0; - margin:0; - font-size:1.4em; - color:white; - position:relative; - left:40px; - top:90px; - width:120px; - float:left; - background-color:transparent; -} - -.footdata{ - margin-left:auto; margin-right:auto; - border-radius: 15px; - height: 50px; - width: 100%; - border: 0px solid gray; - position:absolute; - top: 0px; - background: black; - opacity:1; -} - -.outersquare{ - border-radius: 15px; - border: 1px solid blue; - padding: 1px 1px 1px 1px ; - background: black; - width: 99%; - height: 490px; -} - -.svgmusic { - padding:0px; - border: 1px solid gray; - display:block; - border-radius: 15px; - margin: 0px; - width: 100%; - height: 445px; -} - -svg { background-color: black; width:1000px; height:330px; display:block;} -line { stroke: white; } -text { fill: white;} -path { stroke: white; fill: white; } -rect { fill: white; } -polygon { fill: white; } -circle { stroke: white; } - - -#thesquare{ position:absolute; width:700px; } -.magicsquare { - border: 1px solid white; - padding: 2px 2px 2px 2px; - width: 110px; - height: 100px; - float: left; - font-size: 3em; - color:white; - text-align:center -} - -.sqa {height:50%; width:50%; float:left; color: yellow; } -.sqb {height:50%; width:50%; float:right; color: green; } -.sqc {height:50%; width:50%; float:left; color: aqua; } -.sqd {height:50%; width:50%; float:right; color:red; } - -.row {display:inline;} -.row img{ width:160px; display:inline;} -.row p{display:inline; color:yellow;} -.rrr {position:relative; display:inline;} - -.sqrow{ - display:inline; - padding: 2px 2px 10px 2px; - -} - -.latencies{ -/* height: 90px; width: 200px; - border: 1px solid blue; - position: relative; top: 15%; - float: right; - padding: 5px 5px 5px 5px ; - background-color: yellow; -*/ -} - -#datetime{ - display:table-cell; vertical-align:middle; - width:90px; - font-size:0.9em; color: white; - text-align:center; - position: relative; - bottom: 25px; - right: 4px; - float: left; - background-color: transparent; -} - -#current{ - float:right; - position: relative; - right: 70%; - bottom:50px; - font-size:1.7em; - font-weight: bold; - color: white; - background-color: transparent; - z-index: 3; - opacity: 0.8; - padding: 3px 3px 3px 3px; -} - -#client_latency{ - background:transparent; - width:135px; - font-size:1em; - color: white; - z-index: 1; - padding: 3px 3px 3px 3px; - opacity: 0.8; - float:left; - position:relative; - left: 90px; - bottom: 72px; - -} - -.metrocase { - float:right; - border-radius: 5px; - position: relative; - right: 20px; - top:-25px; - width: 60px; - height: 30px; - color: black; - text-align: center; - font-size: 4em; font-color: black; - background: transparent; - z-index: 2; - border: 1px solid white; -} - -#metronome0 { position: absolute; width: 60px; height: 30px; border-radius: 5px; float:left; } -#metronome1 { width: 50px; height: 40px; border-radius: 30px; float:left; } -#metronome2 { width: 50px; height: 40px; border-radius: 30px; float:left; } -#metronome3 { width: 50px; height: 40px; border-radius: 30px; float:left; } - -#fluid {} -.fluid-img{ height:50%; width:50%; } -.clear { clear:both; } - -#midcomms{ -color:white; -width:160px; -height:40px; -background-color:transparent; -border: 0px solid yellow; -float:left; -} - -#client_chronometer{ - display:table-cell; vertical-align:middle; - border-radius: 15px; - float:right; - background-color: transparent; - color: white; - font-size: 3.7em; - text-align: center; - opacity:0.8; - position: relative; - left: 10px; - bottom:64px; - width: 210px; - z-position: 2; -} - -#transport{ - position:relative; - padding: 20px; - bottom:40px; -} - -#ctrlstop{ - position:absolute; - padding: 5px; - border: 1px solid gray; - bottom:120px; - left:1800px; - height:80px; - width:230px; - border-radius: 15px; - color: gray; - font-size: 3.5em; -} - -#counttitle{ - font-size:3em; - margin:0; - float:left; - width:120px; - position:relative; - top:-5px; - left:20px; -} - -#count { - width:40px; - font-size: 5em; - font-weight:bolder; - margin:0; - padding:0; - position:relative; - left:35px; - top: -10px; - background:transparent; - float:left; - display:inline; -} - -#totalcountdown { - font-size: 1.7em; - font-weight:bolder; - color:orange; - position:relative; - left: 0px; - bottom: -3px; - font-weight:bolder; - display:inline; -} - -#countinnumber{ - border-radius: 15px; - position: absolute; - background-color:black; - font-size: 10em; - font-weight:bolder; - display:inline; - text-align:center; - z-index: 2; - opacity:0.5; - float:left; -} - -#content-txt { - width: 100%; - height: 90%; - font-size:3em; - text-align:center; - background-color:black; - border:1px solid white; - margin-left:auto; margin-right:auto; - display:table-cell; - vertical-align:middle; - border-radius: 15px; -} - -!#wide { background-color:white; width:5600px; height:90%; border: 1px solid black; padding: 16px 10px 16px 0px; display:inline; } - -.outermaster2{ - background-color:black; - margin-top:4px; - height: 810px; - width: 6700px; - border-radius: 15px; - position: relative; - +filter: invert(100%); - -} - -#map { width: 1250px; - position:absolute; - left: -0px; - height: 760px; - padding: 20px 50px 20px 50px; - border: 1px solid gray; background-color: black;} - -#outerpreview { - !display:inline; - !float:left; - height:700px; - width: 1200px; padding: 0; - border: 1px solid gray; background-color: black; - margin: 0 auto; - padding: 50px 50px 50px 50px; - position: relative; left:-1200px; -} - -.pview { border: 1px solid red; height:49%; width:49%; float:left; background:gray; z-index:-100; } -.pviewmusic { position:relative; top:60px; } - -.middle { float: left; width: 10.8%; height: 11%; padding: 0; border: 0; margin: 0.33%; - border: 1px solid red; background:gray; border-radius:10px; } /* 100 = 6 * widt\h + 12 * margin */ - -.middle p { font-size:2.5em; position:relative; left: 0px; opacity:0.3; color:blue; display:block;} -.middle img { padding: 20px 0px 0px 0px; position:relative; top:-30px;} - -.middle:hover img { - z-index:1000; - width:500px; - background-color: orange; - !position: absolute; - border: 0px solid red; - border-radius:20px; - opacity: 1; - box-shadow:4px -4px 10px 3px #888, inset 4px -4px 10px 3px #888; -} - -.middle p.indexnum { font-size:1em; color:black; - position:relative; top:-80px; left:90px; - opacity:1; - } - -.inner-0, .inner-1, .inner-2, .inner-3 { font-size:2.5em; float: left; width: 47%; height: 50%; - padding: 0; border: 1px solid white; margin: 0; - text-align: center; font-weight: bold; - position:relative; top: -110px; } - -.inner-0 { background-color: transparent; } -.inner-1 { background-color: transparent; } -.inner-2 { background-color: transparent; } -.inner-3 { background-color: transparent; } - -.musicianprog { display:inline; float:left; - width:10%; background:transparent; height:40px; - padding: 5px 5px 5px 5px; text-align:center; } - -.unitseq { display:inline; float:right; - width:10%; background:transparent; height:40px; - padding: 5px 5px 5px 5px; text-align:center; - font-size:2em;} - -#links {position:absolute; bottom:150px; left: 800px; width:900px;} -!#transect {position:absolute; bottom:180px; left: 1300px; width:600px;} - -.tportpop { background-color:black; width:200px; height: 90px; - margin: 1px solid white; position:relative; - left:300px; top:60px; border: 1px solid green; - border-radius: 10px; padding: 5px; } \ No newline at end of file diff -r af432b335bf0 -r 74367de56cbf www/martin/css/nodescore.css --- a/www/martin/css/nodescore.css Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/css/nodescore.css Wed Jul 23 15:56:20 2014 +0100 @@ -30,15 +30,16 @@ list-style:none; } -.outermaster{ +.soloscore{ float:right; - height: 580px; - width: 1020px; - border-radius: 15px; + height: 550px; + width: 1000px; position: absolute; top:10%; left: 3000px; !margin: 0 auto; + background:transparent; + !border:1px dashed black; } @@ -286,7 +287,7 @@ } #counttitle{ - font-size:3em; + font-size:2em; margin:0; float:left; width:120px; @@ -298,7 +299,6 @@ #count { width:40px; - font-size: 5em; font-weight:bolder; margin:0; padding:0; @@ -309,6 +309,7 @@ float:left; display:inline; min-height:70px; + font-size: 5em; } #totalcountdown { @@ -367,7 +368,7 @@ #outerpreview { height:600px; - width: 1200px; + width: 1150px; !border: 1px solid red; padding: 0; position: absolute; @@ -375,6 +376,11 @@ top:60px; } +#preview-solo{ +position:absolute; +} + + .pview { border: 1px dashed gray; height:45%; width:45%; float:left; @@ -382,6 +388,16 @@ z-index:-100; margin-left:5px; margin-top:5px; + position:relative; +} +.pviewsolo { + border: 1px dashed gray; + height:100%; + width:100%; + float:left; + background:white; + z-index:-100; + position:relative; } .pviewmusic { @@ -402,13 +418,13 @@ .middle p { font-size:2em; position:relative; - left: 0px; opacity:0.3; + left: 0px; opacity:0.5; color:blue; display:block; } -.middle img { padding: 20px 0px 0px 0px; - position:relative; top:-30px; +.middle img { padding: 0px 0px 0px 0px; + position:relative; top:-15px; } .xmiddle:hover img { @@ -428,14 +444,16 @@ } .inner-0, .inner-1, .inner-2, .inner-3 { - font-size:2em; + + font-size:1em; float: left; width: 45%; height: 45%; padding: 0; border: 1px dashed gray; margin: 0; text-align: center; font-weight: bold; - position:relative; - top: -100px; + position:absolute; + top: -105px; + } .inner-0 { background-color: transparent; } @@ -444,8 +462,21 @@ .inner-3 { background-color: transparent; } .musicianprog { display:inline; float:left; - width:10%; background:transparent; height:40px; - padding: 5px 5px 5px 5px; text-align:center; } + width:15%; background:transparent; height:20%; + padding: 1px; text-align:center; + position:absolute; + } + + +.timeleft { display:inline; + width:15%; + background:transparent; height:20%; + padding: 1px; text-align:center; + font-size:2em; + position:absolute; + right:0%; + } + .unitseq { !position:absolute; diff -r af432b335bf0 -r 74367de56cbf www/martin/index.html --- a/www/martin/index.html Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/index.html Wed Jul 23 15:56:20 2014 +0100 @@ -12,7 +12,7 @@ - + @@ -22,7 +22,10 @@
+
@@ -68,20 +72,33 @@
+
+
-
+
+ +
+
+
+
+
+
+ +
+
+
@@ -89,96 +106,113 @@
-
+ +
-
+
+ +
+
+
+
+
+ + +
-
+ +
-
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
- -
- -
-
-
- -
-
-
-
-
-

LOGIN:

- -

Nickname already in use

-
+
+
+
-
-
Connecting to socket.io server
-
-
-
-
-
-
- - -
-
-
- -
-
-
waiting...
-
-
-
- next in: -
.
-
+ - - -
- + + + +
+ + + +
+ +
+ + + +
- -
- -
- -
- -
- diff -r af432b335bf0 -r 74367de56cbf www/martin/js/controlseq.js --- a/www/martin/js/controlseq.js Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/js/controlseq.js Wed Jul 23 15:56:20 2014 +0100 @@ -64,32 +64,34 @@ $("div#transect").text("Transect: " + (transect+1)); - - if (group == 1) { $('#inner-'+unit+"-0").text(counter); - $("div#unitseq0").text((transect+1)+ " : " + (seq+1)); + $("div#unitseq0").text((transect+1)+ " : " + (seq+1)); + $("div#timeleft1").text(counter); if (counter == 0 ) { $('#inner-'+unit+"-0").css("visibility","hidden") console.log("------------------------- "+ unit) } - else { $('#inner-'+unit+"-0").css({"color" : "white", "background":"black", "opacity" : "0.7", "border-radius":"20px", "visibility": "visible" }) } + else { $('#inner-'+unit+"-0").css({"color" : "yellow", "background":"black", "opacity" : "0.6", "border-radius":"10px", "visibility": "visible" }) } } if (group == 2) { $('#inner-'+unit+"-1").text(counter); - $("div#unitseq1").text((transect+1)+ " : " + (seq+1)); + $("div#unitseq1").text((transect+1)+ " : " + (seq+1)); + $("div#timeleft2").text(counter); if (counter == 0 ) { $('#inner-'+unit+"-1").css("visibility","hidden") } - else { $('#inner-'+unit+"-1").css({"color":"white","background":"green", "opacity" : "0.7", "border-radius":"20px", "visibility": "visible"}) } + else { $('#inner-'+unit+"-1").css({"color":"yellow","background":"green", "opacity" : "0.6", "border-radius":"10px", "visibility": "visible"}) } } if (group == 3) { $('#inner-'+unit+"-2").text(counter); $("div#unitseq2").text((transect+1)+ " : " + (seq+1)); + $("div#timeleft3").text(counter); if (counter == 0 ) { $('#inner-'+unit+"-2").css("visibility","hidden") } - else { $('#inner-'+unit+"-2").css({"color":"white","background":"blue", "opacity" : "0.7", "border-radius":"20px", "visibility": "visible"}) } + else { $('#inner-'+unit+"-2").css({"color":"yellow","background":"blue", "opacity" : "0.6", "border-radius":"10px", "visibility": "visible"}) } } if (group == 4) { $('#inner-'+unit+"-3").text(counter); $("div#unitseq3").text((transect+1)+ " : " + (seq+1)); + $("div#timeleft4").text(counter); if (counter == 0 ) { $('#inner-'+unit+"-3").css("visibility","hidden")} - else { $('#inner-'+unit+"-3").css({"color":"white","background":"red", "opacity" : "0.7", "border-radius":"20px", "visibility": "visible"}) } + else { $('#inner-'+unit+"-3").css({"color":"yellow","background":"red", "opacity" : "0.6", "border-radius":"10px", "visibility": "visible"}) } } } ); diff -r af432b335bf0 -r 74367de56cbf www/martin/js/nodescore-client.js --- a/www/martin/js/nodescore-client.js Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/js/nodescore-client.js Wed Jul 23 15:56:20 2014 +0100 @@ -3,6 +3,10 @@ var socket = io.connect(); +function initPage() { socket.emit("initPage"); + console.log("init.client.log") + } + //socket.on("metroPulse", metronomeTick); ///////////////////////////////////////////////// socket.on("metroPulse", pulseInClient); @@ -12,116 +16,86 @@ metronomeTick(1000, groupID, metrobeat); } } + ///////////////////////////////////////////////// function metroCss(beat, beatcolor,text){ var color = beatcolor; - $(".metrocase > div").each(function(){$(this).stop()}); $(".metrocase > div").each(function(){$(this).css('background-color', beatcolor)}); $(".metrocase > div").each(function(){$(this).text(" ")}); - $(".metrocase > div").each(function(){$(this).animate({opacity: 1}, - 50, - function() { $(this).animate({opacity:0.0}); } - ); - }) } function metronomeTick(pulse, voice,metrobeat) { var color = "gray" - metroCss(0, "red", "4") + metroCss(0, "red", "4") + setTimeout(function(){metroCss(0, "black", "4")},150); }; ///////////////////////////////////////////////// - // update the stopwatch value on the client page in line with server -socket.on("chronFromServer", function(chron) { - $("div#client_chronometer").text(chron); -}); - +socket.on("chronFromServer", function(chron) { $("div#client_chronometer").text(chron); }); // server time - -//var groupPage=document.getElementById('group').value -//if (groupID == groupPage) { socket.on("dateTime", function(datetime) { -// console.log(datetime) - $("div#datetime").text("Server Time: " +datetime); - + $("div#datetime").text("" +datetime); }); - ///////////////////////////////////////////////// // countdown to change - socket.on("countinFromServer", countinClient); -function countinClient(groupID, currentseconds,mm,text,colour,background){ +function countinClient(groupID, currentseconds,mm,text,colour,background,unit){ var groupPage=document.getElementById('group').value if (groupID == groupPage) { - console.log(groupID, currentseconds,mm,text,colour,background) - document.getElementById("count").style.visibility="visible"; - //document.getElementById("count").style.visibility="visible"; + $("#counttitle").css('color','black'); $("#counttitle").text(text); $("#count").text(currentseconds); - //$("#cnt").text(currentseconds); - $("#count").css('background-color', background); document.getElementById("count").style.color=colour; -// if ( currentseconds == 0) { - //document.getElementById("midcomms").style.visibility='hidden'; -// } - }} -///////////////////////////////////////////////// + }} ///////////////////////////////////////////////// // countdown to change - socket.on("counterText", cText); function cText(groupID, currentseconds,text){ - + $("#totalcountdown"+groupID).text(text); var groupPage=document.getElementById('group').value if (groupID == groupPage) { -// console.log(text) + //console.log(text) $("#totalcountdown").text(text); }} /////////////////////////////////////// - -function pageFlip(unit) { - console.log("flipping page:"+ unit); - $('#sections').trigger('goto', [parseFloat(unit)]); -} - +//function pageFlip(unit) { $('#sections').trigger('goto', [parseFloat(unit)]); } ///////////////////////////////////////////////// - // call the fancy jquery functions - function slideTo (target) { $('#sections').trigger('goto', [target]); } function pad2(number) { return (number < 10 ? '0' : '') + number } ///////////////////////////////////////////////// - +//var testSound = new buzz.sound( 'audio/testfile', { formats: [ 'ogg', 'mp3' ] } ); socket.on("pageFlipfromserver", pageTurn); -function pageTurn (group,unit,time,mm) { +function pageTurn (group,unit,time,mm,seqcounter,nextunit) { var groupPage=document.getElementById('group').value; if (group == groupPage) { - var g= pad2(group); - var p= pad2(unit); -// pageFlip(unit); - pageTurnB(unit) - testSound.play(); - console.log("flipping page:"+ unit); - } + console.log(unit + " ---> " + nextunit) + //$("#live").load("music.html #"+unit); + //$("#preview").html("

n e x t :

") + //$("#previewbox-"+group).html("") + } else { console.log("not for this group... ignoring... for group:" + group ); } } -function pageTurnB(unit) { - var units=6; - var next=(((unit+1)%units)+units)%units - console.log("HOP TURN" + unit+ "next:" + next); - $("#live").load("music.html #"+unit +" *"); - $("#preview").html("

n e x t :

") +socket.on("pageIni", pageIni); +function pageIni (group,unit,time,mm,seqcounter,nextunit) { + console.log(unit + " ---> " + nextunit) + //$("#live").load("music.html #"+unit); + //$("#preview").html("

n e x t :

") + $("#previewbox-"+group).html("") + $("#previewbox-solo").html("") + + } //////////////////////////////////////////////// @@ -138,7 +112,7 @@ h to hide all above - +*/ function toggle_visibility(id) { var e = document.getElementById(id); if(e.style.display == 'block') @@ -163,17 +137,17 @@ var hcheckMoz=(e.which==104 ? 1 : 0); // console.log(e.which); - if (checkWebkitandIE || checkMoz) { toggle_visibility('preview') } - if (mcheckWebkitandIE || mcheckMoz) { toggle_visibility('metro') } - if (ccheckWebkitandIE || ccheckMoz) { toggle_visibility('client_chronometer') } +// if (checkWebkitandIE || checkMoz) { toggle_visibility('preview') } + // if (mcheckWebkitandIE || mcheckMoz) { toggle_visibility('comms') } + // if (ccheckWebkitandIE || ccheckMoz) { toggle_visibility('client_chronometer') } if (hcheckWebkitandIE || hcheckMoz) { - toggle_visibility('client_chronometer') - toggle_visibility('metro') - toggle_visibility('preview') + toggle_visibility('info') + //toggle_visibility('comms') + //toggle_visibility('preview') } }); -*/ +//*/ //////////////////////////////////////////////// // this needs to have a variable to define the websocket @@ -183,13 +157,12 @@ // to specific client.. ////////////////////////////////////////////// // Latency "Pong" +socket.on("timeFromServer", function(n) { + socket.emit("clientTimeResponse",n); }); -socket.on("timeFromServer", function(n) { - socket.emit("clientTimeResponse",n); -}); socket.on("latencyFromServer", function(latency) { $("#client_latency").text("Latency: "+latency+"ms.") - //console.log(latency) + }); function getLatencies(x) { socket.emit("getLatencies", x); } @@ -227,7 +200,7 @@ }); function message (from, msg) { - $('#lines').append($('

').append($('').text(from), msg)); + $('#lines').prepend($('

').prepend($('').text(from), msg)); } // dom manipulation diff -r af432b335bf0 -r 74367de56cbf www/martin/js/nodescore-slides.js --- a/www/martin/js/nodescore-slides.js Sun Jul 20 14:33:53 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,227 +0,0 @@ -///////////////////////////////////////////////// -// connect to websocket - -var socket = io.connect(); - -function initPage() { socket.emit("initPage"); - console.log("init.client.log") - } - -//socket.on("metroPulse", metronomeTick); -///////////////////////////////////////////////// -socket.on("metroPulse", pulseInClient); -function pulseInClient(pulse,groupID,metrobeat){ - var groupPage=document.getElementById('group').value - if (groupID == groupPage) { - metronomeTick(1000, groupID, metrobeat); - } -} - -///////////////////////////////////////////////// -function metroCss(beat, beatcolor,text){ - var color = beatcolor; - $(".metrocase > div").each(function(){$(this).stop()}); - $(".metrocase > div").each(function(){$(this).css('background-color', beatcolor)}); - $(".metrocase > div").each(function(){$(this).text(" ")}); - } - -function metronomeTick(pulse, voice,metrobeat) { - var color = "gray" - metroCss(0, "red", "4") - setTimeout(function(){metroCss(0, "black", "4")},150); -}; - -///////////////////////////////////////////////// -// update the stopwatch value on the client page in line with server -socket.on("chronFromServer", function(chron) { $("div#client_chronometer").text(chron); }); - -// server time - socket.on("dateTime", function(datetime) { - $("div#datetime").text("" +datetime); - }); - -///////////////////////////////////////////////// -// countdown to change -socket.on("countinFromServer", countinClient); -function countinClient(groupID, currentseconds,mm,text,colour,background,unit){ - var groupPage=document.getElementById('group').value - if (groupID == groupPage) { - $("#counttitle").css('color','black'); - $("#counttitle").text(text); - $("#count").text(currentseconds); - document.getElementById("count").style.color=colour; - }} - -///////////////////////////////////////////////// -// countdown to change -socket.on("counterText", cText); -function cText(groupID, currentseconds,text){ - $("#totalcountdown"+groupID).text(text); - var groupPage=document.getElementById('group').value - if (groupID == groupPage) { - //console.log(text) - $("#totalcountdown").text(text); - }} - -/////////////////////////////////////// -//function pageFlip(unit) { $('#sections').trigger('goto', [parseFloat(unit)]); } - -///////////////////////////////////////////////// -// call the fancy jquery functions -function slideTo (target) { $('#sections').trigger('goto', [target]); } -function pad2(number) { return (number < 10 ? '0' : '') + number } - -///////////////////////////////////////////////// -//var testSound = new buzz.sound( 'audio/testfile', { formats: [ 'ogg', 'mp3' ] } ); -socket.on("pageFlipfromserver", pageTurn); -function pageTurn (group,unit,time,mm,seqcounter,nextunit) { - var groupPage=document.getElementById('group').value; - if (group == groupPage) { - console.log(unit + " ---> " + nextunit) - $("#live").load("music.html #"+unit); - $("#preview").html("

n e x t :

") - //$("#previewbox-"+group).html("") - } - else { - console.log("not for this group... ignoring... for group:" + group ); - } -} - -socket.on("pageIni", pageIni); -function pageIni (group,unit,time,mm,seqcounter,nextunit) { - console.log(unit + " ---> " + nextunit) - //$("#live").load("music.html #"+unit); - //$("#preview").html("

n e x t :

") - $("#previewbox-"+group).html("") -} - -//////////////////////////////////////////////// - -/* commented out for now as interferes with chat -need to introduce metakey...manyana... not so usefull anyway really... - -keyboard controls -+++++++++++++++++++++++++ - -SPACE to toggle visibilty of preview -m to toggle visibilty of metronome -s to toggle visibilty of stopwatch -h to hide all above - - -*/ -function toggle_visibility(id) { - var e = document.getElementById(id); - if(e.style.display == 'block') - e.style.display = 'none'; - else - e.style.display = 'block'; -} - -$(document).keypress(function(e){ - // "space bar" for next unit preview - var checkWebkitandIE=(e.which==32 ? 1 : 0); - var checkMoz=(e.which==32 ? 1 : 0); - // "m" button for metronome - var mcheckWebkitandIE=(e.which==109 ? 1 : 0); - var mcheckMoz=(e.which==109 ? 1 : 0); - // "s" button for stopwatch/chronometer - var ccheckWebkitandIE=(e.which==115 ? 1 : 0); - var ccheckMoz=(e.which==115 ? 1 : 0); - - // "h" button for hideall - var hcheckWebkitandIE=(e.which==104 ? 1 : 0); - var hcheckMoz=(e.which==104 ? 1 : 0); - -// console.log(e.which); -// if (checkWebkitandIE || checkMoz) { toggle_visibility('preview') } - // if (mcheckWebkitandIE || mcheckMoz) { toggle_visibility('comms') } - // if (ccheckWebkitandIE || ccheckMoz) { toggle_visibility('client_chronometer') } - if (hcheckWebkitandIE || hcheckMoz) { - toggle_visibility('info') - //toggle_visibility('comms') - //toggle_visibility('preview') -} - }); - -//*/ - -//////////////////////////////////////////////// -// this needs to have a variable to define the websocket -// otherwise we will pings from all sockets connected -// no! the server broadcasts the ping and the clients emit the pong! -// ah but then the time reported back from the server needs to be targeted -// to specific client.. -////////////////////////////////////////////// -// Latency "Pong" -socket.on("timeFromServer", function(n) { - socket.emit("clientTimeResponse",n); }); - -socket.on("latencyFromServer", function(latency) { - $("#client_latency").text("Latency: "+latency+"ms.") - -}); - -function getLatencies(x) { socket.emit("getLatencies", x); } - -////////////////////////////////////////////// - - -socket.on('connect', function () { - $('#chat').addClass('connected'); -}); - -socket.on('announcement', function (msg) { - $('#lines').append($('

').append($('').text(msg))); -}); - -socket.on('nicknames', function (nicknames) { - $('#nicknames').empty().append($('Online: ')); - for (var i in nicknames) { - $('#nicknames').append($('').text(nicknames[i])); - } -}); - -socket.on('user message', message); -socket.on('reconnect', function () { - $('#lines').remove(); - message('System', 'Reconnected to the server'); -}); - -socket.on('reconnecting', function () { - message('System', 'Attempting to re-connect to the server'); -}); - -socket.on('error', function (e) { - message('System', e ? e : 'A unknown error occurred'); -}); - -function message (from, msg) { - $('#lines').prepend($('

').prepend($('').text(from), msg)); -} - -// dom manipulation -$(function () { - $('#set-nickname').submit(function (ev) { - socket.emit('nickname', $('#nick').val(), function (set) { - if (!set) { - clear(); - return $('#chat').addClass('nickname-set'); - } - $('#nickname-err').css('visibility', 'visible'); - }); - return false; - }); - - $('#send-message').submit(function () { - message('me', $('#message').val()); - socket.emit('user message', $('#message').val()); - clear(); - $('#lines').get(0).scrollTop = 10000000; - return false; - }); - - function clear () { - $('#message').val('').focus(); - }; -}); diff -r af432b335bf0 -r 74367de56cbf www/martin/js/scoreB.js --- a/www/martin/js/scoreB.js Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/js/scoreB.js Wed Jul 23 15:56:20 2014 +0100 @@ -73,4 +73,4 @@ //return seqA seqB seqC seqD -//} \ No newline at end of file +//} diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/0.svg --- a/www/martin/svg/0.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/0.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,27 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/1.svg --- a/www/martin/svg/1.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/1.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,25 +1,2530 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/10.svg --- a/www/martin/svg/10.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/10.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,52 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/11.svg --- a/www/martin/svg/11.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/11.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,50 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/12.svg --- a/www/martin/svg/12.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/12.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,68 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/13.svg --- a/www/martin/svg/13.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/13.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,51 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/14.svg --- a/www/martin/svg/14.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/14.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,50 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/15.svg --- a/www/martin/svg/15.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/15.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,71 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/16.svg --- a/www/martin/svg/16.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/16.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,96 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/17.svg --- a/www/martin/svg/17.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/17.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,96 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/18.svg --- a/www/martin/svg/18.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/18.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,92 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/19.svg --- a/www/martin/svg/19.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/19.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,96 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/2.svg --- a/www/martin/svg/2.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/2.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,31 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/20.svg --- a/www/martin/svg/20.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/20.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,92 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/21.svg --- a/www/martin/svg/21.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/21.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,92 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/22.svg --- a/www/martin/svg/22.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/22.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,92 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/23.svg --- a/www/martin/svg/23.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/23.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,92 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/24.svg --- a/www/martin/svg/24.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/24.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,54 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -pizz. - - - -& - - - -slide - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/25.svg --- a/www/martin/svg/25.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/25.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,60 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -flautando - - - -repeat, - - - -alternating - - - -between - - - -given - - - -pitches - - - -freely - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/26.svg --- a/www/martin/svg/26.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/26.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,75 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -senza - - - -tempo - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/27.svg --- a/www/martin/svg/27.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/27.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,69 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -sul - - - -pont. - - - -estremo - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/28.svg --- a/www/martin/svg/28.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/28.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,99 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -pitches - - - -need - - - -not - - - -sound - - - -absolute - - - -senza - - - -tempo, - - - -sul - - - -pont. - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/29.svg --- a/www/martin/svg/29.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/29.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,64 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -pizz. - - - -& - - - -slide - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/3.svg --- a/www/martin/svg/3.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/3.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,26 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/30.svg --- a/www/martin/svg/30.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/30.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,62 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -flautando - - - -repeat, - - - -alternating - - - -between - - - -given - - - -pitches - - - -freely - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/31.svg --- a/www/martin/svg/31.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/31.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,59 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -senza - - - -tempo - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/32.svg --- a/www/martin/svg/32.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/32.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,64 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -ad lib. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/33.svg --- a/www/martin/svg/33.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/33.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,70 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ad lib. - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/34.svg --- a/www/martin/svg/34.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/34.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,50 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ad lib. - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/35.svg --- a/www/martin/svg/35.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/35.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,38 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -ad lib. - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/36.svg --- a/www/martin/svg/36.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/36.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,43 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ad lib. - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/37.svg --- a/www/martin/svg/37.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/37.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,66 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -ad lib. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/38.svg --- a/www/martin/svg/38.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/38.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,59 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -ad lib. - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/39.svg --- a/www/martin/svg/39.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/39.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,45 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ad lib. - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/4.svg --- a/www/martin/svg/4.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/4.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,28 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/40.svg --- a/www/martin/svg/40.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/40.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,31 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/41.svg --- a/www/martin/svg/41.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/41.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,30 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/42.svg --- a/www/martin/svg/42.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/42.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,30 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/43.svg --- a/www/martin/svg/43.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/43.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,33 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/44.svg --- a/www/martin/svg/44.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/44.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,29 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/45.svg --- a/www/martin/svg/45.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/45.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,30 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/46.svg --- a/www/martin/svg/46.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/46.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,31 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/47.svg --- a/www/martin/svg/47.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/47.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,29 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/48.svg --- a/www/martin/svg/48.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/48.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,53 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/49.svg --- a/www/martin/svg/49.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/49.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,51 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/5.svg --- a/www/martin/svg/5.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/5.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,35 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/50.svg --- a/www/martin/svg/50.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/50.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,77 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/51.svg --- a/www/martin/svg/51.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/51.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,53 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/52.svg --- a/www/martin/svg/52.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/52.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,58 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/53.svg --- a/www/martin/svg/53.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/53.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,72 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/54.svg --- a/www/martin/svg/54.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/54.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,56 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/55.svg --- a/www/martin/svg/55.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/55.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,52 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/56.svg --- a/www/martin/svg/56.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/56.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,25 +1,141 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/57.svg --- a/www/martin/svg/57.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/57.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,36 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/58.svg --- a/www/martin/svg/58.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/58.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,30 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/59.svg --- a/www/martin/svg/59.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/59.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,29 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/6.svg --- a/www/martin/svg/6.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/6.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,36 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/60.svg --- a/www/martin/svg/60.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/60.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,32 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/61.svg --- a/www/martin/svg/61.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/61.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,30 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/62.svg --- a/www/martin/svg/62.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/62.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,27 +1,141 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/63.svg --- a/www/martin/svg/63.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/63.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,30 +1,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/7.svg --- a/www/martin/svg/7.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/7.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,28 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/8.svg --- a/www/martin/svg/8.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/8.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,54 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r af432b335bf0 -r 74367de56cbf www/martin/svg/9.svg --- a/www/martin/svg/9.svg Sun Jul 20 14:33:53 2014 +0100 +++ b/www/martin/svg/9.svg Wed Jul 23 15:56:20 2014 +0100 @@ -1,71 +1,2530 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +