Nightly update (ISO SHA-1 0c4684d)

TempleOSCD/Apps/Psalmody/Help.DD

@@ -2,13 +2,13 @@ $WW,1$$FG,5$$TX+CX,"Psalmody Help"$$FG$
 
 * The keyboard can be used as an organ by typing letter keys or clicking the mouse on the keyboard diagram$FG$.  You can "record" notes by pressing the red bttn and typing letters.  They will appear on the musical staff.  You can edit and save them.
 
-* The clipboard can be used to cut and paste.
+* The clip can be used to cut and paste.
 
 * $FG,2$Psalmody$FG$ uses $LK,"HolyC",A="FI:::/Doc/HolyC.DD"$ files as the song format!  See $LK,"::/Apps/Psalmody/Examples/prosper.HC"$.  The $FG,2$Psalmody$FG$ program does not fully parse the songs when loading them back in, so changes made outside $FG,2$Psalmody$FG$ will be lost, like if you add graphics.
 
 * The first line of the $LK,"HolyC",A="FI:::/Doc/HolyC.DD"$ song files is a comment with a category recognized by $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$().  The categories are $FG,2$"no nothing"$FG$, $FG,2$"has words"$FG$, $FG,2$"has graphics"$FG$, or $FG,2$"special"$FG$.  The third character in the song comment is a digit rating number, shown in $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$().  You can set the song rating in $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$() by pressing $FG,2$0$FG$-$FG,2$9$FG$.  You can request your reward from God by pressing $FG,2$r$FG$.  You can press $FG,2$<DEL>$FG$ to delete songs.
 
-* You can take the $LK,"Play",A="MN:Play"$() stmts out of a song file and place them in your programs.  You can also add a song to a document with $FG,2$<CTRL-l>$FG$, but you should do it after pressing $FG,2$<CTRL-t>$FG$ because the clipboard-insert in $FG,2$<CTRL-l>$FG$ is screwy.  See this $SO,"<Song>",A="4qG5EC4BeGG5qCeFD4sB5G4B5G4qG5EC4BeGG5qCeFD4sB5G4B5GqEeEFqE4BeG5FetC4A5GqFCEeEFqE4BeG5FetC4A5GqFC"$ after pressing $FG,2$<CTRL-t>$FG$, now.
+* You can take the $LK,"Play",A="MN:Play"$() stmts out of a song file and place them in your programs.  You can also add a song to a document with $FG,2$<CTRL-l>$FG$, but you should do it after pressing $FG,2$<CTRL-t>$FG$ because the clip-insert in $FG,2$<CTRL-l>$FG$ is screwy.  See this $SO,"<Song>",A="4qG5EC4BeGG5qCeFD4sB5G4B5G4qG5EC4BeGG5qCeFD4sB5G4B5GqEeEFqE4BeG5FetC4A5GqFCEeEFqE4BeG5FetC4A5GqFC"$ after pressing $FG,2$<CTRL-t>$FG$, now.
 
 * You can call $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$("~/Psalmody"); to play your songs.
 

TempleOSCD/Apps/Psalmody/JukeBox.HC

@@ -62,7 +62,7 @@ Bool JBPutKey(CDoc *doc,U8 *,I64 ch,I64 sc)
       if (StrLen(doc_ce->tag)>1)
 	doc_ce->tag[0]=ch;
       doc2=DocRead(tmpde->full_name);
