X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-select.cc;h=8091e466eebf379681ab767df4e39ae3852d0c78;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=cb05b0c183037f6e4c472253288be2bbfaa89936;hpb=d61cf3bbdb1c6670a127ba3baddf2f04d3e34fd3;p=lilypond.git

diff --git a/lily/pango-select.cc b/lily/pango-select.cc
index cb05b0c183..8091e466ee 100644
--- a/lily/pango-select.cc
+++ b/lily/pango-select.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 
 #include "dimensions.hh"
 #include "all-font-metrics.hh"
+#include "libc-extension.hh"
 #include "output-def.hh"
 #include "pango-font.hh"
 
@@ -54,7 +55,8 @@ properties_to_pango_description (SCM chain, Real text_size)
                                  0.0);
   Real size = text_size * pow (2.0, step / 6.0);
 
-  pango_font_description_set_size (description, gint (size * PANGO_SCALE));
+  pango_font_description_set_size (description,
+                                   gint (my_round (size * PANGO_SCALE)));
   return description;
 }
 
@@ -78,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;
@@ -91,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;
 }
@@ -100,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;