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
zcmaEGiu=JS?g=LB9s9kzTJ5+uFJ!sMyqSk(vkRlZ<^vvPqKv$ozsIVvGTr3gET5b!
z%e1C@b6>+cW=6irg=a-K2el|NF-^KL`QjPL&3$dTj7%N^lmE7dF{d>4P7dqvWh%Ql
z`QjO=&HFn_7~x{iIX1U;nX)pnOs<O%+kCO#SCWx;v;4{p%1p^$Cto}>k7=F2=EAdg
z*cfxCH}o=zZBDtepM|NBaq`19(alyjzcMi$7MN^!r;_FW|Ns9tue<Y&g^7`2^RkD#
z1Q~BlPW-II#K17Q^|Lag=;W23dl(ren|)DY6rCLT#h&r==9yo7q!}5uKjUXCVq)cP
zVPs&K-nffVY<sZ~qY)Eh(ez~^jP{Jbw?7kM^x$Fa+^(<4xKW&GA;b1Z7L1!YSRdu>
zvgO`B%aPHGiFx~)?(NT=8I_nB^|o`lGgk31sR&GO3udeX%dm$q-sGQrajEe3&&iC6
z>@3^YbTdwV{Ze+jX*T0IVI~XS?X2~T&xF|(6kLkRLi482E@G6N&OMoNBjYVlP;S3A
znNdTXML|KqcX~lClhk&Z-HhM4+0H;5AbFfoi=Anwz;@Sjj0WtiCI$uu4AZNwGI}yg
z3${$xS7a2Qe)lTlWv0&`w{N<}=&sDjz5Ulu#>I?`+}r2<W?U!0)FHUtkB3Q%i@CJK
zb$hiKQw$Sxu{GEBTM|qjER31km1UXOOqr$%Zr2WCvXh3{nxD(Gm!FYwyKXJhL_Veu
MAGROpW?B#l0G#I5?EnA(

delta 581
zcmaEGiu=JS?g=LBWjlYjCE9UsUdVEhc{2~oW*0_=%?CWpL>YNDe~(pTWqQK5Sw1;e
zmMOPub6>+cW=7u0g=a-K2el|NF-^Wc`QjPL&3$dTj7-7&lmE7dF_(DuO%ChuWvaa~
z`QjO=&HFn_7~x_c*f+O!nX*n!njti~KZ14h#eQE&MxM>`D>o=JWqg@@@ytA?UHqF1
z&)#8U%$(lP%Otir<;s2*W+g7==^v{YMK)XA{K~|1j(@V@ol2JcB8HUB>+XDGVah4l
zyzJpFLB^Yt6F)04S(r_3{jAI=GI{0a9!8eQW?z&TMJ7jnv1k0WdFB@%X-3`c&-fXO
zm{_@57#SF*H|}B-+g>chXvD<GFnyT_qdg<T_GcoD9z2ZQ+w~P0H;Oam&e{IRf^jnk
zD+5E@PKNEX92vcsn8kCuwm)}fRAOdS+0Nz8SjEGn&p*8_n6VBl!ydwTlb=y@`@>{L
zV|Ett+%Cq+uV2b;H_c`|C(Pu;vz@h`@tH6a1H*JjW=7HJtBV*pr*ltc+{kzn6qwtu
zO=i?kXR&p137KAy%Otg3W;f$^Znnb^>m`pfYOymN;ot6hj?sXfH8DHYDQ9}sRYp%{
zHG!7t`ihL=)9+qoyv)SFuzk}tMt5aKhV8$8GA?Fh<k~*(H{&`1rpW@^{dkzPxR@Cj
z7`9i7F~u-3TXQjNza_!s!NM57U0Ifi&6H_@z;^8*COc^sLrp7%$qn7&+goy(R`4@2
WY}c)2n#ebOLOY|>_8Z+y9gzUi+skJF

diff --git a/Adam/ADefine.HC b/Adam/ADefine.HC
index 7c41f31..311be97 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 fa6bf00..c0d8195 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 a54cc34..556cb9f 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 fa2e137..9a0172a 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 8f6ccb1..f4c745d 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
zcmdo0gnR!J?hQGLY-wB!4B?)eixhWhFzRjA^?EDI#K5pwCL@%CkzsRDL9hfP&*ozt
z-+~x(r};99ZN7Y4oRcYmck`Pk^B7sp84L~0H}^mLz&JfXg;8$v+!uY^Ord(4b-#40
zvi%1EzU})Y83m-7i<UD?zgWyDJlW5Td;5D6#&R*Hf|BhS-i!|!nVk8zd;2n$F|vB`
zv@kME|L4P~zx}HpBO5zo?(_*|j56CL!Wiv@7<smbXE5H4W%2Aj;IZA}7^9&q(?W*r
z*^e1FGco2)mw(3ioKavq`*TKa=IKSR8HKj1ykd;!XJTNOURcE>vVG=H#_ddu4BG?$
zFfL(YUe2H}ncrP{yYPR;6Ci60N|+?Je_>;qqzBTl_Yb4Q_64R)E}YYOoR|!^i`p|;
n@-gyn_xEM`%+F-UJ>9{YNpyQ;EYn8S$^Fknx63y(DdYnHxQ}v(

delta 343
zcmdo0gnR!J?hQGLY}Q;145<v8ixhWhFfwe`^?EDI<m0qiCL@%CQD}2fL9hfP_vT|A
z-+~x3r};99ZN7Y4oRcYwXY-pU^B7qf(lbi*HupdKz{n^xJy3;FcJtg9ecVhJ88+*F
z=~iW9U|`@kVA#G-l2JgKB`@8YYqE`*?DqF2jOAiX3=G>dycr)dGWqds_x5EhV`L5C
zZee7Y{?CU|fBRQIMmBcF%;^)#7-hCggfZF)F>-GY&tSY8%ks2=kzu>VF-AjKrrbH(
zvmY~VW@5~oF8_@2IV1me_UDY;%uFua+eKb6=JPYTa8EC+ViMUt^C#nWCPv2Xfqxj6
zFfoJN!S61;UHCua36LcQB}@|Azpyb)(qm<0n9t5Q{lFha(d`RNnOr!TLt~Pr^E)x=
uZ5Op?vgBjr+wSkn^qHS2TW`99HIwM}$XKS0s*HJ)Cp;6`F5k?gkPiS032gKL

diff --git a/Demo/AcctExample/HomeKeyPlugIns.HC b/Demo/AcctExample/HomeKeyPlugIns.HC
index 72ccbd7..0ee5efa 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 e701e30..3391d52 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 826446b..01944b9 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 09d19be..69a41d6 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 29a0f99..d149ffb 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_3JMA-mA1i|c^Y~7RaH5u@h>&4xh8uE%Qo*9+P+_iG0_|V
De5w!R

delta 47
zcmZ29g>}Ic)(t&E5;|O*3JNKew!xWs8hQCuRXM5gFEw?zI4AoEOE(`B+I~=oG0_|V
DdFT(G

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{YoQ&;uoJ{R@oXp$p
JI9YPn0ssU85dZ)H

delta 40
wcmdn-R%rEGp$(>-oZ*QjsYP!2<vGpXobBG6jP2f>OzqyB%-g*=S#s9`06EJIivR!s

diff --git a/Demo/ToHtmlToTXTDemo/ToHtml.HC b/Demo/ToHtmlToTXTDemo/ToHtml.HC
index d84c559..569bc61 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 87951b2..9c54459 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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
Ol*xh!{+ryGEe`-5W5?D2

delta 2956
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

diff --git a/Downloads/Linux/TOSZ.CPP b/Downloads/Linux/TOSZ.CPP
index aef3d76..a442cf5 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 a0b2dd8..9b6267a 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);