From f0968255554403de5d86b7e6efff5e644cba7f7a Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 19 Dec 2004 12:03:38 +0000
Subject: [PATCH] (triangle): add s to 0triangle.

---
 ChangeLog                             | 2 ++
 input/regression/molecule-hacking.ly  | 6 +++---
 input/regression/new-markup-scheme.ly | 4 ++--
 mf/feta-bolletjes.mf                  | 2 +-
 scripts/convert-ly.py                 | 4 +++-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9527acbcb9..e7ff3e633a 100644
--- 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 baffe6c080..1bbf1e879b 100644
--- 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 6a4b96bbf1..814018e17c 100644
--- 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 c1e19bcb63..c429ea861c 100644
--- 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 7c5f73bd3a..880fd23415 100644
--- 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.'))
 
 
 ################################
-- 
2.39.2