* scm/define-markup-commands.scm (fill-line): use

stack-stencils. This fixes problems with putting already centered
stencils in a line.

* lily/bar-line.cc (get_staff_bar_size): add line thickness.

diff --git a/lily/object-key.cc b/lily/object-key.cc
index ae38bfb54cafdf87da971178711497a9f6c523f7..776b9b112871f0ebc49589dde2a5765cad83d003 100644 (file)
--- a/lily/object-key.cc
+++ b/lily/object-key.cc
@@ -101,10 +101,12 @@ Object_key::from_scheme (SCM)
   return new Object_key();
 }
 
-struct {
+struct Object_dumper_table_entry {
   Object_key_type type_;
   Object_key* (*ctor_)(SCM);
-} undumpers[] = {
+};
+
+static Object_dumper_table_entry undumpers[] = {
   {BASE_KEY, Object_key::from_scheme},
   {COPIED_KEY, Copied_key::from_scheme},
   {GENERAL_KEY, Lilypond_general_key::from_scheme},

diff --git a/lily/template5.cc b/lily/template5.cc
index e2956a2c767b8f76258234f91c6f8968e7462650..29f0f1666e962ccfd3c1b4983db486bc9bc91995 100644 (file)
--- a/lily/template5.cc
+++ b/lily/template5.cc
@@ -10,6 +10,7 @@
 
 #include "interval.tcc"
 
+template<>
 Rational
 Interval_t<Rational>::infinity ()
 {
@@ -18,6 +19,7 @@ Interval_t<Rational>::infinity ()
   return infty;
 }
 
+template<>
 String
 Interval_t<Rational>::T_to_string (Rational a)
 {