]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'cvs-head' of http://lilypond.org/vc/lilypond into master-hanwen
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Wed, 1 Nov 2006 16:56:52 +0000 (17:56 +0100)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Wed, 1 Nov 2006 16:56:52 +0000 (17:56 +0100)
Conflicts:

buildscripts/git-update-changelog.py

.gitignore
ChangeLog
GNUmakefile.in
buildscripts/git-update-changelog.py
lily/optimal-page-breaking.cc
stepmake/stepmake/po-vars.make

index 6a3858d251ab98ebf9b47c645f5f6ce4d12f5a7f..d1885128819ca55be0044c36617463aa807c27a3 100644 (file)
@@ -15,3 +15,4 @@ tags
 .gdbinit
 ?.ly
 *.midi
+\#*
index a3074889e409b9ce55cb2a0ae9dd057c56a01da3..be4a778f17356759b64958ee14c3414a1ecd7c3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
 
        * flower/polynomial.cc (check_sol): no empty if bodies. 
 
+=======
+2006-10-30  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * stepmake/stepmake/po-vars.make: Resolve.
+
+2006-10-29  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * stepmake/stepmake/po-vars.make: test change for GIT gateway.
+
+2006-10-29  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * buildscripts/git-update-changelog.py (main): write .msg and cvs command.
+
+       * scm/define-grobs.scm: 
+       separation-items have width
+       
+       * VERSION: 
+       bump version
+       
+       * .gitignore: 
+       * Documentation/topdocs/NEWS.tely: 
+       * lily/separating-group-spanner.cc: 
+       * lily/slur-engraver.cc: 
+       * lily/slur-scoring.cc: 
+       * scm/define-grobs.scm: 
+       * input/regression/slur-clef.ly:
+       add breakableSeparationItem to extra encompass for slurs. This
+       fixes slur/clef slur/key collisions etc. Should fix #49
+       
+       * lily/include/slur-scoring.hh: 
+       * lily/slur-scoring.cc: 
+       Use X of separation item as slur start. Fixes #120
+
+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>
+
+       * emacsclient.patch: 
+       * server.el.patch: 
+       move server/emacsclient to elisp/
+
+       * buildscripts/git-update-changelog.py (Commit.note_del_file):
+       apply patches too
+
+       * elisp/server.el.patch: 
+       move emacs patches.
+
+       * elisp/emacsclient.patch: 
+       emacsclient too.
+
+       * buildscripts/git-update-changelog.py: 
+       ignore ChangeLog
+
+       * .gitignore: 
+       update
+
+       * ChangeLog: 
+       * buildscripts/git-update-changelog.py: 
+       script to update ChangeLog with Git messages.
+
+       * lily/beam-engraver.cc: 
+       * input/regression/rest-pitched-beam.ly: 
+       don't set callback if staff-position set. Fixes #126.
+
+       * lily/bar-number-engraver.cc: 
+       * lily/beam.cc: 
+       * lily/fingering-engraver.cc: 
+       * lily/grob-property.cc: 
+       * lily/grob.cc: 
+       * lily/include/grob.hh: 
+       * lily/include/lily-guile-macros.hh: 
+       * lily/mark-engraver.cc: 
+       * lily/melody-engraver.cc: 
+       * lily/script-column.cc: 
+       * lily/tie-formatting-problem.cc: 
+       * lily/tie.cc: 
+       internal_get_property_data() using ly_symbol2scm()
+
+       * stepmake/stepmake/generic-targets.make: 
+       create .gitignore in outdir.
+
+       * .gitignore: 
+       new file.
+
+2006-10-28  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * input/test/vertical-extent.ly: 
+       * python/convertrules.py (conv): verticalExtent -> VerticalAxisGroup.
+
+2006-10-28  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * stepmake/bin/add-html-footer.py (compose): remove setgcos
+
+2006-10-28  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * GNUmakefile.in (install-help2man): install-help2man target. 
+
+2006-10-27  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * SConstruct (configure): Do not check for /bin/sh.
+
+2006-10-27  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * mf/GNUmakefile: explicit dependencies for emmentaler .otf-table
+       files.
+
+       * Documentation/topdocs/NEWS.tely (Top): add FretBoards example. 
+
+       * input/regression/fret-boards.ly: new file.
+
+       * po/de.po: new po courtesy translation team.
+
+       * scripts/lilypond-book.py (get_option_parser): add newline to doc
+       string.
+
+2006-10-27  Mats Bengtsson  <mabe@drongo.s3.kth.se>
+
+       * ly/gregorian-init.ly (neumeDemoLayout): update
+       minimumVerticalExtent -> VerticalAxisGroup #'minimum-Y-extent 
+
+       * scm/define-context-properties.scm, ly/engraver-init.ly: Remove
+       obsolete verticalExtent / extraVerticalExtent / minumumVerticalExtent
+
+2006-10-27  Erlend Aasland  <erlenda@gmail.com>
+
+       * GNUmakefile.in ($(tree-share-prefix)/mf-link-tree link-mf-tree):
+       Yet another build fix.
+
+2006-10-26  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * SConstruct (lilypondprefix): use sorted() for list_sort()
+       indent 4
+
+2006-10-26  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * flower/SConscript: Unit test rules.
+
+       * flower/test-std.cc: Compile fix.
+
+2006-10-26  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * python/midi.c (pymidi_parse_track): warning fixes.
+
+       * lily/dot-column.cc (struct Dot_position): initialize extremal_head_
+       include dot-column.hh
+
+2006-10-26  Graham Percival  <gpermus@gmail.com>
+
+       * Documentation/user/{basic-, global}: minor changes from mailist.
+
+2006-10-26  Erlend Aasland  <erlenda@gmail.com>
+
+       * scm/define-grobs.scm: trivial beautification
+
+       * lily/tie-performer.cc: no need to #include "pqueue.hh"
+
+       * lily/source-file.cc: put multibyte var inside #if clause
+
+       * scm/define-grob-interfaces.scm:
+       * scm/define-grob-properties.scm:
+       Build fix (string-fret-finger-combinations)
+
+       * Documentation/topdocs/INSTALL.texi: Remove obsolete info about
+       lexer-gcc-3.1.sh
+
+       * Documentation/user/lilypond-book.itely: Build fix.
+
+2006-10-26  Joe Neeman  <joeneeman@gmail.com>
+
+       * lily/system.cc (get_paper_system): 
+       * lily/paper-book.cc (systems): 
+       move most of the backwards compatibility stuff into
+       Paper_book::systems
+
+       * Documentation/topdocs/NEWS.tely: add 2 entries for the
+       page breaking stuff
+
+       * Documentation/user/page.itely: remove time-scaled-music
+       bug for the Page_turn_engraver
+
+       * lily/paper-book.cc (set_system_penalty): backwards
+       compatibility (breakbefore) for the old page breaker
+
+2006-10-25  Graham Percival  <gpermus@gmail.com>
+
+       * Diocumentation/user/instrument-notation.itely: added more
+       info about stanzas; thanks Geoff!
+
+       * Documentation/user/ {basic, advanced}: small fixes from
+       mailist.
+
+       * THANKS: add some bug reporters.
+
+2006-10-25  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/define-context-properties.scm (all-user-translation-properties):
+       noteToFretFunction: Add.
+
+       * scm/define-grobs.scm (all-grob-descriptions): FretBoard: use
+       fret-diagram-interface (WAS: fret-board-interface).  Fixes build.
+
+2006-10-23  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * flower/file-name.cc (dos_to_posix): Help std::string.copy with
+       trailing zero.
+
+       * GNUmakefile.in ($(tree-share-prefix)/mf-link-tree link-mf-tree):
+       Remove bashism in delete.
+
+2006-10-25  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * scm/define-grobs.scm (all-grob-descriptions): set finger-code.
+
+       * scm/translation-functions.scm (determine-frets-mf): flatten let*
+
+       * scm/define-context-properties.scm
+       (all-user-translation-properties): add maximumFretStretch property.
+
+       * scm/translation-functions.scm (tunings): read and use maximumFretStretch.
+
+       * lily/source-file.cc (get_counts): use multibyte variable.
+
+       * scm/translation-functions.scm (determine-frets-mf): new
+       function: compute fret numbers. 
+
+       * scm/output-lib.scm (string-frets->description) new function.
+       (fret-board::calc-stencil): new function
+
+       * scm/fret-diagrams.scm (fret-diagram-verbose): update doc string.
+
+       * scm/define-grobs.scm (all-grob-descriptions): add FretBoard grob. 
+
+       * lily/include/lily-guile.hh (ly_cxx_vector_to_list): new function.
+
+       * lily/tab-note-heads-engraver.cc: cleanups.
+
+       * lily/fretboard-engraver.cc: new file
+
+       * ly/engraver-init.ly: add FretBoards context
+
+2006-10-24  Joe Neeman  <joeneeman@gmail.com>
+
+       * lily/grob.cc (pure_relative_y_coordinate)
+       (pure_height): use the new call_pure_function stuff
+
+       * lily/grob-property.cc (call_pure_function): wrapper for the scheme
+       call-pure-function
+
+       * lily/side-position-interface.cc (pure_y_aligned_side): add an
+       optarg
+
+       * lily/simple-closure.cc (ly_eval_simple_closure): make
+       simple-closure evaluatable from scheme
+       (evaluate_with_simple_closure): make simple-closures pure-
+       evaluatable
+
+       * lily/slur.cc (pure_outside_slur_callback): new function
+
+       * ly/paper-defaults.ly: change default blank-page-force to 2 (this
+       fits in with previous changes that made the page forces much
+       smaller)
+
+       * scm/define-grobs.scm (call-pure-function): generalise pure-Y-offset
+       and pure-Y-extent into this new function.
+       (pure-conversions-alist): add outside-slur-callback
+
+2006-10-24  Mats Bengtsson  <mabe@drongo.s3.kth.se>
+
+       * Documentation/user/advanced-notation.itely (Instrument names):
+       Remove obsolete bug workaround for instrument names on piano
+       staff. 
+
+2006-10-24  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * Documentation/user/lilypond-book.itely (Integrating DocBook and
+       music): patch by Bertalan Fodor for docbook.
+
+       * Documentation/topdocs/GNUmakefile (LILYPOND_BINARY): use instead
+       of $(LILYPOND). Prevents lilypond run for .txt files.
+
+       * INSTALL.txt: gitness.
+
+       * .cvsignore: update to force gitness. 
+
+2006-10-23  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * lily/tuplet-bracket.cc (calc_position_and_height): robustness:
+       detect suicide in nested tuplets.
+
+2006-10-23  Werner Lemberg  <wl@gnu.org>
+
+       * lily/pango-font.cc (Pango_font::pango_item_string_stencil): Fix
+       typo in argument to FT_Get_X11_Font_Format.
+
+2006-10-23  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * stepmake/stepmake/po-vars.make: more gitness.
+
+       * flower/polynomial.cc (check_sol): no empty if bodies. 
+
 2006-10-22  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * stepmake/stepmake/po-vars.make: test change for GIT gateway.
