* scm/define-markup-commands.scm (text): add \text markup command.

* configure.in (reloc_b): bump requirement to Python 2.2.

* scm/define-grobs.scm (all-grob-descriptions): reorganize in
alphabetical order.

* scm/define-grobs.scm (Module): new grob TrillPitchHead.

* scm/define-markup-commands.scm (pad-markup): pad-markup command.

diff --git a/ChangeLog b/ChangeLog
index 42e6cee7cc4e72c5c3cfb471cd8cb3567107ef17..e5a0c111c619df4a16b53bf317390316fad22c0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-07-08  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * scm/define-markup-commands.scm (text): add \text markup command.
+
+       * configure.in (reloc_b): bump requirement to Python 2.2.
+
        * lily/include/dots.hh (class Dots): make has_interface() static.
 
        * python/convertrules.py (conv): add rule for ly:grob-default-font

diff --git a/configure.in b/configure.in
index 98890053fde6297c836ef6d2d366b92a48558809..1a459b96991ccbb4dfb4eabed49ba5bf725a6f08 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -37,7 +37,7 @@ STEPMAKE_COMPILE
 
 STEPMAKE_KPATHSEA
 
-STEPMAKE_PYTHON(REQUIRED, 2.1)
+STEPMAKE_PYTHON(REQUIRED, 2.2)
 STEPMAKE_GCC(REQUIRED, 2.8)
 STEPMAKE_CXX(REQUIRED)
 STEPMAKE_GXX(REQUIRED, 3.0.5)

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 23ced398cd5f21fcbf3e9bbc1bdb56b1994b753e..8038b9260bfdb7c5e94cd5ff95985de36d3e546c 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -401,6 +401,7 @@
                                break-aligned-interface
                                percent-repeat-interface item-interface ))))
        ))
+    
     (DynamicText
      . (
        (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 9a61ba87e699b890ffa2ab5c0643aac6c025537c..fe3e3ad5528d496931bdea91a4a61e75e6d784a9 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -721,6 +721,15 @@ recommend font for this is bold and italic"
   (interpret-markup
    layout (prepend-alist-chain 'font-encoding 'fetaDynamic props) arg))
 
+(def-markup-command (text layout props arg) (markup?)
+  "Use a text font instead of music symbol or music alphabet "  
+  "font."
+
+  ;; ugh - latin1
+  (interpret-markup layout (prepend-alist-chain 'font-encoding 'latin1 props)
+                   arg))
+
+
 (def-markup-command (italic layout props arg) (markup?)
   "Use italic @code{font-shape} for @var{arg}. "
   (interpret-markup layout (prepend-alist-chain 'font-shape 'italic props) arg))