X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fmusic-functions-init.ly;h=322dfa251183ce5ffc27bc08a85aa4db170ec0bb;hb=9c3ecc7d6e596e8151a58ce7ed0dd9e1b0802d1e;hp=725ba480a59642102338ef6b8a4333f6264d4fe6;hpb=cadebf9f77a2202f999bf34d4e9fab4dfb3d8f11;p=lilypond.git

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index 725ba480a5..322dfa2511 100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -1,6 +1,6 @@
 % -*-Scheme-*-
 
-\version "2.10.0"
+\version "2.12.0"
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14,7 +14,7 @@
 acciaccatura =
 #(def-grace-function startAcciaccaturaMusic stopAcciaccaturaMusic)
 
-addquote =
+addQuote =
 #(define-music-function (parser location name music) (string? ly:music?)
    (_i "Add a piece of music to be quoted ")
    (add-quotable parser name music)
@@ -98,23 +98,24 @@ applyContext =
                    'procedure proc))
 
 
-balloonText =
-#(define-music-function (parser location offset text) (number-pair? markup?)
+balloonGrobText =
+#(define-music-function (parser location grob-name offset text) (symbol? number-pair? markup?)
    
     (make-music 'AnnotateOutputEvent
+		'symbol grob-name
 		'X-offset (car offset)
 		'Y-offset (cdr offset)
 		'text text))
 
-balloonGrobText =
-#(define-music-function (parser location grob-name offset text) (symbol? number-pair? markup?)
+balloonText =
+#(define-music-function (parser location offset text) (number-pair? markup?)
    
     (make-music 'AnnotateOutputEvent
-		'symbol grob-name
 		'X-offset (car offset)
 		'Y-offset (cdr offset)
 		'text text))
 
+
 bar =
 #(define-music-function (parser location type)
    (string?)
@@ -125,6 +126,7 @@ bar =
 
 barNumberCheck =
 #(define-music-function (parser location n) (integer?)
+  (_i "Print a warning if the current bar number is not @var{n}.")
    (make-music 'ApplyContext 
 	       'origin location
 	       'procedure 
@@ -136,37 +138,32 @@ barNumberCheck =
 					 cbn n))))))
 
 
+bendAfter =
+#(define-music-function (parser location delta) (real?)
+  (_i "Create a fall or doit of pitch interval @var{delta}.")
+  (make-music 'BendAfterEvent
+   'delta-step delta))
+
 %% why a function?
 breathe =
 #(define-music-function (parser location) ()
+  (_i "Insert a breath mark.")
             (make-music 'EventChord 
               'origin location
               'elements (list (make-music 'BreathingEvent))))
 
-bendAfter =
-#(define-music-function (parser location delta) (integer?)
-	      
-  (make-music 'BendAfterEvent
-   'delta-step delta))
 
 clef =
-#(define-music-function (parser location type)
-   (string?)
-   (_i "Set the current clef.")
-
+#(define-music-function (parser location type) (string?)
+  (_i "Set the current clef to @var{type}.")
    (make-clef-set type))
 
 
-compressMusic =
-#(define-music-function
-		  (parser location fraction music) (number-pair? ly:music?)
-		  (ly:music-compress music (ly:make-moment (car fraction) (cdr fraction))))
-
-
 cueDuring = 
 #(define-music-function
