TempleOSTS_131005.ISO

TempleOS/Adam/WordStat/WSDict.CPP

@@ -188,9 +188,9 @@ U0 WSDDictWordsAdd(CDoc *doc,U8 *st=NULL)
 	if (*ptr++!=WSD_WORD_CHAR)
 	  break;
 	if (i)
-	  DocPutS(doc,"\n");
+	  DocPrint(doc,"\n");
 	wsd_fillins[i]=ptr-1;
-	DocPrintF(doc," '%d' %s",i,ptr);
+	DocPrint(doc," '%d' %s",i,ptr);
 	ptr+=StrLen(ptr)+3;
       }
       wsd_num_fillins=i;
@@ -218,7 +218,7 @@ public U0 WSDDisplayDefs(CDoc *doc,U8 *st,I64 num=-1)
   if (!st) return;
   if (*st==WSD_WORD_CHAR)
     st++;
-  DocPrintF(doc,"$$WW,1$$$$FG,RED$$%s:$$FG$$\n\n",st);
+  DocPrint(doc,"$$WW,1$$$$FG,RED$$%s:$$FG$$\n\n",st);
   if (num<0) {
     if (st3=WSDGetWord(st)) {
       st2=st3;
@@ -227,17 +227,17 @@ public U0 WSDDisplayDefs(CDoc *doc,U8 *st,I64 num=-1)
 	  case WSD_WORD_CHAR:
 	    break;
 	  case WSD_DEF_CHAR:
-	    DocPrintF(doc,"$$FG,GREEN$$(%d)$$FG$$ %s\n",
+	    DocPrint(doc,"$$FG,GREEN$$(%d)$$FG$$ %s\n",
 	      ++i,st2);
 	    break;
 	  case WSD_PRONUNCIATION_CHAR:
-	    DocPrintF(doc,"$$FG,LTGREEN$$%s$$FG$$\n",st2);
+	    DocPrint(doc,"$$FG,LTGREEN$$%s$$FG$$\n",st2);
 	    break;
 	  case WSD_POS_CHAR:
-	    DocPrintF(doc,"$$FG,BLACK$$%s$$FG$$\n",st2);
+	    DocPrint(doc,"$$FG,BLACK$$%s$$FG$$\n",st2);
 	    break;
 	  case WSD_EXTRA_CHAR:
-	    DocPrintF(doc,"$$FG,LTBLUE$$%s$$FG$$\n",st2);
+	    DocPrint(doc,"$$FG,LTBLUE$$%s$$FG$$\n",st2);
 	    break;
 	}
 	st2+=StrLen(st2)+1;
@@ -247,7 +247,7 @@ public U0 WSDDisplayDefs(CDoc *doc,U8 *st,I64 num=-1)
   } else {
     while (st2=WSDGetDef(st,++i)) {
       if (i==num)
-	DocPrintF(doc,"$$FG,GREEN$$(%d)$$FG$$ %s\n",
+	DocPrint(doc,"$$FG,GREEN$$(%d)$$FG$$ %s\n",
 	  i,st2);
       Free(st2);
     }
@@ -257,7 +257,7 @@ public U0 WSDDisplayDefs(CDoc *doc,U8 *st,I64 num=-1)
 U0 WSDPopUpDef(U8 *st,I64 num=-1,CTask *parent=NULL)
 {
   U8 *buf;
-  buf=MSPrintF("WSDDisplayDefs(DocPut,\"%s\",%d);View;",st,num);
+  buf=MPrint("WSDDisplayDefs(DocPut,\"%s\",%d);View;",st,num);
   PopUp(buf,parent);
   Free(buf);
 }

TempleOS/Adam/WordStat/WSDictGen.CPP

@@ -27,7 +27,7 @@ I64 WSDNextCmd(U8 **_ptr)
       if (!(ch=*ptr2++)) goto ncmd_done;
     } while (ch!='>');
     *--ptr2=0;
-    result=LstEntryMatch(ptr,"h1\0/h1\0def\0/def\0hw\0/hw\0tt\0/tt\0"
+    result=LstMatch(ptr,"h1\0/h1\0def\0/def\0hw\0/hw\0tt\0/tt\0"
 "ety\0@fld\0@cd\0@blockquote\0@wordforms\0@note\0@altname\0@chform\0@cref\0@syn\0"
 "/ety\0@/fld\0@/cd\0@/blockquote\0@/wordforms\0@/note\0@/altname\0@/chform\0@/cref\0@/syn\0");
     *ptr2++='>';

TempleOS/Adam/WordStat/WSMain.CPP

@@ -415,7 +415,7 @@ U0 WSMan(I64 n,CTask *parent_task=NULL)
     if (tempw=ws_sorted_words[ws_fillin_matches[n]]) {
       if (temph=HashFind(tempw->str,Fs->hash_table,HTG_SRC_SYM)) {
 	if (temph->src_link) {
-	  buf=MSPrintF("Ed(\"%s\");",temph->src_link);
+	  buf=MPrint("Ed(\"%s\");",temph->src_link);
 	  Preempt(old_preempt);
 	  PopUp(buf,parent_task);
 	  Free(buf);
@@ -460,7 +460,7 @@ U0 WSPutChoices(CDoc *focus_l,CDocEntry *doc_e,CTask *focus_task)
   CHashSrcSym *temph;
   CDoc *doc=DocPut;
 
-  src=DocGetLine(focus_l,doc_e,&data_col);
+  src=DocScanLine(focus_l,doc_e,&data_col);
   DocUnlock(focus_l);
   i=StrLen(src);
   buf =MAlloc(MaxI64(i+1,256));
@@ -504,7 +504,7 @@ pc_done:
   Fs->text_attr=LTBLUE<<4+WHITE;
   Fs->border_src =BDS_CONST;
   Fs->border_attr=LTBLUE<<4+BLACK;
-  DocPrintF(doc,"Word:%s\n",ws_cur_word);
+  DocPrint(doc,"Word:%s\n",ws_cur_word);
   for (i=0;i<ws_num_fillins;i++) {
     st=ws_sorted_words[ws_fillin_matches[i]]->str;
     ch=CH_SPACE;
@@ -514,7 +514,7 @@ pc_done:
 	    temph->type&HTT_DEFINE_STR && temph(CHashDefineStr *)->caller)
 	  ch='*';
     }
-    DocPrintF(doc,"%cF%02d %s\n",ch,i+1,st);
+    DocPrint(doc,"%cF%02d %s\n",ch,i+1,st);
   }
   WSDDictWordsAdd(doc);
 
@@ -534,7 +534,7 @@ U0 WSTask(I64)
   CDocEntry *doc_e;
   TaskInitExt;
   UseTermDoc;
-  SetWinHorz(50,Fs->win_right);
+  SetWinHorz(51,Fs->win_right);
   LBts(&Fs->display_flags,DISPLAYf_WIN_ON_TOP);
   do {
     Sleep(333);
@@ -572,13 +572,13 @@ U0 WSMainFileLstTraverse(U8 *files_find_mask,I64 pass)
   U8 *buf;
   try {
     flst=FilesOrder(FilesFind(files_find_mask,
-	FUF_RECURSE|FUF_JUST_TXT_FILES|FUF_JUST_FILES|FUF_FLATTEN_TREE),&cnt);
+	FUF_RECURSE|FUF_JUST_TXT|FUF_JUST_FILES),&cnt);
     for (i=0;i<cnt;i++) {
       "%s\n",flst[i]->full_name;
       buf=TextFileRead(flst[i]->full_name);
       WSSingleFileAdd(buf,pass);
       Free(buf);
-      CDirEntryDel(flst[i]);
+      DirEntryDel(flst[i]);
     }
   } catch
     Fs->catch_except=TRUE;