source file of the GNU LilyPond music typesetter
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
TODO
Glissando
+
+ merge rulesym and filledbox.
*/
#include <ctype.h>
#include "scope.hh"
#include "molecule.hh"
#include "atom.hh"
+#include "lily-guile.hh"
SCM
array_to_list (SCM *a , int l)
{
warning (_f("Can't open `%s'\n", font_name_));
warning (_f("Search path %s\n", global_path.str ().ch_C()));
+ error (_f("Aborting"));
}
}
Adobe_font_char_metric cm = afm_l_->find_char (s, warn);
Molecule m;
if (cm.code () < 0)
- return m;
-
- Atom at (gh_list (ly_symbol ("char"),
+ {
+ /*
+ don't want people relying on this kind of dimension.
+ */
+ m.set_empty (false);
+ return m;
+ }
+
+ Atom at (gh_list (char_scm_sym,
gh_int2scm (cm.code ()),
SCM_UNDEFINED));
at.font_ = ly_symbol (font_name_.ch_C());
}
Molecule
-Lookup::ball (int j) const
+Lookup::notehead (int j, String type) const
{
if (j > 2)
j = 2;
- return afm_find (String ("noteheads-") + to_str (j));
+ return afm_find (String ("noteheads-") + to_str (j) + type);
}
Molecule
{
return fill (Box (Interval(0, 0), Interval (-h/2, h/2)));
}
+ if (str == "scorepostbreak")
+ {
+ return simple_bar ("score", h);
+ }
else if (str == "|")
{
return thin;
Molecule m;
Atom at
- (gh_list (ly_symbol ("beam"),
+ (gh_list (beam_scm_sym,
gh_double2scm (width),
gh_double2scm (slope),
gh_double2scm (thick),
}
Atom at
- (gh_list (ly_symbol ("dashed-slur"),
- gh_double2scm (thick),
- gh_double2scm (dash),
- ly_quote_scm (array_to_list (sc, 4)),
- SCM_UNDEFINED));
+ (gh_list (ly_symbol ("dashed-slur"),
+ gh_double2scm (thick),
+ gh_double2scm (dash),
+ ly_quote_scm (array_to_list (sc, 4)),
+ SCM_UNDEFINED));
m.add_atom (&at);
}
Molecule
-Lookup::rest (int j, bool o) const
+Lookup::rest (int j, bool o, String style) const
{
- return afm_find (String ("rests-") + to_str (j) + (o ? "o" : ""));
+ return afm_find (String ("rests-") + to_str (j) + (o ? "o" : "") + style);
}
Molecule
Lookup::rule_symbol (Real height, Real width) const
{
- Atom at (gh_list (ly_symbol ("rulesym"),
- gh_double2scm (height),
- gh_double2scm (width),
- SCM_UNDEFINED));
+ Atom at (gh_list (rulesym_scm_sym,
+ gh_double2scm (height),
+ gh_double2scm (width),
+ SCM_UNDEFINED));
Molecule m;
m.dim_.x () = Interval (0, width);
return m;
}
-Molecule
-Lookup::script (String str) const
-{
- return afm_find (String ("scripts-") + str);
-}
-
Molecule
Lookup::special_time_signature (String s, int n, int d) const
{
String symbolname = "timesig-" + s + to_str (n) + "/" + to_str (d);
Molecule m = afm_find (symbolname, false);
- if (!m.dim_[X_AXIS].empty_b ())
+ if (!m.empty_b())
return m;
// Second guess: s contains the full signature name
m = afm_find ("timesig-"+s, false);
- if (!m.dim_[X_AXIS].empty_b ())
+ if (!m.empty_b ())
return m;
// Resort to default layout with numbers
{
Molecule m;
- Atom at (gh_list (ly_symbol ("filledbox"),
- gh_double2scm (-b[X_AXIS][LEFT]),
- gh_double2scm (b[X_AXIS][RIGHT]),
- gh_double2scm (-b[Y_AXIS][DOWN]),
- gh_double2scm (b[Y_AXIS][UP]),
- SCM_UNDEFINED));
+ Atom at (gh_list (filledbox_scm_sym,
+ gh_double2scm (-b[X_AXIS][LEFT]),
+ gh_double2scm (b[X_AXIS][RIGHT]),
+ gh_double2scm (-b[Y_AXIS][DOWN]),
+ gh_double2scm (b[Y_AXIS][UP]),
+ SCM_UNDEFINED));
m.dim_ = b;
m.add_atom (&at);
}
-static Dict_initialiser<char const*> cmr_init[] = {
- {"bold", "cmbx"},
- {"dynamic", "feta-din"},
- {"finger", "feta-nummer"},
- {"italic", "cmti"},
- {"roman", "cmr"},
- {"large", "cmbx"},
- {"Large", "cmbx"},
- {"mark", "feta-nummer"},
- {"number", "feta-nummer"},
- {0,0}
-};
-static Dictionary<char const *> cmr_dict (cmr_init);
+/**
+ Magnification steps. These are powers of 1.2. The numbers are
+ taken from Knuth's plain.tex: */
+static Real mag_steps[] = {1, 1, 1.200, 1.440, 1.7280, 2.074, 2.488};
+
+
Molecule
Lookup::text (String style, String text) const
{
Molecule m;
+ if (style.empty_b ())
+ style = "roman";
-
+ int font_mag = 1;
Real font_h = paper_l_->get_var ("font_normal");
if (paper_l_->scope_p_->elem_b ("font_" + style))
{
font_h = paper_l_->get_var ("font_" + style);
}
- if (cmr_dict.elem_b (style))
+ if (paper_l_->scope_p_->elem_b ("magnification_" + style))
{
- style = String (cmr_dict [style]) + to_str ((int)font_h); // ugh
+ font_mag = (int)paper_l_->get_var ("magnification_" + style);
+ }
+
+ /*
+ UGH.
+ */
+ SCM l = gh_eval_str (("(style-to-cmr \"" + style + "\")").ch_C());
+ if (l != SCM_BOOL_F)
+ {
+ style = ly_scm2string (SCM_CDR(l)) +to_str ((int)font_h);
}
Real w = 0;
;
else
{
- Character_metric *c = afm_l->get_char (text[i],false);
+ Character_metric *c = afm_l->get_char ((unsigned char)text[i],false);
+
w += c->dimensions()[X_AXIS].length ();
ydims.unite (c->dimensions()[Y_AXIS]);
}
}
+ if (font_mag > 1 && font_mag < 7 )
+ {
+ /* UGH */
+ style = style + String(" scaled \\magstep ") + to_str (font_mag);
+ w *= mag_steps[font_mag];
+ ydims *= mag_steps[font_mag];
+ }
+
DOUT << "\n" << to_str (w) << "\n";
m.dim_.x () = Interval (0, w);
m.dim_.y () = ydims;
- Atom at (gh_list (ly_symbol ("text"),
+
+
+ Atom at (gh_list (text_scm_sym,
gh_str02scm (text.ch_C()),
SCM_UNDEFINED));
at.font_ = ly_symbol (style);
}
-/*
- */
Molecule
Lookup::time_signature (int num, int den) const
{
String sty = "number";
Molecule n (text (sty, to_str (num)));
Molecule d (text (sty, to_str (den)));
- n.do_center (X_AXIS);
- d.do_center (X_AXIS);
+ n.align_to (X_AXIS, CENTER);
+ d.align_to (X_AXIS, CENTER);
Molecule m;
if (den)
{
else
{
m = n;
- m.do_center (Y_AXIS);
+ m.align_to (Y_AXIS, CENTER);
}
return m;
}
{
Molecule m;
- Atom at (gh_list (ly_symbol ("pianobrace"),
- gh_double2scm (y),
- SCM_UNDEFINED
- ));
+ Atom at (gh_list (pianobrace_scm_sym,
+ gh_double2scm (y),
+ SCM_UNDEFINED
+ ));
m.dim_[Y_AXIS] = Interval (-y/2,y/2);
m.dim_[X_AXIS] = Interval (0,0);
String hairpin = String (decresc ? "de" : "") + "crescendo";
Atom at (gh_list (ly_symbol (hairpin),
- gh_double2scm (width),
- gh_double2scm (height),
- gh_double2scm (continued ? height/2 : 0.0),
- SCM_UNDEFINED));
+ gh_double2scm (width),
+ gh_double2scm (height),
+ gh_double2scm (continued ? height/2 : 0.0),
+ SCM_UNDEFINED));
m.dim_.x () = Interval (0, width);
m.dim_.y () = Interval (-2*height, 2*height);
Lookup::plet (Real dy , Real dx, Direction dir) const
{
Molecule m;
- SCM thick = ly_symbol ("tuplet_thick");
+ SCM thick = tuplet_thick_scm_sym;
Real t = 0.1 PT;
if (paper_l_->scope_p_->elem_b (thick))
{
t = paper_l_->get_realvar (thick);
}
-
- Atom at (gh_list(ly_symbol ("tuplet"),
- gh_double2scm (dx),
- gh_double2scm (dy),
- gh_double2scm (t),
- gh_int2scm (dir),
- SCM_UNDEFINED));
-m.add_atom (&at);
+
+ Real interline_f = paper_l_->get_realvar (interline_scm_sym);
+ Atom at (gh_list(tuplet_scm_sym,
+ gh_double2scm (interline_f),
+ gh_double2scm (dx),
+ gh_double2scm (dy),
+ gh_double2scm (t),
+ gh_int2scm (dir),
+ SCM_UNDEFINED));
+ m.add_atom (&at);
return m;
}
Atom at (gh_list (ly_symbol ("bezier-sandwich"),
- ly_quote_scm (array_to_list (scontrols, 8)),
- SCM_UNDEFINED));
+ ly_quote_scm (array_to_list (scontrols, 8)),
+ SCM_UNDEFINED));
m.dim_[X_AXIS] = Interval (0, delta_off[X_AXIS]);
m.dim_[Y_AXIS] = Interval (0 <? delta_off[Y_AXIS], 0 >? delta_off[Y_AXIS]);
Lookup::staff_bracket (Real y) const
{
Molecule m;
- Atom at ( gh_list (ly_symbol ("bracket"),
- gh_double2scm (y),
- SCM_UNDEFINED));
+ Atom at ( gh_list (bracket_scm_sym,
+ gh_double2scm (y),
+ SCM_UNDEFINED));
m.add_atom (&at);
m.dim_[Y_AXIS] = Interval (-y/2,y/2);
m.dim_[X_AXIS] = Interval (0,4 PT);
Lookup::volta (Real w, bool last_b) const
{
Molecule m;
- SCM thick = ly_symbol ("volta_thick");
+ SCM thick = volta_thick_scm_sym;
Real t = 0.1 PT;
if (paper_l_->scope_p_->elem_b (thick))
{
t = paper_l_->get_realvar (thick);
}
- Atom at (gh_list (ly_symbol ("volta"),
- gh_double2scm (w),
- gh_double2scm (t),
- gh_int2scm (last_b),
- SCM_UNDEFINED));
+ Atom at (gh_list (volta_scm_sym,
+ gh_double2scm (w),
+ gh_double2scm (t),
+ gh_int2scm (last_b),
+ SCM_UNDEFINED));
- Real interline_f = paper_l_->interline_f ();
+ Real interline_f = paper_l_->get_realvar (interline_scm_sym);
m.dim_[Y_AXIS] = Interval (-interline_f, interline_f);
m.dim_[X_AXIS] = Interval (0, w);
}
-Molecule
-Lookup::special_ball (int j, String kind_of_ball) const
-{
- if (j > 2)
- j = 2;
-
- return afm_find (String ("noteheads-") + kind_of_ball);
-}
-
projects / lilypond.git / blobdiff