TempleOS V5.03 Nightly (ISO SHA-1 aed1efc)

2018-09-09 11:35:02 +02:00
1 parent bbd014d8e9
commit da84afbaf7
@@ -126,38 +126,6 @@ Bool MyPutKey(I64 ch,I64 sc)
 		"$$BLUE$$";
 	    }
 	    return TRUE;
-	  case SC_F5:
-	    if (sc&SCF_KEY_DESC)
-	      KeyDescSet("Cmd /GodOffer");
-	    else
-	      GodOffer;
-	    return TRUE;
-	  case SC_F6:
-	    if (sc&SCF_SHIFT) {
-	      if (sc&SCF_KEY_DESC)
-		KeyDescSet("Cmd /TOSIns");
-	      else
-		TOSIns;
-	    } else {
-	      if (sc&SCF_KEY_DESC)
-		KeyDescSet("Cmd /TimeIns");
-	      else
-		TimeIns;
-	    }
-	    return TRUE;
-	  case SC_F7:
-	    if (sc&SCF_SHIFT) {
-	      if (sc&SCF_KEY_DESC)
-		KeyDescSet("Cmd /NISTGodIns2");
-	      else
-		NISTGodIns2;
-	    } else {
-	      if (sc&SCF_KEY_DESC)
-		KeyDescSet("Cmd /GodIns");
-	      else
-		GodIns;
-	    }
-	    return TRUE;
 	  case SC_F8:
 	    if (sc&SCF_SHIFT) {
 	      if (sc&SCF_KEY_DESC)
@@ -185,6 +153,22 @@ Bool MyPutKey(I64 ch,I64 sc)
 	else
 	  AutoComplete;
 	return TRUE;
+      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;
      case 'h':
 	if (sc&SCF_KEY_DESC)
 	  KeyDescSet("Cmd /WinTileHorz");
@@ -211,12 +195,6 @@ Bool MyPutKey(I64 ch,I64 sc)
 	else
 	  WinTileVert;
 	return TRUE;
-      case 'V':
-	if (sc&SCF_KEY_DESC)
-	  KeyDescSet("Cmd /FrameGrabberToggle");
-	else
-	  FrameGrabberToggle;
-	return TRUE;
      case 'l':
 	if (sc&SCF_KEY_DESC)
 	  KeyDescSet("Edit/Put Link to Cur Pos on Clip");
@@ -246,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':
@@ -284,30 +276,6 @@ Bool MyPutKey(I64 ch,I64 sc)
 	else
 	  "$$ID,-5$$";
 	return TRUE;
-      case 'b':
-	if (sc&SCF_KEY_DESC)
-	  KeyDescSet("Cmd /Jump to Bad Code");
-	else //$LK,"::/Adam/God/HSNotes.DD"$
-	  GodCodeJmp;
-	return TRUE;
-      case 'g':
-	if (sc&SCF_KEY_DESC)
-	  KeyDescSet("Edit/BlogScrnShot");
-	else
-	  BlogScrnShot;
-	return TRUE;
-      case 'p':
-	if (sc&SCF_KEY_DESC)
-	  KeyDescSet("Cmd /JukeBox(Home/Sup1Hymns)");
-	else
-	  JukeBox("~/Sup1/Sup1Hymns");
-	return TRUE;
-      case 'P':
-	if (sc&SCF_KEY_DESC)
-	  KeyDescSet("Cmd /JukeBox(Home/Sup1Songs)");
-	else
-	  JukeBox("~/Sup1/Sup1Songs");
-	return TRUE;
    }
  }
  return FALSE;
@@ -9,7 +9,7 @@ U0 UserStartUp()
  WinToTop;
  WinZBufUpdate;
  Dir;
-  "$TX,"81,223",D="DD_TEMPLEOS_LOC_OFFICIAL"$LOC:";
+  "$TX,"82,150",D="DD_TEMPLEOS_LOC"$LOC:";
  CPURep;
 }

@@ -2,7 +2,7 @@

 #define FILEMASK_OFF_LIMITS "!*/Misc/PCIDevices.DD*;!*/Misc/Bible.TXT*;"\
 	"!*/Books?/*;!*/Sup1/Sup1Words/*;!*/Sup1/Sup1Bin/*;"\
-	"!*/Sup1/Sup1Blog/NumBible.TXT*;!*/God/Vocab.DD*"
+	"!*/God/Vocab.DD*"

 public I64 F(U8 *needle_str,U8 *fu_flags=NULL)
 {//Find text in all text files.
@@ -1,5 +1,11 @@
 $WW,1$$FG,5$$TX+CX,"TODO"$$FG$

+* Make MV files combine disjoint rects for same frame.
+
+* God said to reconsider switch start/end, perhaps preface portion?
+
+* 170605 Alec Murphy said MountFile() of a red sea supplemental1 ISO failed.
+
 * Does entire tool chain support super/sub script?

 * $LK,"::/Apps/X-Caliber/X-Caliber.HC"$
@@ -13,9 +19,9 @@ $WW,1$$FG,5$$TX+CX,"TODO"$$FG$
 * Helicopters.
 * Anti-Aircraft.

-* $MA-X+PU,"64-Bit Device Memory",LM="F(\"mem64_ptr\");View;"$ is not implemented.
+* Fix $LK,"::/Home/Sup1/Sup1Graphics/ICOFile.HC"$

-* Cursor in $LK,"~/TOS/TOSToHtml.HC"$.
+* $MA-X+PU,"64-Bit Device Memory",LM="F(\"mem64_ptr\");View;"$ is not implemented.

 * Investigate why packet loss $LK,"Training Sleep(1)",A="FF:::/Adam/Training.HC,Sleep(1)"$.

@@ -192,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"$?
@@ -273,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.
@@ -441,84 +443,13 @@ Thousand songs of Solomon		$TX,"1 Kings 4:32",HTML="http://www.biblegateway.com/
 Not rich, nor poor, but my portion	$TX,"Proverbs 30:8",HTML="http://www.biblegateway.com/verse/en/Proverbs%2030:8"$
 Be hot or cold. Lukewarm I spit you out	$TX,"Revelation 3:16",HTML="http://www.biblegateway.com/verse/en/Revelation%203:16"$

-$FG,5$$TX+CX,"Misc Notes"$$FG$
-Erik van der Karbargenbok: $LK,"TempleBot",A="PI:~/Sup1/Sup1Bin/TempleBot"$.
-Intel CEO's name: Brian Krzanich
->$FG,2$lspci -v$FG$
-Size:$TX,"17400KB",D="DD_TEMPLEOSCD_K_SIZE"$
-
-$FG,5$$TX+CX,"My Web Bookmarks"$$FG$$WW,0$
-$TX,"My FireFox Bookmarks",HTML="http://www.templeos.org/Wb/Home/Sup1/Sup1Blog/Bookmarks"$
-Machine		$HC,"<center><img src=\"http://www.templeos.org/images/Machine.jpg\" width=\"600\" height=\"400\" alt=\"\"></center>"$
-Frosting	$HC,"<center><img src=\"http://www.templeos.org/images/Frosting.jpg\" width=\"600\" height=\"400\" alt=\"\"></center>"$
-Soap Carvings	$HC,"<center><img src=\"http://www.templeos.org/images/SoapCarvings.jpg\" width=\"640\" height=\"480\" alt=\"\"></center>"$
-CottonTail	$HC,"<center><img src=\"http://www.templeos.org/images/CttnTail.jpg\" width=\"644\" height=\"1113\" alt=\"\"></center>"$
-TempleOS Logo	$HC,"<center><img src=\"http://www.templeos.org/images/Logo128x152.jpg\" width=\"640\" height=\"760\" alt=\"\"></center>"$
-T-Shirts & Mug	$HC,"<img src=\"http://www.templeos.org/Wb/Home/Web/Imgs/Gear2387x2849.jpg\" width=\"477\" height=\"569\" alt=\"\">"$
-Pew Pew Pew	$HC,"<center><img src=\"http://i.imgur.com/sMpJ0ch.jpg\" width=\"640\" height=\"480\" alt=\"\"></center>"$
-Iceberg		$HC,"<center><img src=\"https://upload.wikimedia.org/wikipedia/commons/3/38/Blue_ice_in_South_Greenland_-_Visit_Greenland.jpg\" width=\"640\" height=\"480\" alt=\"\"></center>"$
-I made dis	$HC,"<center><img src=\"http://i.imgur.com/cZKkxTX.jpg\" width=\"640\" height=\"800\" alt=\"\"></center>"$
-NIST Beacon	$HC,"<center><img src=\"http://www.nist.gov/itl/csd/ct/images/beacon_architecture_2013.jpg\" width=\"550\" height=\"278\" alt=\"\"></center>"$
-Purple Frog	$HC,"<center><img src=\"https://s-media-cache-ak0.pinimg.com/736x/fb/08/2a/fb082a53bd798f5957a474ff9095e6d4.jpg\" width=\"640\" height=\"420\" alt=\"\"></center>"$
-Sombrero	$HC,"<center><img src=\"https://upload.wikimedia.org/wikipedia/commons/5/5e/M104_ngc4594_sombrero_galaxy_hi-res.jpg\" width=\"640\" height=\"359\" alt=\"\"></center>"$
-Zinger		$HC,"<center><img src=\"http://media.shopwell.com/gladson/00041300000031_full.jpg\" width=\"432\" height=\"234\" alt=\"\"></center>"$
-Dianna Throne	$HC,"<center><img src=\"http://i.imgur.com/RtcK6iX.jpg%EF%BB%BF\" width=\"640\" height=\"746\" alt=\"\"></center>"$
-170310 Terry	$HC,"<center><img src=\"http://www.templeos.org/images/170310TerryADavis.jpg\" width=\"640\" height=\"640\" alt=\"\"></center>"$
-
 $TX,"Linus Torvalds (Dec 28, 1969)",HTML="https://en.wikipedia.org/wiki/Linus_Torvalds"$
 $TX,"John Carmack   (Aug 20, 1970)",HTML="https://en.wikipedia.org/wiki/John_Carmack"$
 $TX,"Terry A. Davis (Dec 15, 1969)",HTML="https://motherboard.vice.com/en_us/article/gods-lonely-programmer"$
-
-$TX,"SimStructure",HTML="http://www.templeos.org/files/SimStrSetUp.zip"$
-$TX,"ASU_Transcripts",HTML="http://www.templeos.org/files/ASU_Transcripts.pdf"$      $TX,"ASU Course Catalog (See page 261)",HTML="https://catalog.asu.edu/files/shared/archives/1994-1996/general/UG1994-1996.pdf/1994-1996-UG-241-267.pdf"$
-$TX,"Dr. David Pheanis",HTML="https://webapp4.asu.edu/directory/person/77201"$	$TX,"Dr. Konstantinos S. Tsakalis",HTML="http://ecee.engineering.asu.edu/directory/tenured-and-tenure-track-faculty/kostantinos-s-tsakalis"$	$TX,"Dr. Walter Higgins",HTML="https://webapp4.asu.edu/directory/directorysearch?cn=Walter+Higgins"$
-$TX,"Peter Gadwa",HTML="http://www.wired.com/magazine/2010/11/mf_ticketmaster/all/1"$	$TX,"Ticketmaster",HTML="http://www.nytimes.com/1994/11/06/business/ticketmaster-s-mr-tough-guy.html?pagewanted=a"$
+$TX,"Dr. David Pheanis",HTML="https://webapp4.asu.edu/directory/person/77201"$
+$TX,"Dr. Konstantinos S. Tsakalis",HTML="http://ecee.engineering.asu.edu/directory/tenured-and-tenure-track-faculty/kostantinos-s-tsakalis"$
+$TX,"Dr. Walter Higgins",HTML="https://webapp4.asu.edu/directory/directorysearch?cn=Walter+Higgins"$
+$TX,"Peter Gadwa",HTML="http://www.wired.com/magazine/2010/11/mf_ticketmaster/all/1"$
+$TX,"Ticketmaster",HTML="http://www.nytimes.com/1994/11/06/business/ticketmaster-s-mr-tough-guy.html?pagewanted=a"$
 $TX,"Tom Foley",HTML="http://web.gccaz.edu/~tfoley/perspage.html"$
-$TX,"Graphic Technologies",HTML="https://web.archive.org/web/20020811060541/http://www.graphic-technologies.com/"$	$TX,"Lexmark vs Static Control",HTML="https://en.wikipedia.org/wiki/Lexmark_International,_Inc._v._Static_Control_Components,_Inc."$
-
-
-
-$TX,"Stephen Davis",HTML="https://photos.google.com/share/AF1QipM4HI3mb_9qe8wDQ--nRfjIzOKyGG8heqWH-tbGBIIoxChWe4GeBegNzgHRy4Z1Qw?key=eGR0R0tyZG5tenRWd0tDN2RHRFRNTmI4NXdhc25B"$
-
-3qEeEGCAsBABAqFDBeE2G33qEeEGCAsBABAqFDBeE2G33qCsBDBDq2G3s2G3F2G3FqAet2G32G3AEDAqF3qCsBDBDq2G3s2G3F2G3FqAet2G32G3AEDAqF
-qFeDAsBDeDqCeF2G3sGGeF2sG3C2G3CBCeF
-
-$FG,5$$TX+CX,"Web Bookmarks"$$FG$
-Cop tying shoe	$HC,"<center><img src=\"https://goodtimestories.files.wordpress.com/2013/04/cop-tying-shoe-cambridge-county-pd.jpg\" width=\"480\" height=\"376\" alt=\"\"></center>"$
-$TX,"Unikernels",HTML="https://ma.ttias.be/what-is-a-unikernel"$
-$TX,"Handford school",HTML="https:/pinterest.com/pin/255368241346360278"$
-$TX,"Look at PCI interrupt routing.",HTML="http://forum.osdev.org/viewtopic.php?f=1&t=29558"$
-$TX,"The sins of Newton",HTML="https://www.brainpickings.org/2012/01/04/isaac-newton-list-of-sins"$
-$TX,"Stalin's Tanks",HTML="https://boardgamegeek.com/boardgame/5198/stalins-tanks"$
-$TX,"Wisdom for the Way",HTML="https://www.amazon.com/Wisdom-Way-Wise-Words-People/dp/1404113258#reader_1404113258"$
-$TX,"Lamp shades",HTML="http://www.lampsplus.com/products/lamp-shades"$
-$TX,"The Original Jewish Temple",HTML="http://www.jewishvirtuallibrary.org/jsource/Judaism/The_Temple.html"$
-$TX,"Top 1000 Movies",HTML="http://www.theyshootpictures.com/gf1000_all1000films.htm"$
-$TX,"KingJamesBible with LineNums",HTML="http://www.templeos.org/Wb/Home/Sup1/Sup1Blog/NumBible.TXT"$
-$TX,"Higgs 5-Sigma Proof",HTML="http://understandinguncertainty.org/explaining-5-sigma-higgs-how-well-did-they-do"$
-$TX,"The Number Bleem",HTML="http://www.strangehorizons.com/2000/20001120/secret_number.shtml"$
-$TX,"Dwight: Nerd torture",HTML="http://www.noob.us/humor/the-office-dwight-faces-nerd-torture-of-the-highest-form"$
-$TX,"TOSZ Compression",HTML="http://www.templeos.org/Wb/Linux/TOSZ.CPP"$
-$TX,"ATA/ATAPI spec",HTML="http://www.t13.org/Documents/UploadedDocuments/docs2007/D1532v1r4b-AT_Attachment_with_Packet_Interface_-_7_Volume_1.pdf"$
-$TX,"Patton Prayer",HTML="http://www.pattonhq.com/prayer.html"$
-$TX,"Streaming Terry A. Davis",HTML="https://www.youtube.com/channel/UCdX4uJUwSFwiY3XBvu-F_-Q/live"$
-$TX,"Bleem",HTML="http://strangehorizons.com/fiction/the-secret-number/"$
-
-$TX,"WWW.OSDEV.ORG",HTML="http://www.osdev.org"$
-$TX,"NIST Beacon",HTML="http://www.nist.gov/itl/csd/ct/nist_beacon.cfm"$
-$TX,"The Perfect Coin Toss",HTML="http://hackaday.com/2014/12/19/nist-randomness-beacon"$
-$TX,"BBC",HTML="http://www.knpr.org"$
-$TX,"KNPR",HTML="http://www.knpr.org"$
-$TX,"BBC_News_24",HTML="http://www.wherever.tv/tv-channels/BBC-News-24.jsf"$
-$TX,"BBC_Five_Live",HTML="http://www.bbc.co.uk/radio/player/bbc_radio_five_live"$
-$TX,"CBS News",HTML="http://www.cbsnews.com/live/?ftag= NM14632fc"$
-
-$TX,"C64 Users Guide",HTML="http://www.commodore.ca/manuals/c64_users_guide/c64-users_guide.htm"$
-$TX,"Mapping the Commodore 64",HTML="http://unusedino.de/ec64/technical/project64/mapping_c64.html"$
-$TX,"C64 Programmers Reference Guide",HTML="http://www.commodore.ca/manuals/c64_programmers_reference/c64-programmers_reference.htm"$
-
-$TX,"8-Bit Pixel Art",HTML="http://8bitdecals.com/8-bit-image-gallery"$
-$TX,"8-Bit Japanese Pixel Art",HTML="http://designmadeinjapan.com/magazine/illustration-icon/tumblr-gifs-of-japanese-life"$
-
-
-sha256sum
+$TX,"Graphic Technologies",HTML="https://web.archive.org/web/20020811060541/http://www.graphic-technologies.com/"$
@@ -8,7 +8,7 @@ $ID,2$#help_index "Registry/Install Registration"
 MemSet(&ins_reg,0,sizeof(CInsReg));
 ins_reg.registered=1;
 ins_reg.host_os=2;
-ins_reg.host_vm=2;
+ins_reg.host_vm=3;

 #define INS_REG_PERSONAL_INITIALS "TAD"
 StrCpy(ins_reg.initials,"TAD");
@@ -28,8 +28,6 @@ $ID,-2$$TR,"DiningStars"$
 $ID,2$F64 best_score=9999.0000;
 $ID,-2$$TR,"CircleTrace"$
 $ID,2$F64 best_score=4.9425;
-$ID,-2$$TR,"TOSNIST"$
-$ID,2$I64 tos_nist_offset=-8049;
 $ID,-2$$TR,"BlackDiamond"$
 $ID,2$I64 best_score=2;
 $ID,-2$$TR,"DunGen"$
@@ -50,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=227.554;
+progress3_tf=0.000;progress4_tf=223.150;
 $ID,-2$$TR,"XCaliber"$
 $ID,2$I64 best_score=90;
 I64 msg_flags=2;
@@ -62,15 +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=188.144;
-$ID,-2$$TR,"TempleTetris"$
-$ID,2$I64 hiscore=1000;
+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=202.07117;
+$ID,2$F64 best_score=187.05180;
 $TR,"SimpleVal"$
-$ID,2$1239;
+$ID,2$1245;
 $ID,-2$$ID,-2$$ID,-2$
@@ -3,11 +3,6 @@ Cd(__DIR__);;
 #include "TOSExt"
 #include "TOSCfg"
 #include "TOSMisc"
-#include "TOSToHtml"
 #include "TOSDistro"
-#include "TOSBlog"
-#include "TOSNIST"
-#include "TOSHolySpirit"
-#include "TOSIns"

 Cd("..");;
@@ -1,14 +1,7 @@
 #help_index "Misc/TOS/Cfg"

-#define PERSONAL_WEB		"http:/" "/www.templeos.org/Wb"
-#define BLOG_BASE		"/Home/Web/"\
-				INS_REG_PERSONAL_INITIALS "/BlogDir"
-#define DAILY_BASE		"/Home/Web/"\
-				INS_REG_PERSONAL_INITIALS "/DailyBlog"
-#define BLOG_LOCAL_BASE		"::" BLOG_BASE
-#define BLOG_WEB_BASE		PERSONAL_WEB BLOG_BASE
-
 #define SLOP	BLK_SIZE
+
 U0 TOSDbgDistro1()
 {
  CBinFile *bfh=mem_boot_base-sizeof(CBinFile);
@@ -51,8 +44,7 @@ U0 TOSInit()
  }
 } TOSInit;

