From afc519eae4c31fe515371ec68b077d6532a7e5cf Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 10 Dec 2004 23:16:22 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 11 +++++++ buildscripts/mf-to-table.py | 36 +++++++++++++++++---- configure.in | 5 +-- flower/include/string.hh | 7 +++-- flower/string.cc | 19 ++++++++++++ lily/accidental.cc | 6 ++-- lily/arpeggio.cc | 6 ++-- lily/auto-beam-engraver.cc | 1 + lily/bar-line.cc | 2 +- lily/beam-quanting.cc | 4 --- lily/bezier.cc | 1 - lily/drum-note-performer.cc | 1 + lily/font-metric.cc | 1 + lily/key-signature-interface.cc | 2 +- lily/line-spanner.cc | 2 +- lily/lookup.cc | 50 +++++++++++++++--------------- lily/mensural-ligature-engraver.cc | 2 +- lily/mensural-ligature.cc | 6 ++-- lily/multi-measure-rest.cc | 4 +-- lily/note-head.cc | 2 +- lily/percent-repeat-item.cc | 2 +- lily/script-interface.cc | 2 +- lily/stem.cc | 4 +-- lily/time-signature.cc | 2 +- lily/vaticana-ligature-engraver.cc | 4 +-- lily/vaticana-ligature.cc | 2 +- mf/GNUmakefile | 5 +-- mf/feta-schrift.mf | 2 +- mf/feta-timesig.mf | 4 +-- 29 files changed, 125 insertions(+), 70 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d4fc6fd69..dde07b37fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-12-10 Han-Wen Nienhuys + + * 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 * Documentation/user/changing-defaults.itely: add info about @@ -12,6 +19,10 @@ 2004-12-09 Han-Wen Nienhuys + * 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 d624262462..22afb3e9ea 100644 --- 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 ab5bfc079a..696463531f 100644 --- 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 be50752b00..252fdb48f2 100644 --- 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 e4191300fe..beb445f255 100644 --- 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 e511d7a7c5..31259da703 100644 --- 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 f0aa6ceaa2..e14e551dd8 100644 --- 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 57d9dbfdab..569ed01480 100644 --- 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 1ba07c18d4..748d3e8b74 100644 --- 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 c10dc8b189..d2b3dc576e 100644 --- a/lily/beam-quanting.cc +++ b/lily/beam-quanting.cc @@ -6,12 +6,8 @@ (c) 1997--2004 Han-Wen Nienhuys Jan Nieuwenhuizen - - */ - - #include #include "warn.hh" diff --git a/lily/bezier.cc b/lily/bezier.cc index c51ba3706d..a8cda69838 100644 --- a/lily/bezier.cc +++ b/lily/bezier.cc @@ -6,7 +6,6 @@ (c) 1998--2004 Jan Nieuwenhuizen */ - #include #include "bezier.hh" diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc index d419a8959a..3bb56ccaba 100644 --- 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 note_evs_; Link_array notes_; diff --git a/lily/font-metric.cc b/lily/font-metric.cc index acd2d3b5f6..5b1783cf51 100644 --- 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 e20570df6f..652eff7d16 100644 --- 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 4d202f05b2..7a682bc9d1 100644 --- 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 37c51a7655..8bc97ef190 100644 --- 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 67b32ae8d0..23a395723c 100644 --- 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 7c3889e12d..42d8d30400 100644 --- 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 4cf770a127..baa061b2e4 100644 --- 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 211e3d7b43..d2bd30b576 100644 --- 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 f7b553b206..297476526f 100644 --- 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 c82b30c4be..f23cc9c21f 100644 --- 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 5f4588d316..eb8d47ef8f 100644 --- 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 42262d8270..c048ae522c 100644 --- 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 10af064573..de737860b0 100644 --- a/lily/vaticana-ligature-engraver.cc +++ b/lily/vaticana-ligature-engraver.cc @@ -229,7 +229,7 @@ Vaticana_ligature_engraver::align_heads (Array 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 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 b10d197230..0553018834 100644 --- 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 802c03f6b7..9b01b6553c 100644 --- 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)/$(