release: 1.3.42

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index c8655ddd097f8f2f14810b19ddfed5a13fab485a..df8e73a6075eb21af0017084f7c8851ffa0e6e59 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -92,11 +92,7 @@
 ;; Score_span_bars are only visible at start of line
 ;; i.e. if break_dir == RIGHT == 1
 (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.
 ;;
@@ -107,40 +103,42 @@
 ;; (Measured in staff space)
 (define space-alist
  '(
-   (("" "Left_edge_item") . (extra-space -15.0))
-   (("" "Clef_item") . (minimum-space 1.0))
-   (("" "Staff_bar") . (minimum-space 0.0))
-   (("" "Clef_item") . (minimum-space 1.0))
-   (("" "Key_item") . (minimum-space 0.5))
-   (("" "Span_bar") . (extra-space 0.0))
-   (("" "Time_signature") . (extra-space 0.0))
-   (("" "begin-of-note") . (minimum-space 1.5))
-   (("Clef_item" "Key_item") . (minimum-space 4.0))
-   (("Key_item" "Time_signature") . (extra-space 1.0))
-   (("Clef_item"  "Time_signature") . (minimum-space 3.5))
-   (("Staff_bar" "Clef_item") .   (minimum-space 1.0))
-   (("Clef_item"  "Staff_bar") .  (minimum-space 3.7))
-   (("Time_signature" "Staff_bar") .  (minimum-space 2.0))
-   (("Key_item"  "Staff_bar") .  (extra-space 1.0))
-   (("Span_bar" "Clef_item") .   (extra-space 1.0))
-   (("Clef_item"  "Span_bar") . (minimum-space 3.7))
-   (("Time_signature" "Span_bar") . (minimum-space 2.0))
-   (("Key_item"  "Span_bar") . (minimum-space 2.5))
-   (("Staff_bar" "Time_signature") . (minimum-space 1.5)) ;double check this.
-   (("Time_signature" "begin-of-note") . (extra-space 2.0)) ;double check this.
-   (("Key_item" "begin-of-note") . (extra-space 2.5))
-   (("Staff_bar" "begin-of-note") . (extra-space 1.0))
-   (("Clef_item" "begin-of-note") . (minimum-space 5.0))
-   (("" "Breathing_sign") . (minimum-space 0.0))
-   (("Breathing_sign" "Key_item") . (minimum-space 1.5))
-   (("Breathing_sign" "begin-of-note") . (minimum-space 1.0))
-   (("Breathing_sign" "Staff_bar") . (minimum-space 1.5))
-   (("Breathing_sign" "Clef_item") . (minimum-space 2.0))
+   ((none Instrument_name) . (extra-space 1.0))
+   ((Instrument_name Left_edge_item) . (extra-space 1.0))
+   ((Left_edge_item Clef_item) . (extra-space 1.0))
+   ((none Left_edge_item) . (extra-space 0.0))
+   ((Left_edge_item Staff_bar) . (extra-space 0.0))        
+;   ((none Left_edge_item) . (extra-space -15.0))
+;   ((none Left_edge_item) . (extra-space -15.0))
+   ((none Clef_item) . (minimum-space 1.0))
+   ((none Staff_bar) . (minimum-space 0.0))
+   ((none Clef_item) . (minimum-space 1.0))
+   ((none Key_item) . (minimum-space 0.5))
+   ((none Time_signature) . (extra-space 0.0))
+   ((none begin-of-note) . (minimum-space 1.5))
+   ((Clef_item Key_item) . (minimum-space 4.0))
+   ((Key_item Time_signature) . (extra-space 1.0))
+   ((Clef_item  Time_signature) . (minimum-space 3.5))
+   ((Staff_bar Clef_item) .   (minimum-space 1.0))
+   ((Clef_item  Staff_bar) .  (minimum-space 3.7))
+   ((Time_signature Staff_bar) .  (minimum-space 2.0))
+   ((Key_item  Staff_bar) .  (extra-space 1.0))
+   ((Staff_bar Time_signature) . (minimum-space 1.5)) ;double check this.
+   ((Time_signature begin-of-note) . (extra-space 2.0)) ;double check this.
+   ((Key_item begin-of-note) . (extra-space 2.5))
+   ((Staff_bar begin-of-note) . (extra-space 1.0))
+   ((Clef_item begin-of-note) . (minimum-space 5.0))
+   ((none Breathing_sign) . (minimum-space 0.0))
+   ((Breathing_sign Key_item) . (minimum-space 1.5))
+   ((Breathing_sign begin-of-note) . (minimum-space 1.0))
+   ((Breathing_sign Staff_bar) . (minimum-space 1.5))
+   ((Breathing_sign Clef_item) . (minimum-space 2.0))
    )
 )
- 
+
+;; (define (ly-warn s) (error s))
 (define (break-align-spacer this next)
-  (let ((entry (assoc `(,this ,next) space-alist)))
+  (let ((entry (assoc (list this next) space-alist)))
     (if entry
        (cdr entry)
        (begin (ly-warn (string-append "Unknown spacing pair `" this "', `" next "'"))
@@ -962,11 +960,9 @@
 (define (break-barline glyph dir)
    (let ((result (assoc glyph 
                        '((":|:" . (":|" . "|:"))
-                         (";|;" . ("|." . ".|"))
                          ("|" . ("|" . ""))
                          ("|s" . (nil . "|"))
                          ("|:" . ("|" . "|:"))
-                         (".|" . ("|" . ".|"))
                          ("|." . ("|." . nil))
                          (":|" . (":|" . nil))
                          ("||" . ("||" . nil))