]> git.donarmstrong.com Git - lilypond.git/blob - lily/slur-scoring.cc
* lily/moment.cc (robust_scm2moment): new function.
[lilypond.git] / lily / slur-scoring.cc
1 /*
2   slur-scoring.cc -- Score based slur formatting
3
4   source file of the GNU LilyPond music typesetter
5
6   (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
7   Jan Nieuwenhuizen <janneke@gnu.org>
8 */
9
10 #include <math.h>
11
12 #include "libc-extension.hh"
13 #include "slur-configuration.hh"
14 #include "slur-scoring.hh"
15 #include "beam.hh"
16 #include "directional-element-interface.hh"
17 #include "group-interface.hh"
18 #include "lily-guile.hh"
19 #include "slur.hh"
20 #include "note-column.hh"
21 #include "output-def.hh"
22 #include "pitch.hh"
23 #include "bezier.hh"
24 #include "spanner.hh"
25 #include "staff-symbol-referencer.hh"
26 #include "staff-symbol.hh"
27 #include "stem.hh"
28 #include "warn.hh"
29 #include "paper-column.hh"
30 #include "accidental-interface.hh"
31
32 /*
33   TODO:
34
35   - curve around flag for y coordinate
36
37   - this file is a mess, clean it up
38
39   - short-cut: try a smaller region first.
40
41   - handle non-visible stems better.
42
43   - try to prune number of scoring criteria
44
45   - take encompass-objects more into account when determining
46   slur shape
47
48   - calculate encompass scoring directly after determining slur shape.
49
50   - optimize.
51
52 */
53 struct Slur_score_state;
54
55 Slur_score_state::Slur_score_state()
56 {
57   musical_dy_ = 0.0;
58   valid_ = false;
59   edge_has_beams_ = false;
60   has_same_beam_ = false;
61   is_broken_ = false;
62   dir_ = CENTER;
63   slur_ = 0;
64   common_[X_AXIS] = 0;
65   common_[Y_AXIS] = 0;
66 }
67
68 Slur_score_state::~Slur_score_state ()
69 {
70   junk_pointers (configurations_);
71 }
72
73 Real
74 get_detail (SCM alist, SCM sym)
75 {
76   SCM entry = scm_assq (sym, alist);
77   return robust_scm2double (scm_is_pair (entry)
78                             ? scm_cdr (entry)
79                             : SCM_EOL,
80                             0.0);
81 }
82
83 void
84 Slur_score_parameters::fill (Grob *me)
85 {
86   SCM details = me->get_property ("slur-details");
87
88   region_size_
89     = (int) get_detail (details, ly_symbol2scm ("region-size"));
90   head_encompass_penalty_
91     = get_detail (details, ly_symbol2scm ("head-encompass-penalty"));
92   stem_encompass_penalty_
93     = get_detail (details, ly_symbol2scm ("stem-encompass-penalty"));
94   closeness_factor_
95     = get_detail (details, ly_symbol2scm ("closeness-factor"));
96   edge_attraction_factor_
97     = get_detail (details, ly_symbol2scm ("edge-attraction-factor"));
98   same_slope_penalty_
99     = get_detail (details, ly_symbol2scm ("same-slope-penalty"));
100   steeper_slope_factor_
101     = get_detail (details, ly_symbol2scm ("steeper-slope-factor"));
102   non_horizontal_penalty_
103     = get_detail (details, ly_symbol2scm ("non-horizontal-penalty"));
104   max_slope_
105     = get_detail (details, ly_symbol2scm ("max-slope"));
106   max_slope_factor_
107     = get_detail (details, ly_symbol2scm ("max-slope-factor"));
108   free_head_distance_
109     = get_detail (details, ly_symbol2scm ("free-head-distance"));
110   absolute_closeness_measure_
111     = get_detail (details, ly_symbol2scm ("absolute-closeness-measure"));
112   extra_object_collision_
113     = get_detail (details, ly_symbol2scm ("extra-object-collision"));
114   accidental_collision_
115     = get_detail (details, ly_symbol2scm ("accidental-collision"));
116   extra_encompass_free_distance_
117     = get_detail (details, ly_symbol2scm ("extra-encompass-free-distance"));
118   head_slur_distance_factor_
119     = get_detail (details, ly_symbol2scm ("head-slur-distance-factor"));
120   head_slur_distance_max_ratio_
121     = get_detail (details, ly_symbol2scm ("head-slur-distance-max-ratio"));
122   free_slur_distance_
123     = get_detail (details, ly_symbol2scm ("free-slur-distance"));
124   edge_slope_exponent_
125     = get_detail (details, ly_symbol2scm ("edge-slope-exponent"));
126 }
127
128 Real
129 broken_trend_y (Slur_score_state const &state, Direction hdir)
130 {
131   /* A broken slur should maintain the same vertical trend
132      the unbroken slur would have had.  */
133   Real by = 0.0;
134   if (Spanner *mother = dynamic_cast<Spanner*> (state.slur_->original_))
135     {
136       int k = broken_spanner_index (state.slur_);
137       int j = k + hdir;
138       if (j < 0 || j >= mother->broken_intos_.size ())
139         return by;
140
141       Grob *neighbor = mother->broken_intos_[j];
142       Spanner *common_mother
143         = dynamic_cast<Spanner*> (state.common_[Y_AXIS]->original_);
144       int common_k
145         = broken_spanner_index (dynamic_cast<Spanner*> (state.common_[Y_AXIS]));
146       int common_j = common_k + hdir;
147
148       if (common_j < 0 || common_j >= common_mother->broken_intos_.size ())
149         return by;
150
151       Grob *common_next_system = common_mother->broken_intos_[common_j];
152       
153       SCM last_point =  scm_car (scm_last_pair (neighbor->get_property ("control-points")));
154       
155       return scm_to_double (scm_cdr (last_point))
156         + neighbor->relative_coordinate (common_next_system, Y_AXIS);
157     }
158   return by;
159 }
160
161
162 /*
163   copy slur dir forwards across line break.
164 */
165 void
166 Slur_score_state::set_next_direction () 
167 {
168   if (extremes_[RIGHT].note_column_)
169     return;
170   
171   if (Spanner *mother = dynamic_cast<Spanner*> (slur_->original_))
172     {
173       int k = broken_spanner_index (slur_);
174       int j = k + 1;
175       if (j < 0 || j >= mother->broken_intos_.size ())
176         return;
177
178       Grob *neighbor = mother->broken_intos_[j];
179       set_grob_direction (neighbor, dir_);
180     }
181 }
182
183 Encompass_info
184 Slur_score_state::get_encompass_info (Grob *col) const
185 {
186   Grob *stem = unsmob_grob (col->get_property ("stem"));
187   Encompass_info ei;
188
189   if (!stem)
190     {
191       programming_error ("No stem for note column?");
192       ei.x_ = col->relative_coordinate (common_[X_AXIS], X_AXIS);
193       ei.head_ = ei.stem_ = col->extent (common_[Y_AXIS],
194                                          Y_AXIS)[dir_];
195       return ei;
196     }
197   Direction stem_dir = get_grob_direction (stem);
198
199   if (Grob *head = Note_column::first_head (col))
200     ei.x_ = head->extent (common_[X_AXIS], X_AXIS).center ();
201   else
202     ei.x_ = col->extent (common_[X_AXIS], X_AXIS).center ();
203
204   Grob *h = Stem::extremal_heads (stem)[Direction (dir_)];
205   if (!h)
206     {
207       ei.head_ = ei.stem_ = col->extent (common_[Y_AXIS], Y_AXIS)[dir_];
208       return ei;
209     }
210
211   ei.head_ = h->extent (common_[Y_AXIS], Y_AXIS)[dir_];
212
213   if ((stem_dir == dir_)
214       && !stem->extent (stem, Y_AXIS).is_empty ())
215     {
216       ei.stem_ = stem->extent (common_[Y_AXIS], Y_AXIS)[dir_];
217       if (Grob *b = Stem::get_beam (stem))
218         ei.stem_ += stem_dir * 0.5 * Beam::get_thickness (b);
219
220       Interval x = stem->extent (common_[X_AXIS], X_AXIS);
221       ei.x_ = x.is_empty ()
222         ? stem->relative_coordinate (common_[X_AXIS], X_AXIS)
223         : x.center ();
224     }
225   else
226     ei.stem_ = ei.head_;
227
228   return ei;
229 }
230
231
232
233
234 Drul_array<Bound_info>
235 Slur_score_state::get_bound_info () const
236 {
237   Drul_array<Bound_info> extremes;
238
239   Direction d = LEFT;
240   Direction dir = dir_;
241
242   do
243     {
244       extremes[d].bound_ = slur_->get_bound (d);
245       if (Note_column::has_interface (extremes[d].bound_))
246         {
247           extremes[d].note_column_ = extremes[d].bound_;
248           extremes[d].stem_ = Note_column::get_stem (extremes[d].note_column_);
249           extremes[d].stem_dir_ = get_grob_direction (extremes[d].stem_);
250           extremes[d].stem_extent_[X_AXIS]
251             = extremes[d].stem_->extent (common_[X_AXIS], X_AXIS);
252           extremes[d].stem_extent_[Y_AXIS]
253             = extremes[d].stem_->extent (common_[Y_AXIS], Y_AXIS);
254           extremes[d].slur_head_
255             = Stem::extremal_heads (extremes[d].stem_)[dir];
256           if (!extremes[d].slur_head_
257               && Note_column::has_rests (extremes[d].bound_))
258             {
259               extremes[d].slur_head_ = Note_column::get_rest (extremes[d].bound_);
260             }
261
262           if (extremes[d].slur_head_)
263             extremes[d].slur_head_extent_
264               = extremes[d].slur_head_->extent (common_[X_AXIS], X_AXIS);
265
266           extremes[d].staff_ = Staff_symbol_referencer
267             ::get_staff_symbol (extremes[d].stem_);
268           extremes[d].staff_space_ = Staff_symbol_referencer
269             ::staff_space (extremes[d].stem_);
270         }
271     }
272   while (flip (&d) != LEFT);
273   return extremes;
274 }
275
276 void
277 Slur_score_state::fill (Grob *me)
278 {
279   slur_ = dynamic_cast<Spanner*> (me);
280   columns_ 
281     = Pointer_group_interface__extract_grobs (me, (Grob *) 0, "note-columns");
282   
283   if (columns_.is_empty ())
284     {
285       me->suicide ();
286       return ;
287     }
288
289   staff_space_ = Staff_symbol_referencer::staff_space (me);
290   Real lt = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
291   thickness_ = robust_scm2double (me->get_property ("thickness"), 1.0) *  lt;
292   
293   dir_ = get_grob_direction (me);
294   parameters_.fill (me);
295   
296   SCM eltlist = me->get_property ("note-columns");
297   SCM extra_list = me->get_property ("encompass-objects");
298   Spanner *sp = dynamic_cast<Spanner*> (me);
299
300   for (int i = X_AXIS; i < NO_AXES; i++)
301     {
302       Axis a = (Axis)i;
303       common_[a] = common_refpoint_of_list (eltlist, me, a);
304       common_[a] = common_refpoint_of_list (extra_list, common_[a], a);
305
306       Direction d = LEFT;
307       do {
308         common_[a] = common_[a]->common_refpoint (sp->get_bound (d), a);
309       }
310       while (flip (&d) != LEFT);
311     }
312
313   extremes_ = get_bound_info ();
314   is_broken_ = (!extremes_[LEFT].note_column_
315                 || !extremes_[RIGHT].note_column_); 
316
317   
318   base_attachments_ = get_base_attachments ();
319
320   Drul_array<Real> end_ys
321     = get_y_attachment_range ();
322
323   configurations_ = enumerate_attachments ( end_ys);
324   for (int i = 0; i < columns_.size (); i++)
325     encompass_infos_.push (get_encompass_info ( columns_[i]));
326
327   extra_encompass_infos_ = get_extra_encompass_infos ();
328   valid_ = true;
329
330
331   musical_dy_ = 0.0;
332   Direction d = LEFT;
333   do
334     {
335       if (!is_broken_)
336         musical_dy_ += d
337           * extremes_[d].slur_head_->relative_coordinate (common_[Y_AXIS], Y_AXIS);
338     }
339   while (flip (&d) != LEFT);
340   
341   edge_has_beams_
342     = (extremes_[LEFT].stem_ && Stem::get_beam (extremes_[LEFT].stem_))
343     || (extremes_[RIGHT].stem_ && Stem::get_beam (extremes_[RIGHT].stem_));
344
345   has_same_beam_ =
346     (extremes_[LEFT].stem_ && extremes_[RIGHT].stem_
347      && Stem::get_beam (extremes_[LEFT].stem_) == Stem::get_beam (extremes_[RIGHT].stem_));
348
349   
350   set_next_direction ();
351
352   if (is_broken_)
353     musical_dy_ = 0.0;
354 }
355
356 void
357 set_slur_control_points (Grob *me)
358 {
359   Slur_score_state state;
360   state.fill (me);
361
362   if (!state.valid_)
363     return;
364   
365   state.generate_curves ();
366   Bezier best (state.get_best_curve());
367
368
369   SCM controls = SCM_EOL;
370   for (int i = 4; i--;)
371     {
372       Offset o = best.control_[i]
373         - Offset (me->relative_coordinate (state.common_[X_AXIS], X_AXIS),
374                   me->relative_coordinate (state.common_[Y_AXIS], Y_AXIS));
375       controls = scm_cons (ly_offset2scm (o), controls);
376     }
377   me->set_property ("control-points", controls);
378 }
379
380
381 Bezier
382 Slur_score_state::get_best_curve ()
383 {
384   for (int i = 0; i < configurations_.size (); i++)
385     {
386       configurations_[i]->score (*this);
387     }
388   
389   Real opt = 1e6;
390   int opt_idx = -1;
391   for (int i = 0; i < configurations_.size (); i++)
392     {
393       if (configurations_[i]->score_ < opt)
394         {
395           opt = configurations_[i]->score_;
396           opt_idx = i;
397         }
398     }
399
400 #if DEBUG_SLUR_SCORING
401   SCM inspect_quants = slur_->get_property ("inspect-quants");
402   if (to_boolean (slur_->get_paper ()
403                   ->lookup_variable (ly_symbol2scm ("debug-slur-scoring")))
404       && scm_is_pair (inspect_quants))
405     {
406       Drul_array<Real> ins = ly_scm2interval (inspect_quants);
407       Real mindist = 1e6;
408       for (int i = 0; i < configurations_.size (); i ++)
409         {
410           Real d =fabs (configurations_[i]->attachment_[LEFT][Y_AXIS] - ins[LEFT])
411             + fabs (configurations_[i]->attachment_[RIGHT][Y_AXIS] - ins[RIGHT]);
412           if (d < mindist)
413             {
414               opt_idx = i;
415               mindist= d;
416             }
417         }
418       if (mindist > 1e5)
419         programming_error ("Could not find quant.");
420     }
421
422   configurations_[opt_idx]->score_card_ += to_string ("=%.2f", opt);  
423   configurations_[opt_idx]->score_card_ += to_string ("i%d", opt_idx);
424
425   // debug quanting
426   slur_->set_property ("quant-score",
427                     scm_makfrom0str (configurations_[opt_idx]->score_card_.to_str0 ()));
428
429 #endif
430
431   return configurations_[opt_idx]->curve_;
432 }
433
434 /*
435   TODO: should analyse encompasses to determine sensible region, and
436   should limit slopes available.
437  */
438
439 Drul_array<Real>
440 Slur_score_state::get_y_attachment_range () const
441 {
442   Drul_array<Real> end_ys;
443   Direction d = LEFT;
444   do
445     {
446       if (extremes_[d].note_column_)
447         {
448           end_ys[d] = dir_
449             * ((dir_ * (base_attachments_[d][Y_AXIS] +  parameters_.region_size_* dir_))
450                >? (dir_ * (dir_ + extremes_[d].note_column_->extent (common_[Y_AXIS],
451                                                                  Y_AXIS)[dir_]))
452                >? (dir_ * base_attachments_[-d][Y_AXIS]));
453         }
454       else
455         end_ys[d] = base_attachments_[d][Y_AXIS] + parameters_.region_size_ * dir_;
456     }
457   while (flip (&d) != LEFT);
458
459   return end_ys;
460 }
461
462 bool
463 spanner_less (Spanner *s1, Spanner* s2)
464 {
465   Slice b1, b2;
466   Direction d  = LEFT;
467   do
468     {
469       b1[d] = s1->get_bound (d)->get_column ()->rank_;
470       b2[d] = s2->get_bound (d)->get_column ()->rank_;
471     } while (flip (&d) != LEFT);
472
473   return b2[LEFT] <= b1[LEFT] && b2[RIGHT] >= b1[RIGHT]
474     && (b2[LEFT] != b1[LEFT] || b2[RIGHT] != b1[RIGHT]);
475 }
476
477
478 Drul_array<Offset>
479 Slur_score_state::get_base_attachments () const
480 {
481   Drul_array<Offset> base_attachment;
482   Direction d = LEFT;
483   do
484     {
485       Grob *stem = extremes_[d].stem_;
486       Grob *head = extremes_[d].slur_head_;
487
488       Real x = 0.0;
489       Real y = 0.0;
490       if (extremes_[d].note_column_)
491         {
492          
493           /*
494             fixme: X coord should also be set in this case.
495            */
496           if (stem
497               && extremes_[d].stem_dir_ == dir_
498               && Stem::get_beaming (stem, -d)
499               && (!spanner_less (slur_, Stem::get_beam (stem))
500                   || has_same_beam_))
501             y = extremes_[d].stem_extent_[Y_AXIS][dir_];
502           else if (head)
503             y = head->extent (common_[Y_AXIS], Y_AXIS)[dir_];
504           y += dir_ * 0.5 * staff_space_;
505
506           Real pos
507             = (y - extremes_[d].staff_->relative_coordinate (common_[Y_AXIS],
508                                                             Y_AXIS))
509             * 2.0 / staff_space_;
510
511           /* start off staffline. */
512           if (fabs (pos - my_round (pos)) < 0.2
513               && Staff_symbol_referencer::on_staffline (head, (int) rint (pos))
514               && Staff_symbol_referencer::line_count (head) - 1 >= rint (pos)
515               )
516             // TODO: calc from slur thick & line thick, parameter.      
517             y += 1.5 * staff_space_ * dir_ / 10;
518
519           Grob * fh = Note_column::first_head (extremes_[d].note_column_);
520           x =
521          (fh ? fh->extent (common_[X_AXIS], X_AXIS)
522              : extremes_[d].bound_->extent (common_[X_AXIS], X_AXIS))
523             .linear_combination (CENTER);
524         }
525       base_attachment[d] = Offset (x, y);
526
527     } while (flip (&d) != LEFT);
528
529   do
530     {
531       if (!extremes_[d].note_column_)
532         {
533           Real x, y;
534           if (d == RIGHT)
535             {
536               x = extremes_[d].bound_->extent (common_[X_AXIS], X_AXIS)[d];
537             }
538           else
539             {
540               x = slur_->get_broken_left_end_align ();
541             }
542           Grob * col = (d == LEFT) ? columns_[0] : columns_.top();
543               
544           if (extremes_[-d].bound_ != col)
545             {
546               y = robust_relative_extent (col, common_[Y_AXIS], Y_AXIS)[dir_];
547               if (get_grob_direction (col) == dir_)
548                 y -= dir_ ;
549             }
550           else
551             y = base_attachment[-d][Y_AXIS];
552
553           base_attachment[d] = Offset (x, y);  
554         }
555     }
556   while (flip (&d) != LEFT);
557
558   return base_attachment;
559 }
560
561 void
562 Slur_score_state::generate_curves () const
563 {
564   Real r_0 = robust_scm2double (slur_->get_property ("ratio"), 0.33);
565   Real h_inf = staff_space_ *scm_to_double (slur_->get_property ("height-limit"));
566   for (int i = 0; i < configurations_.size (); i++)
567     configurations_[i]->generate_curve (*this, r_0, h_inf);
568 }
569
570
571
572
573 Link_array<Slur_configuration> 
574 Slur_score_state::enumerate_attachments (Drul_array<Real> end_ys) const
575 {
576   /*ugh.   */
577   Link_array<Slur_configuration> scores;
578
579
580   Drul_array<Offset> os;
581   os[LEFT] = base_attachments_[LEFT];
582   Real minimum_length = staff_space_
583     * robust_scm2double (slur_->get_property ("minimum-length"), 2.0);
584
585   for (int i = 0; dir_ * os[LEFT][Y_AXIS] <= dir_ * end_ys[LEFT]; i++)
586     {
587       os[RIGHT] = base_attachments_[RIGHT];
588       for (int j = 0; dir_ * os[RIGHT][Y_AXIS] <= dir_ * end_ys[RIGHT]; j++)
589         {
590           Slur_configuration s;
591           Direction d = LEFT;
592           Drul_array<bool> attach_to_stem (false, false);
593           do
594             {
595               os[d][X_AXIS] = base_attachments_[d][X_AXIS];
596               if (extremes_[d].stem_
597                   && !Stem::is_invisible (extremes_[d].stem_)
598                   && extremes_[d].stem_dir_ == dir_)
599                 {
600                   Interval stem_y = extremes_[d].stem_extent_[Y_AXIS];
601                   stem_y.widen (0.25 * staff_space_);
602                   if (dir_ == -d
603                       && stem_y.contains (os[d][Y_AXIS]))
604                     {
605                       os[d][X_AXIS] =  extremes_[d].slur_head_extent_[-d]
606                         - d * 0.3;
607                       attach_to_stem[d] = true;
608                     }
609                   else if (dir_ *extremes_[d].stem_extent_[Y_AXIS][dir_]
610                              < dir_ * os[d][Y_AXIS]
611                            && !extremes_[d].stem_extent_[X_AXIS].is_empty ()
612                            )
613                 
614                     os[d][X_AXIS] = extremes_[d].stem_extent_[X_AXIS].center ();
615                 }
616             }
617           while (flip (&d) != LEFT);
618
619           Offset dz;    
620           dz = os[RIGHT] - os[LEFT];
621           if (dz[X_AXIS] < minimum_length
622               || fabs (dz[Y_AXIS] / dz[X_AXIS]) > parameters_.max_slope_
623               )
624             {
625               do
626                 {
627                   if (extremes_[d].slur_head_)
628                     {
629                       os[d][X_AXIS] = extremes_[d].slur_head_extent_.center ();
630                       attach_to_stem[d] = false;
631                     }
632                 }
633               while (flip (&d) != LEFT);
634             }
635
636           dz = os[RIGHT] - os[LEFT];
637           do
638             {
639               if (extremes_[d].slur_head_
640                   && !attach_to_stem[d])
641                 {
642                   /* Horizontally move tilted slurs a little.  Move
643                      more for bigger tilts.
644                 
645                      TODO: parameter */
646                   os[d][X_AXIS]
647                     -= dir_ * extremes_[d].slur_head_extent_.length ()
648                     * sin (dz.arg ()) / 3;
649                 }
650             }
651           while (flip (&d) != LEFT);
652         
653           s.attachment_ = os;
654           s.index_ = scores.size ();
655
656           scores.push (new Slur_configuration (s));
657           
658           os[RIGHT][Y_AXIS] += dir_ * staff_space_ / 2;
659         }
660
661       os[LEFT][Y_AXIS] += dir_ * staff_space_ / 2;
662     }
663
664   assert (scores.size () > 0);
665   return scores;
666 }
667
668
669 Array<Extra_collision_info>
670 Slur_score_state::get_extra_encompass_infos () const
671 {
672   Link_array<Grob> encompasses
673     = Pointer_group_interface__extract_grobs (slur_, (Grob *)0,
674                                               "encompass-objects");
675   Array<Extra_collision_info> collision_infos;
676   for (int i = encompasses.size (); i--; )
677     {
678       if (Slur::has_interface (encompasses[i]))
679         {
680           Spanner * small_slur = dynamic_cast<Spanner*> (encompasses[i]);
681           Bezier b = Slur::get_curve (small_slur);
682
683           Offset relative (small_slur->relative_coordinate (common_[X_AXIS], X_AXIS),
684                            small_slur->relative_coordinate (common_[Y_AXIS], Y_AXIS));
685
686           for (int k = 0; k < 3; k++)
687             {
688               Direction hdir =  Direction (k /2 - 1);
689
690               /*
691                 Only take bound into account if small slur starts
692                 together with big slur.
693               */
694               if (hdir && small_slur->get_bound (hdir) != slur_->get_bound (hdir))
695                 continue;
696         
697               Offset z = b.curve_point (k / 2.0);
698               z += relative;
699
700               Interval yext;
701               yext.set_full ();
702               yext[dir_] = z[Y_AXIS] + dir_ * thickness_ * 1.0;
703
704               Interval xext (-1, 1);
705               xext = xext * (thickness_*2) + z[X_AXIS];
706               Extra_collision_info info (small_slur,
707                                          k - 1.0,
708                                          xext,
709                                          yext,
710                                          parameters_.extra_object_collision_);
711               collision_infos.push (info);
712             }
713         }
714       else
715         {
716           Grob *g = encompasses [i];
717           Interval xe = g->extent (common_[X_AXIS], X_AXIS);
718           Interval ye = g->extent (common_[Y_AXIS], Y_AXIS);
719
720           Real xp = 0.0;
721           Real penalty = parameters_.extra_object_collision_;
722           if (Accidental_interface::has_interface (g))
723             {
724               penalty = parameters_.accidental_collision_;
725               /* Begin copy accidental.cc */
726               bool parens = false;
727               if (to_boolean (g->get_property ("cautionary")))
728                 {
729                   SCM cstyle = g->get_property ("cautionary-style");
730                   parens = ly_c_equal_p (cstyle, ly_symbol2scm ("parentheses"));
731                 }
732         
733               SCM accs = g->get_property ("accidentals");
734               SCM scm_style = g->get_property ("style");
735               if (!scm_is_symbol (scm_style)
736                   && !parens
737                   && scm_ilength (accs) == 1)
738                 {
739                   /* End copy accidental.cc */
740                   switch (scm_to_int (scm_car (accs)))
741                     {
742                     case FLAT:
743                     case DOUBLE_FLAT:
744                       xp = LEFT;
745                       break ;
746                     case SHARP:
747                       xp = 0.5 * dir_;
748                       break ;
749                     case NATURAL:
750                       xp = -dir_;
751                       break;
752                     }
753                 }
754             }
755
756           ye.widen (thickness_ * 0.5);
757           xe.widen (thickness_ * 1.0);
758           Extra_collision_info info (g, xp, xe, ye,  penalty);
759           collision_infos.push (info);
760         }
761     }
762
763   return collision_infos;
764 }
765