From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 20 Nov 2004 00:39:22 +0000 (+0000)
Subject: * scm/define-markup-commands.scm (fill-line): use
X-Git-Tag: release/2.5.14~519
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b4ed49c90b12e43c11e817bf8bf7312fab997204;p=lilypond.git

* 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 ae38bfb54c..776b9b1128 100644
--- 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 e2956a2c76..29f0f1666e 100644
--- 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)
 {