CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/05 11:28:29
Modified files:
. : ChangeLog
lily : key-engraver.cc key-signature-interface.cc
python : convertrules.py
scm : define-grob-properties.scm
Log message:
* lily/key-signature-interface.cc: change property name to
alteration-alist
* lily/key-engraver.cc (read_event): read keyAlterationOrder, not
keyAccidentalOrder
* python/convertrules.py (conv): keyAccidentalOrder ->
keyAlterationOrder
* lily/key-engraver.cc (create_key): always print a cancellation
for going to C-major/A-minor, regardless of printKeyCancellation.
(create_key): remove typecheck for visibility. This fixes key
signature not being printed.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3963&tr2=1.3964&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/key-engraver.cc.diff?tr1=1.120&tr2=1.121&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/key-signature-interface.cc.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/python/convertrules.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grob-properties.scm.diff?tr1=1.109&tr2=1.110&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3963 lilypond/ChangeLog:1.3964
--- lilypond/ChangeLog:1.3963 Fri Aug 5 11:20:49 2005
+++ lilypond/ChangeLog Fri Aug 5 11:28:29 2005
@@ -1,5 +1,14 @@
2005-08-05 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/key-signature-interface.cc: change property name to
+ alteration-alist
+
+ * lily/key-engraver.cc (read_event): read keyAlterationOrder, not
+ keyAccidentalOrder
+
+ * python/convertrules.py (conv): keyAccidentalOrder ->
+ keyAlterationOrder
+
* lily/key-engraver.cc (create_key): always print a cancellation
for going to C-major/A-minor, regardless of printKeyCancellation.
(create_key): remove typecheck for visibility. This fixes key
Index: lilypond/lily/key-engraver.cc
diff -u lilypond/lily/key-engraver.cc:1.120 lilypond/lily/key-engraver.cc:1.121
--- lilypond/lily/key-engraver.cc:1.120 Fri Aug 5 11:20:50 2005
+++ lilypond/lily/key-engraver.cc Fri Aug 5 11:28:29 2005
@@ -92,11 +92,11 @@
}
}
- cancellation_->set_property ("accidentals", restore);
+ cancellation_->set_property ("alteration-alist", restore);
cancellation_->set_property ("c0-position",
get_property ("middleCPosition"));
}
- item_->set_property ("accidentals", key);
+ item_->set_property ("alteration-alist", key);
}
if (!is_default)
@@ -169,7 +169,7 @@
SCM n = scm_list_copy (p);
SCM accs = SCM_EOL;
- for (SCM s = get_property ("keyAccidentalOrder");
+ for (SCM s = get_property ("keyAlterationOrder");
scm_is_pair (s); s = scm_cdr (s))
{
if (scm_is_pair (scm_member (scm_car (s), n)))
@@ -208,5 +208,5 @@
/* accepts */ "key-change-event",
/* reads */ "keySignature printKeyCancellation lastKeySignature
"
"explicitKeySignatureVisibility createKeyOnClefChange "
- "keyAccidentalOrder keySignature",
+ "keyAlterationOrder keySignature",
/* write */ "lastKeySignature tonic keySignature");
Index: lilypond/lily/key-signature-interface.cc
diff -u lilypond/lily/key-signature-interface.cc:1.37
lilypond/lily/key-signature-interface.cc:1.38
--- lilypond/lily/key-signature-interface.cc:1.37 Fri Aug 5 10:59:28 2005
+++ lilypond/lily/key-signature-interface.cc Fri Aug 5 11:28:29 2005
@@ -101,7 +101,7 @@
style = "";
}
- SCM newas = me->get_property ("accidentals");
+ SCM newas = me->get_property ("alteration-alist");
Stencil mol;
SCM c0s = me->get_property ("c0-position");
@@ -157,4 +157,4 @@
ADD_INTERFACE (Key_signature_interface, "key-signature-interface",
"A group of accidentals, to be printed as signature sign.",
- "style c0-position accidentals");
+ "style c0-position alteration-alist");
Index: lilypond/python/convertrules.py
diff -u lilypond/python/convertrules.py:1.8 lilypond/python/convertrules.py:1.9
--- lilypond/python/convertrules.py:1.8 Thu Jul 21 14:45:55 2005
+++ lilypond/python/convertrules.py Fri Aug 5 11:28:29 2005
@@ -2534,6 +2534,13 @@
'''ly:X-moment -> ly:moment-X'''))
+def conv (str):
+ str = re.sub('keyAccidentalOrder', 'keyAlterationOrder', str)
+ return str
+
+conversions.append (((2, 7, 4), conv,
+ '''keyAccidentalOrder->keyAlterationOrder'''))
+
################################################################
Index: lilypond/scm/define-grob-properties.scm
diff -u lilypond/scm/define-grob-properties.scm:1.109
lilypond/scm/define-grob-properties.scm:1.110
--- lilypond/scm/define-grob-properties.scm:1.109 Fri Aug 5 10:42:22 2005
+++ lilypond/scm/define-grob-properties.scm Fri Aug 5 11:28:29 2005
@@ -35,7 +35,9 @@
(Y-extent-callback ,procedure? "see @code{X-extent-callback}.")
(Y-offset-callbacks ,list? "see @code{X-offset-callbacks}.")
- (accidentals ,list? "List of alteration numbers.")
+ (accidentals ,list? "List of alteration numbers")
+ (alteration-alist ,list? "List of @code{(@var{pitch}
+. @var{accidental})} pairs for key signature.")
(add-stem-support ,boolean? "If set, the Stem object is included in this
script's support")
(align-dir ,ly:dir? "Which side to align? @code{-1}: left side,
@@ -336,8 +338,6 @@
(neutral-position ,number? "Position (in half staff spaces) where
to flip the direction of custos stem.")
- (new-accidentals ,list? "List of @code{(@var{pitch}
-. @var{accidental})} pairs.")
(next ,ly:grob? "Object that is next relation (eg. the lyric syllable
following an extender.")
(note-names ,vector? "Vector of strings containing names for
easy-notation note heads.")
@@ -349,9 +349,6 @@
(number-type ,symbol? "Type of numbers to use in label. Choices
include @code{roman-lower}, @code{roman-upper}, and @code{arabic}.")
- (old-accidentals ,list? "List of @code{(@var{pitch} . @var{accidental})
-pairs.}")
-
(padding ,ly:dimension? "Add this much extra space between
objects that are next to each other.")
(page-penalty ,number? "Penalty for page break at
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
