* buildscripts/output-distance.py (ComparisonData.compare_trees):

fixes. Don't follow symlinks.
(ComparisonData.create_html_result_page): remove previous results.

* scripts/lilypond-book.py (PREAMBLE_LY): spacing fixes.

diff --git a/ChangeLog b/ChangeLog
index f1eae2efef41f30011547b7859af5b95b66a9955..c0671abbf4348c77269e968c8e094c3132d02f16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-31  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * buildscripts/output-distance.py (ComparisonData.compare_trees):
+       fixes. Don't follow symlinks.
+       (ComparisonData.create_html_result_page): remove previous results.
+
+       * scripts/lilypond-book.py (PREAMBLE_LY): spacing fixes.
+
 2006-05-31  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * config.make.in (datadir): Add datarootdir to silence autoconf.

diff --git a/buildscripts/output-distance.py b/buildscripts/output-distance.py
index a19380f1f28b4c9cfbd4aad84749d89e3c733954..64811dbaa9448a8ebd30144dbef753737f9c48a3 100644 (file)
--- a/buildscripts/output-distance.py
+++ b/buildscripts/output-distance.py
@@ -217,10 +217,13 @@ class ComparisonData:
     def compare_trees (self, dir1, dir2):
         self.compare_directories (dir1, dir2)
         
-        (root, files, dirs) = os.walk (dir1).next ()
+        (root, dirs, files) = os.walk (dir1).next ()
         for d in dirs:
             d1 = os.path.join (dir1, d)
             d2 = os.path.join (dir2, d)
+
+            if os.path.islink (d1) or os.path.islink (d2):
+                continue
             
             if os.path.isdir (d2):
                 self.compare_trees (d1, d2)
@@ -278,13 +281,16 @@ class ComparisonData:
 
         html = ''
         old_prefix = os.path.split (dir1)[1]
-        os.mkdir (dir2 + '/' + old_prefix)
+
+        dest_dir = os.path.join (dir2, old_prefix)
+        shutil.rmtree  (dest_dir, ignore_errors=True)
+        os.mkdir (dest_dir)
         for (score, oldfile, newfile) in  results:
             old_base = re.sub ("-[0-9]+.signature", '', os.path.split (oldfile)[1])
             new_base = re.sub ("-[0-9]+.signature", '', newfile)
             
             for ext in 'png', 'ly':
-                shutil.copy2 (old_base + '.' + ext, dir2 + '/' + old_prefix)
+                shutil.copy2 (old_base + '.' + ext, dest_dir)
 
             img_1 = os.path.join (old_prefix, old_base + '.png')
             ly_1 = os.path.join (old_prefix, old_base + '.ly')

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 654f5dd8df3e2f05c9824e9ef25d4300fe743fd4..eccde2b154d664cd379cd669eeb5ebc1faf85820 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -148,6 +148,7 @@ contained staves are not connected vertically."
   \consists "Time_signature_engraver"
   \consists "Instrument_name_engraver"
   \consists "Axis_group_engraver"
+  \consists "Ledger_line_engraver" 
   
   \accepts "Voice"
   \accepts "CueVoice"

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 486d21fedb92d2122b40b68f60aa43d1f809fbbc..70ab6a935f7305bff14d708e2a987156e53e9dbd 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -646,10 +646,10 @@ PREAMBLE_LY = '''%%%% Generated by %(program_name)s
 
 #(set! toplevel-score-handler print-score-with-defaults)
 #(set! toplevel-music-handler
- (lambda (p m)
- (if (not (eq? (ly:music-property m \'void) #t))
-    (print-score-with-defaults
-    p (scorify-music m p)))))
+  (lambda (p m)
+   (if (not (eq? (ly:music-property m \'void) #t))
+        (print-score-with-defaults
+        p (scorify-music m p)))))
 
 #(ly:set-option (quote no-point-and-click))
 #(define inside-lilypond-book #t)
@@ -666,13 +666,13 @@ PREAMBLE_LY = '''%%%% Generated by %(program_name)s
 %% ****************************************************************
 
 \paper {
- #(define dump-extents #t)
- %(font_dump_setting)s
- %(paper_string)s
+  #(define dump-extents #t)
+  %(font_dump_setting)s
+  %(paper_string)s
 }
 
 \layout {
- %(layout_string)s
+  %(layout_string)s
 }
 '''