Hi,
I tried to fix the \mark feature and realized that there
was something strange with the Staff_side class. The same
problem was seen in the positioning of the absolute dynamics.
I don't really understand how Staff_side is supposed to work,
but did a simple patch to force a placement above or below the
staff. I hope Han-Wen or Jan who did the original
version can provide a cleaner patch.
Also included are a couple of small patches needed to be
able to compile the release at all.
/Mats
---------------------------------------------
Generated by (address unknown) using package-diff 0.62,
>From = lilypond-1.1.17, To = lilypond-1.1.17.mb1
usage
cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.17.mb1.diff
Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure
and possibly make outdirs.
--state
1.1.17
1.1.17.mb1
++state
diff -urN ../lilypond-1.1.17/NEWS ./NEWS
--- ../lilypond-1.1.17/NEWS Tue Dec 22 11:18:36 1998
+++ ./NEWS Sun Jan 3 20:27:10 1999
@@ -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 -urN ../lilypond-1.1.17/VERSION ./VERSION
--- ../lilypond-1.1.17/VERSION Thu Dec 24 13:20:40 1998
+++ ./VERSION Sun Jan 3 20:27:26 1999
@@ -2,7 +2,7 @@
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 -urN ../lilypond-1.1.17/lily/dynamic-engraver.cc ./lily/dynamic-engraver.cc
--- ../lilypond-1.1.17/lily/dynamic-engraver.cc Mon Dec 14 14:35:44 1998
+++ ./lily/dynamic-engraver.cc Sun Jan 3 16:09:55 1999
@@ -65,11 +65,11 @@
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 -urN ../lilypond-1.1.17/lily/mark-engraver.cc ./lily/mark-engraver.cc
--- ../lilypond-1.1.17/lily/mark-engraver.cc Mon Nov 16 15:20:51 1998
+++ ./lily/mark-engraver.cc Sat Jan 2 23:36:30 1999
@@ -41,7 +41,7 @@
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 @@
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 -urN ../lilypond-1.1.17/lily/multi-measure-rest.cc ./lily/multi-measure-rest.cc
--- ../lilypond-1.1.17/lily/multi-measure-rest.cc Mon Nov 16 15:20:51 1998
+++ ./lily/multi-measure-rest.cc Sat Jan 2 23:37:45 1999
@@ -48,6 +48,7 @@
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 -urN ../lilypond-1.1.17/lily/staff-side.cc ./lily/staff-side.cc
--- ../lilypond-1.1.17/lily/staff-side.cc Mon Nov 16 15:20:51 1998
+++ ./lily/staff-side.cc Sun Jan 3 20:18:05 1999
@@ -76,8 +76,11 @@
// 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 -urN ../lilypond-1.1.17/po/nl.po ./po/nl.po
--- ../lilypond-1.1.17/po/nl.po Tue Dec 22 11:18:31 1998
+++ ./po/nl.po Sat Jan 2 22:49:18 1999
@@ -316,7 +316,7 @@
#: 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 -urN ../lilypond-1.1.17/scm/lily.scm ./scm/lily.scm
--- ../lilypond-1.1.17/scm/lily.scm Wed Dec 9 11:12:08 1998
+++ ./scm/lily.scm Sat Jan 2 23:11:35 1999
@@ -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))