-  (parser location what dir main-music)
-  (string? ly:dir? ly:music?)
+  (parser location what dir main-music) (string? ly:dir? ly:music?)
+  (_i "Insert contents of quote @var{what} corresponding to @var{main-music},
+in a CueVoice oriented by @var{dir}.")
   (make-music 'QuoteMusic
 	      'element main-music 
 	      'quoted-context-type 'Voice
@@ -175,26 +172,51 @@ cueDuring =
 	      'quoted-voice-direction dir
 	      'origin location))
 
-%% The following causes an error with guile 1.6.8 (guile 1.6.7 and 1.8.x are fine)
-#(use-modules (scm display-lily))
-
 displayLilyMusic =
 #(define-music-function (parser location music) (ly:music?)
+  (_i "Display  the LilyPond input representation of @var{music}
+to the console.")
    (newline)
    (display-lily-music music parser)
    music)
 
 displayMusic =
 #(define-music-function (parser location music) (ly:music?)
+  (_i "Display the internal representation of @var{music} to the console.")
    (newline)
    (display-scheme-music music)
    music)
 
+
+endSpanners =
+#(define-music-function (parser location music) (ly:music?)
+  (_i "Terminate the next spanner prematurely after exactly one note without the need of a specific end spanner.")
+   (if (eq? (ly:music-property music 'name) 'EventChord)
+       (let*
+	   ((elts (ly:music-property music 'elements))
+	    (start-span-evs (filter (lambda (ev)
+				(and (music-has-type ev 'span-event)
+				     (equal? (ly:music-property ev 'span-direction)
+					     START)))
+			      elts))
+	    (stop-span-evs
+	     (map (lambda (m)
+		    (let* ((c (music-clone m)))
+		      (set! (ly:music-property c 'span-direction) STOP)
+		      c))
+		  start-span-evs))
+	    (end-ev-chord (make-music 'EventChord
+				      'elements stop-span-evs))
+	    (total (make-music 'SequentialMusic
+			       'elements (list music
+					       end-ev-chord))))
+	 total)
+       
+       (ly:input-message location (_ "argument endSpanners is not an EventChord: ~a" music))))
+
 featherDurations=
 #(define-music-function (parser location factor argument) (ly:moment? ly:music?)
-   (_i "Rearrange durations in ARGUMENT so there is an
-acceleration/deceleration. ")
-   
+ (_i "Adjust durations of music in @var{argument} by rational @var{factor}. ")
    (let*
        ((orig-duration (ly:music-length argument))
 	(multiplier (ly:make-moment 1 1)))
@@ -217,8 +239,8 @@ acceleration/deceleration. ")
      argument))
 
 grace =
-#(def-grace-function startGraceMusic stopGraceMusic)
-
+#(def-grace-function startGraceMusic stopGraceMusic
+   (_i "Insert @var{music} as grace notes."))
 
 "instrument-definitions" = #'()
 
@@ -234,6 +256,8 @@ addInstrumentDefinition =
 instrumentSwitch =
 #(define-music-function
    (parser location name) (string?)
+   (_i "Switch instrument to @var{name}, which must be predefined with 
+@var{\addInstrumentDefinition}.")
    (let*
        ((handle  (assoc name instrument-definitions))
 	(instrument-def (if handle (cdr handle) '()))
@@ -252,9 +276,29 @@ instrumentSwitch =
       'Staff)))
 
 
+%% Parser used to read page-layout file, and then retreive score tweaks.
+#(define page-layout-parser #f)
+
+includePageLayoutFile = 
+#(define-music-function (parser location) ()
+   (_i "Include the file @var{<basename>-page-layout.ly}. Deprecated as
+part of two-pass spacing.")
+   (if (not (ly:get-option 'dump-tweaks))
+       (let ((tweak-filename (format #f "~a-page-layout.ly"
+				     (ly:parser-output-name parser))))
+	 (if (access? tweak-filename R_OK)
+	     (begin
+	       (ly:message "Including tweak file ~a" tweak-filename)
+               (set! page-layout-parser (ly:parser-clone parser))
+	       (ly:parser-parse-string page-layout-parser
+                                       (format #f "\\include \"~a\""
+                                               tweak-filename))))))
+   (make-music 'SequentialMusic 'void #t))
+
 keepWithTag =
 #(define-music-function
   (parser location tag music) (symbol? ly:music?)
+  (_i "Include only elements of @var{music} that are tagged with @var{tag}.")
   (music-filter
    (lambda (m)
     (let* ((tags (ly:music-property m 'tags))
@@ -264,22 +308,41 @@ keepWithTag =
       res)))
    music))
 
-
+removeWithTag = 
+#(define-music-function
+  (parser location tag music) (symbol? ly:music?)
+  (_i "Remove elements of @var{music} that are tagged with @var{tag}.")
+  (music-filter
+   (lambda (m)
+    (let* ((tags (ly:music-property m 'tags))
+           (res (memq tag tags)))
+     (not res)))
+ music))
 
 killCues =
 #(define-music-function
    (parser location music)
    (ly:music?)
+   (_i "Remove cue notes from @var{music}.")
    (music-map
     (lambda (mus)
       (if (string? (ly:music-property mus 'quoted-music-name))
 	  (ly:music-property mus 'element)
 	  mus)) music))
-   
+
+label = 
+#(define-music-function (parser location label) (symbol?)
+   (_i "Create @var{label} as a bookmarking label")
+   (make-music 'EventChord
+	       'page-marker #t
+	       'page-label label
+	       'elements (list (make-music 'LabelEvent
+					   'page-label label)))) 
 
 makeClusters =
 #(define-music-function
 		(parser location arg) (ly:music?)
+   (_i "Display chords in @var{arg} as clusters")
 		(music-map note-to-cluster arg))
 
 musicMap =
@@ -326,29 +389,83 @@ or @code{\"GrobName\"}")
 			grob-name)
 		       (set! (ly:grob-property grob property) value))))))
 
-
-removeWithTag = 
-#(define-music-function
-  (parser location tag music) (symbol? ly:music?)
-  (music-filter
-   (lambda (m)
-    (let* ((tags (ly:music-property m 'tags))
-           (res (memq tag tags)))
-     (not res)))
- music))
+%% These are music functions (iso music indentifiers), because music identifiers
+%% are not allowed at top-level.
+pageBreak =
+#(define-music-function (location parser) ()
+   (_i "Force a page break. May be used at toplevel (ie between scores or
+markups), or inside a score.")
+   (make-music 'EventChord
+	       'page-marker #t
+	       'line-break-permission 'force
+	       'page-break-permission 'force
+	       'elements (list (make-music 'LineBreakEvent
+					   'break-permission 'force)
+			       (make-music 'PageBreakEvent
+					   'break-permission 'force))))
+
+noPageBreak =
+#(define-music-function (location parser) ()
+   (_i "Forbid a page break. May be used at toplevel (ie between scores or
+markups), or inside a score.")
+   (make-music 'EventChord
+	       'page-marker #t
+	       'page-break-permission 'forbid
+	       'elements (list (make-music 'PageBreakEvent
+					   'break-permission '()))))
+
+pageTurn =
+#(define-music-function (location parser) ()
+   (_i "Force a page turn between two scores or top-level markups.")
+   (make-music 'EventChord 
+	       'page-marker #t
+	       'line-break-permission 'force
+	       'page-break-permission 'force
+	       'page-turn-permission 'force
+	       'elements (list (make-music 'LineBreakEvent
+					   'break-permission 'force)
+			       (make-music 'PageBreakEvent
+					   'break-permission 'force)
+			       (make-music 'PageTurnEvent
+					   'break-permission 'force))))
+
+noPageTurn =
+#(define-music-function (location parser) ()
+   (_i "Forbid a page turn. May be used at toplevel (ie between scores or
+markups), or inside a score.")
+   (make-music 'EventChord
+	       'page-marker #t
+	       'page-turn-permission 'forbid
+	       'elements (list (make-music 'PageTurnEvent
+					   'break-permission '()))))
+
+allowPageTurn =
+#(define-music-function (location parser) ()
+   (_i "Allow a page turn. May be used at toplevel (ie between scores or
+markups), or inside a score.")
+   (make-music 'EventChord
+	       'page-marker #t
+	       'page-turn-permission 'allow
+	       'elements (list (make-music 'PageTurnEvent
+					   'break-permission 'allow))))
 
 %% Todo:
 %% doing
 %% define-music-function in a .scm causes crash.
 
