* lily/my-lily-lexer.cc (My_lily_lexer): don't crash

[lilypond.git] / scm / molecule.scm

diff --git a/scm/molecule.scm b/scm/molecule.scm
index 1335e9af5a6a5dceac1379bcea50d2d5fea41360..fb604872eda404fdb76160024eb415a84709d11a 100644 (file)
--- a/scm/molecule.scm
+++ b/scm/molecule.scm
@@ -4,7 +4,7 @@
   (if (null? mols)
       '()
       (if (pair? mols)
-         (ly:combine-molecule-at-edge (car mols) axis dir 
+         (ly:molecule-combine-at-edge (car mols) axis dir 
                                       (stack-molecules axis dir padding (cdr mols))
                                       padding
                                       )
@@ -12,7 +12,17 @@
   ))
 
 
-
+(define-public (stack-lines dir padding baseline mols)
+  "Stack vertically with a baseline-skip."
+  (if (null? mols)
+      '()
+      (if (null? (cdr mols))
+         (car mols)
+         (ly:molecule-combine-at-edge (car mols) Y dir 
+                                      (stack-lines dir padding baseline (cdr mols))
+                                      padding baseline
+                                      )
+         )))
 
 (define-public (fontify-text font-metric text)
   "Set TEXT with font FONT-METRIC, returning a molecule."
@@ -24,19 +34,15 @@
 (define-public (bracketify-molecule mol axis thick protusion padding)
   "Add brackets around MOL, producing a new molecule."
 
-  (let* (
-        (ext (ly:get-molecule-extent mol axis))
+  (let* ((ext (ly:molecule-get-extent mol axis))
         (lb (ly:bracket axis ext thick (- protusion)))
-        (rb (ly:bracket axis ext thick protusion))
-        )
-    (set! mol (ly:combine-molecule-at-edge mol (other-axis  axis) 1 lb padding))
-    (set! mol (ly:combine-molecule-at-edge mol (other-axis  axis) -1 rb padding))
+        (rb (ly:bracket axis ext thick protusion)))
+    (set! mol (ly:molecule-combine-at-edge mol (other-axis  axis) 1 lb padding))
+    (set! mol (ly:molecule-combine-at-edge mol (other-axis  axis) -1 rb padding))
     mol
   ))
 
-
-
-(define-public (box-molecule xext yext)
+(define-public (make-filled-box-molecule xext yext)
   "Make a filled box."
   
   (ly:make-molecule
@@ -45,19 +51,34 @@
       xext yext)                      
 )
 
+
 (define-public (box-grob-molecule grob)
   "Make a box of exactly the extents of the grob.  The box precisely
 encloses the contents.
 "
   (let* ((xext (ly:get-extent grob grob 0))
         (yext (ly:get-extent grob grob 1))
-        (mol (ly:make-molecule '() '(10000 . -10000) '(10000 . -10000)))
-        (thick 0.1)
-        )
-
-    (set! mol (ly:add-molecule mol (box-molecule xext (cons (- (car yext) thick) (car yext) ))))
-    (set! mol (ly:add-molecule mol (box-molecule xext (cons  (cdr yext) (+ (cdr yext) thick) ))))
-    (set! mol (ly:add-molecule mol (box-molecule (cons (cdr xext) (+ (cdr xext) thick)) yext)))
-    (set! mol (ly:add-molecule mol (box-molecule (cons (- (car xext) thick) (car xext)) yext)))
-    mol
-  ))
+        (thick 0.1))
+
+    (ly:molecule-add (make-filled-box-molecule xext (cons (- (car yext) thick) (car yext) ))
+                    (make-filled-box-molecule xext (cons  (cdr yext) (+ (cdr yext) thick) ))
+                    (make-filled-box-molecule (cons (cdr xext) (+ (cdr xext) thick)) yext)
+                    (make-filled-box-molecule (cons (- (car xext) thick) (car xext)) yext))))
+
+
+;; TODO merge this and prev function. 
+(define-public (box-molecule mol thick padding)
+  "Add a box around MOL, producing a new molecule."
+  (let* (
+        (x-ext (interval-widen (ly:molecule-get-extent mol 0) padding))
+        (y-ext (interval-widen (ly:molecule-get-extent mol 1) padding))
+        (x-rule (make-filled-box-molecule (interval-widen x-ext thick)
+                              (cons 0 thick)))
+        (y-rule (make-filled-box-molecule (cons 0 thick) y-ext)))
+    
+    (set! mol (ly:molecule-combine-at-edge mol 0 1 y-rule (* 0.5 padding)))
+    (set! mol (ly:molecule-combine-at-edge mol 0 -1  y-rule (* 0.5 padding)))
+    (set! mol (ly:molecule-combine-at-edge mol 1 1  x-rule 0.0))  
+    (set! mol (ly:molecule-combine-at-edge mol 1 -1 x-rule 0.0))
+    
+    mol))