Nightly update (ISO SHA-1 9d79d10)

TempleOSCD/Demo/AcctExample/HomeKeyPlugIns.HC

@@ -229,14 +229,14 @@ Bool MyPutKey(I64 ch,I64 sc)
 	  KeyDescSet("Cmd /JukeBox");
 	else
 	  PopUp("#include \"::/Apps/Psalmody/Load\";"
-		"JukeBox(\"::/Home/Sup1/Sup1Hymns\");");
+		"JukeBox(\"::/Home/Sup3/Sup3Hymns\");");
 	return TRUE;
       case 'P':
 	if (sc&SCF_KEY_DESC)
 	  KeyDescSet("Cmd /Psalmody");
 	else
 	  PopUp("#include \"::/Apps/Psalmody/Load\";"
-		"Psalmody(\"~/Sup1/Sup1Hymns\");");
+		"Psalmody(\"~/Sup3/Sup3Hymns\");");
 	return TRUE;
 
 	//Ins your own ALT-key plug-ins

TempleOSCD/Demo/AcctExample/PersonalNotes.DD

@@ -10,6 +10,8 @@ $WW,1$$FG,5$$TX+CX,"TODO"$$FG$
 
 * Does entire tool chain support super/sub script?
 
+* 170624 $LK,"DskChk",A="MN:DskChk"$() showed extra alloced clus for FAT32, Sup1Hymns.  ClusNum was '.'+1 and clus was zero.
+
 * $LK,"::/Apps/X-Caliber/X-Caliber.HC"$
 * Add asteroid harbor defense.
 * Afterburner thruster.

TempleOSCD/Demo/AcctExample/Registry.HC

@@ -60,7 +60,7 @@ $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=341.847;
+progress3_tf=0.000;progress4_tf=256.163;
 $ID,-2$$ID,-2$$TR,"Once"$
 $ID,2$$TR,"Adam"$
 $ID,2$$ID,-2$$TR,"User"$

TempleOSCD/Demo/AcctExample/TOS/TOSDistro.HC

@@ -29,7 +29,10 @@ public U0 TOSCopyDrv(U8 src,U8 dst)
   src=Let2Let(src);
   dst=Let2Let(dst);
 
-  Fmt(dst,,FALSE,FSt_FAT32);
+  if (dst=='D')
+    Fmt(dst,,FALSE,FSt_FAT32);
+  else
+    Fmt(dst,,FALSE,FSt_REDSEA);
 
   StrPrint(buf_s,"%c:/",src);
   StrPrint(buf_d,"%c:/",dst);
@@ -69,6 +72,8 @@ U0 DistroPrep()
   CopyTree("/Home","/Demo/AcctExample");
   DelTree("/Demo/AcctExample/TAD");
   DelTree("/Demo/AcctExample/Sup1");
+  DelTree("/Demo/AcctExample/Sup2");
+  DelTree("/Demo/AcctExample/Sup3");
   Del("/Demo/AcctExample/Test*");
   if (FileFind("~/Sup1/Sup1Utils/SortHeaders.HC.Z"))
     ExeFile("~/Sup1/Sup1Utils/SortHeaders.HC.Z");
@@ -125,6 +130,8 @@ U0 StaffDistroPrep()
   DelTree(TOS_DISTRO_DIR);
   CopyTree("C:/",TOS_DISTRO_DIR "/");
   DelTree(TOS_DISTRO_DIR "/Home/Sup1");
+  DelTree(TOS_DISTRO_DIR "/Home/Sup2");
+  DelTree(TOS_DISTRO_DIR "/Home/Sup3");
   Del(TOS_DISTRO_DIR "/" KERNEL_BIN_C);
 }
 U0 MakeStaffDistro()
@@ -239,7 +246,7 @@ U0 TOSProgress(U8 *st)
   progress4=tos_progress;
   progress3_max=1;
   *progress4_desc=0;
-  progress4_max=8+MAKE_DBG+MAKE_STAFF;
+  progress4_max=9+MAKE_DBG+MAKE_STAFF;
   progress4_t0=tos_progress_t0;
   StrPrint(buf,"%d. %s",++progress4,st);
   "$$PURPLE$$$$TX+CX,\"%s\"$$$$FG$$\n",buf;
@@ -275,6 +282,12 @@ U0 TOSRegen2()
   TOSProgress("Make Supplemental1 ISO");
   RedSeaISO("D:/Downloads/TOS_Supplemental1","C:/Home/Sup1");
 
