patch::: 1.3.18.jcn3

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index 3ab025c5fd32a83b7998f12b4b3796bdcdccdeb5..96941d93f8b33877e5096f9da0398ad3d57190f2 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -747,22 +747,25 @@
 ;
 ; How should a  bar line behave at a break? 
 ;
-(define (break-barline glyph dir)
-   (let ((result (assoc glyph 
-                       '((":|:" . (":|" . "|:"))
-                         ("|" . ("|" . ""))
-                         ("|s" . (nil . "|"))
-                         ("|:" . ("|" . "|:"))
-                         ("|." . ("|." . nil))
-                         (":|" . (":|" . nil))
-                         ("||" . ("||" . nil))
-                         (".|." . (".|." . nil))
-                         ("scorebar" . (nil . "scorepostbreak"))
-                         ("brace" . (nil . "brace"))
-                         ("bracket" . (nil . "bracket"))  
-                         )
-                       )))
 
+; move this to paper.scm?
+; to override, see input/test/no-span.ly
+(define bar-break-glyph-alist
+  '((":|:" . (":|" . "|:"))
+    ("|" . ("|" . ""))
+    ("|s" . (nil . "|"))
+    ("|:" . ("|" . "|:"))
+    ("|." . ("|." . nil))
+    (":|" . (":|" . nil))
+    ("||" . ("||" . nil))
+    (".|." . (".|." . nil))
+    ("scorebar" . (nil . "scorepostbreak"))
+    ("brace" . (nil . "brace"))
+    ("bracket" . (nil . "bracket"))  
+    ))
+
+(define (break-barline glyph dir)
+   (let ((result (assoc glyph bar-break-glyph-alist)))
      (if (equal? result #f)
         (ly-warn (string-append "Unknown bar glyph: `" glyph "'"))
         (index-cell (cdr result) dir))