-#define TOS_ISO_NAME	"B:/TempleOSCD.ISO"
-#define TOS_ISO_C_NAME	"B:/TempleOSCD.ISO.C"
+#define TOS_ISO_NAME	"B:/TOS_Distro.ISO.C"
 #define TOS_DISTRO_DIR	"B:/Distro"
 #define CFG_OPTS	"StaffMode\nMountIDEAuto\nCT\n"
 #define CFG_DBG_OPTS	"StaffMode\nMountIDEAuto\nCT"\
@@ -2,17 +2,8 @@

 #help_index "Misc/TOS/Distro"

-#define MAKE_STD	1
-#define MAKE_STD_RS	0
-#define MAKE_ULTRA	1
-#define MAKE_ULTRA_RS	0
-#define MAKE_SUP1	1
-#define MAKE_WEB	1
-#define MAKE_BOOKS1	0
-#define MAKE_BOOKS2	0
 #define MAKE_DBG	0
 #define MAKE_STAFF	1
-#define PROFANITY_CHK	0

 public U8 TOSGetDrv()
 {//Pmt for drv let.
@@ -59,25 +50,6 @@ public U0 TOSPmtAndCopyDrv()
  TOSCopyDrv(src,dst);
 }

-U0 DistroSongsPrep(U8 threshold='7')
-{
-  CDoc *doc;
-  CDocEntry *doc_e;
-  CDirEntry *tmpde=FilesFind("/Home/Sup1/Sup1Hymns/*.HC*",
-	FUF_CLUS_ORDER),*tmpde1=tmpde;
-  DelTree("/Apps/Psalmody/Examples");
-  DirMk("/Apps/Psalmody/Examples");
-  while (tmpde) {
-    doc=DocRead(tmpde->full_name);
-    doc_e=doc->head.next;
-    if (doc_e->type_u8==DOCT_TEXT && doc_e->tag[2]>=threshold)
-      Copy(tmpde->full_name,"/Apps/Psalmody/Examples");
-    DocDel(doc);
-    tmpde=tmpde->next;
-  }
-  DirTreeDel(tmpde1);
-}
-
 U0 DistroPrep()
 {
  AOnceFlush; //Don't want in Registry
@@ -85,8 +57,6 @@ U0 DistroPrep()

  Del("/Home/Demo*");
  DelTree("/Home/*Tmp.DD.Z");
-  if (FileFind("/Home/Sup1/Sup1Hymns"))
-    DistroSongsPrep;

  DelTree("/Tmp");
  DirMk("/Tmp");
@@ -97,22 +67,12 @@ U0 DistroPrep()

  DelTree("/Demo/AcctExample");
  CopyTree("/Home","/Demo/AcctExample");
-  DelTree("/Demo/AcctExample/Private");
+  DelTree("/Demo/AcctExample/TAD");
  DelTree("/Demo/AcctExample/Sup1");
-  DelTree("/Demo/AcctExample/Books1");
-  DelTree("/Demo/AcctExample/Books2");
-  DelTree("/Demo/AcctExample/Web");
  Del("/Demo/AcctExample/Test*");
-  Copy("/Home/Web/index.DD.Z",
-	"/Demo/ToHtmlToTXTDemo/DemoInPage.DD.Z");
  if (FileFind("~/Sup1/Sup1Utils/SortHeaders.HC.Z"))
    ExeFile("~/Sup1/Sup1Utils/SortHeaders.HC.Z");

-  if (FileFind("~/Sup1/Sup1Blog/YouTube.DD.Z"))
-    Sort("~/Sup1/Sup1Blog/YouTube.DD.Z",,2);
-
-  //Once in a while, do ~/Sup1/Sup1Utils/DblSpaceScan.HC.
-
  CursorRem("/*");
  DelTree("/Demo/*.BI*");
  S2T("/*","+r+S");
@@ -155,81 +115,6 @@ U0 DbgDistroFilePrep()
 	bd->RAM_dsk,(bd->max_blk+1)<<BLK_SIZE_BITS);
 }

