X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-lib.scm;h=2496763397fd36deaf92990a186c2e07ecb456bf;hb=198f4d748307a3d6d8be3bb29e4197606f24b6b8;hp=d5d9d10264b5748adcf5f3bd65dcd313ce749751;hpb=ea6d4c224d988252a9cff44776d0159b4c26a443;p=lilypond.git

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index d5d9d10264..2496763397 100644
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -2,24 +2,26 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 
 ;;; Tablature functions, by Jiba (jiba@tuxfamily.org)
 
 ;; The TabNoteHead stem attachment function.
-(define (tablature-stem-attachment-function style duration)
-  (cons 0.0 0.5))
+(define (note-head::calc-tablature-stem-attachment grob)
+  (cons 0.0 1.35))
 
 ;; The TabNoteHead tablatureFormat callback.
 ;; Compute the text grob-property
 (define-public (fret-number-tablature-format string tuning pitch)
-  (number->string
-   (- (ly:pitch-semitones pitch)
-      (list-ref tuning
-		;; remove 1 because list index starts at 0 and guitar string at 1. 
-                (- string 1)))))
+  (make-whiteout-markup
+   (make-vcenter-markup  
+    (number->string
+     (- (ly:pitch-semitones pitch)
+	(list-ref tuning
+		  ;; remove 1 because list index starts at 0 and guitar string at 1. 
+		  (- string 1)))))))
 
 ;; The 5-string banjo has got a extra string, the fifth (duh), wich
 ;; starts at the fifth fret on the neck. Frets on the fifth string
