From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 15 Mar 2006 13:48:10 +0000 (+0000)
Subject: * lily/tie-formatting-problem.cc (set_chord_outline): initialize
X-Git-Tag: release/2.7.39~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f52e35cada21e6bd31c188a06d0e8cf1ce03c853;p=lilypond.git

* 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 a29ecd407f..446f4ba915 100644
--- 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>
 
-	* 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>
diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc
index 7926652284..125fd3c252 100644
--- 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; 
     }
-	  
+  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);
diff --git a/python/convertrules.py b/python/convertrules.py
index 0e43d001fb..028efef4dd 100644
--- 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"""))
 
+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
diff --git a/scm/font.scm b/scm/font.scm
index 4173aa4242..8774042ca9 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -322,6 +322,7 @@
 		       (ly:pt 12)))))))
 
   (add-node 'upright 'normal) 
+  (add-node 'caps 'normal) 
   (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 3905e8da2c..5acc2238bc 100644
--- 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
-		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)