[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Patch
|
From: |
Rune Zedeler |
|
Subject: |
Patch |
|
Date: |
Sun, 11 Mar 2001 20:23:43 +0100 |
Yikes, I have now used 1.5 hours on getting that f.... patching to
work... But it won't.
Finally I decided to patch manually using diff, but that was rather
difficult because diff also "sees" the backup (~) files and the config
files which ofcourse are different in the old and the new dir.
make clean do not remove the files in ./out (i.e. unsuccesful "make
release" attemps).
When trying to diff in the "correct" way (make release) diff ends with
an error like this:
make[3]: Leaving directory `/users/rz/lilypond/lilypond-1.3.135/scm'
make[2]: Nothing to be done for
`/users/rz/lilypond/lilypond-1.3.135/./out/lilypond-1.3.135.rz1'.
make[2]: Leaving directory `/users/rz/lilypond/lilypond-1.3.135'
chmod -R a+r
/users/rz/lilypond/lilypond-1.3.135/./out/lilypond-1.3.135.rz1
chmod a+x `find
/users/rz/lilypond/lilypond-1.3.135/./out/lilypond-1.3.135.rz1 -type d
-print`
(cd ./././out; tar cf - lilypond-1.3.135.rz1 | gzip -9 >
lilypond-1.3.135.rz1.tar.gz)
ln -f ././out/lilypond-1.3.135.rz1.tar.gz /users/rz/lilypond/releases
rm -rf /users/rz/lilypond/lilypond-1.3.135/./out/lilypond-1.3.135.rz1/
rm: cannot remove directory
`/users/rz/lilypond/lilypond-1.3.135/./out/lilypond-1.3.135.rz1/stepmake/bin':
File exists
rm: cannot remove directory
`/users/rz/lilypond/lilypond-1.3.135/./out/lilypond-1.3.135.rz1/stepmake':
File exists
rm: cannot remove directory
`/users/rz/lilypond/lilypond-1.3.135/./out/lilypond-1.3.135.rz1': File
exists
make[1]: *** [dist] Error 1
make[1]: Leaving directory `/users/rz/lilypond/lilypond-1.3.135'
Traceback (innermost last):
File "././stepmake/bin/release.py", line 49, in ?
raise 'make dist failed'
make dist failed
make: *** [release] Error 1
Well, but here is the result of 1.5 hrs work :-\
Assuming that my previous patches have not been applied.
-Rune
diff -urN lilypond-1.3.135/AUTHORS.txt lilypond-1.3.135.rz1/AUTHORS.txt
--- lilypond-1.3.135/AUTHORS.txt Mon Mar 5 00:13:37 2001
+++ lilypond-1.3.135.rz1/AUTHORS.txt Sun Mar 11 19:37:03 2001
@@ -77,3 +77,4 @@
* August S.Sigov <address@hidden> Russian translation
+ * Rune Zedeler <address@hidden> Some fontchanges, bug fixes
diff -urN lilypond-1.3.135/CHANGES lilypond-1.3.135.rz1/CHANGES
--- lilypond-1.3.135/CHANGES Sun Mar 11 20:09:11 2001
+++ lilypond-1.3.135.rz1/CHANGES Sun Mar 11 20:08:48 2001
@@ -1,3 +1,17 @@
+1.3.135.rz1
+===========
+
+* Bugfix: Repeat dots on even number of staff lines
+
+* Completed noteheadtype "cross",
+added complete noteheadtypes "slash", "triangle",
+incomplete noteheadtype "xcircle".
+Added clef "tab", changed clef "percussion"
+NOTE: Font changed!
+
+* Added nested staffgroups/choirstaffs support
+
+
1.3.134.jcn2
============
diff -urN lilypond-1.3.135/VERSION lilypond-1.3.135.rz1/VERSION
--- lilypond-1.3.135/VERSION Mon Mar 5 00:00:04 2001
+++ lilypond-1.3.135.rz1/VERSION Sun Mar 11 18:54:02 2001
@@ -2,7 +2,7 @@
MAJOR_VERSION=1
MINOR_VERSION=3
PATCH_LEVEL=135
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=rz1
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
diff -urN lilypond-1.3.135/lily/bar.cc lilypond-1.3.135.rz1/lily/bar.cc
--- lilypond-1.3.135/lily/bar.cc Sat Feb 24 22:06:30 2001
+++ lilypond-1.3.135.rz1/lily/bar.cc Fri Mar 9 21:11:11 2001
@@ -61,7 +61,10 @@
Molecule thin = simple_barline (me, hair, h);
Molecule thick = simple_barline (me, fatline, h);
- Molecule colon = Font_interface::get_default_font (me)->find_by_name
("dots-repeatcolon");
+ Molecule colon = Font_interface::get_default_font (me)->find_by_name (
+ Staff_symbol_referencer::line_count (me) & 1 == 1 ?
+ "dots-repeatcolon" : "dots-evenrepeatcolon"
+ );
Molecule m;
diff -urN lilypond-1.3.135/lily/system-start-delimiter-engraver.cc
lilypond-1.3.135.rz1/lily/system-start-delimiter-engraver.cc
--- lilypond-1.3.135/lily/system-start-delimiter-engraver.cc Sat Feb 24
22:06:31 2001
+++ lilypond-1.3.135.rz1/lily/system-start-delimiter-engraver.cc Fri Mar
9 22:10:40 2001
@@ -53,6 +53,14 @@
if (gh_symbol_p (gl) && gl == ly_symbol2scm ("brace")
&& gh_symbol_p (my_gl) && my_gl == ly_symbol2scm ("bracket"))
inf.elem_l_->translate_axis ( -1.0, X_AXIS); // ugh
+ else if (gh_symbol_p (gl) && gl == ly_symbol2scm ("bracket")
+ && gh_symbol_p (my_gl) && my_gl == ly_symbol2scm ("bracket"))
+ {
+ inf.elem_l_->translate_axis ( -0.8, X_AXIS); // ugh
+ inf.elem_l_->set_grob_property ("arch-height",
+ gh_double2scm(gh_scm2double(inf.elem_l_->get_grob_property
+ ("arch-height"))+0.5));
+ }
}
}
diff -urN lilypond-1.3.135/ly/engraver.ly lilypond-1.3.135.rz1/ly/engraver.ly
--- lilypond-1.3.135/ly/engraver.ly Tue Feb 27 20:49:25 2001
+++ lilypond-1.3.135.rz1/ly/engraver.ly Fri Mar 9 21:23:21 2001
@@ -70,6 +70,8 @@
\accepts "PianoStaff";
\accepts "Lyrics";
\accepts "ChordNames";
+ \accepts "StaffGroup";
+ \accepts "ChoirStaff";
}
@@ -243,7 +245,9 @@
\accepts "RhythmicStaff";
\accepts "GrandStaff";
\accepts "PianoStaff";
-
+ \accepts "StaffGroup";
+ \accepts "ChoirStaff";
+
\accepts "Lyrics";
\accepts "ChordNames";
}
diff -urN lilypond-1.3.135/mf/feta-bolletjes.mf
lilypond-1.3.135.rz1/mf/feta-bolletjes.mf
--- lilypond-1.3.135/mf/feta-bolletjes.mf Sat Feb 24 22:06:31 2001
+++ lilypond-1.3.135.rz1/mf/feta-bolletjes.mf Fri Mar 9 21:11:11 2001
@@ -440,18 +440,120 @@
fill black;
fet_endchar;
+save triangle; path triangle;
+triangle = (-sqrt3/4,-1/2) -- (0,1) -- (sqrt3/4,-1/2) -- cycle;
+
+fet_beginchar("Whole trianglehead", "0triangle", "wholetrianglehead")
+ set_char_box(0, 2(noteheight#+stafflinethickness#)/sqrt3*7/8,
+
(noteheight#+stafflinethickness#)/2,(noteheight#+stafflinethickness#)/2);
+ fill triangle scaled (7h/6) shifted (w/2,-h/6);
+ unfill triangle scaled 0.72h shifted (w/2,-h/6);
+fet_endchar;
+fet_beginchar("Half trianglehead", "1triangle", "halftrianglehead")
+ thick := 1.2stafflinethickness;
+ set_char_box(0, 2noteheight#/sqrt3*7/8,noteheight#/2,noteheight#/2);
+ fill triangle scaled (7h/6) shifted (w/2,-h/6);
+ unfill triangle scaled 0.7h shifted (w/2,-h/6);
+fet_endchar;
+fet_beginchar("Quart trianglehead", "2triangle", "trianglehead")
+ thick := 1.2stafflinethickness;
+ set_char_box(0, 2noteheight#/sqrt3*7/8,noteheight#/2,noteheight#/2);
+ fill triangle scaled (7h/6) shifted (w/2,-h/6);
+fet_endchar;
+
+
+slw := staff_space;
+slw# := staff_space#;
+slt := 1.25stafflinethickness;
+slt# := 1.25stafflinethickness#;
+slxt = 1.5slt;
+slxt# := 1.5slt#;
+slh := 1.5staff_space;
+slh# := 1.5staff_space#;
+
+fet_beginchar("Whole slashhead","0slash","wholeslashhead")
+ wid := slw#+2slxt#+staff_space#;
+ set_char_box(0,wid-stafflinethickness#,slh#/2,slh#/2);
+ define_pixels (wid);
+ pickup penrazor scaled slxt;
+ draw (-b+slxt/2-stafflinethickness/2,-d) --
(-b+slxt/2+slw-stafflinethickness/2,h);
+ draw (w-slxt/2-slw+stafflinethickness/2,-d) --
(w-slxt/2+stafflinethickness/2,h);
+ pickup penrazor scaled slt rotated 90;
+ draw (-b+slxt-stafflinethickness/2,-d+slt/2) --
(w-slw+stafflinethickness/2,-d+slt/2);
+ draw (-b+slw-stafflinethickness/2,h-slt/2) --
(w-slxt+stafflinethickness/2,h-slt/2);
+fet_endchar;
+
+fet_beginchar("Half slashhead","1slash","halfslashhead")
+ wid := slw#+2slxt#+0.6staff_space#;
+ set_char_box(0,wid-stafflinethickness#,slh#/2,slh#/2);
+ define_pixels (wid);
+ pickup penrazor scaled slxt;
+ draw (b+slxt/2-stafflinethickness/2,-d) --
(b+slxt/2+slw-stafflinethickness/2,h);
+ draw (w-slxt/2-slw+stafflinethickness/2,-d) --
(w-slxt/2+stafflinethickness/2,h);
+ pickup penrazor scaled slt rotated 90;
+ draw (b+slxt-stafflinethickness/2,-d+slt/2) --
(w-slw+stafflinethickness/2,-d+slt/2);
+ draw (b+slw-stafflinethickness/2,h-slt/2) --
(w-slxt+stafflinethickness/2,h-slt/2);
+fet_endchar;
+
+fet_beginchar("Quart slashhead","2slash","quartslashhead")
+ wid := slw#+slxt#;
+ set_char_box(0,slw#+slxt#-stafflinethickness#,slh#/2,slh#/2);
+ define_pixels (wid);
+ pickup penrazor scaled slxt;
+ draw (b+slxt/2-stafflinethickness/2,-d) --
(b+slxt/2+slw-stafflinethickness/2,h);
+fet_endchar;
+
+% thick is the distance between the two parallel lines in the cross (distance
between centres of lines)
+def draw_cross(expr thick) =
+ pent := 1.2stafflinethickness;
+ pickup pencircle scaled pent;
+ % alfa is the slant of the lines (i.e. 1 means 45 degrees)
+ alfa := (2h-pent)/(w-pent);
+ % llen is the length of the little outer lines
+ % llen = thick / sin(2atan(alfa))
+ llen := thick/(ypart(dir(2angle(1,alfa))));
+ xa := llen/sqrt(1+alfa**2);
+ ya := xa*alfa;
+ xl := w/2-xa-pent/2;
+ yl := h-ya-pent/2;
+ save crz; path crz;
+ crz = (xa,0) -- (xa+xl,yl) -- (xl,yl+ya) -- (0,ya);
+ draw crz shifted(w/2,0);
+ draw crz xscaled -1 shifted(w/2,0);
+ draw crz yscaled -1 shifted(w/2,0);
+ draw crz scaled -1 shifted(w/2,0);
+enddef;
+
+fet_beginchar("Whole Crossed notehead", "0cross", "wholecrossedhead")
+ wid# := black_notehead_width#+4stafflinethickness#;
+ hei# := noteheight#+stafflinethickness#;
+ set_char_box(0, wid#,hei#/2,hei#/2);
+ draw_cross(3.75stafflinethickness);
+fet_endchar;
+
+fet_beginchar("Half Crossed notehead", "1cross", "halfcrossedhead")
+ wid# := black_notehead_width#+2stafflinethickness#;
+ hei# := noteheight#+stafflinethickness#/2;
+ set_char_box(0, wid#,hei#/2,hei#/2);
+ draw_cross(3stafflinethickness);
+fet_endchar;
+
fet_beginchar("Crossed notehead", "2cross", "crossedhead")
- set_char_box(0, black_notehead_width#, noteheight#/2, noteheight#/2);
- pickup pencircle scaled 1.5 stafflinethickness;
- lft x1 = 0;
- bot y1 = -d;
- top y2 = h;
- rt x2 = w;
-
- draw z1 .. z2;
- draw (z1 .. z2) yscaled -1;
-fet_endchar
+ wid# := black_notehead_width#;
+ hei# := noteheight#;
+ set_char_box(0, wid#,hei#/2,hei#/2);
+ draw_cross(stafflinethickness/4);
+fet_endchar;
+fet_beginchar("X-Circled notehead", "2xcircle", "xcircledhead")
+ set_char_box(0, noteheight#+stafflinethickness#,
+
noteheight#/2+stafflinethickness#/2,noteheight#/2+stafflinethickness#/2);
+ pickup pencircle scaled 1.2stafflinethickness;
+ draw fullcircle scaled 2h shifted (h,0);
+ pos := h/sqrt2;
+ draw (-pos+h,-pos) -- (pos+h,pos);
+ draw (-pos+h,pos) -- (pos+h,-pos);
+fet_endchar;
fet_endgroup("noteheads");
define_pixels(black_notehead_width);
diff -urN lilypond-1.3.135/mf/feta-klef.mf lilypond-1.3.135.rz1/mf/feta-klef.mf
--- lilypond-1.3.135/mf/feta-klef.mf Sat Feb 24 22:06:31 2001
+++ lilypond-1.3.135.rz1/mf/feta-klef.mf Fri Mar 9 21:11:11 2001
@@ -1054,10 +1054,11 @@
save reduced_il;
reduced_il# = staff_space# * reduction;
define_pixels(reduced_il);
- set_char_box(.5reduced_il#,1.25reduced_il#,reduced_il#,reduced_il#);
- pickup pencircle scaled 3.33 stafflinethickness;
- draw (b,h) -- (b,-d);
- draw (w,h) -- (w,-d);
+ set_char_box(-.67reduced_il#,2.0reduced_il#,reduced_il#,reduced_il#);
+ razt := 0.45reduced_il;
+ pickup penrazor scaled razt;
+ draw (-b+razt/2,h) -- (-b+razt/2,-d);
+ draw (w-razt/2,h) -- (w-razt/2,-d);
enddef;
fet_beginchar("percussion clef", "percussion", "percussionclef")
@@ -1066,6 +1067,41 @@
fet_beginchar("percussion clef", "percussion_change", "cpercussionclef")
draw_percussion_clef(.8);
+fet_endchar;
+
+def draw_tab_clef(expr reduction) =
+ save reduced_il;
+ reduced_il# = staff_space# * reduction;
+ define_pixels(reduced_il);
+
set_char_box(-.5reduced_il#,1.8reduced_il#,2.25reduced_il#,2.25reduced_il#);
+ bs := -d+0.65reduced_il;
+ cx := 0.5(-b+w);
+ xp := 0.32 reduced_il;
+ yp := 0.25reduced_il;
+ pickup pensquare xscaled xp yscaled yp;
+
+ draw (-b,h) -- (w,h);
+ draw (cx,h) -- (cx,h-1.2reduced_il);
+
+ pickup penrazor scaled yp rotated 90;
+ draw (-0.85b+0.15w,-0.25reduced_il) -- (-0.15b+0.85w,-0.25reduced_il);
+ pickup penrazor scaled xp;
+ draw (-b,-0.6reduced_il-yp/2) -- (cx,0.6reduced_il+yp/2) --
(w,-0.6reduced_il-yp/2);
+
+
+ pickup pensquare xscaled xp yscaled yp;
+ draw (-b,-d+1.2reduced_il) -- (-b,-d);
+ pickup pencircle xscaled xp yscaled yp;
+ draw (-b,-d) --- (cx,-d) .. (w,0.5(bs-d)) .. (cx,bs) --- (-b,bs) ---
(cx,bs)
+ .. (0.3cx+0.7w,0.5(bs-d+1.2reduced_il)) .. (cx,-d+1.2reduced_il)
--- (-b,-d+1.2reduced_il)
+enddef;
+
+fet_beginchar("tab clef", "tab", "tabclef")
+ draw_tab_clef(1.0);
+fet_endchar;
+
+fet_beginchar("tab clef", "tab_change", "ctabclef")
+ draw_tab_clef(.8);
fet_endchar;
fet_endgroup("clefs");
diff -urN lilypond-1.3.135/mf/feta-puntje.mf
lilypond-1.3.135.rz1/mf/feta-puntje.mf
--- lilypond-1.3.135/mf/feta-puntje.mf Fri Jan 14 00:22:09 2000
+++ lilypond-1.3.135.rz1/mf/feta-puntje.mf Fri Mar 9 21:11:12 2001
@@ -17,5 +17,11 @@
set_char_box(0, dot_diam#, staff_space#/2, staff_space#/2);
fet_endchar;
+fet_beginchar("even repeat dots", "evenrepeatcolon", "evenrepeatcolon")
+ pickup pencircle scaled dot_diam;
+ draw (dot_diam/2, staff_space);
+ addto currentpicture also currentpicture yscaled -1;
+ set_char_box(0, dot_diam#, staff_space#, staff_space#);
+fet_endchar;
fet_endgroup("dots");
diff -urN lilypond-1.3.135/scm/clef.scm lilypond-1.3.135.rz1/scm/clef.scm
--- lilypond-1.3.135/scm/clef.scm Thu Jan 18 20:22:25 2001
+++ lilypond-1.3.135.rz1/scm/clef.scm Fri Mar 9 21:11:12 2001
@@ -20,6 +20,7 @@
("F" . ( "clefs-F" 2 0))
("subbass" . ("clefs-F" 4 0))
("percussion" . ("clefs-percussion" 0 0))
+ ("tab" . ("clefs-tab" 0 0))
;; should move mensural stuff to separate file?
("vaticana_do1" . ("clefs-vaticana_do" -1 0))
diff -urN lilypond-1.3.135/scm/output-lib.scm
lilypond-1.3.135.rz1/scm/output-lib.scm
--- lilypond-1.3.135/scm/output-lib.scm Sat Feb 24 22:06:31 2001
+++ lilypond-1.3.135.rz1/scm/output-lib.scm Fri Mar 9 21:11:12 2001
@@ -63,7 +63,7 @@
;; silly, use alist?
(define (find-notehead-symbol duration style)
(case style
- ((cross) "2cross")
+ ((xcircle) "2xcircle")
((harmonic) "0mensural")
((baroque)
(string-append (number->string duration)
- Patch,
Rune Zedeler <=
- Patch, Rune Zedeler, 2001/03/11