(MIDI block): add note about

dotted tempos.

diff --git a/ChangeLog b/ChangeLog
index 83ae006cc2e148009417288841899a71c4d5a83c..fa4c77b406d02eef9a4e92eda52143cd5db102ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-08-26  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * Documentation/user/refman.itely (MIDI block): add note about
+       dotted tempos.
+
        * scm/font.scm: remove old markup legacy
 
        * GNUmakefile.in (web-clean): remake share/ after web-clean.

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 5a3fae21422eaa00ed814c9b16f5dd03009ac1e4..9030b57be8b4165f8e97a112af2b380e3ba2efcc 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -8366,6 +8366,13 @@ simpler.  The @code{\midi} block can contain:
 
 Assignments in the @code{\midi} block are not allowed.
 
+A number followed by a period is interpreted as a real number, so
+for setting the tempo for dotted notes, an extra space should be
+inserted, for example:
+
+@example
+  \midi @{ \tempo 4 . = 120 @} 
+@end example
 
 
 @cindex context definition

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 020d1424ff353e1a1e6c356168a5607dd6ab3d8f..530f0b1fff1be1df4ee3b915237635a2525c5a61 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -95,7 +95,7 @@
     
     (BarNumber
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (breakable . #t)
        (break-visibility . ,begin-of-line-visible)
        (padding . 1.0)
@@ -116,7 +116,7 @@
 
     (BassFigure
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
        (direction . 1)
        (font-family . number)
@@ -319,7 +319,7 @@
     (DynamicText
      . (
        (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
                               ,Self_alignment_interface::centered_on_parent))
        (self-alignment-X . 0)
@@ -364,7 +364,7 @@
 
     (Fingering
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (padding . 0.6)
        ;;              (direction . -1)
        (self-alignment-X . 0)
@@ -424,7 +424,7 @@
                        ))
 
        (self-alignment-Y . 0)
-       (molecule-callback . ,brew-new-markup-molecule)         
+       (molecule-callback . ,Text_item::brew_molecule)         
        (break-align-symbol . instrument-name)
        (break-visibility . ,begin-of-line-visible)
        (baseline-skip . 2)
@@ -486,7 +486,7 @@
 
     (LyricText
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent
                               ,Self_alignment_interface::aligned_on_self))
        (self-alignment-X . 0)
@@ -511,7 +511,7 @@
 
     (RehearsalMark
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
        (Y-offset-callbacks . (,Side_position_interface::aligned_side)) 
        (self-alignment-X . 0)
@@ -527,7 +527,7 @@
        ))
      (MetronomeMark
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (Y-offset-callbacks . (,Side_position_interface::aligned_side)) 
        (direction . 1)
        (breakable . #t)
@@ -563,7 +563,7 @@
     
     (MultiMeasureRestNumber
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
                               ,Self_alignment_interface::centered_on_other_axis_parent))
        (Y-offset-callbacks . (,Side_position_interface::aligned_side))
@@ -575,7 +575,7 @@
        ))
     (MultiMeasureRestText
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
                               ,Self_alignment_interface::centered_on_other_axis_parent))
        (Y-offset-callbacks . (,Side_position_interface::aligned_side))
@@ -641,7 +641,7 @@
 
     (NoteName
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (font-family . roman)
        (meta . ((interfaces . (note-name-interface text-interface font-interface item-interface ))))
        ))
@@ -653,7 +653,7 @@
        (break-visibility . ,begin-of-line-visible)
        (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent ,Self_alignment_interface::aligned_on_self))
        (Y-offset-callbacks . (,Side_position_interface::aligned_side))
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (font-shape . italic)
        (padding . 0.4)
        (font-relative-size . -2)
@@ -849,7 +849,7 @@
     (StanzaNumber
      . (
        (breakable . #t)
-       (molecule-callback . ,brew-new-markup-molecule)         
+       (molecule-callback . ,Text_item::brew_molecule)         
        (break-align-symbol . clef)
        (break-visibility . ,begin-of-line-visible)
        (font-family . roman)
@@ -884,7 +884,7 @@
 
     (SostenutoPedal
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (direction . 1)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
        (no-spacing-rods . #t)
@@ -1055,7 +1055,7 @@
 
     (TextScript
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (no-spacing-rods . #t)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
        (direction . -1)
@@ -1166,7 +1166,7 @@
 
     (UnaCordaPedal
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (font-family . roman)
        (font-shape . italic)
        (no-spacing-rods . #t)

diff --git a/scm/new-markup.scm b/scm/new-markup.scm
index a5df938642f85ec116d50ffae5c565f3aa59e47f..03b3e1f0cf9b11e6919f2432c8a814d84d895a9c 100644 (file)
--- a/scm/new-markup.scm
+++ b/scm/new-markup.scm
@@ -394,7 +394,7 @@ for the reader.
 "
 
   (let*
-      ((m (Text_item::text_to_molecule grob props " ")))
+      ((m (Text_item::interpret_markup grob props " ")))
 
     (ly:molecule-set-extent! m 0 '(1000 . -1000))
     m))