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