From 93181651aac4b268c8dbcd8795e2d7e296299791 Mon Sep 17 00:00:00 2001
From: "Terry A. Davis" <tdavis@templeos.org>
Date: Tue, 10 Oct 2017 22:39:21 -0400
Subject: [PATCH] TempleOS V5.03 Nightly (ISO SHA-1 9d79d10)

---
 0000Boot/0000Kernel.BIN.C          | Bin 189792 -> 189792 bytes
 Adam/ADefine.HC                    |   2 +-
 Adam/ASnd.HC                       |  13 ++++-----
 Adam/Gr/SpriteEd.HC                |  41 +++++++++++++----------------
 Adam/Opt/Utils/TOS.HC              |  16 +++++++++--
 Apps/Psalmody/JukePuppet.HC        |   6 +++++
 Compiler/Compiler.BIN              | Bin 193087 -> 193087 bytes
 Demo/AcctExample/HomeKeyPlugIns.HC |   4 +--
 Demo/AcctExample/PersonalMenu.DD   | Bin 65945 -> 65954 bytes
 Demo/AcctExample/PersonalNotes.DD  |   2 ++
 Demo/AcctExample/Registry.HC       |   2 +-
 Demo/AcctExample/TOS/TOSDistro.HC  |  19 ++++++++++---
 Demo/AcctExample/TOS/TOSMisc.HC    |  25 +++++++++++-------
 Demo/Games/Squirt.HC               | Bin 84512 -> 84514 bytes
 Demo/Snd/WaterFowl.HC              | Bin 308907 -> 308920 bytes
 Demo/ToHtmlToTXTDemo/ToHtml.HC     |   2 +-
 Demo/WebLogDemo/WebLogRep.HC       |   9 +++++--
 Downloads/Linux/TOSZ               | Bin 29280 -> 29280 bytes
 Downloads/Linux/TOSZ.CPP           |   7 ++---
 Kernel/KernelC.HH                  |   2 +-
 20 files changed, 94 insertions(+), 56 deletions(-)

diff --git a/0000Boot/0000Kernel.BIN.C b/0000Boot/0000Kernel.BIN.C
index d6619ca073cd8513d0d1817fd37c8926dfe098f1..ad96704be433255c67eda40f27d896090f0c8ca1 100644
GIT binary patch
delta 575
zcmX|7Ur1AN7`^AacTT+1-KCpN6Q_#`qgtUNMM|W&GJCL+gnEei5;4nZLPn;rt>x1G
z{D?~hl0<?aBl|u4$OwfV0#RX<(qw`9phPdmG%1O?6!pEFkMA5f=X?v3>cXUYuhbkF
zuj>s}s(et1%iN;yYG{1ITW&`t-#EX+L<uV|^!W>DB+C1{V=}T>>$IIW1dE6sd}Q${
zC+`pYL0*mhywxZ-_w=#GNIi8V3@VS0N80iKwvx_6y=5jStm~|U$M4oV4UfX%7jE*c
z8|ndyX}onhnFhb!-A4}I{9#<79<ar*ogYlB6TQ{g{^T{~moYq+{H72jKD0Py!#ul?
zDke!{p_ChTHk`TxiIuMv8++4Q6;k}s+KGHfV%drSnbaU8N$(khL$qzd0YX3@%0U%2
z#c~e37Tgy5iZGf>gOXUP08ck9wTvBB#p5G5PO=z@ij|`%ma$i4)S}Zu+ciCW3SEB~
z^JyfkEdD%Oq<kncD~1~E%jW`7b_p}tRFNr6H?f>;cDbqp9cNnfCjmHhm0{GVV7yYy
zG3?r@xLmG!{feLR#J1PiP}8RV25`PZiJ4w$qGkpjv#HeM@kn~-ERM<fwxDig&ecE7
z;ytClikEY!bwd?DzT+7T9N0umqlitMv`|Tge6_tsTzAkplG_eti21GLRd7+b3n;CO
g9@@n22CB^e=X%*sZ>)gWbA#?@(dw$0h|<%h-<;;w?EnA(

delta 581
zcmX|-QAiYF6ou#9nQ?1(b2eRfQxkJHEDbTM6){pYLyhb~MG}fI4GJAfTY@$$gLM@x
zHU5XG2q^+l0?Gb|AML@QAdp;;(liV-!iZifx1=QKr=YjXJs;=XbC;$ZOH+=4eYT6^
z>yd^c2fwe)sNAXXGAR6MMSc>TeC<T0P9NfVdZU>}W)JV{7*(-}wN5AT>Tm`Td&6d4
zCiA|C392#J@2)yESlP$wx~r&tUP>u^vO9?XyDv80*%Q#&sapxG|Cr8a`m2&<O8Uqn
zKb?t5evl>%-a5S)hqG444f61&*OQv+v-_>DA-H+r!gr#m!SWU_Y3JIMCO*3OL!*`;
zA6lN+j0M)P>Z5{u*1773n~khqhsN?_J~`LNit&x#jvYxwj#x3!M!G!=MX|0;z#}ds
zU=KmDhTJHIB39g}aH3b_W?;-q=3Vi=0DOb4D3NhR+$q6fQoUx6_;?UL72Acq93dy=
z8djtRSN<xtS}YjI63dO)YttkP_W4tq2s9&_NTp7pU&Try$@CHxN!G(QY_uE<W3qsJ
zrkG>cxkEcpT2^bFHz`GIeS$Sd+_Qi2$uE#?qvwV=6vb|v-q3uyw8aX|qEgLtg)Mop
z*LpXLSJGTOo<q4`*7@}l4*<IuT*s)3m`faWQnp=HBy!n9$4T99SH#;bRH5Od@TXB+
pfbO}(u4*bu)$+0mx3P|1uLzqoY)G@5cDfmF4Rj$z%=c1v{U6fX%Vz)p

