CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/19 10:34:27
Modified files:
. : ChangeLog
input/mutopia : claop.py
input/regression: accidental-unbroken-tie-spacing.ly
number-staff-lines.ly
lily : ly-module.cc volta-bracket.cc volta-engraver.cc
Log message:
* lily/ly-module.cc (make_stand_in_procs_weak): only kludge if
scm_stand_in_procs is not weak_any.
* lily/volta-bracket.cc (print): don't use strcmp().
* lily/volta-engraver.cc (process_music): use
Text_interface::is_markup() for setting the 'text property of the
volta bracket.
* input/mutopia/claop.py (accents): update syntax to 2.6
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4041&tr2=1.4042&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/mutopia/claop.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/accidental-unbroken-tie-spacing.ly.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/number-staff-lines.ly.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/ly-module.cc.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/volta-bracket.cc.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/volta-engraver.cc.diff?tr1=1.71&tr2=1.72&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4041 lilypond/ChangeLog:1.4042
--- lilypond/ChangeLog:1.4041 Fri Aug 19 10:13:08 2005
+++ lilypond/ChangeLog Fri Aug 19 10:34:26 2005
@@ -1,5 +1,10 @@
2005-08-19 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/ly-module.cc (make_stand_in_procs_weak): only kludge if
+ scm_stand_in_procs is not weak_any.
+
+ * lily/volta-bracket.cc (print): don't use strcmp().
+
* lily/volta-engraver.cc (process_music): use
Text_interface::is_markup() for setting the 'text property of the
volta bracket.
Index: lilypond/input/mutopia/claop.py
diff -u lilypond/input/mutopia/claop.py:1.4 lilypond/input/mutopia/claop.py:1.5
--- lilypond/input/mutopia/claop.py:1.4 Fri Aug 19 10:13:08 2005
+++ lilypond/input/mutopia/claop.py Fri Aug 19 10:34:26 2005
@@ -266,7 +266,7 @@
for i in range(start_measure-1, start_measure-1+no_measures):
print16(str[i*16:i*16+16])
- sys.stdout.write (" |\n")
+ sys.stdout.write (" \n")
sys.stdout.write ("\\bar\"|.\" }\n")
@@ -298,12 +298,13 @@
%hsize = 30.0 \cm
%vsize = 42.0 \cm
}
-\context
-{
+\layout {
+ \context {
\translator {
\StaffContext
\override StaffSymbol #'line-count = #3
minimumVerticalExtent = #'(-3 . 3)
}
+ }
}
""")
Index: lilypond/input/regression/accidental-unbroken-tie-spacing.ly
diff -u lilypond/input/regression/accidental-unbroken-tie-spacing.ly:1.31
lilypond/input/regression/accidental-unbroken-tie-spacing.ly:1.32
--- lilypond/input/regression/accidental-unbroken-tie-spacing.ly:1.31 Thu Aug
18 13:43:05 2005
+++ lilypond/input/regression/accidental-unbroken-tie-spacing.ly Fri Aug
19 10:34:26 2005
@@ -6,14 +6,12 @@
\version "2.6.0"
-rechts = \relative c' {
+\relative c' {
\clef treble
\time 3/4
- c8 b2 <g b des f>8 ~ |
- <g b des f>8
+ c8 b2 <g b des f>8 ~ |
+ <g b des f>8
}
-
- \rechts
\layout {
raggedright = ##t
Index: lilypond/input/regression/number-staff-lines.ly
diff -u lilypond/input/regression/number-staff-lines.ly:1.37
lilypond/input/regression/number-staff-lines.ly:1.38
--- lilypond/input/regression/number-staff-lines.ly:1.37 Thu Aug 18
13:43:05 2005
+++ lilypond/input/regression/number-staff-lines.ly Fri Aug 19 10:34:26 2005
@@ -8,13 +8,10 @@
}
-\context Voice \relative c {
+\new Staff \with {
+ \override StaffSymbol #'line-count = #3
+}
+\relative c {
c' c c c | g' g g g \bar ":|"
}
-\layout {
- \context {
- \Staff
- \override StaffSymbol #'line-count = #3
- }
-
Index: lilypond/lily/ly-module.cc
diff -u lilypond/lily/ly-module.cc:1.50 lilypond/lily/ly-module.cc:1.51
--- lilypond/lily/ly-module.cc:1.50 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/ly-module.cc Fri Aug 19 10:34:26 2005
@@ -152,6 +152,9 @@
void
make_stand_in_procs_weak ()
{
+ if (SCM_IS_WHVEC_ANY(scm_stand_in_procs))
+ return;
+
SCM old_tab = scm_stand_in_procs;
SCM new_tab = scm_make_weak_key_hash_table (scm_from_int (257));
Index: lilypond/lily/volta-bracket.cc
diff -u lilypond/lily/volta-bracket.cc:1.48 lilypond/lily/volta-bracket.cc:1.49
--- lilypond/lily/volta-bracket.cc:1.48 Fri Aug 19 10:15:00 2005
+++ lilypond/lily/volta-bracket.cc Fri Aug 19 10:34:27 2005
@@ -53,7 +53,6 @@
else
str = "|";
- char const *cs = str.to_str0 ();
no_vertical_end
|= (str != ":|"
&& str != "|:"
Index: lilypond/lily/volta-engraver.cc
diff -u lilypond/lily/volta-engraver.cc:1.71
lilypond/lily/volta-engraver.cc:1.72
--- lilypond/lily/volta-engraver.cc:1.71 Fri Aug 19 10:13:08 2005
+++ lilypond/lily/volta-engraver.cc Fri Aug 19 10:34:27 2005
@@ -14,6 +14,7 @@
#include "side-position-interface.hh"
#include "warn.hh"
#include "staff-symbol.hh"
+#include "text-interface.hh"
#include "translator.icc"
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