-      DocLineNumGoTo(doc2,1);
+      DocGoToLine(doc2,1);
       doc_e=doc2->cur_entry;
       if (doc_e!=doc2 && doc_e->type_u8==DOCT_TEXT && StrLen(doc_e->tag)>=3) {
 	doc_e->tag[2]=ch;
@@ -73,7 +73,7 @@ Bool JBPutKey(CDoc *doc,U8 *,I64 ch,I64 sc)
     } else if (ch=='r') {
       if (!DocTreeFFind(tmpde->full_name,"Reward1")) {
 	doc2=DocRead(tmpde->full_name);
-	DocLineNumGoTo(doc2,2);
+	DocGoToLine(doc2,2);
 	DocPrint(doc2,
 	      "\n$$TR,\"Reward1\"$$\n"
 	      "$$ID,2$$CallExtStr(\"JukeReward\",\"\"\n"

TempleOSCD/Apps/Psalmody/Psalmody.HC

@@ -50,7 +50,7 @@ class PsmNote
 class PsmCtrl
 {
   PsmNote head;
-  PsmNote clipboard;
+  PsmNote clip;
   CMenuEntry *incomplete_entry,*record_entry;
   I64 scrn_x,tool;
   PsmNote *cur_note;

TempleOSCD/Apps/Psalmody/PsalmodyFile.HC

@@ -26,10 +26,10 @@ U0 PsmSongDel(PsmNote *head)
   QueInit(head);
 }
 
-U0 PsmCutToClipboard()
+U0 PsmCutToClip()
 {
   PsmNote *tmpn,*tmpn1;
-  PsmSongDel(&psm.clipboard);
+  PsmSongDel(&psm.clip);
   tmpn=psm.head.next;
   while (tmpn!=&psm.head) {
     tmpn1=tmpn->next;
@@ -38,33 +38,33 @@ U0 PsmCutToClipboard()
 	psm.cur_note=tmpn->next;
       QueRem(tmpn);
       tmpn->flags&=~PSMF_SEL;
-      QueIns(tmpn,psm.clipboard.last);
+      QueIns(tmpn,psm.clip.last);
     }
     tmpn=tmpn1;
   }
 }
 
-U0 PsmPasteClipboard()
+U0 PsmPasteClip()
 {
   PsmNote *tmpn,*tmpn1;
-  tmpn=psm.clipboard.next;
-  while (tmpn!=&psm.clipboard) {
+  tmpn=psm.clip.next;
+  while (tmpn!=&psm.clip) {
     tmpn1=PsmNoteCopy(tmpn);
     QueIns(tmpn1,psm.cur_note->last);
     tmpn=tmpn->next;
   }
 }
 
-U0 PsmCopyToClipboard()
+U0 PsmCopyToClip()
 {
   PsmNote *tmpn,*tmpn1;
-  PsmSongDel(&psm.clipboard);
+  PsmSongDel(&psm.clip);
   tmpn=psm.head.next;
   while (tmpn!=&psm.head) {
     if (tmpn->flags&PSMF_SEL) {
       tmpn->flags&=~PSMF_SEL;
       tmpn1=PsmNoteCopy(tmpn);
-      QueIns(tmpn1,psm.clipboard.last);
+      QueIns(tmpn1,psm.clip.last);
     }
     tmpn=tmpn->next;
   }

TempleOSCD/Apps/Psalmody/PsalmodyMain.HC

@@ -369,7 +369,7 @@ U0 Psalmody(U8 *dirname="~/Psalmody")
   MemSet(&psm,0,sizeof(PsmCtrl));
   psm.scrn_x=0;
   psm.head.next=psm.head.last=&psm.head;
-  psm.clipboard.next=psm.clipboard.last=&psm.clipboard;
+  psm.clip.next=psm.clip.last=&psm.clip;
   psm.cur_note=&psm.head;
   psm.dc2=DCAlias;
 
@@ -543,7 +543,7 @@ mo_got_msg:
 		    break;
 		  case SC_DELETE:
 		    if (arg2&SCF_SHIFT)
-		      PsmCutToClipboard;
+		      PsmCutToClip;
 		    else {
 		      tmpn=psm.cur_note;
 		      psm.cur_note=tmpn->next;
@@ -555,9 +555,9 @@ mo_got_msg:
 		    break;
 		  case SC_INS:
 		    if (arg2&SCF_SHIFT)
-		      PsmPasteClipboard;
+		      PsmPasteClip;
 		    else if (arg2&SCF_CTRL)
-		      PsmCopyToClipboard;
+		      PsmCopyToClip;
 		    break;
 		  case SC_F1:
 		    PsmPopMode;
@@ -609,13 +609,13 @@ mo_got_msg:
 		PsmPushMode(psm_octave);
 		break;
 	      case CH_CTRLC:
-		PsmCopyToClipboard;
+		PsmCopyToClip;
 		break;
 	      case CH_CTRLV:
-		PsmPasteClipboard;
+		PsmPasteClip;
 		break;
 	      case CH_CTRLX:
-		PsmCutToClipboard;
+		PsmCutToClip;
 		break;
 	      case '.':
 		PsmMenu(psm_octave);
@@ -786,7 +786,7 @@ mo_done:
     PutExcept;
   PsmPopMode;
   PsmSongDel(&psm.head);
-  PsmSongDel(&psm.clipboard);
+  PsmSongDel(&psm.clip);
   TempoDel(c);
   DCFill;
   DCDel(psm.dc2);