Changeset 704

Timestamp:

06/29/08 06:58:48 (8 weeks ago)

Author:

artem

Message:

applied font fallback patch from Beau Gunderson

Location:

trunk

Files:

• include/mapnik/font_engine_freetype.hpp (modified) (12 diffs)
• include/mapnik/map.hpp (modified) (2 diffs)
• include/mapnik/text_symbolizer.hpp (modified) (4 diffs)
• src/SConscript (modified) (1 diff)
• src/agg_renderer.cpp (modified) (6 diffs)
• src/load_map.cpp (modified) (9 diffs)
• src/map.cpp (modified) (1 diff)
• src/text_symbolizer.cpp (modified) (5 diffs)

trunk/include/mapnik/font_engine_freetype.hpp

@@ -31 +31 @@
 #include <mapnik/geometry.hpp>
 #include <mapnik/text_path.hpp>
+#include <mapnik/font_set.hpp>
 
 // freetype2
@@ -62 +63 @@
     {
     public:
-        typedef std::pair<unsigned,unsigned> dimension_t;
-
-        font_face(FT_Face face)
+        font_face(FT_Face face)
             : face_(face) {}
         
@@ -105 +104 @@
         }
               
+        ~font_face()
+        {
+#ifdef MAPNIK_DEBUG
+            std::clog << "~font_face: Clean up face \"" << family_name()
+                << " " << style_name() << "\"" << std::endl;
+#endif
+            FT_Done_Face(face_);
+        }
+        
+    private:
+        FT_Face face_;
+    };
+    
+    typedef boost::shared_ptr<font_face> face_ptr;
+   
+    class MAPNIK_DECL freetype_engine  // : public mapnik::singleton<freetype_engine,mapnik::CreateStatic>,
+         // private boost::noncopyable
+    {
+       // friend class mapnik::CreateStatic<freetype_engine>;
+      public:
+        static bool register_font(std::string const& file_name);
+        static std::vector<std::string> face_names ();
+        face_ptr create_face(std::string const& family_name);
+        virtual ~freetype_engine();
+        freetype_engine();
+      private:
+        FT_Library library_;
+        static boost::mutex mutex_;
+        static std::map<std::string,std::string> name2file_;
+    }; 
+    
+    template <typename T>
+    class MAPNIK_DECL face_manager : private boost::noncopyable
+    {
+        typedef T font_engine_type;
+        typedef std::map<std::string,face_ptr> faces;
+        
+    public:
+        face_manager(T & engine)
+           : engine_(engine) {}
+        
+        face_ptr get_face(std::string const& name)
+        {
+            typename faces::iterator itr;
+            itr = faces_.find(name);
+            if (itr != faces_.end())
+            {
+                return itr->second;
+            }
+            else
+            {
+                face_ptr face = engine_.create_face(name);
+                if (face)
+                {
+                    faces_.insert(make_pair(name,face));
+                }
+                return face;    
+            }
+        }
+    private:
+        faces faces_;
+        font_engine_type & engine_;
+    };
+        
+    template <typename T>
+    struct text_renderer : private boost::noncopyable
+    {
+        typedef std::pair<unsigned,unsigned> dimension_t;
+        
+        struct glyph_t : boost::noncopyable
+        {
+            FT_Glyph image;
+            glyph_t(FT_Glyph image_) : image(image_) {}
+            ~glyph_t () { FT_Done_Glyph(image);}
+        };
+        
+        typedef boost::ptr_vector<glyph_t> glyphs_t;
+        typedef T pixmap_type;
+        
+        text_renderer (pixmap_type & pixmap, std::vector<face_ptr> faces)
+            : pixmap_(pixmap),
+              faces_(faces),
+              fill_(0,0,0), 
+              halo_fill_(255,255,255),
+              halo_radius_(0) {}
+
         dimension_t character_dimensions(const unsigned c)
         {
@@ -111 +196 @@
             FT_Error  error;
             
-            FT_GlyphSlot slot = face_->glyph;
-            
             pen.x = 0;
             pen.y = 0;
@@ -118 +201 @@
             FT_BBox glyph_bbox; 
             FT_Glyph image;
-            
+                    
+            FT_Face face = (*faces_.begin())->get_face();
+            
+            FT_UInt glyph_index = FT_Get_Char_Index(face, c);
+                 
+            // If there's no glyph_index we loop through the remaining fonts
+            // in the fontset looking for one.
+            if (!glyph_index) {
+                std::vector<face_ptr>::iterator itr = faces_.begin();
+                std::vector<face_ptr>::iterator end = faces_.end();
+                
+                ++itr; // Skip the first one, we already tried it.
+                
+                for (; itr != end; ++itr)
+                {
+                    FT_Face f = (*itr)->get_face();
+                    
+                    glyph_index = FT_Get_Char_Index(f, c);
+
+                    if (glyph_index) {
+                        face = f;
+                        break;
+                    }
+                }
+            }
+
             matrix.xx = (FT_Fixed)( 1 * 0x10000L ); 
             matrix.xy = (FT_Fixed)( 0 * 0x10000L ); 
             matrix.yx = (FT_Fixed)( 0 * 0x10000L ); 
             matrix.yy = (FT_Fixed)( 1 * 0x10000L );
-                    
-            FT_Set_Transform (face_,&matrix,&pen);
-            
-            FT_UInt glyph_index = FT_Get_Char_Index( face_, c);
-            
-            error = FT_Load_Glyph (face_,glyph_index,FT_LOAD_NO_HINTING); 
+            
+            FT_Set_Transform(face, &matrix, &pen);
+
+            error = FT_Load_Glyph (face, glyph_index, FT_LOAD_NO_HINTING); 
             if ( error )
                 return dimension_t(0, 0);
             
-            error = FT_Get_Glyph( face_->glyph, &image);
+            error = FT_Get_Glyph(face->glyph, &image);
             if ( error )
                 return dimension_t(0, 0);
-            
-            FT_Glyph_Get_CBox(image,ft_glyph_bbox_pixels, &glyph_bbox); 
-            FT_Done_Glyph(image); 
-            return dimension_t(slot->advance.x >> 6, glyph_bbox.yMax - glyph_bbox.yMin);
+
+            FT_Glyph_Get_CBox(image, ft_glyph_bbox_pixels, &glyph_bbox); 
+            FT_Done_Glyph(image);
+
+            unsigned tempx = face->glyph->advance.x >> 6;
+            unsigned tempy = glyph_bbox.yMax - glyph_bbox.yMin;
+
+            //std::clog << "glyph: " << glyph_index << " x: " << tempx << " y: " << tempy << std::endl;
+
+            return dimension_t(tempx, tempy);
         }
         
@@ -188 +300 @@
                         if ( *arabic.getBuffer() >= 0x0600 && *arabic.getBuffer() <= 0x06ff)
                         {
-                            
                            UnicodeString shaped;
                            u_shapeArabic(arabic.getBuffer(),arabic.length(),shaped.getBuffer(arabic.length()),arabic.length(),
@@ -216 +327 @@
             info.set_dimensions(width, height);
         }
-        
-        ~font_face()
-        {
-#ifdef MAPNIK_DEBUG
-            std::clog << "clean up face:" << family_name()<<":" << style_name() << std::endl;
-#endif
-            FT_Done_Face(face_);
-        }
-        
-    private:
-        FT_Face face_;
-    };
-    
-   typedef boost::shared_ptr<font_face> face_ptr;
-   class MAPNIK_DECL freetype_engine  // : public mapnik::singleton<freetype_engine,mapnik::CreateStatic>,
-         // private boost::noncopyable
-    {
-       // friend class mapnik::CreateStatic<freetype_engine>;
-      public:
-        static bool register_font(std::string const& file_name);
-        static std::vector<std::string> face_names ();
-        face_ptr create_face(std::string const& family_name);
-        virtual ~freetype_engine();
-        freetype_engine();
-      private:
-        FT_Library library_;
-        static boost::mutex mutex_;
-        static std::map<std::string,std::string> name2file_;
-    }; 
-    
-    template <typename T>
-    class MAPNIK_DECL face_manager : private boost::noncopyable
-    {
-        typedef T font_engine_type;
-        typedef std::map<std::string,face_ptr> faces;
-        
-    public:
-        face_manager(T & engine)
-           : engine_(engine) {}
-        
-        face_ptr get_face(std::string const& name)
-        {
-            typename faces::iterator itr;
-            itr = faces_.find(name);
-            if (itr != faces_.end())
-            {
-                return itr->second;
-            }
-            else
-            {
-                face_ptr face = engine_.create_face(name);
-                if (face)
-                {
-                    faces_.insert(make_pair(name,face));
-                }
-                return face;    
-            }
-        }
-    private:
-        faces faces_;
-        font_engine_type & engine_;
-    };
-        
-    template <typename T>
-    struct text_renderer : private boost::noncopyable
-    {
-        struct glyph_t : boost::noncopyable
-        {
-            FT_Glyph image;
-            glyph_t(FT_Glyph image_) : image(image_) {}
-            ~glyph_t () { FT_Done_Glyph(image);}
-        };
-        
-        typedef boost::ptr_vector<glyph_t> glyphs_t;
-        typedef T pixmap_type;
-        
-        text_renderer (pixmap_type & pixmap, face_ptr face)
-            : pixmap_(pixmap),
-              face_(face),
-              fill_(0,0,0), 
-              halo_fill_(255,255,255),
-              halo_radius_(0) {}
-    
+
         void set_pixel_size(unsigned size)
         {
-            face_->set_pixel_sizes(size);
+            std::vector<face_ptr>::iterator itr = faces_.begin();
+            std::vector<face_ptr>::iterator end = faces_.end();
+            for (; itr != end; ++itr)
+            {
+                (*itr)->set_pixel_sizes(size);
+            }
         }
     
@@ -327 +361 @@
             FT_Vector pen;
             FT_Error  error;
-            
-            FT_Face face = face_->get_face();
-            //            FT_GlyphSlot slot = face->glyph;
-            
+
             FT_BBox bbox;   
-            bbox.xMin = bbox.yMin = 32000; 
-            bbox.xMax = bbox.yMax = -32000; //hmm?? 
-            
+            bbox.xMin = bbox.yMin = 32000;  // Initialize these so we can tell if we
+            bbox.xMax = bbox.yMax = -32000; // properly grew the bbox later
+            
+            std::vector<face_ptr>::iterator end = faces_.end();
+            
             for (int i = 0; i < path->num_nodes(); i++) 
             {
                 int c;
                 double x, y, angle;
-                
+
                 path->vertex(&c, &x, &y, &angle);
-//                std::clog << "   prepare_glyph: " << (unsigned char)c << "," << x << "," << y << "," << angle << std::endl;
-
+
+#ifdef MAPNIK_DEBUG
+                // TODO Enable when we have support for setting verbosity
+                //std::clog << "prepare_glyphs: " << c << "," << x << 
+                //    "," << y << "," << angle << std::endl;
+#endif
 
                 FT_BBox glyph_bbox; 
@@ -350 +387 @@
                 pen.y = int(y * 64);
                         
+                FT_Face face = (*faces_.begin())->get_face();
+
+                FT_UInt glyph_index = FT_Get_Char_Index(face, unsigned(c));
+                     
+                // If there's no glyph_index we loop through the remaining fonts
+                // in the fontset looking for one.
+                if (!glyph_index) {
+                    std::vector<face_ptr>::iterator itr = faces_.begin();
+                    ++itr; // Skip the first one, we already tried it.
+                    
+                    for (; itr != end; ++itr)
+                    {
+#ifdef MAPNIK_DEBUG
+                        // TODO Enable when we have support for setting verbosity
+                        //std::clog << "prepare_glyphs: Falling back to font named \""
+                        //    << (*itr)->family_name() << " " << (*itr)->style_name()
+                        //    << "\"" << std::endl;
+#endif
+
+                        FT_Face f = (*itr)->get_face();
+                        
+                        glyph_index = FT_Get_Char_Index(f, unsigned(c));
+
+                        if (glyph_index) {
+                            face = f;
+                            break;
+                        }
+                    }
+
+#ifdef MAPNIK_DEBUG
+                    // TODO Enable when we have support for setting verbosity
+                    //if (!glyph_index) {
+                    //    std::clog << "prepare_glyphs: Failed to fall back, glyph "
+                    //        << c << " not found in any font." << std::endl;
+                    //}
+#endif
+                }
+
                 matrix.xx = (FT_Fixed)( cos( angle ) * 0x10000L ); 
                 matrix.xy = (FT_Fixed)(-sin( angle ) * 0x10000L ); 
                 matrix.yx = (FT_Fixed)( sin( angle ) * 0x10000L ); 
                 matrix.yy = (FT_Fixed)( cos( angle ) * 0x10000L );
-                
-                FT_Set_Transform (face,&matrix,&pen);
-                
-                FT_UInt glyph_index = FT_Get_Char_Index( face, unsigned(c));
-                
-                error = FT_Load_Glyph (face,glyph_index, FT_LOAD_NO_HINTING); 
+
+                FT_Set_Transform(face, &matrix, &pen);
+
+                error = FT_Load_Glyph(face, glyph_index, FT_LOAD_NO_HINTING); 
                 if ( error )
                     continue;
-                
-                error = FT_Get_Glyph( face->glyph, &image);
+
+                error = FT_Get_Glyph(face->glyph, &image);
                 if ( error )
                     continue;
-                
+
                 FT_Glyph_Get_CBox(image,ft_glyph_bbox_pixels, &glyph_bbox); 
                 if (glyph_bbox.xMin < bbox.xMin) 
@@ -376 +449 @@
                 if (glyph_bbox.yMax > bbox.yMax) 
                     bbox.yMax = glyph_bbox.yMax;
-                
+        
+                // Check if we properly grew the bbox
                 if ( bbox.xMin > bbox.xMax )
                 {
@@ -485 +559 @@
     
         pixmap_type & pixmap_;
-        face_ptr face_;
+        std::vector<face_ptr> faces_;
         mapnik::Color fill_;
         mapnik::Color halo_fill_;
@@ -495 +569 @@
 }
 
-
 #endif // FONT_ENGINE_FREETYPE_HPP

trunk/include/mapnik/map.hpp

@@ -45 +45 @@
         boost::optional<Color> background_;
         std::map<std::string,feature_type_style> styles_;
+        std::map<std::string,FontSet> fontsets_;
         std::vector<Layer> layers_;
         Envelope<double> currentExtent_;
@@ -129 +130 @@
          */
         feature_type_style const& find_style(std::string const& name) const;
+
+        /*! \brief Insert a fontset into the map.
+         *  @param name The name of the fontset.
+         *  @param style The fontset to insert.
+         *  @return true If success.
+         *  @return false If failure.
+         */
+        bool insert_fontset(std::string const& name, FontSet const& fontset);
+       
+        /*! \brief Find a fontset.
+         *  @param name The name of the fontset.
+         *  @return The fontset if found. If not found return the default map fontset.
+         */
+        FontSet const& find_fontset(std::string const& name) const;
 
         /*! \brief Get number of all layers.

trunk/include/mapnik/text_symbolizer.hpp

@@ -28 +28 @@
 #include <mapnik/enumeration.hpp>
 #include <mapnik/color.hpp>
-#include <mapnik/graphics.hpp> 
+#include <mapnik/font_set.hpp>
+#include <mapnik/graphics.hpp>
 // boost
 #include <boost/tuple/tuple.hpp>
@@ -50 +51 @@
          text_symbolizer(std::string const& name,std::string const& face_name, 
                          unsigned size, Color const& fill);     
+         text_symbolizer(std::string const& name, unsigned size, Color const& fill);    
          text_symbolizer(text_symbolizer const& rhs);
          text_symbolizer& operator=(text_symbolizer const& rhs);
@@ -67 +69 @@
          unsigned get_text_size() const;
          std::string const& get_face_name() const;
+         void set_face_name(std::string face_name);
+         FontSet const& get_fontset() const;
+         void set_fontset(FontSet fontset);
          Color const& get_fill() const;
          void set_halo_fill(Color const& fill);
@@ -87 +92 @@
          std::string name_;
          std::string face_name_;
+         FontSet fontset_;
          unsigned size_;
          unsigned text_ratio_;

trunk/src/SConscript

@@ -48 +48 @@
     filter_factory.cpp
     font_engine_freetype.cpp
+    font_set.cpp
     graphics.cpp
     image_reader.cpp

trunk/src/agg_renderer.cpp

@@ -30 +30 @@
 #include <mapnik/arrow.hpp>
 #include <mapnik/config_error.hpp>
+#include <mapnik/font_set.hpp>
 
 // agg
@@ -281 +282 @@
                frame->move_to(itr->get<0>(),itr->get<1>());
                frame->line_to(itr->get<0>(),itr->get<1>()+height);   
-               
             }
             
@@ -311 +311 @@
             ren.color(agg::rgba8(r, g, b, int(255 * sym.get_opacity())));
             agg::render_scanlines(*ras_ptr, sl, ren);
-            
          }
       }
@@ -461 +460 @@
       if (text.length() > 0 && data)
       {
-         face_ptr face = font_manager_.get_face(sym.get_face_name());
-         if (face)
-         {
-            text_renderer<mapnik::Image32> ren(pixmap_,face);
+         std::vector<face_ptr> faces;
+                        
+         faces.push_back(font_manager_.get_face(sym.get_face_name()));
+         
+         if (faces.size() > 0)
+         {
+            text_renderer<mapnik::Image32> ren(pixmap_, faces);
+            
             ren.set_pixel_size(sym.get_text_size());
             ren.set_fill(sym.get_fill());
             
             string_info info(text);
-            face->get_string_info(info);
+
+            ren.get_string_info(info);
             
             placement_finder<label_collision_detector4> finder(detector_);
@@ -670 +674 @@
       if ( text.length() > 0 )
       {
-         Color const& fill  = sym.get_fill();
-         face_ptr face = font_manager_.get_face(sym.get_face_name());
-         if (face)
-         {
-            text_renderer<mapnik::Image32> ren(pixmap_,face);
+         Color const& fill = sym.get_fill();
+
+         std::vector<face_ptr> faces;
+    
+         FontSet fontset = sym.get_fontset();
+         std::vector<std::string> face_names = fontset.get_face_names();
+    
+         if (face_names.size() > 0)
+         {
+            std::vector<std::string>::iterator itr = face_names.begin();
+            std::vector<std::string>::iterator end = face_names.end();
+
+            for (; itr != end; ++itr)
+            {
+               faces.push_back(font_manager_.get_face(*itr));
+            }
+         }
+         else 
+         {
+            faces.push_back(font_manager_.get_face(sym.get_face_name()));
+         }
+     
+         if (faces.size() > 0)
+         {
+            text_renderer<mapnik::Image32> ren(pixmap_, faces);
             ren.set_pixel_size(sym.get_text_size());
             ren.set_fill(fill);
@@ -683 +707 @@
            
             string_info info(text);
-            face->get_string_info(info);
+            
+            ren.get_string_info(info);
             unsigned num_geom = feature.num_geometries();
             for (unsigned i=0;i<num_geom;++i)

trunk/src/load_map.cpp

@@ -30 +30 @@
 #include <mapnik/datasource_cache.hpp>
 #include <mapnik/font_engine_freetype.hpp>
+#include <mapnik/font_set.hpp>
 
 #include <mapnik/ptree_helpers.hpp>
@@ -67 +68 @@
          void parse_style( Map & map, ptree const & sty);
          void parse_layer( Map & map, ptree const & lay);
-         
+        
+         void parse_fontset(Map & map, ptree const & fset);
+         void parse_font(FontSet & fset, ptree const & f);
+     
          void parse_rule( feature_type_style & style, ptree const & r);
          
@@ -80 +84 @@
          void parse_markers_symbolizer( rule_type & rule, ptree const & sym );
          
-         void ensure_font_face( const text_symbolizer & text_symbol );
+         void ensure_font_face( const std::string & face_name );
          
          bool strict_;
@@ -87 +91 @@
          face_manager<freetype_engine> font_manager_;
          std::map<std::string,std::string> file_sources_;
+         std::map<std::string,FontSet> fontsets_;
     };
 
@@ -143 +148 @@
                 else if (v.first == "Layer")
                 {
-
                     parse_layer(map, v.second );
+                }
+                else if (v.first == "FontSet")
+                {
+                    parse_fontset(map, v.second);
                 }
                 else if (v.first == "FileSource")
@@ -227 +235 @@
         }
     }
+
+    void map_parser::parse_fontset( Map & map, ptree const & fset )
+    {
+        string name("<missing name>");
+        try