-U0 MakeSymFiles()
-{
-  CDoc *doc;
-  U8 *st;
-
-  DocClear;
-  DocMax;
-  HashTablePurge(adam_task->hash_table);
-  Who;
-  if (doc=DocPut) {
-    st=StrNew(doc->filename.name);
-    StrCpy(doc->filename.name,"D:/Wb/Home/Web/SymsAlpha.DD.Z");
-    DocWrite(doc);
-    StrCpy(doc->filename.name,st);
-    Free(st);
-  }
-  DocClear;
-  DocMax;
-  Who("+m");
-  if (doc=DocPut) {
-    st=StrNew(doc->filename.name);
-    StrCpy(doc->filename.name,"D:/Wb/Home/Web/SymsAddress.DD.Z");
-    DocWrite(doc);
-    StrCpy(doc->filename.name,st);
-    Free(st);
-  }
-  DocClear;
-}
-
-I64 MakeLineRepFile()
-{
-  U8 *st;
-  CDoc *doc;
-  I64 res,official;
-
-  DocClear;
-  Drv('C');
-  DistroPrep;
-
-  Cd("C:/");
-  DelTree("B:/TOS/TOS");
-  CopyTree("C:/Home","B:/TOS/TOS");
-  DelTree("C:/Home");
-
-  DocMax;
-  DocClear;
-  res=LineRep;
-  if (doc=DocPut) {
-    st=StrNew(doc->filename.name);
-    StrCpy(doc->filename.name,"B:/TOS/TOS/Web/LineRep.DD.Z");
-    DocWrite(doc);
-    StrCpy(doc->filename.name,st);
-    Free(st);
-  }
-  DocClear;
-  official=LineRep("C:/*","-r")+
-	LineRep("C:/Adam/*")+
-	LineRep("C:/Compiler/*","-S+$$")+
-	LineRep("C:/Kernel/*");
-  DocClear;
-  CopyTree("B:/TOS/TOS","C:/Home");
-  DelTree("B:/TOS/TOS");
-
-  DocTreeFWrite("C:/Adam/ADefine.HC.Z","LineRep",
-	"DefinePrint(\"DD_TEMPLEOS_LOC\",\"%,d\");\n",res);
-  DocTreeFAppend("C:/Adam/ADefine.HC.Z","LineRep",
-	"DefinePrint(\"DD_TEMPLEOS_LOC_OFFICIAL\",\"%,d\");\n",official);
-
-  DefinePrint("DD_TEMPLEOS_LOC","%,d",res);
-  DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","%,d",official);
-
-  "Total LOC:%12,d\n\n",res;
-  return res;
-}
-
 U0 StaffDistroPrep()
 {
  Drv('C');
@@ -240,15 +125,12 @@ U0 StaffDistroPrep()
  DelTree(TOS_DISTRO_DIR);
  CopyTree("C:/",TOS_DISTRO_DIR "/");
  DelTree(TOS_DISTRO_DIR "/Home/Sup1");
-  DelTree(TOS_DISTRO_DIR "/Home/Books1");
-  DelTree(TOS_DISTRO_DIR "/Home/Books2");
  Del(TOS_DISTRO_DIR "/" KERNEL_BIN_C);
 }
 U0 MakeStaffDistro()
 {
  StaffDistroPrep;
-  ISO9660ISO(TOS_ISO_NAME,TOS_DISTRO_DIR "/*",,
-	TOS_DISTRO_DIR BOOT_DIR_KERNEL_BIN_C);
+  RedSeaISO(TOS_ISO_NAME,TOS_DISTRO_DIR,TOS_DISTRO_DIR BOOT_DIR_KERNEL_BIN_C);
  DefinePrint("DD_TEMPLEOS_STAFF_SIZE",
 	"Download $TX,"TempleOS V5.03",D="DD_OS_NAME_VERSION"$ - T.S. Company Internal Distro (%0.1fMB)",
 	0.1*(10*Size(TOS_ISO_NAME,"+s")/1024/1024));
@@ -274,8 +156,7 @@ U0 DbgDistroPrep()
 U0 MakeDbgDistro()
 {
  DbgDistroPrep;
-  ISO9660ISO(TOS_ISO_NAME,TOS_DISTRO_DIR "/*",,
-	TOS_DISTRO_DIR BOOT_DIR_KERNEL_BIN_C);
+  RedSeaISO(TOS_ISO_NAME,TOS_DISTRO_DIR,TOS_DISTRO_DIR BOOT_DIR_KERNEL_BIN_C);
  DefinePrint("DD_TEMPLEOS_DBG_SIZE",
 	"Download $TX,"TempleOS V5.03",D="DD_OS_NAME_VERSION"$ - Debug Distro (%0.1fMB)",
 	0.1*(10*Size(TOS_ISO_NAME,"+s")/1024/1024));
@@ -300,96 +181,49 @@ U0 StdDistroPrep()
 U0 MakeStdDistro()
 {
  StdDistroPrep;
-  ISO9660ISO(TOS_ISO_NAME,TOS_DISTRO_DIR "/*",,
-	TOS_DISTRO_DIR BOOT_DIR_KERNEL_BIN_C);
+  RedSeaISO(TOS_ISO_NAME,TOS_DISTRO_DIR,TOS_DISTRO_DIR BOOT_DIR_KERNEL_BIN_C);
  DefinePrint("DD_TEMPLEOSCD_SIZE",
 	"Download $TX,"TempleOS V5.03",D="DD_OS_NAME_VERSION"$ - Standard Distro (%0.1fMB)",
 	0.1*(10*Size(TOS_ISO_NAME,"+s")/1024/1024));
  Drv('C');
 }
-U0 MakeStdRedSeaDistro()
-{
-  StdDistroPrep;
-  RedSeaISO(TOS_ISO_C_NAME,TOS_DISTRO_DIR,TOS_DISTRO_DIR BOOT_DIR_KERNEL_BIN_C);
-  DefinePrint("DD_TEMPLEOSCD_RS_SIZE",
-	"Download $TX,"TempleOS V5.03",D="DD_OS_NAME_VERSION"$ - Standard RedSea Distro (%0.1fMB)",
-	0.1*(10*Size(TOS_ISO_C_NAME,"+s")/1024/1024));
-  Drv('C');
-}

-U0 UltraDistroPrep()
+I64 UpdateLineCnts()
 {
-  StdDistroPrep;
-  DelTree(TOS_DISTRO_DIR "/Linux");
-  Del(TOS_DISTRO_DIR "/" KERNEL_BIN_C);
-  Del(TOS_DISTRO_DIR "/Adam/AutoComplete/ACDefs.DATA*");
-  Del(TOS_DISTRO_DIR "/Misc/PCIDevices.DD.Z");
-  Del(TOS_DISTRO_DIR "/Misc/Bible.TXT.Z");
+  I64 res;

-  DelTree(TOS_DISTRO_DIR "/Apps");
-  DirMk(TOS_DISTRO_DIR "/Apps");
-  DelTree(TOS_DISTRO_DIR "/Demo");
-  DelTree(TOS_DISTRO_DIR "/Misc/Tour");
-  Del(TOS_DISTRO_DIR "/" KERNEL_BIN_C);
-  Del(TOS_DISTRO_DIR "/Adam/AutoComplete/ACWords.DATA*");
-  Del(TOS_DISTRO_DIR "/Adam/God/Vocab.DD.Z");
-  Del(TOS_DISTRO_DIR "/Misc/OSTestSuite.HC.Z");
-  Copy("C:/Home/Sup1/Sup1Distro/UltraMenu.DD.Z",
-	TOS_DISTRO_DIR "/PersonalMenu.DD.Z");
-  Copy("C:/Demo/Games/Talons.HC.Z",
-	TOS_DISTRO_DIR "/Misc");
-}
-U0 MakeUltraDistro()
-{
-  UltraDistroPrep;
-  ISO9660ISO(TOS_ISO_NAME,TOS_DISTRO_DIR "/*",,
-	TOS_DISTRO_DIR BOOT_DIR_KERNEL_BIN_C);
-  DefinePrint("DD_TEMPLEOS_ULTRA_SIZE",
-	"Download $TX,"TempleOS V5.03",D="DD_OS_NAME_VERSION"$ - UltraSmall Distro (%0.2fMB)",
-	0.01*(100*Size(TOS_ISO_NAME,"+s")/1024/1024));
-  Drv('C');
-}
-U0 MakeUltraRedSeaDistro()
-{
-  UltraDistroPrep;
-  RedSeaISO(TOS_ISO_C_NAME,TOS_DISTRO_DIR,TOS_DISTRO_DIR BOOT_DIR_KERNEL_BIN_C);
-  DefinePrint("DD_TEMPLEOS_ULTRA_RS_SIZE",
-	"Download $TX,"TempleOS V5.03",D="DD_OS_NAME_VERSION"$ - UltraSmall RedSea Distro (%0.2fMB)",
-	0.01*(100*Size(TOS_ISO_C_NAME,"+s")/1024/1024));
+  DocClear;
  Drv('C');
+  DistroPrep;
+
+  Cd("C:/");
+  DelTree("B:/TOS/TOS");
+  CopyTree("C:/Home","B:/TOS/TOS");
+  DelTree("C:/Home");
+
+  DocMax;
+  DocClear;
+  res=LineRep("C:/*","-r")+LineRep("C:/Adam/*")+
+	LineRep("C:/Compiler/*","-S+$$")+LineRep("C:/Kernel/*");
+  CopyTree("B:/TOS/TOS","C:/Home");
+  DelTree("B:/TOS/TOS");
+
+  DocTreeFWrite("C:/Adam/ADefine.HC.Z","LineRep",
+	"DefinePrint(\"DD_TEMPLEOS_LOC\",\"%,d\");\n",res);
+  DefinePrint("DD_TEMPLEOS_LOC","%,d",res);
+
+  "Total LOC:%12,d\n\n",res;
+  return res;
 }

 U0 UpdateISODocDefines()
 {
  try {
-#if MAKE_STD
    DefinePrint("DD_TEMPLEOSCD_SIZE",
 	  "Download $TX,"TempleOS V5.03",D="DD_OS_NAME_VERSION"$ - Standard Distro (%0.1fMB)",
-	  0.1*(10*Size("D:/Wb/TempleOSCD.ISO","+s")/1024/1024));
+	  0.1*(10*Size("D:/TOS_Distro.ISO","+s")/1024/1024));
    DefinePrint("DD_TEMPLEOSCD_K_SIZE",
-	  "%dKB",Size("D:/Wb/TempleOSCD.ISO","+s")/1024);
-#endif
-#if MAKE_STD_RS
-    DefinePrint("DD_TEMPLEOSCD_RS_SIZE",
-	  "Download $TX,"TempleOS V5.03",D="DD_OS_NAME_VERSION"$ - Standard RedSea Distro (%0.1fMB)",
-	  0.1*(10*Size("D:/Wb/TempleOSCDRS.ISO","+s")/1024/1024));
-    DefinePrint("DD_TEMPLEOSCD_RS_K_SIZE",
-	  "%dKB",Size("D:/Wb/TempleOSCDRS.ISO","+s")/1024);
-#endif
-#if MAKE_ULTRA
-    DefinePrint("DD_TEMPLEOS_ULTRA_SIZE",
-	  "Download $TX,"TempleOS V5.03",D="DD_OS_NAME_VERSION"$ - UltraSmall Distro (%0.2fMB)",
-	  0.01*(100*Size("D:/Wb/TempleOSUltra.ISO","+s")/1024/1024));
-    DefinePrint("DD_TEMPLEOS_ULTRA_K_SIZE",
-	  "%dKB",Size("D:/Wb/TempleOSUltra.ISO","+s")/1024);
-#endif
-#if MAKE_ULTRA_RS
-    DefinePrint("DD_TEMPLEOS_ULTRA_RS_SIZE",
-	  "Download $TX,"TempleOS V5.03",D="DD_OS_NAME_VERSION"$ - UltraSmall RedSea Distro (%0.2fMB)",
-	  0.01*(100*Size("D:/Wb/TempleOSUltraRS.ISO","+s")/1024/1024));
-    DefinePrint("DD_TEMPLEOS_ULTRA_RS_K_SIZE",
-	  "%dKB",Size("D:/Wb/TempleOSUltraRS.ISO","+s")/1024);
-#endif
+	  "%dKB",Size("D:/TOS_Distro.ISO","+s")/1024);
  } catch
    Fs->catch_except=TRUE;
 }
@@ -405,8 +239,7 @@ U0 TOSProgress(U8 *st)
  progress4=tos_progress;
  progress3_max=1;
  *progress4_desc=0;
-  progress4_max=13+MAKE_STD+MAKE_STD_RS+MAKE_ULTRA+MAKE_ULTRA_RS+MAKE_SUP1+
-	MAKE_WEB+MAKE_BOOKS1+MAKE_BOOKS2+MAKE_DBG+MAKE_STAFF+PROFANITY_CHK;
+  progress4_max=8+MAKE_DBG+MAKE_STAFF;
  progress4_t0=tos_progress_t0;
  StrPrint(buf,"%d. %s",++progress4,st);
  "$$PURPLE$$$$TX+CX,\"%s\"$$$$FG$$\n",buf;
@@ -414,31 +247,7 @@ U0 TOSProgress(U8 *st)
  tos_progress=progress4;
 }

