release: 1.3.61

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index 2f237ac73acb0fdb2a335ae6ff7cbc34a24e67d8..80e3ffeb6ae74ac8903a06ce9146444c95a2ec4f 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -105,6 +105,7 @@
    ((Instrument_name Left_edge_item) . (extra-space 1.0))
    ((Left_edge_item Clef_item) . (extra-space 1.0))
    ((Left_edge_item Key_item) . (extra-space 0.0))   
+   ((Left_edge_item begin-of-note) . (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))
@@ -135,15 +136,7 @@
    )
 )
 
-;; (define (ly-warn s) (error s))
-(define (break-align-spacer this next)
-  (let ((entry (assoc (list this next) space-alist)))
-    (if entry
-       (cdr entry)
-       (begin (ly-warn (string-append "Unknown spacing pair `" this "', `" next "'"))
-              '(minimum-space 0.0)))))
-  
-
+;; silly, use alist? 
 (define (find-notehead-symbol duration style)
   (case style
    ((cross) "2cross")
@@ -170,6 +163,7 @@
     ("feta-2" . "feta") 
     ("typewriter" . "cmtt") 
     ("italic" . "cmti") 
+    ("msam" . "msam") 
     ("roman" . "cmr") 
     ("script" . "cmr") 
     ("large" . "cmbx") 
@@ -208,17 +202,6 @@
   )
             
 (define script-alist '())
-(define (articulation-to-scriptdef a)
-  (assoc a script-alist)
-  )
-
-;; Map style names to TeX font names.  Return false if 
-;; no font name found. 
-(define (style-to-cmr s)
-  (assoc s cmr-alist )
-  )
-           
-
 
 (define font-name-alist  '())
 (define (font-command name-mag)
@@ -309,7 +292,12 @@
     (string-append "% " s))
   
   (define (end-output) 
-    "\n\\EndLilyPondOutput")
+       (begin
+; uncomment for some stats about lily memory     
+;              (display (gc-stats))
+    (string-append "\n\\EndLilyPondOutput"
+                  ; Put GC stats here.
+                  )))
   
   (define (experimental-on)
     "")
@@ -916,7 +904,7 @@
        content))
 
 ;; urg: Use when standalone, do:
-;; (define (ly-gulp-file name) (scm-gulp-file name))
+;; (define ly-gulp-file scm-gulp-file)
 (define (scm-gulp-file name)
   (set! %load-path 
        (cons (string-append (getenv 'LILYPONDPREFIX) "/ly")
@@ -951,6 +939,7 @@
                          ("|s" . (nil . "|"))
                          ("|:" . ("|" . "|:"))
                          ("|." . ("|." . nil))
+                         (".|" . (nil . ".|"))
                          (":|" . (":|" . nil))
                          ("||" . ("||" . nil))
                          (".|." . (".|." . nil))
@@ -966,3 +955,15 @@
      )
    )
      
+
+(define major-scale
+  '(
+    (0 . 0)
+    (1 . 0)
+    (2 . 0)
+    (3 . 0)
+    (4 . 0)
+    (5 . 0)
+    (6 . 0)
+    )
+  )