From 1a42c5af9e1b0f27e8250ccefa1b204a359cbf12 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 12 Mar 2004 20:56:46 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 3 +++ VERSION | 2 +- lily/gourlay-breaking.cc | 4 +--- lily/stencil.cc | 2 -- scm/output-tex.scm | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 293cc67b1d..b3316b63de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-03-12 Han-Wen Nienhuys + * scm/part-combiner.scm (make-autochange-music): switch rests + before switched notes too. + * lily/figured-bass-engraver.cc (process_music): change calling convention. diff --git a/VERSION b/VERSION index 19131d29c2..c71b24e8d6 100644 --- a/VERSION +++ b/VERSION @@ -2,5 +2,5 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=1 PATCH_LEVEL=30 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=hwn1 diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc index f2182e2eb5..2b935037dd 100644 --- a/lily/gourlay-breaking.cc +++ b/lily/gourlay-breaking.cc @@ -66,7 +66,6 @@ print_break_nodes (Array const & arr) This algorithms is adapted from the OSU Tech report on breaking lines. this function is longish, but not very complicated. - */ Array Gourlay_breaking::do_solve () const @@ -81,8 +80,7 @@ Gourlay_breaking::do_solve () const optimal_paths.push (first_node); Real worst_force = 0.0; - - for (int break_idx=1; break_idx< breaks.size (); break_idx++) + for (int break_idx = 1; break_idx< breaks.size (); break_idx++) { /* start with a short line, add measures. At some point diff --git a/lily/stencil.cc b/lily/stencil.cc index 2b16efe8b6..9acbc8dc0a 100644 --- a/lily/stencil.cc +++ b/lily/stencil.cc @@ -16,10 +16,8 @@ #include "stencil.hh" #include "warn.hh" - #include "ly-smobs.icc" - SCM Stencil::smobbed_copy () const { diff --git a/scm/output-tex.scm b/scm/output-tex.scm index e825cc02e3..52c86ed58a 100644 --- a/scm/output-tex.scm +++ b/scm/output-tex.scm @@ -50,11 +50,11 @@ (font-load-command (car x) (cdr x))) (map cdr font-name-alist)))) - - +;; ;; urg, how can exp be #unspecified? -- in sketch output ;; ;; set! returns # --hwn +;; (define (fontify name-mag-pair exp) (string-append (select-font name-mag-pair) exp)) -- 2.39.2