lilypond-0.0.61

diff --git a/flower/choleski.cc b/flower/choleski.cc
index 1d64f949acdc775844c65d58f16dc8778937f2be..d10372fdfdc0339d089cdf935495a59d4dda42e5 100644 (file)
--- a/flower/choleski.cc
+++ b/flower/choleski.cc
@@ -55,7 +55,7 @@ Choleski_decomposition::Choleski_decomposition(Matrix P)
        D(k) = d;
     }
 
-#ifdef NDEBUG
+#ifndef NDEBUG
     assert((original()-P).norm() / P.norm() < EPS);
 #endif
 }
@@ -81,10 +81,10 @@ Choleski_decomposition::inverse() const
            invm(i,j) = inv(j);
     }
     
-#ifdef NDEBUG
+#ifndef NDEBUG
     Matrix I1(n), I2(original());
     I1.unit();
-    assert((I1-original()*invm).norm()/original.norm() < EPS);
+    assert((I1-I2*invm).norm()/I2.norm() < EPS);
 #endif
     
     return invm;

diff --git a/flower/flower-debug.cc b/flower/flower-debug.cc
index 7617faaa24a7f914340e6e96d88841b62da4be8c..702304e71fba71d8160198841ae4cdd7d5c0f1a9 100644 (file)
--- a/flower/flower-debug.cc
+++ b/flower/flower-debug.cc
@@ -12,6 +12,9 @@ Dstream *flower_dstream  = &default_flower_stream;
  */
 void set_flower_debug(Dstream&ds, bool b)
 {
+#ifdef NPRINT
+    cout << "Debug printout disabled, see the installation guide." << endl;
+#endif
     flower_check_debug = b;
     flower_dstream = &ds;
 }

