patch::: 1.1.17.mb1: Re: LilyPond Xmas release

pl 17.mb1
	- center the number of multi-bar rests
	- Ugly fix to make \mark work and give better placement of dynamics.

diff --git a/NEWS b/NEWS
index a5905654bba36b8a384e3a31e52717641909c5e5..aea1b1fcb3f70eac56cac1bd067fd0f9c8288057 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+pl 17.mb1
+       - center the number of multi-bar rests
+       - Ugly fix to make \mark work and give better placement of dynamics.
+
 pl 16.jcn2
        - fix: TEMPO 4., well urg, "TEMPO 4 ."
        - beginning of violino/violoncello (viola) duet

diff --git a/VERSION b/VERSION
index b422755b051a36931b8f69cd75c7aa7f3d3c827d..03e50b5e80c35c1af35b35f5135522b0e75e503e 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=17
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index e01a2fb6b69a727c498b73588cd9441abb867f6e..bf4b890c7035e49841d11682d5f48f2a08d8d1ce 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -65,11 +65,11 @@ Dynamic_engraver::do_process_requests()
          String loud = absd->loudness_str ();
          td_p->text_str_ =  paper ()->lookup_l (0)->dynamic (loud).str_; // ugh
          td_p->style_str_ = "dynamic";
-         td_p->align_dir_ = RIGHT;
+         td_p->align_dir_ = RIGHT; // Ugh, Doesn't give any effect?
          Real nw_f = paper ()->note_width () * 0.8;
 
          dynamic_p_ = new Text_item (td_p);
-         dynamic_p_->translate (Offset (nw_f, 0));
+         //      dynamic_p_->translate (Offset (nw_f, 0)); // Removed, Mats B
 
          announce_element (Score_element_info (dynamic_p_, dreq_l));
        }

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 55390bfae301315df6d9f94b29ec6d24c292e69b..b3f9bf9f0c93f76fec4ea6fcd92ba1798d3cd9e9 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -41,7 +41,7 @@ Mark_engraver::do_process_requests ()
     return;
 
   script_p_ = new Script;
-  script_p_->breakable_b_ = true;
+  //  script_p_->breakable_b_ = true;
 
   Text_def *td_p = new Text_def;
 
@@ -51,9 +51,9 @@ Mark_engraver::do_process_requests ()
   td_p->style_str_ = td_p->text_str_.index_any_i ("0123456789") >= 0 
     ? "mark" : "Large";
 
-  script_p_->dir_ = LEFT;
+  script_p_->dir_ = UP;
   script_p_->specs_p_ = td_p->clone ();
-  script_p_->postbreak_only_b_ = true;
+  // script_p_->postbreak_only_b_ = false;
   
   Scalar padding = get_property ("markScriptPadding");
   if (padding.length_i() && padding.isnum_b ())

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 27b13a42da6920212b0613cbb644dc917ad8682d..b6c8b5d5b3a54e58e3c1a545afaa0a0cc1d19c61 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -48,6 +48,7 @@ Multi_measure_rest::brew_molecule_p () const
       Text_def text;
       text.text_str_ = to_str (measures_i_);
       text.style_str_ = "number";
+      text.align_dir_ = CENTER;
       Atom s = text.get_atom (paper (), UP);
       s.translate_axis (3.0 * interline_f, Y_AXIS);
       mol_p->add_atom (s);

diff --git a/lily/staff-side.cc b/lily/staff-side.cc
index a3a3a14afd8c7cbb40cfdbf7921c9e1a9a2de2be..5133465bee91000c365408d543d94959b8a413d0 100644 (file)
--- a/lily/staff-side.cc
+++ b/lily/staff-side.cc
@@ -76,8 +76,11 @@ Staff_side::get_position_f () const
   // ugh: 5 -> staff_lines
   if (axis_ == Y_AXIS && abs (coordinate_offset_f_i) < 5)
     {
-      if (!(abs (coordinate_offset_f_i) % 2))
-       y += (Real)dir_ * inter_f;
+      /* I don't understand how this is supposed to work, 
+        simple patch below. Mats B
+        if (!(abs (coordinate_offset_f_i) % 2))
+        y += (Real)dir_ * inter_f; */
+      y = (Real)dir_ * 6 * inter_f;
     }
 //  else
 //    y = v[dir_] + 1 * dir_ * inter_f;

diff --git a/po/nl.po b/po/nl.po
index 23d4cdd5e389a208a7475afbdf406526eb09a3ea..0bc609467dbc79a200a5f0767e3e082774e61b0c 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -316,7 +316,7 @@ msgstr "  -D, --debug            toon ontluis berichten\n"
 #: main.cc:94
 msgid ""
 "  -d, --dependencies     write Makefile dependencies for every input file\n"
-msstr ""
+msgstr ""
 "  -d, --dependencies     schrijf Makefile afhankelijkheden voor elk\n"
 "                           invoerbestand\n"
 

diff --git a/scm/lily.scm b/scm/lily.scm
index 4aa093e81809d9fded7064698a7fe52ff684b8a0..2085fe20f9b0b3d1de7c6f1067920fc89551c3be 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -78,6 +78,9 @@
 (define (settypewriter s) (text "typewriter" s))
 (define (setnumber s) (text "number" s))
 (define (setbold s) (text "bold" s))
+(define (setlarge s) (text "large" s))
+(define (setLarge s) (text "Large" s))
+(define (setmark s) (text "mark" s))
 (define (setfinger s) (text "finger" s))
 (define (setitalic s) (text "italic" s))
 (define (setnumber-1 s) (text "numberj" s))