CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/04/19 17:29:12
Modified files:
lily : simple-spacer.cc
scripts : convert-ly.py
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/simple-spacer.cc.diff?tr1=1.79&tr2=1.80&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scripts/convert-ly.py.diff?tr1=1.237&tr2=1.238&r1=text&r2=text
Patches:
Index: lilypond/lily/simple-spacer.cc
diff -u lilypond/lily/simple-spacer.cc:1.79 lilypond/lily/simple-spacer.cc:1.80
--- lilypond/lily/simple-spacer.cc:1.79 Tue Apr 12 22:49:27 2005
+++ lilypond/lily/simple-spacer.cc Tue Apr 19 17:29:12 2005
@@ -273,10 +273,10 @@
by constraints, eg.
- =====
- | |
- o|o| x ##x
-
+ . =====
+ . | |
+ .o|o|x ##x
+ .
The ## forces the notes apart; we shouldn't allow the O's to touch
this closely.
@@ -418,7 +418,7 @@
for (int i = 0; i < cols.size () - 1; i++)
{
- for (SCM s = Spaceable_grob::get_minimum_distances (cols[i]);
+g for (SCM s = Spaceable_grob::get_minimum_distances (cols[i]);
scm_is_pair (s); s = scm_cdr (s))
{
Grob *other = unsmob_grob (scm_caar (s));
Index: lilypond/scripts/convert-ly.py
diff -u lilypond/scripts/convert-ly.py:1.237
lilypond/scripts/convert-ly.py:1.238
--- lilypond/scripts/convert-ly.py:1.237 Thu Apr 14 10:06:04 2005
+++ lilypond/scripts/convert-ly.py Tue Apr 19 17:29:12 2005
@@ -2137,7 +2137,7 @@
def conv (str):
if re.search ('textheight', str):
sys.stderr.write ('\n')
- sys.stderr.write (NOT_SMART % "tuning of page layout")
+ sys.stderr.write (NOT_SMART % "tuning of textheight")
sys.stderr.write ('\n')
sys.stderr.write (UPDATE_MANUALLY)
sys.stderr.write ('\n')
@@ -2153,7 +2153,6 @@
str = re.sub (r'\\([a-zA-Z]+)Context\b', func, str)
-
str = re.sub ('ly:paper-lookup', 'ly:output-def-lookup', str)
return str
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
