Nightly update (ISO SHA-1 aed1efc)

Note: this removes BMP support

TempleOSCD/Demo/AcctExample/HomeKeyPlugIns.HC

@@ -156,12 +156,16 @@ Bool MyPutKey(I64 ch,I64 sc)
       case 'f': //With sync
 	if (sc&SCF_KEY_DESC)
 	  KeyDescSet("Cmd /FrameGrabber Sync");
+	else if (fg_on)
+	  FrameGrabberToggle(FALSE,FALSE,FALSE);
 	else
 	  FrameGrabberToggle(TRUE,FALSE,FALSE);
 	return TRUE;
       case 'F': //With sync and intro TOS theme
 	if (sc&SCF_KEY_DESC)
 	  KeyDescSet("Cmd /FrameGrabber Intro");
+	else if (fg_on)
+	  FrameGrabberToggle(FALSE,FALSE,TRUE);
 	else
 	  FrameGrabberToggle(TRUE,TRUE,FALSE);
 	return TRUE;
@@ -220,6 +224,20 @@ Bool MyPutKey(I64 ch,I64 sc)
 	  "$$AN,\"<TODO>\",A=\"ANC%d\"$$",i;
 	}
 	return TRUE;
+      case 'p':
+	if (sc&SCF_KEY_DESC)
+	  KeyDescSet("Cmd /JukeBox");
+	else
+	  PopUp("#include \"::/Apps/Psalmody/Load\";"
+		"JukeBox(\"::/Home/Sup1/Sup1Hymns\");");
+	return TRUE;
+      case 'P':
+	if (sc&SCF_KEY_DESC)
+	  KeyDescSet("Cmd /Psalmody");
+	else
+	  PopUp("#include \"::/Apps/Psalmody/Load\";"
+		"Psalmody(\"~/Sup1/Sup1Hymns\");");
+	return TRUE;
 
 	//Ins your own ALT-key plug-ins
       case '1':

TempleOSCD/Demo/AcctExample/PersonalNotes.DD

@@ -1,6 +1,6 @@
 $WW,1$$FG,5$$TX+CX,"TODO"$$FG$
 
-* Make $LK,"GR2BMPLst",A="MN:GR2BMPLst"$ combine disjoint rects for same frame.
+* Make MV files combine disjoint rects for same frame.
 
 * God said to reconsider switch start/end, perhaps preface portion?
 
@@ -198,8 +198,6 @@ $FG,5$$TX+CX,"Bugs? Not really sure."$$FG$
 
 * $LK,"StrPrintJoin",A="MN:StrPrintJoin"$(,st); With st="\n\\"; (Forgot what this is talking about.)
 
-* $LK,"BMPRLE4To",A="MN:BMPRLE4To"$() has files_size too big by 108.  Fixed?
-
 
 $FG,5$$TX+CX,"TODO? Not really, just angst."$$FG$
 * Should these be moved into $LK,"CHashClass",A="MN:CHashClass"$ from $LK,"CMemberLst",A="MN:CMemberLst"$ and $LK,"CHashGlblVar",A="MN:CHashGlblVar"$?
@@ -279,8 +277,6 @@ $FG,5$$TX+CX,"Committee Needed"$$FG$
 
 * Import Intel datasheets so we can use links in $LK,"Code",A="FI:::/Kernel/Mem/PageTables.HC"$ for documentation.  I tried a PDF-to-text convertor and it wasn't acceptible.
 
-* Why are BMP file $LK,"CBGR24",A="MN:CBGR24"$'s wrong?  $LK,"::/Adam/Opt/Utils/FileBMP.HC"$.
-
 * Switch stmt with sparse cases?  Maybe, ban sparse switch stmts.
 
 * Compiler Optimization: Postpone LocalVar init until last possible moment in case of return.

TempleOSCD/Demo/AcctExample/Registry.HC

@@ -48,7 +48,7 @@ $ID,-2$$TR,"Wenceslas"$
 $ID,2$F64 best_score=43.9944;
 $ID,-2$$TR,"OSTestSuite"$
 $ID,2$progress1_tf=0.000;progress2_tf=0.000;
-progress3_tf=0.000;progress4_tf=224.153;
+progress3_tf=0.000;progress4_tf=223.150;
 $ID,-2$$TR,"XCaliber"$
 $ID,2$I64 best_score=90;
 I64 msg_flags=2;
@@ -60,13 +60,13 @@ $ID,-2$$TR,"Titanium"$
 $ID,2$I64 best_score=16469;
 $ID,-2$$TR,"TOSRegen"$
 $ID,2$progress1_tf=0.000;progress2_tf=0.000;
-progress3_tf=0.000;progress4_tf=279.256;
+progress3_tf=0.000;progress4_tf=279.384;
 $ID,-2$$ID,-2$$TR,"Once"$
 $ID,2$$TR,"Adam"$
 $ID,2$$ID,-2$$TR,"User"$
 $ID,2$$ID,-2$$ID,-2$$TR,"DemoCompany"$
 $ID,2$$TR,"Game1"$
