(process_lilypond_blocks): opps.

diff --git a/ChangeLog b/ChangeLog
index f39f1899dd73ccebf4336f593624860adbf9f31e..9bf7b85e5830f00ba6fac1be3c1eff45886fdc6f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,14 @@
+2003-06-15  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * scripts/lilypond-book.py (process_lilypond_blocks): opps.
+
 2003-06-15  Heikki Junes  <hjunes@cc.hut.fi>
 
        * README.mandrake: Change lilypond-extras to lilypond-documentation.
 
 2003-06-14  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
-       *  input/test/dpncnt.ly,part-combine-score.ly: remove.
+       * input/test/dpncnt.ly,part-combine-score.ly: remove.
 
        * VERSION (PACKAGE_NAME): release 1.7.21
 

diff --git a/input/regression/beam-chord.ly b/input/regression/beam-chord.ly
index f37883393e4e3084b2c3d47f34489f51973d44ad..bfbd0a7f12e58cd2371b145bf3dfbd791895c46b 100644 (file)
--- a/input/regression/beam-chord.ly
+++ b/input/regression/beam-chord.ly
@@ -8,24 +8,19 @@ the beam should be be horizontal.  "
 \score{
        \notes  \transpose c' c'{
 
-% this property doesn't appear to change the output in 1.7.19.
-\property Voice.Beam \set #'position-callbacks =
- #`(,Beam::least_squares
-                              ,Beam::check_concave
-                              ,Beam::slope_damping
-                              ,Beam::shift_region_to_valid
-       
-                             )
                 a'8-[ <<a' g''>>]
-                c-[ <<c e,>>]
                 a'16-[ <<a' g''>>]
-                c-[ <<c e,>>]
                 a'32-[ <<a' g''>>]
-                c-[ <<c e,>>]
+                a'8-[ <<f' c''>>]
+                a'16-[ <<f' c''>>]
+                a'32-[ <<f' c''>>]
+                a'16-[ <<f' c''>>]
+                c8-[ <<c e,>>]
+                c16-[ <<c e,>>]
+                c32-[ <<c e,>>]
        }
        \paper{
-
-               linewidth = 66.0\mm
+           raggedright = ##t 
        }
 }
 %% new-chords-done %%

diff --git a/input/test/trills.ly b/input/test/trills.ly
index e12b5eaffcb70e86cdbf24023cec3bb1ff612fd1..a88400fa6d833ce53b57cfd69ea16d156cab7f06 100644 (file)
--- a/input/test/trills.ly
+++ b/input/test/trills.ly
@@ -1,7 +1,3 @@
-
-% Generated automatically by: lilypond-book.py
-% options are filename=/var/fred/cvs/savannah/lilypond/input/test/trills.ly printfilename  
-
 \paper  {
   linewidth = 433.619940\pt
   

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index c7ebdc2c4d4e9f39b88791a7c818e53cd09f2548..c4981cb439974fc0f2c5795bb3fa79b54f2190a5 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -132,6 +132,7 @@
        (molecule-callback . ,Beam::brew_molecule)
        (concaveness-gap . 2.0)
        (concaveness-threshold . 0.08)
+       
        (positions . (#f . #f))
        (position-callbacks . (,Beam::least_squares
                               ,Beam::check_concave
@@ -168,7 +169,10 @@
        (flag-width-function . ,beam-flag-width-function)
        (damping . 1)
        (auto-knee-gap . 5.5)
-       (font-name . "cmr10")
+
+       ;; only for debugging.
+;      (font-name . "cmr10")
+       
        (space-function . ,Beam::space_function)
        (meta . ((interfaces . (staff-symbol-referencer-interface beam-interface spanner-interface))))
        ))
@@ -894,6 +898,8 @@
        
     (Stem
      . (
+
+       ;; this list is rather long. Trim --hwn
        (before-line-breaking-callback . ,Stem::before_line_breaking)
        (molecule-callback . ,Stem::brew_molecule)
        (thickness . 1.3)

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index bb0e4476554b58abcf3641a31df1605bea8d9da5..0a9c5c682da3276712f1e9f46ffb947ceec4715c 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1153,13 +1153,14 @@ def process_lilypond_blocks (chunks):#ugh rename
        newchunks = []
        # Count sections/chapters.
        for c in chunks:
-               cs = []
+               cs = [c]
                if c[0] == 'lilypond':
                        cs = schedule_lilypond_block (c)
                elif c[0] == 'numcols':
                        paperguru.m_num_cols = c[2]
                elif c[0] == 'multicols':
                        paperguru.m_multicols = c[2]
+                       
                newchunks += cs
                
        return newchunks