+  TOSProgress("Make Supplemental2 ISO");
+  RedSeaISO("D:/Downloads/TOS_Supplemental2","C:/Home/Sup2");
+
+  TOSProgress("Make Supplemental3 ISO");
+  RedSeaISO("D:/Downloads/TOS_Supplemental3","C:/Home/Sup3");
+
 #if MAKE_DBG
   TOSProgress("Make Dbg Distro ISO");
   MakeDbgDistro;
@@ -316,7 +329,7 @@ U0 TOSRegen2()
 }
 
 public U0 TOSPreRegen()
-{//Copy bookmarks and bins from D:/Home/Sup1 to C:/Home/Sup1
+{//Copy bins from D:/Home/Sup1 to C:/Home/Sup1
   Copy("D:/Home/" INS_REG_PERSONAL_INITIALS "/*",
 	"C:/Home/" INS_REG_PERSONAL_INITIALS);
   DelTree("C:/Home/Sup1/Sup1Bin");

TempleOSCD/Demo/AcctExample/TOS/TOSMisc.HC

@@ -49,35 +49,42 @@ public U0 FrameGrabberToggle(Bool sync_tone,Bool tos_theme,
   }
 }
 
-public U0 JukeSong(I64 num,I64 passes=2)
+public U0 JukeSong(I64 vol,I64 num,I64 passes=2)
 {//Make movie of one song.
+  U8 *st=MStrPrint("~/Sup%d/Sup%dHymns",vol,vol);
   if (!fg_on)
     FrameGrabberToggle(FALSE,FALSE);
-  JukeSongsPuppet("~/Sup1/Sup1Hymns",passes,num,num+1);
+  JukeSongsPuppet(st,passes,num,num+1);
   if (fg_on)
     FrameGrabberToggle(FALSE,FALSE);
+  Free(st);
 }
 
-public U0 JukeLines(I64 start_line,I64 end_line)
+public U0 JukeLines(I64 vol,I64 start_line,I64 end_line)
 {//Make movie of many lines of songs, starting at 0.
+  U8 *st=MStrPrint("~/Sup%d/Sup%dHymns",vol,vol);
   if (!fg_on)
     FrameGrabberToggle(FALSE,FALSE);
-  JukeSongsPuppet("~/Sup1/Sup1Hymns",,start_line*5,end_line*5);
+  JukeSongsPuppet(st,,start_line*5,end_line*5);
   if (fg_on)
     FrameGrabberToggle(FALSE,FALSE);
+  Free(st);
 }
 
-public U0 TADHymn(I64 num)
-{//Make 2-lines of songs movie starting at 1.
-  JukeLines((num-1)*2,num*2);
+public U0 TADHymns(I64 vol,I64 let)
+{//Make 2-lines of songs movie
+  I64 line=2*(ToUpper(let)-'A');
+  JukeLines(vol,line,line+2);
 }
 
 #help_index "Misc/TOS"
 public U0 DskChkAll()
 {//DskChk on C & D.
   U8 *ptr=TOS_HDS;
-  while (*ptr)
-    DskChk(*ptr++);
+  while (*ptr) {
+    "DskChk('%c')\n",*ptr;
+    DskChk(*ptr++,TRUE);
+  }
 }
 
 public CDoc *DC2Doc(CDC *dc,I64 dx=0,I64 dy=0,I64 *_total_score=NULL)

TempleOSCD/Demo/ToHtmlToTXTDemo/ToHtml.HC

@@ -189,7 +189,7 @@ public CDoc *Doc2Html(CDoc *doc_in,U8 *html_header=NULL,U8 *body_header=NULL,
 	  "<body>\n"
 	  "<pre style=\"font-family:courier;font-size:10pt\">\n";
   if (!body_footer) body_footer=
-	  "</pre></body>\n</html>\n";
+	  "</pre></body>\n";
   if (!html_footer) html_footer=
 	  "</html>\n";
 

TempleOSCD/Demo/WebLogDemo/WebLogRep.HC

@@ -219,9 +219,14 @@ Bool IsIndex(LogStruct *tmplg)
 
 Bool IsKeeper(LogStruct *tmplg,CDate dstart,CDate dend)
 {
-  if (dstart<=tmplg->datetime<=dend && !StrOcc(tmplg->file,'?'))
+  if (dstart<=tmplg->datetime<=dend && !StrOcc(tmplg->file,'?') &&
+    StrLen(tmplg->file)>2 && 'A'<=tmplg->file[1]<='Z' &&
+    tmplg->size && tmplg->file[StrLen(tmplg->file)-1]!='/' &&
+    (StrLen(tmplg->file)<3 || MemCmp(&tmplg->file[1],"Wb",2)) &&
+    (StrLen(tmplg->file)<7 || MemCmp(&tmplg->file[1],"Family",6))) {
     return TRUE;
-  else
+
+}  else
     return FALSE;
 }