source file of the GNU LilyPond music typesetter
- (c) 2001--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2001--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include <stdio.h>
+
+#include "staff-spacing.hh"
+
+#include <cstdio>
#include "paper-column.hh"
#include "separation-item.hh"
-#include "item.hh"
-#include "staff-spacing.hh"
-#include "grob.hh"
#include "warn.hh"
#include "bar-line.hh"
#include "staff-symbol-referencer.hh"
if (!g || !Note_column::has_interface (g))
return 0.0;
- Item *col =dynamic_cast<Item*> (g)->get_column ();
+ Item *col = dynamic_cast<Item*> (g)->get_column ();
Real max_corr = 0. >? (- g->extent (col, X_AXIS)[LEFT]);
/*
Interval v;
if (Accidental_placement::has_interface (a))
{
- v = Accidental_placement::get_relevant_accidental_extent(a, col, me);
+ v = Accidental_placement::get_relevant_accidental_extent (a, col, me);
}
else
v = a->extent (col, X_AXIS);
max_corr = max_corr >? (- v[LEFT]);
}
- if (Grob* a = unsmob_grob (g->get_grob_property ("arpeggio")))
+ if (Grob* a = unsmob_grob (g->get_property ("arpeggio")))
{
max_corr = max_corr >? (- a->extent (col, X_AXIS)[LEFT]);
}
Real corr = abs (stem_posns.length ()/7.) <? 1.0;
corr *=
- robust_scm2double (me->get_grob_property ("stem-spacing-correction"), 1);
+ robust_scm2double (me->get_property ("stem-spacing-correction"), 1);
if (d != DOWN)
corr = 0.0;
Staff_spacing::bar_y_positions (Grob *bar_grob)
{
Interval bar_size;
- bar_size.set_empty();
+ bar_size.set_empty ();
if (Bar_line::has_interface (bar_grob))
{
- SCM glyph = bar_grob->get_grob_property ("glyph");
+ SCM glyph = bar_grob->get_property ("glyph");
- String glyph_string = gh_string_p (glyph) ? ly_scm2string (glyph) : "";
+ String glyph_string = scm_is_string (glyph) ? ly_scm2string (glyph) : "";
if (glyph_string.left_string (1) == "|" || glyph_string.left_string (1) == ".")
{
- SCM sz = Bar_line::get_staff_bar_size (bar_grob->self_scm());
- bar_size = Interval (-1,1);
+ SCM sz = Bar_line::get_staff_bar_size (bar_grob->self_scm ());
+ bar_size = Interval (-1, 1);
bar_size *= robust_scm2double (sz, 1)
/ Staff_symbol_referencer::staff_space (bar_grob);
}
Staff_spacing::next_notes_correction (Grob *me, Grob * last_grob)
{
Interval bar_size = bar_y_positions (last_grob);
- Real max_corr =0.0;
+ Real max_corr = 0.0;
- for (SCM s = me->get_grob_property ("right-items");
- gh_pair_p (s); s = gh_cdr (s))
+ for (SCM s = me->get_property ("right-items");
+ scm_is_pair (s); s = scm_cdr (s))
{
- Grob * g = unsmob_grob (gh_car (s));
+ Grob * g = unsmob_grob (scm_car (s));
max_corr = max_corr >? next_note_correction (me, g, bar_size);
- for (SCM t = g->get_grob_property ("elements");
- gh_pair_p (t); t = gh_cdr (t))
- max_corr = max_corr >? next_note_correction (me, unsmob_grob (gh_car (t)), bar_size);
+ for (SCM t = g->get_property ("elements");
+ scm_is_pair (t); t = scm_cdr (t))
+ max_corr = max_corr >? next_note_correction (me, unsmob_grob (scm_car (t)), bar_size);
}
*space = 1.0;
*fixed = 1.0;
- Grob * separation_item=0;
+ Grob * separation_item = 0;
Item * me_item = dynamic_cast<Item*> (me);
- for (SCM s = me->get_grob_property ("left-items");
- gh_pair_p (s); s = gh_cdr(s))
+ for (SCM s = me->get_property ("left-items");
+ scm_is_pair (s); s = scm_cdr (s))
{
- Grob * cand = unsmob_grob(gh_car (s));
+ Grob * cand = unsmob_grob (scm_car (s));
if (cand && Separation_item::has_interface (cand))
separation_item = cand ;
}
*fixed = last_ext[RIGHT];
*space = *fixed + 1.0;
- SCM alist = last_grob->get_grob_property ("space-alist");
+ SCM alist = last_grob->get_property ("space-alist");
if (!scm_list_p (alist))
return ;
if (me_item->break_status_dir () == CENTER)
{
SCM nndef = scm_sloppy_assq (ly_symbol2scm ("next-note"), alist);
- if (gh_pair_p (nndef))
+ if (scm_is_pair (nndef))
space_def = nndef;
}
- if (!gh_pair_p (space_def))
+ if (!scm_is_pair (space_def))
{
programming_error ("Unknown prefatory spacing. ");
return;
}
- space_def = gh_cdr (space_def);
- Real distance = gh_scm2double (gh_cdr (space_def));
- SCM type = gh_car (space_def) ;
+ space_def = scm_cdr (space_def);
+ Real distance = scm_to_double (scm_cdr (space_def));
+ SCM type = scm_car (space_def) ;
*fixed = last_ext[RIGHT];
if (type == ly_symbol2scm ("fixed-space"))
*fixed += distance / 2;
*space = *fixed + distance/2;
}
- else if (type == ly_symbol2scm("minimum-space"))
+ else if (type == ly_symbol2scm ("minimum-space"))
{
*space = last_ext[LEFT] + (last_ext.length () >? distance);
}
- else if (type == ly_symbol2scm("minimum-fixed-space"))
+ else if (type == ly_symbol2scm ("minimum-fixed-space"))
{
*space = last_ext[LEFT] + (last_ext.length () >? distance);
*fixed = *space;
}
-ADD_INTERFACE (Staff_spacing,"staff-spacing-interface",
- "",
+ADD_INTERFACE (Staff_spacing, "staff-spacing-interface",
+ "This object calculates spacing details from a "
+ " breakable symbol (left) to another object. For example, it takes care "
+ " of optical spacing from a bar lines to a note.",
"stem-spacing-correction left-items right-items");