Rename command files. Add test to commands to prevent crashing scripts on button cancel

8 files changed, 25 insertions, 33 deletions

diff --git a/actions/Default.commands b/actions/Default.commands
index b443698f..04b26953 100644
--- a/actions/Default.commands
+++ b/actions/Default.commands
@@ -4373,31 +4373,31 @@ for second and subsequent systems</tooltip>
         <tooltip>Create a selection, move cursor left.</tooltip>
       </row>
       <row>
-        <action>InsertStringAsBinaryRhythm</action>
+        <action>NotationMagick-InsertStringAsBinaryRhythm</action>
         <scheme></scheme>
         <menupath>/ObjectMenu/NotationMagick/GenerateRhythmFromString</menupath>
         <label>Insert string as binary rhythm</label>
         <tooltip>Give a string to generate a rhythm out of its ascii chars in binary encoding</tooltip>
       </row>
       <row>
-        <action>InsertReversedStringAsBinaryRhythm</action>
-        <after>InsertStringAsBinaryRhythm</after>
+        <action>NotationMagick-InsertReversedStringAsBinaryRhythm</action>
+        <after>NotationMagick-InsertStringAsBinaryRhythm</after>
         <scheme></scheme>
         <menupath>/ObjectMenu/NotationMagick/GenerateRhythmFromString</menupath>
         <label>Insert reversed string as binary rhythm</label>
         <tooltip>Give a string to generate a rhythm out of its ascii chars in binary encoding. The string gets reversed before converting.</tooltip>
       </row>
       <row>
-        <action>InsertStringAsReversedBinaryRhythm</action>
-        <after>InsertReversedStringAsBinaryRhythm</after>
+        <action>NotationMagick-InsertStringAsReversedBinaryRhythm</action>
+        <after>NotationMagick-InsertReversedStringAsBinaryRhythm</after>
         <scheme></scheme>
         <menupath>/ObjectMenu/NotationMagick/GenerateRhythmFromString</menupath>
         <label>Insert string as reversed binary rhythm</label>
         <tooltip>Give a string to generate a rhythm out of its ascii chars in binary encoding. The rhythm for each letter gets reversed before inserting.</tooltip>
       </row>
       <row>
-        <action>InsertReversedStringAsReversedBinaryRhythm</action>
-        <after>InsertStringAsReversedBinaryRhythm</after>
+        <action>NotationMagick-InsertReversedStringAsReversedBinaryRhythm</action>
+        <after>NotationMagick-InsertStringAsReversedBinaryRhythm</after>
         <scheme></scheme>
         <menupath>/ObjectMenu/NotationMagick/GenerateRhythmFromString</menupath>
         <label>Insert reversed string as reversed binary rhythm</label>
diff --git a/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/InsertReversedStringAsBinaryRhythm b/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/NotationMagick-InsertReversedStringAsBinaryRhythm
index f52b315e..2b4854e5 100644
--- a/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/InsertReversedStringAsBinaryRhythm
+++ b/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/NotationMagick-InsertReversedStringAsBinaryRhythm
@@ -5,8 +5,8 @@
     <author>AT, JRR, RTS</author>
     <map>
       <row>
