* lily/tie-formatting-problem.cc (set_chord_outline): initialize

outline with outer edge of note heads. This prevents infinity
problems with tied whole notes.

* scripts/lilypond-book.py (do_file): use os.popen

* python/convertrules.py (conv): add rule for Stem #'beamed-*

diff --git a/ChangeLog b/ChangeLog
index a29ecd407f9559e31e4177fe9dbc10ea874aee76..446f4ba915bcc684f63b9e7732236994ba31d2a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
+2006-03-15  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/tie-formatting-problem.cc (set_chord_outline): initialize
+       outline with outer edge of note heads. This prevents infinity
+       problems with tied whole notes.
+
+       * scripts/lilypond-book.py (do_file): use os.popen
+
+       * python/convertrules.py (conv): add rule for Stem #'beamed-*
+

 2006-03-14 Erik Sandberg  <mandolaerik@gmail.com>
 
 2006-03-14 Erik Sandberg  <mandolaerik@gmail.com>
 

-       * Documentaiton/user/invoking.itely: Add ragged-right to bug report
+       * Documentation/user/invoking.itely: Add ragged-right to bug report

        guidelines.
 
 2006-03-14  Graham Percival  <gpermus@gmail.com>
        guidelines.
 
 2006-03-14  Graham Percival  <gpermus@gmail.com>

diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc
index 7926652284619a936a3b9c5931517002c719009a..125fd3c252e4c77ea95a92ce8fd3cb6208abdbc2 100644 (file)
--- a/lily/tie-formatting-problem.cc
+++ b/lily/tie-formatting-problem.cc
@@ -113,7 +113,17 @@ Tie_formatting_problem::set_chord_outline (vector<Item*> bounds,
       Real x = robust_relative_extent (bounds[0],  x_refpoint_, X_AXIS)[-dir];
       chord_outlines_[dir].at (0).height_ = x; 
     }
       Real x = robust_relative_extent (bounds[0],  x_refpoint_, X_AXIS)[-dir];
       chord_outlines_[dir].at (0).height_ = x; 
     }

-         
+  else
+    {
+      Interval x;      
+      for (vsize i = 0; i < head_boxes.size (); i++)
+       {
+         x.unite (head_boxes[i][X_AXIS]);
+       }
+
+      chord_outlines_[dir].at (0).height_ = x[dir];
+    }
+

   for (vsize i = 0; i < boxes.size (); i++)
     insert_extent_into_skyline (&chord_outlines_[dir]  ,
                                boxes[i], Y_AXIS, -dir);
   for (vsize i = 0; i < boxes.size (); i++)
     insert_extent_into_skyline (&chord_outlines_[dir]  ,
                                boxes[i], Y_AXIS, -dir);

diff --git a/python/convertrules.py b/python/convertrules.py
index 0e43d001fb37afb39f54fc0d8945a76109d25e13..028efef4dd33c924e6c38a50aa1af8e636ddbc33 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2675,6 +2675,17 @@ def conv (str):
 conversions.append (((2, 7, 28), conv,
                     """ly:spanner-get-bound -> ly:spanner-bound"""))
 
 conversions.append (((2, 7, 28), conv,
                     """ly:spanner-get-bound -> ly:spanner-bound"""))
 

+def conv (str):
+       for a in ['beamed-lengths', 'beamed-minimum-free-lengths',
+                 'beamed-extreme-minimum-free-lengths']:
+               str = re.sub (r"\\override\s+Stem\s+#'%s" % a,
+                             r"\\override Stem #'details #'%s" % a,
+                             str)
+       return str
+
+conversions.append (((2, 7, 29), conv,
+                    """override Stem #'beamed-* -> #'details #'beamed-*"""))
+

 def conv (str):
        str = re.sub (r'\epsfile *#"', r'\epsfile #X #10 #"', str)
        return str
 def conv (str):
        str = re.sub (r'\epsfile *#"', r'\epsfile #X #10 #"', str)
        return str

diff --git a/scm/font.scm b/scm/font.scm
index 4173aa424269b79281269354cb1056538fa1f183..8774042ca90b87d8ef458f2e7ebbb828cec44fcb 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -322,6 +322,7 @@
                       (ly:pt 12)))))))
 
   (add-node 'upright 'normal) 
                       (ly:pt 12)))))))
 
   (add-node 'upright 'normal) 

+  (add-node 'caps 'normal) 

   (add-node 'upright 'bold) 
   (add-node 'italic 'normal)
   (add-node 'italic 'bold))
   (add-node 'upright 'bold) 
   (add-node 'italic 'normal)
   (add-node 'italic 'bold))

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 3905e8da2c60988d9d6a8a40c91c756d7175fd3f..5acc2238bc167a83d4a7e623442d742defb049fd 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1562,8 +1562,8 @@ def do_file (input_filename):
        else:
                if os.path.exists (input_filename):
                        input_fullname = input_filename
        else:
                if os.path.exists (input_filename):
                        input_fullname = input_filename

-               elif global_options.format == LATEX and ly.search_exe_path ('kpsewhich'): 
-                       input_fullname = os.read_pipe ('kpsewhich ' + input_filename).read()[:-1]
+               elif global_options.format == LATEX and ly.search_exe_path ('kpsewhich'):
+                       input_fullname = os.popen ('kpsewhich ' + input_filename).read()[:-1]

                else:
                        input_fullname = find_file (input_filename)
 
                else:
                        input_fullname = find_file (input_filename)