index 8ecc6f65bfc3993bbdfe0ea02ad2a9569a124cc8..ffab58bd76996ba55cfdb697aac0430e9086b6c3 100644 (file)
@@ -9,7 +9,7 @@ SUBDIRS = buildscripts python scripts \
        po make \
        elisp vim \
        input \
-       stepmake $(documentation-dir)
+       cygwin stepmake $(documentation-dir)
 
 
 ## this convoluted construction is necessary, since we don't know the
index a1cb3cf2f961bead4f16c83311ce72141808826e..95c45592c901b62d15645cdd6def475043f6db5d 100644 (file)
@@ -9,6 +9,7 @@ import optparse
 def read_pipe (x):
     print 'pipe', x
     return os.popen (x).read ()
+
 def system (x):
     print x
     return os.system (x)
@@ -45,6 +46,9 @@ class Commit:
 
         return files
 
+    def has_patch (self):
+        return self.touched_files () <> []
+    
     def apply (self, add_del_files):
         def note_add_file (x):
             add_del_files.append (('add', x.group (1)))
@@ -80,9 +84,17 @@ def parse_commit_log (log):
     c = Commit (locals ())
     return c
 
-def parse_add_changes (from_commit):
-    
-    log = read_pipe ('git log %(from_commit)s..' % locals ())
+def parse_add_changes (from_commit, max_count=0):
+    opt = ''
+    rest = '..'
+    if max_count:
+
+        # fixme.
+        assert max_count == 1
+        opt = '--max-count=%d' % max_count 
+        rest = ''
+        
+    log = read_pipe ('git log %(opt)s %(from_commit)s%(rest)s' % locals ())
 
     log = log[len ('commit '):]
     log = log.strip ()
