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

Delta Between Two Patch Sets: lily/slur.cc

Issue 7424049: Allows slurs to break at barlines.
Left Patch Set: Allows either side of the broken slur to be junked Created 12 years, 1 month ago
Right Patch Set: Changes name, harmonizes slur direction Created 12 years ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « lily/phrasing-slur-engraver.cc ('k') | lily/slur-engraver.cc » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
1 /* 1 /*
2 This file is part of LilyPond, the GNU music typesetter. 2 This file is part of LilyPond, the GNU music typesetter.
3 3
4 Copyright (C) 1996--2012 Han-Wen Nienhuys <hanwen@xs4all.nl> 4 Copyright (C) 1996--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
5 Jan Nieuwenhuizen <janneke@gnu.org> 5 Jan Nieuwenhuizen <janneke@gnu.org>
6 6
7 LilyPond is free software: you can redistribute it and/or modify 7 LilyPond is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
9 the Free Software Foundation, either version 3 of the License, or 9 the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 10 (at your option) any later version.
(...skipping 30 matching lines...) Expand all
41 #include "slur-scoring.hh" 41 #include "slur-scoring.hh"
42 #include "separation-item.hh" 42 #include "separation-item.hh"
43 #include "unpure-pure-container.hh" 43 #include "unpure-pure-container.hh"
44 #include "international.hh" 44 #include "international.hh"
45 45
46 MAKE_SCHEME_CALLBACK (Slur, calc_direction, 1) 46 MAKE_SCHEME_CALLBACK (Slur, calc_direction, 1)
47 SCM 47 SCM
48 Slur::calc_direction (SCM smob) 48 Slur::calc_direction (SCM smob)
49 { 49 {
50 Grob *me = unsmob_grob (smob); 50 Grob *me = unsmob_grob (smob);
51 extract_grob_set (me, "note-columns", encompasses); 51 vector<Grob *> encompasses;
52 extract_grob_set (me, "note-columns", ro_encompasses);
53 encompasses.insert (encompasses.end (), ro_encompasses.begin (), ro_encompasse s.end ());
54 if (Grob *other_half = unsmob_grob (me->get_object ("other-half")))
55 {
56 extract_grob_set (other_half, "note-columns", oh_encompasses);
57 encompasses.insert (encompasses.end (), oh_encompasses.begin (), oh_encomp asses.end ());
58 }
52 59
53 if (encompasses.empty ()) 60 if (encompasses.empty ())
54 { 61 {
55 me->suicide (); 62 me->suicide ();
56 return SCM_BOOL_F; 63 return SCM_BOOL_F;
57 } 64 }
58 65
59 Direction d = DOWN; 66 Direction d = DOWN;
60 for (vsize i = 0; i < encompasses.size (); i++) 67 for (vsize i = 0; i < encompasses.size (); i++)
61 { 68 {
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 "height-limit " 571 "height-limit "
565 "inspect-quants " 572 "inspect-quants "
566 "inspect-index " 573 "inspect-index "
567 "line-thickness " 574 "line-thickness "
568 "note-columns " 575 "note-columns "
569 "positions " 576 "positions "
570 "ratio " 577 "ratio "
571 "thickness " 578 "thickness "
572 ); 579 );
573 580
LEFTRIGHT

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