* 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.

diff --git a/ChangeLog b/ChangeLog
index ce9359991f55c01b0e6b6573c13060d0f350783e..c7988956552cd6f2107b3344ca2676d8beb1c7c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-03-24  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * 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  <wl@gnu.org>
 
        * stepmake/stepmake/generic-targets.make (help): Improve text.

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index a5b5de7de89149e956c6a3bb1e65973fdaf17609..9ea571da32e643b017e95d89693267469ff2f2fd 100644 (file)
--- 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 522ee2c133546a201fc360609ac664eb8d9b3cfd..dd9f56b4d7bade22e7678c646058a54274a24881 100644 (file)
--- 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 6eb46f8a2321760c97e8706302f4b4b33629f235..f0d9c1dbd11f24af6eb970bc0fc2daa33c49b3d7 100644 (file)
--- 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 7d414ab26841e28afa1e85e0cc07f285d2388bc2..1e15c69683521a7e547e78b780f1f7da0d61462e 100644 (file)
--- 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 3ca748c76401fbd05b12f5556bccb5bd27e87a65..b600e0643c38edb228b00e14de63fe10ecf90e12 100644 (file)
--- 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