lilypond-1.3.101

diff --git a/input/test/markup.ly b/input/test/markup.ly
index 6ca28e3d5d7cdb276f4c2a836230fd9ae4be685d..f64a558d4e4407c3dc9f4e446e164dc9ca8b82cc 100644 (file)
--- a/input/test/markup.ly
+++ b/input/test/markup.ly
@@ -21,6 +21,7 @@
                \translator{
                        \ScoreContext
                        TextScript \push #'font-family = #'roman
+                       TextScript \push #'font-shape = #'upright
                        TextScript \pop #'no-spacing-rods
                        TextScript \push #'direction = #1
                }

diff --git a/lily/afm.cc b/lily/afm.cc
index 1efee6721313570c77390e7045b436721d0fbbd1..1745b683a35ac6c0217b71e5d3766d722367836a 100644 (file)
--- a/lily/afm.cc
+++ b/lily/afm.cc
@@ -95,7 +95,7 @@ read_afm_file (String nm)
 
   if (ok)
     {
-      error (_("Error parsing AFM file"));
+      error (_f ("Error parsing AFM file: %s", nm.ch_C ()));
       exit (2);
     }
   fclose (f);

diff --git a/lily/text-item.cc b/lily/text-item.cc
index c26d5509c643d500ec510ec2f256aafce8f632e2..b9207108a4f3199dc46fd55bae5ba7070f31bf4d 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -105,15 +105,13 @@ Text_item::string2molecule (Score_element *me, SCM text, SCM alist_chain)
   SCM proc  = gh_cdr (scm_assoc (ly_symbol2scm ("properties-to-font"), sheet));
   SCM font_name = gh_call2 (proc, fonts, alist_chain);
 
-#if 0   
-  SCM lookup = scm_assoc (ly_symbol2scm ("lookup"), properties);
+  SCM lookup = ly_assoc_chain (ly_symbol2scm ("lookup"), alist_chain);
 
   Molecule mol;
   if (gh_pair_p (lookup) && ly_symbol2string (gh_cdr (lookup)) == "name")
     mol = lookup_character (me, font_name, text);
   else
-#endif
-  Molecule mol = lookup_text (me, font_name, text);
+    mol = lookup_text (me, font_name, text);
   
   return mol;
 }
@@ -163,30 +161,32 @@ Text_item::markup_sentence2molecule (Score_element *me, SCM markup_sentence,
 {
   /*
     FIXME
+
+    huh?
    */
-  return Molecule ();
+  // return Molecule ();
   
   SCM sheet = me->paper_l ()->style_sheet_;
-  SCM f = gh_cdr (scm_assoc (ly_symbol2scm ("markup-abbrev-to-properties-alist"), sheet));
+  SCM f = gh_cdr (scm_assoc (ly_symbol2scm ("markup-to-properties"), sheet));
   
   SCM markup = gh_car (markup_sentence);
   SCM sentence = gh_cdr (markup_sentence);
   
-  SCM p = gh_cons  (gh_call1 (f, markup), alist_chain);
+  SCM p = gh_cons  (gh_call2 (f, sheet, markup), alist_chain);
 
   Axis align = X_AXIS;
-  SCM a = scm_assoc (ly_symbol2scm ("align"), p);
+  SCM a = ly_assoc_chain (ly_symbol2scm ("align"), p);
   if (gh_pair_p (a) && gh_number_p (gh_cdr (a)))
     align = (Axis)gh_scm2int (gh_cdr (a));
 
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Real kern = 0;
-  SCM k = scm_assoc (ly_symbol2scm ("kern"), p);
+  SCM k = ly_assoc_chain (ly_symbol2scm ("kern"), p);
   if (gh_pair_p (k) && gh_number_p (gh_cdr (k)))
     kern = gh_scm2double (gh_cdr (k)) * staff_space;
                             
   Real raise = 0;
-  SCM r = scm_assoc (ly_symbol2scm ("raise"), p);
+  SCM r = ly_assoc_chain (ly_symbol2scm ("raise"), p);
   if (gh_pair_p (r) && gh_number_p (gh_cdr (r)))
     raise = gh_scm2double (gh_cdr (r)) * staff_space;