CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/06 20:58:23
Modified files:
. : ChangeLog
lily : source-file.cc
system-start-delimiter-engraver.cc
ly : engraver-init.ly
Log message:
add \defaultchild to InnerStaffGroup.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3726&tr2=1.3727&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/source-file.cc.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/system-start-delimiter-engraver.cc.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/engraver-init.ly.diff?tr1=1.234&tr2=1.235&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3726 lilypond/ChangeLog:1.3727
--- lilypond/ChangeLog:1.3726 Mon Jun 6 19:25:54 2005
+++ lilypond/ChangeLog Mon Jun 6 20:58:23 2005
@@ -1,5 +1,7 @@
2005-06-06 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * ly/engraver-init.ly: add \defaultchild to InnerStaffGroup.
+
* scm/ps-to-png.scm (gulp-port): rename from read. Don't redefine
system primitives.
(gulp-port): using read-string!/partial. We don't want to read an
Index: lilypond/lily/source-file.cc
diff -u lilypond/lily/source-file.cc:1.28 lilypond/lily/source-file.cc:1.29
--- lilypond/lily/source-file.cc:1.28 Mon May 2 12:39:28 2005
+++ lilypond/lily/source-file.cc Mon Jun 6 20:58:23 2005
@@ -234,6 +234,10 @@
while (left > 0)
{
wchar_t multibyte[2];
+
+ /*
+ FIXME, this is apparently locale dependent.
+ */
size_t thislen = mbrtowc (multibyte, line_chars, left, &state);
/* Stop converting at invalid character;
@@ -241,6 +245,7 @@
of a valid character. */
if (thislen == (size_t) -1)
break;
+
/* We want to handle embedded NUL bytes
but the return value is 0. Correct this. */
if (thislen == 0)
Index: lilypond/lily/system-start-delimiter-engraver.cc
diff -u lilypond/lily/system-start-delimiter-engraver.cc:1.63
lilypond/lily/system-start-delimiter-engraver.cc:1.64
--- lilypond/lily/system-start-delimiter-engraver.cc:1.63 Sun May 8
23:30:51 2005
+++ lilypond/lily/system-start-delimiter-engraver.cc Mon Jun 6 20:58:23 2005
@@ -52,9 +52,6 @@
&& scm_is_string (my_gl) && ly_c_equal_p (my_gl, scm_makfrom0str
("bracket")))
{
inf.grob ()->translate_axis (-0.8, X_AXIS); // ugh
- inf.grob ()->set_property ("arch-height",
- scm_make_real (scm_to_double (inf.grob
()->get_property
-
("arch-height")) + 0.5));
}
}
}
Index: lilypond/ly/engraver-init.ly
diff -u lilypond/ly/engraver-init.ly:1.234 lilypond/ly/engraver-init.ly:1.235
--- lilypond/ly/engraver-init.ly:1.234 Sat May 28 13:43:24 2005
+++ lilypond/ly/engraver-init.ly Mon Jun 6 20:58:23 2005
@@ -297,6 +297,8 @@
systemStartDelimiter = #'SystemStartBracket
\consists "System_start_delimiter_engraver"
+
+ \defaultchild "Staff"
\accepts "Staff"
\accepts "RhythmicStaff"
\accepts "DrumStaff"
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
