From d310a440c3b5a4d40b5adf01a0f027f65bddfea8 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Sun, 22 Jun 2003 22:57:13 +0000
Subject: [PATCH] * lily/line-spanner.cc (line_molecule): bugfix for trill
 style.

* scm/font.scm: remove properties-to-font-name code.

* scripts/convert-ly.py (FatalConversionError.conv): type -> style
conversion
---
 ChangeLog             |  4 ++++
 lily/line-spanner.cc  | 11 +++++------
 scm/font.scm          | 36 +++---------------------------------
 scm/lily.scm          | 10 ++++++++++
 scripts/convert-ly.py |  2 +-
 5 files changed, 23 insertions(+), 40 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index adca966ea9..c037ade55c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-06-23  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* lily/line-spanner.cc (line_molecule): bugfix for trill style.
+
+	* scm/font.scm: remove properties-to-font-name code.
+
 	* scm/define-grob-properties.scm: remove 'type
 
 	* scripts/convert-ly.py (FatalConversionError.conv): type -> style
diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index 541b242550..aa137fa38c 100644
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -148,14 +148,13 @@ Line_spanner::line_molecule (Grob *me, Real thick, Real dx, Real dy)
 	   && type == ly_symbol2scm ("trill"))
     {
       SCM alist_chain = Font_interface::font_alist_chain (me);
-      SCM style_chain = scm_list_n (gh_cons (ly_symbol2scm ("font-family"),
-					  ly_symbol2scm ("music")),
-				 SCM_UNDEFINED);
+      SCM style_alist = scm_list_n (gh_cons (ly_symbol2scm ("font-family"),
+					     ly_symbol2scm ("music")),
+				    SCM_UNDEFINED);
       
       Font_metric *fm = Font_interface::get_font (me,
-						  scm_list_n (style_chain,
-							   alist_chain,
-							   SCM_UNDEFINED));
+						  gh_cons (style_alist,
+							   alist_chain));
       Molecule m = fm->find_by_name ("scripts-trill-element");
       do
 	mol.add_at_edge (X_AXIS, RIGHT, m, 0,0);
diff --git a/scm/font.scm b/scm/font.scm
index 0d1cd0f5fa..34dd63b130 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -289,39 +289,9 @@ and warn if the selected font is not unique.
   ))
 
 
-(define (chain-assoc x alist-list)
-  (if (null? alist-list)
-      #f
-      (let* ((handle (assoc x (car alist-list))))
-	(if (pair? handle)
-	    handle
-	    (chain-assoc x (cdr alist-list))))))
-
-;; TODO
-;; the C++ version  in font-interface.cc is usually used.
-;;
-;; FIXME: this has silently been broken by the introduction
-;;        of wildcards in the font list.    
-(define (properties-to-font-name fonts properties-alist-list)
-  (let*  (
-	  ;; change order to change priorities of qualifiers.
-	  (q-order '(font-family font-series font-shape
-			       font-design-size font-relative-size))
-	  (rawqualifiers (map (lambda (x)
-				(chain-assoc x properties-alist-list))
-			      q-order))
-	  (qualifiers (filter-list pair? rawqualifiers))
-	  (selected (find-first-font qualifiers fonts))
-	  (err (current-error-port)))
-
-    (if (equal? selected "")
-	(begin
-	  (display "\ncouldn't find any font satisfying " err)
-	  (write qualifiers err)
-	  "cmr10"
-	  )
-	selected)	; return the topmost.
-    ))
+; there used to be a Scheme  properties-to-font-name function,
+; but that is  superseeded by the C++ version  out of speed concerns.
+
 
 (define-public (markup-to-properties abbrev-alist style-alist markup)
   "DOCME."
diff --git a/scm/lily.scm b/scm/lily.scm
index b38984f018..37b6812b28 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -90,6 +90,16 @@
   (string<? (symbol->string (car x))
 	    (symbol->string (car y))))
 
+
+
+(define (chain-assoc x alist-list)
+  (if (null? alist-list)
+      #f
+      (let* ((handle (assoc x (car alist-list))))
+	(if (pair? handle)
+	    handle
+	    (chain-assoc x (cdr alist-list))))))
+
 ;;;;;;;;;;;;;;;;
 ; list
 (define (tail lst)
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 8ced4b6a79..9093b73f05 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1204,7 +1204,7 @@ if 1:
 	def conv(str):
 		str = re.sub (
 			r"(set|override|revert) *#'type",
-			r"\1 #'style"
+			r"\1 #'style",
 			str)
 		return str
 	
-- 
2.39.5