diff --git a/Adam/ADefine.HC b/Adam/ADefine.HC
index 7c41f314..311be971 100644
--- a/Adam/ADefine.HC
+++ b/Adam/ADefine.HC
@@ -15,7 +15,7 @@ U0 LoadDocDefines()
   //$LK,"DD_BOOT_HIGH_LOC_DVD",A="FF:::/Adam/Opt/Boot/BootDVD.HC,DD_BOOT_HIGH_LOC_DVD"$
 
 $TR,"LineRep"$
-$ID,2$DefinePrint("DD_TEMPLEOS_LOC","80,845");
+$ID,2$DefinePrint("DD_TEMPLEOS_LOC","80,849");
 $ID,-2$
   DefinePrint("DD_MP_VECT","%08X",MP_VECT_ADDR);
   DefinePrint("DD_MP_VECT_END","%08X",
diff --git a/Adam/ASnd.HC b/Adam/ASnd.HC
index fa6bf00a..c0d81958 100644
--- a/Adam/ASnd.HC
+++ b/Adam/ASnd.HC
@@ -275,14 +275,11 @@ per second.  It defaults to
       ona=ONA_REST;
     if (words && (word=LstSub(i++,words)) && StrCmp(word," "))
       "%s",word;
+
     d=JIFFY_FREQ*music.note_len/music.tempo;
-    if (tie) {
-      on_jiffies  =d;
-      off_jiffies =0;
-    } else {
-      on_jiffies  =d*music.stacatto_factor;
-      off_jiffies =d*(1.0-music.stacatto_factor);
-    }
+    on_jiffies	=d*music.stacatto_factor;
+    off_jiffies =d*(1.0-music.stacatto_factor);
+
     timeout_val+=on_jiffies;
     timeout_val2=timeout_val+off_jiffies;
 
@@ -291,7 +288,7 @@ per second.  It defaults to
     SleepUntil(timeout_val);
     music.tM_correction+=on_jiffies-ToI64(on_jiffies);
 
-    if (!music.mute)
+    if (!music.mute && !tie)
       Snd;
     SleepUntil(timeout_val2);
     music.tM_correction+=off_jiffies-ToI64(off_jiffies);
diff --git a/Adam/Gr/SpriteEd.HC b/Adam/Gr/SpriteEd.HC
index a54cc342..556cb9f4 100644
--- a/Adam/Gr/SpriteEd.HC
+++ b/Adam/Gr/SpriteEd.HC
@@ -296,38 +296,38 @@ CSprite *SpriteTransformBitMap(I64 *r,CSprite *tmpg)
   I64 x,y,z,minx,maxx,miny,maxy,minz,maxz;
   CSprite *tmpg1;
 
-  x=0; y=0; z=0;
+  x=tmpg->pwhu.x1; y=tmpg->pwhu.y1; z=0;
   Mat4x4MulXYZ(r,&x,&y,&z);
   minx=maxx=x;
   miny=maxy=y;
   minz=maxz=z;
 
-  x=0; y=tmpg->pwhu.height; z=0;
+  x=tmpg->pwhu.x1; y=tmpg->pwhu.y1+tmpg->pwhu.height; z=0;
   Mat4x4MulXYZ(r,&x,&y,&z);
   if (x<minx) minx=x;
   if (x>maxx) maxx=x;
-  if (y<minx) miny=y;
-  if (y>maxx) maxy=y;
-  if (z<minx) minz=z;
-  if (z>maxx) maxz=z;
+  if (y<miny) miny=y;
+  if (y>maxy) maxy=y;
+  if (z<minz) minz=z;
+  if (z>maxz) maxz=z;
 
-  x=tmpg->pwhu.width; y=0; z=0;
+  x=tmpg->pwhu.x1+tmpg->pwhu.width; y=tmpg->pwhu.y1; z=0;
   Mat4x4MulXYZ(r,&x,&y,&z);
   if (x<minx) minx=x;
   if (x>maxx) maxx=x;
-  if (y<minx) miny=y;
-  if (y>maxx) maxy=y;
-  if (z<minx) minz=z;
-  if (z>maxx) maxz=z;
+  if (y<miny) miny=y;
+  if (y>maxy) maxy=y;
+  if (z<minz) minz=z;
+  if (z>maxz) maxz=z;
 
-  x=tmpg->pwhu.width; y=tmpg->pwhu.height; z=0;
+  x=tmpg->pwhu.x1+tmpg->pwhu.width; y=tmpg->pwhu.y1+tmpg->pwhu.height; z=0;
   Mat4x4MulXYZ(r,&x,&y,&z);
   if (x<minx) minx=x;
   if (x>maxx) maxx=x;
-  if (y<minx) miny=y;
-  if (y>maxx) maxy=y;
-  if (z<minx) minz=z;
-  if (z>maxx) maxz=z;
+  if (y<miny) miny=y;
+  if (y>maxy) maxy=y;
+  if (z<minz) minz=z;
+  if (z>maxz) maxz=z;
 
   dc3=DCNew(maxx-minx+1,maxy-miny+1);
 
@@ -345,8 +345,8 @@ CSprite *SpriteTransformBitMap(I64 *r,CSprite *tmpg)
   DCMat4x4Set(dc3,r);
   dc3->flags|=DCF_TRANSFORMATION;
 
-  dc3->x=-minx;
-  dc3->y=-miny;
+  dc3->x=tmpg->pwhu.x1-minx;
+  dc3->y=tmpg->pwhu.y1-miny;
   dc3->z=-minz;
   GrBlot3(dc3,0,0,0,img);
   Free(img);
@@ -363,11 +363,6 @@ CSprite *SpriteTransformBitMap(I64 *r,CSprite *tmpg)
   tmpg1->pwhu.x1=x;
   tmpg1->pwhu.y1=y;
 
-  x=0; y=0; z=0;
-  Mat4x4MulXYZ(r,&x,&y,&z);
-  tmpg1->pwhu.x1+=minx-x;
-  tmpg1->pwhu.y1+=miny-y;
-
   return tmpg1;
 }
 
