|
From: | Doug Linhardt |
Subject: | Re: Merging different fonts |
Date: | Tue, 16 Mar 2004 07:53:18 -0600 |
User-agent: | Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4.1) Gecko/20031030 |
Douglas A Linhardt wrote:
After removing the merge-differently-headed, the documentation didn't need to be changed, and I didn't need to a properties. It turns out all I needed is:Han-Wen, On 3/15/2004 12:20 PM, Han-Wen Nienhuys wrote:The other properties reflect some guitar and piano practices. I don't see use of a merge-different-style, so please leave it out for now. We can always put it back in later.No problem. Thanks for the feedback.I haven't integrated your previous patch due to the questions I had. Could you (re)implement the functionality as you would do it now, and send me the patch, so I can apply it to the CVS repo? Thanks!I should be able to do it tonight. I'll get it to you as soon as it's done. Doug
--- note-collision.cc 2004-03-15 20:47:15.000000000 -0600+++ ../../lilypond-2.1.31/lily/note-collision.cc 2004-03-15 20:52:46.000000000 -0600
@@ -71,6 +71,11 @@ // FIXME: what's this? bool merge_possible = (ups[0] >= dps[0]) && (ups.top () >= dps.top ());
+ /* Do not merge notes typeset in different fonts */ + if ( ! gh_equal_p (nu->get_property ("style"), + nd->get_property ("style") ) ) + merge_possible = false; + int upball_type = Note_head::get_balltype (nu); int dnball_type = Note_head::get_balltype (nd);
[Prev in Thread] | Current Thread | [Next in Thread] |