*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index b95c3ddb78b9a1fa7bf194e5d355151c2832503f..2f11e36c24350981e6b3bf06daa13546a49c3ee2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
+2005-01-02    Tatsuya Ono <tats_ono@infoseek.jp>
+
+       * scm/define-markup-commands.scm :  fix glyph-strings of
+       accidentals and \note-by-number
+       
 2005-01-01  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * VERSION: 2.5.6 released.
+       
        * ps/lilyponddefs.ps: put mm -> pt scaling in here.
 
        * input/regression/new-markup-scheme.ly: oops. font-family=music

diff --git a/THANKS b/THANKS
index b42098b3bda8a7503a446736c652331af9eb51a1..b2b930fa5423b2b0a1bc85be6b8f69a8acd249dd 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -17,6 +17,7 @@ Heikki Junes
 Werner Lemberg
 Andreas Scherer
 Nicolas Sceaux
+Tatsuya Ono
 
 SPONSORS
 

diff --git a/VERSION b/VERSION
index 41483e3a70f07d70144a1af010b0b26dbe1c26eb..c01296d01fbeb1a46559683abd1dc766a1cc2713 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=5
-PATCH_LEVEL=6
+PATCH_LEVEL=7
 MY_PATCH_LEVEL=
 

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 120b25568d3d52bd3af1974c8c84bbec3ca35d35..ff2e9da7457b7b1993d490086fb15144122d2b81 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -280,36 +280,36 @@ recommend font for this is bold and italic"
 (def-markup-command (doublesharp layout props) ()
   "Draw a double sharp symbol."
 
-  (interpret-markup layout props (markup #:musicglyph "accidentals-4")))
+  (interpret-markup layout props (markup #:musicglyph "accidentals.4")))
 (def-markup-command (sesquisharp layout props) ()
   "Draw a 3/2 sharp symbol."
-  (interpret-markup layout props (markup #:musicglyph "accidentals-3")))
+  (interpret-markup layout props (markup #:musicglyph "accidentals.3")))
 
 (def-markup-command (sharp layout props) ()
   "Draw a sharp symbol."
-  (interpret-markup layout props (markup #:musicglyph "accidentals-2")))
+  (interpret-markup layout props (markup #:musicglyph "accidentals.2")))
 (def-markup-command (semisharp layout props) ()
   "Draw a semi sharp symbol."
-  (interpret-markup layout props (markup #:musicglyph "accidentals-1")))
+  (interpret-markup layout props (markup #:musicglyph "accidentals.1")))
 (def-markup-command (natural layout props) ()
   "Draw a natural symbol."
 
-  (interpret-markup layout props (markup #:musicglyph "accidentals-0")))
+  (interpret-markup layout props (markup #:musicglyph "accidentals.0")))
 (def-markup-command (semiflat layout props) ()
   "Draw a semiflat."
-  (interpret-markup layout props (markup #:musicglyph "accidentals--1")))
+  (interpret-markup layout props (markup #:musicglyph "accidentals.M1")))
 (def-markup-command (flat layout props) ()
   "Draw a flat symbol."
   
-  (interpret-markup layout props (markup #:musicglyph "accidentals--2")))
+  (interpret-markup layout props (markup #:musicglyph "accidentals.M2")))
 (def-markup-command (sesquiflat layout props) ()
   "Draw a 3/2 flat symbol."
   
-  (interpret-markup layout props (markup #:musicglyph "accidentals--3")))
+  (interpret-markup layout props (markup #:musicglyph "accidentals.M3")))
 (def-markup-command (doubleflat layout props) ()
   "Draw a double flat symbol."
 
-  (interpret-markup layout props (markup #:musicglyph "accidentals--4")))
+  (interpret-markup layout props (markup #:musicglyph "accidentals.M4")))
 
 
 (def-markup-command (column layout props args) (markup-list?)
@@ -444,7 +444,7 @@ and/or @code{extra-offset} properties. "
          (stem-length (* (magstep size) (max 3 (- log 1))))
          (head-glyph (ly:font-get-glyph
                      font
-                     (string-append "noteheads-s" (number->string (min log 2)))))
+                     (string-append "noteheads.s" (number->string (min log 2)))))
          (stem-thickness 0.13)
          (stemy (* dir stem-length))
          (attachx (if (> dir 0)
@@ -468,7 +468,7 @@ and/or @code{extra-offset} properties. "
          (flaggl (and (> log 2)
                       (ly:stencil-translate
                        (ly:font-get-glyph font
-                                         (string-append "flags-"
+                                         (string-append "flags."
                                                         (if (> dir 0) "u" "d")
                                                         (number->string log)))
                        (cons (+ attachx (/ stem-thickness 2)) stemy)))))