patch::: 1.1.37.mb1: Re: LilyPond 1.1.37

[lilypond.git] / lily / lookup.cc

diff --git a/lily/lookup.cc b/lily/lookup.cc
index dcbafb39755c466843a26141766fe99a64929e56..9458b672d19f840847a0ef8a5794e097796084b5 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -26,6 +26,7 @@
 #include "scope.hh"
 #include "molecule.hh"
 #include "atom.hh"
+#include "lily-guile.hh"
 
 SCM
 array_to_list (SCM *a , int l)
@@ -109,7 +110,7 @@ Lookup::afm_find (String s, bool warn) const
   if (cm.code () < 0)
     return m;
     
-  Atom at (gh_list (ly_symbol ("char"),
+  Atom at (gh_list (char_scm_sym,
                    gh_int2scm (cm.code ()),
                    SCM_UNDEFINED));
   at.font_ = ly_symbol (font_name_.ch_C());
@@ -119,12 +120,12 @@ Lookup::afm_find (String s, bool warn) const
 }
 
 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
@@ -161,6 +162,10 @@ Lookup::bar (String str, Real h) const
     {
       return fill (Box (Interval(0, 0), Interval (-h/2, h/2)));
     }
+  if (str == "scorepostbreak")
+    {
+      return simple_bar ("score", h);
+    }
   else if (str == "|")
     {
       return thin;
@@ -218,7 +223,7 @@ Lookup::beam (Real slope, Real width, Real thick) const
   
   Molecule m;
   Atom at
-     (gh_list (ly_symbol ("beam"),
+     (gh_list (beam_scm_sym,
                                gh_double2scm (width),
                                gh_double2scm (slope),
                                gh_double2scm (thick),
@@ -300,15 +305,15 @@ Lookup::flag (int j, Direction d) const
 }
 
 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"),
+  Atom at  (gh_list (rulesym_scm_sym,
                                         gh_double2scm (height),
                                         gh_double2scm (width),
                                         SCM_UNDEFINED));
@@ -335,12 +340,12 @@ 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
@@ -352,7 +357,7 @@ Lookup::filledbox (Box b ) const
 {
   Molecule m;
   
-  Atom at  (gh_list (ly_symbol ("filledbox"),
+  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]),
@@ -379,38 +384,35 @@ Lookup::stem (Real y1, Real y2) const
 }
 
 
-static Dict_initialiser<char const*> cmr_init[] = {
-  {"bold", "cmbx"},
-  {"dynamic", "feta-din"},
-  {"finger", "feta-nummer"},
-  {"typewriter", "cmtt"},
-  {"italic", "cmti"},
-  {"roman", "cmr"},
-  {"large", "cmbx"},
-  {"Large", "cmbx"},
-  {"mark", "feta-nummer"},
-  {"number", "feta-nummer"},
-  {"volta", "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;
   
-
+  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);
+    }
+
+  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;
@@ -426,16 +428,27 @@ Lookup::text (String style, String text) const
          ;
       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);
@@ -474,7 +487,7 @@ Lookup::staff_brace (Real y) const
 {
   Molecule m;
   
-  Atom at  (gh_list (ly_symbol ("pianobrace"),
+  Atom at  (gh_list (pianobrace_scm_sym,
                       gh_double2scm (y),
                       SCM_UNDEFINED
                       ));
@@ -508,14 +521,14 @@ Molecule
 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"),
+  Atom at  (gh_list(tuplet_scm_sym,
                      gh_double2scm (dx),
                      gh_double2scm (dy),
                      gh_double2scm (t),
@@ -556,7 +569,7 @@ Molecule
 Lookup::staff_bracket (Real y) const
 {
   Molecule m; 
-  Atom at  ( gh_list (ly_symbol ("bracket"),
+  Atom at  ( gh_list (bracket_scm_sym,
                        gh_double2scm (y),
                        SCM_UNDEFINED));
   m.add_atom (&at);                             
@@ -571,19 +584,19 @@ Molecule
 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"),
+  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);
@@ -593,12 +606,3 @@ Lookup::volta (Real w, bool last_b) const
 }
 
 
-Molecule
-Lookup::special_ball (int j, String kind_of_ball) const
-{
-  if (j > 2)
-    j = 2;
-
-  return afm_find (String ("noteheads-") + kind_of_ball);
-}
-