*** empty log message ***

diff --git a/configure.in b/configure.in
index 696463531f1ae45ca8459e9ea2c6beafd02d5e09..4290614d1add3b024e1a4c09c71a3c892bf2cdb1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -51,6 +51,12 @@ STEPMAKE_KPATHSEA
 STEPMAKE_MAKEINFO(REQUIRED)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
+# mftrace for generating pfa's, pfb's
+STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.0.27)
+
+# mftrace for generating pfa's, pfb's
+STEPMAKE_PROGS(FONTFORGE, fontforge, REQUIRED, 20041208)
+
 
 AC_CHECK_HEADERS([assert.h sys/stat.h])
 AC_LANG_PUSH(C++)
@@ -91,7 +97,7 @@ PKG_CONFIG_PATH=$HOME/usr/pkg/pango/lib/pkgconfig:$PKG_CONFIG_PATH
 
 STEPMAKE_FREETYPE2
 STEPMAKE_PANGO
-
+i
 if test "$gui_b" = "yes"; then
     STEPMAKE_GTK2
 fi
@@ -102,8 +108,8 @@ fi
 STEPMAKE_GUILE(OPTIONAL)
 # perl for help2man.
 STEPMAKE_PERL(OPTIONAL)
-# mftrace for generating pfa's, pfb's
-STEPMAKE_PROGS(MFTRACE, mftrace, OPTIONAL, 1.0.27)
+
+
 
 # new makeinfo for multi-page website docs
 STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.7)

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 5b1783cf511a369c881818282e4650462692a7e2..1a4d3b42685cca82022280c5ad8bf07d706603f8 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -130,7 +130,7 @@ IMPLEMENT_DEFAULT_EQUAL_P (Font_metric);
 IMPLEMENT_TYPE_P (Font_metric, "ly:font-metric?");
 
 
