From 78cd69d26cc09efc02d9ee587d5f29d928363071 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Thu, 29 Jul 2004 22:56:34 +0000
Subject: [PATCH] * lily/text-item.cc (interpret_string): insert encoding
 setting here

* lily/lyric-engraver.cc (try_music): remove superfluous check.
---
 ChangeLog                              |  6 ++++++
 input/mutopia/F.Schubert/morgenlied.ly |  1 +
 lily/lyric-engraver.cc                 | 12 ++++--------
 lily/text-item.cc                      |  4 +++-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9431b4a280..f5f79ce292 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-07-30  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* lily/text-item.cc (interpret_string): insert encoding setting
+	here
+
+	* scm/framework-ps.scm (ps-font-command): remove feta/parmesan
+	encoding kludge.
+
 	* Documentation/user/changing-defaults.itely (Text encoding): node
 	on encoding.
 
diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index 0d6fbd24c8..efce4e698d 100644
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -184,6 +184,7 @@ pianoLH =  \relative c'' \repeat volta 2 {
 	    \Staff
 	    minimumVerticalExtent = #'(-3. . 6)
 	}
+	inputencoding = "latin1"
     }
     \midi {
 	\tempo 4 = 70
diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 6b4ac2309a..e82aa698c2 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -43,14 +43,10 @@ Lyric_engraver::Lyric_engraver ()
 bool
 Lyric_engraver::try_music (Music*r)
 {
-  if (r->is_mus_type ("lyric-event"))
-    {
-      if (event_)
-	return false;
-      event_ =r;
-      return true;
-    }
-  return false;
+  if (event_)
+    return false;
+  event_ =r;
+  return true;
 }
 
 void
diff --git a/lily/text-item.cc b/lily/text-item.cc
index bdeb54c017..10fdc67ec0 100644
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -15,6 +15,7 @@
 #include "virtual-font-metric.hh"
 #include "output-def.hh"
 #include "scaled-font-metric.hh"
+#include "ly-module.hh"
 
 MAKE_SCHEME_CALLBACK (Text_item, interpret_string, 4)
 SCM
@@ -33,7 +34,8 @@ Text_item::interpret_string (SCM paper, SCM props, SCM encoding, SCM markup)
       SCM var = ly_module_lookup (pap->scope_,
 				  ly_symbol2scm ("inputencoding"));
       if (var != SCM_BOOL_F) 
-	input_enc_name = scm_variable_ref (var);
+	encoding = scm_variable_ref (var);
+      
     }
   
   Font_metric *fm = select_encoded_font (pap, props, encoding);
-- 
2.39.5