* scripts/abc2ly.py (try_parse_comment): idem.

* scripts/lilypond-book.py (find_toplevel_snippets): use 'foo' in
bar_string iso. string.find()

diff --git a/ChangeLog b/ChangeLog
index 66a2ce59fc36d1347008f4289a737cdcaba54a06..49982cbc4d807358a38287d29fb023a873bc71d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
 2006-09-19  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * scripts/abc2ly.py (try_parse_comment): idem.
+
+       * scripts/lilypond-book.py (find_toplevel_snippets): use 'foo' in
+       bar_string iso. string.find()
+
        * lily/*.cc: idem.
 
        * lily/slur.cc (get_curve): always use scm_is_pair() looping
-       scheme lists.  Backportme.
+       scheme lists.  
 
 2006-09-18  Graham Percival  <gpermus@gmail.com>
 
@@ -107,7 +112,7 @@
 2006-09-16  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * scm/define-grobs.scm (all-grob-descriptions): oops, typo:
-       use spanner::set-spacing-ronds
+       use spanner::set-spacing-rods
 
        * lily/note-column.cc: reformat.
 
@@ -580,7 +585,7 @@
  
        * lily/grob.cc (get_print_stencil): use retval.expr() as base for
        color, not the original stencil. Fixes combinations of
-       color/transparency/rotation. Backportme.
+       color/transparency/rotation. 
 
        * scripts/lilypond-book.py (main): add --formats=eps for
        texinfo/latex.
@@ -1271,7 +1276,7 @@
        (get_line_configuration): don't use cols.resize(); it introduces
        initialized data.
 
-       * scm/framework-ps.scm (dump-page): add setstrokeadjust. Backportme.
+       * scm/framework-ps.scm (dump-page): add setstrokeadjust. 
 
        * ps/music-drawing-routines.ps: remove selectfont L1 hack.
 

diff --git a/THANKS b/THANKS
index 845778fcd831d7915d5bbde1fd3b20f11a38586a..76c9dabfa1ed8da443b7e7704718747228e86627 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -76,6 +76,7 @@ Markus Schneider
 Matti Aaltonen
 Michael Meixner
 Michael Welsh Duggan
+Milan Zamazal
 Orm Finnendahl
 Paul Scott
 Phillip Kirlin

diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index ba60c1cfeeb447230de77f191f2020c2e31f1576..9b15bfceb0e2d2d1971149ec04f14100300d11db 100644 (file)
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -1262,7 +1262,7 @@ def try_parse_comment (str):
 #convention, such as most music written before 1700, or ethnic music in
 #non-western scales, it is necessary to be able to tell a translator that
 #the barlines should not affect its interpretation of the pitch.  
-            if (string.find(str,'nobarlines') > 0):
+            if 'nobarlines' in str:
                 nobarlines = 1
         elif str[0:3] == '%LY':
             p = string.find(str, 'voices')

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 1c08e6a247d8581a2ad8d5881d0c3a8d3dbda394..1e368d455cc589d7b3740b5bc1e6ac2ce3cbce27 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -845,7 +845,7 @@ class Lilypond_snippet (Snippet):
         options = split_options (option_string)
 
         for i in options:
-            if string.find (i, '=') > 0:
+            if '=' in i:
                 (key, value) = re.split ('\s*=\s*', i)
                 self.option_dict[key] = value
             else: