* lily/text-item.cc (interpret_string): insert encoding setting

here

* lily/lyric-engraver.cc (try_music): remove superfluous check.

diff --git a/ChangeLog b/ChangeLog
index 9431b4a280c541c5f897ee8a9f23da197330edba..f5f79ce292d5ee3ac8110624fc765349e2744336 100644 (file)
--- 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 0d6fbd24c8b2e4ad69d79d38882e521dc6d309b9..efce4e698d703aa8f791d002c261815ad49f9e53 100644 (file)
--- 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 6b4ac2309a92729cd65315a5abc14bd13e9ba2d1..e82aa698c25de21e3faaac7e8c0acf5d86cd2769 100644 (file)
--- 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 bdeb54c017b9b6c52104d419c9bea740209fa76d..10fdc67ec0fa7783d9568d811bf2da7fb8a653a0 100644 (file)
--- 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);