CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/23 10:28:03
Modified files:
. : ChangeLog
lily : system-start-delimiter.cc
mf : feta-beugel.mf
Log message:
* lily/system-start-delimiter.cc (staff_brace): don't remove brace
extent. This fixes braces falling out of the EPS bbox.
* mf/feta-beugel.mf (braces_per_font): make brace glyph align
exactly to bbox.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4069&tr2=1.4070&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/system-start-delimiter.cc.diff?tr1=1.107&tr2=1.108&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/feta-beugel.mf.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4069 lilypond/ChangeLog:1.4070
--- lilypond/ChangeLog:1.4069 Tue Aug 23 03:27:00 2005
+++ lilypond/ChangeLog Tue Aug 23 10:28:03 2005
@@ -1,3 +1,12 @@
+
+2005-08-23 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/system-start-delimiter.cc (staff_brace): don't remove brace
+ extent. This fixes braces falling out of the EPS bbox.
+
+ * mf/feta-beugel.mf (braces_per_font): make brace glyph align
+ exactly to bbox.
+
2005-08-23 Graham Percival <[EMAIL PROTECTED]>
* {various} : change #up->#UP and #down->#DOWN.
Index: lilypond/lily/system-start-delimiter.cc
diff -u lilypond/lily/system-start-delimiter.cc:1.107
lilypond/lily/system-start-delimiter.cc:1.108
--- lilypond/lily/system-start-delimiter.cc:1.107 Sat Aug 13 21:51:54 2005
+++ lilypond/lily/system-start-delimiter.cc Tue Aug 23 10:28:03 2005
@@ -164,9 +164,9 @@
int lo = 0;
int hi = max (fm->count () - 1, 2);
- Box b;
/* do a binary search for each Y, not very efficient, but passable? */
+ Box b;
do
{
int cmp = (lo + hi) / 2;
@@ -179,14 +179,17 @@
while (hi - lo > 1);
Stencil stil (fm->find_by_name ("brace" + to_string (lo)));
- b = stil.extent_box ();
- b[X_AXIS] = Interval (0, 0);
+ stil.translate_axis (-b[X_AXIS].length()/2, X_AXIS);
- return Stencil (b, stil.expr ());
+ return stil;
}
ADD_INTERFACE (System_start_delimiter, "system-start-delimiter-interface",
"The brace, bracket or bar in front of the system. "
"It is implemented as a spanner.",
- "collapse-height thickness "
- "glyph");
+
+ /* properties */
+ "collapse-height "
+ "glyph "
+ "thickness "
+ );
Index: lilypond/mf/feta-beugel.mf
diff -u lilypond/mf/feta-beugel.mf:1.32 lilypond/mf/feta-beugel.mf:1.33
--- lilypond/mf/feta-beugel.mf:1.32 Fri Feb 4 13:48:10 2005
+++ lilypond/mf/feta-beugel.mf Tue Aug 23 10:28:03 2005
@@ -1,5 +1,5 @@
%
-% feta-beugel.mf -- [Staff] braces
+% feta-beugel.mf -- Staff braces
%
% source file of the Feta (not an acronym for Font-En-Tja)
% pretty-but-neat music font
@@ -41,7 +41,7 @@
fet_beginchar ("brace number " & (decimal (brace_number)),
"brace" & decimal(brace_number))
- set_char_box (0, width#, height#/2, height#/2);
+ set_char_box (width#, 0, height#/2, height#/2);
define_pixels (height, width, slt);
thin = 2 slt;
@@ -51,7 +51,7 @@
y3l = y1 + height/2;
x3 = x1 + width;
y1 =0;
- x3 = - width / 2;
+ x1 = - b;
pair pendir;
pendir = unitvector(x3 - x1, y3l/6 - y1);
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
