commit 2020.06.06.01

lilypond/includes/cicc_high.ly

@@ -17,7 +17,7 @@ r2. r8  [ f''''8  ] ~ | f''''1 ~ | f''''4 r2. | R1 | r2 f''''2 ~ | f''''1 ~ | f'
 \time 3/2
 R1*3/2 |   \bar ".|" \mark \markup { \bold \box 1.4 } 
 \time 2/2
-r2. r8  [ f''''8  ] ~ | f''''1 ~ | f''''2. r4 | R1 | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2. r4 | R1 | R1 | r8  [ f''''8  ] ~ f''''2. ~ | f''''1 | r8  [ f''''8  ] ~ f''''2. ~ | f''''2 r2 | R1 | R1 |   \bar "||" \set Score.currentBarNumber = #1  \mark \markup { \bold \box 2.1 }
+r2. r8  [ f''''8  ] ~ | f''''1 ~ | f''''2. r4 | R1 | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2. r4 | R1 | R1 | r8  [ f''''8  ] ~ f''''2. ~ | f''''1 | r8  [ f''''8  ] ~ f''''2. ~ | f''''2 r2 | R1 | R1 |   \bar "|." \set Score.currentBarNumber = #1  \mark \markup { \bold \box 2.1 }
 \pageBreak 
 r1 | R1 | r8  [ f''''8  ] ~ f''''2. ~ | f''''4 ~ f''''8  [ r8  ] r2 | r2. f''''4 ~ | f''''1 ~ | f''''8  [ r8  ] f''''2. ~ | f''''1 ~ | f''''8  [ r8  ] r2. | R1 | R1 | R1 | R1 | R1 | R1 |  
 \time 3/2
@@ -25,7 +25,7 @@ R1*3/2 |   \bar "||" \mark \markup { \bold \box 2.2 }
 \time 2/2
 r1 | R1 | r4 r8  [ d''''8  ] ~ d''''2 ~ | d''''1 ~ | d''''4 ~ d''''8  [ r8  ] d''''2 ~ | d''''1 ~ | d''''4 r2. | R1 | R1 | R1 | R1 |   \bar "||" \mark \markup { \bold \box 2.3 }r1 | r2. r8  [ f''''8  ] ~ | f''''1 ~ | f''''1 | r8  [ f''''8  ] ~ f''''2. ~ | f''''2. r8  [ f''''8  ] ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2 r8  [ f''''8  ] ~ f''''4 ~ | f''''1 ~ | f''''1 | r8  [ f''''8  ] ~ f''''2. ~ | f''''2 ~ f''''8  [ r8  ] r4 | R1 | R1 | f''''1 ~ | f''''2 r8  [ f''''8  ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2. r8  [ f''''8  ] ~ | f''''1 ~ | f''''1 ~ | f''''4 ~ f''''8  [ r8  ] r2 | R1 | r2 r8  [ f''''8  ] ~ f''''4 ~ | f''''1 ~ | f''''8  [ r8  ] r2. | r4 r8  [ f''''8  ] ~ f''''2 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 | R1 | R1 | r8  [ f''''8  ] ~ f''''2. ~ | f''''2 r8  [ f''''8  ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''8  [ r8  ] r2. | R1 | r4 r8  [ f''''8  ] ~ f''''2 ~ | f''''1 ~ | f''''4 r2. | R1 | R1 |   \bar ".|" \mark \markup { \bold \box 2.4 }r1 | r2 r8  [ f''''8  ] ~ f''''4 ~ | f''''1 ~ | f''''1 | R1 | r2 r8  [ f''''8  ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''8  [ r8  ] f''''2. ~ | f''''1 ~ | f''''2 ~ f''''8  [ r8  ] r4 |  
 \time 3/2
-R1*3/2 |   \bar "||" \set Score.currentBarNumber = #1  \mark \markup { \bold \box 3.1 }
+R1*3/2 |   \bar "|." \set Score.currentBarNumber = #1  \mark \markup { \bold \box 3.1 }
 \pageBreak 
  
 \time 2/2
@@ -35,7 +35,7 @@ R1*3/2 |   \bar "||" \mark \markup { \bold \box 3.3 }
 \time 2/2
 r1 | r2 f''''2 ~ | f''''1 ~ | f''''4 r8  [ f''''8  ] ~ f''''2 ~ | f''''1 ~ | f''''2. ~ f''''8  [ r8  ] | R1 | r8  [ f''''8  ] ~ f''''2. ~ | f''''1 ~ | f''''4 ~ f''''8  [ r8  ] r2 | r2. f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''8  [ r8  ] f''''2. ~ | f''''2. ~ f''''8  [ r8  ] | f''''1 ~ | f''''1 ~ | f''''8  [ r8  ] r2. | R1 | r4 r8  [ f''''8  ] ~ f''''2 ~ | f''''1 ~ | f''''4 ~ f''''8  [ r8  ] r2 | R1 | r2. f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2 ~ f''''8  [ r8  ] f''''4 ~ | f''''1 ~ | f''''2. ~ f''''8  [ r8  ] | R1 | r2 r8  [ f''''8  ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2 ~ f''''8  [ r8  ] r4 | R1 | r8  [ f''''8  ] ~ f''''2. ~ | f''''1 ~ | f''''4 r2. | R1 | f''''1 ~ | f''''1 ~ | f''''2 r8  [ f''''8  ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''2 ~ f''''8  [ r8  ] r4 | R1 | r4 r8  [ f''''8  ] ~ f''''2 ~ | f''''2. ~ f''''8  [ r8  ] | R1 | R1 |   \bar ".|" \mark \markup { \bold \box 3.4 }r2. r8  [ f''''8  ] ~ | f''''1 ~ | f''''1 ~ | f''''4 r8  [ f''''8  ] ~ f''''2 ~ | f''''1 ~ | f''''2 r8  [ f''''8  ] ~ f''''4 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''1 ~ | f''''4 ~ f''''8  [ r8  ] f''''2 ~ | f''''1 ~ | f''''2 r2 |  
 \time 3/2
-R1*3/2 |   \bar "||" \set Score.currentBarNumber = #1  \mark \markup { \bold \box 4.1 }
+R1*3/2 |   \bar "|." \set Score.currentBarNumber = #1  \mark \markup { \bold \box 4.1 }
 \pageBreak 
  
 \time 2/2

lilypond/includes/cicc_low.ly

@@ -17,7 +17,7 @@ R1*3/2 |   \bar "||" \mark \markup { \bold \box 1.3 }
 \time 3/2
 R1*3/2 |   \bar ".|" \mark \markup { \bold \box 1.4 } 
 \time 2/2
- <<{ d,,4  \laissezVibrer ^ \markup{ 0.0 }  }\\ {\new Voice { \voiceTwo d,,4  \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 |   \bar "||" \set Score.currentBarNumber = #1  \mark \markup { \bold \box 2.1 }
+ <<{ d,,4  \laissezVibrer ^ \markup{ 0.0 }  }\\ {\new Voice { \voiceTwo d,,4  \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 |   \bar "|." \set Score.currentBarNumber = #1  \mark \markup { \bold \box 2.1 }
 \pageBreak 
  <<{ d,4  \laissezVibrer ^ \markup{ 0.0 }  }\\ {\new Voice { \voiceTwo d,4  \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 |  
 \time 3/2
@@ -25,7 +25,7 @@ R1*3/2 |   \bar "||" \mark \markup { \bold \box 2.2 }
 \time 2/2
  <<{ a,,4  \laissezVibrer ^ \markup{ 5.0 }  }\\ {\new Voice { \voiceTwo a,,4  \laissezVibrer }}>> \oneVoice r2. | r4  <<{ a,,4  \laissezVibrer ^ \markup{ 4.2 }  }\\ {\new Voice { \voiceTwo a,,4  \laissezVibrer }}>> \oneVoice r2 | R1 |  <<{ a,,4  \laissezVibrer ^ \markup{ 3.3 }  }\\ {\new Voice { \voiceTwo a,,4  \laissezVibrer }}>> \oneVoice r2. | R1 | r4  <<{ a,,4  \laissezVibrer ^ \markup{ 2.5 }  }\\ {\new Voice { \voiceTwo a,,4  \laissezVibrer }}>> \oneVoice r2 | R1 | r4  <<{ a,,4  \laissezVibrer ^ \markup{ 1.7 }  }\\ {\new Voice { \voiceTwo a,,4  \laissezVibrer }}>> \oneVoice r2 | R1 | r2  <<{ a,,4  \laissezVibrer ^ \markup{ 0.8 }  }\\ {\new Voice { \voiceTwo a,,4  \laissezVibrer }}>> \oneVoice r4 | R1 |   \bar "||" \mark \markup { \bold \box 2.3 } <<{ d,4  \laissezVibrer ^ \markup{ 0.0 }  }\\ {\new Voice { \voiceTwo d,4  \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 |  <<{ f,,4  \laissezVibrer ^ \markup{ 4.0 }  }\\ {\new Voice { \voiceTwo f,,4  \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 |  <<{ e,,4  \laissezVibrer ^ \markup{ 2.0 }  }\\ {\new Voice { \voiceTwo e,,4  \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 |   \bar ".|" \mark \markup { \bold \box 2.4 } <<{ d,,4  \laissezVibrer ^ \markup{ 0.0 }  }\\ {\new Voice { \voiceTwo d,,4  \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 |  
 \time 3/2
-R1*3/2 |   \bar "||" \set Score.currentBarNumber = #1  \mark \markup { \bold \box 3.1 }
+R1*3/2 |   \bar "|." \set Score.currentBarNumber = #1  \mark \markup { \bold \box 3.1 }
 \pageBreak 
  
 \time 2/2
@@ -35,7 +35,7 @@ R1*3/2 |   \bar "||" \mark \markup { \bold \box 3.3 }
 \time 2/2
  <<{ d,4  \laissezVibrer ^ \markup{ 0.0 }  }\\ {\new Voice { \voiceTwo d,4  \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | r2.  <<{ f,,4  \laissezVibrer ^ \markup{ 4.0 }  }\\ {\new Voice { \voiceTwo f,,4  \laissezVibrer }}>> \oneVoice | R1 | R1 | R1 | R1 | r2  <<{ e,,4  \laissezVibrer ^ \markup{ 2.0 }  }\\ {\new Voice { \voiceTwo e,,4  \laissezVibrer }}>> \oneVoice r4 | R1 | R1 | R1 |   \bar ".|" \mark \markup { \bold \box 3.4 } <<{ d,,4  \laissezVibrer ^ \markup{ 0.0 }  }\\ {\new Voice { \voiceTwo d,,4  \laissezVibrer }}>> \oneVoice r2. | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 | R1 |  
 \time 3/2
-R1*3/2 |   \bar "||" \set Score.currentBarNumber = #1  \mark \markup { \bold \box 4.1 }
+R1*3/2 |   \bar "|." \set Score.currentBarNumber = #1  \mark \markup { \bold \box 4.1 }
 \pageBreak 
  
 \time 2/2

supercollider/cicc_main.scd

@@ -34,54 +34,4 @@ s.waitForBoot({
 	~generateGUI.value;
 
 	appEnvironment.pop;
-});
-
-
-//counterfeitTranscribe.value(~scoreData);
-
-// init
-/*
-~dir = thisProcess.nowExecutingPath.dirname;
-~loadedTransform = nil;
-~transform = [2, 1, 0, 1, 0, 0, 0];
-~tileMap = ~mapAll.value(6 /*max depth*/, ~transform);
-~layoutState = 0;
-~tempo = 120;
-~dur = 0.125 * (120/~tempo);
-~continuousPlay = false;
-
-// launch
-~launchTileVisualizer.value;
-~launchGui.value;
-*/
-)
-
-~dir
-~fader = Synth(\crossFade, [\sel, 0, \busA, ~busA.index, \busB, ~busB.index]);
-~currentSection = 0
-~play.set(\sel, ~currentSection % 2);
-~patterns[~currentSection].play(quant: 0)
-~transcribe.value(~scoreData)
-
-~patterns[0].stop
-~player = Ptpar(([~sectionOffsets.postln * 0.08, ~patterns].flop.flat ++ [0, ~faderPattern]))
-
-
-~patterns[0][0]
-
-
-~fader.play
-~player.play
-
-(
-~droneFade = Synth.new(\droneFade);
-~dronePattern.play
-)
-
-~droneFade.set(\gate, 1)
-~dronePattern.stop
-
-t = Synth.new(\droneOut);
-t.free
-t.run
-~dir
+});

supercollider/cicc_transcriber.scd

@@ -125,7 +125,7 @@
 					barType = switch(sectionData[sectionCount][1],
 						0, {"\"||\""},
 						1, {"\".|\""},
-						-1, {"\"||\" \\set Score.currentBarNumber = #1 "});
+						-1, {"\"|.\" \\set Score.currentBarNumber = #1 "});
 					pageBreak = switch(sectionData[sectionCount][1], 0, {""}, 1, {""}, -1, {measureCount = 0; "\n\\pageBreak \n"});
 					isHarmonic = switch(sectionData[sectionCount][1], 0, {false}, 1, {true}, -1, {false});
 					lilyString = lilyString + " \\bar " ++  barType ++ " \\mark \\markup { \\bold \\box " ++ sectionIndex ++ "." ++ subSectionIndex ++ " }" ++ pageBreak;