CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/08/11 23:28:07
Modified files:
lily : lily-guile.cc
buildscripts : fixcc.py
. : ChangeLog
Log message:
(parse_symbol_list): Bugfix.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/lily-guile.cc.diff?tr1=1.217&tr2=1.218&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/buildscripts/fixcc.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3993&tr2=1.3994&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3993 lilypond/ChangeLog:1.3994
--- lilypond/ChangeLog:1.3993 Thu Aug 11 13:00:47 2005
+++ lilypond/ChangeLog Thu Aug 11 23:28:07 2005
@@ -1,3 +1,7 @@
+2005-08-12 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * lily/lily-guile.cc (parse_symbol_list): Bugfix.
+
2005-08-11 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* mf/GNUmakefile (get-*-fonts): Rename from get-*-pfa. Copy SVG
Index: lilypond/buildscripts/fixcc.py
diff -u lilypond/buildscripts/fixcc.py:1.5 lilypond/buildscripts/fixcc.py:1.6
--- lilypond/buildscripts/fixcc.py:1.5 Wed Mar 16 19:19:15 2005
+++ lilypond/buildscripts/fixcc.py Thu Aug 11 23:28:07 2005
@@ -91,6 +91,9 @@
('\n[ \t]*,', ','),
# dangling semicolon
('\n[ \t]*;', ';'),
+ # delete gratuitous blocks
+ ('''(?ux)\n([
]|\t\s*){\n\s*(.*?)(?![{}]|\b(do|for|else|if|switch|while)\b);\n\s*}''',
+ '\n\\2;'),
# brace open
('(\w)[ \t]*([^\s]*){([ \t]*\n)', '\\1\\2\n{\n'),
# brace open backslash
@@ -588,6 +591,26 @@
(shift) *-d;
a = 0 ? *x : *y;
+
+{
+ if (foo)
+ {
+ a = 1;
+ }
+}
+
+ if (prev_delta_pitch < - 1)
+ {
+ glyph_name = "svaticana.reverse.plica";
+ }
+ if (prev_delta_pitch < - 1)
+ {
+ glyph_name = svaticana.reverse.plica;
+ }
+ if (prev_delta_pitch < - 1)
+ {
+ glyph_name = "2";
+ }
'''
def test ():
Index: lilypond/lily/lily-guile.cc
diff -u lilypond/lily/lily-guile.cc:1.217 lilypond/lily/lily-guile.cc:1.218
--- lilypond/lily/lily-guile.cc:1.217 Thu Aug 11 12:47:26 2005
+++ lilypond/lily/lily-guile.cc Thu Aug 11 23:28:07 2005
@@ -370,11 +370,13 @@
return s;
}
-/* LST is whitespace separated list of symbols. */
+/* SYMBOLS is a whitespace separated list. */
SCM
-parse_symbol_list (char const *lst)
+parse_symbol_list (char const *symbols)
{
- String s = lst;
+ while (isspace (*symbols))
+ *symbols++;
+ String s = symbols;
s.substitute ('\n', ' ');
s.substitute ('\t', ' ');
return ly_string_array_to_scm (String_convert::split (s, ' '));
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
