Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(2262)

Issue 4293054: Close loopholes in note-collision logic (Closed)

Can't Edit
Can't Publish+Mail
Start Review
Created:
13 years, 1 month ago by Keith
Modified:
12 years, 3 months ago
Reviewers:
pkx166h, MikeSol
CC:
lilypond-devel_gnu.org
Visibility:
Public.

Description

lily/note-collision.cc: handle more dot situations Patch sets 1--5 were for issue 1174, now done. Patch set 6-- are for issue 2200. Makes it feasible to set DotColumns separately in each voice.

Patch Set 1 : simplest change; handle prefer-dotted-right when deciding shift_amount #

Patch Set 2 : make the decision of which chord goes to the right in one place #

Total comments: 3

Patch Set 3 : tidy #

Patch Set 4 : handle <f g>4\\f2 , restore old formatted comment #

Patch Set 5 : rebased to tab-free codebase #

Patch Set 6 : do not depend that DotColumns are merged #

Total comments: 2

Patch Set 7 : conform dots in meshed chords #

Patch Set 8 : account for Flags, now distinct from Stems #

Patch Set 9 : regression tests #

Unified diffs Side-by-side diffs Delta from patch set Stats (+51 lines, -25 lines) Patch
M input/regression/dot-column-note-collision.ly View 1 2 3 4 5 6 7 8 1 chunk +1 line, -0 lines 0 comments Download
M input/regression/dot-up-voice-collision.ly View 1 2 3 4 5 6 7 8 2 chunks +3 lines, -3 lines 0 comments Download
M lily/dot-column.cc View 1 2 3 4 5 6 7 1 chunk +2 lines, -0 lines 0 comments Download
M lily/note-collision.cc View 1 2 3 4 5 6 7 1 chunk +44 lines, -21 lines 0 comments Download
M ly/engraver-init.ly View 1 2 3 4 5 6 2 chunks +1 line, -1 line 0 comments Download

Messages

Total messages: 5
Keith
http://codereview.appspot.com/4293054/diff/7001/lily/note-collision.cc File lily/note-collision.cc (right): http://codereview.appspot.com/4293054/diff/7001/lily/note-collision.cc#newcode331 lily/note-collision.cc:331: FIXME: if I understand this comment, the problem seems ...
13 years, 1 month ago (2011-03-19 03:50:42 UTC) #1
MikeSol
LGTM
13 years, 1 month ago (2011-03-19 13:18:07 UTC) #2
Keith
http://codereview.appspot.com/4293054/diff/7001/input/regression/collision-dots-move.ly File input/regression/collision-dots-move.ly (right): http://codereview.appspot.com/4293054/diff/7001/input/regression/collision-dots-move.ly#newcode4 input/regression/collision-dots-move.ly:4: texidoc = "If dotted note heads must remain on ...
13 years ago (2011-04-26 06:00:21 UTC) #3
pkx166h
Passes Make and reg tests http://code.google.com/p/lilypond/issues/detail?id=1792#c1
12 years, 9 months ago (2011-07-31 19:00:41 UTC) #4
Keith
12 years, 3 months ago (2012-01-08 04:15:03 UTC) #5
http://codereview.appspot.com/4293054/diff/21002/lily/note-collision.cc
File lily/note-collision.cc (right):

http://codereview.appspot.com/4293054/diff/21002/lily/note-collision.cc#newco...
lily/note-collision.cc:315: && Rhythmic_head::dot_count (head_up))
Probably wise to remove the condition on the dot_count to the right, in any
case.

http://codereview.appspot.com/4293054/diff/21002/ly/engraver-init.ly
File ly/engraver-init.ly (right):

http://codereview.appspot.com/4293054/diff/21002/ly/engraver-init.ly#newcode228
ly/engraver-init.ly:228: \consists "Dot_column_engraver"
Having the Voice make its own dot columns creates a difficulty when colliding
chords require dots to move vertically: << <e' b'>4. \\ g'4. >>

The code in note-collision.cc is negotiating between Voices, so it would need to
be smarter.
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b