source file of the GNU LilyPond music typesetter
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "paper-column.hh"
#include "system.hh"
#include "spring.hh"
#include "lookup.hh"
+#include "string-convert.hh"
Grob *
-Paper_column::clone (int count) const
+Paper_column::clone () const
{
- return new Paper_column (*this, count);
+ return new Paper_column (*this);
}
void
return (Paper_column *) (this);
}
-Paper_column::Paper_column (SCM l, Object_key const *key)
- : Item (l, key) // guh.?
+Paper_column::Paper_column (SCM l)
+ : Item (l)
{
system_ = 0;
rank_ = -1;
}
-Paper_column::Paper_column (Paper_column const &src, int count)
- : Item (src, count)
+Paper_column::Paper_column (Paper_column const &src)
+ : Item (src)
{
system_ = 0;
rank_ = src.rank_;
properties,
ly_string2scm (when));
Stencil t = *unsmob_stencil (scm_mol);
- t.add_at_edge (Y_AXIS, DOWN, *unsmob_stencil (when_mol), 0.1, 0.1);
+ t.add_at_edge (Y_AXIS, DOWN, *unsmob_stencil (when_mol), 0.1);
t.align_to (X_AXIS, CENTER);
t.align_to (Y_AXIS, DOWN);
Stencil l = Lookup::filled_box (Box (Interval (-0.01, 0.01),
Interval (-2, -1)));
-
-
- System * my_system = me->get_system ();
- int drank =
- me->get_rank ()
- - my_system->get_bound (LEFT)->get_column ()->get_rank ();
+ SCM small_letters = scm_cons (scm_acons (ly_symbol2scm ("font-size"),
+ scm_from_int (-6), SCM_EOL),
+ properties);
+
int j = 0;
for (SCM s = me->get_object ("ideal-distances");
scm_is_pair (s); s = scm_cdr (s))
{
Spring_smob *sp = unsmob_spring (scm_car (s));
+ if (!sp->other_->get_system ())
+ continue;
- Real y = -j * 0.1 -3;
+ j++;
+ Real y = -j * 1 -3;
vector<Offset> pts;
pts.push_back (Offset (0, y));
Stencil id_stencil = Lookup::points_to_line_stencil (0.1, pts);
Stencil head (musfont->find_by_name ("arrowheads.open.01"));
- head.translate (p2);
- id_stencil.add_stencil (head);
+
+ SCM distance_stc = Text_interface::interpret_markup (me->layout ()->self_scm (),
+ small_letters,
+ ly_string2scm (String_convert::form_string ("%5.2lf", sp->distance_)));
+
+ id_stencil.add_stencil (unsmob_stencil (distance_stc)->translated (Offset (sp->distance_/3, y+1)));
+ id_stencil.add_stencil (head.translated (p2));
id_stencil = id_stencil.in_color (0,0,1);
- l.add_stencil (id_stencil) ;
-
+ l.add_stencil (id_stencil);
}
for (SCM s = me->get_object ("minimum-distances");
scm_is_pair (s); s = scm_cdr (s))
{
- Grob *other = unsmob_grob (scm_caar (s));
Real dist = scm_to_double (scm_cdar (s));
+ Grob *other = unsmob_grob (scm_caar (s));
+ if (!other || other->get_system () != me->get_system ())
+ continue;
- Real y = -j * 0.1 -3.5;
+ j++;
+
+ Real y = -j * 1.0 -3.5;
vector<Offset> pts;
pts.push_back (Offset (0, y));
Stencil head (musfont->find_by_name ("arrowheads.open.0M1"));
head.translate_axis (y, Y_AXIS);
id_stencil.add_stencil (head);
-
+
+ SCM distance_stc = Text_interface::interpret_markup (me->layout ()->self_scm (),
+ small_letters,
+ ly_string2scm (String_convert::form_string ("%5.2lf",
+ dist)));
+
+ id_stencil.add_stencil (unsmob_stencil (distance_stc)->translated (Offset (dist/3, y-1)));
+
+
id_stencil = id_stencil.in_color (1,0,0);
l.add_stencil (id_stencil);
}