diff --git a/Adam/Opt/Utils/TOS.HC b/Adam/Opt/Utils/TOS.HC
index fa2e1370..9a0172a5 100644
--- a/Adam/Opt/Utils/TOS.HC
+++ b/Adam/Opt/Utils/TOS.HC
@@ -10,11 +10,17 @@ U0 TOSStaffIns()
   "$$PURPLE$$$$TX+CX,\"Complete TOS install from TOS_Staff.ISO\"$$$$FG$$\n\n\n\n";
   InsRereg;
 
-  "\nDownload TOS_Supplemental1.ISO.C\tfrom http://www.templeos.org\n";
+  "\nDownload TOS_Supplemental1.ISO.C\tfrom http://www.templeos.org\n"
+  "Download TOS_Supplemental2.ISO.C\tfrom http://www.templeos.org\n"
+  "Download TOS_Supplemental3.ISO.C\tfrom http://www.templeos.org\n";
 
   if (PressAKey!=CH_SHIFT_ESC) {
     if (HostChgDsk("/home/tad/Downloads/TOS_Supplemental1.ISO.C"))
       CopyTree("T:/","~/Sup1");
+    if (HostChgDsk("/home/tad/Downloads/TOS_Supplemental2.ISO.C"))
+      CopyTree("T:/","~/Sup2");
+    if (HostChgDsk("/home/tad/Downloads/TOS_Supplemental3.ISO.C"))
+      CopyTree("T:/","~/Sup3");
 
     Once("TOSBootHDIns;");
     "\nDo you wish to run >$FG,2$TOSRegen;$FG$ to generate\n the "
@@ -41,13 +47,19 @@ public U0 TOSStdIns()
   "$$PURPLE$$$$TX+CX,\"Complete TOS install from TOS_Distro.ISO\"$$$$FG$$\n\n\n\n";
   InsRereg;
 
-  "\nDownload TOS_Supplemental1.ISO.C\tfrom http://www.templeos.org\n";
+  "\nDownload TOS_Supplemental1.ISO.C\tfrom http://www.templeos.org\n"
+  "Download TOS_Supplemental2.ISO.C\tfrom http://www.templeos.org\n"
+  "Download TOS_Supplemental3.ISO.C\tfrom http://www.templeos.org\n";
 
   if (PressAKey!=CH_SHIFT_ESC) {
     if (FileFind("/Demo/AcctExample"))
       CopyTree("::/Demo/AcctExample","~");
     if (HostChgDsk("/home/tad/Downloads/TOS_Supplemental1.ISO.C"))
       CopyTree("T:/","~/Sup1");
+    if (HostChgDsk("/home/tad/Downloads/TOS_Supplemental2.ISO.C"))
+      CopyTree("T:/","~/Sup2");
+    if (HostChgDsk("/home/tad/Downloads/TOS_Supplemental3.ISO.C"))
+      CopyTree("T:/","~/Sup3");
 
     Once("TOSBootHDIns;");
     "\nDo you wish to run >$FG,2$TOSRegen;$FG$ to generate\n the distro ISO's ";
diff --git a/Apps/Psalmody/JukePuppet.HC b/Apps/Psalmody/JukePuppet.HC
index 8f6ccb17..f4c745d1 100644
--- a/Apps/Psalmody/JukePuppet.HC
+++ b/Apps/Psalmody/JukePuppet.HC
@@ -76,11 +76,17 @@ public U0 JukeSongsPuppet(U8 *dirname="~/Psalmody",I64 passes=2,
   I64 i;
   CDirEntry *tmpde,*tmpde1;
   CTask *juke_task=User("JukeBox(0x%X);\n",dirname);
+  F64 t0;
   Cd(dirname);
   tmpde1=FilesFind("*",FUF_RECURSE|FUF_JUST_TXT|FUF_JUST_FILES);
   for (tmpde=tmpde1,i=0;tmpde && i<start_song;i++)
     tmpde=tmpde->next;
+  if (scrncast.record)
+    t0=scrncast.t0_tS;
+  else
+    t0=tS;
   for (i=start_song;tmpde && i<end_song;i++) {
+    "%12.6fs %s\n",tS-t0,tmpde->full_name;
     JukeSongPuppet(juke_task,passes,i,tmpde->name);
     tmpde=tmpde->next;
   }
diff --git a/Compiler/Compiler.BIN b/Compiler/Compiler.BIN
index 42f83a377de33ba70552e2feba6a6bf3ce650181..0667f7e90decb1dd6e5d9f815e59c81964ceb7db 100644
GIT binary patch
delta 338
zcmWlUO(?^09L9gocWn5Nzc!m`UTZ5CV}+4ID6jL{$YF8PiiKHIt{jv?R{l8<rCjNE
z_?BW$a+RYTWR1K;c_}4q&-wX0pPpD;iN%$}sWSaUmJlPIGE{b44wtOxdMP3yWMROU
z0U<*(LpB)Y`SRBwf}37g<<)h5CXHvy=lBlNJ;Lqw$hE{9w0;MQ<@Up>LcZk6$BI+`
zmr4$w79iKI3mpjUat`KbZ>_?w)tI-^Oqc`RxCOPU-0ejK>0QPp2<^8AmHgQYy#YaO
zJ%U2E4WrQnBaZ}d<4@~cIqTrMbGVCWPw?a&BqfU_3EU%>4fjxVTIdNTc06KCO@7g4
z7buUnzQF{+13%a&-GL~Ls_k|*|KTE~sS1;gKlHTWN&zQ7u<>pUwPk9?7IL$tiRyEp
da-WypRcchU<_5CxsGp9U(Y1tyOBShg`X9KDa)<x`

delta 343
zcmWlT&nts*9LK-!&ulY~_Gq@5ctTMwhC(zUDaA&9j1(6okDp_$DJR82DMWcvejWS)
z^gVpa!JOnOM>)uB5>bAX66W?kyn4OfvA7b8D@T(>7GH)CBSMCYPD&wUS=+Nl{$`o4
z2h-t@;h7!}6nVb<*^RNS0NnEGI>$!iner*V2eTN}BVM_dcm*6rS1~lX`>?9eWy<ru
zQeqK8s1<@wbCH#oHa+Ug*sQP7_@xSSZW4m^cHDwG?A#te6y{!K3BvgCqntlFV6kG%
zSdSu~J$-0!K;eEJH$!Rn3lLm;j!KQDc6j0rl2Twn0!gTBO+qnIi^9%Fgw)h9X6MPt
z+h1S;xa%8-WcvT1w&rp6FE0Kg6%q3AyM;EqW{7<&jI(dJ_@J6vY^LDgu%R}SmtBoi
hXNR3T1N5fSgx6^Dk&6e0=(q&ao9hWD7c5d?=no4CZ1eyC

diff --git a/Demo/AcctExample/HomeKeyPlugIns.HC b/Demo/AcctExample/HomeKeyPlugIns.HC
index 72ccbd7b..0ee5efa6 100644
--- a/Demo/AcctExample/HomeKeyPlugIns.HC
+++ b/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
diff --git a/Demo/AcctExample/PersonalMenu.DD b/Demo/AcctExample/PersonalMenu.DD
index b8387842702f0cc83bb76b6ca6f5198289cb3dd9..a90bf7f1b1c3ff1f0f0dc3746b5ef33dcce6617a 100644
GIT binary patch
delta 111
zcmbQ)%(AGNWrG8|l1F83Ua_%)f|8DpudR}Eibjl*zDIs;s(x^3fiakvJb_&dqRa@p
hG9!>OBakvSuxW;qOW2JjJFx3bUdBFU^FodvKLA`UBeDPh

