merge (2nd try -- argh git.el)

diff --git a/.gitignore b/.gitignore
index 9526956a35b288df570402c6bdfaea48129885dd..44b67df04b38943ee8b02e6acce8767e54f204c2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,3 @@ gcstat*.scm
 .htaccess
 *.tfm
 *.afm
-

diff --git a/ChangeLog b/ChangeLog
index 203ff58d4b13d61eb3806cb1d801d5071331dca4..709756e77674c561cac4ecb40652df187325ec97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2006-11-01  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * python/midi.c: 
+       init running_status
+
+       * python/midi.c: 
+       trim warning messages.
+
+       * configure.in: 
+       strip -Werror.
+
+       * input/regression/utf-8.ly: 
+       document utf-8 meaning of phrases.
+
+       * scm/define-markup-commands.scm: 
+       make \caps markup default to smallCaps
+
+       * lily/pango-font.cc: 
+       * lily/ttf.cc: 
+       use glyph indexing for glyph name .notdef
+
+2006-11-02  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * input/regression/utf-8.ly: Fix doc to match order of language
+       fonts.
+
 2006-11-01  Joe Neeman  <joeneeman@gmail.com>
 
        * lily/optimal-page-breaking.cc (try_page_spacing): don't average

diff --git a/lily/tie.cc b/lily/tie.cc
index 264bc9172a2b6f60d018c92863195787520e4581..1263237688630d9d862a5978acff1a85856c60b7 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -213,7 +213,8 @@ Tie::calc_control_points (SCM smob)
   (void)  get_grob_direction (me);
 
   Grob *yparent = me->get_parent (Y_AXIS);
-  if (Tie_column::has_interface (yparent)
+  if ((Tie_column::has_interface (yparent)
+       || Semi_tie_column::has_interface (yparent)) 
       && unsmob_grob_array (yparent->get_object ("ties"))
       && unsmob_grob_array (yparent->get_object ("ties"))->size () > 1)
     {