* lily/midi-stream.cc (operator <<): rewrite.

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

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index b0ad0fccff93bb1fd5ddf7efe0e8fc768546c27d..84e45228e4facaafaa6e1669cc1846a7078254c2 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  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)
@@ -50,16 +50,16 @@
     (let ((slur (Slur::brew_molecule grob))
           (text (fontify-text (ly:get-default-font grob) letter)))
     
-      (let ((x (/ (- (cdr (ly:get-molecule-extent slur 0)) 
-                     (/ (cdr (ly:get-molecule-extent text 0)) 2.0)
+      (let ((x (/ (- (cdr (ly:molecule-get-extent slur 0)) 
+                     (/ (cdr (ly:molecule-get-extent text 0)) 2.0)
                      )
                   -2.0)))
       
-        (ly:set-molecule-extent! text 0 (cons x x))
-        (ly:align-to! text 0 1)
+        (ly:molecule-set-extent! text 0 (cons x x))
+        (ly:molecule-align-to! text 0 1)
         )
-      
-      (ly:combine-molecule-at-edge slur 1 1 text -0.6)
+
+      (ly:molecule-combine-at-edge slur 1 1 text -0.6)
       )
     )
   )
@@ -77,28 +77,42 @@
   (let*
    (
     (mol    (callback grob))
-    (x-ext (widen-interval (ly:get-molecule-extent mol 0) x-padding))
-    (y-ext (widen-interval (ly:get-molecule-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:combine-molecule-at-edge mol 0 1 y-rule x-padding))
-    (set! mol (ly:combine-molecule-at-edge mol 0 -1  y-rule x-padding))
-    (set! mol (ly:combine-molecule-at-edge mol 1 1  x-rule 0))  
-    (set! mol (ly:combine-molecule-at-edge mol 1 -1 x-rule 0))
+    (set! mol (ly:molecule-combine-at-edge mol 0 1 y-rule x-padding))
+    (set! mol (ly:molecule-combine-at-edge mol 0 -1  y-rule x-padding))
+    (set! mol (ly:molecule-combine-at-edge mol 1 1  x-rule 0))  
+    (set! mol (ly:molecule-combine-at-edge mol 1 -1 x-rule 0))
     
     mol
  ))
  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)))
@@ -171,6 +185,7 @@
 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)
@@ -184,6 +199,10 @@ centered, X==1 is at the right, X == -1 is at the left."
     ((transparent) '(1.0 . 1.0))
     ((slash) '(1.0 . 1.0))
     ((harmonic) '(1.0 0.0))
+
+    ;;
+    ;;UGH this needs to be changed: triangle is not point-symmetric, has different attachments
+    ;;  for up/down stem
     ((triangle) '(0.75 . 0.15))
     ((baroque)
      (if (< duration 0)
@@ -207,6 +226,12 @@ centered, X==1 is at the right, X == -1 is at the left."
 
 (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:get-context-property tr 'currentBarNumber)))
+   (ly:set-context-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_