(triangle): add s to 0triangle.

diff --git a/ChangeLog b/ChangeLog
index 9527acbcb9ea32e199360b2103ce6b3f536b849b..e7ff3e633a659fc0eaf897a7499daeec8d618f6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-12-19  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * mf/feta-bolletjes.mf (triangle): add s to 0triangle.
+
        * mf/GNUmakefile (ALL_GEN_FILES): make SVG files too.
 
 2004-12-19  Jan Nieuwenhuizen  <janneke@gnu.org>

diff --git a/input/regression/molecule-hacking.ly b/input/regression/molecule-hacking.ly
index baffe6c0804f97e386422e02ac02b7d3c0004bd0..1bbf1e879b178af4e338c7ff6730da9f4b5d4cb1 100644 (file)
--- a/input/regression/molecule-hacking.ly
+++ b/input/regression/molecule-hacking.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.5.2"
 
 \header { texidoc=" You can write stencil callbacks in Scheme, thus
 providing custom glyphs for notation elements.  A simple example is
@@ -29,8 +29,8 @@ GROB.  The dimensions of the stencil is not affected.
 "
      
      (let* ((fn (ly:get-default-font grob))
-           (pclose (ly:find-glyph-by-name fn "accidentals-rightparen"))
-           (popen (ly:find-glyph-by-name fn "accidentals-leftparen"))
+           (pclose (ly:font-get-glyph fn "accidentals.rightparen"))
+           (popen (ly:font-get-glyph fn "accidentals.leftparen"))
            (subject (callback grob))
 
            ; remember old size

diff --git a/input/regression/new-markup-scheme.ly b/input/regression/new-markup-scheme.ly
index 6a4b96bbf1173d9302022c4c79df4379b308df48..814018e17cdc50b42df84495a683ac634ee5cb92 100644 (file)
--- a/input/regression/new-markup-scheme.ly
+++ b/input/regression/new-markup-scheme.ly
@@ -20,7 +20,7 @@
                 \lookup #"noteheads-0"
                 \char #53
             }
-            \musicglyph #"accidentals--1"
+            \musicglyph #"accidentals.-1"
             \combine "X" "+"   
             \combine "o" "/"
             \box \column { \line { "string 1" } \line { "string 2" } }
@@ -41,7 +41,7 @@
               #:hspace 2.0
               #:override '(font-family . music) #:line (#:lookup "noteheads-0" 
                                                         #:char 53)
-              #:musicglyph "accidentals--1"
+              #:musicglyph "accidentals.-1"
               #:combine "X" "+"   
               #:combine "o" "/"
               #:box #:column ("string 1" "string 2")

diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index c1e19bcb6378ae0d596517833b483be227b66b86..c429ea861ca4abf8591eb54e5b8adf55a6c260c5 100644 (file)
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-bolletjes.mf
@@ -268,7 +268,7 @@ def define_triangle_shape(expr stemdir) =
        fi
 enddef;
 
-fet_beginchar("Whole trianglehead", "0triangle")
+fet_beginchar("Whole trianglehead", "s0triangle")
        save hei,xs;
        save llap;
        save tilt;

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 7c5f73bd3a53f4aea78d639b284334f7afcf87a1..880fd23415d7969bdd455c82961813951e1ab5f1 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -2287,11 +2287,13 @@ conversions.append (((2, 5, 2),
 
 def conv (str):
        str = re.sub ('ly:find-glyph-by-name', 'ly:font-get-glyph', str)
+       str = re.sub ('"accidentals-', '"accidentals.', str)
+       str = re.sub ('"scripts-', '"scripts.', str)
        return str
 
 conversions.append (((2, 5, 2),
                     conv,
-                    'ly:find-glyph-by-name -> ly:font-get-glyph'))
+                    'ly:find-glyph-by-name -> ly:font-get-glyph, remove - from glyphnames.'))
 
 
 ################################