Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/denemo

configure.ac aubio to default to yes
denemo · Jun 8, 2016 · 6f899b7 · 6f899b7
2 parents 88090af + bd8decc
commit 6f899b7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 29 deletions.
diff --git a/actions/menus/ObjectMenu/StaffMenu/InsertStaff/CreateClickStaff.scm b/actions/menus/ObjectMenu/StaffMenu/InsertStaff/CreateClickStaff.scm
@@ -26,6 +26,7 @@
 
 ;;;procedure adds beats to the bar and plays it the recursively call the procedure to ask if it should be duplicated.               
     (define (populate-measure)
+    	(d-DirectiveDelete-standalone "Blank")
         (let* ((numerator  (duration::GetNumerator))
                 (denominator (duration::lilypond->denemo (duration::GetDenominator)))
                 (put-beat (eval-string (string-append "d-" (number->string denominator)))))

diff --git a/actions/menus/ObjectMenu/StaffMenu/InsertStaff/NewStructuredStaff.scm b/actions/menus/ObjectMenu/StaffMenu/InsertStaff/NewStructuredStaff.scm
@@ -1,38 +1,34 @@
 ;;;; NewStructuredStaff
 (let ((params NewStructuredStaff::params))
-    (d-MoveToBeginning)
-    (if (eq? params 'initial)
-        (d-AddInitial)
-        (d-AddAfter))
-    (if (eq? params 'voice)
-        (d-SetCurrentStaffAsVoice))
-    (if (not (eq? params 'initial))
-        (d-MoveToStaffUp)
-        (d-MoveToStaffDown))
-
-    (if (or (Timesignature?) (d-Directive-standalone? "Upbeat")(d-Directive-standalone? "ShortMeasure"))
-            (begin
+    (define (copy-this)
                 (d-PushPosition)
                 (d-UnsetMark)
                 (d-SetMark)
                 (d-Copy)
-                (if (eq? params 'initial)
-                    (d-MoveToStaffUp)
-                    (d-MoveToStaffDown))
+                (if (not params)
+                    (d-MoveToStaffDown)
+                    (d-MoveToStaffUp))
                 (d-Paste) 
-                (d-PopPosition)))
+                (d-PopPosition))
+    (d-MoveToBeginning)
+    (case params 
+        ((initial)
+        (d-AddInitial))
+        ((before)
+            (d-AddBefore))
+        (else
+            (d-AddAfter)))
+    (if (eq? params 'voice)
+        (begin
+            (set! params #f)
+            (d-SetCurrentStaffAsVoice)))
+    (if (not params)
+            (d-MoveToStaffUp) 
+            (d-MoveToStaffDown))
+    (if (or (Timesignature?) (d-Directive-standalone? "Upbeat") (d-Directive-standalone? "Blank") (d-Directive-standalone? "ShortMeasure"))
+        (copy-this))
     (while (d-MoveCursorRight)
-        (if (or (Timesignature?) (d-Directive-standalone? "Upbeat")(d-Directive-standalone? "ShortMeasure"))
-            (begin
-                (d-PushPosition)
-                (d-UnsetMark)
-                (d-SetMark)
-                (d-Copy)
-                (if (eq? params 'initial)
-                    (d-MoveToStaffUp)
-                    (d-MoveToStaffDown))
-
-                (d-Paste) 
-                (d-PopPosition))))
+        (if (or (Timesignature?) (d-Directive-standalone? "Upbeat") (d-Directive-standalone? "Blank") (d-Directive-standalone? "ShortMeasure"))
+            (copy-this)))
     (d-MoveToStaffDown)
     (d-MoveToBeginning))
diff --git a/src/command/select.c b/src/command/select.c
@@ -915,7 +915,7 @@ pastewrapper (GtkAction * action, DenemoScriptParam * param)
 {
   stage_undo (Denemo.project->movement, ACTION_STAGE_END);        //undo is a queue (ie stack) so we push the end first
 
-  if (copybuffer == NULL)
+  if ((Denemo.project->movement->directive_on_clipboard) && (copybuffer == NULL))
     call_out_to_guile ("(eval-string CreateScriptForDirective::clipboard)");
   else
     call_out_to_guile ("(DenemoPaste)");