-octave =
+octaveCheck =
 #(define-music-function (parser location pitch-note) (ly:music?)
    (_i "octave check")
 
    (make-music 'RelativeOctaveCheck
 	       'origin location
 	       'pitch (pitch-of-note pitch-note) 
-	       ))
+           ))
+
+ottava = #(define-music-function (parser location octave) (number?)
+  (_i "set the octavation ")
+  (make-ottava-set octave))
+
 partcombine =
 #(define-music-function (parser location part1 part2) (ly:music? ly:music?)
                 (make-part-combine-music parser
@@ -365,29 +482,28 @@ pitchedTrill =
 		      (lambda (m) (eq? 'NoteEvent (ly:music-property m 'name)))
 		      (ly:music-property ev-chord 'elements))))
 	(sec-note-events (get-notes secondary-note))
-	(trill-events (filter (lambda (m) (memq 'trill-span-event (ly:music-property m 'types)))
-			      (ly:music-property main-note 'elements)))
-
-	(trill-pitch
-	 (if (pair? sec-note-events)
-	     (ly:music-property (car sec-note-events) 'pitch)
-	     )))
-     
-     (if (ly:pitch? trill-pitch)
-	 (for-each (lambda (m) (ly:music-set-property! m 'pitch trill-pitch))
-		   trill-events)
-	 (begin
-	   (ly:warning (_ "Second argument of \\pitchedTrill should be single note: "))
-	   (display sec-note-events)))
+	(trill-events (filter (lambda (m) (music-has-type m 'trill-span-event))
+			      (ly:music-property main-note 'elements))))
 
+     (if (pair? sec-note-events)
+	 (begin
+	   (let*
+	       ((trill-pitch (ly:music-property (car sec-note-events) 'pitch))
+		(forced (ly:music-property (car sec-note-events ) 'force-accidental)))
+	     
+	     (if (ly:pitch? trill-pitch)
+		 (for-each (lambda (m) (ly:music-set-property! m 'pitch trill-pitch))
+			   trill-events)
+		 (begin
+		   (ly:warning (_ "Second argument of \\pitchedTrill should be single note: "))
+		   (display sec-note-events)))
+
+	     (if (eq? forced #t)
+		 (for-each (lambda (m) (ly:music-set-property! m 'force-accidental forced))
+			   trill-events)))))
      main-note))
-   
-parenthesize =
-#(define-music-function (parser loc arg) (ly:music?)
-   (_i "Tag @var{arg} to be parenthesized.")
 
-   (set! (ly:music-property arg 'parenthesize) #t)
-   arg)
+
 
 %% for lambda*
 #(use-modules (ice-9 optargs))
@@ -485,6 +601,23 @@ Example:
 
 
 
+parenthesize =
+#(define-music-function (parser loc arg) (ly:music?)
+   (_i "Tag @var{arg} to be parenthesized.")
+
+   (if (memq 'event-chord (ly:music-property arg 'types))
+     ; arg is an EventChord -> set the parenthesize property on all child notes and rests
+     (map
+       (lambda (ev)
+         (if (or (memq 'note-event (ly:music-property ev 'types))
+                 (memq 'rest-event (ly:music-property ev 'types)))
+           (set! (ly:music-property ev 'parenthesize) #t)))
+       (ly:music-property arg 'elements))
+     ; No chord, simply set property for this expression:
+     (set! (ly:music-property arg 'parenthesize) #t))
+   arg)
+
+
 quoteDuring = #
 (define-music-function
   (parser location what main-music)
@@ -515,6 +648,12 @@ resetRelativeOctave  =
     reference-note))
 
 
+scaleDurations =
+#(define-music-function
+		  (parser location fraction music) (number-pair? ly:music?)
+		  (ly:music-compress music (ly:make-moment (car fraction) (cdr fraction))))
+
+
 
 shiftDurations =
 #(define-music-function (parser location dur dots arg) (integer? integer? ly:music?)
@@ -531,28 +670,10 @@ the `parameters' assoc list.")
    #{
       \overrideProperty #"Score.NonMusicalPaperColumn"
         #'line-break-system-details
-        #$(list (cons 'alignment-extra-space (cdr (assoc 'system-stretch parameters))))
+        #$(list (cons 'alignment-extra-space (cdr (assoc 'system-stretch parameters)))
+		(cons 'system-Y-extent (cdr (assoc 'system-Y-extent parameters))))
    #})
 
-%% Parser used to read page-layout file, and then retreive score tweaks.
-#(define page-layout-parser #f)
-
-includePageLayoutFile = 
-#(define-music-function (parser location) ()
-   (_i "If page breaks and tweak dump is not asked, and the file
-<basename>-page-layout.ly exists, include it.")
-   (if (not (ly:get-option 'dump-tweaks))
-       (let ((tweak-filename (format #f "~a-page-layout.ly"
-				     (ly:parser-output-name parser))))
-	 (if (access? tweak-filename R_OK)
-	     (begin
-	       (ly:message "Including tweak file ~a" tweak-filename)
-               (set! page-layout-parser (ly:parser-clone parser))
-	       (ly:parser-parse-string page-layout-parser
-                                       (format #f "\\include \"~a\""
-                                               tweak-filename))))))
-   (make-music 'SequentialMusic 'void #t))
-
 
 rightHandFinger =
 #(define-music-function (parser location finger) (number-or-string?)
@@ -578,6 +699,20 @@ scoreTweak =
              (make-music 'SequentialMusic)))
        (make-music 'SequentialMusic)))
 
+
+tag = #(define-music-function (parser location tag arg)
+   (symbol? ly:music?)
+
+   (_i "Add @var{tag} to the @code{tags} property of @var{arg}.")
+
+   (set!
+    (ly:music-property arg 'tags)
+    (cons tag
+	  (ly:music-property arg 'tags)))
+   arg)
+
+
+
 transposedCueDuring =
 #(define-music-function
   (parser location what dir pitch-note main-music)
@@ -620,16 +755,6 @@ tweak = #(define-music-function (parser location sym val arg)
 		   (ly:music-property arg 'tweaks)))
 	   arg)
 
-tag = #(define-music-function (parser location tag arg)
-   (symbol? ly:music?)
-
-   (_i "Add @var{tag} to the @code{tags} property of @var{arg}.")
-
-   (set!
-    (ly:music-property arg 'tags)
-    (cons tag
-	  (ly:music-property arg 'tags)))
-   arg)
 
 
 unfoldRepeats =
@@ -644,5 +769,3 @@ withMusicProperty =
 
    (set! (ly:music-property music sym) val)
    music)
-
-