@@ -28,53 +30,20 @@
 ;;   on the banjo neck.
 ;; We solve this by defining a new fret-number-tablature function:
 (define-public (fret-number-tablature-format-banjo string tuning pitch)
+  (make-whiteout-markup
+   (make-vcenter-markup  
     (let ((fret (- (ly:pitch-semitones pitch) (list-ref tuning (- string 1)))))
-        (number->string (cond
-            ((and (> fret 0) (= string 5))
-                (+ fret 5))
-            (else fret)))))
-
-(define-public (hammer-print-function grob)
-  (let* ((note-collums (ly:grob-property grob 'note-columns))
-         (note-column1 (cadr note-collums))
-         (note-column2 (car  note-collums))
-         (note1 (car (ly:grob-property note-column1 'note-heads)))
-         (note2 (car (ly:grob-property note-column2 'note-heads)))
-	 (text1 (ly:grob-property note1 'text))
-	 (text2 (ly:grob-property note2 'text))
-         (fret1 (if (string? text1) (string->number text1) 0))
-         (fret2 (if (string? text2) (string->number text2) 0))
-         (letter (cond
-		  ((< fret1 fret2) "H")
-		  ((> fret1 fret2) "P")
-		  (else ""))))
-    (let* ((slur
-	    ;; (Slur::print grob)
-
-	    ;; 
-	    ;; FIXME: a hammer is not a slur.
-	    ;; 
-	    (ly:make-stencil '() '(0 . 0) '(0 . 0)))
-	   (layout (ly:grob-layout grob))
-	   (text (interpret-markup
-		  layout
-		  (ly:grob-alist-chain grob (ly:output-def-lookup layout 'text-font-defaults))
-		  letter)))
-      
-      (let ((x (/ (- (cdr (ly:stencil-extent slur 0)) 
-                     (/ (cdr (ly:stencil-extent text 0)) 2.0))
-                  -2.0)))
-
-	(set! text
-	      (ly:make-stencil (ly:stencil-expr text)
-			       (cons x x)
-			       (ly:stencil-extent text Y)))
-	
-        (ly:stencil-aligned-to text X RIGHT)))))
+      (number->string (cond
+		       ((and (> fret 0) (= string 5))
+			(+ fret 5))
+		       (else fret)))))))
 
 
+; default tunings for common string instruments
 (define-public guitar-tuning '(4 -1 -5 -10 -15 -20))
+(define-public guitar-open-g-tuning '(2 -1 -5 -10 -17 -22))
 (define-public bass-tuning '(-17 -22 -27 -32))
+(define-public mandolin-tuning '(16 9 2 -5))
 
 ;; tunings for 5-string banjo
 (define-public banjo-open-g-tuning '(2 -1 -5 -10 7))
@@ -82,19 +51,18 @@
 (define-public banjo-modal-tuning '(2 0 -5 -10 7))
 (define-public banjo-open-d-tuning '(2 -3 -6 -10 9))
 (define-public banjo-open-dm-tuning '(2 -3 -6 -10 9))
-;; convert 5-string banjo tunings to 4-string tunings by
-;; removing the 5th string
-;;
-;; example:
-;; \set TabStaff.stringTunings = #(four-string-banjo banjo-open-g-tuning)
+;; convert 5-string banjo tuning to 4-string by removing the 5th string
 (define-public (four-string-banjo tuning)
   (reverse (cdr (reverse tuning))))
 
 ;;; end of tablature functions
 
 (define-public (make-stencil-boxer thickness padding callback)
+
   "Return function that adds a box around the grob passed as argument."
-  (lambda (grob) (box-stencil (callback grob) thickness padding)))
+  (lambda (grob)
+    
+    (box-stencil (callback grob) thickness padding)))
 
 (define-public (make-stencil-circler thickness padding callback)
   "Return function that adds a circle around the grob passed as argument."
@@ -107,14 +75,13 @@
 
 (define-public (print-circled-text-callback grob)
   (let* ((text (ly:grob-property grob 'text))
+	 
 	 (layout (ly:grob-layout grob))
 	 (defs (ly:output-def-lookup layout 'text-font-defaults))
 	 (props (ly:grob-alist-chain grob defs))
-	 (circle (Text_interface::interpret_markup
-		  layout props (make-draw-circle-markup 0.8 0.1 #f)))
-	 (text-stencil (Text_interface::interpret_markup layout props text)))
-    
-    (ly:stencil-add (centered-stencil text-stencil) circle)))
+	 (circle (ly:text-interface::interpret-markup
+		  layout props (make-circle-markup text))))
+    circle))
 
 
 ;;(define (mm-to-pt x)
@@ -144,37 +111,45 @@
 
 
 ;; silly, use alist? 
-(define-public (find-notehead-symbol duration style)
-  (case style
-    ((xcircle) "2xcircle")
-    ((harmonic) "0harmonic")
-    ((baroque) 
-     ;; Oops, I actually would not call this "baroque", but, for
-     ;; backwards compatibility to 1.4, this is supposed to take
-     ;; brevis, longa and maxima from the neo-mensural font and all
-     ;; other note heads from the default font.  -- jr
-     (if (< duration 0)
-	 (string-append (number->string duration) "neomensural")
-	 (number->string duration)))
-    ((mensural)
-     (string-append (number->string duration) (symbol->string style)))
-    ((neomensural)
-     (string-append (number->string duration) (symbol->string style)))
-    ((default)
-     ;; The default font in mf/feta-bolletjes.mf defines a brevis, but
-     ;; neither a longa nor a maxima.  Hence let us, for the moment,
-     ;; take these from the neo-mensural font.  TODO: mf/feta-bolletjes
-     ;; should define at least a longa for the default font.  The longa
-     ;; should look exactly like the brevis of the default font, but
-     ;; with a stem exactly like that of the quarter note. -- jr
-     (if (< duration -1)
-	 (string-append (number->string duration) "neomensural")
-	 (number->string duration)))
-    (else
-     (if (string-match "vaticana*|hufnagel*|medicaea*" (symbol->string style))
-	 (symbol->string style)
-	 (string-append (number->string (max 0 duration))
-			(symbol->string style))))))
+(define-public (note-head::calc-glyph-name grob)
+  (let*
+      ((style (ly:grob-property grob 'style))
+       (log (min 2 (ly:grob-property grob 'duration-log))))
+    
+    (case style
+      ((xcircle) "2xcircle")
+      ((harmonic) "0harmonic")
+      ((baroque) 
+       ;; Oops, I actually would not call this "baroque", but, for
+       ;; backwards compatibility to 1.4, this is supposed to take
+       ;; brevis, longa and maxima from the neo-mensural font and all
+       ;; other note heads from the default font.  -- jr
+       (if (< log 0)
+	   (string-append (number->string log) "neomensural")
+	   (number->string log)))
+      ((mensural)
+       (string-append (number->string log) (symbol->string style)))
+      ((petrucci)
+       (if (< log 0)
+	   (string-append (number->string log) "mensural")
+	   (string-append (number->string log) (symbol->string style))))
+      ((neomensural)
+       (string-append (number->string log) (symbol->string style)))
+      ((default)
+       ;; The default font in mf/feta-bolletjes.mf defines a brevis, but
+       ;; neither a longa nor a maxima.  Hence let us, for the moment,
+       ;; take these from the neo-mensural font.  TODO: mf/feta-bolletjes
+       ;; should define at least a longa for the default font.  The longa
+       ;; should look exactly like the brevis of the default font, but
+       ;; with a stem exactly like that of the quarter note. -- jr
+       (if (< log -1)
+	   (string-append (number->string log) "neomensural")
+	   (number->string log)))
+      (else
+       (if (string-match "vaticana*|hufnagel*|medicaea*" (symbol->string style))
+	   (symbol->string style)
+	   (string-append (number->string (max 0 log))
+			  (symbol->string style)))))))
 
 ;; TODO junk completely?
 (define (note-head-style->attachment-coordinates grob axis)
@@ -200,19 +175,22 @@ centered, X==1 is at the right, X == -1 is at the left."
   (let* ((bn (ly:context-property tr 'currentBarNumber)))
     (ly:context-set-property! tr 'barNumberVisibility (modulo-bar-number-visible n (modulo bn n)))))
 
-(define-public (default-bar-number-visibility barnum) (> barnum 1))
-
-;; See documentation of Item::visibility_lambda_
-(define-safe-public (begin-of-line-visible d) (if (= d 1) '(#f . #f) '(#t . #t)))
-(define-safe-public (end-of-line-visible d) (if (= d -1) '(#f . #f) '(#t . #t)))
-(define-safe-public (spanbar-begin-of-line-invisible d) (if (= d -1) '(#t . #t) '(#f . #f)))
-
-(define-safe-public (all-visible d) '(#f . #f))
-(define-safe-public (all-invisible d) '(#t . #t))
-(define-safe-public (begin-of-line-invisible d) (if (= d 1) '(#t . #t) '(#f . #f)))
-(define-safe-public (center-invisible d) (if (= d 0) '(#t . #t) '(#f . #f)))
-(define-safe-public (end-of-line-invisible d) (if (= d -1) '(#t . #t) '(#f . #f)))
-
+(define-public (first-bar-number-invisible barnum) (> barnum 1))
+
+;; See documentation of ly:item::visibility-lambda-
+(define-public begin-of-line-visible
+  #(#f #f #t))
+(define-public end-of-line-visible
+  #(#t #f #f))
+(define-public end-of-line-invisible
+  #(#f #t #t))
+(define-public spanbar-begin-of-line-invisible
+  #(#t #f #f))
+(define-public all-visible #(#t #t #t))
+(define-public all-invisible #(#f #f #f))
+(define-public begin-of-line-invisible
+  #(#t #t #f))
+(define-public center-invisible #(#t #f #t))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Bar lines.
@@ -221,8 +199,11 @@ centered, X==1 is at the right, X == -1 is at the left."
 ;; How should a  bar line behave at a break? 
 ;;
 ;; Why prepend `default-' to every scm identifier?
-(define-public (default-break-barline glyph dir)
-  (let ((result (assoc glyph 
+(define-public (bar-line::calc-glyph-name grob)
+  (let* (
+	 (glyph (ly:grob-property grob 'glyph))
+	 (dir (ly:item-break-dir grob))
+	 (result (assoc glyph 
 		       '((":|:" . (":|" . "|:"))
 			 ("||:" . ("||" . "|:"))
 			 ("|" . ("|" . ()))
@@ -238,20 +219,47 @@ centered, X==1 is at the right, X == -1 is at the left."
 			 (".|." . (".|." . ()))
 			 ("" . ("" . ""))
 			 (":" . (":" . ""))
+			 ("." . ("." . ()))
 			 ("empty" . (() . ()))
 			 ("brace" . (() . "brace"))
-			 ("bracket" . (() . "bracket"))  ))))
+			 ("bracket" . (() . "bracket"))  )))
+	 (glyph-name (if (= dir CENTER)
+			 glyph
+		         (if (and result (string? (index-cell (cdr result) dir)))
+			     (index-cell (cdr result) dir)
+			     #f)))
+	 )
+
+    (if (not glyph-name)
+	(ly:grob-suicide! grob))
+
+    glyph-name))
 
-    (if (equal? result #f)
-	(ly:warning (_ "unknown bar glyph: `~S'" glyph))
-	(index-cell (cdr result) dir))))
 
 (define-public (shift-right-at-line-begin g)
   "Shift an item to the right, but only at the start of the line."
-  (if (and (ly:item? g)  (equal? (ly:item-break-dir g) RIGHT))
+  (if (and (ly:item? g)
+	   (equal? (ly:item-break-dir g) RIGHT))
       (ly:grob-translate-axis! g 3.5 X)))
 
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Tuplets
+
+(define-public (tuplet-number::calc-denominator-text grob)
+  (let*
+      ((ev (ly:grob-property grob 'cause)))
+    
+    (number->string (ly:event-property ev 'denominator))))
+
+
+(define-public (tuplet-number::calc-fraction-text grob)
+  (let*
+      ((ev (ly:grob-property grob 'cause)))
+    (format "~a:~a" 
+      (ly:event-property ev 'denominator)
+      (ly:event-property ev 'numerator))))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Color
 
@@ -263,14 +271,134 @@ centered, X==1 is at the right, X == -1 is at the left."
 (define-public red         '(1.0 0.0 0.0))
 (define-public green       '(0.0 1.0 0.0))
 (define-public blue        '(0.0 0.0 1.0))
-(define-public cyan        '(1.0 1.0 0.0))
+(define-public cyan        '(0.0 1.0 1.0))
 (define-public magenta     '(1.0 0.0 1.0))
-(define-public yellow      '(0.0 1.0 1.0))
+(define-public yellow      '(1.0 1.0 0.0))
 
 (define-public grey        '(0.5 0.5 0.5))
 (define-public darkred     '(0.5 0.0 0.0))
 (define-public darkgreen   '(0.0 0.5 0.0))
 (define-public darkblue    '(0.0 0.0 0.5))
-(define-public darkcyan    '(0.5 0.5 0.0))
+(define-public darkcyan    '(0.0 0.5 0.5))
 (define-public darkmagenta '(0.5 0.0 0.5))
-(define-public darkyellow  '(0.0 0.5 0.5))
+(define-public darkyellow  '(0.5 0.5 0.0))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; * Pitch Trill Heads
+;; * Parentheses
+
+(define (parenthesize-elements grob . rest)
+  (let*
+      (
+       (refp (if (null? rest)
+		 grob
+		 (car rest)))
+       (elts (ly:grob-object grob 'elements))
+       (x-ext (ly:relative-group-extent elts refp X))
+
+       (font (ly:grob-default-font grob))
+       (lp (ly:font-get-glyph font "accidentals.leftparen"))
+       (rp (ly:font-get-glyph font "accidentals.rightparen"))
+       (padding (ly:grob-property grob 'padding 0.1)))
+
+    (ly:stencil-add
+     (ly:stencil-translate-axis lp (- (car x-ext) padding) X)
+     (ly:stencil-translate-axis rp (+ (cdr x-ext) padding) X))
+  ))
+
+
+(define (parentheses-item::print me)
+  (let*
+      ((elts (ly:grob-object me 'elements))
+       (y-ref (ly:grob-common-refpoint-of-array me elts Y))
+       (x-ref (ly:grob-common-refpoint-of-array me elts X))
+       (stencil (parenthesize-elements me x-ref))
+       (elt-y-ext  (ly:relative-group-extent elts y-ref Y))
+       (y-center (interval-center elt-y-ext)))
+
+    (ly:stencil-translate
+     stencil
+     (cons
+      (-
+       (ly:grob-relative-coordinate me x-ref X))
+      (-
+       y-center
+       (ly:grob-relative-coordinate me y-ref Y))))
+    ))
+
+       
+       
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 
+
+(define-public (chain-grob-member-functions grob value . funcs)
+  (for-each
+   (lambda (func)
+     (set! value (func grob value)))
+   funcs)
+
+  value)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; falls
+
+(define-public (fall::print spanner)
+  (let*
+      ((delta (ly:grob-property spanner 'delta-position))
+       (left-span (ly:spanner-bound spanner LEFT))
+       (right-span (ly:spanner-bound spanner RIGHT))
+       (thickness (* (ly:grob-property spanner 'thickness)
+		     (ly:output-def-lookup (ly:grob-layout spanner) 'line-thickness)))
+       (padding (ly:grob-property spanner 'padding 0.5))
+       (common (ly:grob-common-refpoint right-span
+					(ly:grob-common-refpoint spanner
+						left-span X)
+					X))
+       (left-x (+ padding  (interval-end  (ly:grob-robust-relative-extent left-span common X))))
+       (right-x (- (interval-start  (ly:grob-robust-relative-extent right-span common X)) padding))
+       (self-x (ly:grob-relative-coordinate spanner common X))
+       (dx (- right-x left-x))
+       (exp (list 'path thickness 
+		  `(quote
+		    (rmoveto
+		     ,(- left-x self-x) 0
+
+		     rcurveto		     
+		     ,(/ dx 3)
+		     0
+		     ,dx ,(* 0.66 delta)
+		     ,dx ,delta
+		     ))))
+       )
+
+    (ly:make-stencil
+     exp
+     (cons 0 dx)
+     (cons (min 0 delta)
+	   (max 0 delta)))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; grace spacing
+
+
+(define-public (grace-spacing::calc-shortest-duration grob)
+  (let*
+     ((cols (ly:grob-object grob 'columns))
+      (get-difference
+       (lambda (idx)
+	 (ly:moment-sub (ly:grob-property (ly:grob-array-ref cols (1+ idx)) 'when)
+			(ly:grob-property (ly:grob-array-ref cols idx) 'when))))
+      
+      (moment-min (lambda (x y)
+		    (cond
+		     ((and x y)
+		      (if (ly:moment<? x y)
+			    x
+			    y))
+		     (x x)
+		     (y y)))))
+		     
+    (fold moment-min #f (map get-difference
+			     (iota (1- (ly:grob-array-length cols)))))))
+