diff --git a/init/table_sixteen.ini b/init/table_sixteen.ini
index 82364493b752b6a59260c1d430148c2566e1c322..a1beff522b506c53f3030854b6360e5103b77543 100644 (file)
--- a/init/table_sixteen.ini
+++ b/init/table_sixteen.ini
@@ -13,16 +13,16 @@ table_sixteen=
     "scripts" = \table {
            "fermata" "\fermata"                0\pt 0\pt       0\pt 6\pt
            "-fermata" "\ifermata"              0\pt 0\pt       -6\pt 0\pt
-           "portato" "\portato"
-           "-portato" "\iportato"
-           "tenuto" "\tenuto"  
-           "-tenuto" "\itenuto"
+           "portato" "\portato"                0\pt 4.8\pt     0\pt 2\pt
+           "-portato" "\iportato"              0\pt 4.8\pt     -2\pt 0\pt
+           "tenuto" "\tenuto"                  0\pt 4.8\pt     0\pt 1\pt
+           "-tenuto" "\itenuto"                0\pt 4.8\pt     -1\pt 0\pt
            "sforzato" "\sforzato"              -0.8\pt 4.8\pt  -1.92\pt 1.92\pt
            "marcato" "\marcato"                0\pt 4.8\pt     0\pt 4\pt
            "-marcato" "\imarcato"              0\pt 4.8\pt     -4\pt 0\pt
            "staccato" "\staccato"              0\pt 0\pt        0\pt 5\pt
-           "staccatissimo" "\staccatissimo"    0\pt 0\pt       0\pt 7.5\pt
-           "-staccatissimo" "\istaccatissimo"  0\pt 0\pt       -7.5\pt 0\pt
+           "staccatissimo" "\staccatissimo"    0\pt 0\pt       0\pt 1\pt
+           "-staccatissimo" "\istaccatissimo"  0\pt 0\pt       0\pt 1\pt
            "upbow" "\upbow"                    -1\pt 6\pt      0\pt 5\pt
            "downbow" "\downbow"                0\pt 5\pt       0\pt 7.5\pt
            "back" "\backorfront"               0\pt 6\pt       0\pt 3\pt

diff --git a/lily/.version b/lily/.version
index 4a6628d2a94ab2e21c78c0b6b3e6b2894e5974a8..cc03f17df4279b38cd445bbf81bc3b1ca0016c22 100644 (file)
--- a/lily/.version
+++ b/lily/.version
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
-PATCH_LEVEL = 60
+PATCH_LEVEL = 61
 
 # use to send patches, always empty for released version:
 # include separator: ".postfix", "-pl" makes rpm barf

diff --git a/lily/p-score.cc b/lily/p-score.cc
index ff3482097e461f063df18bdd43b562652b9787ee..184e90db3f4fe166d7e0f05033f18ea838c3860f 100644 (file)
--- a/lily/p-score.cc
+++ b/lily/p-score.cc
@@ -150,7 +150,7 @@ PScore::select_items(PStaff*ps, PCol*pc)
 void
 PScore::OK()const
 {
-#ifdef NDEBUG
+#ifndef NDEBUG
     for (iter_top(cols,cc); cc.ok(); cc++)
        cc->OK();
     for (iter_top(suz,i); i.ok(); i++)

diff --git a/lily/slur.cc b/lily/slur.cc
index 7de562215a3ca5e33a72949d89d0920f9aefbac4..1b7bb0f76a028a13d27da1cb8fbeebd4d8947802 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -74,8 +74,14 @@ Slur::do_post_processing()
     if (!dir_i_)
        set_default_dir();
     Real inter_f = paper()->internote();
-    left_pos_i_ = encompass_arr_[0]->stem_l_->height()[dir_i_]/inter_f;
-    right_pos_i_ = encompass_arr_.top()->stem_l_->height()[dir_i_]/inter_f;
+    if (encompass_arr_[0]->stem_l_)
+        left_pos_i_ = encompass_arr_[0]->stem_l_->height()[dir_i_]/inter_f;
+    else
+        left_pos_i_ = 0;
+    if (encompass_arr_.top()->stem_l_)
+        right_pos_i_ = encompass_arr_.top()->stem_l_->height()[dir_i_]/inter_f;
+    else
+        right_pos_i_ = 0;
 
     left_pos_i_ += dir_i_;
     right_pos_i_ += dir_i_;

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 47252308602670ff9f2bba676f48b311a6d883e0..ca18e61502f7abfcef7bce3731db28d2d7f729da 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -21,7 +21,7 @@
         \rationalmultiply\dimen0*#2%
         \raise\dimen0\hbox{#1}}
 \def\maccentdef#1#2#3{\def#1{\maccentraise{\mchar{#2}}{#3}}}
-\def\vcenter#1{\vbox to 0pt{\vss #1\vss}}
+\def\vertcenter#1{\vbox to 0pt{\vss #1\vss}}
 
 \def\mathdef#1#2{\def#1{\mathchar{#2}}}
 \def\mathchar#1{\mathfont\char#1}
@@ -110,15 +110,15 @@
 \def\kdynm{\dynfont m\kern-.15ex}
 \def\kdynp{\dynfont p\kern-.15ex}
 
-\def\dynppp{\dynfont\dynp\kdynp p}
 
-\def\dynpp{\dynfont p\kdynp}
 \def\dynp{\dynfont p}
+\def\dynpp{\dynp\kdynp}
+\def\dynppp{\dynpp\kdynp}
 \def\dynmp{\dynfont m\kdynp}
 \def\dynmf{\dynfont m\kdynf}
 \def\dynf{\dynfont f}
-\def\dynff{\dynfont f\kdynf}
-\def\dynfff{\dynfont f\kdynf \kdynf}
+\def\dynff{\dynf\kdynf}
+\def\dynfff{\dynff\kdynf}
 
 \def\slurcharh#1{{\slurhfont\char#1}}
 \def\slurcharu#1{{\slurufont\char#1}}
@@ -226,10 +226,10 @@
 \def\sixteenthflag{\topalign{\usixteenthflag}}
 \def\thirtysecondflag{\topalign{\uthirtysecondflag}}
 
-\def\cquartrest{\vcenter\quartrest}
-\def\ceighthrest{\vcenter\eighthrest}
-\def\csixteenthrest{\vcenter\sixteenthrest}
-\def\cthirtysecondrest{\vcenter\thirtysecondrest}
+\def\cquartrest{\vertcenter\quartrest}
+\def\ceighthrest{\vertcenter\eighthrest}
+\def\csixteenthrest{\vertcenter\sixteenthrest}
+\def\cthirtysecondrest{\vertcenter\thirtysecondrest}
 
 \def\lsingledot{\kern-\notewidth\singledot}
 \def\ldoubledot{\kern-\notewidth\doubledot}
@@ -238,14 +238,14 @@
 \maccentdef\sforzato{30}{-3/2}
 \maccentdef\marcato{20}{-1/1}
 \maccentdef\imarcato{21}{1/1}
-\maccentdef\staccato{24}{-1/1}
-\maccentdef\istaccato{25}{1/1}
-\maccentdef\staccatissimo{28}{-1/1}
-\maccentdef\istaccatissimo{29}{1/1}
-\maccentdef\portato{18}{-9/10}
-\maccentdef\iportato{19}{9/10}
-\maccentdef\tenuto{26}{0/1}
-\maccentdef\itenuto{27}{0/1}
+\maccentdef\staccato{24}{-1/3}
+\maccentdef\istaccato{25}{1/3}
+\maccentdef\staccatissimo{28}{-5/5}
+\maccentdef\istaccatissimo{29}{2/5}
+\maccentdef\portato{18}{-6/5}
+\maccentdef\iportato{19}{3/5}
+\maccentdef\tenuto{26}{-1/1}
+\maccentdef\itenuto{27}{1/1}
 \maccentdef\fermata{80}{-1/1}
 \maccentdef\ifermata{81}{1/1}
 
@@ -253,7 +253,6 @@
 \mdef\ispicato{29}
 \mdef\upbow{23}
 \mdef\downbow{22}
-\mdef\portato{26}
 
 \mathdef\cup{91} % \cup
 \mathdef\wedge{94} % \wedge