delta 126
zcmZ3~%rdi?WrG9z<QMFElQ*!lPS)j<oqUO1Y_b@~lxP)SM;)cG{N%(W1qB5q9Uos?
zCFc~47$tqjf`VdwutaH2Vo_y`lBTswW|4JFo{|b!Pe^8Ns&h^@rXGkyescEac^oW1
E0lhaTpa1{>

diff --git a/Demo/AcctExample/PersonalNotes.DD b/Demo/AcctExample/PersonalNotes.DD
index e701e301..3391d523 100644
--- a/Demo/AcctExample/PersonalNotes.DD
+++ b/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.
diff --git a/Demo/AcctExample/Registry.HC b/Demo/AcctExample/Registry.HC
index 826446b1..01944b90 100644
--- a/Demo/AcctExample/Registry.HC
+++ b/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"$
diff --git a/Demo/AcctExample/TOS/TOSDistro.HC b/Demo/AcctExample/TOS/TOSDistro.HC
index 09d19beb..69a41d66 100644
--- a/Demo/AcctExample/TOS/TOSDistro.HC
+++ b/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");
diff --git a/Demo/AcctExample/TOS/TOSMisc.HC b/Demo/AcctExample/TOS/TOSMisc.HC
index 29a0f994..d149ffbc 100644
--- a/Demo/AcctExample/TOS/TOSMisc.HC
+++ b/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)
diff --git a/Demo/Games/Squirt.HC b/Demo/Games/Squirt.HC
index 3ccbab5aacb46d6d14604f3f01a3ad75f239642f..9fb7da5af8a07e17b2fcce912e79dd68f9fc42a6 100644
GIT binary patch
delta 47
zcmZ25g>}&s)(t&E64qP_K#)>t8=RS^k(Xapm6IC(Qq!7ivWKv2^M0Z2`-K=2%>jI>
B599y<

delta 47
zcmZ29g>}Ic)(t&E5;|O*3JNKew!xWs8hQCuRXM5gFExRJlYNAxn-2<YKPbeQXbu2*
C=ntL%

diff --git a/Demo/Snd/WaterFowl.HC b/Demo/Snd/WaterFowl.HC
index d968a5f0b4c03f7913036b23a2ee3861cf697530..bd888bd7b4fbb5a9cb5ccb7e42fdd5e592fe6f58 100644
GIT binary patch
delta 53
zcmZ4eR%pjtp$(>-VgdODp#>UB;fW=wMQ-`!Io3)#ZpE6-cAV{YoQy!s1jNkS?KoL-
G*8%_p0ucZJ

delta 40
tcmdn-R%rEGp$(>-oZ*QjsYP!2<vGpXobBG6j6lo;#LU~hIazYo0suM74T}H(

diff --git a/Demo/ToHtmlToTXTDemo/ToHtml.HC b/Demo/ToHtmlToTXTDemo/ToHtml.HC
index d84c5591..569bc610 100644
--- a/Demo/ToHtmlToTXTDemo/ToHtml.HC
+++ b/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";
 
diff --git a/Demo/WebLogDemo/WebLogRep.HC b/Demo/WebLogDemo/WebLogRep.HC
index 87951b23..9c544591 100644
--- a/Demo/WebLogDemo/WebLogRep.HC
+++ b/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;
 }
 
diff --git a/Downloads/Linux/TOSZ b/Downloads/Linux/TOSZ
index efe1a29728421d4210aaa8b9a53f827f61d27d7e..f264fe22fbea86d8236529d2965b8544d4314ebc 100644
GIT binary patch
delta 2777
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

delta 2956
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
Dwn@@T

diff --git a/Downloads/Linux/TOSZ.CPP b/Downloads/Linux/TOSZ.CPP
index aef3d765..a442cf5d 100644
--- a/Downloads/Linux/TOSZ.CPP
+++ b/Downloads/Linux/TOSZ.CPP
@@ -988,7 +988,7 @@ int SND2MP4Lst(char *snd_print_fmt,char *mp4_print_fmt,char *out_name,
 }
 
 int AU2SNDLst(char *au_name,char *snd_print_fmt,
-	char *mp4_print_fmt,char *out_name,int rate=24000)
+	char *mp4_print_fmt,char *out_name,double vol=1.0,int rate=24000)
 {//Cvt AU file to SND lst to MP4
   int num=0,snd_percent_cnt;
   FILE *au_file;
@@ -998,7 +998,7 @@ int AU2SNDLst(char *au_name,char *snd_print_fmt,
   else
     snd_percent_cnt=0;
   AURead(&head,au_name);
-  num=SndFileCreate(&head,snd_print_fmt);
+  num=SndFileCreate(&head,snd_print_fmt,vol);
   QueDel(&head);
   return SND2MP4Lst(snd_print_fmt,mp4_print_fmt,out_name,rate);
 }
@@ -1008,6 +1008,7 @@ int main(int argc, char* argv[])
   char *in_name,*out_name,st[256],*mv_print_fmt,*au_name;
   BOOL cvt_ascii,del_in=FALSE;
   int i=1,l;
+  double vol=0.1;
   if (argc>i && !strcmp(argv[i],"-mp4")) {
     i++;
     if (argc>i) 
@@ -1022,7 +1023,7 @@ int main(int argc, char* argv[])
 	  (char *)"TOSZTEMP%06d.BMP",(char *)"TOSZTEMPVID%03d.MP4",
 	  (char *)"TOSZVIDEO.MP4");
     AU2SNDLst(au_name,(char *)"TOSZTEMP%03d.SND",
-	  (char *)"TOSZTEMPAUD%03d.MP4",(char *)"TOSZAUDIO.MP4");
+	  (char *)"TOSZTEMPAUD%03d.MP4",(char *)"TOSZAUDIO.MP4",vol);
     if (argc>i) 
       out_name=argv[i++];
     else
diff --git a/Kernel/KernelC.HH b/Kernel/KernelC.HH
index a0b2dd84..9b6267a9 100644
--- a/Kernel/KernelC.HH
+++ b/Kernel/KernelC.HH
@@ -681,7 +681,6 @@ public extern U0 SndRst();
 
 #help_index "StdIn"
 #help_file "::/Doc/Streams"
-
 #help_index "StdOut"
 #help_file "::/Doc/Streams"
 
@@ -729,6 +728,7 @@ public extern CTask *Spawn(U0 (*fp_addr)(U8 *data),U8 *data=NULL,
 
 #help_index "Time/CPU Cycles;Time/HPET;Time/Jiffies"
 public extern CCntsGlbls cnts;
+
 #help_index "Time/Date/CDate;Date/CDate"
 #help_file "::/Doc/TimeDate"
 public extern U0 Date2Struct(CDateStruct *_ds,CDate cdt);