-LY_DEFINE (ly_find_glyph_by_name, "ly:find-glyph-by-name",
+LY_DEFINE (ly_find_glyph_by_name, "ly:font-get-glyph",
           2, 0, 0,
          (SCM font, SCM name),
          "This function retrieves a Stencil for the glyph named @var{name} "

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 9b01b6553cdd68d7a6c70021b51c5e2886758ddc..d0736af0c00858f49295a59b780a875cdda10e18 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -6,7 +6,7 @@ include $(depth)/make/stepmake.make
 
 AF_FILES = $(wildcard *.af) 
 
-EXTRA_DIST_FILES += README feta.tex  merge.pe
+EXTRA_DIST_FILES += README feta.tex merge.pe
 
 
 # We don't use $(MF_FILES), because there's more .mf cruft here
@@ -31,8 +31,6 @@ FETA_LIST_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%list.ly)
 
 ENCODING_FILE=$(findstring $(<:.mf=.enc), $(FETA_MF_FILES:.mf=.enc))
 MFTRACE_FLAGS=$(if $(ENCODING_FILE),--encoding $(ENCODING_FILE),)
-bla:
-       echo $(TFM_FILES) 
 
 # only for fonts which
 #
@@ -46,6 +44,9 @@ foe:
        echo $(TEXMF)
        kpsewhich exbase.mf
 
+$(outdir)/feta20.otf: merge.pe
+       (cd $(outdir) ; fontforge -s merge.pe ) 
+
 
 ## use separate package sauter-fonts-mftraced.
 SAUTER_FONTS = 

diff --git a/scm/clef.scm b/scm/clef.scm
index 2b27e5ae380b62c765b5807fb195a08c2065890c..2bbc081ec5eafcca5f17cb2addf7f1ca525c5ab0 100644 (file)
--- a/scm/clef.scm
+++ b/scm/clef.scm
@@ -10,85 +10,85 @@
 ;; -- the name clefOctavation is misleading. The value 7 is 1 octave,
 ;; not 7 Octaves.
 (define supported-clefs
-  '(("treble" . ("clefs-G" -2 0))
-    ("violin" . ("clefs-G" -2 0))
-    ("G" . ("clefs-G" -2 0))
-    ("G2" . ("clefs-G" -2 0))
-    ("french" . ("clefs-G" -4 0))
-    ("soprano" . ("clefs-C" -4 0))
-    ("mezzosoprano" . ("clefs-C" -2 0))
-    ("alto" . ("clefs-C" 0 0))
-    ("C" . ("clefs-C" 0 0))
-    ("tenor" . ("clefs-C" 2 0))
-    ("baritone" . ("clefs-C" 4 0))
-    ("varbaritone" . ("clefs-F" 0 0))
-    ("bass" . ("clefs-F" 2 0))
-    ("F" . ("clefs-F" 2 0))
-    ("subbass" . ("clefs-F" 4 0))
-    ("percussion" . ("clefs-percussion" 0 0))
-    ("tab" . ("clefs-tab" 0 0))
+  '(("treble" . ("clefs.G" -2 0))
+    ("violin" . ("clefs.G" -2 0))
+    ("G" . ("clefs.G" -2 0))
+    ("G2" . ("clefs.G" -2 0))
+    ("french" . ("clefs.G" -4 0))
+    ("soprano" . ("clefs.C" -4 0))
+    ("mezzosoprano" . ("clefs.C" -2 0))
+    ("alto" . ("clefs.C" 0 0))
+    ("C" . ("clefs.C" 0 0))
+    ("tenor" . ("clefs.C" 2 0))
+    ("baritone" . ("clefs.C" 4 0))
+    ("varbaritone" . ("clefs.F" 0 0))
+    ("bass" . ("clefs.F" 2 0))
+    ("F" . ("clefs.F" 2 0))
+    ("subbass" . ("clefs.F" 4 0))
+    ("percussion" . ("clefs.percussion" 0 0))
+    ("tab" . ("clefs.tab" 0 0))
 
     ;; should move mensural stuff to separate file? 
-    ("vaticana-do1" . ("clefs-vaticana-do" -1 0))
-    ("vaticana-do2" . ("clefs-vaticana-do" 1 0))
-    ("vaticana-do3" . ("clefs-vaticana-do" 3 0))
-    ("vaticana-fa1" . ("clefs-vaticana-fa" -1 0))
-    ("vaticana-fa2" . ("clefs-vaticana-fa" 1 0))
-    ("medicaea-do1" . ("clefs-medicaea-do" -1 0))
-    ("medicaea-do2" . ("clefs-medicaea-do" 1 0))
-    ("medicaea-do3" . ("clefs-medicaea-do" 3 0))
-    ("medicaea-fa1" . ("clefs-medicaea-fa" -1 0))
-    ("medicaea-fa2" . ("clefs-medicaea-fa" 1 0))
-    ("hufnagel-do1" . ("clefs-hufnagel-do" -1 0))
-    ("hufnagel-do2" . ("clefs-hufnagel-do" 1 0))
-    ("hufnagel-do3" . ("clefs-hufnagel-do" 3 0))
-    ("hufnagel-fa1" . ("clefs-hufnagel-fa" -1 0))
-    ("hufnagel-fa2" . ("clefs-hufnagel-fa" 1 0))
-    ("hufnagel-do-fa" . ("clefs-hufnagel-do-fa" 4 0))
-    ("mensural-c1" . ("clefs-mensural-c" -2 0))
-    ("mensural-c2" . ("clefs-mensural-c" 0 0))
-    ("mensural-c3" . ("clefs-mensural-c" 2 0))
-    ("mensural-c4" . ("clefs-mensural-c" 4 0))
-    ("mensural-f" . ("clefs-mensural-f" 2 0))
-    ("mensural-g" . ("clefs-mensural-g" -2 0))
-    ("neomensural-c1" . ("clefs-neomensural-c" -4 0))
-    ("neomensural-c2" . ("clefs-neomensural-c" -2 0))
-    ("neomensural-c3" . ("clefs-neomensural-c" 0 0))
-    ("neomensural-c4" . ("clefs-neomensural-c" 2 0))
-    ("petrucci-c1" . ("clefs-petrucci-c1" -4 0))
-    ("petrucci-c2" . ("clefs-petrucci-c2" -2 0))
-    ("petrucci-c3" . ("clefs-petrucci-c3" 0 0))
-    ("petrucci-c4" . ("clefs-petrucci-c4" 2 0))
-    ("petrucci-c5" . ("clefs-petrucci-c5" 4 0))
-    ("petrucci-f" . ("clefs-petrucci-f" 2 0))
-    ("petrucci-g" . ("clefs-petrucci-g" -2 0))))
+    ("vaticana-do1" . ("clefs.vaticana-do" -1 0))
+    ("vaticana-do2" . ("clefs.vaticana-do" 1 0))
+    ("vaticana-do3" . ("clefs.vaticana-do" 3 0))
+    ("vaticana-fa1" . ("clefs.vaticana-fa" -1 0))
+    ("vaticana-fa2" . ("clefs.vaticana-fa" 1 0))
+    ("medicaea-do1" . ("clefs.medicaea-do" -1 0))
+    ("medicaea-do2" . ("clefs.medicaea-do" 1 0))
+    ("medicaea-do3" . ("clefs.medicaea-do" 3 0))
+    ("medicaea-fa1" . ("clefs.medicaea-fa" -1 0))
+    ("medicaea-fa2" . ("clefs.medicaea-fa" 1 0))
+    ("hufnagel-do1" . ("clefs.hufnagel-do" -1 0))
+    ("hufnagel-do2" . ("clefs.hufnagel-do" 1 0))
+    ("hufnagel-do3" . ("clefs.hufnagel-do" 3 0))
+    ("hufnagel-fa1" . ("clefs.hufnagel-fa" -1 0))
+    ("hufnagel-fa2" . ("clefs.hufnagel-fa" 1 0))
+    ("hufnagel-do-fa" . ("clefs.hufnagel-do-fa" 4 0))
+    ("mensural-c1" . ("clefs.mensural-c" -2 0))
+    ("mensural-c2" . ("clefs.mensural-c" 0 0))
+    ("mensural-c3" . ("clefs.mensural-c" 2 0))
+    ("mensural-c4" . ("clefs.mensural-c" 4 0))
+    ("mensural-f" . ("clefs.mensural-f" 2 0))
+    ("mensural-g" . ("clefs.mensural-g" -2 0))
+    ("neomensural-c1" . ("clefs.neomensural-c" -4 0))
+    ("neomensural-c2" . ("clefs.neomensural-c" -2 0))
+    ("neomensural-c3" . ("clefs.neomensural-c" 0 0))
+    ("neomensural-c4" . ("clefs.neomensural-c" 2 0))
+    ("petrucci-c1" . ("clefs.petrucci-c1" -4 0))
+    ("petrucci-c2" . ("clefs.petrucci-c2" -2 0))
+    ("petrucci-c3" . ("clefs.petrucci-c3" 0 0))
+    ("petrucci-c4" . ("clefs.petrucci-c4" 2 0))
+    ("petrucci-c5" . ("clefs.petrucci-c5" 4 0))
+    ("petrucci-f" . ("clefs.petrucci-f" 2 0))
+    ("petrucci-g" . ("clefs.petrucci-g" -2 0))))
 
 ;; "an alist mapping GLYPHNAME to the position of the middle C for
 ;; that symbol"
 (define c0-pitch-alist
-  '(("clefs-G" . -4)
-    ("clefs-C" . 0)
-    ("clefs-F" . 4)
-    ("clefs-percussion" . 0)
-    ("clefs-tab" . 0 )
-    ("clefs-vaticana-do" . 0)
-    ("clefs-vaticana-fa" . 4)
-    ("clefs-medicaea-do" . 0)
-    ("clefs-medicaea-fa" . 4)
-    ("clefs-hufnagel-do" . 0)
-    ("clefs-hufnagel-fa" . 4)
-    ("clefs-hufnagel-do-fa" . 0)
-    ("clefs-mensural-c" . 0)
-    ("clefs-mensural-f" . 4)
-    ("clefs-mensural-g" . -4)
-    ("clefs-neomensural-c" . 0)
-    ("clefs-petrucci-c1" . 0)
-    ("clefs-petrucci-c2" . 0)
-    ("clefs-petrucci-c3" . 0)
-    ("clefs-petrucci-c4" . 0)
-    ("clefs-petrucci-c5" . 0)
-    ("clefs-petrucci-f" . 4)
-    ("clefs-petrucci-g" . -4)))
+  '(("clefs.G" . -4)
+    ("clefs.C" . 0)
+    ("clefs.F" . 4)
+    ("clefs.percussion" . 0)
+    ("clefs.tab" . 0 )
+    ("clefs.vaticana-do" . 0)
+    ("clefs.vaticana-fa" . 4)
+    ("clefs.medicaea-do" . 0)
+    ("clefs.medicaea-fa" . 4)
+    ("clefs.hufnagel-do" . 0)
+    ("clefs.hufnagel-fa" . 4)
+    ("clefs.hufnagel-do-fa" . 0)
+    ("clefs.mensural-c" . 0)
+    ("clefs.mensural-f" . 4)
+    ("clefs.mensural-g" . -4)
+    ("clefs.neomensural-c" . 0)
+    ("clefs.petrucci-c1" . 0)
+    ("clefs.petrucci-c2" . 0)
+    ("clefs.petrucci-c3" . 0)
+    ("clefs.petrucci-c4" . 0)
+    ("clefs.petrucci-c5" . 0)
+    ("clefs.petrucci-f" . 4)
+    ("clefs.petrucci-g" . -4)))
 
 (define-public (make-clef-set clef-name)
   "Generate the clef setting commands for a clef with name CL."

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 2e973151e6f5269628ded1e77e9263681a96309d..82a039460960b9382f953d76878e5349761b541d 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -2292,6 +2292,13 @@ def conv (str):
 conversions.append (((2, 5, 2),
                     conv,
                     '\markup .. < .. > .. -> \markup .. { .. } ..'))
+def conv (str):
+       str = re.sub ('ly:find-glyph-by-name', 'ly:font-get-glyph', str)
+       return str
+
+conversions.append (((2, 5, 2),
+                    conv,
+                    'ly:find-glyph-by-name -> ly:font-get-glyph'))
 
 ################################
 #      END OF CONVERSIONS