TempleOSTS_130707.ISO

2018-09-08 21:45:45 +02:00
1 parent 17b71f1a2d
commit 1343005a29
@@ -30,6 +30,7 @@ U0 Song()
  CTask *task;
  I64 i;
  SettingsPush; //See $LK,"SettingsPush","MN:SettingsPush"$
+  Fs->text_attr=LTCYAN<<4+BLACK;
  Fs->draw_it=&DrawIt;
  Fs->task_end_cb=&SndTaskEndCB;
  MusicSettingsRst;
@@ -52,16 +53,16 @@ U0 Song()
    TaskWait(task);
    SetWinHorz(Fs->win_left,Fs->win_right,task);
    SetWinVert(Fs->win_bottom+3,Fs->win_bottom+15,task);
-    "$$BD+H,LTCYAN$$$$FD+H,BLACK$$";
+    "$$BG+H,LTCYAN$$$$FD+H,BLACK$$";
    while (!ScanKey) {
      "$$FG,WHITE$$To God...\n$$FG$$";
-      Play("W13etCFE!!sDDDDD2G!3D2G!!3qC2eG3EqEetAA!F2qG",
+      Play("3etCFEsDDDDD2G3D2G3qC2eG3EqEetAAF2qG",
      "I \0am \0a\0biding \0 \0 \0 \0in \0 \0Your \0 \0presence.\n\0 \0 \0 \0 \0 \0 \0 \0");
-      Play("3etCFE!!sDDDDD2G!3D2G!!3qC2eG3EqEetAA!F2qG",
+      Play("3etCFEsDDDDD2G3D2G3qC2eG3EqEetAAF2qG",
      "I \0am \0a\0biding \0 \0 \0 \0in \0 \0Your \0 \0presence.\n\0 \0 \0 \0 \0 \0 \0 \0");
-      Play("!3DBsFGF!G2eG!!3FRDqEGeB!E",
+      Play("3DBsFGFG2eG3FRDqEGeBE",
      "What \0a \0joy!\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
-      Play("!qDBsFGF!G2eG!!3FRDqEGeB!E",
+      Play("qDBsFGFG2eG3FRDqEGeBE",
      "I'm \0so \0coy!\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
    }
    } catch
@@ -20,7 +20,7 @@ U0 Song()
  SetWinHorz(Fs->win_left,Fs->win_right,task);
  SetWinVert(Fs->win_bottom+3,Fs->win_bottom+15,task);
  while (!ScanKey) {
-	Play("W13sBBBBqCq.BeAqBh.A",
+	Play("3sBBBBqCq.BeAqBh.A",
 		"Can't \0 \0 \0 \0get \0there, \0from \0he\0re.\n\0");
 	Play("M2/4");
 	Play("eECqAM4/4");
@@ -28,9 +28,9 @@ U0 Song()
 		"Can't \0 \0 \0 \0get \0there, \0from \0he\0re.\n\0");
 	Play("M2/4");
 	Play("eDDqDM4/4");
-	Play("DeEDqG!CeF2G3qG!!sFGFG!!eD!C",
+	Play("DeEDqGCeF2G3qGsFGFGeDC",
 		"Oh, \0my \0 \0God, \0some\0thing's... \0 \0 \0ver\0 \0y \0 \0wrong!\n\0 \0");
-	Play("qDeEDqG!CeF2G3qG!!sFGFG!!eD!C",
+	Play("qDeEDqGCeF2G3qGsFGFGeDC",
 		"Oh, \0my \0 \0God, \0some\0thing's... \0 \0 \0ver\0 \0y \0 \0wrong!\n\0 \0");
  }
  } catch
@@ -57,13 +57,13 @@ U0 Song()
  SetWinVert(Fs->win_bottom+3,Fs->win_bottom+15,task);
  while (!ScanKey) {
 	"$$FG,GREEN$$Jesus talking...$$FG$$\n";
-	Play("W13eBC!qB2sG3D2G3DetC!!GFsCBCB!etCGBeB!!GsBCB!C",
+	Play("3eBCqB2sG3D2G3DetCGFsCBCBetCGBeBGsBCBC",
 		"Stay \0a\0wake.\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
-	Play("eBC!qB2sG3D2G3DetC!!GFsCBCB!etCGBeB!!GsBCB!C",
+	Play("eBCqB2sG3D2G3DetCGFsCBCBetCGBeBGsBCBC",
 		"Stay \0a\0wake.\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
-	Play("qD!sD!BD!BetA2G3GqB2G3sAD!ADqD!etGF!D",
+	Play("qDsDBDBetA2G3GqB2G3sADADqDetGFD",
 		" \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0I \0 \0am \0a \0dead \0 \0man.\n\0");
-	Play("qD!sD!BD!BetA2G3GqB2G3sAD!ADqD!etGF!D",
+	Play("qDsDBDBetA2G3GqB2G3sADADqDetGFD",
 		" \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0I \0 \0am \0a \0dead \0 \0man.\n\0");
  }
  } catch
@@ -37,13 +37,13 @@ U0 Song()
  try {
    while (!ScanKey) {
      t0=tMBeat;
-      Play("3qB!eB2G!3qA!!eF!!AsF!AFA!!qC2sG!3A!2G3ARBRB",
+      Play("3qBeB2G3qAeFAsFAFAqC2sG3A2G3ARBRB",
 	  "New \0day \0is \0born.\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
-      Play("qB!eB2G!3qA!!eF!!AsF!AFA!!qC2sG!3A!2G3ARBRB",
+      Play("qBeB2G3qAeFAsFAFAqC2sG3A2G3ARBRB",
 	  "Though \0it's \0the \0mourn',\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
-      Play("!eDDR!!CqG!2eGR3qE!!etEA!!FqCsDGDG",
+      Play("eDDRCqG2eGR3qEetEAFqCsDGDG",
 	  "cheer-\0up \0 \0the \0heart\n\0 \0 \0 \0 \0 \0 \0 \0 \0as \0 \0you \0");
-      Play("!eDDR!!CqG!2eGR3qE!!etEA!!FqCsDGDG",
+      Play("eDDRCqG2eGR3qEetEAFqCsDGDG",
 	  "hitch-\0up \0 \0the \0cart.\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
    }
  } catch
@@ -7,7 +7,7 @@ U0 Song()
  music_stacatto_factor= 0.902;
  try {
  while (!ScanKey) {
-	Play("W13qEsCDCDqCDeEGsEBEBeCBsDADA",
+	Play("3qEsCDCDqCDeEGsEBEBeCBsDADA",
 		"Be \0like \0 \0a \0 \0child \0 \0 \0 \0some \0 \0re\0 \0spect.\n\0 \0 \0 \0 \0 \0");
 	Play("qEsCDCDqCDeEGsEBEBeCBsDADA",
 		"Ma\0tur\0 \0i\0 \0ty \0 \0 \0 \0don't \0 \0ne\0 \0glect.\n\0 \0 \0 \0 \0 \0");
@@ -7,13 +7,13 @@ U0 Song()
  music_stacatto_factor= 0.902;
  try {
  while (!ScanKey) {
-	Play("W13qBAeEE!qAeA!EDB!2qG3F",
+	Play("3qBAeEEqAeAEDB2qG3F",
 		"$$FG,RED$$You \0need \0help!\n\0 \0 \0 \0Po\0-o\0-o\0r \0dear.\n\0");
-	Play("BAeEE!qAeA!EDB!2qG3F",
+	Play("BAeEEqAeAEDB2qG3F",
 		"You \0need \0help!\n\0 \0 \0 \0Po\0-o\0-o\0r \0dear.\n$$FG$$\0");
-	Play("!4eFG!!qDetF!E!D!eD!EetADEC3G4GqD3G",
+	Play("4eFGqDetFEDeDEetADEC3G4GqD3G",
 		"Pat\0ron\0ize?  \0No, \0 \0thank \0you!\n\0 \0Too \0 \0man\0y \0strings \0a\0ttach\0ed.\n\0");
-	Play("!4eFG!!qDetF!E!D!eD!EetADEC3G4GqD3G",
+	Play("4eFGqDetFEDeDEetADEC3G4GqD3G",
 		"Pat\0ron\0ize?  \0No, \0 \0thank \0you!\n\0 \0Too \0 \0man\0y \0strings \0a\0ttach\0ed.\n\0");
  }
  } catch
@@ -7,7 +7,7 @@ U0 Song()
  music_stacatto_factor= 0.902;
  try {
  while (!ScanKey) {
-	Play("W13qABeCCqABAAR",
+	Play("3qABeCCqABAAR",
 		"What \0makes \0You \0 \0 \0think \0You're \0God?\n\0 \0");
 	Play("ABeCCqABAAR",
 		"What \0makes \0You \0 \0 \0think \0You're \0God?\n\0 \0");
@@ -15,9 +15,9 @@ U0 Song()
 		"Do \0You \0 \0think \0 \0 \0I'll \0app\0laud?\n\0 \0");
 	Play("ABeCCqABAAR",
 		"What \0makes \0You \0 \0 \0think \0You're \0God?\n\0 \0");
-	Play("GD!G!!eGA2G3FqF!!eDRqB",
+	Play("GDGeGA2G3FqFeDRqB",
 		"$$FG,RED$$Be\0-e-\0cause \0 \0 \0 \0I \0 \0a\0 \0m.\n\0");
-	Play("GD!G!!eGA2G3FqF!!eDRqB",
+	Play("GDGeGA2G3FqFeDRqB",
 		"Are \0 \0you \0 \0 \0 \0a \0 \0fan?\n$$FG$$\0 \0 \0");
 	"$$FG,GREEN$$(If God talks, how can you be sure it's not Him?\n"
 	"You can't, so harden not your heart.)\n$$FG$$";
@@ -8,12 +8,12 @@ U0 Song()
  try {
  while (!ScanKey) {
 	Play("M9/8");
-	Play("W13hDeFhDeFhDC");
+	Play("3hDeFhDeFhDC");
 	Play("FeDhFeDhFE");
 	Play("M4/4");
-	Play("qD!!2G3AeBF!FE2qG!!3D!!A",
+	Play("qD2G3AeBFFE2qG3DA",
 		"Hold \0 \0on!\n\0 \0It's \0gon\0na \0be \0fine.\n\0 \0");
-	Play("D!!2G3AeBF!FE2qG!!3D!!A",
+	Play("D2G3AeBFFE2qG3DA",
 		"Hold \0 \0on!\n\0 \0It's \0gon\0na \0be \0fine.\n\0 \0");
  }
  } catch
@@ -8,14 +8,14 @@ U0 Song()
  try {
  while (!ScanKey) {
 	Play("M3/4");
-	Play("W13eECqAAeECqAA",
+	Play("3eECqAAeECqAA",
 		"I \0hate \0you.\n\0 \0I \0hate \0you.\n\0 \0");
 	Play("eDCqAAeECqAR",
 		" \0 \0 \0 \0I \0hate \0you.\n\0 \0");
 	Play("M6/8");
-	Play("etAB!GqCsGEGE!!etGBDqCsCD!CD",
+	Play("etABGqCsGEGEetGBDqCsCDCD",
 		"$$FG,RED$$Don't \0 \0 \0smile.\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
-	Play("etAB!GqCsGEGE!!etGBDqCsCD!CD",
+	Play("etABGqCsGEGEetGBDqCsCDCD",
 		"Don't \0 \0 \0smile.$$FG$$\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
  }
  } catch
@@ -7,13 +7,13 @@ U0 Song()
  music_stacatto_factor= 0.902;
  try {
  while (!ScanKey) {
-	Play("W13qA!!sDGD!!GqAsCA!CAeCBsFDF!D!!etCGAsAD!A!!D",
+	Play("3qAsDGDGqAsCACAeCBsFDFDetCGAsADAD",
 		" \0I\0mag\0 \0ine.\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
-	Play("qA!!sDGD!!GqAsCA!CAeCBsFDF!D!!etCGAsAD!A!!D",
+	Play("qAsDGDGqAsCACAeCBsFDFDetCGAsADAD",
 		" \0 \0Fa\0 \0thom.\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
-	Play("!!GF!G!!FE!!BE!BeCB2qG3sFAFAqCEA",
+	Play("GFGFEBEBeCB2qG3sFAFAqCEA",
 		"Hi-\0 \0i-\0gh \0as \0 \0your \0 \0thoughts \0will \0go.\n\0 \0 \0 \0 \0 \0 \0 \0");
-	Play("!!sGF!G!!FE!!BE!BeCB2qG3sFAFAqCEA",
+	Play("sGFGFEBEBeCB2qG3sFAFAqCEA",
 		"Deep \0 \0 \0as \0 \0 \0we \0 \0ought \0to \0know.\n\0 \0 \0 \0 \0 \0 \0 \0");
  }
  } catch
@@ -9,10 +9,10 @@ U0 Song()
  while (!ScanKey) {
 	"$$FG,GREEN$$To God...$$FG$$\n";
 	Play("M5/4");
-	Play("W13eEqCeEFEDCqBeEqCeEFEDCqB",
+	Play("3eEqCeEFEDCqBeEqCeEFEDCqB",
 		"Fa\0ther, \0for\0give \0them \0if \0you \0must.\n\0I'd \0like \0to \0see \0them \0turn \0to \0dust.\n\0");
 	Play("M4/4");
-	Play("sGBGBetAF!2G3eEF!sEGEGqDsB!!D!BDGFGF2etG3GB");
+	Play("sGBGBetAF2G3eEFsEGEGqDsBDBDGFGF2etG3GB");
  }
  } catch
    CatchAll;
@@ -22,7 +22,7 @@ U0 Song()
  SetWinHorz(Fs->win_left,Fs->win_right,task);
  SetWinVert(Fs->win_bottom+3,Fs->win_bottom+15,task);
  while (!ScanKey) {
-	Play("W13qBeCDqCAetAACeECsF2G3F2GqG",
+	Play("3qBeCDqCAetAACeECsF2G3F2GqG",
 		"I'm \0on \0a \0mis\0sion \0from \0 \0 \0my \0 \0God.\n\0 \0 \0 \0 \0");
 	Play("3BeCDqCAetAACeECsF2G3F2GqG",
 		"I'm \0on \0a \0mis\0sion \0from \0 \0 \0my \0 \0God.\n\0 \0 \0 \0 \0");
@@ -14,6 +14,7 @@ U0 DrawIt(CTask *task,CDC *dc)
 U0 Song()
 {
  SettingsPush; //See $LK,"SettingsPush","MN:SettingsPush"$
+  Fs->text_attr=LTCYAN<<4+BLACK;
  Fs->draw_it=&DrawIt;
  Fs->task_end_cb=&SndTaskEndCB;

@@ -38,6 +38,7 @@ U0 DrawIt(CTask *,CDC *dc)
 U0 Song()
 {
  SettingsPush; //See $LK,"SettingsPush","MN:SettingsPush"$
+  Fs->text_attr=LTCYAN<<4+BLACK;
  Fs->draw_it=&DrawIt;
  Fs->task_end_cb=&SndTaskEndCB;
  MusicSettingsRst;
@@ -46,13 +47,13 @@ U0 Song()
  try {
    "$$BG+H,LTCYAN$$";
    while (!ScanKey) {
-	Play("W13qE!AA!etF2G3G!qDF!!etFE!D2eG!3G",
+	Play("3qEAAetF2G3GqDFetFED2eG3G",
 		"A\0dam... \0 \0no \0 \0 \0long\0er \0sees \0Your \0face.\n\0 \0 \0");
-	Play("qE!AA!etF2G3G!qDF!!etFE!D2eG!3G",
+	Play("qEAAetF2G3GqDFetFED2eG3G",
 		"Oh! \0 \0 \0What \0 \0a \0wretch\0ed \0bar\0ren \0waste!\n\0 \0 \0");
-	Play("qACFeB!CB2GqG3E!D",
+	Play("qACFeBCB2GqG3ED",
 		" \0 \0 \0 \0 \0 \0 \0 \0Ex\0iled.\n\0");
-	Play("ACFeB!CB2GqG3E!D");
+	Play("ACFeBCB2GqG3ED");
    }
  } catch
    CatchAll;
@@ -7,14 +7,14 @@ U0 Song()
  music_stacatto_factor= 0.857;
  try {
  while (!ScanKey) {
-	Play("W13eEDEFqDDeEDEDqCC",
+	Play("3eEDEFqDDeEDEDqCC",
 		"$$CL$$Sit\0ting \0in \0a \0church\n\0 \0wond\0ering \0to \0my\0self,\n\0 \0");
 	Play("eD2G3BCqDsGGGGeD2G3BCqDsGGGG",
 		"\"Is \0 \0God \0 \0real?\"\n\0 \0 \0 \0 \0\"At \0 \0the \0 \0wheel?\"\n\0 \0 \0 \0 \0");
 	"$$FG,GREEN$$God talking...\n$$FG$$";
-	Play("qF!FFetREA!qG!sG!FG!!F!GEGEqC",
+	Play("qFFFetREAqGsGFGFGEGEqC",
 		"$$FG,RED$$Oh, \0Hell \0yes!\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
-	Play("F!FFetREA!qG!sG!FG!!F!GEGEqC",
+	Play("FFFetREAqGsGFGFGEGEqC",
 		"Pass \0the \0test.$$FG$$\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
  }
  } catch
@@ -7,10 +7,10 @@ U0 Song()
  music_stacatto_factor= 0.758;
  try {
  while (!ScanKey) {
-	Play("W13sDDeBCsAAeB2G3A2F3sCCeDsFFeEsFFEEeDE");
+	Play("3sDDeBCsAAeB2G3A2F3sCCeDsFFeEsFFEEeDE");
 	Play("sDDeBCsAAeB2G3A2F3sCCeDsFFeEsFFEEeDE");
-	Play("sGBGB2etG3EGqF!!ED2G3eBA!DG");
-	Play("sGBGB2etG3EGqF!!ED2G3eBA!DG");
+	Play("sGBGB2etG3EGqFED2G3eBADG");
+	Play("sGBGB2etG3EGqFED2G3eBADG");
  }
  } catch
    CatchAll;
@@ -7,10 +7,10 @@ U0 Song()
  music_stacatto_factor= 0.714;
  try {
  while (!ScanKey) {
-	Play("W13sBBBBEBDBeEBqDeBBEDEBqD");
+	Play("3sBBBBEBDBeEBqDeBBEDEBqD");
 	Play("sFEFEeFEDBqDeEFEBABqD");
-	Play("eDGqEeBAABqF!eBD!qE!A");
-	Play("eDGqEeBAABqF!eBD!qE!A");
+	Play("eDGqEeBAABqFeBDqEA");
+	Play("eDGqEeBAABqFeBDqEA");
  }
  } catch
    CatchAll;
@@ -7,13 +7,13 @@ U0 Song()
  music_stacatto_factor= 0.604;
  try {
  while (!ScanKey) {
-	Play("W13sEqAsDeCqAsEqAsDeCqAsDeEqEsE",
+	Play("3sEqAsDeCqAsEqAsDeCqAsDeEqEsE",
 		"Jes\0us \0kind \0of \0freaks,\n\0Jes\0us \0kind \0of \0freaks,\n\0are \0dif\0ferent \0 \0");
-	Play("eDqCsDeCqBsBeBqAetBED!qBeC!B",
+	Play("eDqCsDeCqBsBeBqAetBEDqBeCB",
 		"from \0 \0oth\0er\n\0 \0 \0peo\0ple.\n\0 \0 \0 \0 \0They \0don't \0");
-	Play("2qGeG!3FsCDC!!DqFetB!ACBED!qBeC!B",
+	Play("2qGeG3FsCDCDqFetBACBEDqBeCB",
 		"care,\n\0for \0God \0 \0is \0their \0 \0joy!\n\0 \0 \0 \0 \0 \0 \0 \0They \0don't \0");
-	Play("2qGeG!3FsCDC!!DqFetB!AC",
+	Play("2qGeG3FsCDCDqFetBAC",
 		"care,\n\0for \0God \0 \0is \0their \0 \0joy!\n\0 \0 \0 \0");
  }
  } catch
@@ -120,7 +120,7 @@ U0 Song()
  SettingsPush; //See $LK,"SettingsPush","MN:SettingsPush"$
  Preempt(OFF);
  Init;
-  Fs->animate_task=Spawn(&AnimateTask,NULL,"Animate",Fs);
+  Fs->animate_task=Spawn(&AnimateTask,NULL,"Animate",,Fs);
  Fs->draw_it=&DrawIt;
  Fs->task_end_cb=&SndTaskEndCB;
  MusicSettingsRst;
@@ -134,13 +134,13 @@ U0 Song()
  SetWinHorz(Fs->win_left,Fs->win_right,task);
  SetWinVert(Fs->win_bottom+3,Fs->win_bottom+15,task);
  while (!ScanKey) {
-	Play("W13qEEBeBDsBBB!BqDsBFB!!FD2G3D!2G",
+	Play("3qEEBeBDsBBBBqDsBFBFD2G3D2G",
 		"Free \0will... \0 \0 \0 \0 \0 \0 \0 \0 \0I \0 \0 \0 \0fail.\n\0 \0 \0 \0");
-	Play("3qEEBeBDsBBB!BqDsBFB!!FD2G3D!2G",
+	Play("3qEEBeBDsBBBBqDsBFBFD2G3D2G",
 		"God \0still... \0 \0 \0 \0 \0 \0 \0 \0 \0I \0 \0 \0 \0hail.\n\0 \0 \0 \0");
-	Play("3qD2G3eA2G3qCetEC!AqBsA!!C!ACqA",
+	Play("3qD2G3eA2G3qCetECAqBsACACqA",
 		"All \0things \0work \0for \0good... \0to \0the \0Lord.\n\0 \0 \0 \0 \0 \0 \0");
-	Play("D2G3eA2G3qCetEC!AqBsA!!C!ACqA",
+	Play("D2G3eA2G3qCetECAqBsACACqA",
 		"It's \0all \0good... \0 \0 \0as\0 \0sured.\n\0 \0 \0 \0 \0 \0 \0");
  }
  } catch
@@ -7,10 +7,10 @@ U0 Song()
  music_stacatto_factor= 0.758;
  try {
  while (!ScanKey) {
-	Play("W13qBeABqA2G3AB2hG");
+	Play("3qBeABqA2G3AB2hG");
 	Play("3sCCCCqBsAAAA2qG3sCCCCqE2GR");
-	Play("!!3sBDB!!DA2G!3A2G!!3etAA!EsGCGCetFFEqDFeE2G");
-	Play("!!3sBDB!!DA2G!3A2G!!3etAA!EsGCGCetFFEqDFeE2G");
+	Play("3sBDBDA2G3A2G3etAAEsGCGCetFFEqDFeE2G");
+	Play("3sBDBDA2G3A2G3etAAEsGCGCetFFEqDFeE2G");
  }
  } catch
    CatchAll;
@@ -7,10 +7,10 @@ U0 Song()
  music_stacatto_factor= 0.538;
  try {
  while (!ScanKey) {
-	Play("W13qEDCDeEEqEeDDqD");
+	Play("3qEDCDeEEqEeDDqD");
 	Play("EDCDeEEqEeDDqD");
-	Play("eD!!AsFDF!DqFsFBFB2qG3etBB!BqFC");
-	Play("eD!!AsFDF!DqFsFBFB2qG3etBB!BqFC");
+	Play("eDAsFDFDqFsFBFB2qG3etBBBqFC");
+	Play("eDAsFDFDqFsFBFB2qG3etBBBqFC");
  }
  } catch
    CatchAll;
@@ -7,10 +7,10 @@ U0 Song()
  music_stacatto_factor= 0.902;
  try {
  while (!ScanKey) {
-	Play("W13sC!G!CG!!etA!DD2sG!3G2G3G!F!A!!FADD!!DD!qGsB2G3B2G3qG");
-	Play("sC!G!CG!!etA!DD2sG!3G2G3G!F!A!!FADD!!DD!qGsB2G3B2G3qG");
-	Play("eG!2G3qEeAsA2G3qAsEAEAD!E!!DEqFeA!2G");
-	Play("3G!2G3qEeAsA2G3qAsEAEAD!E!!DEqFeA!2G");
+	Play("3sCGCGetADD2sG3G2G3GFAFADDDDqGsB2G3B2G3qG");
+	Play("sCGCGetADD2sG3G2G3GFAFADDDDqGsB2G3B2G3qG");
+	Play("eG2G3qEeAsA2G3qAsEAEADEDEqFeA2G");
+	Play("3G2G3qEeAsA2G3qAsEAEADEDEqFeA2G");
  }
  } catch
    CatchAll;
@@ -7,10 +7,10 @@ U0 Song()
  music_stacatto_factor= 0.780;
  try {
  while (!ScanKey) {
-	Play("W13eCDBCA2FFF3C2F3E2F3A2F3sEEeD");
+	Play("3eCDBCA2FFF3C2F3E2F3A2F3sEEeD");
 	Play("F2FFF3qCeF2F3F2FFF3qCeF2F");
-	Play("!3qG!sEAEAqB!etDC!F2qG3D!sGDGDetCRC");
-	Play("!qG!sEAEAqB!etDC!F2qG3D!sGDGDetCRC");
+	Play("3qGsEAEAqBetDCF2qG3DsGDGDetCRC");
+	Play("qGsEAEAqBetDCF2qG3DsGDGDetCRC");
  }
  } catch
    CatchAll;
@@ -8,13 +8,13 @@ U0 Song()
  try {
  while (!ScanKey) {
 	Play("M5/4");
-	Play("W12qGGG3qtCBA2qGGG3qtCetBBqtA",
+	Play("2qGGG3qtCBA2qGGG3qtCetBBqtA",
 		"Hymn's \0not \0long.\n\0 \0 \0 \0Nor \0this \0song.\n\0 \0 \0 \0 \0");
 	Play("qEeCCqDqtCBAM4/4",
 		"For\0 \0 \0give!\n\0 \0 \0 \0");
-	Play("qD!eA!2G3DG2G3DF!FAC!!2qG3eAE",
+	Play("qDeA2G3DG2G3DFFAC2qG3eAE",
 		"That's \0 \0 \0all \0 \0I \0 \0say.\n\0 \0 \0 \0 \0 \0 \0");
-	Play("qD!eA!2G3DG2G3DF!FAC!!2qG3eAE",
+	Play("qDeA2G3DG2G3DFFAC2qG3eAE",
 		"This \0 \0 \0I \0 \0 \0 \0pray.\n\0 \0 \0 \0 \0 \0 \0");
  }
  } catch
@@ -7,13 +7,13 @@ U0 Song()
  music_stacatto_factor= 0.902;
  try {
  while (!ScanKey) {
-	Play("W13eC2G3DDEDqCeEEGFGFqE",
+	Play("3eC2G3DDEDqCeEEGFGFqE",
 		"Sit\0ting \0 \0 \0on \0the \0fence,\n\0is \0 \0 \0 \0no \0de\0fence.\n\0");
 	Play("sFFeGFEFEqDsCCeDCBqBB",
 		"Is \0this \0seat \0 \0 \0tak\0 \0en?\n\0An\0 \0y\0one \0op\0 \0pose?\n\0");
-	Play("etB2GG!3qE!2eG3F!EEetFBA!qFDetF!CC",
+	Play("etB2GG3qE2eG3FEEetFBAqFDetFCC",
 		"Take \0 \0a \0step.\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
-	Play("B2GG!3qE!2eG3F!EEetFBA!qFDetF!CC",
+	Play("B2GG3qE2eG3FEEetFBAqFDetFCC",
 		"Take \0 \0the \0step,\n\0 \0 \0 \0 \0 \0 \0 \0not \0back.\n\0 \0 \0 \0");
  }
  } catch
@@ -14,11 +14,11 @@ U0 Song()
  SetWinHorz(Fs->win_left,Fs->win_right,task);
  SetWinVert(Fs->win_bottom+3,Fs->win_bottom+15,task);
  while (!ScanKey) {
-	Play("W13sDDDACCADDACCAe.DsCCC2G3FD2G3FD2G3CCAe.D",
+	Play("3sDDDACCADDACCAe.DsCCC2G3FD2G3FD2G3CCAe.D",
 		"I \0 \0 \0 \0got \0 \0 \0paid, \0 \0 \0to\0 \0 \0day.\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
-	Play("qD2sG3G2G3G!etGDAeF2GqG3etF!BA!!EACE!CE",
+	Play("qD2sG3G2G3GetGDAeF2GqG3etFBAEACECE",
 		" \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0I \0 \0 \0can't \0 \0 \0get \0 \0to \0");
-	Play("qD2sG3G2G3G!etGDAeF2GqG3etF!BA!!EACE!CE",
+	Play("qD2sG3G2G3GetGDAeF2GqG3etFBAEACECE",
 		"sleep.\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
  }
  } catch
@@ -8,10 +8,10 @@ U0 Song()
  try {
  while (!ScanKey) {
 	Play("M9/8");
-	Play("W13qAeCBAq.CsAAqAeCBA2q.G3sBC");
+	Play("3qAeCBAq.CsAAqAeCBA2q.G3sBC");
 	Play("qAeDCAhBeFsEEeDq.CM4/4");
-	Play("sAFAFeF!!2GsG3B2G!!3BqGeA!sAAetEGDE2G!3DeGsGG");
-	Play("AFAFeF!!2GsG3B2G!!3BqGeA!sAAetEGDE2G!3DeGsGG");
+	Play("sAFAFeF2GsG3B2G3BqGeAsAAetEGDE2G3DeGsGG");
+	Play("AFAFeF2GsG3B2G3BqGeAsAAetEGDE2G3DeGsGG");
  }
  } catch
    CatchAll;
@@ -63,6 +63,7 @@ U0 Song()
 {
  I64 i;
  SettingsPush; //See $LK,"SettingsPush","MN:SettingsPush"$
+  Fs->text_attr=LTCYAN<<4+BLACK;
  Fs->draw_it=&DrawIt;
  Fs->task_end_cb=&SndTaskEndCB;
  MusicSettingsRst;
@@ -73,10 +74,10 @@ U0 Song()
    by[i]=RANGE*RandI16/RANGE;
  }
  try {
-    "$$BG+H,LTCYAN$$$$FD+H,BLACK$$";
+    "$$BG+H,LTCYAN$$";
    while (!ScanKey) {
 	t0=tMBeat;
-	Play("W13eDEqFFetEEFqDeCDDEetCGF");
+	Play("3eDEqFFetEEFqDeCDDEetCGF");
 	Play("eDEqFFetEEFqDeCDDEetCGF");
 	Play("eDCqDEeAAetEEFEDGBDCqF");
 	Play("eDCqDEeAAetEEFEDGBDCqF");
@@ -18,11 +18,11 @@ U0 Song()
  while (!ScanKey) {
 	"$$FG,GREEN$$Jesus talking...\n$$FG$$";
 	Play("M6/8");
-	Play("W13eAACADAADACAR",
+	Play("3eAACADAADACAR",
 		" \0 \0I \0 \0came \0 \0 \0to \0 \0serve.\n\0 \0 \0");
 	Play("AACADAADACAR",
 		" \0 \0I \0 \0give \0 \0 \0my \0 \0word.\n\0 \0 \0");
-	Play("FG!etFEGA!!B!C!DA!C2qG!3sECEC");
+	Play("FGetFEGABCDAC2qG3sECEC");
  }
  } catch
    CatchAll;
@@ -14,13 +14,13 @@ U0 Song()
  SetWinHorz(Fs->win_left,Fs->win_right,task);
  SetWinVert(Fs->win_bottom+3,Fs->win_bottom+15,task);
  while (!ScanKey) {
-	Play("W13hDeDA2qG3hDeD2GqF",
+	Play("3hDeDA2qG3hDeD2GqF",
 		"It \0sig\0ni\0fies\n\0a \0big \0sur\0prise.\n\0");
 	Play("3hDeD2sFG3qAhDeDA2qG",
 		"Why \0 \0im\0pro\0vise?\n\0$$FG,RED$$\"Be\0cause,\"$$FG$$ \0re\0plies.\n\0");
-	Play("3eC!!EsACACeD2G3qA!AFeE2G!3etFCC",
+	Play("3eCEsACACeD2G3qAAFeE2G3etFCC",
 		"If \0 \0you \0 \0 \0 \0love \0your \0god,\n\0 \0don't \0bore \0 \0Him!\n\0 \0 \0");
-	Play("eC!!EsACACeD2G3qA!AFeE2G!3etFCC",
+	Play("eCEsACACeD2G3qAAFeE2G3etFCC",
 		"If \0 \0you \0 \0 \0 \0love \0your \0god,\n\0 \0sur\0prise \0 \0Him!\n\0 \0 \0");
  }
  } catch
@@ -8,13 +8,13 @@ U0 Song()
  music_stacatto_factor= 0.902;
  try {
  while (!ScanKey) {
-	Play("W13qF!2GsGG!!GG3GFG!FqAeD!2G!3etDBEsFCFC",
+	Play("3qF2GsGGGG3GFGFqAeD2G3etDBEsFCFC",
 		"Love \0 \0 \0 \0 \0 \0ev\0 \0ery \0 \0sec\0ond.\n\0 \0 \0 \0 \0 \0 \0 \0 \0");
-	Play("qF!2GsGG!!GG3GFG!FqAeD!2G!3etDBEsFCFC",
+	Play("qF2GsGGGG3GFGFqAeD2G3etDBEsFCFC",
 		"World -- \0 \0 \0 \0 \0 \0all \0 \0that \0 \0beck\0ons.\n\0 \0 \0 \0 \0 \0 \0 \0 \0");
-	Play("qBG!!FsEAEAqEFGeF!C",
+	Play("qBGFsEAEAqEFGeFC",
 		" \0Life \0is \0too \0 \0 \0 \0prec\0i\0ous.\n\0 \0 \0");
-	Play("qBG!!FsEAEAqEFGeF!C",
+	Play("qBGFsEAEAqEFGeFC",
 		" \0Can \0be \0 \0 \0 \0 \0worr\0i\0ous.\n\0 \0 \0");
  }
  } catch
@@ -15,13 +15,13 @@ U0 Song()
  SetWinHorz(Fs->win_left,Fs->win_right,task);
  SetWinVert(Fs->win_bottom+3,Fs->win_bottom+15,task);
  while (!ScanKey) {
-	Play("W12eG3CD!AqE!!sACACG!EGEqDsAAA!AetCDD",
+	Play("2eG3CDAqEsACACGEGEqDsAAAAetCDD",
 		"Ple\0ase \0te\0ach \0me.\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
-	Play("2eG3CD!AqE!!sACACG!EGEqDsAAA!AetCDD",
+	Play("2eG3CDAqEsACACGEGEqDsAAAAetCDD",
 		"Wa\0ter \0thi\0s \0tree.\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
-	Play("2qG!G3eEBqAGeFE!!sF!GFG!etD!BD",
+	Play("2qGG3eEBqAGeFEsFGFGetDBD",
 		" \0 \0$$FG,RED$$I \0will \0teach \0thee.\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
-	Play("2qG!G3eEBqAGeFE!!sF!GFG!etD!BD",
+	Play("2qGG3eEBqAGeFEsFGFGetDBD",
 		" \0 \0Wat\0er \0that \0tree.$$FG$$\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
  }
  } catch
@@ -30,6 +30,7 @@ U0 Song()
  I64 i;
  CTask *task;
  SettingsPush; //See $LK,"SettingsPush","MN:SettingsPush"$
+  Fs->text_attr=LTCYAN<<4+BLACK;
  Fs->draw_it=&DrawIt;
  Fs->task_end_cb=&SndTaskEndCB;
  MusicSettingsRst;
@@ -52,17 +53,17 @@ U0 Song()
    TaskWait(task);
    SetWinHorz(Fs->win_left,Fs->win_right,task);
    SetWinVert(Fs->win_bottom+3,Fs->win_bottom+15,task);
-    "$$BD+H,LTCYAN$$$$FD+H,BLACK$$";
+    "$$BG+H,LTCYAN$$$$FG+H,BLACK$$";
    while (!ScanKey) {
-      Play("W12qG3eCB2hGqG3eCB2qG3A",
+      Play("2qG3eCB2hGqG3eCB2qG3A",
      "Umm... \0God?\n\0 \0 \0Let \0Your \0 \0 \0 \0");
      Play("CeBA2G3DqEeDCBA2qG3A",
      "face \0shine \0on \0down\n\0on \0us, \0Your \0 \0luck\0y \0 \0peo\0");
-      Play("eBA2h.G3qE!!CAF",
+      Play("eBA2h.G3qECAF",
      " \0ple.\n\0 \0Fath\0e\0r \0a\0");
-      Play("FD!A!eEDqE!!CAF",
+      Play("FDAeEDqECAF",
      "bove,\n\0 \0 \0I \0 \0feel \0 \0 \0Your \0");
-      Play("FD!A!eED",
+      Play("FDAeED",
      "love.\n\0 \0 \0 \0 \0");
    }
    } catch
@@ -7,13 +7,13 @@ U0 Song()
  music_stacatto_factor= 0.902;
  try {
  while (!ScanKey) {
-	Play("W13sC#C#D#D#C#C#CCC#C#D#D#C#C#CCEEDDC#C#DDEEDDC#C#DD",
+	Play("3sC#C#D#D#C#C#CCC#C#D#D#C#C#CCEEDDC#C#DDEEDDC#C#DD",
 		"Still \0 \0 \0 \0there.\n\0 \0 \0 \0Still \0 \0 \0 \0there.\n\0 \0 \0 \0Not \0 \0 \0 \0fair.\n\0 \0 \0 \0Not \0 \0 \0 \0fair.\n\0 \0 \0 \0");
 	Play("C#C#D#D#C#C#CCC#C#D#D#C#C#CCEEDDC#C#DDEEDDC#C#DD",
 		"Un\0 \0 \0 \0aware!\n\0 \0 \0 \0Un\0 \0 \0 \0aware!\n\0 \0 \0 \0Every\0 \0 \0 \0where!\n\0 \0 \0 \0Every\0 \0 \0 \0where!\n\0 \0 \0 \0");
-	Play("eB!!DetFGAeF!EBE!etE!FEqCeFEDA",
+	Play("eBDetFGAeFEBEetEFEqCeFEDA",
 		"$$FG,RED$$Running \0 \0 \0a\0way \0 \0 \0 \0 \0 \0from \0the \0Lord \0won't \0 \0work.\n\0 \0");
-	Play("B!!DetFGAeF!EBE!etE!FEqCeFEDA",
+	Play("BDetFGAeFEBEetEFEqCeFEDA",
 		"Running \0 \0 \0a\0way \0 \0 \0 \0 \0 \0from \0the \0Lord \0won't \0 \0work.$$FG$$\n\0 \0");
  }
  } catch
@@ -8,7 +8,7 @@ U0 Song()
  try {
  while (!ScanKey) {
 	"$$FG,GREEN$$As I look back on my sinful past...$$FG$$\n";
-	Play("W13qCAABAeAECEqB",
+	Play("3qCAABAeAECEqB",
 		"Who \0was \0that \0per\0son? \0 \0It \0wasn't \0 \0me?\n\0");
 	Play("CAABAeAECEqB",
 		"Who \0was \0that \0per\0son? \0 \0It \0wasn't \0 \0me?\n\0");
@@ -16,7 +16,7 @@ U0 PutVerse()
  U8 *ch;
  I64 *start;

-  "$$CL$$";
+  DocClear;
  start=GetTimeStamp/16%size;
  if (start>size-LEN) start=size-LEN;
  ch=bible[start+LEN-1];
@@ -38,12 +38,12 @@ U0 Song()
    "$$WW,1$$This shows a random passage based on "
    "the time at the moment this song was run.  "
    "Talk to God as an offering, then run $MA+A-X+PU,"AfterEgypt","Cd(\"::/TempleOS/Apps/AfterEgypt\");;#include \"Run\"\\n"$ if you "
-    "want God to talk some more.  The $LK,"Holy Spirit","FI:::/TempleOS/Apps/HolySpirit/HSNotes.TXT"$ can "
+    "want God to talk some more.  The $LK+PU,"Holy Spirit","FI:::/TempleOS/Apps/HolySpirit/HSNotes.TXT"$ can "
    "puppet you.\n");
  TaskWait(task);
  SetWinHorz(Fs->win_left,Fs->win_right,task);
  SetWinVert(Fs->win_bottom+3,Fs->win_bottom+15,task);
-  DocRecalc(DocCur(task)); //Reformat word-wrap with new window size.
+  DocRecalc(DocPut(task)); //Reformat word-wrap with new window size.
  while (!ScanKey) {
 	PutVerse;
 	Play("3qAeABCBqCetABBqCetAAREE2G");
@@ -7,12 +7,12 @@ U0 Song()
  music_stacatto_factor= 0.902;
  try {
  while (!ScanKey) {
-	Play("W14etEEEqBetDDqtDqBetCCqtCqBhB");
+	Play("4etEEEqBetDDqtDqBetCCqtCqBhB");
 	Play("etEEEqBetDDqtDqBetCCqtCqBhB");
 	Play("etABCqDetBCCqDetDCBqAhA");
 	Play("etABCqDetBCCqDetDCBqAhA");
-	Play("!qAetC!!AEsG!!CGCetBC3G4ADAqAGetDAD");
-	Play("!qAetC!!AEsG!!CGCetBC3G4ADAqAGetDAD");
+	Play("qAetCAEsGCGCetBC3G4ADAqAGetDAD");
+	Play("qAetCAEsGCGCetBC3G4ADAqAGetDAD");
  }
  } catch
    CatchAll;
@@ -7,12 +7,12 @@ U0 Song()
  music_stacatto_factor= 0.902;
  try {
  while (!ScanKey) {
-	Play("W13qEDeCC!etEAAqEetCDCA!!GFqG",
+	Play("3qEDeCCetEAAqEetCDCAGFqG",
 		"I \0don't \0know \0 \0 \0 \0 \0 \0 \0 \0what \0 \0to \0 \0pray.\n\0");
-	Play("EDeCC!etEAAqEetCDCA!!GFqG");
-	Play("eGEetFDAqF!sGF!GF!G!!FG!F!etBGFqGeDE",
+	Play("EDeCCetEAAqEetCDCAGFqG");
+	Play("eGEetFDAqFsGFGFGFGFetBGFqGeDE",
 		"It's \0a \0blah \0 \0 \0day.\n\0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0");
-	Play("GEetFDAqF!sGF!GF!G!!FG!F!etBGFqGeDE");
+	Play("GEetFDAqFsGFGFGFGFetBGFqGeDE");
  }
  } catch
    CatchAll;
@@ -8,14 +8,14 @@ U0 Song()
  try {
  while (!ScanKey) {
 	DocClear;
-	Play("W13qDsCCCCeBBCCqDsCCCCeBBCC",
+	Play("3qDsCCCCeBBCCqDsCCCCeBBCC",
 		"I'm \0 \0 \0 \0 \0on \0my \0way.\n\0 \0Got \0a \0 \0 \0 \0bus\0y \0day.\n\0 \0");
 	Play("sBBBBeAAsBA2G3AqAsBBBBeAAsBA2G3AqA",
 		"Woe, \0 \0 \0 \0I \0for\0got \0 \0to \0 \0pray.\n\0What's \0 \0 \0 \0God \0 \0have \0 \0to \0 \0say?\n\0");
 	"$$FG,GREEN$$God talking...\n$$FG$$";
-	Play("AeB2G3GGqE2etG3F!B!eFGqFeEC",
+	Play("AeB2G3GGqE2etG3FBeFGqFeEC",
 		"$$FG,RED$$Oh, \0 \0 \0hi-\0a \0you!\n\0What\0ch\0u \0been \0 \0do\0ing?\n\0 \0");
-	Play("qAeB2G3GGqE2etG3F!B!eFGqFeEC",
+	Play("qAeB2G3GGqE2etG3FBeFGqFeEC",
 		"Oh, \0 \0 \0hi-\0a \0you!\n\0What\0ch\0u \0been \0 \0do\0ing?$$FG$$\n\0 \0");
  }
  } catch
@@ -4,9 +4,9 @@ $WW,1$$FG,5$$TX+CX,"Music Organ Help"$$FG$

 * The clipboard can be used to cut and paste.

-* $FG,2$MusicOrgan$FG$ uses $FG,2$C+$FG$ files as it's fmt!  See $LK-A,"::/TempleOS/Apps/MusicOrgan/Examples/personal.CPP"$.  It does not fully parse them when loading back in, so changes made outside $FG,2$MusicOrgan$FG$ can be lost.
+* $FG,2$MusicOrgan$FG$ uses $LK,"Holy C","FI:::/TempleOS/Doc/HolyC.TXT"$ files as it's fmt!  See $LK-A,"::/TempleOS/Apps/MusicOrgan/Examples/personal.CPP"$.  It does not fully parse them when loading back in, so changes made outside $FG,2$MusicOrgan$FG$ can be lost.

-* The first line of the $FG,2$C+$FG$ files has a comment with a category recognized by $LK,"JukeBox","FF:::/TempleOS/Apps/MusicOrgan/JukeBox.CPP,JukeBox"$().  The categories are $FG,2$"no nothing"$FG$, $FG,2$"has words"$FG$, $FG,2$"has graphics"$FG$, or $FG,2$"special"$FG$.  The third character in the comment is a digit rating number.
+* The first line of the $LK,"Holy C","FI:::/TempleOS/Doc/HolyC.TXT"$ files has a comment with a category recognized by $LK,"JukeBox","FF:::/TempleOS/Apps/MusicOrgan/JukeBox.CPP,JukeBox"$().  The categories are $FG,2$"no nothing"$FG$, $FG,2$"has words"$FG$, $FG,2$"has graphics"$FG$, or $FG,2$"special"$FG$.  The third character in the comment is a digit rating number.

 * You can take the $LK,"Play","MN:Play"$() statements out of a song file and place them in your programs.  You can also add a song to a document with $FG,2$<CTRL-L>$FG$, but you should do it after pressing $FG,2$<CTRL-T>$FG$ because the clipboard-insert in $FG,2$<CTRL-L>$FG$ is screwy.  See this $SO,"<Song>","2qG3ECB2eGG3qCeFDsBGBG2qG3ECB2eGG3qCeFDsBGBGqEeEFqEB2eG3FetCAGqFCEeEFqEB2eG3FetCAGqFC"$ after pressing $FG,2$<CTRL-T>$FG$, now.

@@ -22,5 +22,5 @@ $FG,5$U0 CtrlAltR(I64)
 SetCtrlAltLetCB('R',&CtrlAltR,"Toggle snd_record");$FG$


-* The note accent feature only works when exporting songs.  When calling $LK,"SndFileCreate","MN:SndFileCreate"$() you can set a waveform.  The PC speaker is $LK,"WF_SQUARE","MN:WF_SQUARE"$.  You can select reverb and averaging, also.
+* When calling $LK,"SndFileCreate","MN:SndFileCreate"$() you can set a waveform.  The PC speaker is $LK,"WF_SQUARE","MN:WF_SQUARE"$.  You can select reverb and averaging, also.

@@ -1,15 +1,15 @@
 CTask *SingleSong(U8 *msg,U8 *name)
 {
  Bool old_preempt=Preempt(OFF);
-  CTask *task=Spawn(&ServantUserCmdLine,NULL,name,Fs);
-  LBts(&task->task_flags,TASKf_LOCK_TITLE);
+  CTask *task=Spawn(&SrvUserCmdLine,NULL,name,,Fs);
  StrCpy(task->task_title,name);
-  TaskRqstQue(task,Fs,";",1<<TASKCf_WAKE_MASTER);
+  task->title_src=TTS_LOCKED_CONST;
+  TaskExeStrQue(task,Fs,";",1<<SVCf_WAKE_MASTER|1<<SVCf_FREE_ON_COMPLETE);
  SetWinHorz(task->win_left,task->win_left+50,task);
  SetWinVert(2,2+8,task);
  Preempt(old_preempt);
-  TaskRqstQue(task,NULL,msg,1<<TASKCf_EXIT_ON_COMPLETE);
-  DocCur(task)->max_entries=100;
+  TaskExeStrQue(task,NULL,msg,1<<SVCf_EXIT_ON_COMPLETE|1<<SVCf_FREE_ON_COMPLETE);
+  DocPut(task)->max_entries=100;
  return task;
 }

@@ -93,15 +93,15 @@ public U0 JukeBox(U8 *dirname=NULL,U8 **_filename=NULL)
 	if ('0'<=doc_e->tag[2]<='9')
 	  rating=doc_e->tag[2];
 	if (StrStr(doc_e->tag,"incomplete"))
-	  DocPutS(doc,"$$FM,BLACK$$");
+	  DocPutS(doc,"$$FG,BLACK$$");
 	else if (StrStr(doc_e->tag,"has graphics"))
-	  DocPutS(doc,"$$FM,GREEN$$");
+	  DocPutS(doc,"$$FG,GREEN$$");
 	else if (StrStr(doc_e->tag,"has words"))
-	  DocPutS(doc,"$$FM,BLUE$$");
+	  DocPutS(doc,"$$FG,BLUE$$");
 	else if (StrStr(doc_e->tag,"special"))
-	  DocPutS(doc,"$$FM,CYAN$$");
+	  DocPutS(doc,"$$FG,CYAN$$");
 	else if (StrStr(doc_e->tag,"no nothing")) {
-	  DocPutS(doc,"$$FM,RED$$");
+	  DocPutS(doc,"$$FG,RED$$");
 	  if (FileOcc("\\0",tempm1->full_name,"")) {
 	    s->cur_entry=doc_e->next;
 	    s->cur_data_col=0;
@@ -118,7 +118,7 @@ public U0 JukeBox(U8 *dirname=NULL,U8 **_filename=NULL)
    }
    tempm1=tempm1->next;
  }
-  DocPrintF(doc,"\n$$FM,CYAN$$$$MU-UL,\"DONE\",%d$$\n",DOCM_CANCEL);
+  DocPrintF(doc,"\n$$FG,CYAN$$$$MU-UL,\"DONE\",%d$$\n",DOCM_CANCEL);
  while (TRUE) {
    if (_filename)
      tempm1=PopUpMenu(doc,DOF_INTERCEPT_TASK_END);
@@ -4,9 +4,8 @@ class MakeSongSettings
  Bool normal_rhythms		fmtstr "$$CB,\"Normal Rhythms\"$$\n";
  Bool complex_rhythms		fmtstr "$$CB,\"Complex Rhythms\"$$\n";
  Bool rests			fmtstr "$$CB,\"Rests\"$$\n";
-  Bool change_waveforms	fmtstr "$$CB,\"Change Waveforms\"$$\n";
  Bool six_eight		fmtstr "$$CB,\"Six Eight\"$$\n";
-  I64	 octave			fmtstr "$$DA-T,32,\"Octave:%d\"$$\n";
+  I64  octave			fmtstr "$$DA-T,32,\"Octave:%d\"$$\n";
 };

 U0 InsNote(MakeSongSettings *mss,U8 *buf,I64 k,I64 *j)
@@ -60,14 +59,12 @@ U8 *MakeSong()
 {
  MakeSongSettings mss;
  U8 *buf;
-  I64 i,j=0,k,n,k2,duration,last_duration=-1,
-     wf[2],w=0,len;
+  I64 i,j=0,k,n,k2,duration,last_duration=-1,len;

  mss.simple_rhythms=FALSE;
  mss.normal_rhythms=TRUE;
  mss.complex_rhythms=FALSE;
  mss.rests=FALSE;
-  mss.change_waveforms=FALSE;
  mss.octave=music_octave;

  if (!PopUpForm(&mss,"MakeSongSettings"))
@@ -81,18 +78,6 @@ U8 *MakeSong()
  else
    progress4_max=8;

-  n=TimerPickedNi$WW,0$bble/2;
-  if (WF_NULL<n<WF_NOISE)
-    wf[0]=n;
-  else
-    wf[0]=WF_SQUARE;
-
-  n=TimerPickedNibble/2;
-  if (WF_NULL<n<WF_NOISE)
-    wf[1]=n;
-  else
-    wf[1]=wf[0];
-
  buf[j++]='0'+music_octave;
  if (mss.six_eight) {
    len=6;
@@ -102,18 +87,7 @@ U8 *MakeSong()
    buf[j++]='8';
  } else
    len=8;
-  if (mss.change_waveforms) {
-    buf[j++]='W';
-    buf[j++]='0'+wf[w++&1];
-  }
  for (i=0;i<len;i++) {
-    if (mss.change_waveforms) {
-      if (TimerPickedNibble<6) {
-	buf[j++]='W';
-	buf[j++]='0'+wf[w++&1];
-      }
-    }
-
    n=TimerPickedNibble<<4+TimerPickedNibble;
    if (mss.complex_rhythms)
      duration=complex_songs[n%9];
@@ -18,7 +18,7 @@ This uses four types of output

  2) The Fs->draw_it() for the staff region, drawn every refresh.

-  3) The gr_dc2 persistent layer for the note chooser, meter chooser.  The persistent layer is used during drag-and-drop.
+  3) The gr_dc persistent layer for the note chooser, meter chooser.  The persistent layer is used during drag-and-drop.

  4) The Fs->next_ctrl for the tempo/stacatto sliders.

@@ -60,7 +60,7 @@ class OrgNote
     I64 octave;
     I64 meter_bottom;
  }
-  I64 duration,accent,width,waveform;
+  I64 duration,width;
  U8 ascii[32];
 };

@@ -143,16 +143,10 @@ U8 org_note_inverse_map[7]={10,8,7,5,3,2,0};
 	$SP,"<15>",15$


+
+
 	$SP,"<16>",16$

-
-	$SP,"<17>",17$
-
-
-
-
-	$SP,"<18>",18$
-
 #define ORG_NOTE_SPACING	9
 #define ORG_NUM_DURATIONS	12

@@ -349,9 +343,9 @@ U0 DrawNote(CDC *dc,I64 x,I64 y,I64 duration)
  if (0<=duration<=ORG_NUM_DURATIONS) {
    SpritePlot3(dc,x,y,0,org_duration_imgs[duration]);
    if (org_triplet_durations[duration])
-      SpritePlot3(dc,x,y,0,$IB,"<18>",18$);
+      SpritePlot3(dc,x,y,0,$IB,"<16>",16$);
    if (OrgIsDotted(duration))
-      SpritePlot3(dc,x,y,0,$IB,"<19>",19$);
+      SpritePlot3(dc,x,y,0,$IB,"<15>",15$);
  }
 }

@@ -416,18 +410,13 @@ U0 DrawIt(CTask *task,CDC *dc)
 	if (OrgHasWords(tempo->word))
 	  dc->color=GREEN;
      }
-      if (tempo->accent==1)
-	SpritePlot3(dc,x,y,0,$IB,"<20>",20$);
-      else if (tempo->accent==2)
-	SpritePlot3(dc,x,y,0,$IB,"<21>",21$);
      DrawNote(dc,x,y,tempo->duration);
      if (OrgIsDotted(tempo->duration))
 	x+=ORG_NOTE_SPACING/2;
-
      if (Bt(&tempo->flags,Of_SHARP))
-	SpritePlot3(dc,x,y,0,$IB,"<22>",22$);
+	SpritePlot3(dc,x,y,0,$IB,"<13>",13$);
      else if (Bt(&tempo->flags,Of_FLAT))
-	SpritePlot3(dc,x,y,0,$IB,"<23>",23$);
+	SpritePlot3(dc,x,y,0,$IB,"<14>",14$);
      measure_left-=org_durations[tempo->duration];
    }
    tempo=tempo->next;
@@ -437,7 +426,7 @@ U0 DrawIt(CTask *task,CDC *dc)
    dc->color=BROWN;
  else
    dc->color=BLACK;
-  SpritePlot3(dc,oc.root.x,50,0,$IB,"<24>",24$);
+  SpritePlot3(dc,oc.root.x,50,0,$IB,"<12>",12$);
  Preempt(old_preempt);
 }

@@ -456,7 +445,7 @@ F64 PopUpDuration()
 {
  I64 i;
  CDoc *doc=DocNew;
-  DocPutS(doc,"$$FM,GREEN$$$$MU,\"Set Word\",ORGR_SET_WORD$$\n"
+  DocPutS(doc,"$$FG,GREEN$$$$MU,\"Set Word\",ORGR_SET_WORD$$\n"
 	"$$MU,\"Toggle Sharp\",ORGR_SHARP$$\n"
 	"$$MU,\"Toggle Flat\",ORGR_FLAT$$\n"
 	"$$MU,\"Toggle Tie\",ORGR_TIE$$\n"
@@ -479,7 +468,7 @@ U0 OrgRightClick(I64 x,I64 y)
  U8 *st,*st2;
  OrgNote *tempo,*tempo1;
  I64 i,old_doc_flags;
-  if (DocCur) old_doc_flags=DocCur->flags;
+  if (DocPut) old_doc_flags=DocPut->flags;
  oc.cur_note=tempo=OrgFindNote(x,y);
  if (tempo!=&oc.root) {
    Fs->win_inhibit=0;
@@ -493,8 +482,6 @@ U0 OrgRightClick(I64 x,I64 y)
 	  if (tempo->type==OT_NOTE) {
 	    tempo->octave=OCTAVE_REST;
 	    tempo->note=NOTE_REST;
-	    tempo->accent=0;
-	    tempo->waveform=WF_SQUARE;
 	  }
 	  break;
 	case ORGR_SHARP:
@@ -537,7 +524,7 @@ U0 OrgRightClick(I64 x,I64 y)
 	  break;
 	case ORGR_SET_WORD:
 	  if (tempo->type==OT_NOTE) {
-	    if (DocCur) DocCur->flags&=~DOCF_FORM;
+	    if (DocPut) DocPut->flags&=~DOCF_FORM;
 	    if (OrgHasWords(tempo->word))
 	      st2=MSPrintF("\nWord(\"%Q\"):",tempo->word);
 	    else
@@ -551,7 +538,7 @@ U0 OrgRightClick(I64 x,I64 y)
 	      Free(st);
 	    } else
 	      tempo->word=StrNew(" ");
-	    if (DocCur) DocCur->flags=DocCur->flags&~DOCF_FORM|old_doc_flags&DOCF_FORM;
+	    if (DocPut) DocPut->flags=DocPut->flags&~DOCF_FORM|old_doc_flags&DOCF_FORM;
 	  }
 	  break;
 	case ORGR_INS_NOTE:
@@ -563,18 +550,6 @@ U0 OrgRightClick(I64 x,I64 y)
 	  QueRem(tempo);
 	  OrgNoteDel(tempo);
 	  break;
-	case ORGR_NO_ACCENT:
-	  if (tempo->type==OT_NOTE && tempo->octave!=OCTAVE_REST)
-	    tempo->accent=0;
-	  break;
-	case ORGR_ACCENT:
-	  if (tempo->type==OT_NOTE && tempo->octave!=OCTAVE_REST)
-	    tempo->accent=1;
-	  break;
-	case ORGR_STRONG_ACCENT:
-	  if (tempo->type==OT_NOTE && tempo->octave!=OCTAVE_REST)
-	    tempo->accent=2;
-	  break;
      }
    }
    OrgSetWidth(oc.cur_note);
@@ -631,16 +606,16 @@ U0 DrawPickNoteBox()
 U0 DrawPickTools()
 {
  if (oc.tool==OTT_BOX_TOOL)
-    oc.dc2->color=ROPF_DITHER+WHITE<<16+ROP_EQU+RED;
+    oc.dc2->color=ROPF_DITHER+WHITE<<16+RED;
  else
-    oc.dc2->color=ROPF_DITHER+WHITE<<16+ROP_EQU+BLACK;
+    oc.dc2->color=ROPF_DITHER+WHITE<<16+BLACK;
  GrLineRect4(oc.dc2,ORG_TOOLS_X,ORG_TOOLS_Y,
    ORG_TOOLS_X+10,ORG_TOOLS_Y+10);

  if (oc.tool==OTT_PTR_TOOL)
-    oc.dc2->color=ROP_EQU+RED;
+    oc.dc2->color=RED;
  else
-    oc.dc2->color=ROP_EQU+BLACK;
+    oc.dc2->color=BLACK;
  (*fp_draw_input_ptr)(oc.dc2,ORG_TOOLS_X+15,ORG_TOOLS_Y);
  oc.dc2->color=BLACK;
 }
@@ -728,7 +703,6 @@ U0 OrgLeftClickPickNoteBox(I64 duration)
    tempo->note=n;
    tempo->octave=o;
    tempo->duration=duration;
-    tempo->waveform=tempo1->waveform;
    OrgSetWidth(tempo);
    QueIns(tempo,tempo1);
    oc.cur_note=tempo->next;
@@ -758,7 +732,6 @@ U0 OrgLeftClickPickMeterBox(I64 top,I64 bottom)
    tempo->type=OT_METER;
    tempo->meter_top=top;
    tempo->meter_bottom=bottom;
-    tempo->waveform=tempo1->waveform;
    OrgSetWidth(tempo);
    QueIns(tempo,tempo1);
    oc.cur_note=tempo->next;
@@ -769,14 +742,12 @@ U0 OrgLeftClickPickMeterBox(I64 top,I64 bottom)
 U0 OrgLeftClickStaffPtr(I64 x,I64 y)
 {
  OrgNote *tempo,*tempo1;
-  I64 o,n,msg_code,p1,p2,n_original,o_original,a_original,wf_original;
+  I64 o,n,msg_code,p1,p2,n_original,o_original;
  oc.cur_note=tempo=OrgFindNote(x,y);
  if (tempo!=&oc.root) {
    if (tempo->type==OT_NOTE) {
      n_original=tempo->note;
      o_original=tempo->octave;
-      a_original=tempo->accent;
-      wf_original=tempo->waveform;
      do {
 	msg_code=GetMsg(&p1,&p2,1<<MSG_IP_L_UP|1<<MSG_IP_MOVE);
 	if (msg_code==MSG_IP_L_UP) {
@@ -789,8 +760,6 @@ U0 OrgLeftClickStaffPtr(I64 x,I64 y)
 	    tempo->word=NULL;
 	    tempo->note=n_original;
 	    tempo->octave=o_original;
-	    tempo->accent=a_original;
-	    tempo->waveform=wf_original;
 	  }
 	} else {
 move_note:
@@ -818,7 +787,7 @@ U0 OrgLeftClickStaffBox(I64 x,I64 y)
  do {
    msg_code=GetMsg(&p1,&p2,1<<MSG_IP_L_UP|1<<MSG_IP_MOVE);
    DrawDC2;
-    oc.dc2->color=ROPF_DITHER+WHITE<<16+ROP_EQU+BLACK;
+    oc.dc2->color=ROPF_DITHER+WHITE<<16+BLACK;
    GrLineRect4(oc.dc2,x,y,p1,p2);
    if (msg_code==MSG_IP_L_UP) {
      if (x>p1) SwapU64(&x,&p1);
@@ -866,7 +835,7 @@ U0 OrgPlayTask(I64)
      case ORGPM_NORMAL:
 	if (org_play_f!=f) {
 	  f=org_play_f;
-	  Snd(f,music_waveform);
+	  Snd(f);
 	}
 	break;
      case ORGPM_REVERB1:
@@ -877,9 +846,9 @@ U0 OrgPlayTask(I64)
 	}
 	if (!(i&15)) {
 	  if (i&16)
-	    Snd(f,music_waveform);
+	    Snd(f);
 	  else
-	    Snd(f2,music_waveform);
+	    Snd(f2);
 	}
 	break;
    }
@@ -932,15 +901,13 @@ U8 *OrgMusicSetNoteLen(U8 *st,F64 *org_duration)
 U0 OrgLoadSongStr(U8 *st,I64 *org_octave,F64 *org_duration)
 {
  OrgNote *tempo,*tempo1;
-  I64 note,i=0,waveform=WF_SQUARE;
+  I64 note,i=0;
  while (*st) {
    tempo=CAlloc(sizeof(OrgNote));
-    tempo->waveform=WF_SQUARE;
    while (*st && !('A'<=*st<='G') && *st!='R') {
      if (*st=='M') {
 	tempo1=CAlloc(sizeof(OrgNote));
 	tempo1->type=OT_METER;
-	tempo1->waveform=tempo->waveform;
 	st++;
 	if ('1'<=*st<='9')
 	  tempo1->meter_top=*st++-'0';
@@ -955,15 +922,6 @@ U0 OrgLoadSongStr(U8 *st,I64 *org_octave,F64 *org_duration)
 	OrgSetWidth(tempo1);
 	QueIns(tempo1,oc.root.last);
      }
-      if (*st=='W') {
-	st++;
-	tempo->waveform=*st++-'0';
-	waveform=tempo->waveform;
-      }
-      while (*st=='!') {
-	tempo->accent++;
-	st++;
-      }
      while (*st=='(') {
 	Bts(&tempo->flags,Of_TIE);
 	st++;
@@ -999,8 +957,6 @@ U0 OrgLoadSongStr(U8 *st,I64 *org_octave,F64 *org_duration)
    } else {
      tempo->note=NOTE_REST;
      tempo->octave=OCTAVE_REST;
-      tempo->accent=0;
-      tempo->waveform=WF_SQUARE;
    }
    if (*org_duration<=2*.25/3)
      i=0;
@@ -1037,7 +993,7 @@ U0 OrgLoadSong(U8 *filename,I64 *org_octave,F64 *org_duration)
 {
  U8 *st;
  OrgNote *tempo;
-  CLex *lx=LexNew(TextFileRead(filename),0,StrNew(filename));
+  CLex *lx=LexNew(TextFileRead(filename),0,filename);
  Lex(lx);
  if (FileOcc("incomplete",filename,""))
    oc.incomplete_entry->checked=TRUE;
@@ -1084,13 +1040,12 @@ U8 *OrgCvtSong()
 {
  OrgNote *tempo;
  U8 *st,*src,*dst;
-  I64 i,note,octave,last_octave,last_duration,accent,waveform,last_waveform;
+  I64 i,note,octave,last_octave,last_duration;

  i=0;
  tempo=oc.root.next;
  last_octave=OCTAVE_REST;
  last_duration=-1;
-  last_waveform=-1;
  while (tempo!=&oc.root) {
    dst=&tempo->ascii;
    if (tempo->type==OT_METER) {
@@ -1115,17 +1070,8 @@ U8 *OrgCvtSong()
 	}
 	note=music_note_map[*LstEntryPt(note,org_note_lst)-'A'];
      }
-      accent=tempo->accent;
-      waveform=tempo->waveform;
-      if (waveform!=last_waveform && note!=NOTE_REST) {
-	*dst++='W';
-	*dst++=waveform+'0';
-	last_waveform=waveform;
-      }
      if (Bt(&tempo->flags,Of_TIE))
 	*dst++='(';
-      while (accent--)
-	*dst++='!';
      if (octave!=last_octave && note!=NOTE_REST) {
 	*dst++=octave+'0';
 	last_octave=octave;
@@ -1296,25 +1242,8 @@ U0 OrgSetOctave(I64 octave)
    tempse->checked=org_play_mode==1;
 }

-U0 OrgSetWaveform(I64 waveform)
-{
-  CMenuEntry *tempse;
-  if (tempse=MenuEntryFind(Fs->cur_menu,"Snd/Square"))
-    tempse->checked=waveform==WF_SQUARE;
-  if (tempse=MenuEntryFind(Fs->cur_menu,"Snd/Sine"))
-    tempse->checked=waveform==WF_SINE;
-  if (tempse=MenuEntryFind(Fs->cur_menu,"Snd/Triangle"))
-    tempse->checked=waveform==WF_TRIANGLE;
-  if (tempse=MenuEntryFind(Fs->cur_menu,"Snd/Sawtooth"))
-    tempse->checked=waveform==WF_SAWTOOTH;
-  if (tempse=MenuEntryFind(Fs->cur_menu,"Snd/Noise"))
-    tempse->checked=waveform==WF_NOISE;
-}

-
-
-
-$SP,"<25>",25$
+$SP,"<17>",17$
 


@@ -1393,11 +1322,11 @@ U0 OrgUpKey(I64 x,I64 y)
  }
 }

-U0 OrgMenu(I64 org_octave,I64 org_waveform)
+U0 OrgMenu(I64 org_octave)
 {
  DocClear;
-  "$$BD,WHITE$$$$FD,GREEN$$$$FU,GREEN$$$$FM,GREEN$$$$CM,0,12$$\n";
-  PutSprite($IB,"<25>",25$);
+  "$$BD,WHITE$$$$FD,GREEN$$$$CM,0,12$$\n";
+  PutSprite($IB,"<17>",17$);
  NewLine(5);

  DrawDC2;
@@ -1422,15 +1351,14 @@ U0 OrgMenu(I64 org_octave,I64 org_waveform)
  PutSprite($IB,"<7>",7$,"$$SP+LM+LA,\"\",\"Msg(MSG_KEY_DOWN,0,SCF_CTRL|SC_CURSOR_RIGHT);\",%d$$");
  "$$CM+LX,0,6$$";
  OrgSetOctave(org_octave);
-  OrgSetWaveform(org_waveform);
  WinMgrSync(2);
 }


-U0 OrgPushMode(I64 org_octave,I64 org_waveform)
+U0 OrgPushMode(I64 org_octave)
 {
  Fs->win_inhibit=WIF_ALL-WIF_BORDER-WIF_MENU-WIF_CTRLS;
-  OrgMenu(org_octave,org_waveform);
+  OrgMenu(org_octave);
 }

 U0 OrgPopMode()
@@ -1446,16 +1374,16 @@ U0 MusicOrgan(U8 *dirname=NULL)
 {
  Bool is_note,was_playing;
  I64 p1,p2,ch,sc,msg_code=0,col,
-      note=NOTE_REST,octave=OCTAVE_REST,accent=0,org_waveform=WF_SQUARE,org_octave=3,timeout_val,timeout_val2,
+      note=NOTE_REST,octave=OCTAVE_REST,org_octave=3,timeout_val,timeout_val2,
      old_doc_flags;
  U8 *filename=NULL,*st,*st2;
-  CTask *play_task=Spawn(&OrgPlayTask,NULL,"Organ Play",Fs);
+  CTask *play_task=Spawn(&OrgPlayTask,NULL,"Organ Play",,Fs);
  OrgNote *tempo;
  F64 f=0,last_f=0,org_duration=1.0,
      d,evt_time=tT,note_down_time=tT;
  CCtrl *c=TempoNew;

-  if (DocCur) old_doc_flags=DocCur->flags;
+  if (DocPut) old_doc_flags=DocPut->flags;
  SettingsPush; //See $LK,"SettingsPush","MN:SettingsPush"$
  WinBorder;
  WordStat;
@@ -1466,13 +1394,12 @@ U0 MusicOrgan(U8 *dirname=NULL)
  tempo_state.tempo=Round(TEMPO_RANGE*(music_tempo-0.5)/4.4);
  tempo_state.stacatto=Round(TEMPO_RANGE*(music_stacatto_factor-0.12)/0.88);

-  if (DocCur) DocCur->flags|=DOCF_FORM;
+  if (DocPut) DocPut->flags|=DOCF_FORM;

  MemSet(&oc,0,sizeof(OrgCtrl));
  oc.screen_x=0;
  oc.root.next=oc.root.last=&oc.root;
  oc.clipboard.next=oc.clipboard.last=&oc.clipboard;
-  oc.root.waveform=WF_SQUARE;
  oc.cur_note=&oc.root;
  oc.dc2=DCAlias;

@@ -1505,11 +1432,6 @@ U0 MusicOrgan(U8 *dirname=NULL)
  "  MarkIncomplete(MSG_CMD,ORGF_INCOMPLETE);"
  "}"
  "Snd {"
-  "  Square(,'!');"
-  "  Sine(,'@');"
-  "  Triangle(,'#');"
-  "  Sawtooth(,'$$');"
-  "  Noise(,'%');"
  "  Reverb(,'c');"
  "  Octave0(,'0');"
  "  Octave1(,'1');"
@@ -1532,7 +1454,7 @@ U0 MusicOrgan(U8 *dirname=NULL)
    dirname=StrNew("HOME/MusicOrgan");
  else
    dirname=StrNew(dirname);
-  OrgPushMode(org_octave,org_waveform);
+  OrgPushMode(org_octave);
  col=0;
  Fs->draw_it=&DrawIt;

@@ -1556,8 +1478,8 @@ got_msg:
      }
      if (msg_code!=MSG_IP_MOVE) {
 	DocBottom;
-	if (was_playing || DocCur->cur_entry->y>=Fs->win_height-2) {
-	  OrgMenu(org_octave,org_waveform);
+	if (was_playing || DocPut->cur_entry->y>=Fs->win_height-2) {
+	  OrgMenu(org_octave);
 	  col=0;
 	}
      }
@@ -1579,7 +1501,7 @@ got_msg:
 	      oc.incomplete_entry->checked=!oc.incomplete_entry->checked;
 	      break;
 	  }
-	  OrgPushMode(org_octave,org_waveform);
+	  OrgPushMode(org_octave);
 	  is_note=FALSE;
 	  col=0;
 	  break;
@@ -1589,7 +1511,7 @@ got_msg:
 	  sc=p2;
 	  if ('0'<=ch<='9') {
 	    org_octave=ch-'0';
-	    OrgMenu(org_octave,org_waveform);
+	    OrgMenu(org_octave);
 	    col=0;
 	  } else {
 	    is_note=TRUE;
@@ -1647,7 +1569,7 @@ got_msg:
 		  case SC_F1:
 		    OrgPopMode;
 		    PopUp("Ed(\"::/TempleOS/Apps/MusicOrgan/Help.TXT.Z\");",Fs);
-		    OrgPushMode(org_octave,org_waveform);
+		    OrgPushMode(org_octave);
 		    col=0;
 		    is_note=FALSE;
 		    break;
@@ -1686,7 +1608,7 @@ got_msg:
 		  OrgLoadSongStr(st2,&org_octave,&org_duration);
 		  Free(st2);
 		}
-		OrgPushMode(org_octave,org_waveform);
+		OrgPushMode(org_octave);
 		is_note=FALSE;
 		col=0;
 		break;
@@ -1697,7 +1619,7 @@ got_msg:
 		"$$FG,GREEN$$<SHIFT-ESC>$$FG$$ to load it into MusicOrgan.\n\n"
 		ST_WARN_ST " Graphics and other embelishments\n"
 		"will be lost because MusicOrgan can't\n"
-		    "parse C/C++ programs completely.\n");
+		    "parse Holy C programs completely.\n");
 		Free(filename);
 		filename=NULL;
 		JukeBox(dirname,&filename);
@@ -1711,14 +1633,14 @@ got_msg:
 		  oc.record_entry->checked=FALSE;
 		  oc.cur_note=oc.root.next;
 		}
-		OrgPushMode(org_octave,org_waveform);
+		OrgPushMode(org_octave);
 		is_note=FALSE;
 		col=0;
 		break;
 	      case CH_CTRLA:
 		OrgPopMode;
 		filename=OrgSaveSong(dirname,filename);
-		OrgPushMode(org_octave,org_waveform);
+		OrgPushMode(org_octave);
 		is_note=FALSE;
 		break;
 	      case CH_CTRLC:
@@ -1734,7 +1656,7 @@ got_msg:
 		is_note=FALSE;
 		break;
 	      case '.':
-		OrgMenu(org_octave,org_waveform);
+		OrgMenu(org_octave);
 		col=0;
 		Free(filename);
 		filename=NULL;
@@ -1757,7 +1679,7 @@ got_msg:
 		}
 		col=0;
 		oc.playing=TRUE;
-		OrgMenu(org_octave,org_waveform);
+		OrgMenu(org_octave);
 		tempo=oc.cur_note;
 		while (tempo!=&oc.root) {
 		  if (tempo->type!=OT_METER) {
@@ -1783,8 +1705,6 @@ got_msg:
 		      "" tempo->word;
 		    note=tempo->note;
 		    octave=tempo->octave;
-		    accent=tempo->accent;
-		    org_waveform=tempo->waveform;
 		    if (note!=NOTE_REST)
 		      f=Note2Freq(note,octave);
 		    else
@@ -1797,7 +1717,6 @@ got_msg:

 		    music_tempo=4.4*tempo_state.tempo/TEMPO_RANGE+0.5;
 		    music_stacatto_factor=0.88*tempo_state.stacatto/TEMPO_RANGE+0.12;
-		    music_waveform=org_waveform;
 		    d=JIFFY_FREQ*org_durations[tempo->duration]/music_tempo;
 		    if (Bt(&tempo->flags,Of_TIE)) {
 		      timeout_val+=d;
@@ -1816,7 +1735,7 @@ got_msg:
 		oc.cur_note=&oc.root;
 		oc.screen_x+=oc.cur_note->x-GR_WIDTH/2;
 		oc.playing=FALSE;
-		OrgMenu(org_octave,org_waveform);
+		OrgMenu(org_octave);
 		col=0;
 		f=0;
 		org_play_f=0;
@@ -1838,7 +1757,7 @@ got_msg:
 		org_play_mode++;
 		if (org_play_mode>=ORGPM_NUM_PLAY_MODES) org_play_mode=0;
 		is_note=FALSE;
-		OrgMenu(org_octave,org_waveform);
+		OrgMenu(org_octave);
 		col=0;
 		break;
 	      case 'z':
@@ -1850,44 +1769,14 @@ got_msg:
 		  org_octave=3;
 		  oc.screen_x=0;
 		}
-		OrgMenu(org_octave,org_waveform);
+		OrgMenu(org_octave);
 		col=0;
 		is_note=FALSE;
 		break;
 	      case CH_ESC:
 		OrgPopMode;
 		filename=OrgSaveSong(dirname,filename);
-		OrgPushMode(org_octave,org_waveform);
-		break;
-	      case '!':
-		music_waveform=org_waveform=WF_SQUARE;
-		OrgMenu(org_octave,org_waveform);
-		col=0;
-		is_note=FALSE;
-		break;
-	      case '@':
-		music_waveform=org_waveform=WF_SINE;
-		OrgMenu(org_octave,org_waveform);
-		col=0;
-		is_note=FALSE;
-		break;
-	      case '#':
-		music_waveform=org_waveform=WF_TRIANGLE;
-		OrgMenu(org_octave,org_waveform);
-		col=0;
-		is_note=FALSE;
-		break;
-	      case '$$':
-		music_waveform=org_waveform=WF_SAWTOOTH;
-		OrgMenu(org_octave,org_waveform);
-		col=0;
-		is_note=FALSE;
-		break;
-	      case '%':
-		music_waveform=org_waveform=WF_NOISE;
-		OrgMenu(org_octave,org_waveform);
-		col=0;
-		is_note=FALSE;
+		OrgPushMode(org_octave);
 		break;
 	      default:
 		is_note=FALSE;
@@ -1946,8 +1835,6 @@ got_msg:
 	    tempo->type=OT_NOTE;
 	    tempo->note=note;
 	    tempo->octave=octave;
-	    tempo->accent=0;
-	    tempo->waveform=org_waveform;
 	    if (st[1]=='#')
 	      Bts(&tempo->flags,Of_SHARP);
 	  }
@@ -1961,6 +1848,7 @@ got_msg:
 	}
      }
    } while (ch!=CH_ESC && ch!=CH_SHIFT_ESC);
+    GetMsg(,,1<<MSG_KEY_UP);
  } catch
    CatchAll;
  OrgPopMode;
@@ -1970,10 +1858,10 @@ got_msg:
  Kill(play_task);
  DCFill;
  DCDel(oc.dc2);
+  DocClear;
  SettingsPop;
-  if (DocCur) DocCur->flags=DocCur->flags&~DOCF_FORM|old_doc_flags&DOCF_FORM;
+  if (DocPut) DocPut->flags=DocPut->flags&~DOCF_FORM|old_doc_flags&DOCF_FORM;
  Free(dirname);
-  "$$CL$$\n";
  MenuPop;
 }
 "òÿÿÿñÿÿÿñÿÿÿ
@@ -2015,18 +1903,13 @@ got_msg:
 ?


-	#þÿÿÿÖÿÿÿþÿÿÿ&Öÿÿÿ&␍Eúÿÿÿúÿÿÿ
-ýÿÿÿV	ýÿÿÿ
+	#þÿÿÿÖÿÿÿþÿÿÿ&Öÿÿÿ&␍Eúÿÿÿúÿÿÿ
+ýÿÿÿV	ýÿÿÿ

 ␍␍

-#ýÿÿÿýÿÿÿúÿÿÿúÿÿÿýÿÿÿEýÿÿÿýÿÿÿúÿÿÿúÿÿÿýÿÿÿýÿÿÿúÿÿÿ÷ÿÿÿ÷ÿÿÿúÿÿÿEþÿÿÿöÿÿÿöÿÿÿöÿÿÿòÿÿÿòÿÿÿþÿÿÿòÿÿÿôÿÿÿÿÿÿÿôÿÿÿò$ $ 0$0,444,,@$@<DDD<<|„„„||ltttll$À$ÄA$S4DDFTGdHtJ„K”L¤;´',E<RLTlU|IœP¬[¼]PPLTTTLL`$`p$p€$€�$� $ °$°À$Àœ¤¤¤œœ¬´´´¬¬¼ÄÄÄ¼¼P$P0@Pp€ °À@
+Eþÿÿÿöÿÿÿöÿÿÿöÿÿÿòÿÿÿòÿÿÿþÿÿÿòÿÿÿôÿÿÿÿÿÿÿôÿÿÿò$ $ 0$0,444,,@$@<DDD<<|„„„||ltttll$À$ÄA$S4DDFTGdHtJ„K”L¤;´',E<RLTlU|IœP¬[¼]PPLTTTLL`$`p$p€$€�$� $ °$°À$Àœ¤¤¤œœ¬´´´¬¬¼ÄÄÄ¼¼P$P0@Pp€ °À@
 ~ 
-#ýÿÿÿýÿÿÿúÿÿÿúÿÿÿýÿÿÿEýÿÿÿýÿÿÿúÿÿÿúÿÿÿýÿÿÿýÿÿÿúÿÿÿ÷ÿÿÿ÷ÿÿÿúÿÿÿEúÿÿÿúÿÿÿ
-ýÿÿÿV	ýÿÿÿ
-
-␍␍
-
-#þÿÿÿÖÿÿÿþÿÿÿ&Öÿÿÿ&	P
+	P

 ␍␍