* scm/encoding.scm (coding-alist): Fix encodings for fetaNumber

and fetaDynamic.

* lily/rest.cc (glyph_name): Change - to . .

* scm/output-gnome.scm (text): Hello world, again.

* lily/font-metric.cc (ly:font-glyph-name-to-charcode): Use it in
new function.
(ly:font-glyph-to-index): Remove.

diff --git a/ChangeLog b/ChangeLog
index 989cd1c79ffc86f8514b95814fe1714b7055ea80..720f78cbbc8fe73466e5e4c55cc26123383d67db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-12-13  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * scm/encoding.scm (coding-alist): Fix encodings for fetaNumber
+       and fetaDynamic.
+
+       * lily/rest.cc (glyph_name): Change - to . .
+
        * scm/output-gnome.scm (text): Hello world, again.
 
        * scm/output-svg.scm (named-glyph): New function.  Hello world!

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 9686b7b54dbc5c853b5c453bc6c6ab336b2085fa..e334548fbb75601c2803dba7ca49223ba7634a40 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -201,7 +201,7 @@ LY_DEFINE (ly_font_glyph_name_to_charcode, "ly:font-glyph-name-to-charcode",
 #endif
 }
 
-LY_DEFINE (ly_text_dimension,"ly:text-dimension",
+LY_DEFINE (ly_text_dimension, "ly:text-dimension",
           2, 0, 0,
          (SCM font, SCM text),
          "Given the font metric in @var{font} and the string @var{text}, "
@@ -219,7 +219,7 @@ LY_DEFINE (ly_text_dimension,"ly:text-dimension",
   return scm_cons (ly_interval2scm (b[X_AXIS]), ly_interval2scm (b[Y_AXIS]));
 }
 
-LY_DEFINE (ly_font_file_name,"ly:font-file-name",
+LY_DEFINE (ly_font_file_name, "ly:font-file-name",
           1, 0, 0,
           (SCM font),
           "Given the font metric @var{font}, "
@@ -233,7 +233,7 @@ LY_DEFINE (ly_font_file_name,"ly:font-file-name",
 
 #include "afm.hh"
 
-LY_DEFINE (ly_font_name,"ly:font-name",
+LY_DEFINE (ly_font_name, "ly:font-name",
           1, 0, 0,
           (SCM font),
           "Given the font metric @var{font}, "
@@ -250,7 +250,7 @@ LY_DEFINE (ly_font_name,"ly:font-name",
   return SCM_BOOL_F;
 }
 
-LY_DEFINE (ly_font_magnification,"ly:font-magnification", 1 , 0, 0,
+LY_DEFINE (ly_font_magnification, "ly:font-magnification", 1, 0, 0,
          (SCM font),
           "Given the font metric @var{font}, return the "
           "magnification, relative to the current outputscale.")
@@ -260,7 +260,7 @@ LY_DEFINE (ly_font_magnification,"ly:font-magnification", 1 , 0, 0,
   return scm_cdr (fm->description_);
 }
 
-LY_DEFINE (ly_font_design_size,"ly:font-design-size", 1 , 0, 0,
+LY_DEFINE (ly_font_design_size, "ly:font-design-size", 1, 0, 0,
          (SCM font),
           "Given the font metric @var{font}, return the "
           "design size, relative to the current outputscale.")

diff --git a/lily/rest.cc b/lily/rest.cc
index 35897357055f962b86a58db452a8a0df9fc0439e..7769d030feee3496c8fea470adcd81003fc512c7 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -108,7 +108,8 @@ Rest::glyph_name (Grob *me, int balltype, String style, bool try_ledgers)
     actual_style = "";
   }
 
-  return ("rests-") + to_string (balltype) + (ledgered_b ? "o" : "") + actual_style;
+  return ("rests." + to_string (balltype) + (ledgered_b ? "o" : "")
+         + actual_style);
 }
 
 

diff --git a/scm/encoding.scm b/scm/encoding.scm
index 13970ef5b6a29d2638dd1ce04ad5b905242fa1bf..c108066f789ad92eead52e4f72afa835beaf0e62 100644 (file)
--- a/scm/encoding.scm
+++ b/scm/encoding.scm
@@ -98,8 +98,10 @@ vector of symbols."
 
         ;; LilyPond FETA music font
         ("fetaBraces" . "feta-braces-a.enc")
-        ("fetaDynamic" . "feta-din10.enc")
-        ("fetaNumber" . "feta-nummer10.enc")
+        ;;("fetaDynamic" . "feta-din10.enc")
+        ;;("fetaNumber" . "feta-nummer10.enc")
+        ("fetaDynamic" . "feta-alphabet20.enc")
+        ("fetaNumber" . "feta-alphabet20.enc")
         ("fetaMusic" . "feta20.enc")
         ("parmesanMusic" . "parmesan20.enc"))
        ))

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index e44781a6a238c5d3c52c57ff8588286ff312f181..30c1767c935609dce3cf883396b3864bbca4d914 100644 (file)
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -273,7 +273,7 @@ lilypond -fgnome input/simple-song.ly
     bezier))
 
 (define (char font i)
-  (text font (ly:font-index-to-charcode (integer->char i))))
+  (text font (ly:font-index-to-charcode font i)))
 
 ;; FIXME: naming
 (define (filledbox breapth width depth height)