From 8f3846527dca3c9ab4f9304ea9479c083aae2198 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 24 Mar 2004 00:31:21 +0000 Subject: [PATCH] * tex/titledefs.tex: remove scshape for piece. * lily/line-spanner.cc (line_stencil): font-encoding = music, not font-family * lily/time-signature.cc (special_time_signature): font-encoding not family. * lily/dynamic-engraver.cc (acknowledge_grob): fix typo, attach dynamic to head. This fixes p placement in morgenlied. --- ChangeLog | 13 +++++++++++++ lily/dynamic-engraver.cc | 6 +++--- lily/include/font-interface.hh | 1 - lily/line-spanner.cc | 6 +++--- lily/time-signature.cc | 2 +- tex/titledefs.tex | 2 +- 6 files changed, 21 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce9359991f..c798895655 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2004-03-24 Han-Wen Nienhuys + + * tex/titledefs.tex: remove scshape for piece. + + * lily/line-spanner.cc (line_stencil): font-encoding = music, not + font-family + + * lily/time-signature.cc (special_time_signature): font-encoding + not family. + + * lily/dynamic-engraver.cc (acknowledge_grob): fix typo, attach + dynamic to head. This fixes p placement in morgenlied. + 2004-03-23 Werner Lemberg * stepmake/stepmake/generic-targets.make (help): Improve text. diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index a5b5de7de8..9ea571da32 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -56,7 +56,7 @@ class Dynamic_engraver : public Engraver void typeset_all (); -TRANSLATOR_DECLARATIONS (Dynamic_engraver ); + TRANSLATOR_DECLARATIONS (Dynamic_engraver); protected: virtual void finalize (); @@ -399,9 +399,9 @@ Dynamic_engraver::acknowledge_grob (Grob_info i) if (script_ && !script_->get_parent (X_AXIS)) { - SCM head = scm_last_pair (i.grob_->get_property ("heads")); + SCM head = scm_last_pair (i.grob_->get_property ("note-heads")); if (gh_pair_p (head)) - script_->set_parent (unsmob_grob (head), X_AXIS); + script_->set_parent (unsmob_grob (gh_car (head)), X_AXIS); } } diff --git a/lily/include/font-interface.hh b/lily/include/font-interface.hh index 522ee2c133..dd9f56b4d7 100644 --- a/lily/include/font-interface.hh +++ b/lily/include/font-interface.hh @@ -16,7 +16,6 @@ struct Font_interface { static SCM text_font_alist_chain (Grob*); - static SCM font_alist_chain (Grob*); static Font_metric * get_default_font (Grob*); static bool has_interface (Grob*); }; diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index 6eb46f8a23..f0d9c1dbd1 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -113,13 +113,13 @@ Line_spanner::line_stencil (Grob *me, && type == ly_symbol2scm ("trill")) { SCM alist_chain = Font_interface::text_font_alist_chain (me); - SCM style_alist = scm_list_n (gh_cons (ly_symbol2scm ("font-family"), + SCM style_alist = scm_list_n (gh_cons (ly_symbol2scm ("font-encoding"), ly_symbol2scm ("music")), SCM_UNDEFINED); Font_metric *fm = select_font (me->get_paper (), - gh_cons (style_alist, - alist_chain)); + gh_cons (style_alist, + alist_chain)); Stencil m = fm->find_by_name ("scripts-trill-element"); Stencil mol; diff --git a/lily/time-signature.cc b/lily/time-signature.cc index 7d414ab268..1e15c69683 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -84,7 +84,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-family", ly_symbol2scm ("music")); + me->set_property ("font-encoding", ly_symbol2scm ("music")); Stencil out = Font_interface::get_default_font (me) ->find_by_name ("timesig-" + char_name); if (!out.is_empty ()) diff --git a/tex/titledefs.tex b/tex/titledefs.tex index 3ca748c764..b600e0643c 100644 --- a/tex/titledefs.tex +++ b/tex/titledefs.tex @@ -103,7 +103,7 @@ \lilypondifundefined{lilypondpiece} {} - {\flushleft{\large\normalfont\scshape\lilypondpiece} + {\flushleft{\large\normalfont\lilypondpiece} \par} \nopagebreak -- 2.39.2