lilypond-0.0.22

diff --git a/hdr/lookup.hh b/hdr/lookup.hh
index 5fa14d57a891f79ae31afbc56e395a6a815956cb..f947a7d734f7ac9a4f8cee3aafd5c8c2945e6a52 100644 (file)
--- a/hdr/lookup.hh
+++ b/hdr/lookup.hh
@@ -28,7 +28,7 @@ struct Lookup {
       pos == -3: below staff
       */
 
-    Symbol meter(svec<Scalar>);
+    Symbol meter(Array<Scalar>);
     Symbol stem(Real y1_pos, Real y2_pos);
     Symbol rule_symbol(Real height, Real width);
     Symbol accidental(int);

diff --git a/hdr/parseconstruct.hh b/hdr/parseconstruct.hh
index dea0d0cd9510c62360f0b4e9e83f5bc5d4f6cb57..8afb32d94bf1ae6854dea50f1ed7e1ac9c644a4e 100644 (file)
--- a/hdr/parseconstruct.hh
+++ b/hdr/parseconstruct.hh
@@ -16,7 +16,7 @@ Staff * get_new_rhythmstaff();
 Voice_element * get_note_element(String,int * ,int *);
 Voice_element* get_rest_element(String,int *);
 Staff * get_new_melodicstaff();
-void add_requests( Voice_element*v, svec<Request*>&req);
+void add_requests( Voice_element*v, Array<Request*>&req);
 Request* get_request(char);
 void set_text_style(String);
 Script_def* get_scriptdef(char);

diff --git a/hdr/qlp.hh b/hdr/qlp.hh
index b539fe6b865798de9a309e9a10c961ec75d72360..db5438499d6beaf75723159e637fcbe6ef8e369d 100644 (file)
--- a/hdr/qlp.hh
+++ b/hdr/qlp.hh
@@ -7,8 +7,8 @@
 class Ineq_constrained_qp {
     friend class Active_constraints;
 
-    svec<Vector> cons;
-    svec<Real> consrhs;
+    Array<Vector> cons;
+    Array<Real> consrhs;
 public:
     Matrix quad;
     Vector lin;
@@ -55,8 +55,8 @@ public:
 
 /// Quadratic programming with mixed linear constraints
 class Mixed_qp :public Ineq_constrained_qp {
-    svec<int> eq_cons;
-    svec<Real> eq_consrhs;
+    Array<int> eq_cons;
+    Array<Real> eq_consrhs;
 public:
     Mixed_qp(int n);
     void OK() const;

diff --git a/hdr/simplestaff.hh b/hdr/simplestaff.hh
index 34e48b0d23c27c25e4e756b158bbb7a53d2cba49..f074dc169d6541029f0a1915f257355a0a548552 100644 (file)
--- a/hdr/simplestaff.hh
+++ b/hdr/simplestaff.hh
@@ -19,7 +19,7 @@
 struct Simple_staff;
 struct Note_info {
     Rhythmic_req *rq;
-    svec<Script_req*> scripts;
+    Array<Script_req*> scripts;
     Note_info();
     Note_info(Rhythmic_req*);
 };
@@ -27,8 +27,8 @@ struct Note_info {
 /// column of Simple_staff: store one request
 struct Simple_column : Staff_column {
 
-    svec<Note_info> notes;
-    svec<Slur_req *> slurs;
+    Array<Note_info> notes;
+    Array<Slur_req *> slurs;
     Stem_req *stem_;
     Moment stem_requester_len;
     Beam_req *beam_;

diff --git a/hdr/tex.hh b/hdr/tex.hh
index aba60f06c42a0d27a1057a066a16d2ff3ba5129e..c33f30e202d5884479b61299f86d35ea54c8c4f6 100644 (file)
--- a/hdr/tex.hh
+++ b/hdr/tex.hh
@@ -7,7 +7,7 @@
 
 /// parameter substitution in TeXstrings
 String
-substitute_args(String source, svec<String> args);
+substitute_args(String source, Array<String> args);
 /**
   this structure provides a simple macro mechanism:
 
@@ -17,7 +17,7 @@ substitute_args(String source, svec<String> args);
 
 /// parameter substitution in TeXstrings
 String
-substitute_args(String source, svec<Scalar> args);
+substitute_args(String source, Array<Scalar> args);
 
 /// #h# is in points
 String vstrut(Real h);

diff --git a/src/clef.cc b/src/clef.cc
index 49671dd4267f5d87109b5405a4873fe7b08f2c13..0abd26f44ae72e6bc9a0a8ea49f2bc3e46de2f62 100644 (file)
--- a/src/clef.cc
+++ b/src/clef.cc
@@ -7,7 +7,7 @@ Clef::Clef()
 }
 
 void
-Clef::read(svec<Scalar>args)
+Clef::read(Array<Scalar>args)
 {
     clef_type = args[0];
     if (clef_type == "violin") {

diff --git a/src/lookup.cc b/src/lookup.cc
index 9c8def52cf56f40947bb830b135f0aaa5d337472..200ae0994b9693da588ee58b5d30cdb6277b86c3 100644 (file)
--- a/src/lookup.cc
+++ b/src/lookup.cc
@@ -31,7 +31,7 @@ Lookup::add(String s, Symtable*p)
 Symbol
 Lookup::text( String style, String text , int dir)
 {
-    svec<String> a;
+    Array<String> a;
  
     a.add(text);
     Symbol tsym =  (*symtables_)("style")->lookup(style);
@@ -129,7 +129,7 @@ Lookup::streepjes(int i)
     }
     Symbol ret = (*symtables_)("streepjes")->lookup(idx);
     
-    svec<String> a;
+    Array<String> a;
     a.add(arg);
     ret.tex = substitute_args(ret.tex, a);
 
@@ -146,7 +146,7 @@ Lookup::linestaff(int lines, Real wid)
     Real dy=(lines-1)*internote()*2;
     s.dim.y = Interval(0,dy);
 
-    svec<String> a;
+    Array<String> a;
     a.add(lines);
     a.add(print_dimen(wid));
 
@@ -158,7 +158,7 @@ Lookup::linestaff(int lines, Real wid)
 
 
 Symbol
-Lookup::meter(svec<Scalar> a)
+Lookup::meter(Array<Scalar> a)
 {
     Symbol s;
     s.dim.x = Interval( convert_dimen(0,"pt"),
@@ -179,7 +179,7 @@ Lookup::stem(Real y1,Real y2)
     s.dim.x = Interval(0,0);
     s.dim.y = Interval(y1,y2);
     
-    svec<String> a;
+    Array<String> a;
     a.add(print_dimen(y1));
     a.add(print_dimen(y2));
        

diff --git a/src/meter.cc b/src/meter.cc
index dc3cb40f3e4645ef2c51f838705ed3e83b301cf8..fb8224ec07ee23ef3411ef23bc62b2ced0fb00b2 100644 (file)
--- a/src/meter.cc
+++ b/src/meter.cc
@@ -4,7 +4,7 @@
 #include "paper.hh"
 #include "lookup.hh"
 
-Meter::Meter(svec<Scalar>a)
+Meter::Meter(Array<Scalar>a)
     :args(a)
 {
 }
@@ -12,7 +12,7 @@ Meter::Meter(svec<Scalar>a)
 Molecule*
 Meter::brew_molecule()const
 {
-    Symbol s = paper()->lookup_->meter(args);
+    Symbol s = paper()->lookup_p_->meter(args);
 return new Molecule(Atom(s));
 }
 

diff --git a/src/texbeam.cc b/src/texbeam.cc
index 713bc1f4737ef6b2089ad305f3f4f7c776d077d6..652360eee871351fdd7e114b8840a3a04fad37fa 100644 (file)
--- a/src/texbeam.cc
+++ b/src/texbeam.cc
@@ -18,7 +18,7 @@ Lookup::beam_element(int sidx, int widx, Real slope)
 {
     Symbol bs=(*symtables_)("beamslopes")->lookup("slope");
     
-    svec<String> args;
+    Array<String> args;
     args.add(sidx);
     args.add(widx);
     bs.tex = substitute_args(bs.tex,args);
@@ -51,7 +51,7 @@ Symbol
 Lookup::rule_symbol(Real height, Real width)
 {
     Symbol bs=(*symtables_)("beamslopes")->lookup("horizontal");    
-    svec<String> args;
+    Array<String> args;
     args.add(print_dimen(height));
     args.add(print_dimen(width));
     bs.tex = substitute_args(bs.tex,args);