X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fparser-clef.scm;h=a731e7459e7e6a38e6f796998d3f3b12b3852122;hb=c1c919567da299663c9d92e919e682df4be95602;hp=4f9a409c52eef0177eeafacb3b0840bf40f9c1d5;hpb=b7a0cffbf9d1069860368f289a5b50e9d1d90ba8;p=lilypond.git

diff --git a/scm/parser-clef.scm b/scm/parser-clef.scm
index 4f9a409c52..a731e7459e 100644
--- a/scm/parser-clef.scm
+++ b/scm/parser-clef.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -74,6 +74,7 @@
     ("petrucci-c5" . ("clefs.petrucci.c5" 4 0))
     ("petrucci-f3" . ("clefs.petrucci.f" 0 0))
     ("petrucci-f4" . ("clefs.petrucci.f" 2 0))
+    ("petrucci-f5" . ("clefs.petrucci.f" 4 0))
     ("petrucci-f" . ("clefs.petrucci.f" 2 0))
     ("petrucci-g" . ("clefs.petrucci.g" -2 0))))
 
@@ -105,7 +106,7 @@
     ("clefs.petrucci.g" . -4)))
 
 (define-public (make-clef-set clef-name)
-  "Generate the clef setting commands for a clef with name CLEF-NAME."
+  "Generate the clef setting commands for a clef with name @var{clef-name}."
   (define (make-prop-set props)
     (let ((m (make-music 'PropertySet)))
       (map (lambda (x) (set! (ly:music-property m (car x)) (cdr x))) props)
@@ -113,7 +114,7 @@
   (let ((e '())
 	(c0 0)
 	(oct 0)
-	(match (string-match "^(.*)([_^])([0-9]+)$" clef-name)))
+	(match (string-match "^(.*)([_^])([1-9][0-9]*)$" clef-name)))
     (if match
 	(begin
 	  (set! clef-name (match:substring match 1))
@@ -143,9 +144,70 @@
 		       (sort (map car supported-clefs) string<?)))
 	  (make-music 'Music)))))
 
+(define-public (make-cue-clef-set clef-name)
+  "Generate the clef setting commands for a cue clef with name
+@var{clef-name}."
+  (define (make-prop-set props)
+    (let ((m (make-music 'PropertySet)))
+      (map (lambda (x) (set! (ly:music-property m (car x)) (cdr x))) props)
+      m))
+  (let ((e '())
+	(c0 0)
+	(oct 0)
+	(match (string-match "^(.*)([_^])([1-9][0-9]*)$" clef-name)))
+    (if match
+	(begin
+	  (set! clef-name (match:substring match 1))
+	  (set! oct
+		(* (if (equal? (match:substring match 2) "^") -1 1)
+		   (- (string->number (match:substring match 3)) 1)))))
+    (set! e (assoc-get clef-name supported-clefs))
+    (if e
+	(let* ((musics (map make-prop-set
+			    `(((symbol . cueClefGlyph) (value . ,(car e)))
+			      ((symbol . middleCCuePosition)
+			       (value . ,(+ oct
+					    (cadr e)
+					    (assoc-get (car e) c0-pitch-alist))))
+			      ((symbol . cueClefPosition) (value . ,(cadr e)))
+			      ((symbol . cueClefOctavation) (value . ,(- oct))))))
+	       (recalc-mid-C (make-music 'ApplyContext))
+	       (seq (make-music 'SequentialMusic
+				'elements (append musics (list recalc-mid-C))))
+	       (csp (make-music 'ContextSpeccedMusic)))
+	  (set! (ly:music-property recalc-mid-C 'procedure) ly:set-middle-C!)
+	  (context-spec-music seq 'Staff))
+	(begin
+	  (ly:warning (_ "unknown clef type `~a'") clef-name)
+	  (ly:warning (_ "supported clefs: ~a")
+		      (string-join
+		       (sort (map car supported-clefs) string<?)))
+	  (make-music 'Music)))))
+
+
+(define-public (make-cue-clef-unset)
+  "Reset the clef settings for a cue clef."
+  (define (make-prop-unset props)
+    (let ((m (make-music 'PropertyUnset)))
+      (set! (ly:music-property m (car props)) (cdr props))
+      m))
+  (let* ((musics (map make-prop-unset
+			`((symbol . cueClefGlyph)
+			  (symbol . middleCCuePosition)
+			  (symbol . cueClefPosition)
+			  (symbol . cueClefOctavation))))
+	 (recalc-mid-C (make-music 'ApplyContext))
+	 (seq (make-music 'SequentialMusic
+			  'elements (append musics (list recalc-mid-C))))
+	 (csp (make-music 'ContextSpeccedMusic)))
+    (set! (ly:music-property recalc-mid-C 'procedure) ly:set-middle-C!)
+    (context-spec-music seq 'Staff)))
+
+
 ;; a function to add new clefs at runtime
 (define-public (add-new-clef clef-name clef-glyph clef-position octavation c0-position)
-  "Append the entries for a clef symbol to supported clefs and c0-pitch-alist"
+  "Append the entries for a clef symbol to supported clefs and
+@code{c0-pitch-alist}."
   (set! supported-clefs
         (acons clef-name (list clef-glyph clef-position octavation) supported-clefs))
   (set! c0-pitch-alist