X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-interface.cc;h=bad6d50281f626ccce966a8e15200b9a4f80ea8d;hb=8cf69a467ad7650f5ca9da6fe2dfd4c7c088b239;hp=b8ec1d6c88f31b7077ff5caed0f83724b611728d;hpb=59a6d1a06432fc0ca88c3023c646182f389ec1b5;p=lilypond.git

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index b8ec1d6c88..bad6d50281 100644
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -35,8 +35,6 @@
 #include "warn.hh"
 #include "lily-imports.hh"
 
-using std::string;
-
 static void
 replace_special_characters (string &str, SCM props)
 {
@@ -47,7 +45,7 @@ replace_special_characters (string &str, SCM props)
   int max_length = 0;
   for (SCM s = replacement_alist; scm_is_pair (s); s = scm_cdr (s))
     {
-      max_length = std::max (max_length, scm_to_int
+      max_length = max (max_length, scm_to_int
                         (scm_string_length (scm_caar (s))));
     }
 
@@ -94,8 +92,44 @@ Text_interface::interpret_string (SCM layout_smob,
                                      SCM_BOOL_F);
   SCM music_encodings = Lily::all_music_font_encodings;
 
+  SCM features = ly_chain_assoc_get (ly_symbol2scm ("font-features"),
+                                     props,
+                                     SCM_BOOL_F);
+
+  // The font-features value is stored in a scheme list. This joins the entries
+  // with commas for processing with pango.
+  string features_str = string ();
+  if (scm_is_pair (features))
+    {
+      bool first = true;
+      for (SCM s = features; scm_is_pair (s); s = scm_cdr (s))
+        {
+          SCM feature = scm_car (s);
+          if (scm_is_string (feature))
+            {
+              if (first)
+                {
+                  first = false;
+                }
+              else
+                {
+                  features_str += ",";
+                }
+              features_str += ly_scm2string (feature);
+            }
+          else
+            {
+              scm_misc_error (__FUNCTION__, "Found non-string in font-features list", SCM_EOL);
+            }
+        }
+    }
+  else if (!scm_is_false (features))
+    {
+      scm_misc_error (__FUNCTION__, "Expecting a list for font-features value", SCM_EOL);
+    }
+
   bool is_music = scm_is_true (scm_memq (encoding, music_encodings));
-  return fm->text_stencil (layout, str, is_music).smobbed_copy ();
+  return fm->text_stencil (layout, str, is_music, features_str).smobbed_copy ();
 }
 
 static size_t markup_depth = 0;
@@ -136,6 +170,7 @@ Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup)
       scm_dynwind_unwind_handler (markup_down_depth, 0, SCM_F_WIND_EXPLICITLY);
       if (markup_depth > max_depth)
         {
+          scm_dynwind_end ();
           string name = ly_symbol2string (scm_procedure_name (func));
           // TODO: Also print the arguments of the markup!
           non_fatal_error (_f ("Markup depth exceeds maximal value of %d; "