(c) 2001--2004 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]);
/*
{
SCM glyph = bar_grob->get_property ("glyph");
- String glyph_string = ly_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 ());
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_property ("right-items");
- ly_pair_p (s); s = ly_cdr (s))
+ scm_is_pair (s); s = scm_cdr (s))
{
- Grob * g = unsmob_grob (ly_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_property ("elements");
- ly_pair_p (t); t = ly_cdr (t))
- max_corr = max_corr >? next_note_correction (me, unsmob_grob (ly_car (t)), bar_size);
+ 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_property ("left-items");
- ly_pair_p (s); s = ly_cdr (s))
+ scm_is_pair (s); s = scm_cdr (s))
{
- Grob * cand = unsmob_grob (ly_car (s));
+ Grob * cand = unsmob_grob (scm_car (s));
if (cand && Separation_item::has_interface (cand))
separation_item = cand ;
}
if (me_item->break_status_dir () == CENTER)
{
SCM nndef = scm_sloppy_assq (ly_symbol2scm ("next-note"), alist);
- if (ly_pair_p (nndef))
+ if (scm_is_pair (nndef))
space_def = nndef;
}
- if (!ly_pair_p (space_def))
+ if (!scm_is_pair (space_def))
{
programming_error ("Unknown prefatory spacing. ");
return;
}
- space_def = ly_cdr (space_def);
- Real distance = ly_scm2double (ly_cdr (space_def));
- SCM type = ly_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"))