* input/mutopia/F.Schubert/GNUmakefile: add morgenlied.ly

[lilypond.git] / scm / output-lib.scm

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 0885e8d3d4e053a5a0407b35e32830604c93be16..8d28d5090d92abba3aa08d9850d3bc617413d3c2 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -2,15 +2,14 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c)  1998--2003 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) ;; UGH!
-)
+  (cons 0.0 0.5))
 
 ; The TabNoteHead molecule callback.
 ; Create a text molecule
@@ -20,8 +19,7 @@
                    (ly:get-grob-property grob 'text)
                    )))
     molecule ; return the molecule.
-    )
-  )
+    ))
 
 ; The TabNoteHead tablatureFormat callback.
 ; Compute the text grob-property
@@ -31,9 +29,7 @@
       (list-ref tuning
                 (- string 1) ; remove 1 because list index starts at 0 and guitar string at 1.
                 )
-      )
-   )
-  )
+      ) ) ) 
 
 (define-public (hammer-molecule-callback grob)
   (let* ((note-collums (ly:get-grob-property grob 'note-columns))
@@ -60,9 +56,7 @@
         )
 
       (ly:molecule-combine-at-edge slur 1 1 text -0.6)
-      )
-    )
-  )
+      ) ) )
 
 
 
@@ -77,11 +71,11 @@
   (let*
    (
     (mol    (callback grob))
-    (x-ext (widen-interval (ly:molecule-get-extent mol 0) x-padding))
-    (y-ext (widen-interval (ly:molecule-get-extent mol 1) y-padding))
-    (x-rule (box-molecule (widen-interval x-ext line-thick)
+    (x-ext (interval-widen (ly:molecule-get-extent mol 0) x-padding))
+    (y-ext (interval-widen (ly:molecule-get-extent mol 1) y-padding))
+    (x-rule (make-filled-box-molecule (interval-widen x-ext line-thick)
                               (cons 0 line-thick)))
-    (y-rule (box-molecule (cons 0 line-thick) y-ext))
+    (y-rule (make-filled-box-molecule (cons 0 line-thick) y-ext))
     )
     
     (set! mol (ly:molecule-combine-at-edge mol 0 1 y-rule x-padding))
@@ -94,11 +88,25 @@
  molecule-boxer
  )
 
+(define-public (arg->string arg)
+  (cond ((number? arg) (inexact->string arg 10))
+       ((string? arg) (string-append "\"" arg "\""))
+       ((symbol? arg) (string-append "\"" (symbol->string arg) "\""))))
+
+(define-public (func name . args)
+  (string-append
+   "(" name
+   (if (null? args)
+       ""
+       (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-public (numbers->string l)
   (apply string-append (map ly:number->string l)))
@@ -120,8 +128,8 @@
 
 
 (define-public (number-pair->string c)
-  (string-append (number->string (car c)) " "
-                (number->string (cdr c)) " "))
+  (string-append (ly:number->string (car c)) " "
+                (ly:number->string (cdr c)) " "))
 
 (define (font i)
   (string-append
@@ -166,35 +174,14 @@
                       (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)
-     )))
+   '(1.0 . 0.0))
+
 
 (define-public (string-encode-integer i)
   (cond
@@ -211,8 +198,7 @@ centered, X==1 is at the right, X == -1 is at the left."
 
 (define-public ((set-bar-number-visibility n) tr)
   (let* ((bn (ly:get-context-property tr 'currentBarNumber)))
-   (ly:set-context-property tr 'barNumberVisibility (modulo-bar-number-visible n (modulo bn n))))
-)
+   (ly:set-context-property! tr 'barNumberVisibility (modulo-bar-number-visible n (modulo bn n)))))
 
 (define-public (default-bar-number-visibility barnum) (> barnum 1))
 
@@ -259,6 +245,5 @@ centered, X==1 is at the right, X == -1 is at the left."
      (if (equal? result #f)
         (ly:warn (string-append "Unknown bar glyph: `" glyph "'"))
         (index-cell (cdr result) dir))
-     )
-   )
+     ) )