-        <after>InsertStringAsBinaryRhythm</after>
-        <action>InsertReversedStringAsBinaryRhythm</action>
+        <after>NotationMagick-InsertStringAsBinaryRhythm</after>
+        <action>NotationMagick-InsertReversedStringAsBinaryRhythm</action>
         <scheme>(let ((return (NotationMagick::AskNewAsciistring)))
 	(if return
 		 (NotationMagick::PutBinaryStringList (reverse (NotationMagick::String-&gt;CharsAsBinary return)))
diff --git a/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/InsertReversedStringAsReversedBinaryRhythm b/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/NotationMagick-InsertReversedStringAsReversedBinaryRhythm
index fe977c04..1c65228e 100644
--- a/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/InsertReversedStringAsReversedBinaryRhythm
+++ b/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/NotationMagick-InsertReversedStringAsReversedBinaryRhythm
@@ -5,8 +5,8 @@
     <author>AT, JRR, RTS</author>
     <map>
       <row>
-        <after>InsertStringAsReversedBinaryRhythm</after>
-        <action>InsertReversedStringAsReversedBinaryRhythm</action>
+        <after>NotationMagick-InsertStringAsReversedBinaryRhythm</after>
+        <action>NotationMagick-InsertReversedStringAsReversedBinaryRhythm</action>
         <scheme>(let ((return (NotationMagick::AskNewAsciistring)))
 	(if return
 		 (NotationMagick::PutBinaryStringList  (reverse (NotationMagick::ReverseStringsInList (NotationMagick::String-&gt;CharsAsBinary return))))
diff --git a/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/InsertStringAsBinaryRhythm b/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/NotationMagick-InsertStringAsBinaryRhythm
index d2d8d6da..8eb966f3 100644
--- a/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/InsertStringAsBinaryRhythm
+++ b/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/NotationMagick-InsertStringAsBinaryRhythm
@@ -5,7 +5,7 @@
     <author>AT, JRR, RTS</author>
     <map>
       <row>
-        <action>InsertStringAsBinaryRhythm</action>
+        <action>NotationMagick-InsertStringAsBinaryRhythm</action>
         <scheme>(let ((return (NotationMagick::AskNewAsciistring)))
 	(if return
 		(NotationMagick::PutBinaryStringList (NotationMagick::String-&gt;CharsAsBinary return))
diff --git a/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/InsertStringAsReversedBinaryRhythm b/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/NotationMagick-InsertStringAsReversedBinaryRhythm
index dab61fbc..bc2dc61a 100644
--- a/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/InsertStringAsReversedBinaryRhythm
+++ b/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/NotationMagick-InsertStringAsReversedBinaryRhythm
@@ -5,8 +5,8 @@
     <author>AT, JRR, RTS</author>
     <map>
       <row>
-        <after>InsertReversedStringAsBinaryRhythm</after>
-        <action>InsertStringAsReversedBinaryRhythm</action>
+        <after>NotationMagick-InsertReversedStringAsBinaryRhythm</after>
+        <action>NotationMagick-InsertStringAsReversedBinaryRhythm</action>
         <scheme>(let ((return (NotationMagick::AskNewAsciistring)))
 	(if return
 		(NotationMagick::PutBinaryStringList (NotationMagick::ReverseStringsInList (NotationMagick::String-&gt;CharsAsBinary return)))
diff --git a/actions/menus/ObjectMenu/NotationMagick/NotationMagick-InsertNoteFromPool b/actions/menus/ObjectMenu/NotationMagick/NotationMagick-InsertNoteFromPool
deleted file mode 100644
index 7b6d054d..00000000
--- a/actions/menus/ObjectMenu/NotationMagick/NotationMagick-InsertNoteFromPool
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<Denemo>
-  <merge>
-    <title>A Denemo Keymap</title>
-    <author>AT, JRR, RTS</author>
-    <map>
-      <row>
-        <action>NotationMagick-InsertNoteFromPool</action>
-        <scheme>;;; Part of NotationMagick 
-				(NotationMagick::InsertMemberRandomlyLy (NotationMagick::AskNewNotationstring))</scheme>
-        <label>Note from pool</label>
-        <tooltip>Inserts one note from a user-specified pool of notes in Lilypond syntax</tooltip>
-      </row>
-    </map>
-  </merge>
-</Denemo>
diff --git a/actions/menus/ObjectMenu/NotationMagick/NotationMagick-InsertPoolShuffled b/actions/menus/ObjectMenu/NotationMagick/NotationMagick-InsertPoolShuffled
index 5de103fb..83b2889d 100644
--- a/actions/menus/ObjectMenu/NotationMagick/NotationMagick-InsertPoolShuffled
+++ b/actions/menus/ObjectMenu/NotationMagick/NotationMagick-InsertPoolShuffled
@@ -6,8 +6,12 @@
     <map>
       <row>
         <action>NotationMagick-InsertPoolShuffled</action>
-        <scheme>;;; Part of NotationMagick 
-				(NotationMagick::InsertListRandomlyLy (NotationMagick::AskNewNotationstring))</scheme>
+		<scheme>;;; Part of NotationMagick 
+				(let ((return (NotationMagick::AskNewNotationstring)))
+					(if return
+						 (NotationMagick::InsertListRandomlyLy return)
+						#f))
+		</scheme>
         <label>Insert shuffled pool</label>
         <tooltip>Inserts all notes, shuffled, from a user-specified pool of notes in Lilypond syntax</tooltip>
       </row>
diff --git a/actions/menus/ObjectMenu/NotationMagick/SingleRandomNote/NotationMagick-InsertNoteFromPool b/actions/menus/ObjectMenu/NotationMagick/SingleRandomNote/NotationMagick-InsertNoteFromPool
index 7b6d054d..27d10d8f 100644
--- a/actions/menus/ObjectMenu/NotationMagick/SingleRandomNote/NotationMagick-InsertNoteFromPool
+++ b/actions/menus/ObjectMenu/NotationMagick/SingleRandomNote/NotationMagick-InsertNoteFromPool
@@ -7,7 +7,11 @@
       <row>
         <action>NotationMagick-InsertNoteFromPool</action>
         <scheme>;;; Part of NotationMagick 
-				(NotationMagick::InsertMemberRandomlyLy (NotationMagick::AskNewNotationstring))</scheme>
+				(let ((return (NotationMagick::AskNewNotationstring)))
+					(if return
+						 (NotationMagick::InsertMemberRandomlyLy return)
+						#f))
+		</scheme>
         <label>Note from pool</label>
         <tooltip>Inserts one note from a user-specified pool of notes in Lilypond syntax</tooltip>
       </row>