*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 4d4fc6fd699dd2f651939b5b522943746b3941aa..dde07b37fa91dfbc97af707c579982efbdf301e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * buildscripts/mf-to-table.py (write_ps_encoding): write real
+       names in .enc
+
+       * lily/*.cc: use '.' iso. '-' for separating glyph name elements.
+
 2004-12-09  Graham Percival  <gperlist@shaw.ca>
 
         * Documentation/user/changing-defaults.itely: add info about
@@ -12,6 +19,10 @@
 
 2004-12-09  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * buildscripts/mf-to-table.py (parse_logfile): use . for
+       concatting name and group.
+       (parse_logfile): use M for Minus (negative.)
+
        * lily/include/type-swallow-translator.hh
        (DECLARE_EVENT_SWALLOWER): ENTER_DESCRIPTION -> ADD_TRANSLATOR
 

diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index d624262462529b3394c1b79c29642d918e513094..22afb3e9ea64144be6e012b2f8f4cc34cdf43027 100644 (file)
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -74,8 +74,10 @@ def parse_logfile (fn):
                        group = ''
                elif tags[0] == 'char':
                        name = tags[9]
+
+                       name = re.sub ('-', 'M', name)
                        if group:
-                               name = group + '-' + name
+                               name = group + '.' + name
                        m = {
                                'description': tags[1],
                                'name': name,
@@ -157,10 +159,30 @@ def write_tex_defs (file, global_info, charmetrics):
        file.write ('\\endinput\n')
 
 
+def write_otf_lisp_table (file, global_info, charmetrics):
+
+       def conv_char_metric (charmetric):
+               f = 1.0
+               s = """((%s .
+(bbox . (%f %f %f %f))
+(attachment . (%f %f))))
+""" %(charmetric['name'],
+                -charmetric['breapth'] * f,
+                -charmetric['depth'] * f,
+                charmetric['width'] * f,
+                charmetric['height'] * f,
+                charmetric['wx'],
+                charmetric['wy'])
+
+               return s
+
+       for c in charmetrics:
+               file.write (conv_char_metric (c))
+       
 def write_ps_encoding (name, file, global_info, charmetrics):
        encs = ['.notdef'] * 256
        for m in charmetrics:
-               encs[m['code']] = m['tex']
+               encs[m['code']] = m['name']
 
        file.write ('/%s [\n' % name)
        for m in range (0, 256):
@@ -248,9 +270,11 @@ Options:
 (options, files) = \
   getopt.getopt (sys.argv[1:],
                 'a:d:hl:o:p:t:',
-                ['enc=', 'afm=', 'outdir=', 'dep=',
+                ['enc=', 'afm=', 'outdir=', 'dep=', 'lisp=',
                  'tex=', 'ly=', 'debug', 'help', 'package='])
 
+
+lisp_nm = ''
 enc_nm = ''
 texfile_nm = ''
 depfile_nm = ''
@@ -267,6 +291,8 @@ for opt in options:
                outdir_prefix = a
        elif o == '--tex' or o == '-t':
                texfile_nm = a
+       elif o == '--lisp': 
+               lisp_nm = a
        elif o == '--enc':
                enc_nm = a
        elif o == '--ly' or o == '-l':
@@ -277,8 +303,6 @@ for opt in options:
                afmfile_nm = a
        elif o == '--debug':
                debug_b = 1
-       elif o == '-p' or o == '--package':
-               topdir = a
        else:
                print o
                raise getopt.error
@@ -306,7 +330,7 @@ for filenm in files:
                enc_name = 'FetaBraceEncoding'
 
        write_ps_encoding (enc_name, open (enc_nm, 'w'), g, m)
-
+       write_otf_lisp_table (open (lisp_nm, 'w'), g, m)  
        if depfile_nm:
                write_deps (open (depfile_nm, 'wb'), deps,
                            [base + '.dvi', base + '.pfa', base + '.pfb',

diff --git a/configure.in b/configure.in
index ab5bfc079a70d8e88e3da0cac836acb8aa1b674f..696463531f1ae45ca8459e9ea2c6beafd02d5e09 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -89,10 +89,11 @@ PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig:$PKG_CONFIG_PATH
 PKG_CONFIG_PATH=$HOME/usr/pkg/gnome/lib/pkgconfig:$PKG_CONFIG_PATH
 PKG_CONFIG_PATH=$HOME/usr/pkg/pango/lib/pkgconfig:$PKG_CONFIG_PATH
 
-#STEPMAKE_FREETYPE2
+STEPMAKE_FREETYPE2
+STEPMAKE_PANGO
+
 if test "$gui_b" = "yes"; then
     STEPMAKE_GTK2
-    STEPMAKE_PANGO
 fi
 
 ## Optional tools for building documentation, website, extra fonts.

diff --git a/flower/include/string.hh b/flower/include/string.hh
index be50752b0051156a42eca234dd6d1d9b51f78307..252fdb48f2b3888d8c7553a41962c693f10af1fb 100644 (file)
--- a/flower/include/string.hh
+++ b/flower/include/string.hh
@@ -79,8 +79,8 @@ public:
 
   char const* to_str0 () const;
   Byte const* to_bytes () const;
-  char* get_str0 ();
-  Byte* get_bytes ();
+  char *get_str0 ();
+  Byte *get_bytes ();
 
   String &operator = (String const & source);
 
@@ -107,7 +107,6 @@ public:
 
   /// return uppercase of *this
   String upper_string () const;
-
   /// return lowercase of *this
   String lower_string () const;
 
@@ -153,6 +152,8 @@ public:
 
   /// convert to a double
   double to_double () const;
+
+  String substituted (char text, String sub) const; 
 };
 
 /*

diff --git a/flower/string.cc b/flower/string.cc
index e4191300fe5500c283414adb0a74b079d757b18b..beb445f2555e80c4df5ac4eaae17b243795f41f6 100644 (file)
--- a/flower/string.cc
+++ b/flower/string.cc
@@ -408,3 +408,22 @@ String::print_on (ostream& os) const
       os << (Byte) (*this)[ i ];
 }
 #endif
+
+
+String
+String::substituted (char chr, String sub) const
+{
+  Byte const* t = this->to_bytes ();
+  
+  String accumulator;
+  int n = length();
+  for (int i = 0; i < n; i++)
+    {
+      if (t[i] == chr)
+       accumulator += sub;
+      else
+       accumulator += String_convert::char_string (t[i], 1); 
+    }
+
+  return accumulator;
+}

diff --git a/lily/accidental.cc b/lily/accidental.cc
index e511d7a7c5a26411b194f7c46e9481dc89cf1aac..31259da703fdb8f111db59c2572e4724cd3b4241 100644 (file)
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -23,8 +23,8 @@
 Stencil
 parenthesize (Grob*me, Stencil m)
 {
-  Stencil open = Font_interface::get_default_font (me)->find_by_name (String ("accidentals-leftparen"));
-  Stencil close = Font_interface::get_default_font (me)->find_by_name (String ("accidentals-rightparen"));
+  Stencil open = Font_interface::get_default_font (me)->find_by_name ("accidentals.leftparen");
+  Stencil close = Font_interface::get_default_font (me)->find_by_name ("accidentals.rightparen");
 
   m.add_at_edge (X_AXIS, LEFT, Stencil (open), 0,0);
   m.add_at_edge (X_AXIS, RIGHT, Stencil (close), 0,0);
@@ -214,7 +214,7 @@ Accidental_interface::print (SCM smob)
     {
       int alteration = scm_to_int (scm_car (s));
       String font_char = get_fontcharname (style, alteration);
-      Stencil acc (fm->find_by_name ("accidentals-" + font_char));
+      Stencil acc (fm->find_by_name ("accidentals." + font_char));
 
       if (acc.is_empty ())
        {

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index f0aa6ceaa2004ace6f12d357f6ef46d64af5cdf3..e14e551dd8bf29b9a3ad792bd2bcc113c3c0f181 100644 (file)
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -73,12 +73,12 @@ Arpeggio::print (SCM smob)
   
   Stencil mol;
   Font_metric *fm = Font_interface::get_default_font (me);
-  Stencil squiggle = fm->find_by_name ("scripts-arpeggio");
+  Stencil squiggle = fm->find_by_name ("scripts.arpeggio");
 
   Stencil arrow ;  
   if (dir)
     {
-      arrow = fm->find_by_name ("scripts-arpeggio-arrow-" + to_string (dir));
+      arrow = fm->find_by_name ("scripts.arpeggio.arrow." + to_string (dir));
       heads[dir] -= dir * arrow.extent (Y_AXIS).length ();
     }
   
@@ -144,7 +144,7 @@ Arpeggio::width_callback (SCM smob, SCM axis)
   Grob * me = unsmob_grob (smob);
   Axis a = (Axis)scm_to_int (axis);
   assert (a == X_AXIS);
-  Stencil arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio");
+  Stencil arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts.arpeggio");
 
   return ly_interval2scm (arpeggio.extent (X_AXIS));
 }

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 57d9dbfdabac8f88ad351ed99a4832e8757527b5..569ed01480fb12ca0d4a751c30db425db68c825b 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -21,6 +21,7 @@
 class Auto_beam_engraver : public Engraver
 {
   TRANSLATOR_DECLARATIONS (Auto_beam_engraver);
+
 protected:
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 1ba07c18d427998b0f763f19443807bab4dd13af..748d3e8b745229659ca30c43f880938fd82363f5 100644 (file)
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -58,7 +58,7 @@ Bar_line::compound_barline (Grob*me, String str, Real h)
 
   Stencil thin = simple_barline (me, hair, h);
   Stencil thick = simple_barline (me, fatline, h);
-  Stencil dot = Font_interface::get_default_font (me)->find_by_name ("dots-dot");
+  Stencil dot = Font_interface::get_default_font (me)->find_by_name ("dots.dot");
 
   int lines = Staff_symbol_referencer::line_count (me);
   Real dist 

diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc
index c10dc8b189c3fd4302c97d8e0486250b31989f96..d2b3dc576e3bd05cec03f6e056f1174f75472b0a 100644 (file)
--- a/lily/beam-quanting.cc
+++ b/lily/beam-quanting.cc
@@ -6,12 +6,8 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
   
-
-  
 */
 
