* buildscripts/git-update-changelog.py (changelog_body): don't

write committishes.

* lily/grob.cc: add avoid-slur

diff --git a/ChangeLog b/ChangeLog
index 32038e168fbfc70f4bd1bd8999f2223e8b49169d..6edc681b445c713692d4533d8b3166d79e38b981 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,48 +1,39 @@
+2006-10-29  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * buildscripts/git-update-changelog.py (changelog_body): don't
+       write committishes.
+
+       * lily/grob.cc: add avoid-slur
+
 2006-10-28  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
-       git commit e5d9c526aec8d0c7c7727068b13c346c475ac7c3
-       
        * emacsclient.patch: 
        * server.el.patch: 
        move server/emacsclient to elisp/
 
-       git commit f6191da666fd8897411e866594616cd0f7ae6350
-       
        * buildscripts/git-update-changelog.py (Commit.note_del_file):
        apply patches too
 
        * elisp/server.el.patch: 
        move emacs patches.
 
-       git commit 80844c903201b9df79ae81d4edcfbd299e08a9f7
-       
        * elisp/emacsclient.patch: 
        emacsclient too.
 
-       git commit 64179afe25bf5723fe9bb5a6631799c050d12de2
-       
        * buildscripts/git-update-changelog.py: 
        ignore ChangeLog
 
-       git commit 614460c52e72c96824da0a583297123e510f6fff
-       
        * .gitignore: 
        update
 
-       git commit 6ca40e8913957dd9fa510855ae1c4efacde09603
-       
        * ChangeLog: 
        * buildscripts/git-update-changelog.py: 
        script to update ChangeLog with Git messages.
 
-       git commit ef70710d3cf52502900408aa1f55a2354ed4e8ab
-       
        * lily/beam-engraver.cc: 
        * input/regression/rest-pitched-beam.ly: 
        don't set callback if staff-position set. Fixes #126.
 
-       git commit 6dcaa230251aa4f95e4153bd4de021c65207b798
-       
        * lily/bar-number-engraver.cc: 
        * lily/beam.cc: 
        * lily/fingering-engraver.cc: 
@@ -57,13 +48,9 @@
        * lily/tie.cc: 
        internal_get_property_data() using ly_symbol2scm()
 
-       git commit 914e47b38f98b87c2622a5bbd8237ca97f97da34
-       
        * stepmake/stepmake/generic-targets.make: 
        create .gitignore in outdir.
 
-       git commit 122da86232bb745d50cddbd893e3cc48c3af6216
-       
        * .gitignore: 
        new file.
 
@@ -5930,7 +5917,6 @@
        * flower/include/std-vector.hh
        * flower/include/array.hh (concat): Globally change to insert ().
 
-       
        * flower/include/std-vector.hh
        * flower/include/parray.hh
        * flower/include/array.hh (elem, elem_ref): Globally replace by
@@ -8875,7 +8861,6 @@
        * lily/staff-performer.cc (initialize): add tempo/name to
        audio_staff_
 
-
 2005-08-26  Graham Percival  <gpermus@gmail.com>
 
        * Documentation/user/advanced.itely: add text-only example.

diff --git a/buildscripts/git-update-changelog.py b/buildscripts/git-update-changelog.py
index 2817ff31f7356da90b7e1c5fb61390c000b6ea9e..73355dddea3f8d671fe2114684336ffbbd80eb13 100644 (file)
--- a/buildscripts/git-update-changelog.py
+++ b/buildscripts/git-update-changelog.py
@@ -1,5 +1,6 @@
 #!/usr/bin/python
 
+import sys
 import time
 import os
 import re
@@ -32,8 +33,8 @@ class Commit:
         self.email = m.group (2).strip ()
         self.name = m.group (1).strip ()
         self.diff = read_pipe ('git show %s' % self.committish)
+        
     def touched_files (self):
-
         files = []
         def note_file (x):
             files.append (x.group (1))
@@ -55,7 +56,6 @@ class Commit:
             add_del_files.append (('del', x.group (1)))
             return ''
         
-        
         re.sub('\n--- /dev/null\n\\+\\+\\+ b/([^\n]+)',
                note_add_file, self.diff)
         
@@ -103,25 +103,13 @@ def header (commit):
 
 def changelog_body (commit):
 
-    s = ''
-    s += "\ngit commit %s\n" % commit.committish    
+    s = '\n'
     s += ''.join ('\n* %s: ' % f for f in commit.touched_files())
     s += '\n' + commit.message
     
     s = s.replace ('\n', '\n\t')
     s += '\n'
     return s
-        
-def find_last_checked_in_commit (log):
-    m = re.match ('^(\\d+-\\d+-\\d+)[^\n]+\n*\tgit commit ([a-f0-9]+)', log)
-    
-    if m:
-        return (m.group (1), m.group (2))
-
-    return None
-
-
-
 
 def main ():
     p = optparse.OptionParser (usage="usage git-update-changelog.py [options]",
@@ -147,14 +135,12 @@ Run this file from the CVS directory, with --git-dir
     log = open ('ChangeLog').read ()
 
     if not options.start:
-        (time, id) = find_last_checked_in_commit (log)
-        options.start = id
-
-        print 'processing commits from ', id, options.start
+        print 'Must set start committish.'  
+        sys.exit (1)
 
     if options.gitdir:
         os.environ['GIT_DIR'] = options.gitdir
-    
+     
     commits = parse_add_changes (options.start)
     if not commits:
         return

diff --git a/lily/grob.cc b/lily/grob.cc
index ecbaa74a579dbb3f603c26a5293c153c2097fe6e..28f665138cae691ac2bcd883e3be668ec63f0b08 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -607,6 +607,7 @@ ADD_INTERFACE (Grob, "grob-interface",
               "Y-extent "
               "Y-offset "
               "after-line-breaking "
+              "avoid-slur "
               "axis-group-parent-X "
               "axis-group-parent-Y "
               "before-line-breaking "