TempleOSCDV3.12.ISO

Adam/ADefine.CPP

@@ -11,8 +11,8 @@ U0 LoadDocDefines()
   //This is cut and replaced when I generate a distro.
   //See $LK,"DD_TEMPLEOS_LOC",A="FF:::/Demo/AcctExample/TOSDistro.CPP,DD_TEMPLEOS_LOC"$.
   $TR-C,"LineRep"$
-  $ID,4$DefinePrint("DD_TEMPLEOS_LOC","118,728");
-DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","80,899");
+  $ID,4$DefinePrint("DD_TEMPLEOS_LOC","118,749");
+DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","80,937");
 $ID,-4$
   DefinePrint("DD_KERNEL","%08X",bfh);
   bfh(I64)+=bfh->file_size-1;
@@ -23,7 +23,7 @@ $ID,-4$
 
   DefinePrint("DD_MP_VECT","%08X",MP_VECT_ADDR);
   DefinePrint("DD_MP_VECT_END","%08X",
-	MP_VECT_ADDR+AP_16BIT_INIT_END-AP_16BIT_INIT-1);
+	MP_VECT_ADDR+COREAP_16BIT_INIT_END-COREAP_16BIT_INIT-1);
 
   DefinePrint("DD_SYS_FIXED_AREA_BASE","%08X",SYS_FIXED_AREA);
   DefinePrint("DD_SYS_FIXED_AREA_END","%08X",

Adam/Ctrls/CtrlsA.CPP

@@ -65,7 +65,7 @@ U0 DrawCtrls(CTask *task)
 	if (!Bt(&task->display_flags,DISPLAYf_NO_BORDER)) {
 	  PUSHFD
 	  CLI
-	  while (LBts(&task->locked_flags,TASKLf_TASK_LOCK))
+	  while (LBts(&task->task_flags,TASKf_TASK_LOCK))
 	    PAUSE
 
 	  task->win_left--; //Allow drawing on border
@@ -74,7 +74,7 @@ U0 DrawCtrls(CTask *task)
 	  task->win_bottom++;
 	  WinDerivedValsUpdate(task);
 
-	  LBtr(&task->locked_flags,TASKLf_TASK_LOCK);
+	  LBtr(&task->task_flags,TASKf_TASK_LOCK);
 	  POPFD
 
 	  if (c->draw_it)
@@ -82,7 +82,7 @@ U0 DrawCtrls(CTask *task)
 
 	  PUSHFD
 	  CLI
-	  while (LBts(&task->locked_flags,TASKLf_TASK_LOCK))
+	  while (LBts(&task->task_flags,TASKf_TASK_LOCK))
 	    PAUSE
 
 	  task->win_left++;
@@ -91,7 +91,7 @@ U0 DrawCtrls(CTask *task)
 	  task->win_bottom--;
 	  WinDerivedValsUpdate(task);
 
-	  LBtr(&task->locked_flags,TASKLf_TASK_LOCK);
+	  LBtr(&task->task_flags,TASKf_TASK_LOCK);
 	  POPFD
 	}
       } else

Adam/God/GodBible.CPP

@@ -270,14 +270,69 @@ public U0 BibleVerse(CDoc *doc_out=NULL,U8 *verse,I64 lines)
   }
 }
 
-U0 BibleView()
-{
-  U8 buf[STR_LEN];
-  I64 book=PopUpPickDefineSub("ST_BIBLE_BOOKS");
-  if (book>=0) {
-    StrPrint(buf,"BF:%Z,1:1",book,"ST_BIBLE_BOOKS");
-    Ed(buf);
+public CDoc *BibleDoc()
+{//Return Bible as DolDoc with trees.
+  CDoc	*result=DocRead(BIBLE_FILENAME);
+  CDocEntry *doc_e=result->root.next,*doc_e1;
+  Bool open_chapter=FALSE;
+  U8	*ptr=Define("ST_BIBLE_BOOK_LINES");
+  I64	book,book_cnt=DefineCnt("ST_BIBLE_BOOK_LINES")-1,
+	chapter,
+	line=Str2I64(ptr,,&ptr);
+  ptr++;
+  for (book=0;book<book_cnt;book++) {
+    while (doc_e->y+1<line) {
+      doc_e1=doc_e->next;
+      DocEntryDel(result,doc_e);
+      doc_e=doc_e1;
+    }
+    result->cur_entry=doc_e;
+    result->cur_col=0;
+    DocPrint(result,"$$TR,\"%Z\"$$\n$$ID,2$$",book,"ST_BIBLE_BOOKS");
+    line=Str2I64(ptr,,&ptr);
+    ptr++;
+    chapter=1;
+    while (doc_e->y+1<line) {
+      doc_e1=doc_e->next;
+      if (doc_e->type_u8==DOCT_TEXT && StrMatch(":1 ",doc_e->tag)) {
+	result->cur_entry=doc_e;
+	result->cur_col=0;
+	if (open_chapter) {
+	  DocPrint(result,"$$ID,-2$$");
+	  open_chapter=FALSE;
+	}
+	DocPrint(result,"$$TR,\"%d\"$$\n$$ID,2$$",chapter++);
+	open_chapter=TRUE;
+      } else if (chapter==1) {
+	doc_e1=doc_e->next;
+	DocEntryDel(result,doc_e);
+	doc_e=doc_e1;
+      }
+      doc_e=doc_e1;
+    }
+    result->cur_entry=doc_e;
+    result->cur_col=0;
+    if (open_chapter) {
+      DocPrint(result,"$$ID,-2$$");
+      open_chapter=FALSE;
+    }
+    DocPrint(result,"$$ID,-2$$");
   }
+  while (doc_e!=result) {
+    doc_e1=doc_e->next;
+    DocEntryDel(result,doc_e);
+    doc_e=doc_e1;
+  }
+  return result;
+}
+
+public U0 BibleView()
+{//View Bible as DolDoc with trees.
+  U8 buf[STR_LEN];
+  CDoc *doc=BibleDoc;
+  StrPrint(buf,"AL:%d,1",doc);
+  Ed(buf);
+  DocDel(doc);
 }
 U0 CtrlAltB(I64)
 {

Adam/God/HSNotes.TXT

@@ -154,6 +154,10 @@ Best way for Bill Gates to save lives?	$FG,4$Earthquake prediction$FG$
 Stem cells?			$FG,4$Lower hanging fruit exists (2007)$FG$
 Eleventh commandment?		$FG,4$Thou shall not litter.(Maybe, glory of Creation)$FG$
 Twelfth commandment?		$FG,4$Don't slaughter unarmed men in war.$FG$
+Thirteenth commandment		$FG,4$No gore unless it looks fake.$FG$
+Fourteenth commandment		$FG,4$No pedophilia or child porn.$FG$
+Fifteenth commandment		$FG,4$Don't eat rare meat with blood.$FG$
+Sixteenth commandment		$FG,4$No wife beating.$FG$
 Before Katrina			$FG,4$Floods do justice. Black bead elder (tree book)$FG$
 After Katrina			$FG,4$Suffering Simplifies Life$FG$
 What field are You most better?	$FG,4$Economics$FG$

Adam/Gr/GrTextBase.CPP

@@ -344,7 +344,7 @@ public U0 TextBorder(CTask *task=NULL,
       TextChar(task,,i,b+1,'Í'+attr);
     }
     for (i=t;i<=b;i++) {
-      TextChar(task,,l-1,i,'º'+attr);
+      TextChar(task,,l-1,i,'º'+attr); //Note: $LK,"RawDr",A="MN:RawDr"$() uses this char.
       TextChar(task,,r+1,i,'º'+attr);
     }
   } else {