Be const correct in Open_type_font::index_to_charcode()

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

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 1b90dcfed37be657483adf359f40d8687305b0d2..6d18820b97e66eb83461a68ea1002e296623d15a 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2010 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
@@ -17,7 +17,10 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#define PANGO_ENABLE_BACKEND // ugh, why necessary?
+// Necessary for supporting pango_context_new() and
+// pango_context_set_font_map() in Pango < 1.22
+#define PANGO_ENABLE_BACKEND
+
 #include <pango/pangoft2.h>
 #include <freetype/ftxf86.h>
 
@@ -40,14 +43,14 @@
 #if HAVE_PANGO_FT2
 #include "stencil.hh"
 
-Pango_font::Pango_font (PangoFT2FontMap * /* fontmap */,
+Pango_font::Pango_font (PangoFT2FontMap *fontmap,
                        PangoFontDescription const *description,
                        Real output_scale)
 {
   physical_font_tab_ = scm_c_make_hash_table (11);
   PangoDirection pango_dir = PANGO_DIRECTION_LTR;
-  context_ = pango_ft2_get_context (PANGO_RESOLUTION,
-                                   PANGO_RESOLUTION);
+  context_ = pango_context_new ();
+  pango_context_set_font_map (context_, PANGO_FONT_MAP (fontmap));
 
   pango_description_ = pango_font_description_copy (description);
   attribute_list_ = pango_attr_list_new ();
@@ -121,9 +124,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item,
   PangoRectangle ink_rect;
   pango_glyph_string_extents (pgs, pa->font, &ink_rect, &logical_rect);
 
-  PangoFcFont *fcfont = G_TYPE_CHECK_INSTANCE_CAST (pa->font,
-                                                   PANGO_TYPE_FC_FONT,
-                                                   PangoFcFont);
+  PangoFcFont *fcfont = PANGO_FC_FONT (pa->font);
 
   FT_Face ftface = pango_fc_font_lock_face (fcfont);
 
@@ -300,20 +301,17 @@ Pango_font::physical_font_tab () const
 }
 
 Stencil
-Pango_font::word_stencil (string str, bool feta) const
+Pango_font::text_stencil (Output_def* state,
+                          string str, bool music_string) const
 {
-  return text_stencil (str, feta, true);
+  return text_stencil (str, music_string, false);
 }
 
-Stencil
-Pango_font::text_stencil (string str, bool feta) const
-{
-  return text_stencil (str, feta, false);
-}
+extern bool music_strings_to_paths;
 
 Stencil
 Pango_font::text_stencil (string str,
-                         bool feta,
+                         bool music_string,
                          bool tight) const
 {
   /*
@@ -367,21 +365,23 @@ Pango_font::text_stencil (string str,
       SCM utf8_string = ly_module_lookup (mod, ly_symbol2scm ("utf-8-string"));
       /*
        has_utf8_string should only be true when utf8_string is a
-       variable that is bound to a *named* procedure.
+       variable that is bound to a *named* procedure, i.e. not a
+       lambda expression.
       */
       if (utf8_string != SCM_BOOL_F
          && scm_procedure_name (SCM_VARIABLE_REF (utf8_string)) != SCM_BOOL_F)
        has_utf8_string = true;
     }
 
-  /*
-    The SVG backend only uses utf-8-string for the non-music
-    fonts, hence the check here.  --pmccarty
+  bool to_paths = music_strings_to_paths;
 
-    TODO: use a program option (-dmusic-strings-to-paths) here
-    instead that is enabled only when -dbackend=svg.
+  /*
+    Backends with the utf-8-string expression use it when
+      1) the -dmusic-strings-to-paths option is set
+         and `str' is not a music string, or
+      2) the -dmusic-strings-to-paths option is not set.
   */
-  if ((name == "svg" && !feta) || (name != "svg" && has_utf8_string))
+  if (has_utf8_string && ((to_paths && !music_string) || !to_paths))
     {
       // For Pango based backends, we take a shortcut.
       SCM exp = scm_list_3 (ly_symbol2scm ("utf-8-string"),