* scm/new-markup.scm (strut-markup): new markup function.

* scm/bass-figure.scm (make-bass-figure-markup): insert vertical
space also when no accidental is there.

diff --git a/ChangeLog b/ChangeLog
index a6216da95cdff631696a23f082ee2bff2cb19b34..a54a85fa1e4d540183f9ae2baa3c3adf9796fb49 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-02  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * scm/new-markup.scm (strut-markup): new markup function.
+
+       * scm/bass-figure.scm (make-bass-figure-markup): insert vertical
+       space also when no accidental is there.
+
 2003-08-02  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * input/les-nereides.ly: Updates.

diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly
index dc48c5a12ad19e73209102d6af56a34e93f68044..2e67bf053580ffea33e0455af70de4ac8333264b 100644 (file)
--- a/input/regression/figured-bass.ly
+++ b/input/regression/figured-bass.ly
@@ -18,6 +18,7 @@ You can also type letters by entering quoted strings, as demonstrated in the las
        <3 [5] 7 [9 11]>
        <3+ 5- 7!>
        <3 _! 5 _- 7>
+       <3 _ 5 _ 7>
 \property FiguredBass.BassFigure \set #'font-family = #'roman
        <"V7" ["bla" 6] 7>
    }

diff --git a/scm/bass-figure.scm b/scm/bass-figure.scm
index 136396187e34b9e858ee4c880e55e36377291523..9c72b95ed07977e162df4e8bf7d372433aa6be81 100644 (file)
--- a/scm/bass-figure.scm
+++ b/scm/bass-figure.scm
@@ -33,7 +33,10 @@
         (fig-markup
          (if (string? fig)
              (make-simple-markup fig)
-             (make-simple-markup (if align-accs " " ""))
+             (if align-accs (make-simple-markup " ")
+                 (if (not (eq? acc '()))
+                     (make-simple-markup "")
+                     (make-strut-markup)))
              )))
 
       (if (number? acc)

diff --git a/scm/new-markup.scm b/scm/new-markup.scm
index f60c36caf73be26d5eaf15ed261feb3cc6b7fc68..d7e751ea691139c889e097e2136aa680d0a56f4d 100644 (file)
--- a/scm/new-markup.scm
+++ b/scm/new-markup.scm
@@ -45,6 +45,13 @@ for the reader.
 
 " ; " 
 
+
+;;;;;;;;;;;;;;;;;
+;; TODO:
+;; each markup function should have a doc string with
+;; syntax, description and example. 
+;;
+
 (define-public (simple-markup grob props . rest)
   (Text_item::text_to_molecule grob props (car rest))
   )
@@ -383,6 +390,23 @@ for the reader.
     (box-molecule m th pad)
   ))
 
+
+(define-public (strut-markup grob props . rest)
+  "Syntax: \strut
+
+ A box of the same height as the space.
+"
+
+  (let*
+      ((m (Text_item::text_to_molecule grob props " ")))
+
+    (ly:molecule-set-extent! m 0 '(1000 . -1000))
+    m))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
 (define (markup-signature-to-keyword sig)
   " (A B C) -> a0-b1-c2 "
   
@@ -545,8 +569,8 @@ for the reader.
    (cons fontsize-markup (list number? markup?))
 
    (cons box-markup  (list markup?))
-   )
-  )
+   (cons strut-markup '())
+   ))
 
 
 (define markup-module (current-module))
@@ -612,13 +636,12 @@ against SIGNATURE, reporting MAKE-NAME as the user-invoked function.
 "
 
   (let*
-      (
-       (arglen (length args))
+      ((arglen (length args))
        (siglen (length signature))
        (error-msg
        (if (and (> siglen 0) (> arglen 0))
-           (markup-argument-list-error signature args 1)))
-       )
+           (markup-argument-list-error signature args 1)
+           #f)))
 
 
     (if (or (not (= arglen siglen)) (< siglen 0) (< arglen 0))