* scm/display-lily.scm: new file. Define a `display-lily-music'

[lilypond.git] / mf / feta-autometric.mf

diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf
index 77b551e30c5c2ef55ee18ff6f0a067264e871391..0181d0746cae930b43a3d572bde564165c3cd7b5 100644 (file)
--- a/mf/feta-autometric.mf
+++ b/mf/feta-autometric.mf
@@ -4,7 +4,7 @@
 % source file of the Feta (not an acronym for Font-En-Tja)
 % pretty-but-neat music font
 %
-% (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 %          Jan Nieuwenhuizen <janneke@gnu.org>
 %
 % these macros help create ascii logging output
@@ -23,7 +23,7 @@ message "";
 def fet_beginfont (expr name, size, encod) =
        font_identifier := name & decimal size;
        font_size size;
-       font_coding_scheme encod;
+       font_coding_scheme "asis";
        message "@{font@:GNU@:LilyPond@:" & name
                & "@:" & decimal size
                & "@:" & encod
@@ -39,18 +39,23 @@ enddef;
 
 % group or table?
 def fet_begingroup (expr name) =
-       message "@{group@:" & name
+begingroup;
+       save feta_group;
+       string feta_group;
+
+       feta_group := name;
+
+       message "@{group@:" & feta_group
                & "@}";
        message "";
-begingroup
 enddef;
 
 
 def fet_endgroup (expr name) =
-endgroup;
        message "@{puorg@:" & name
                & "@}";
        message "";
+endgroup;
 enddef;
 
 
@@ -163,7 +168,7 @@ enddef;
 
 
 def no_dimen_beginchar (expr c) =
-begingroup
+begingroup;
        charcode := if known c: byte c else: 0; fi;
        charic := 0;
        clearxy;
@@ -196,6 +201,16 @@ def fet_beginchar (expr name, id_lit) =
        charnamestr := name;
        idstr := id_lit;
 
+       % addition for mf2pt1
+       if known bp_per_pixel:
+               if known feta_group:
+                       special "% MF2PT1: glyph_name "
+                               & feta_group & "." & idstr;
+               else:
+                       special "% MF2PT1: glyph_name " & idstr;
+               fi;
+       fi;
+
        no_dimen_beginchar (incr code) name;
 enddef;
 
@@ -223,7 +238,7 @@ def breapth_endchar =
 
        chardx := (w + b);      % what the heck is chardx
        shipit;
-endgroup
+endgroup;
 enddef;