release: 1.3.31

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index b6ea62e1df2dc049d3cb04cef482195e7b286f93..841ecade60b67b1467af676033133c908967886f 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -71,21 +71,21 @@
 
 
 ;; See documentation of Item::visibility_lambda_
-(define (postbreak-only-visibility d) (if (= d 1) '(#f . #f) '(#t . #t)))
-(define (spanbar-non-postbreak-visibility d) (if (= d -1) '(#t . #t) '(#f . #f)))
-(define (all-visibility d) '(#f . #f))
-(define (non-postbreak-visibility d) (if (= d 1) '(#t . #t) '(#f . #f)))
-(define (non-prebreak-visibility d) (if (= d -1) '(#t . #t) '(#f . #f)))
+(define (begin-of-line-visible d) (if (= d 1) '(#f . #f) '(#t . #t)))
+(define (spanbar-begin-of-line-invisible d) (if (= d -1) '(#t . #t) '(#f . #f)))
+(define (all-visible d) '(#f . #f))
+(define (begin-of-line-invisible d) (if (= d 1) '(#t . #t) '(#f . #f)))
+(define (end-of-line-invisible d) (if (= d -1) '(#t . #t) '(#f . #f)))
 
 
 ;; Score_span_bars are only visible at start of line
 ;; i.e. if break_dir == RIGHT == 1
-(define Span_bar_engraver-visibility non-postbreak-visibility)
-(define Base_span_bar_engraver-visibility non-postbreak-visibility)
-(define mark-visibility non-prebreak-visibility)
-(define Span_score_bar_engraver-visibility postbreak-only-visibility)
-(define Piano_bar_engraver-visibility postbreak-only-visibility)
-(define Staff_group_bar_engraver-visibility postbreak-only-visibility)
+(define Span_bar_engraver-visibility begin-of-line-invisible)
+(define Base_span_bar_engraver-visibility begin-of-line-invisible)
+(define mark-visibility end-of-line-invisible)
+(define Span_score_bar_engraver-visibility begin-of-line-visible)
+(define Piano_bar_engraver-visibility begin-of-line-visible)
+(define Staff_group_bar_engraver-visibility begin-of-line-visible)
 
 ;; Spacing constants for prefatory matter.
 ;;
@@ -215,7 +215,12 @@
         (map (lambda (x)
                (font-load-command (car x) (cdr x))) font-name-alist)
   ))
-  
+
+(define (fontify name exp)
+  (string-append (select-font name)
+                exp)
+  )
+
 ;;;;;;;;;;;;;;;;;;;;
 
 
@@ -233,7 +238,10 @@
 
 
 
+;;;;;;;;;;;;;;;;;;; generic output
 
+(define (translate-molecule offset)
+  "")
 
 
 ;;;;;;;;;;;;;;;;;;; TeX output
@@ -273,6 +281,9 @@
   (define (char i)
     (string-append "\\char" (inexact->string i 10) " "))
   
+  (define (dashed-line thick dash w)
+    (embedded-ps ((ps-scm 'dashed-line) thick dash w)))
+
   (define (decrescendo thick w h cont)
     (embedded-ps ((ps-scm 'decrescendo) thick w h cont)))
 
@@ -397,6 +408,7 @@
            (define bracket ,bracket)
            (define char ,char)
            (define crescendo ,crescendo)
+           (define dashed-line ,dashed-line) 
            (define dashed-slur ,dashed-slur) 
            (define decrescendo ,decrescendo) 
            (define end-output ,end-output)
@@ -423,6 +435,7 @@
        ((eq? action-name 'tuplet) tuplet)
        ((eq? action-name 'bracket) bracket)
        ((eq? action-name 'crescendo) crescendo)
+       ((eq? action-name 'dashed-line) dashed-line) 
        ((eq? action-name 'dashed-slur) dashed-slur) 
        ((eq? action-name 'decrescendo) decrescendo) 
        ((eq? action-name 'end-output) end-output)
@@ -530,6 +543,17 @@
      (number->string (* 10 thick))     ;UGH.  10 ?
      " ] 0 draw_dashed_slur"))
 
+  (define (dashed-line thick dash width)
+    (string-append 
+     (number->string width) 
+     " "
+     (number->string thick) 
+     " [ "
+     (number->string dash)
+     " "
+     (number->string dash)
+     " ] 0 draw_dashed_line"))
+
   (define (decrescendo thick w h cont)
     (string-append 
      (numbers->string (list w h (inexact->exact cont) thick))
@@ -633,6 +657,7 @@
            (define crescendo ,crescendo)
            (define volta ,volta)
            (define bezier-sandwich ,bezier-sandwich)
+           (define dashed-line ,dashed-line) 
            (define dashed-slur ,dashed-slur) 
            (define decrescendo ,decrescendo) 
            (define end-output ,end-output)
@@ -660,6 +685,7 @@
        ((eq? action-name 'bracket) bracket)
        ((eq? action-name 'char) char)
        ((eq? action-name 'crescendo) crescendo)
+       ((eq? action-name 'dashed-line) dashed-line) 
        ((eq? action-name 'dashed-slur) dashed-slur) 
        ((eq? action-name 'decrescendo) decrescendo)
        ((eq? action-name 'experimental-on) experimental-on)