X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-select.cc;h=8091e466eebf379681ab767df4e39ae3852d0c78;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=a0cf0aaee3e8210ccb0155dfcccb6b2d385d72e5;hpb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;p=lilypond.git diff --git a/lily/pango-select.cc b/lily/pango-select.cc index a0cf0aaee3..8091e466ee 100644 --- a/lily/pango-select.cc +++ b/lily/pango-select.cc @@ -80,10 +80,10 @@ PangoStyle symbol_to_pango_style (SCM style) { PangoStyle pstyle = PANGO_STYLE_NORMAL; - if (style == ly_symbol2scm ("italic")) + if (scm_is_eq (style, ly_symbol2scm ("italic"))) pstyle = PANGO_STYLE_ITALIC; - else if (style == ly_symbol2scm ("oblique") - || style == ly_symbol2scm ("slanted")) + else if (scm_is_eq (style, ly_symbol2scm ("oblique")) + || scm_is_eq (style, ly_symbol2scm ("slanted"))) pstyle = PANGO_STYLE_OBLIQUE; return pstyle; @@ -93,7 +93,7 @@ PangoVariant symbol_to_pango_variant (SCM variant) { PangoVariant pvariant = PANGO_VARIANT_NORMAL; - if (variant == ly_symbol2scm ("caps")) + if (scm_is_eq (variant, ly_symbol2scm ("caps"))) pvariant = PANGO_VARIANT_SMALL_CAPS; return pvariant; } @@ -102,15 +102,15 @@ PangoWeight symbol_to_pango_weight (SCM weight) { PangoWeight pw = PANGO_WEIGHT_NORMAL; - if (weight == ly_symbol2scm ("bold")) + if (scm_is_eq (weight, ly_symbol2scm ("bold"))) pw = PANGO_WEIGHT_BOLD; - if (weight == ly_symbol2scm ("heavy")) + if (scm_is_eq (weight, ly_symbol2scm ("heavy"))) pw = PANGO_WEIGHT_HEAVY; - if (weight == ly_symbol2scm ("ultrabold")) + if (scm_is_eq (weight, ly_symbol2scm ("ultrabold"))) pw = PANGO_WEIGHT_ULTRABOLD; - if (weight == ly_symbol2scm ("light")) + if (scm_is_eq (weight, ly_symbol2scm ("light"))) pw = PANGO_WEIGHT_LIGHT; - if (weight == ly_symbol2scm ("ultralight")) + if (scm_is_eq (weight, ly_symbol2scm ("ultralight"))) pw = PANGO_WEIGHT_ULTRALIGHT; return pw;