* scripts/musicxml2ly.py (convert): add \version

[lilypond.git] / lily / pango-select.cc

diff --git a/lily/pango-select.cc b/lily/pango-select.cc
index 708720486ecffea6a713c9452483813bb0392110..2fa33d506c4a002af3afa82ee0e9a245f705adfc 100644 (file)
--- a/lily/pango-select.cc
+++ b/lily/pango-select.cc
@@ -5,7 +5,6 @@
 
   (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
-#include <math.h>
 
 #include "dimensions.hh"
 #include "all-font-metrics.hh"
@@ -15,12 +14,12 @@
 PangoFontDescription *
 properties_to_pango_description (SCM chain, Real text_size)
 {
-  SCM name = ly_chain_assoc (ly_symbol2scm ("font-name"), chain);
+  SCM name = ly_chain_assoc_get (ly_symbol2scm ("font-name"), chain, SCM_BOOL_F);
 
   PangoFontDescription *description = 0;
-  if (scm_is_pair (name) && scm_is_string (scm_cdr (name)))
+  if (scm_is_string (name))
     {
-      String name_str = ly_scm2string (scm_cdr (name));
+      String name_str = ly_scm2string (name);
       description = pango_font_description_from_string (name_str.to_str0 ());
     }
   else
@@ -69,14 +68,10 @@ symbol_to_pango_style (SCM style)
 {
   PangoStyle pstyle = PANGO_STYLE_NORMAL;
   if (style == ly_symbol2scm ("italic"))
-    {
-      pstyle = PANGO_STYLE_ITALIC;
-    }
+    pstyle = PANGO_STYLE_ITALIC;
   else if (style == ly_symbol2scm ("oblique")
           || style == ly_symbol2scm ("slanted"))
-    {
-      pstyle = PANGO_STYLE_OBLIQUE;
-    }
+    pstyle = PANGO_STYLE_OBLIQUE;
 
   return pstyle;
 }
@@ -86,9 +81,7 @@ symbol_to_pango_variant (SCM variant)
 {
   PangoVariant pvariant = PANGO_VARIANT_NORMAL;
   if (variant == ly_symbol2scm ("caps"))
-    {
-      pvariant = PANGO_VARIANT_SMALL_CAPS;
-    }
+    pvariant = PANGO_VARIANT_SMALL_CAPS;
   return pvariant;
 }
 
@@ -97,25 +90,15 @@ symbol_to_pango_weight (SCM weight)
 {
   PangoWeight pw = PANGO_WEIGHT_NORMAL;
   if (weight == ly_symbol2scm ("bold"))
-    {
-      pw = PANGO_WEIGHT_BOLD;
-    }
+    pw = PANGO_WEIGHT_BOLD;
   if (weight == ly_symbol2scm ("heavy"))
-    {
-      pw = PANGO_WEIGHT_HEAVY;
-    }
+    pw = PANGO_WEIGHT_HEAVY;
   if (weight == ly_symbol2scm ("ultrabold"))
-    {
-      pw = PANGO_WEIGHT_ULTRABOLD;
-    }
+    pw = PANGO_WEIGHT_ULTRABOLD;
   if (weight == ly_symbol2scm ("light"))
-    {
-      pw = PANGO_WEIGHT_LIGHT;
-    }
+    pw = PANGO_WEIGHT_LIGHT;
   if (weight == ly_symbol2scm ("ultralight"))
-    {
-      pw = PANGO_WEIGHT_ULTRALIGHT;
-    }
+    pw = PANGO_WEIGHT_ULTRALIGHT;
 
   return pw;
 }