X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flily.scm;h=841ecade60b67b1467af676033133c908967886f;hb=f798a4c8737f0d279fcf54ba4f0951074565fa76;hp=582c55e24be4b06338f12212a772ebdde8450925;hpb=a6193f6f613e0b2ff519b804d28f99fcd6ec9b92;p=lilypond.git

diff --git a/scm/lily.scm b/scm/lily.scm
index 582c55e24b..841ecade60 100644
--- 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.
 ;;
@@ -240,8 +240,8 @@
 
 ;;;;;;;;;;;;;;;;;;; generic output
 
-(define (translate-atom offset exp)
-  exp)
+(define (translate-molecule offset)
+  "")
 
 
 ;;;;;;;;;;;;;;;;;;; TeX output
@@ -281,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)))
 
@@ -405,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)
@@ -431,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)
@@ -538,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))
@@ -641,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)
@@ -668,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)