TODO
Glissando
*/
-
+#include <math.h>
#include <ctype.h>
#include "lookup.hh"
#include "debug.hh"
#include "dimensions.hh"
-#include "scalar.hh"
+
#include "paper-def.hh"
#include "string-convert.hh"
#include "file-path.hh"
#include "main.hh"
#include "lily-guile.hh"
-#include "all-fonts.hh"
+#include "all-font-metrics.hh"
#include "afm.hh"
#include "scope.hh"
#include "molecule.hh"
}
-Molecule
-Lookup::accidental (int j, bool cautionary) const
-{
- Molecule m(afm_find (String ("accidentals-") + to_str (j)));
- if (cautionary)
- {
- Molecule open = afm_find (String ("accidentals-("));
- Molecule close = afm_find (String ("accidentals-)"));
- m.add_at_edge(X_AXIS, LEFT, Molecule(open), 0);
- m.add_at_edge(X_AXIS, RIGHT, Molecule(close), 0);
- }
- return m;
-}
-
Molecule
{
if (!afm_l_)
{
- Lookup * me = (Lookup*)(this);
+ Lookup * me = (Lookup*)(this);
me->afm_l_ = all_fonts_global_p->find_afm (font_name_);
if (!me->afm_l_)
{
- warning (_f("Can't open `%s'\n", font_name_));
- warning (_f("Search path %s\n", global_path.str ().ch_C()));
- error (_f("Aborting"));
+ warning (_f ("Can't find font: `%s'", font_name_));
+ warning (_f ("(search path: `%s')", global_path.str ().ch_C()));
+ error (_ ("Aborting"));
}
}
Adobe_font_char_metric cm = afm_l_->find_char (s, warn);
{
/*
don't want people relying on this kind of dimension.
- */
+ */
m.set_empty (false);
return m;
}
- Atom at (gh_list (char_scm_sym,
+ Atom at (gh_list (ly_symbol2scm ("char"),
gh_int2scm (cm.code ()),
SCM_UNDEFINED));
- at.font_ = ly_symbol (font_name_.ch_C());
- at.magn_ = gh_int2scm (0);
-
+
+ at.fontify (afm_l_);
m.dim_ = cm.dimensions();
m.add_atom (&at);
return m;
}
-Molecule
-Lookup::notehead (int j, String type) const
-{
- if (j > 2)
- j = 2;
-
- return afm_find (String ("noteheads-") + to_str (j) + type);
-}
-
Molecule
Lookup::simple_bar (String type, Real h, Paper_def* paper_l) const
{
- SCM thick = ly_symbol ("barthick_" + type);
+ SCM thick = ly_symbol2scm (("barthick_" + type).ch_C());
Real w = 0.0;
if (paper_l->scope_p_->elem_b (thick))
Lookup::bar (String str, Real h, Paper_def *paper_l) const
{
if (str == "bracket")
- return staff_bracket (h);
+ return staff_bracket (h, paper_l);
else if (str == "brace")
{
Real staffht = paper_l->get_var ("staffheight");
Molecule m;
Atom at
- (gh_list (beam_scm_sym,
- gh_double2scm (width),
- gh_double2scm (slope),
- gh_double2scm (thick),
- SCM_UNDEFINED));
+ (gh_list (ly_symbol2scm ("beam"),
+ gh_double2scm (width),
+ gh_double2scm (slope),
+ gh_double2scm (thick),
+ SCM_UNDEFINED));
m.dim_[X_AXIS] = Interval (0, width);
m.dim_[Y_AXIS] = Interval (min_y, max_y);
return m;
}
-Molecule
-Lookup::clef (String st) const
-{
- return afm_find (String ("clefs-" + st));
-}
-
SCM
offset2scm (Offset o)
{
}
Atom at
- (gh_list (ly_symbol ("dashed-slur"),
+ (gh_list (ly_symbol2scm ("dashed-slur"),
gh_double2scm (thick),
gh_double2scm (dash),
ly_quote_scm (array_to_list (sc, 4)),
return m;
}
-Molecule
-Lookup::dots () const
-{
- return afm_find (String ("dots-dot"));
-}
return m;
}
-Molecule
-Lookup::rest (int j, bool o, String style) const
-{
- return afm_find (String ("rests-") + to_str (j) + (o ? "o" : "") + style);
-}
Molecule
{
Molecule m;
- Atom at (gh_list (filledbox_scm_sym,
+ Atom at (gh_list (ly_symbol2scm ("filledbox"),
gh_double2scm (-b[X_AXIS][LEFT]),
gh_double2scm (b[X_AXIS][RIGHT]),
gh_double2scm (-b[Y_AXIS][DOWN]),
return m;
}
+/*
+ TODO: THIS IS UGLY. Since the user has direct access to TeX
+ strings, we try some halfbaked attempt to detect TeX trickery.
+ */
+String
+sanitise_TeX_string (String text)
+{
+ int brace_count =0;
+ for (int i= 0; i < text.length_i (); i++)
+ {
+ if (text[i] == '\\')
+ continue;
+
+ if (text[i] == '{')
+ brace_count ++;
+ else if (text[i] == '}')
+ brace_count --;
+ }
+
+ if(brace_count)
+ {
+ warning (_f ("Non-matching braces in text `%s', adding braces", text.ch_C()));
+ if (brace_count < 0)
+ {
+ text = to_str ('{', -brace_count) + text;
+ }
+ else
+ {
+ text = text + to_str ('}', brace_count);
+ }
+ }
+
+ return text;
+}
/**
- 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};
+ TODO!
+ */
+String
+sanitise_PS_string (String t)
+{
+ return t;
+}
/**
- TODO: THIS IS UGLY. Since the user has direct access to TeX
- strings, we try some halfbaked attempt to detect TeX trickery.
*/
Molecule
{
font_h = paper_l->get_var ("font_" + style);
}
-
+
+
if (paper_l->scope_p_->elem_b ("magnification_" + style))
{
font_mag = (int)paper_l->get_var ("magnification_" + style);
/*
UGH.
*/
- SCM l = gh_eval_str (("(style-to-cmr \"" + style + "\")").ch_C());
+ SCM l = ly_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;
- Interval ydims (0,0);
-
- Font_metric* afm_l = all_fonts_global_p->find_font (style);
- DOUT << "\nChars: ";
-
-
- int brace_count =0;
- for (int i = 0; i < text.length_i (); i++)
- {
-
- if (text[i]=='\\')
- {
- for (i++; (i < text.length_i ()) && isalpha(text[i]); i++)
- ;
- i--; // Compensate for the increment in the outer loop!
- }
- else
- {
- if (text[i] == '{')
- brace_count ++;
- else if (text[i] == '}')
- brace_count --;
- Character_metric *c = afm_l->get_char ((unsigned char)text[i],false);
-
- w += c->dimensions()[X_AXIS].length ();
- ydims.unite (c->dimensions()[Y_AXIS]);
- }
+ style = ly_scm2string (gh_cdr(l)) +to_str ((int)font_h);
}
- if (font_mag > 1 && font_mag < 7 )
- {
- /* UGH */
- w *= mag_steps[font_mag];
- ydims *= mag_steps[font_mag];
- }
+
- if(brace_count)
- {
- warning (_f ("Non-matching braces in text `%s', adding braces.", text.ch_C()));
-
- if (brace_count < 0)
- {
- text = to_str ('{', -brace_count) + text;
- }
- else
- {
- text = text + to_str ('}', brace_count);
- }
- }
+ Font_metric* metric_l = 0;
+ if (font_mag)
+ metric_l = all_fonts_global_p->find_scaled (style, font_mag);
+ else
+ metric_l = all_fonts_global_p->find_font (style);
- DOUT << "\n" << to_str (w) << "\n";
- m.dim_.x () = Interval (0, w);
- m.dim_.y () = ydims;
-
- Atom at (gh_list (text_scm_sym,
- gh_str02scm (text.ch_C()),
+ if (output_global_ch == "tex")
+ text = sanitise_TeX_string (text);
+ else if (output_global_ch == "ps")
+ text = sanitise_PS_string (text);
+
+ m.dim_ = metric_l->text_dimension (text);
+
+ Atom at (gh_list (ly_symbol2scm ("text"),
+ ly_str02scm (text.ch_C()),
SCM_UNDEFINED));
- at.font_ = ly_symbol (style);
- at.magn_ = gh_int2scm (font_mag);
+ at.fontify (metric_l);
m.add_atom (&at);
return m;
}
+
+
Molecule
Lookup::time_signature (int num, int den, Paper_def *paper_l) const
{
Lookup::staff_brace (Real y, int staff_size) const
{
Molecule m;
- /*
- (define (pianobrace y staffht)
- (let* ((step 1.0)
- (minht (* 2 staffht))
- (maxht (* 7 minht))
- )
- (string-append
- (select-font (string-append "feta-braces" (number->string (inexact->exact staffht))) 0)
- (char (max 0 (/ (- (min y (- maxht step)) minht) step))))
- )
- )
- */
Real step = 1.0;
int minht = 2 * staff_size;
int maxht = 7 * minht;
int idx = int (((maxht - step) <? y - minht) / step);
idx = idx >? 0;
-
- SCM f = ly_symbol (String ("feta-braces" + to_str (staff_size)));
- SCM e =gh_list (char_scm_sym, gh_int2scm (idx), SCM_UNDEFINED);
+
+
+ String nm = String ("feta-braces" + to_str (staff_size));
+ SCM e =gh_list (ly_symbol2scm ("char"), gh_int2scm (idx), SCM_UNDEFINED);
Atom at (e);
- at.font_ = f;
+
+ at.fontify (all_fonts_global_p->find_font (nm));
m.dim_[Y_AXIS] = Interval (-y/2,y/2);
m.dim_[X_AXIS] = Interval (0,0);
return m;
}
-Molecule
-Lookup::hairpin (Real width, Real height, Real thick, bool decresc, bool continued) const
-{
- Molecule m;
- String hairpin = String (decresc ? "de" : "") + "crescendo";
- Atom at (gh_list (ly_symbol (hairpin),
- gh_double2scm (thick),
- 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);
-
- m.add_atom (&at);
- return m;
-}
Molecule
-Lookup::tuplet_bracket (Real dy , Real dx, Real thick, Real gap, Real interline_f, Direction dir) const
+Lookup::tuplet_bracket (Real dy , Real dx, Real thick, Real gap,
+ Real height, Direction dir) const
{
Molecule m;
- Atom at (gh_list(tuplet_scm_sym,
- gh_double2scm (interline_f),
+ Atom at (gh_list(ly_symbol2scm ("tuplet"),
+ gh_double2scm (height),
gh_double2scm (gap),
gh_double2scm (dx),
gh_double2scm (dy),
scontrols[i] = offset2scm (controls[indices[i]]);
- Atom at (gh_list (ly_symbol ("bezier-sandwich"),
+ Atom at (gh_list (ly_symbol2scm ("bezier-sandwich"),
ly_quote_scm (array_to_list (scontrols, 8)),
gh_double2scm (linethick),
SCM_UNDEFINED));
}
Molecule
-Lookup::staff_bracket (Real y) const
+Lookup::staff_bracket (Real height, Paper_def* paper_l) const
{
- Molecule m;
- Atom at ( gh_list (bracket_scm_sym,
- gh_double2scm (y),
- SCM_UNDEFINED));
+ Molecule m;
+ Atom at ( gh_list (ly_symbol2scm ("bracket"),
+ gh_double2scm (paper_l->get_var("bracket_arch_angle")),
+ gh_double2scm (paper_l->get_var("bracket_arch_width")),
+ gh_double2scm (paper_l->get_var("bracket_arch_height")),
+ gh_double2scm (paper_l->get_var("bracket_width")),
+ gh_double2scm (height),
+ gh_double2scm (paper_l->get_var("bracket_arch_thick")),
+ gh_double2scm (paper_l->get_var("bracket_thick")),
+ SCM_UNDEFINED));
+
m.add_atom (&at);
- m.dim_[Y_AXIS] = Interval (-y/2,y/2);
+ m.dim_[Y_AXIS] = Interval (-height/2,height/2);
m.dim_[X_AXIS] = Interval (0,4 PT);
m.translate_axis (- 4. / 3. * m.dim_[X_AXIS].length (), X_AXIS);
{
Molecule m;
- Atom at (gh_list (volta_scm_sym,
+ Atom at (gh_list (ly_symbol2scm ("volta"),
gh_double2scm (h),
gh_double2scm (w),
gh_double2scm (thick),
Lookup::accordion (SCM s, Real interline_f) const
{
Molecule m;
- String sym = ly_scm2string(SCM_CAR(s));
- String reg = ly_scm2string(SCM_CAR(SCM_CDR(s)));
+ String sym = ly_scm2string(gh_car (s));
+ String reg = ly_scm2string(gh_car (gh_cdr(s)));
if (sym == "Discant")
{
}
return m;
}
+
projects / lilypond.git / blobdiff