-
-
 #include <math.h>
 
 #include "warn.hh"

diff --git a/lily/bezier.cc b/lily/bezier.cc
index c51ba3706d1603846c679ed0088d6aac78443e50..a8cda698382d8191d73b0c583ba9ca80699cddb6 100644 (file)
--- a/lily/bezier.cc
+++ b/lily/bezier.cc
@@ -6,7 +6,6 @@
   (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-
 #include <math.h>
 
 #include "bezier.hh"

diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
index d419a8959aed013afe8fffadec4f2f88ab029347..3bb56ccabaf0d0c6f8d80ef6933314bf456083ba 100644 (file)
--- a/lily/drum-note-performer.cc
+++ b/lily/drum-note-performer.cc
@@ -20,6 +20,7 @@ protected:
   virtual bool try_music (Music *ev) ;
   virtual void stop_translation_timestep ();
   virtual void create_audio_elements ();
+
 private:
   Link_array<Music> note_evs_;
   Link_array<Audio_note> notes_;

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index acd2d3b5f62bfcf44056b32fec7c4b774951a936..5b1783cf511a369c881818282e4650462692a7e2 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -35,6 +35,7 @@ Font_metric::coding_scheme () const
 Stencil
 Font_metric::find_by_name (String s) const
 {
+  s = s.substituted ('-', "M"); 
   int idx = name_to_index (s);
   Box b;
   

diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc
index e20570df6f42e9befa6023b586a2201de990862e..652eff7d168b64452cae3198446e2594ba1bba0f 100644 (file)
--- a/lily/key-signature-interface.cc
+++ b/lily/key-signature-interface.cc
@@ -126,7 +126,7 @@ Key_signature_interface::print (SCM smob)
       int alteration = scm_to_int (scm_cdar (s));
       String font_char =
        Accidental_interface::get_fontcharname (style, alteration);
-      Stencil acc (fm->find_by_name ("accidentals-" + font_char));
+      Stencil acc (fm->find_by_name ("accidentals." + font_char));
 
       if (acc.is_empty ())
        {

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index 4d202f05b294eec47a02a91cc71fe7afd7a18b7f..7a682bc9d1d8d40b46b3534e0143438b5188f1f5 100644 (file)
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -119,7 +119,7 @@ Line_spanner::line_stencil (Grob *me,
       Font_metric *fm = select_font (me->get_layout (),
                                     scm_cons (style_alist,
                                              alist_chain));
-      Stencil m = fm->find_by_name ("scripts-trill-element");
+      Stencil m = fm->find_by_name ("scripts.trill.element");
       Stencil mol;
 
       do

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 37c51a765544a4a3cd21fd0a3f6c30b903bb67b7..8bc97ef19013b06939a2b475b7523c6e353241ca 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -457,11 +457,11 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
 
   if (sym == "Discant")
     {
-      Stencil r = fm->find_by_name ("accordion-accDiscant");
+      Stencil r = fm->find_by_name ("accordion.accDiscant");
       m.add_stencil (r);
       if (reg.left_string (1) == "F")
        {
-         Stencil d = fm->find_by_name ("accordion-accDot");
+         Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
          m.add_stencil (d);
          reg = reg.right_string (reg.length ()-1);
@@ -489,27 +489,27 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
        }
       if (eflag & 0x02)
        {
-         Stencil d = fm->find_by_name ("accordion-accDot");
+         Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
          m.add_stencil (d);
        }
       if (eflag & 0x04)
        {
-         Stencil d = fm->find_by_name ("accordion-accDot");
+         Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
          d.translate_axis (0.8 * staff_space PT, X_AXIS);
          m.add_stencil (d);
        }
       if (eflag & 0x01)
        {
-         Stencil d = fm->find_by_name ("accordion-accDot");
+         Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
          d.translate_axis (-0.8 * staff_space PT, X_AXIS);
          m.add_stencil (d);
        }
       if (reg.left_string (2) == "SS")
        {
-         Stencil d = fm->find_by_name ("accordion-accDot");
+         Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (0.5 * staff_space PT, Y_AXIS);
          d.translate_axis (0.4 * staff_space PT, X_AXIS);
          m.add_stencil (d);
@@ -519,7 +519,7 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
        }
       if (reg.left_string (1) == "S")
        {
-         Stencil d = fm->find_by_name ("accordion-accDot");
+         Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (0.5 * staff_space PT, Y_AXIS);
          m.add_stencil (d);
          reg = reg.right_string (reg.length ()-1);
@@ -527,29 +527,29 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
     }
   else if (sym == "Freebase")
     {
-      Stencil r = fm->find_by_name ("accordion-accFreebase");
+      Stencil r = fm->find_by_name ("accordion.accFreebase");
       m.add_stencil (r);
       if (reg.left_string (1) == "F")
        {
-         Stencil d = fm->find_by_name ("accordion-accDot");
+         Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
          m.add_stencil (d);
          reg = reg.right_string (reg.length ()-1);
        }
       if (reg == "E")
        {
-         Stencil d = fm->find_by_name ("accordion-accDot");
+         Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
          m.add_stencil (d);
        }
     }
   else if (sym == "Bayanbase")
     {
-      Stencil r = fm->find_by_name ("accordion-accBayanbase");
+      Stencil r = fm->find_by_name ("accordion.accBayanbase");
       m.add_stencil (r);
       if (reg.left_string (1) == "T")
        {
-         Stencil d = fm->find_by_name ("accordion-accDot");
+         Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
          m.add_stencil (d);
          reg = reg.right_string (reg.length ()-1);
@@ -557,14 +557,14 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
       /* include 4' reed just for completeness. You don't want to use this. */
       if (reg.left_string (1) == "F")
        {
-         Stencil d = fm->find_by_name ("accordion-accDot");
+         Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
          m.add_stencil (d);
          reg = reg.right_string (reg.length ()-1);
        }
       if (reg.left_string (2) == "EE")
        {
-         Stencil d = fm->find_by_name ("accordion-accDot");
+         Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
          d.translate_axis (0.4 * staff_space PT, X_AXIS);
          m.add_stencil (d);
@@ -574,7 +574,7 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
        }
       if (reg.left_string (1) == "E")
        {
-         Stencil d = fm->find_by_name ("accordion-accDot");
+         Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
          m.add_stencil (d);
          reg = reg.right_string (reg.length ()-1);
@@ -582,25 +582,25 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
     }
   else if (sym == "Stdbase")
     {
-      Stencil r = fm->find_by_name ("accordion-accStdbase");
+      Stencil r = fm->find_by_name ("accordion.accStdbase");
       m.add_stencil (r);
       if (reg.left_string (1) == "T")
        {
-         Stencil d = fm->find_by_name ("accordion-accDot");
+         Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 3.5 PT, Y_AXIS);
          m.add_stencil (d);
          reg = reg.right_string (reg.length ()-1);
        }
       if (reg.left_string (1) == "F")
        {
-         Stencil d = fm->find_by_name ("accordion-accDot");
+         Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
          m.add_stencil (d);
          reg = reg.right_string (reg.length ()-1);
        }
       if (reg.left_string (1) == "M")
        {
-         Stencil d = fm->find_by_name ("accordion-accDot");
+         Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 2 PT, Y_AXIS);
          d.translate_axis (staff_space PT, X_AXIS);
          m.add_stencil (d);
@@ -608,14 +608,14 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
        }
       if (reg.left_string (1) == "E")
        {
-         Stencil d = fm->find_by_name ("accordion-accDot");
+         Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
          m.add_stencil (d);
          reg = reg.right_string (reg.length ()-1);
        }
       if (reg.left_string (1) == "S")
        {
-         Stencil d = fm->find_by_name ("accordion-accDot");
+         Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
          m.add_stencil (d);
          reg = reg.right_string (reg.length ()-1);
@@ -625,22 +625,22 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
      for the rectangle */
   else if (sym == "SB")
     {
-      Stencil r = fm->find_by_name ("accordion-accSB");
+      Stencil r = fm->find_by_name ("accordion.accSB");
       m.add_stencil (r);
     }
   else if (sym == "BB")
     {
-      Stencil r = fm->find_by_name ("accordion-accBB");
+      Stencil r = fm->find_by_name ("accordion.accBB");
       m.add_stencil (r);
     }
   else if (sym == "OldEE")
     {
-      Stencil r = fm->find_by_name ("accordion-accOldEE");
+      Stencil r = fm->find_by_name ("accordion.accOldEE");
       m.add_stencil (r);
     }
   else if (sym == "OldEES")
     {
-      Stencil r = fm->find_by_name ("accordion-accOldEES");
+      Stencil r = fm->find_by_name ("accordion.accOldEES");
       m.add_stencil (r);
     }
   return m;  

diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc
index 67b32ae8d07db7c22e9e26890b607f0880d119fa..23a395723c7b6d9843d245cb317cee41960ba81d 100644 (file)
--- a/lily/mensural-ligature-engraver.cc
+++ b/lily/mensural-ligature-engraver.cc
@@ -347,7 +347,7 @@ Mensural_ligature_engraver::propagate_properties (Spanner *ligature,
 
   Real head_width =
     Font_interface::get_default_font (ligature)->
-    find_by_name ("noteheads--1mensural").extent (X_AXIS).length ();
+    find_by_name ("noteheads.-1mensural").extent (X_AXIS).length ();
     Real flexa_width = robust_scm2double (ligature->get_property ("flexa-width"), 2);
   flexa_width *= Staff_symbol_referencer::staff_space (ligature);
 

diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc
index 7c3889e12de1b64d496d08cb400d0c21e4b9027f..42d8d304005cba8e63ede018a95a0d80ae371cda 100644 (file)
--- a/lily/mensural-ligature.cc
+++ b/lily/mensural-ligature.cc
@@ -142,13 +142,13 @@ internal_brew_primitive (Grob *me)
                          flexa_width, thickness, true, DOWN);
        break;
       case MLP_sc: // mensural brevis head with right cauda
-       out = Font_interface::get_default_font (me)->find_by_name ("noteheads--2mensural");
+       out = Font_interface::get_default_font (me)->find_by_name ("noteheads.-2mensural");
        break;
       case MLP_ss: // mensural brevis head
-       out = Font_interface::get_default_font (me)->find_by_name ("noteheads--1mensural");
+       out = Font_interface::get_default_font (me)->find_by_name ("noteheads.-1mensural");
        break;
       case MLP_cs: // mensural brevis head with left cauda
-       out = Font_interface::get_default_font (me)->find_by_name ("noteheads-lmensural");
+       out = Font_interface::get_default_font (me)->find_by_name ("noteheads.lmensural");
        break;
       case MLP_SS:
        out = brew_flexa (me, delta_pitch, false,

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 4cf770a1277609659c9f7583e0a17adec87a5b16..baa061b2e4107b827fcaf29c2b3dbc7d41a5dbc3 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -235,7 +235,7 @@ Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures,
              k = -1;
            }
 
-         Stencil r (musfont->find_by_name ("rests-" + to_string (k)));
+         Stencil r (musfont->find_by_name ("rests." + to_string (k)));
          symbols_width += r.extent (X_AXIS).length ();
          mols = scm_cons (r.smobbed_copy (), mols);
        }
@@ -258,7 +258,7 @@ Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures,
              l--;
            }
 
-         Stencil r (musfont->find_by_name ("rests-" + to_string (k)));
+         Stencil r (musfont->find_by_name ("rests." + to_string (k)));
          if (k == 0)
            {
              Real staff_space = Staff_symbol_referencer::staff_space (me);

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 211e3d7b43b605f3629fa2c2a12d692d23ea5392..d2bd30b576ffcc6689f1613944cb5372c50722ab 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -53,7 +53,7 @@ internal_print (Grob *me, String * font_char)
   
   Stencil out;
 
-  String prefix = "noteheads-";
+  String prefix = "noteheads.";
   String idx =
     prefix + ((stem_dir == UP) ? "u" : "d")  + ly_scm2string (scm_font_char);
   out = fm->find_by_name (idx);

diff --git a/lily/percent-repeat-item.cc b/lily/percent-repeat-item.cc
index f7b553b20699b8f254b8569d50d5d594e94ab748..297476526f25aab24ef76e0732107e908d3a07b4 100644 (file)
--- a/lily/percent-repeat-item.cc
+++ b/lily/percent-repeat-item.cc
@@ -44,7 +44,7 @@ Percent_repeat_item_interface::x_percent (Grob *me, int count,
     {
       m.add_at_edge (X_AXIS, RIGHT, s, -slash_neg_kern,0);
     }
-  Stencil d1 = Font_interface::get_default_font (me)->find_by_name ("dots-dot");
+  Stencil d1 = Font_interface::get_default_font (me)->find_by_name ("dots.dot");
   Stencil d2  =  d1;
   d1.translate_axis (0.5, Y_AXIS );
   d2.translate_axis (-0.5, Y_AXIS);

diff --git a/lily/script-interface.cc b/lily/script-interface.cc
index c82b30c4be4acbc7b28cd2b961929420d1c125a7..f23cc9c21f950aa9b133abb803202a95c1b3e138 100644 (file)
--- a/lily/script-interface.cc
+++ b/lily/script-interface.cc
@@ -30,7 +30,7 @@ Script_interface::get_stencil (Grob *me, Direction d)
       SCM str = ((scm_is_pair (name_entry)) ? index_get_cell (name_entry, d)
                 : name_entry);
       return Font_interface::get_default_font (me)
-       ->find_by_name ("scripts-" + ly_scm2string (str));
+       ->find_by_name ("scripts." + ly_scm2string (str));
     }
   else if (key == ly_symbol2scm ("accordion"))
     return Lookup::accordion (scm_cdr (s), 1.0,

diff --git a/lily/stem.cc b/lily/stem.cc
index 5f4588d31665340cb2aac881faf2293059d75b0e..eb8d47ef8f37cb1e619bc09a203741636cde7c04 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -570,7 +570,7 @@ Stem::flag (Grob *me)
   String font_char = flag_style
     + to_string (dir) + staffline_offs + to_string (duration_log (me));
   Font_metric *fm = Font_interface::get_default_font (me);
-  Stencil flag = fm->find_by_name ("flags-" + font_char);
+  Stencil flag = fm->find_by_name ("flags." + font_char);
   if (flag.is_empty ())
     me->warning (_f ("flag `%s' not found", font_char));
 
@@ -581,7 +581,7 @@ Stem::flag (Grob *me)
       if (!stroke_style.is_empty ())
        {
          String font_char = to_string (dir) + stroke_style;
-         Stencil stroke = fm->find_by_name ("flags-" + font_char);
+         Stencil stroke = fm->find_by_name ("flags." + font_char);
          if (stroke.is_empty ())
            me->warning (_f ("flag stroke `%s' not found", font_char));
          else

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 42262d827033996afc3ee90ad6a8e76103547cf8..c048ae522cf85a35a9a1221f49636363cc7d1f26 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -80,7 +80,7 @@ Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d)
   String char_name = style + to_string (n) + "/" + to_string (d);
   me->set_property ("font-encoding", ly_symbol2scm ("fetaMusic"));
   Stencil out = Font_interface::get_default_font (me)
-    ->find_by_name ("timesig-" + char_name);
+    ->find_by_name ("timesig." + char_name);
   if (!out.is_empty ())
     return out;
 

diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc
index 10af06457310ace034343e1f9ca203803a92d224..de737860b03af621dceef7ab0d33097975585697 100644 (file)
--- a/lily/vaticana-ligature-engraver.cc
+++ b/lily/vaticana-ligature-engraver.cc
@@ -229,7 +229,7 @@ Vaticana_ligature_engraver::align_heads (Array<Grob_info> primitives,
          head_width = 0.0;
          x_offset = join_thickness -
            Font_interface::get_default_font (primitive)->
-           find_by_name ("noteheads-" + glyph_name).extent (X_AXIS).length ();
+           find_by_name ("noteheads." + glyph_name).extent (X_AXIS).length ();
        }
       else if (!String::compare (glyph_name, "flexa") ||
               !String::compare (glyph_name, ""))
@@ -249,7 +249,7 @@ Vaticana_ligature_engraver::align_heads (Array<Grob_info> primitives,
           */
          head_width =
            Font_interface::get_default_font (primitive)->
-           find_by_name ("noteheads-" + glyph_name).extent (X_AXIS).length ();
+           find_by_name ("noteheads." + glyph_name).extent (X_AXIS).length ();
          x_offset = 0.0;
        }
 

diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc
index b10d197230f703640e1f12f3da852d207c6a8bb4..0553018834214843c590d6f72f1ee0a993fbef3b 100644 (file)
--- a/lily/vaticana-ligature.cc
+++ b/lily/vaticana-ligature.cc
@@ -250,7 +250,7 @@ vaticana_brew_primitive (Grob *me)
     {
       out =
        Font_interface::get_default_font (me)->
-       find_by_name ("noteheads-" + glyph_name);
+       find_by_name ("noteheads." + glyph_name);
     }
   out.translate_axis (x_offset, X_AXIS);
   Real head_width = out.extent (X_AXIS).length ();

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 802c03f6b77faf36abed867428d560639c266951..9b01b6553cdd68d7a6c70021b51c5e2886758ddc 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -6,7 +6,8 @@ include $(depth)/make/stepmake.make
 
 AF_FILES = $(wildcard *.af) 
 
-EXTRA_DIST_FILES += README feta.tex 
+EXTRA_DIST_FILES += README feta.tex  merge.pe
+
 
 # We don't use $(MF_FILES), because there's more .mf cruft here
 FETA_MF_FILES = $(wildcard feta[0-9]*.mf)\
@@ -144,7 +145,7 @@ get-pfa: get-rpm-pfa
 ##
 ## todo: this also depends on .tfm, FIXME.
 $(outdir)/%.afm  $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%list.ly $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm
-       $(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm)  --enc $(outdir)/$(<F:.log=.enc) --tex $(outdir)/$(<F:.log=.tex) --ly $(outdir)/$(<F:.log=list.ly) $<
+       $(PYTHON) $(buildscript-dir)/mf-to-table.py --lisp=$(outdir)/$(<F:.log=.lisp) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm)  --enc $(outdir)/$(<F:.log=.enc) --tex $(outdir)/$(<F:.log=.tex) --ly $(outdir)/$(<F:.log=list.ly) $<
 
 fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd private-fonts fonts.scale fonts.dir Fontmap.lily)
 

diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index 61ed5bb4108b6aeb4d4a629a51d9fd65b521095b..02c8de5b06ff6dba76fdf611e7afe95e111777bf 100644 (file)
--- a/mf/feta-schrift.mf
+++ b/mf/feta-schrift.mf
@@ -992,7 +992,7 @@ fet_beginchar("Arpeggio","arpeggio","arpeggio");
 % Extendable Trill symbol.
 % Not yet used
 % Rename me to Trill, rename Trill to Tr?
-fet_beginchar("Trill-element","trill-element","trillelement");
+fet_beginchar("Trill_element","trill_element","trillelement");
        save height, overshoot;
        height# = staff_space#;
        width# = 0.8height#;

diff --git a/mf/feta-timesig.mf b/mf/feta-timesig.mf
index 216166755baa28baafe3f73fbb10f9ff7b667fa5..355097b692b86094efb523f1b7a6f0b2673be2e3 100644 (file)
--- a/mf/feta-timesig.mf
+++ b/mf/feta-timesig.mf
@@ -78,11 +78,11 @@ def draw_C =
        penlabels(1,2,3,4,5,6);
 enddef;
 
-fet_beginchar ("4/4 meter", "C4/4", "fourfourmeter")
+fet_beginchar ("4/4 meter", "C44", "fourfourmeter")
        draw_C;
 fet_endchar;
 
-fet_beginchar ("2/2 meter", "C2/2", "allabreve")
+fet_beginchar ("2/2 meter", "C22", "allabreve")
        draw_C;
        save excentricity;
        pair excentricity;