Merge branch 'cvs-head' of http://lilypond.org/vc/lilypond into master-hanwen

Conflicts:

	.gitignore
	scm/lily.scm

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 566b1f8227b86851a9ba80c019a00b1b8fe0d233..e598f311faffc29dc71f2aea31a944917338a17c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -453,6 +453,311 @@
 
        * 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.

diff --git a/flower/file-name.cc b/flower/file-name.cc
index fd69d379d5a4e42b0aec4af31493ea0dfc9d7e43..21fec4e4b1a8a8a5a054edef2f32ae3175a9c566 100644 (file)
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -42,7 +42,7 @@ static string
 dos_to_posix (string file_name)
 {
   char buf[PATH_MAX] = "";
-  char s[PATH_MAX];
+  char s[PATH_MAX] = {0};
   file_name.copy (s, PATH_MAX - 1);
   /* ugh: char const* argument gets modified.  */
   int fail = cygwin_conv_to_posix_path (s, buf);

diff --git a/input/regression/horizontal-bracket-break.ly b/input/regression/horizontal-bracket-break.ly
new file mode 100644 (file)
index 0000000..1b28726
--- /dev/null
+++ b/input/regression/horizontal-bracket-break.ly
@@ -0,0 +1,12 @@
+\header {
+  texidoc = "Horizontal brackets connect over line breaks."
+
+}
+\version "2.9.26"
+\paper { ragged-right  = ##t }
+
+\new Voice \with {
+  \consists Horizontal_bracket_engraver }
+{
+  c1\startGroup \break c1 \stopGroup
+}

diff --git a/input/regression/utf-8.ly b/input/regression/utf-8.ly
index a9b4179face3c36905992cf53e9ac152888b56c8..4a82eab24b5ec7fab1d5b102cf5bdf3ca167f8a2 100644 (file)
--- a/input/regression/utf-8.ly
+++ b/input/regression/utf-8.ly
@@ -43,7 +43,7 @@ japanese = \lyricmode {
   わがよたれぞ  つねならむ
   うゐのおくや  まけふこえて
   あさきゆめみじ ゑひもせず 
- }
+}
 
 % "a legal song to you"
 portuguese = \lyricmode { 

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index 3aa4bc001cf50547673ad349d29e7cfa813718d5..115c2a73376acb5cc5894173259c77e97405d407 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -407,8 +407,10 @@ get_column_description (vector<Grob*> const &cols, vsize col_index, bool line_st
            description.end_rods_.push_back (Rod_description (j, scm_to_double (scm_cdar (s))));
        }
     }
+  
   if (!line_starter && to_boolean (col->get_property ("keep-inside-line")))
     description.keep_inside_line_ = col->extent (col, X_AXIS);
+
   description.break_permission_ = col->get_property ("line-break-permission");
   return description;
 }

diff --git a/scm/lily.scm b/scm/lily.scm
index 2c47415ff0adb278e33d6daf32c4495ef7eef33e..e7d6e8d0ce2226554a9bc05a5b201c32cd8c5cdf 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -20,14 +20,12 @@
              (anti-alias-factor 1 "render at higher resolution and scale down result\nto prevent jaggies in PNG")
              (check-internal-types #f "check every property assignment for types")
              (clip-systems #f "Generate cut-out snippets of a score")
-             (debug-gc #f
-                       "dump memory debugging statistics")
-             (debug-gc-assert-parsed-dead #f
-                       "for memory debugging: ensure that all refs to parsed objects are dead.")
-             
-             (debug-parser #f "debug the bison parser")
+             (debug-gc #f "dump memory debugging statistics")
+             (debug-gc-assert-parsed-dead
+              #f "for memory debugging: ensure that all refs to parsed objects are dead.")
              (debug-lexer #f "debug the flex lexer")
              (debug-midi #f "generate human readable MIDI")
+             (debug-parser #f "debug the bison parser")
              (delete-intermediate-files #f
                                         "delete unusable PostScript files")
              (dump-signatures #f "dump output signatures of each system")

diff --git a/stepmake/stepmake/po-vars.make b/stepmake/stepmake/po-vars.make
index e032d7ee59da0ee580e7967954f6938b5163084d..1bb8bf6d7fd4c8d09aea89b47de20fb8bbb61626 100644 (file)
--- a/stepmake/stepmake/po-vars.make
+++ b/stepmake/stepmake/po-vars.make
@@ -1,2 +1 @@
 # empty
-