-I64 TOSProfanity()
-{
-  I64 res;
-  if (res=Profanity(,"D:/Wb/*;"
-	"!*/Misc/PCIDevices.DD*;!*/Misc/Bible.TXT*;"
-	"!*/Books?/*;!*/Sup1/Sup1Words/*;!*/Sup1/Sup1Blog/Profanity.DD*;"
-	"!*/Sup1/Sup1Blog/NumBible.TXT*;!*/God/Vocab.DD*")) {
-    while (PressAKey!=CH_SHIFT_ESC) {
-      ProgressBarsRst;
-      if (Profanity(,"C:/Home/*;"
-	    "!*/Misc/PCIDevices.DD*;!*/Misc/Bible.TXT*;"
-	    "!*/Books?/*;!*/Sup1/Sup1Words/*;!*/Sup1/Sup1Blog/Profanity.DD*;"
-	    "!*/Sup1/Sup1Blog/NumBible.TXT*;!*/God/Vocab.DD*")) {
-	"\n\nEdit profanity and press $FG,2$ESC$FG$.\n";
-	if (!View)
-	  break;
-	DocBottom;
-      } else
-	break;
-    }
-  }
-  return res;
-}
-
-U0 TOSRegen3()
+U0 TOSRegen2()
 {
  I64 slash_home=0;
  SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
@@ -452,71 +261,31 @@ U0 TOSRegen3()
  WinMax;
  DskChkAll;

-  TOSProgress("Make LineRep");
-  MakeLineRepFile;
+  TOSProgress("Update Line Cnts");
+  UpdateLineCnts;

  TOSProgress("Copy C to D");
  TOSCopyDrv('C','D');

-  TOSProgress("Del D:/Wb");
-  DelTree ("D:/Wb");
-
-  TOSProgress("Copy C to D:/Wb");
-  CopyTree("C:/","D:/Wb");
-  DocClear;
-
-#if MAKE_STD
  TOSProgress("Make Standard Distro ISO");
  MakeStdDistro;
  DocClear;
-  Move(TOS_ISO_NAME,"D:/Wb/TempleOSCD.ISO");
-#endif
-#if MAKE_STD_RS
-  TOSProgress("Make Standard RedSea Distro ISO");
-  MakeStdRedSeaDistro;
-  DocClear;
-  Move(TOS_ISO_C_NAME,"D:/Wb/TempleOSCDRS.ISO");
-#endif
-#if MAKE_ULTRA
-  TOSProgress("Make Ultra Distro ISO");
-  MakeUltraDistro;
-  DocClear;
-  Move(TOS_ISO_NAME,"D:/Wb/TempleOSUltra.ISO");
-#endif
-#if MAKE_ULTRA_RS
-  TOSProgress("Make Ultra RedSea Distro ISO");
-  MakeUltraRedSeaDistro;
-  DocClear;
-  Move(TOS_ISO_C_NAME,"D:/Wb/TempleOSUltraRS.ISO");
-#endif
+  Move(TOS_ISO_NAME,"D:/TOS_Distro.ISO");
+
+  TOSProgress("Make Supplemental1 ISO");
+  RedSeaISO("D:/TOS_Supplemental1","C:/Home/Sup1");
+
 #if MAKE_DBG
  TOSProgress("Make Dbg Distro ISO");
  MakeDbgDistro;
  DocClear;
-  Move(TOS_ISO_NAME,"D:/Wb/TempleOSDbg.ISO");
+  Move(TOS_ISO_NAME,"D:/TOS_Dbg.ISO");
 #endif
 #if MAKE_STAFF
  TOSProgress("Make Staff Distro ISO");
  MakeStaffDistro;
  DocClear;
-  Move(TOS_ISO_NAME,"D:/Wb/TempleOSStaff.ISO");
-#endif
-
-#if MAKE_SUP1
-  TOSProgress("Make Supplemental #1 ISO");
-  RedSeaISO("D:/Wb/TempleOSSup1","C:/Home/Sup1");
-#endif
-#if MAKE_WEB
-  TOSProgress("Make www.templeos.org ISO");
-  RedSeaISO("D:/Wb/TempleOSWeb","C:/Home/Web");
-#endif
-#if MAKE_BOOKS1
-  TOSProgress("Make Books #1 ISO");
-  RedSeaISO("D:/Wb/TempleOSBooks1","C:/Home/Books1");
-#endif
-#if MAKE_BOOKS2
-  TOSProgress("Make Books #2 ISO");
-  RedSeaISO("D:/Wb/TempleOSBooks2","C:/Home/Books2");
+  Move(TOS_ISO_NAME,"D:/TOS_Staff.ISO");
 #endif

  UpdateISODocDefines;
@@ -532,21 +301,6 @@ U0 TOSRegen3()
  if (LinkChk)
    throw;

-  DocClear;
-  TOSProgress("Make Symbol Files");
-  MakeSymFiles;
-
-  DocClear;
-  TOSProgress("Freshen WebSite");
-  FreshenSite;
-
-#if PROFANITY_CHK
-  DocClear;
-  TOSProgress("Check WebSite for Profanity");
-  if (TOSProfanity)
-    throw;
-#endif
-
  TOSProgress("Find /Home");
  slash_home=F2("/Home","-i+la");

@@ -563,53 +317,18 @@ U0 TOSRegen3()

 public U0 TOSPreRegen()
 {//Copy bookmarks and bins from D:/Home/Sup1 to C:/Home/Sup1
-  Copy("D:/Home/Private/*","C:/Home/Private");
-  Copy("D:/Home/Sup1/Sup1Blog/Bookmarks.html","C:/Home/Sup1/Sup1Blog");
-  Del("C:/Home/Sup1/Sup1Bin/*");
-  Copy("D:/Home/Sup1/Sup1Bin/*","C:/Home/Sup1/Sup1Bin");
+  Copy("D:/Home/" INS_REG_PERSONAL_INITIALS "/*",
+	"C:/Home/" INS_REG_PERSONAL_INITIALS);
+  DelTree("C:/Home/Sup1/Sup1Bin");
+  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");
-}
-
-public U0 TOSHomeIn()
-{//Copy D:/Home to C:/Home
-  DelTree("C:/Home");
-  CopyTree("D:/Home","C:/Home");
-}
-
-public U0 TOSHomeOut()
-{//Copy C:/Home to D:/Home
-  DelTree("D:/Home");
-  CopyTree("C:/Home","D:/Home");
-}
-
-public U0 TOSSongsIn()
-{//Copy songs from D:/Home/Sup1 to C:/Home/Sup1
-  Del("C:/Home/Sup1/Sup1Hymns/*");
-  Del("C:/Home/Sup1/Sup1Songs/*");
-  Copy("D:/Home/Sup1/Sup1Hymns/*","C:/Home/Sup1/Sup1Hymns");
-  Copy("D:/Home/Sup1/Sup1Songs/*","C:/Home/Sup1/Sup1Songs");
-}
-
-public U0 TOSSongsOut()
-{//Copy songs from C:/Home/Sup1 to D:/Home/Sup1
-  Del("D:/Home/Sup1/Sup1Hymns/*");
-  Del("D:/Home/Sup1/Sup1Songs/*");
-  Copy("C:/Home/Sup1/Sup1Hymns/*","D:/Home/Sup1/Sup1Hymns");
-  Copy("C:/Home/Sup1/Sup1Songs/*","D:/Home/Sup1/Sup1Songs");
-}
-
-U0 TOSRegen2()
-{
-  TOSChgLog; //$LK,"::/Doc/ChgLog.DD"$ datetime matches Kernel $LK,"sys_compile_time",A="MN:sys_compile_time"$.
-  TOSBootHDIns('C');
-  Once("TOSRegen3;");
-  BootRAM("C:/Kernel/" KERNEL_BIN_C); //Boot new Kernel and Compiler.
+  DelTree("C:/Linux");
+  CopyTree("D:/Linux","C:/Linux");
 }

 public U0 TOSRegen()
-{//Generate distro ISO's and website image, D:/Wb.
+{//Generate distro ISO's
  TOSBootHDIns('C');
  Once("TOSRegen2;");
  BootRAM("C:/Kernel/" KERNEL_BIN_C); //Boot to load $LK,"TOS_CFG",A="PF:::/Demo/AcctExample/TOS/TOSCfg.HC,TOS_CFG"$.
@@ -21,7 +21,7 @@
 class CRandExtDec5Form
 {
  I64	timestamp;
-  U8	rnd0[512]	fmtstr "$$DA-P,A=\"5 Decimal Digits from Hex:%s\"$$\n";
+  U8	rnd0[512]	format "$$DA-P,A=\"5 Decimal Digits from Hex:%s\"$$\n";
  U8	rnd1[512];
  U8	rnd2[512];
  U8	rnd3[512];
@@ -39,43 +39,43 @@ class CRandExtDec5Form
 class CHexWordForm
 {
  I64	timestamp;
-  U8	rnd0[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#0:%s\"$$\n";
-  U8	rnd1[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#1:%s\"$$\n";
-  U8	rnd2[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#2:%s\"$$\n";
-  U8	rnd3[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#3:%s\"$$\n";
-  U8	rnd4[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#4:%s\"$$\n";
-  U8	rnd5[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#5:%s\"$$\n";
-  U8	rnd6[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#6:%s\"$$\n";
-  U8	rnd7[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#7:%s\"$$\n";
-  U8	rnd8[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#8:%s\"$$\n";
-  U8	rnd9[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#9:%s\"$$\n";
-  U8	rndA[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#A:%s\"$$\n";
-  U8	rndB[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#B:%s\"$$\n";
+  U8	rnd0[512]	format "$$DA-P,A=\"Hex Word Indices#0:%s\"$$\n";
+  U8	rnd1[512]	format "$$DA-P,A=\"Hex Word Indices#1:%s\"$$\n";
+  U8	rnd2[512]	format "$$DA-P,A=\"Hex Word Indices#2:%s\"$$\n";
+  U8	rnd3[512]	format "$$DA-P,A=\"Hex Word Indices#3:%s\"$$\n";
+  U8	rnd4[512]	format "$$DA-P,A=\"Hex Word Indices#4:%s\"$$\n";
+  U8	rnd5[512]	format "$$DA-P,A=\"Hex Word Indices#5:%s\"$$\n";
+  U8	rnd6[512]	format "$$DA-P,A=\"Hex Word Indices#6:%s\"$$\n";
+  U8	rnd7[512]	format "$$DA-P,A=\"Hex Word Indices#7:%s\"$$\n";
+  U8	rnd8[512]	format "$$DA-P,A=\"Hex Word Indices#8:%s\"$$\n";
+  U8	rnd9[512]	format "$$DA-P,A=\"Hex Word Indices#9:%s\"$$\n";
+  U8	rndA[512]	format "$$DA-P,A=\"Hex Word Indices#A:%s\"$$\n";
+  U8	rndB[512]	format "$$DA-P,A=\"Hex Word Indices#B:%s\"$$\n";
  I64	cert;
 };

 class CNISTBeaconHexWordForm
 {
-  I64	timestamp	fmtstr "$$DA,A=\"TimeStamp:%d\"$$\n";
-  U8	rnd0[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#0:%s\"$$\n";
-  U8	rnd1[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#1:%s\"$$\n";
-  U8	rnd2[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#2:%s\"$$\n";
-  U8	rnd3[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#3:%s\"$$\n";
-  U8	rnd4[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#4:%s\"$$\n";
-  U8	rnd5[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#5:%s\"$$\n";
-  U8	rnd6[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#6:%s\"$$\n";
-  U8	rnd7[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#7:%s\"$$\n";
-  U8	rnd8[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#8:%s\"$$\n";
-  U8	rnd9[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#9:%s\"$$\n";
-  U8	rndA[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#A:%s\"$$\n";
-  U8	rndB[512]	fmtstr "$$DA-P,A=\"Hex Word Indices#B:%s\"$$\n";
+  I64	timestamp	format "$$DA,A=\"TimeStamp:%d\"$$\n";
+  U8	rnd0[512]	format "$$DA-P,A=\"Hex Word Indices#0:%s\"$$\n";
+  U8	rnd1[512]	format "$$DA-P,A=\"Hex Word Indices#1:%s\"$$\n";
+  U8	rnd2[512]	format "$$DA-P,A=\"Hex Word Indices#2:%s\"$$\n";
+  U8	rnd3[512]	format "$$DA-P,A=\"Hex Word Indices#3:%s\"$$\n";
+  U8	rnd4[512]	format "$$DA-P,A=\"Hex Word Indices#4:%s\"$$\n";
+  U8	rnd5[512]	format "$$DA-P,A=\"Hex Word Indices#5:%s\"$$\n";
+  U8	rnd6[512]	format "$$DA-P,A=\"Hex Word Indices#6:%s\"$$\n";
+  U8	rnd7[512]	format "$$DA-P,A=\"Hex Word Indices#7:%s\"$$\n";
+  U8	rnd8[512]	format "$$DA-P,A=\"Hex Word Indices#8:%s\"$$\n";
+  U8	rnd9[512]	format "$$DA-P,A=\"Hex Word Indices#9:%s\"$$\n";
+  U8	rndA[512]	format "$$DA-P,A=\"Hex Word Indices#A:%s\"$$\n";
+  U8	rndB[512]	format "$$DA-P,A=\"Hex Word Indices#B:%s\"$$\n";
  I64	cert;
 };

 class CRandHex5Form
 {
  I64	timestamp;
-  U8	rnd0[512]	fmtstr "$$DA-P-TRM,LEN=5,"
+  U8	rnd0[512]	format "$$DA-P-TRM,LEN=5,"
 	"A=\"Line (5-Digit Hex):%5s\"$$\n";
  U8	rnd1[512];
  U8	rnd2[512];
@@ -94,7 +94,7 @@ class CRandHex5Form
 class CRandHex8Form
 {
  I64	timestamp;
-  U8	rnd0[512]	fmtstr "$$DA-P-TRM,LEN=8,"
+  U8	rnd0[512]	format "$$DA-P-TRM,LEN=8,"
 	"A=\"Line (8-Digit Hex):%8s\"$$\n";
  U8	rnd1[512];
  U8	rnd2[512];
@@ -113,7 +113,7 @@ class CRandHex8Form
 class CMoviesForm
 {
  I64	timestamp;
-  U8	rnd0[512]	fmtstr "$$DA-P,"
+  U8	rnd0[512]	format "$$DA-P,"
 	"A=\"Movie #1-100 (2 Decimal Digits from Hex):%s\"$$\n";
  U8	rnd1[512];
  U8	rnd2[512];
@@ -132,7 +132,7 @@ class CMoviesForm
 class CPaintings100Form
 {
  I64	timestamp;
-  U8	rnd0[512]	fmtstr "$$DA-P,"
+  U8	rnd0[512]	format "$$DA-P,"
 	"A=\"Painting #00-99 (2 Decimal Digits from Hex):%s\"$$\n";
  U8	rnd1[512];
  U8	rnd2[512];
@@ -151,7 +151,7 @@ class CPaintings100Form
 class CPaintings1000Form
 {
  I64	timestamp;
-  U8	rnd0[512]	fmtstr "$$DA-P,"
+  U8	rnd0[512]	format "$$DA-P,"
 	"A=\"Painting #000-999 (3 Decimal Digits from Hex):%s\"$$\n";
  U8	rnd1[512];
  U8	rnd2[512];
@@ -170,7 +170,7 @@ class CPaintings1000Form
 class CPoems100Form
 {
  I64	timestamp;
-  U8	rnd0[512]	fmtstr "$$DA-P,"
+  U8	rnd0[512]	format "$$DA-P,"
 	"A=\"Poems #00-99 (2 Decimal Digits from Hex):%s\"$$\n";
  U8	rnd1[512];
  U8	rnd2[512];
@@ -189,7 +189,7 @@ class CPoems100Form
 class CMetallicaForm
 {
  I64	timestamp;
-  U8	rnd0[512]	fmtstr "$$DA-P,"
+  U8	rnd0[512]	format "$$DA-P,"
 	"A=\"Song #1-99 (2 Decimal Digits from Hex):%s\"$$\n";
  U8	rnd1[512];
  U8	rnd2[512];
@@ -208,7 +208,7 @@ class CMetallicaForm
 class CCertRandDec5Form
 {
  I64	timestamp;
-  U8	rnd0[512]	fmtstr "$$DA-P,A=\"Line (Dec):%s\"$$\n";
+  U8	rnd0[512]	format "$$DA-P,A=\"Line (Dec):%s\"$$\n";
  U8	rnd1[512];
  U8	rnd2[512];
  U8	rnd3[512];
@@ -220,57 +220,83 @@ class CCertRandDec5Form
  U8	rnd9[512];
  U8	rndA[512];
  U8	rndB[512];
-  I64	cert		fmtstr "$$DA,A=\"Certificate:%d\"$$\n";
+  I64	cert		format "$$DA,A=\"Certificate:%d\"$$\n";
 };

 class CGodVideoForm
 {
-  U8	title[STR_LEN]	fmtstr "$$DA-P,A=\"Title:%s\"$$\n";
-  U8	serial[STR_LEN] fmtstr "$$DA-P-TRM,LEN=11,A=\"SerialNum:%11s\"$$\n";
-  I64	min		fmtstr "$$DA,A=\"Minutes:%d\"$$\n";
-  I64	sec		fmtstr "$$DA,A=\"Seconds:%d\"$$\n";
+  U8	title[STR_LEN]	format "$$DA-P,A=\"Title:%s\"$$\n";
+  U8	serial[STR_LEN] format "$$DA-P-TRM,LEN=11,A=\"SerialNum:%11s\"$$\n";
+  I64	min		format "$$DA,A=\"Minutes:%d\"$$\n";
+  I64	sec		format "$$DA,A=\"Seconds:%d\"$$\n";
 };

 class CWebBibleForm
 {
-  U8	tag[STR_LEN]	fmtstr "$$DA-P,A=\"Tag Text:%s\"$$\n";
-  U8	special[STR_LEN] fmtstr "$$DA-P,A=\"Bible Passage:%s\"$$\n";
+  U8	tag[STR_LEN]	format "$$DA-P,A=\"Tag Text:%s\"$$\n";
+  U8	special[STR_LEN] format "$$DA-P,A=\"Bible Passage:%s\"$$\n";
  I64	min;
  I64	sec;
 };

 class CYouTubeForm
 {
-  U8	tag[STR_LEN]	fmtstr "$$DA-P,A=\"Title:%s\"$$\n";
-  U8	special[STR_LEN] fmtstr "$$DA-P-TRM,LEN=11,A=\"SerialNum:%11s\"$$\n";
-  I64	min		fmtstr "$$DA,A=\"Minutes:%d\"$$\n";
-  I64	sec		fmtstr "$$DA,A=\"Seconds:%d\"$$\n";
+  U8	tag[STR_LEN]	format "$$DA-P,A=\"Title:%s\"$$\n";
+  U8	special[STR_LEN] format "$$DA-P-TRM,LEN=11,A=\"SerialNum:%11s\"$$\n";
+  I64	min		format "$$DA,A=\"Minutes:%d\"$$\n";
+  I64	sec		format "$$DA,A=\"Seconds:%d\"$$\n";
 };

 class CImgurForm
 {
  U8	tag[STR_LEN];
-  U8	special[STR_LEN] fmtstr "$$DA-P,A=\"SerialNum:%s\"$$\n";
-  I64	min		fmtstr "$$DA,A=\"Width    :%d\"$$\n";
-  I64	sec		fmtstr "$$DA,A=\"Height   :%d\"$$\n";
+  U8	special[STR_LEN] format "$$DA-P,A=\"SerialNum:%s\"$$\n";
+  I64	min		format "$$DA,A=\"Width    :%d\"$$\n";
+  I64	sec		format "$$DA,A=\"Height   :%d\"$$\n";
 };

 class CWikipediaForm
 {
-  U8	tag[STR_LEN]	fmtstr "$$DA-P,A=\"Tag Text:%s\"$$\n";
-  U8	special[STR_LEN] fmtstr "$$DA-P,A=\"Index   :%s\"$$\n";
+  U8	tag[STR_LEN]	format "$$DA-P,A=\"Tag Text:%s\"$$\n";
+  U8	special[STR_LEN] format "$$DA-P,A=\"Index   :%s\"$$\n";
  I64	min;
  I64	sec;
 };

 class CWebBookMarkForm
 {
-  U8	tag[STR_LEN]	fmtstr "$$DA-P,A=\"Tag Text:%s\"$$\n";
+  U8	tag[STR_LEN]	format "$$DA-P,A=\"Tag Text:%s\"$$\n";
  U8	special[STR_LEN];
  I64	min;
  I64	sec;
 };

+DefineLstLoad("ST_FAMLY_PHOTOS","Family1_58-78\0Family2_78-86\0"
+	"Family3_86-99\0Family4_99\0");
+
+class CFamilyPhotoForm
+{
+  I64	volume		format	"$$LS,D=\"ST_FAMLY_PHOTOS\"$$\n";
+  I64	part		format	"$$DA,A=\"Part   :%d\"$$\n";
+  U8	picture[STR_LEN] format	"$$DA-P,A=\"Picture:%s\"$$\n";
+  I64	width		format	"$$GREEN$$640x427 or 640x960$$FG$$\n"
+				"$$DA,A=\"Width  :%d\"$$\n";
+  I64	height		format	"$$DA,A=\"Height :%d\"$$\n";
+};
+
+class CBlogImgForm
+{
+  U8	picture[STR_LEN] format "$$DA-P,A=\"Picture:%s\"$$\n";
+  I64	width		format "$$DA,A=\"Width  :%d\"$$\n";
+  I64	height		format "$$DA,A=\"Height :%d\"$$\n";
+};
+
+class CBlogVideoForm
+{
+  U8	video[STR_LEN]	format "$$DA-P,A=\"Video:%s\"$$\n";
+  Bool	big		format "$$CB,\"Big\"$$\n";
+};
+
 extern U0 FreshenBlog();
 extern U0 GodBooksPassageU32(U32 rand_u32,U8 *files_find_mask,
 	U8 *file_mask="*",I64 len=512,I64 verbosity=GBP_MEDIUM);
@@ -1,64 +1,41 @@
 #help_index "Misc/TOS"

-#define VIDEO_FRAME_RATE	29.97
-
-#define FG_JUST_AUDIO	0
-#define FG_BOOT_DRV	1
-#define FG_RAM_DRV	2
-I64	fg_mode=FG_RAM_DRV;
 Bool	fg_on =FALSE;

-U0 FrameGrabberTask(I64)
-{//#!/bin/bash
-//for f in ./ScrnShots/*.Z; do ./Bin/TOSZ $$f; done
-  //ffmpeg -r 8 -i VID%05d.BMP -y Movie.avi
-  I64 frame_num=0;
-  U8  buf[STR_LEN],buf2[STR_LEN],*st_dir;
-  F64 end_time=tS;
-  Silent;	//no output to scrn
-  if (fg_mode==FG_RAM_DRV)
-    st_dir="B:/Tmp/ScrnShots";
-  else
-    st_dir="::/Tmp/ScrnShots";
-  DirMk(st_dir);
-  while (fg_on) {
-    StrPrint(buf,"%s/VID%05d.BMP.Z",st_dir,frame_num++);
-    StrCpy(buf2,buf);
-    BMPScrnCapture(buf);
-    while (TRUE) {
-      end_time+=1.0/VIDEO_FRAME_RATE;
-      if (end_time<tS) {
-	StrPrint(buf,"%s/VID%05d.BMP.Z",st_dir,frame_num++);
-	Copy(buf2,buf);
-      } else
-	break;
-    }
-    SleepUntil(cnts.jiffies+(end_time-tS)*JIFFY_FREQ);
-  }
-}
-
-I64 CopyVideo()
+I64 CopyVideo(Bool reverb)
 {
  I64 res=0;
-  Del("D:/Tmp/*.SND");
-  if (fg_mode==FG_JUST_AUDIO)
-    SndFileCreate("D:/Tmp/Audio",0.115,0.0,WF_SQUARE,0.45,0.35,2.5);
-  else {
-    SndFileCreate("D:/Tmp/Audio",0.115,0.0,WF_SQUARE,0.45,0.35);
-    DelTree("D:/Tmp/ScrnShots");
-    if (fg_mode==FG_RAM_DRV) {
-      res=CopyTree("B:/Tmp/ScrnShots","D:/Tmp/ScrnShots");
-      "Unused Space: %12.6fMeg\n",DrvUnused('B')/1024.0/1024.0;
-    } else
-      res=CopyTree("::/Tmp/ScrnShots","D:/Tmp/ScrnShots");
-    "$$BK,1$$Files Copied:%d$$BK,0$$ Time:%8.3fm\n",
-	  res,res/60.0/VIDEO_FRAME_RATE;
+  F64 delay=0,intensity=0;
+  Bool old_silent=Silent;
+  if (reverb) {
+    delay=0.45;
+    intensity=0.35;
  }
+  Del("D:/Tmp/*.SND");
+  Del("D:/Tmp/*.MV");
+  Silent(old_silent);
+  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;
 }

-public U0 FrameGrabberToggle()
-{//The frame grabber saves BMP files to D:/Tmp/ScrnShots.
+#help_index "Misc/TOS"
+U0 DelScrnShots()
+{
+  Bool old_silent=Silent;
+  DelTree("B:/Tmp");
+  DirMk("B:/Tmp");
+  Del("D:/Tmp/*.SND");
+  Del("D:/Tmp/*.MV");
+  Del("C:/Tmp/*.SND");
+  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 GR files to B:/Tmp.
  static F64 last_time=0;
  if (tS-last_time>3.0) {
    last_time=tS;
@@ -66,34 +43,42 @@ public U0 FrameGrabberToggle()
      fg_on=FALSE;
      Snd;
      wall->record=snd.record=FALSE;
-      Sleep(1000);
-      User("CopyVideo;Exit;\n");
+      ScrnCast(OFF);
+      User("CopyVideo(%d);Exit;\n",reverb);
    } else {
+      DelScrnShots;
      fg_on=TRUE;
-      if (fg_mode!=FG_JUST_AUDIO)
-	Spawn(&FrameGrabberTask,NULL,"Frame Grabber");
+      if (!just_audio)
+	ScrnCast(ON);
      wall->record=snd.record=TRUE;
      Snd;
+      if (sync_tone) {Beep;}
+      if (tos_theme) {User("ExeFile(\"~/TOS/TOSTheme\");Exit;\n");}
    }
  }
 }

-public U0 JukeSong(I64 num)
+public U0 JukeSong(I64 num,I64 passes=2)
 {//Make movie of one song.
  if (!fg_on)
-    FrameGrabberToggle;
-  JukeSongsPuppet("~/Sup1/Sup1Hymns",,num,num+1);
+    FrameGrabberToggle(FALSE,FALSE,FALSE);
+  JukeSongsPuppet("~/Sup1/Sup1Hymns",passes,num,num+1);
  if (fg_on)
-    FrameGrabberToggle;
+    FrameGrabberToggle(FALSE,FALSE,TRUE);
 }

 public U0 JukeLines(I64 start_line,I64 end_line)
-{//Make movie of many lines of songs.
+{//Make movie of many lines of songs, starting at 0.
  if (!fg_on)
-    FrameGrabberToggle;
+    FrameGrabberToggle(FALSE,FALSE,FALSE);
  JukeSongsPuppet("~/Sup1/Sup1Hymns",,start_line*5,end_line*5);
  if (fg_on)
-    FrameGrabberToggle;
+    FrameGrabberToggle(FALSE,FALSE,TRUE);
+}
+
+public U0 TADHymn(I64 num)
+{//Make 2-lines of songs movie starting at 1.
+  JukeLines((num-1)*2,num*2);
 }

 public U0 DskChkAll()
@@ -150,41 +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);
-}
-
-U0 TOSTheme()
-{
-  if (!fg_on)
-    PopUp("Sleep(50);FrameGrabberToggle;");
-  ExeFile("~/Sup1/Sup1Graphics/TOS/TOSTheme.HC");
-  DocClear;
-}
-
 #define MEM_TEST_SIZE	1024*1024
 U0 MemTest()
 {
@@ -202,38 +152,3 @@ U0 MemTest()
    Yield;
  }
 }
-
-public I64 Profanity(
-	U8 *needle_filename="~/Sup1/Sup1Blog/Profanity.DD.Z",
-	U8 *files_find_mask="/*",U8 *fu_flags=NULL)
-{//Scan for profanity.
-  CCmpCtrl *cc;
-  I64 res=0;
-  if (FileFind(needle_filename)) {
-    cc=CmpCtrlNew(MStrPrint("#include \"%s\"",needle_filename));
-    while (Lex(cc))
-      if (cc->token==TK_IDENT)
-	res+=Find(cc->cur_str,files_find_mask,fu_flags);
-    CmpCtrlDel(cc);
-  }
-  return res;
-}
-
-U0 TOSChgLog2()
-{
-  InStr("\"Ed(\\\"::/Doc/ChgLog.DD.Z\\\");\n\";
-  Msg(MSG_KEY_DOWN_UP,0,SC_CURSOR_UP|SCF_CTRL);
-  Msg(MSG_KEY_DOWN_UP,0,SC_CURSOR_DOWN);
-  Msg(MSG_KEY_DOWN_UP,0,SC_CURSOR_DOWN);
-  Msg(MSG_KEY_DOWN_UP,0,SC_CURSOR_DOWN);
-  Msg(MSG_KEY_DOWN_UP,0,SC_CURSOR_DOWN);
-  Msg(MSG_KEY_DOWN_UP,CH_CTRLY,0);
-  Msg(MSG_KEY_DOWN_UP,0,SC_F6|SCF_ALT);
-  Msg(MSG_KEY_DOWN_UP,CH_ESC,0);"
-  "\"Exit;\n\";");
-}
-
-public U0 TOSChgLog()
-{//Opdate ChgLog file.
-  User("TOSChgLog2;\n");
-}
@@ -76,5 +76,5 @@ The flag arrays $LK,"doldoc.type_flags_form",A="MN:CDolDocGlbls"$, etc
 are useful.
 */

-DocProfile("::/Doc/ChgLog.DD",0);
-DocProfile("::/Doc/ChgLog.DD",DOCF_PLAIN_TEXT);
+DocProfile("::/Doc/Welcome.DD",0);
+DocProfile("::/Doc/Welcome.DD",DOCF_PLAIN_TEXT);
@@ -1,16 +1,16 @@
 class FDStruct
 {//Use <CTRL-l> and sel "Data", "List" or "Check Box"
-//to generate the fmtstrs.
-  F64 num1	fmtstr "$$DA-TRM,A=\"Float 1:%12.8f\"$$\n";
-  F64 num2	fmtstr "$$DA-TRM,A=\"Float 2:%12e\"$$\n";
-  I64 num3	fmtstr "$$DA-TRM,A=\"Int   1:0x%016X\"$$\n";
-  I64 num4	fmtstr "$$DA-TRM,A=\"Int   2:%12d\"$$\n";
-  I64 type	fmtstr "$$LS,D=\"ST_PERSON_TYPE\"$$\n";
-  U8  name[32]	fmtstr "$$DA-P,A=\"Name   :%s\"$$\n";
-  U8  *address1	fmtstr "$$DA+M,A=\"Address:%s\"$$\n"; //+M is unlimited len U8 *.
-  U8  *address2	fmtstr "$$DA+M,A=\"Address:%s\"$$\n"; //+M is unlimited len U8 *.
-  CDate datetime fmtstr "$$DA-TRM,A=\"Date   :%8D\"$$\n";
-  Bool	check	fmtstr "$$CB,\"Check\"$$\n";
+//to generate the formats.
+  F64 num1	format "$$DA-TRM,A=\"Float 1:%12.8f\"$$\n";
+  F64 num2	format "$$DA-TRM,A=\"Float 2:%12e\"$$\n";
+  I64 num3	format "$$DA-TRM,A=\"Int   1:0x%016X\"$$\n";
+  I64 num4	format "$$DA-TRM,A=\"Int   2:%12d\"$$\n";
+  I64 type	format "$$LS,D=\"ST_PERSON_TYPE\"$$\n";
+  U8  name[32]	format "$$DA-P,A=\"Name   :%s\"$$\n";
+  U8  *address1	format "$$DA+M,A=\"Address:%s\"$$\n"; //+M is unlimited len U8 *.
+  U8  *address2	format "$$DA+M,A=\"Address:%s\"$$\n"; //+M is unlimited len U8 *.
+  CDate datetime format "$$DA-TRM,A=\"Date   :%8D\"$$\n";
+  Bool	check	format "$$CB,\"Check\"$$\n";
 };

 U0 FormDemo()
@@ -3,9 +3,9 @@
 #define DB_ACCT_BLKS	1

 class Acct
-{//Use <CTRL-l> to help generate fmtstrs.
-  U8 name[32] fmtstr "$$DA-P,LEN=32,A=\"Name:%s\"$$\n";
-  U8 addr[64] fmtstr "$$DA-P,LEN=64,A=\"Addr:%s\"$$\n";
+{//Use <CTRL-l> to help generate formats.
+  U8 name[32] format "$$DA-P,LEN=32,A=\"Name:%s\"$$\n";
+  U8 addr[64] format "$$DA-P,LEN=64,A=\"Addr:%s\"$$\n";
  U8 pad[DB_ACCT_BLKS*BLK_SIZE-64-32];
 };

@@ -262,7 +262,7 @@ ti_restart:
      for (j=0;j<UNITS_NUM/2;j++) {
 	if (i!=j) {
 	  dd=SqrI64(u[i].x-u[j].x)+SqrI64(u[i].y-u[j].y);
-	  if (u[j].x<=u[i].x && dd<best_dd) {
+	  if ((u[j].x<u[i].x || u[j].king) && dd<best_dd ) {
 	    best_dd=dd;
 	    best=j;
 	  }
@@ -125,7 +125,7 @@ U0 FontEd()
 	  break;
 	case MSG_MS_L_DOWN:
 	case MSG_MS_R_DOWN:
-	  if (0<=arg1<FONT_WIDTH*16 && FONT_HEIGHT*2<=arg2<FONT_HEIGHT*16) {
+	  if (0<=arg1<FONT_WIDTH*16 && 0<=arg2-2*FONT_HEIGHT<FONT_HEIGHT*16) {
 	    cur_ch=(arg2/FONT_HEIGHT-2)*16+arg1/FONT_WIDTH;
 	    break;
 	  } //fall through
@@ -1,191 +1,11 @@
-$WW,1$$FG,5$$TX+CX,"The Temple Operating System"$$FG,0$
-$FG,4$
-$LK,"Download Operating System",A="FI:~/Web/DownloadOS.DD"$		$LK,"App Store",A="FI:~/Web/AppStore/AppStore.DD"$
+$WW,1$$FG,5$$TX+CX,"The Temple Operating System",HTML="http://www.templeos.org"$$FG,0$

-$FG,4$$TX,"Terry's Linux Bash Scripts for QEMU, VMware and VirtualBox",HTML="http://www.templeos.org/Wb/Home/Sup1/Sup1Bin"$
+$FG,4$$TX,"Downloads (100% Public Domain)",HTML="http://www.templeos.org/files"$$FG$

-$LK,"Screen Shots",A="FI:~/Web/ScrnShots.DD"$				$LK,"Instructional Videos",A="FI:~/Web/TOSVideos.DD"$
+TempleOS is a free, public domain, open source, x86_64, non-preemptive multi-tasking, multi-cored, ring-0-only, single-address-map (identity-mapped), non-networked, PC operating system.  Paging is, basically, not used.

-$LK,"Introduction",A="FI:::/Doc/Welcome.DD"$				$LK,"F.A.Q.",A="FI:::/Doc/FAQ.DD"$
+The CIA obsfucates to foil India, China, Russia and Korea.  They make things more complicated than necessary.  TempleOS is more simple than necessary.  It is obnoxiously simple.  If you look at this $TX,"\"Hello World\" joke",HTML="http://www.ariel.com.au/jokes/The_Evolution_of_a_Programmer.html"$, you can see why I capped the line count of TempleOS at 100,000.

-$LK,"Features",A="FI:::/Doc/Features.DD"$				$LK,"The Charter",A="FI:::/Doc/Charter.DD"$
+God said TempleOS must be perfect, so backward compatibility is not promised.

-$LK,"Source Code By File",A="FF:~/Web/LineRep.DD,KStart16.HC"$			$TX,"Source Code (Raw)",HTML="http://www.templeos.org/Wb/"$
-
-$TX,"Source Code By Sym",HTML="http://www.templeos.org/Wb/Home/Web/SymsAlpha.html"$			$TX,"Source Code By Address",HTML="http://www.templeos.org/Wb/Home/Web/SymsAddress.html"$
-	
-$LK,"TempleOS Credits",A="FI:::/Doc/Credits.DD"$			$LK,"History of TempleOS",A="FI:~/Web/History.DD"$
-
-$LK,"Why 640x480?",A="FI:~/Web/640x480.DD"$
-$FG$
-$LK,"Change Log",A="FI:::/Doc/ChgLog.DD"$				$LK,"Terry Davis",A="FI:~/Web/TAD/TAD.DD"$
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/JKPARXPvozk\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/JKPARXPvozk\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-The IRA beat Sherlock Holmes with the grace of God.  Ghandi was a faggot.  God said boys should be taught military things.
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/qGyPuey-1Jw\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/qGyPuey-1Jw\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-God said he wanted to "compact" the Jews.  God said Jews were guilty because they did not warn their brother sinners, so suffered their sin.  Reputation is worth more than gold.  Niggers have a reputation -- no fathers.  Irish have a reputation.  Germans have a reputation.  Attacker has the advantage.  Jews have a reputation.  God said the French once stood for character.  ($TX,"Code of Chivalry",HTML="http://www.lordsandladies.org/knights-code-of-chivalry.htm"$) Ironic.  I guess Jews did, too.  Woah!  God is boss.  Too bad the Jews were cowards and didn't assassinate NAZI's.
-
-CIA must surrender to the IRA.  They started a war on God. You die, CIA niggers.
-
-The CIA picked a fight with the IRA and God, a War on Terror to humiliate the Irish and attack the concept of God as represented by pathetic loser sand niggers.  Surrender, silly CIA niggers.  Yer fucked.  You started a war with God.  He talks.
-
-Saying the word, "pedophile", is an attack on Catholics and God, by those who hate children.
-
-We're not stupid.  You are.  God exists.  Yer fucked, CIA niggers.
-
-Saying the word, "homophobe", is an attack on God. 
-
-No police state.  Nothing is different from 1990 except we don't have any enemies.  The World has gadgets to amuse itself.  Eliminate fat-ass government jobs.  Eliminate CIA, NSA and TSA.  Don't fucken touch my computer, CIA nigger.  Githib is to register and control dangerous people and code.  No cloud.
-
-Intel must do a Superbowl commercial for Xeon 64 core desktop computers.  CIA doesn't want the public to know powerful computers exist.  Shareholders of Intel must sue.  CIA is killing Intel on purpose.  They are coming for our guns, want us to have impotent computers.
-
-God went through the A.I. singularity a billion years ago.  God laughed at us doing A.I.  God said A.I. was needed for Mars.  God said to start planting.  He is not in suspense on question of life.  On the topic of endanger species on Earth, God said, "Enough stars?"  Talk with God.
-
-The CIA ruthlessly clinches the status quo with an iron fist and wants a world of harmless dumb impotent nigger cattle that sit, shit, do nothing but stand there.  "Look at all these nigger cattle!  We're rich.  What a herd of nigger cattle!  Yippee ki-yay!", says Zuckerberg and Gates.
-
-Iran had a theocratic revolution.  God talks.  CIA are like NAZI SS to be executed.  They, literally, started a War on God.  <shrug> God will finish it.
-
-God said sports are "homo" and to tackle a horse.  Sunday is for God.  Busywork is terrible.  The purpose of man is to entertain God.  As a matter of fact, if you offer no entertainment for God, you should not exist.  Jesus said the chaff will be burned and the trees with no fruit, uprooted.
-
-God said pets are, "homo".  He is disgusted with how tame and dependent they are, not like how He created them.  Africa should be wild and glorify God.  A tame, pathetic Africa is reason for grief and anguish at how awful, not glory for God.  I asked what happened when humans met Neanderthals?  "Count.  Pets."  Why isn't the Pope outraged at the injustice of Africa importing 60% of its food?  Pope Francis wants to be the pope of the niggers.  I'll be the pope of the whites.
-
-Desolation is a 20-year-old guy who is stuck with a video game he got sick-of 5 years ago.  That is how God is punishing the wicked, today.
-
-Humility equals how exalted you become.  $TX,"This is terrifying humility.",HTML="https://www.brainpickings.org/2012/01/04/isaac-newton-list-of-sins/"$  Work in a patent office or change a diaper.  God said homos excel because of self-loathing.  Confession makes sense.
-
-I asked God if the World was perfectly just.  He asked if I was calling Him lazy.  Good and bad balance in life.  The rich are retards.  God likes Beverly Hillbillies.  On the Arab/Jew conflict, He said, "Oil funny, hopefully."  He purposely causes envy for the wicked who covet and must do justice by turning the World on its head.  Martin Luther was a nigger.  There is nothing wrong with sale of indulgences.
-
-God said blue eyes come from Neanderthals.  My God!  This German guy is a hilarious Neanderthal -- $TX,"Friedrich_Nietzsche",HTML="http://en.wikipedia.org/wiki/Friedrich_Nietzsche"$.  In war, the attacker has the advantage.  The scales fell from my eyes!
-
-There are pendulums that swing to keep from desolation.  I am the Father of the Counter Renaissance. Rationalism is the worst strategy in a World of perfect justice.  Machievelli was a nigger and followers get what they deserved.  CIA is worse than useless.
-
-The priest must serve God, not the people.  The Church must immediately make the priest face God, not the people.  Jesus over-turned tables in His cherished temple.  The Catholic church has become a charity with only love of neighbor and not a church with only love of God.  Sorry, any human that doesn't entertain God has no purpose.  I saw an uncontacted tribe in the Amazon and said, "How precious."  God said, "Heathen."  If you would not slaughter heathens for the glory of God, you don't really believe you have the true faith.  The Pope apologized for conquest of the New World.  If you love God, He loves you.  He doesn't love everyone.  "Do I know you, nigger?  Who the fuck are you?", is what God will say.  Better talk with Him!
-
-TempleOS is a trading post with a space alien.  Your offering equals His response.  Solomon wrote 1005 hymns.  Hymns are currency.  $LK,"I wrote 120 Hymns",A="FI:::/Home/Web/TAD/HymnVideos.DD"$.  
-
-$LK,"::/Doc/Demands.DD"$
-
-$LK,"::/Doc/StdTempleOSPC.DD"$
-
-God said we are the Roman Empire and Muslims are the Barbarians.  Change C.E./B.C.E. back to A.D./B.C.  Fuck the retard atheist Marxist-nigger Orientals who don't have an alphabet and never accepted Christianity, like white people.
-
-$WW,1$$FG,5$$TX+CX,"Counter-Renaissance",HTML="http://www.templeos.org/Wb/Home/Web/TAD/TAD.html"$$FG$
-
-I, Terry A. Davis, am the Father of the Counter-Renaissance.  I am not interested in backward technology, but a society that places the same importance and spends the same GDP on God as 1200 A.D., with rejection of rationalism replaced with trust in perfect divine justice on Earth, with rejection of proud-of-heart liberalism replaced with colonialism, with rejection of love of neighbor replaced with love of God, with rejection of charity replaced with prayer and offerings to God, with the priest facing God instead of the people, and not rejecting such ideas as divine right of kings and class.
-
-A Renaissance, rational, modern man like Richard Dawkins, or any confused Chinaman Marxist nigger might very proudly and earnestly, state this five-year-old logic: "Goliath kills David unless David is clever."  I, however, believe the better man wins in fights because God, in an oracle, told me the World is perfectly just.  Or, you can turn the other cheek and perfect justice will still be done.
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/GHAhRyfNSBo\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/GHAhRyfNSBo\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/cV0tCphFMr8\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/cV0tCphFMr8\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/VXnAP6YUwZU\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/VXnAP6YUwZU\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$TX,"The sins of Newton",HTML="https://www.brainpickings.org/2012/01/04/isaac-newton-list-of-sins"$.  $LK,"God's world has perfect justice.",A="FI:::/Home/Web/TAD/Justice.DD"$
-
-Work in a patent office or change a diaper and you at least have a remote chance of going farther then the most honored MIT physicist.  He has zero chance.  To kiss the sky, you must horribly kneel.
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/wirRZsAvJGQ\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/wirRZsAvJGQ\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/7J6aH7Ga7N0\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/7J6aH7Ga7N0\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/hnU7MKGz0tc\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/hnU7MKGz0tc\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/t8g1e-JLrhM\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/t8g1e-JLrhM\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/lK_cdkpazjI\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/lK_cdkpazjI\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/x9ffXnJQ0xE\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/x9ffXnJQ0xE\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-God's favorite national anthem.  God hates America the Beautiful.  He said they made themselves cry.
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/PFx-56KkweM\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/PFx-56KkweM\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-Armor makes your body horribly inferior.  God said the military should not use helmets.
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/8kG9j5Io6yw\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/8kG9j5Io6yw\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/4mhrWnEJZEU\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/4mhrWnEJZEU\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/HgGAzBDE454\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/HgGAzBDE454\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/6zLpf1XDNko\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/6zLpf1XDNko\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/5C2nhCM8LEE\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/5C2nhCM8LEE\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/KZaz7OqyTHQ\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/KZaz7OqyTHQ\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/QK8mJJJvaes\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/QK8mJJJvaes\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/wsrvmNtWU4E\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/wsrvmNtWU4E\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-TempleOS is a trading post with a space alien.  What do you have to trade?  Entertainment?  God's favorite thing on TV is soap operas.  God mocked German music.
-
-God's favorite movie.
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/b36mjDR-9WU\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/b36mjDR-9WU\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-God's favorite band is Beatles.
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/VJDJs9dumZI\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/VJDJs9dumZI\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/Cv6tuzHUuuk\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/Cv6tuzHUuuk\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-God said this makes a mockery of classical music.  Germans are cows who cannot hear the music.  Blue eyes come from Neanderthals.
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/OZEMT6Ts6sg\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/OZEMT6Ts6sg\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$WW,1$================================================================================
-i cdnuolt blveiee taht I cluod aulaclty uesdnatnrd waht I was rdanieg. The phaonmneal pweor of the hmuan mnid, aoccdrnig to a rscheearch at Cmabrigde Uinervtisy, it dseno’t mtaetr in waht oerdr the ltteres in a wrod are, the olny iproamtnt tihng is taht the frsit and lsat ltteer be in the rghi t pclae. The rset can be a taotl mses and you can sitll raed it whotuit a pboerlm. Tihs is bcuseae the huamn mnid deos not raed ervey lteter by istlef, but the wrod as a wlohe. Azanmig huh? yaeh and I awlyas tghuhot slpeling was ipmorantt! if you can raed tihs forwrad it.
-================================================================================
-
-Grammar is for vain arrogant niggers, full of redundancy.  Secretaries are niggers.  Don't be vain.  Getting humiliated by "potatoe" adds grace.
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/VAu_no-uT-o\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/VAu_no-uT-o\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-America is special because of God and we have been exceptional since the Pilgrims, with manifest destiny.  Japan and China are inferior, nigger cultures. We will force them to use an alphabet.  We will put the English King James TempleOS into every Intel chip in a factory ROM, with 8-bit ASCII only.  We will pay the national debt with $LK,"The TempleOS Standard PC",A="FI:::/Doc/StdTempleOSPC.DD"$.
-
-I saw a program on Amazon uncontacted tribes.  I said, "How precious!"  God said, "Heathens."  We are a superior culture.  There is a YouTube video which says capitalism doesn't work in China because it only works in Christian cultures.  God said we are the Roman Empire and Muslims are the barbarians.  English is the new Latin.  We will force the world to use A.D./B.C. instead of C.E./B.C.E.  
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/ExWfh6sGyso\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/ExWfh6sGyso\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-A Counter-Renaissance man knows what "humble of heart" means.  Jesus said, "I am meek and humble of heart."  What does "humble of head" mean?  It means you look around and decide you are not the smartest.  A person who is humble of heart looks around and decides he is not the most compassionate.  A proud of heart *person believes he is more compassionate than others and says, "You are mean, selfish people and do not love the poor as much as Judas and I love the poor!"  I say that Africa imports 60% of its food and they need white-owned farms.
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/jkje4FiH9Qc\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/jkje4FiH9Qc\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/2YpQhxqnaNw\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/2YpQhxqnaNw\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-Animals have pecking order.  If two big niggers walk on the sidewalk toward me, I go in the gutter.  It is okay for men to hurt feelings, like one high school football team making another very sad by beating them.  Jews did animal sacrifices.  e.g. I'm sorry, cow, I like meat so you must die.  Thanks, Jesus, for dying so I can sin.  Grace, not works, is humble of heart.  Fuck-it.  I didn't ask Jesus to die, He just did it.  Thanks.
-
-A Renaissance proud-of-heart man, like Pope Francis, loves neighbor, not God.  He focuses on rational acts, such as charity instead of irrational acts, such as prayer.  A Counter-Renaissance man believes that if the World is perfectly just, there is nothing wrong with niggers living in teepees and shitting in buckets.  After all, monks take vows of poverty, for God's sake!  Read $TX,"Numbers 11",HTML="http://www.biblegateway.com/passage/?search=Numbers%2011&version=NIV"$.  The odds of a rich man going to Heaven are like a $LK,"camel going through a needle",A="BF:Matthew,19:24"$.  Sale of indulgences is perfectly reasonable, since God is perfectly just and if a rich man gives-up something, he is compensated.  God purposely antagonizes those who envy.  God said of Arabs and Jews, "Oil funny, hopefully!"  God likes the Beverly Hillbillies.  The original German Martin Luthur was a low class nigger who seethed with anger at the church getting money.  As a matter of fact, God purposely burns money in front of the greedy to punish them.  Martin Luther was nothing but a run-of-the-mill populist Marxist nigger who had problems accepting lawful authority.
-
-A Renaissance man attempts to use philosophy to prove God exists.  A Counter-Renaissance man knows that belief in God comes not philosophy, but from the occult.  A Counter-Renaissance man enquires of the Lord at oracles, like $LK,"King Solomon's Oracle",A="BF:1 Kings,6:21"$, providing he has made an offering like Cain and Abel.  $LK,"Genesis,4:1-10",A="BF:Genesis,4:1-10"$.
-
-I am not in favor of ignorance, although, Galileo means nothing when you are not an atheist.  People believe the Dark Age Church created ignorance on purpose.  Good an evil, light and dark are clear.  Today, the CIA, the liberal elites, and scheming wicked Jew-niggers create ignorance.  I am shocked when people speak of code obfuscation.  That is the most wicked thing, and paywall barriers.  Obfuscation is code that is more complicated than necessary.  I try to make my code the opposite of obsfucated -- more simple than necessary.  Bill Gates said a company is a castle -- build walls or fight everybody who comes along.  God said, "You ate your children in the siege."
-
-God said Creationists brought shame with their stupidity.  However, evolution loses all it's significance when you are not an atheist.  By the way, God said the IQ obsessed people are, "vain", as though they look in the mirror frequently during the day and say to themselves, "You know?  I really am smart.  I should reproduce and help the gene pool.  <sigh>  Damn-it!  Those niggers really really should not reproduce.  We need more abortions and birth control."  That's what they are obsessed with 16 hours a day, instead of something more healthy and less ugly, like God.
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/A_hzz2XSAaI\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/A_hzz2XSAaI\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-TempleOS is a free, public domain, open source, $FG,4$$TX,"x86_64",HTML="http://en.wikipedia.org/wiki/Amd64#AMD64"$$FG$, non-preemptive multi-tasking, multi-cored, $FG,4$$TX,"ring-0-only",HTML="http://en.wikipedia.org/wiki/Ring_(computer_security)"$$FG$, single-address-map ($FG,4$$TX,"identity-mapped",HTML="http://en.wikipedia.org/wiki/Identity_(mathematics)"$$FG$), non-networked, PC operating system.  Paging is, basically, not used.
-
-The CIA encourages code obsfucation.  They make it more complicated than necessary.  TempleOS is, literally, more simple than necessary.  It is obnoxiously simple... to the point it hurts. 
-
-This $TX,"\"Hello World\" joke",HTML="http://www.ariel.com.au/jokes/The_Evolution_of_a_Programmer.html"$, the $TX,"BMP file format",HTML="http://en.wikipedia.org/wiki/BMP_file_format"$ and the $TX,"WAV file format",HTML="http://en.wikipedia.org/wiki/WAV"$ show that the industry is really screwed-up!  That's what TempleOS fixes.  I capped the line-of-code count at 100,000 and God said it must be perfect, so it will never be an ugly monstrocity.  It is currently $TX,"82,152",D="DD_TEMPLEOS_LOC_OFFICIAL"$ lines of unblemished code.  Backward compatibility is not promised.
-
-Normally, failure is not an option, but since TempleOS accompanies Windows or Linux, we exclude certain uses.  There is no reason to duplicate browsing, multimedia, desktop publishing, etc.  Linux wants to be a secure, multi-user mainframe.  That's why it has file permissions.  The vision for TempleOS, however, is a modern, 64-bit Commodore 64.  The C64 was a non-networked, home computer mostly used for games.  It trained my generation how to program because it was wide open, completely hackable.  The games were not multimedia works of art, but generated by non-artist.
-
-A troll might ask, "Why not just use $FG,4$$TX,"DOS",HTML="http://en.wikipedia.org/wiki/DOS"$$FG$?  It was ring-0-only and single-address-map."  $FG,4$$TX,"DOS",HTML="http://en.wikipedia.org/wiki/DOS"$$FG$ was 16-bit, with segmentation -- awful!  TempleOS is 64-bit, flat, non-segmented and multi-cored.  It has a C64-like shell with $LK,"HolyC",A="FI:::/Doc/HolyC.DD"$, a dialect of C/C++, instead of BASIC.  It was written from scratch, and not even ASCII was sacred -- it has 8-bit unsigned char source code to support European languages.  Also, the source code supports binary sprite graphics.
-
-A troll might say, "It can crash!"  We used $FG,4$$TX,"DOS",HTML="http://en.wikipedia.org/wiki/DOS"$$FG$ for years and loved it. Computers even had a reset switch!  Just think of the power of ring-0, muhahaha! Think of the speed and simplicity of $FG,4$$TX,"ring-0-only",HTML="http://en.wikipedia.org/wiki/Ring_(computer_security)"$$FG$ and $FG,4$$TX,"identity-mapping",HTML="http://en.wikipedia.org/wiki/Identity_(mathematics)"$$FG$.  It can change tasks in half a microsecond because it doesn't mess with page tables or privilege levels.  Inter-process communication is effortless because every task can access every other task's memory.
-
-It's fun having access to everything.  When I was a teenager, I had a book, $FG,4$$TX,"Mapping the Commodore 64",HTML="http://unusedino.de/ec64/technical/project64/mapping_c64.html"$$FG$, that told what every location in memory did.  I liked copying the ROM to RAM and poking around at the ROM BASIC's variables.  Everybody directly poked the hardware ports.
-
-TempleOS is simpler than Linux and you can have hours of fun tinkering because all memory and ports are accessible.  Memory is $FG,4$$TX,"identity-mapped",HTML="http://en.wikipedia.org/wiki/Identity_(mathematics)"$$FG$ at all times, so you can modify any task's memory from any other task.  You can access all disk blocks, too.  I had a blast using a C64 disk block editor to modify directories to un-delete files, when I was a kid.  Maybe, you want to play with a raw-block database, or make your own file system?
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/AIEJjpVlZu0\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/AIEJjpVlZu0\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-$HC,"<object width=\"640\" height=\"520\"><param name=\"movie\" value=\"http://www.youtube.com/v/W_b4zMxfLvA\"></param><param name=\"allowscriptaccess\" value=\"always\"></param><embed src=\"http://www.youtube.com/v/W_b4zMxfLvA\" type=\"application/x-shockwave-flash\" allowscriptaccess=\"always\" width=\"640\" height=\"520\"></embed></object>"$
-
-I wrote all $LK,"120,834",A="FF:~/Web/LineRep.DD,Kernel.PRJ",D="DD_TEMPLEOS_LOC"$ lines of TempleOS over the last $TX,"13.6",D="DD_TEMPLEOS_AGE"$ years, full-time, including the 64-bit compiler.  It was called, at various times, "$FG,4$$TX,"Hoppy",HTML="http://web.archive.org/web/*/http://www.simstructure.hare.com/*"$$FG$", "$FG,4$$TX,"The J Operating System",HTML="http://wayback.archive.org/web/*/http://www.justrighteous.org/*"$$FG$", "$FG,4$$TX,"LoseThos",HTML="http://web.archive.org/web/*/http://www.losethos.com/*"$$FG$" and "$FG,4$$TX,"SparrowOS",HTML="http://web.archive.org/web/*/http://www.sparrowos.com/*"$$FG$".  Here are my $FG,4$$TX,"college transcripts",HTML="http://www.templeos.org/files/ASU_Transcripts.pdf"$$FG$.  I've been a professional operating system developer since 1990 when I was hired to work on Ticketmaster's VAX OS.
-
-$FG,8$
-* "Commodore 64" is a trademark owned by Polabe Holding NV.
-* "Linux" is a trademark owned by Linus Torvalds.
-* "Windows" and "DOS" are trademarks owned by MicroSoft Corp.
+I, Terry Davis, wrote all $TX,"81,281",D="DD_TEMPLEOS_LOC"$ lines of TempleOS over the last $TX,"13.9",D="DD_TEMPLEOS_AGE"$ years, including the 64-bit compiler.  I have been a professional operating system developer since 1990 when I worked on Ticketmaster's VAX OS.
@@ -12,11 +12,6 @@ http://www.templeos.org if you want file that come on the
 TempleOS distribution.

 You can pass html meta data as args to $LK,"ToHtml",A="FF:::/Demo/ToHtmlToTXTDemo/ToHtml.HC,ToHtml"$().
-
-If you want to blog like I do, see these files...
-$LK,"::/Demo/AcctExample/TOS/TOSToHtml.HC"$
-$LK,"::/Demo/AcctExample/HomeKeyPlugIns.HC"$
-$LK,"::/Demo/AcctExample/TOS/TOSHolySpirit.HC"$
 */

 Cd(__DIR__);;
@@ -1,11 +1,5 @@
-#define DOWNLOAD_FILE1		"TempleOSCD.ISO"
-#define DOWNLOAD_FILE1_SIZE	17000000
-#define DOWNLOAD_FILE2		"TempleOSUltra.ISO"
-#define DOWNLOAD_FILE2_SIZE	 1900000
-#define DOWNLOAD_FILE3		"TempleOSCDRS.ISO"
-#define DOWNLOAD_FILE3_SIZE	16000000
-#define DOWNLOAD_FILE4		"TempleOSUltraRS.ISO"
-#define DOWNLOAD_FILE4_SIZE	 1600000
+#define DOWNLOAD_FILE1		"TOS_Distro.ISO"
+#define DOWNLOAD_FILE1_SIZE	16000000

 #define HOURS_MAX		(24*3)

@@ -39,7 +33,7 @@ U0 LogStructDel(LogStruct *tmplg)
  Free(tmplg);
 }

-U0 PrsSingleLogFile(LogStruct *head,U8 *name,CDate *_start,CDate *_end)
+U0 PrsSingleLogFile(LogStruct *head,U8 *name,CDate *_dstart,CDate *_dend)
 {
  CDoc *doc=DocRead(name,
 	DOCF_PLAIN_TEXT_TABS|DOCF_DBL_DOLLARS|DOCF_NO_CURSOR);
@@ -84,9 +78,10 @@ U0 PrsSingleLogFile(LogStruct *head,U8 *name,CDate *_start,CDate *_end)
 	if (*src++!=CH_SPACE) throw;
 	i=Str2I64(src,10,&src);
 	tmplg->datetime-=(i/100+i%100/60.0)*CDATE_FREQ*60*60;
-
-	if (tmplg->datetime<*_start) *_start=tmplg->datetime;
-	if (tmplg->datetime>*_end)   *_end  =tmplg->datetime;
+	if (!(Str2Date("1/1/2017")<=tmplg->datetime<Str2Date("1/1/2050")))
+	  throw;
+	if (tmplg->datetime<*_dstart) *_dstart=tmplg->datetime;
+	if (tmplg->datetime>*_dend)   *_dend  =tmplg->datetime;

 	do if (!*src) throw;
 	while (*src++!=']');
@@ -133,13 +128,13 @@ U0 PrsSingleLogFile(LogStruct *head,U8 *name,CDate *_start,CDate *_end)
  DocDel(doc);
 }

-LogStruct *PrsLogFiles(U8 *files_find_mask,CDate *_start,CDate *_end)
+LogStruct *PrsLogFiles(U8 *files_find_mask,CDate *_dstart,CDate *_dend)
 {
  LogStruct *head=CAlloc(sizeof(LogStruct));
  CDirEntry *tmpde=FilesFind(files_find_mask),*tmpde1=tmpde;
  QueInit(head);
  while (tmpde) {
-    PrsSingleLogFile(head,tmpde->full_name,_start,_end);
+    PrsSingleLogFile(head,tmpde->full_name,_dstart,_dend);
    tmpde=tmpde->next;
  }
  DirTreeDel(tmpde1);
@@ -181,13 +176,7 @@ U0 BlockIPNuip(LogStruct *head)

  QueInit(&blocked_head);

-  BlockedStructAdd(&blocked_head,70<<24+173<<16+110<<8+214);
-  BlockedStructAdd(&blocked_head,68<<24+224<<16+130<<8+96);
-  BlockedStructAdd(&blocked_head,68<<24+96<<16+100<<8+126);
-  BlockedStructAdd(&blocked_head,68<<24+96<<16+110<<8+213);
-  BlockedStructAdd(&blocked_head,68<<24+96<<16+242<<8+108);
-  BlockedStructAdd(&blocked_head,68<<24+227<<16+61<<8+11);
-  BlockedStructAdd(&blocked_head,68<<24+227<<16+61<<8+139);
+  BlockedStructAdd(&blocked_head,68<<24+227<<16+61<<8+6);

  //pass 1: collect robot lst
  while (tmplg!=head) {
@@ -214,13 +203,7 @@ U0 BlockIPNuip(LogStruct *head)
 Bool IsDownLoad(LogStruct *tmplg)
 {
  if (StrMatch(DOWNLOAD_FILE1,tmplg->file)&&tmplg->size>=
-	DOWNLOAD_FILE1_SIZE ||
-	StrMatch(DOWNLOAD_FILE2,tmplg->file)&&tmplg->size>=
-	DOWNLOAD_FILE2_SIZE ||
-	StrMatch(DOWNLOAD_FILE3,tmplg->file)&&tmplg->size>=
-	DOWNLOAD_FILE3_SIZE ||
-	StrMatch(DOWNLOAD_FILE4,tmplg->file)&&tmplg->size>=
-	DOWNLOAD_FILE4_SIZE)
+	DOWNLOAD_FILE1_SIZE)
    return TRUE;
  else
    return FALSE;
@@ -228,9 +211,15 @@ Bool IsDownLoad(LogStruct *tmplg)

 Bool IsIndex(LogStruct *tmplg)
 {
-  if (!StrCmp(tmplg->file,"/index.html") ||
-	!StrNCmp(tmplg->file+StrLen(tmplg->file)-14,"/TempleOS.html",14) ||
-	!StrCmp(tmplg->file,"/"))
+  if (!StrCmp(tmplg->file,"/index.html") || !StrCmp(tmplg->file,"/"))
+    return TRUE;
+  else
+    return FALSE;
+}
+
+Bool IsKeeper(LogStruct *tmplg,CDate dstart,CDate dend)
+{
+  if (dstart<=tmplg->datetime<=dend && !StrOcc(tmplg->file,'?'))
    return TRUE;
  else
    return FALSE;
@@ -340,7 +329,7 @@ U0 FileTreeTraverse(LinkStruct *root)
  }
 }

-U0 DownLoadRep(LogStruct *head,CDate start,CDate end)
+U0 DownLoadRep(LogStruct *head,CDate dstart,CDate dend)
 {
  I64 i,j,cnt,dups,
 	hours_start,hours_end,*hour_cnts,*dup_cnts,
@@ -349,11 +338,11 @@ U0 DownLoadRep(LogStruct *head,CDate start,CDate end)
  LinkStruct *link_root=NULL;
  CDateStruct ds;

-  i=start*24;hours_start=i.u32[1];
-  i=end  *24;hours_end	=i.u32[1];
+  i=dstart*24;hours_start=i.u32[1];
+  i=dend  *24;hours_end	=i.u32[1];

-  days_start=(start+local_time_offset)>>32;
-  days_end  =(end+local_time_offset)>>32;
+  days_start=(dstart+local_time_offset)>>32;
+  days_end  =(dend+local_time_offset)>>32;

  hour_cnts=CAlloc((hours_end-hours_start+1)*sizeof(I64));
  dup_cnts =CAlloc((hours_end-hours_start+1)*sizeof(I64));
@@ -361,7 +350,7 @@ U0 DownLoadRep(LogStruct *head,CDate start,CDate end)
  day_dup_cnts=CAlloc((days_end-days_start+1)*sizeof(I64));
  dups=cnt=0;
  while (tmplg!=head) {
-    if (start<=tmplg->datetime<=end && IsDownLoad(tmplg)) {
+    if (IsKeeper(tmplg,dstart,dend) && IsDownLoad(tmplg)) {
      i=tmplg->datetime*24;
      hour_cnts[i.u32[1]-hours_start]++;
      day_cnts[(tmplg->datetime+local_time_offset)>>32-days_start]++;
@@ -376,15 +365,15 @@ U0 DownLoadRep(LogStruct *head,CDate start,CDate end)
    tmplg=tmplg->next;
  }

-  "\n\nDownloads of /TempleOSCD.ISO\n";
-  for (i=start;i<=end;i+=1<<32)
+  "\n\nDownloads of /TOS_Distro.ISO\n";
+  for (i=dstart;i<=dend;i+=1<<32)
    "%D  Dups:%5d  Total:%5d  Uniques:%5d\n",i,
 	  day_dup_cnts[(i+local_time_offset)>>32-days_start],
 	  day_cnts[(i+local_time_offset)>>32-days_start],
 	  day_cnts[(i+local_time_offset)>>32-days_start]-
 	  day_dup_cnts[(i+local_time_offset)>>32-days_start];

-  "\n\nDownloads of /TempleOSCD.ISO\n"
+  "\n\nDownloads of /TOS_Distro.ISO\n"
 	"'-' is a dup.  '+' is not a dup.\n";
  if (hours_end-hours_start>=HOURS_MAX)
    i=hours_end-HOURS_MAX+1;
@@ -401,7 +390,7 @@ U0 DownLoadRep(LogStruct *head,CDate start,CDate end)
  }
  "Total:%d  Dups:%d  Uniques:%d\n",cnt,dups,cnt-dups;

-  "\n\nDownloads of /TempleOSCD.ISO\n";
+  "\n\nDownloads of /TOS_Distro.ISO\n";
  LinkTreeTraverse(link_root);
  '\n';

@@ -412,12 +401,12 @@ U0 DownLoadRep(LogStruct *head,CDate start,CDate end)
  Free(day_dup_cnts);
 }

-U0 FileRep(LogStruct *head,CDate start,CDate end)
+U0 FileRep(LogStruct *head,CDate dstart,CDate dend)
 {
  LogStruct *tmplg=head->next;
  LinkStruct *file_root=NULL;
  while (tmplg!=head) {
-    if (start<=tmplg->datetime<=end)
+    if (IsKeeper(tmplg,dstart,dend))
      FileTreeAdd(&file_root,tmplg);
    tmplg=tmplg->next;
  }
@@ -427,7 +416,7 @@ U0 FileRep(LogStruct *head,CDate start,CDate end)
  FileTreeDel(file_root);
 }

-U0 IndexRep(LogStruct *head,CDate start,CDate end)
+U0 IndexRep(LogStruct *head,CDate dstart,CDate dend)
 {
  I64 i,j,cnt,dups,
 	hours_start,hours_end,*hour_cnts,*dup_cnts,
@@ -436,11 +425,11 @@ U0 IndexRep(LogStruct *head,CDate start,CDate end)
  LinkStruct *link_root=NULL;
  CDateStruct ds;

-  i=start*24;hours_start=i.u32[1];
-  i=end  *24;hours_end	=i.u32[1];
+  i=dstart*24;hours_start=i.u32[1];
+  i=dend  *24;hours_end	=i.u32[1];

-  days_start=(start+local_time_offset)>>32;
-  days_end  =(end+local_time_offset)>>32;
+  days_start=(dstart+local_time_offset)>>32;
+  days_end  =(dend+local_time_offset)>>32;

  hour_cnts=CAlloc((hours_end-hours_start+1)*sizeof(I64));
  dup_cnts =CAlloc((hours_end-hours_start+1)*sizeof(I64));
@@ -448,7 +437,7 @@ U0 IndexRep(LogStruct *head,CDate start,CDate end)
  day_dup_cnts=CAlloc((days_end-days_start+1)*sizeof(I64));
  dups=cnt=0;
  while (tmplg!=head) {
-    if (start<=tmplg->datetime<=end && IsIndex(tmplg)) {
+    if (IsKeeper(tmplg,dstart,dend) && IsIndex(tmplg)) {
      i=tmplg->datetime*24;
      hour_cnts[i.u32[1]-hours_start]++;
      day_cnts[(tmplg->datetime+local_time_offset)>>32-days_start]++;
@@ -465,7 +454,7 @@ U0 IndexRep(LogStruct *head,CDate start,CDate end)

  "\n\nHits on /index.html\n"
 	"'-' is a dup.  '+' is not a dup.\n";
-  for (i=start;i<=end;i+=1<<32)
+  for (i=dstart;i<=dend;i+=1<<32)
    "%D  Dups:%5d  Total:%5d  Uniques:%5d\n",i,
 	  day_dup_cnts[(i+local_time_offset)>>32-days_start],
 	  day_cnts[(i+local_time_offset)>>32-days_start],
@@ -502,29 +491,33 @@ U0 IndexRep(LogStruct *head,CDate start,CDate end)
 U0 WebLogRep(U8 *mask,U8 *output_filename)
 {
  LogStruct *head;
-  CDate start=I64_MAX,end=I64_MIN;
+  CDate dstart=I64_MAX,dend=I64_MIN;

  DocMax;

-  head=PrsLogFiles(mask,&start,&end);
-  start=GetDate("Start(%D):",start);
-  end  =GetDate("End  (%D):",end);
-  BlockIPNuip(head);
+  head=PrsLogFiles(mask,&dstart,&dend);
+  if (dstart>dend)
+    PrintErr("No Data.\n");
+  else {
+    dstart=GetDate("Start(%D):",dstart);
+    dend  =GetDate("End  (%D):",dend);
+    BlockIPNuip(head);

-  DocClear;
-  "$$WW,0$$";
-  IndexRep(head,start,end);
-  FileRep(head,start,end);
-  DownLoadRep(head,start,end);
+    DocClear;
+    "$$WW,0$$";
+    IndexRep(head,dstart,dend);
+    FileRep(head,dstart,dend);
+    DownLoadRep(head,dstart,dend);

-  StrCpy(DocPut->filename.name,output_filename);
-  DocWrite(DocPut,TRUE);
+    StrCpy(DocPut->filename.name,output_filename);
+    DocWrite(DocPut,TRUE);

-  "$$WW,1$$";
+    "$$WW,1$$";
+  }
  LogLstDel(head);
 }

 #if __CMD_LINE__
 Cd(__DIR__);;
-WebLogRep("*.LOG*","~/DemoWebLog.DD.Z");
+WebLogRep("*.log*","~/DemoWebLog.DD.Z");
 #endif
@@ -60,10 +60,10 @@ U0 LogScrambleDemo()
  U8 *dirname;
  Cd(__DIR__);
  dirname=DirCur;
-  ST_WARN_ST "This will scramble all .LOG files in '%s'.\n\n",dirname;
+  ST_WARN_ST "This will scramble all .log files in '%s'.\n\n",dirname;
  Free(dirname);
  if (AreYouSure)
-    WebLogScramble("*.LOG*");
+    WebLogScramble("*.log*");
 }

 LogScrambleDemo;