-$ID,2$F64 best_score=184.02909;
+$ID,2$F64 best_score=187.05180;
 $TR,"SimpleVal"$
-$ID,2$1244;
+$ID,2$1245;
 $ID,-2$$ID,-2$$ID,-2$

TempleOSCD/Demo/AcctExample/TOS/TOSDistro.HC

@@ -323,7 +323,8 @@ public U0 TOSPreRegen()
   CopyTree("D:/Home/Sup1/Sup1Bin","C:/Home/Sup1/Sup1Bin");
   Copy("D:/Home/Sup1/Sup1CodeScraps/Comm/TOSSocket*",
 	"C:/Home/Sup1/Sup1CodeScraps/Comm");
-  Copy("D:/Home/Sup1/Sup1Bin/God*","C:/Linux");
+  DelTree("C:/Linux");
+  CopyTree("D:/Linux","C:/Linux");
 }
 
 public U0 TOSRegen()

TempleOSCD/Demo/AcctExample/TOS/TOSMisc.HC

@@ -12,11 +12,11 @@ I64 CopyVideo(Bool reverb)
     intensity=0.35;
   }
   Del("D:/Tmp/*.SND");
-  DelTree("D:/Tmp/ScrnShots");
-  DirMk("D:/Tmp/ScrnShots");
+  Del("D:/Tmp/*.MV");
   Silent(old_silent);
-  SndFileCreate("D:/Tmp/Audio",0.115,0.0,WF_SQUARE,delay,intensity);
-  GR2BMPLst("B:/Tmp","+d","D:/Tmp/ScrnShots/VID%05d.BMP.Z");
+  RunFile("~/Sup1/Sup1Snd/SndFile",,
+	"D:/Tmp/AUD%03d.SND",0.115,0.0,1,delay,intensity,0.185);
+  GR2MV("D:/Tmp/VID%03d.MV","B:/Tmp","+d");
   return res;
 }
 
@@ -27,17 +27,15 @@ U0 DelScrnShots()
   DelTree("B:/Tmp");
   DirMk("B:/Tmp");
   Del("D:/Tmp/*.SND");
-  DelTree("D:/Tmp/ScrnShots");
-  DirMk("D:/Tmp/ScrnShots");
+  Del("D:/Tmp/*.MV");
   Del("C:/Tmp/*.SND");
-  DelTree("C:/Tmp/ScrnShots");
-  DirMk("C:/Tmp/ScrnShots");
+  Del("C:/Tmp/*.MV");
   Silent(old_silent);
 }
 
 public U0 FrameGrabberToggle(Bool sync_tone,Bool tos_theme,
 	Bool reverb,Bool just_audio=FALSE)
-{//The frame grabber saves BMP files to D:/Tmp/ScrnShots.
+{//The frame grabber saves GR files to B:/Tmp.
   static F64 last_time=0;
   if (tS-last_time>3.0) {
     last_time=tS;
@@ -73,7 +71,7 @@ public U0 JukeLines(I64 start_line,I64 end_line)
 {//Make movie of many lines of songs, starting at 0.
   if (!fg_on)
     FrameGrabberToggle(FALSE,FALSE,FALSE);
-  JukeSongsPuppet("~/Sup1/Sup1Hymns",,start_line*5,end_line*5,1.5);
+  JukeSongsPuppet("~/Sup1/Sup1Hymns",,start_line*5,end_line*5);
   if (fg_on)
     FrameGrabberToggle(FALSE,FALSE,TRUE);
 }
@@ -137,33 +135,6 @@ public CDoc *DC2Doc(CDC *dc,I64 dx=0,I64 dy=0,I64 *_total_score=NULL)
   return doc;
 }
 
-public U0 BMP2Doc(U8 *_in_name,U8 *_out_name=NULL)
-{//Use OCR to make a text DolDoc from BMP file.
-  U8 *in_name,*out_name;
-  I64 dx,dy,score,best_score=I64_MAX;
-  CDC *dc;
-  CDoc *doc;
-  in_name=ExtDft(_in_name,"BMP");
-  if (_out_name)
-    out_name=ExtDft(_out_name,"DD.Z");
-  else
-    out_name=ExtChg(_in_name,"DD.Z");
-  if (dc=BMPRead(in_name)) {
-    for (dy=-3;dy<=4;dy++)
-      for (dx=-3;dx<=4;dx++) {
-	doc=DC2Doc(dc,dx,dy,&score);
-	if (score<best_score) {
-	  best_score=score;
-	  StrCpy(&doc->filename.name,out_name);
-	  DocWrite(doc);
-	}
-	DocDel(doc);
-      }
-  }
-  Free(in_name);
-  Free(out_name);
-}
-
 #define MEM_TEST_SIZE	1024*1024
 U0 MemTest()
 {