lilypond-0.1.9

diff --git a/lib/include/duration-convert.hh b/lib/include/duration-convert.hh
index 3f34a7650b4816fa0f630a34d20a59abc808d079..d321c4598edd11edc388131db5ec2ac828240dae 100644 (file)
--- a/lib/include/duration-convert.hh
+++ b/lib/include/duration-convert.hh
@@ -1,4 +1,3 @@
-
 /*
          duration-convert.hh -- declare 
 
@@ -51,6 +50,13 @@ struct Duration_convert {
     /// Return number of ticks in (ticks, division_1) representation
     static int dur2ticks_i( Duration dur );
        
+    /// Return the type_i representation of note length i
+    static int i2_type(int i);
+
+    /// Return the note length corresponding to the type_i representation
+    /// Return 0 if longer than whole note.
+    static int type2_i(int type);
+
     /// Return Moment representation (fraction of whole note).
     static Moment dur2_mom( Duration dur );
 

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 6cdf8356048a416e8105f717123e8bcfec2df9fc..18407dece2e63f86c6d32713d720a77e9d682ebc 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -22,51 +22,51 @@
 
 Lookup::Lookup()
 {
-    paper_l_ = 0;
-    texsetting = "\\unknowntexsetting";
-    symtables_ = new Symtables;
+  paper_l_ = 0;
+  texsetting = "\\unknowntexsetting";
+  symtables_ = new Symtables;
 }
 
 Lookup::Lookup (Lookup const &s)
 {
-    paper_l_ = s.paper_l_;
-    texsetting = s.texsetting;
-    symtables_ = new Symtables (*s.symtables_);
+  paper_l_ = s.paper_l_;
+  texsetting = s.texsetting;
+  symtables_ = new Symtables (*s.symtables_);
 }
 Lookup::~Lookup()
 {
-    delete symtables_;
+  delete symtables_;
 }
 
 void
 Lookup::add (String s, Symtable*p)
 {
-    symtables_->add (s, p);
+  symtables_->add (s, p);
 }
 
 void
 Lookup::print()const
 {
-    #ifndef NPRINT
-    DOUT << "Lookup: " << texsetting << " {\n";
-    symtables_->print();
-    DOUT << "}\n";
-    #endif
+  #ifndef NPRINT
+  DOUT << "Lookup: " << texsetting << " {\n";
+  symtables_->print();
+  DOUT << "}\n";
+  #endif
 }
 
 Symbol
 Lookup::text (String style, String text, int dir) const
 {
-    Array<String> a;
+  Array<String> a;
  
-    a.push (text);
-    Symbol tsym =  (*symtables_)("style")->lookup (style);
-    a[0] = substitute_args (tsym.tex,a);
-
-    Symbol s = (*symtables_)("align")->lookup (dir);
-    s.tex = substitute_args (s.tex,a);
-    s.dim = tsym.dim;
-    return s;
+  a.push (text);
+  Symbol tsym =  (*symtables_)("style")->lookup (style);
+  a[0] = substitute_args (tsym.tex,a);
+
+  Symbol s = (*symtables_)("align")->lookup (dir);
+  s.tex = substitute_args (s.tex,a);
+  s.dim = tsym.dim;
+  return s;
 }
 
 
@@ -74,170 +74,175 @@ Lookup::text (String style, String text, int dir) const
 Symbol
 Lookup::ball (int j) const
 {
-    if (j > 4)
-       j = 4;
+  if (j > 2)
+       j = 2;
 
-    Symtable * st = (*symtables_)("balls");
-    return st->lookup (String (j));
+  Symtable * st = (*symtables_)("balls");
+  return st->lookup (String (j));
 }
 
 Symbol
 Lookup::rest (int j, bool o) const
 {
-    return (*symtables_)("rests")->lookup (String (j) + (o ? "o" : ""));
+  return (*symtables_)("rests")->lookup (String (j) + (o ? "o" : ""));
 }
 
 Symbol
 Lookup::fill (Box b) const
 {
-    Symbol s ((*symtables_)("param")->lookup ("fill"));
-    s.dim = b;
-    return s;
+  Symbol s ((*symtables_)("param")->lookup ("fill"));
+  s.dim = b;
+  return s;
 }
 
 Symbol
 Lookup::accidental (int j) const
 {
-    return (*symtables_)("accidentals")->lookup (String (j));
+  return (*symtables_)("accidentals")->lookup (String (j));
 }
 
 
 Symbol
 Lookup::bar (String s, Real h) const
 {
-    Array<String> a;
-    a.push (print_dimen (h));
-    Symbol ret=(*symtables_)("bars")->lookup (s);;
-    ret.tex = substitute_args (ret.tex, a);
-    ret.dim.y() = Interval (0, h);
-    return ret;
+  Array<String> a;
+  a.push (print_dimen (h));
+  Symbol ret=(*symtables_)("bars")->lookup (s);;
+  ret.tex = substitute_args (ret.tex, a);
+  ret.dim.y() = Interval (0, h);
+  return ret;
 }
 
 Symbol
 Lookup::script (String s) const
 {
-    return (*symtables_)("scripts")->lookup (s);
+  return (*symtables_)("scripts")->lookup (s);
 }
 
 Symbol
 Lookup::dynamic (String s) const
 {
-    return (*symtables_)("dynamics")->lookup (s);
+  return (*symtables_)("dynamics")->lookup (s);
 }
 
 Symbol
 Lookup::clef (String s) const
 {
-    return (*symtables_)("clefs")->lookup (s);
+  return (*symtables_)("clefs")->lookup (s);
 }
  
 Symbol
 Lookup::dots (int j) const
 {
-    if (j>3) {
+  if (j>3) 
+    {
        j = 3;
        warning ("max 3 dots"); // todo
     }
-    return (*symtables_)("dots")->lookup (j);
+  return (*symtables_)("dots")->lookup (j);
 }
 
 Symbol
 Lookup::flag (int j) const
 {
-    return (*symtables_)("flags")->lookup (j);
+  return (*symtables_)("flags")->lookup (j);
 }
 
 Symbol
 Lookup::streepjes (int i) const
 {
-    assert (i);
-    
-    int arg;
-    String idx;
-    
-    if (i < 0) {
+  assert (i);
+  
+  int arg;
+  String idx;
+  
+  if (i < 0) 
+    {
        idx = "botlines";
        arg = -i;
-    } else {
+    }
+  else 
+    {
        arg = i;
        idx = "toplines";
     }
-    Symbol ret = (*symtables_)("streepjes")->lookup (idx);
-    
-    Array<String> a;
-    a.push (arg);
-    ret.tex = substitute_args (ret.tex, a);
+  Symbol ret = (*symtables_)("streepjes")->lookup (idx);
+  
+  Array<String> a;
+  a.push (arg);
+  ret.tex = substitute_args (ret.tex, a);
 
-    return ret;
+  return ret;
 }
 
 Symbol
 Lookup::hairpin (Real &wid, bool decresc) const
 {
-    int idx = int (rint (wid / 6 PT));
-    if (!idx) idx ++;
-    wid = idx*6 PT;
-    String idxstr = (decresc)? "decrescendosym" : "crescendosym";
-    Symbol ret=(*symtables_)("param")->lookup (idxstr);
-       
-    Array<String> a;
-    a.push (idx);
-    ret.tex = substitute_args (ret.tex, a);
-    ret.dim.x() = Interval (0,wid);
-    return ret;
+  int idx = int (rint (wid / 6 PT));
+  if (!idx) idx ++;
+  wid = idx*6 PT;
+  String idxstr = (decresc)? "decrescendosym" : "crescendosym";
+  Symbol ret=(*symtables_)("param")->lookup (idxstr);
+     
+  Array<String> a;
+  a.push (idx);
+  ret.tex = substitute_args (ret.tex, a);
+  ret.dim.x() = Interval (0,wid);
+  return ret;
 }
 
 Symbol
 Lookup::linestaff (int lines, Real wid) const
 {
-    Real internote_f = paper_l_ ->internote_f();
-    Symbol s;
-    Real dy = (lines >0) ? (lines-1)*internote_f : 0;
-    s.dim = Box (Interval (0,wid), Interval (0,dy));
+  Real internote_f = paper_l_ ->internote_f();
+  Symbol s;
+  Real dy = (lines >0) ? (lines-1)*internote_f : 0;
+  s.dim = Box (Interval (0,wid), Interval (0,dy));
 
-    Array<String> a;
-    a.push (lines);
-    a.push (print_dimen (wid));
+  Array<String> a;
+  a.push (lines);
+  a.push (print_dimen (wid));
 
-    s.tex = (*symtables_)("param")->lookup ("linestaf").tex;
-    s.tex = substitute_args (s.tex, a);
+  s.tex = (*symtables_)("param")->lookup ("linestaf").tex;
+  s.tex = substitute_args (s.tex, a);
 
-    return s;
+  return s;
 }
 
 
 Symbol
 Lookup::meter (Array<Scalar> a) const
 {
-    Symbol s;
-    s.dim.x() = Interval (0 PT, 10 PT);
-    s.dim.y() = Interval (0, 20 PT);   // todo
-    String src = (*symtables_)("param")->lookup ("meter").tex;
-    s.tex = substitute_args (src,a);
-    return s;    
+  Symbol s;
+  s.dim.x() = Interval (0 PT, 10 PT);
+  s.dim.y() = Interval (0, 20 PT);     // todo
+  String src = (*symtables_)("param")->lookup ("meter").tex;
+  s.tex = substitute_args (src,a);
+  return s;    
 }
 
 
 Symbol
 Lookup::stem (Real y1,Real y2) const
 {
-    if (y1 > y2) {
+  if (y1 > y2) 
+    {
        Real t = y1;
        y1 = y2;
        y2 = t;
     }
-    Symbol s;
-    
-    s.dim.x() = Interval (0,0);
-    s.dim.y() = Interval (y1,y2);
-    
-    Array<String> a;
-    a.push (print_dimen (y1));
-    a.push (print_dimen (y2));
+  Symbol s;
+  
+  s.dim.x() = Interval (0,0);
+  s.dim.y() = Interval (y1,y2);
+  
+  Array<String> a;
+  a.push (print_dimen (y1));
+  a.push (print_dimen (y2));
        
-    String src = (*symtables_)("param")->lookup ("stem").tex;
-    s.tex = substitute_args (src,a);
-    return s;
+  String src = (*symtables_)("param")->lookup ("stem").tex;
+  s.tex = substitute_args (src,a);
+  return s;
 }
 
 /*
@@ -246,25 +251,27 @@ Lookup::stem (Real y1,Real y2) const
 Symbol
 Lookup::vbrace (Real &y) const
 {
-    if (y < 2* 20 PT) {
+  if (y < 2* 20 PT) 
+    {
        warning ( "piano brace too small (" + print_dimen (y)+ ")");
        y = 2*20 PT;
     }
-    if (y > 67 * 2 PT) {
+  if (y > 67 * 2 PT) 
+    {
        warning ( "piano brace too big (" + print_dimen (y)+ ")");      
        y = 67 *2 PT;
     }
-    
-    int idx = int (rint ((y/2.0 - 20) + 148));
-    
-    Symbol s = (*symtables_)("param")->lookup ("brace");
-    {
+  
+  int idx = int (rint ((y/2.0 - 20) + 148));
+  
+  Symbol s = (*symtables_)("param")->lookup ("brace");
+  {
        Array<String> a;
        a.push (idx);
        s.tex = substitute_args (s.tex,a);
        s.dim.y() = Interval (0,y);
     }
-    {
+  {
        Array<String> a;
        a.push (print_dimen (y/2));
        a.push (print_dimen (0));
@@ -273,5 +280,5 @@ Lookup::vbrace (Real &y) const
     }
 
        
-    return s;
+  return s;
 }