@@ -109,17 +121,22 @@ def changelog_body (commit):
     return s
 
 def main ():
-    p = optparse.OptionParser (usage="usage git-update-changelog.py [options]",
+    p = optparse.OptionParser (usage="usage git-update-changelog.py [options] [commits]",
                                description="""
 Apply GIT patches and update change log.
 
-Run this file from the CVS directory, with --git-dir 
+Run this file from the CVS directory, with commits from the repository in --git-dir.
+
+
+
+
 """)
     p.add_option ("--start",
                   action='store',
                   default='',
+                  metavar="FIRST"
                   dest="start",
-                  help="start of log messages to merge.")
+                  help="all commits starting with FIRST.")
     
     p.add_option ("--git-dir",
                   action='store',
@@ -131,14 +148,21 @@ Run this file from the CVS directory, with --git-dir
     
     log = open ('ChangeLog').read ()
 
-    if not 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 args:
+        if not options.start:
+            print 'Must set start committish.'  
+            sys.exit (1)
+
+        commits = parse_add_changes (options.start)
+    else:
+        commits = [] 
+        for a in args:
+            commits += parse_add_changes (a, max_count=1)
+
     if not commits:
         return
     
@@ -153,8 +177,17 @@ Run this file from the CVS directory, with --git-dir
     
     collated_log = ''
     collated_message = ''
-    
-    for c in commits:
+
+    commits_done = []
+    while commits:
+        c = commits[0]
+        commits = commits[1:]
+        commits_done.append (c) 
+
+        if not c.has_patch ():
+            print 'patchless commit (merge?)'
+            continue
+        
         print 'patch ', c.committish
         try:
             c.apply (file_adddel)
@@ -199,6 +232,12 @@ Run this file from the CVS directory, with --git-dir
     open ('.msg','w').write (collated_message)
     print '\nCommit message\n**\n%s\n**\n' % collated_message
     print '\nRun:\n\n\tcvs commit -F .msg\n\n'
+    print '\n\techo %s >> .git-commits-done\n\n' % ' '.join (commits_done) 
+
+
+    if commits:
+        print 'Commits left to do:'
+        print ' '.join ([c.committish for c in commits])
     
 main ()
     
index 90bc685f06c31c2afce499ddba51d9691aaba845..21fb841d6635b80477f8dc863ec50b24f5b70931 100644 (file)
@@ -63,14 +63,16 @@ Optimal_page_breaking::try_page_spacing (Line_division const &line_count)
     {
       Real uniformity = fabs (ret.force_[i] - ret.force_[i-1]);
       ret.demerits_ += (ret.force_[i] * ret.force_[i]
-                       + uniformity * uniformity) * page_weighting;
+                      + uniformity * uniformity) * page_weighting;
     }
 
-  /* for a while we tried averaging page and line forces instead of summing
-     them, but it caused the following problem. If there is a single page
-     with a very bad page force (for example because of a forced page break),
-     the page breaker will put in a _lot_ of pages so that the bad force
-     becomes averaged out over many pages. */
+  /* If ragged_last is true, the last page will have
+     zero force no matter what. In this case, we exclude it from the average or
+     we will become biased towards scores with less pages (because the force
+     of zero will affect the average more when there are fewer pages) */
+  if (!ragged_last || ret.force_.size () > 1)
+    ret.demerits_ /= ret.force_.size () - (ragged_last ? 1 : 0);
+  line_force /= lines.size ();
   ret.demerits_ += line_force + line_penalty;
   return ret;
 }
index e032d7ee59da0ee580e7967954f6938b5163084d..1bb8bf6d7fd4c8d09aea89b47de20fb8bbb61626 100644 (file)
@@ -1,2 +1 @@
 # empty
-