From ef8ba7c80f3d6e8ba81c49736821be91e3bc51d8 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:42:38 +0000 Subject: [PATCH] lilypond-0.0.61 --- flower/choleski.cc | 6 +++--- flower/flower-debug.cc | 3 +++ init/table_sixteen.ini | 12 ++++++------ lily/.version | 2 +- lily/p-score.cc | 2 +- lily/slur.cc | 10 ++++++++-- tex/lilyponddefs.tex | 35 +++++++++++++++++------------------ 7 files changed, 39 insertions(+), 31 deletions(-) diff --git a/flower/choleski.cc b/flower/choleski.cc index 1d64f949ac..d10372fdfd 100644 --- 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 7617faaa24..702304e71f 100644 --- 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 82364493b7..a1beff522b 100644 --- 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 4a6628d2a9..cc03f17df4 100644 --- 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 ff3482097e..184e90db3f 100644 --- 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 7de562215a..1b7bb0f76a 100644 --- 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 4725230860..ca18e61502 100644 --- 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 -- 2.39.5