X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-lib.scm;h=e4a9557b46a3b5469bbb69955436902c64f8fb1a;hb=cd481bdd451490f0af8c7ee9cab5341d8a6c8cbb;hp=52baf2e1be98eff568fe5a379ba1ce9e7edf67a3;hpb=54685cedab8c7e6ce9cfc754dc6b6c646e8421ff;p=lilypond.git

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 52baf2e1be..e4a9557b46 100644
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -2,68 +2,114 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c)  1998--2004 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 1.0)
-)
-
-; The TabNoteHead molecule callback.
-; Create a text molecule
-(define (tablature-molecule-callback grob)
-  (let ((molecule (fontify-text
-                   (ly-get-default-font grob)
-                   (ly-get-grob-property grob 'text)
-                   )))
-    molecule ; return the molecule.
-    )
-  )
+  (cons 0.0 0.5))
+
 
 ; The TabNoteHead tablatureFormat callback.
 ; Compute the text grob-property
-(define (fret-number-tablature-format string tuning pitch)
+(define-public (fret-number-tablature-format string tuning pitch)
   (number->string
-   (- (pitch-semitones pitch)
+   (- (ly:pitch-semitones pitch)
       (list-ref tuning
                 (- string 1) ; remove 1 because list index starts at 0 and guitar string at 1.
                 )
-      )
-   )
-  )
+      ) ) ) 
+
+(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))
+	   (paper (ly:grob-paper grob))
+	   (text (interpret-markup
+		  paper
+		  (ly:grob-alist-chain grob (ly:paper-lookup paper 'text-font-defaults))
+		  letter)))
+    
+      (let ((x (/ (- (cdr (ly:stencil-extent slur 0)) 
+                     (/ (cdr (ly:stencil-extent text 0)) 2.0)
+                     )
+                  -2.0)))
+      
+        (ly:stencil-set-extent! text 0 (cons x x))
+        (ly:stencil-align-to! text 0 1)
+        )
+
+      (ly:stencil-combine-at-edge slur 1 1 text -0.6)
+      ) ) )
+
+
+
+(define-public guitar-tunings '(4 -1 -5 -10 -15 -20))
 
 ; end of tablature functions
 
 
-(define (arg->string arg)
-  (cond ((number? arg) (inexact->string arg 10))
+(define-public (make-stencil-boxer line-thick x-padding y-padding callback)
+   "Makes a routine that adds a box around the grob parsed as argument"
+  (define (stencil-boxer grob)
+  (let*
+   (
+    (mol    (callback grob))
+    (x-ext (interval-widen (ly:stencil-extent mol 0) x-padding))
+    (y-ext (interval-widen (ly:stencil-extent mol 1) y-padding))
+    (x-rule (make-filled-box-stencil (interval-widen x-ext line-thick)
+                              (cons 0 line-thick)))
+    (y-rule (make-filled-box-stencil (cons 0 line-thick) y-ext))
+    )
+    
+    (set! mol (ly:stencil-combine-at-edge mol 0 1 y-rule x-padding))
+    (set! mol (ly:stencil-combine-at-edge mol 0 -1  y-rule x-padding))
+    (set! mol (ly:stencil-combine-at-edge mol 1 1  x-rule 0))  
+    (set! mol (ly:stencil-combine-at-edge mol 1 -1 x-rule 0))
+    
+    mol
+ ))
+ stencil-boxer
+ )
+
+(define-public (arg->string arg)
+  (cond ((number? arg) (ly:inexact->string arg 10))
 	((string? arg) (string-append "\"" arg "\""))
 	((symbol? arg) (string-append "\"" (symbol->string arg) "\""))))
 
-;; ugh: naming.
-(define (func name . args)
-  (string-append 
-   "(" name 
-   (if (null? args) 
+(define-public (func name . args)
+  (string-append
+   "(" name
+   (if (null? args)
        ""
-       (apply string-append 
+       (apply string-append
 	      (map (lambda (x) (string-append " " (arg->string x))) args)))
    ")\n"))
 
-
 ;;(define (mm-to-pt x)
 ;;  (* (/ 72.27 25.40) x))
 
 ;; do nothing in .scm output
-(define (comment s) "")
+(define-public (comment s) "")
 
-(define (numbers->string l)
-  (apply string-append (map ly-number->string l)))
-
-; (define (chop-decimal x) (if (< (abs x) 0.001) 0.0 x))
+(define-public (ly:numbers->string lst)
+  (apply string-append
+	 (map (lambda (x) (string-append (ly:number->string x) " "))  lst)))
 
 (define (number->octal-string x)
   (let* ((n (inexact->exact x))
@@ -74,14 +120,13 @@
      (number->string n8)
      (number->string (remainder (- n (+ (* n64 64) (* n8 8))) 8)))))
 
-(define (inexact->string x radix)
+(define-public (ly:inexact->string x radix)
   (let ((n (inexact->exact x)))
     (number->string n radix)))
 
-
-(define (control->string c)
-  (string-append (number->string (car c)) " "
-		 (number->string (cdr c)) " "))
+(define-public (ly:number-pair->string c)
+  (string-append (ly:number->string (car c)) " "
+		 (ly:number->string (cdr c)) " "))
 
 (define (font i)
   (string-append
@@ -93,24 +138,22 @@
 
 
 ;; silly, use alist? 
-(define (find-notehead-symbol duration style)
+(define-public (find-notehead-symbol duration style)
   (case style
-   ((xcircle) (cons "2xcircle" "music"))
-   ((harmonic) (cons "0neo_mensural" "music"))
+   ((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)
-	(cons (string-append (number->string duration) "neo_mensural") "ancient")
-	(cons (number->string duration) "music")))
+	(string-append (number->string duration) "neo_mensural")
+	(number->string duration)))
    ((mensural)
-    (cons (string-append (number->string duration) (symbol->string style))
-     "ancient"))
+    (string-append (number->string duration) (symbol->string style)))
    ((neo_mensural)
-    (cons (string-append (number->string duration) (symbol->string style))
-     "ancient"))
+    (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,
@@ -119,81 +162,25 @@
     ;; 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)
-	(cons (string-append (number->string duration) "neo_mensural") "ancient")
-	(cons (number->string duration) "music")))
+	(string-append (number->string duration) "neo_mensural")
+	(number->string duration)))
    (else
-    (cons (string-append (number->string (max 0 duration)) (symbol->string style))
-     "music"))))
+    (if (string-match "vaticana*|hufnagel*|medicaea*" (symbol->string style))
+	(symbol->string style)
+	(string-append (number->string (max 0 duration))
+		       (symbol->string style))))))
 
 
-(define (note-head-style->attachment-coordinates style duration)
+;; TODO junk completely?
+(define (note-head-style->attachment-coordinates grob axis)
   "Return pair (X . Y), containing multipliers for the note head
 bounding box, where to attach the stem. e.g.: X==0 means horizontally
 centered, X==1 is at the right, X == -1 is at the left."
 
-  (case style
-    ((default)
-     (if (< duration -1)
-	 '(0.0 . 0.6) ;; neo-mensural
-	 '(1.0 . 0.5) ;; default
-	 ))
-    ((cross) '(1.0 . 0.75))
-    ((mensural) '(0.0 . 0.6))
-    ((neo_mensural) '(0.0 . 0.6))
-    ((diamond) '(1.0 . 0.8))
-    ((transparent) '(1.0 . 1.0))
-    ((slash) '(1.0 . 1.0))
-    ((harmonic) '(1.0 0.0))
-    ((triangle) '(0.75 . 0.15))
-    ((baroque)
-     (if (< duration 0)
-	 '(0.0 . 0.6) ;; neo-mensural
-	 '(1.0 . 0.5) ;; default
-	 ))
-    (else
-
-     ;; this also works for easy notation.
-     '(1.0 . 0.0)
-     )))
-
-(define (find-timesig-symbol nom denom style)
-  (case style
-   ((mensural)
-    (cons (string-append
-	     "mensural"
-	     (number->string nom)
-	     "/"
-	     (number->string denom))
-	  "ancient"))
-   ((neo_mensural)
-    (cons (string-append
-	     "neo_mensural"
-	     (number->string nom)
-	     "/"
-	     (number->string denom))
-	  "ancient"))
-   ((numbered)
-    (cons (string-append
-	   (number->string nom)
-	   "/"
-	   (number->string denom))
-	  "music"))
-   (else
-    ;; default: use "C" style when possible, otherwise return ""
-    (cons
-     (case nom
-       ((2)
-	(case denom
-	  ((2) "C2/2")
-	  (else "")))
-       ((4)
-	(case denom
-	  ((4) "C4/4")
-	  (else "")))
-       (else ""))
-     "music"))))
-
-(define (string-encode-integer i)
+   '(1.0 . 0.0))
+
+
+(define-public (string-encode-integer i)
   (cond
    ((= i  0) "o")
    ((< i 0)   (string-append "n" (string-encode-integer (- i))))
@@ -202,6 +189,66 @@ centered, X==1 is at the right, X == -1 is at the left."
 	  (string-encode-integer (quotient i 26))))))
 
 
-
-
-
+(define-public ((every-nth-bar-number-visible n) barnum) (= 0 (modulo barnum n)))
+
+(define-public ((modulo-bar-number-visible n m) barnum) (and (> barnum 1) (= m (modulo barnum n))))
+
+(define-public ((set-bar-number-visibility n) tr)
+  (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-public (begin-of-line-visible d) (if (= d 1) '(#f . #f) '(#t . #t)))
+(define-public (end-of-line-visible d) (if (= d -1) '(#f . #f) '(#t . #t)))
+(define-public (spanbar-begin-of-line-invisible d) (if (= d -1) '(#t . #t) '(#f . #f)))
+
+(define-public (all-visible d) '(#f . #f))
+(define-public (all-invisible d) '(#t . #t))
+(define-public (begin-of-line-invisible d) (if (= d 1) '(#t . #t) '(#f . #f)))
+(define-public (end-of-line-invisible d) (if (= d -1) '(#t . #t) '(#f . #f)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Bar lines.
+
+;
+; 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 
+			'((":|:" . (":|" . "|:"))
+			  ("||:" . ("||" . "|:"))
+			  ("|" . ("|" . ()))
+			  ("||:" . ("||" . "|:"))
+			  ("|s" . (() . "|"))
+			  ("|:" . ("|" . "|:"))
+			  ("|." . ("|." . ()))
+
+			  ;; hmm... should we end with a barline here?
+			  (".|" . ("|" . ".|"))
+			  (":|" . (":|" . ()))
+			  ("||" . ("||" . ()))
+			  (".|." . (".|." . ()))
+			  ("" . ("" . ""))
+			  (":" . (":" . ""))
+			  ("empty" . (() . ()))
+			  ("brace" . (() . "brace"))
+			  ("bracket" . (() . "bracket"))  
+			  )
+			)))
+
+     (if (equal? result #f)
+	 (ly:warn (string-append "Unknown bar glyph: `" 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))
+      (ly:grob-translate-axis! g 3.5 X)
+  ))