Add Unicode fonts on Windows for CJK

data/fonts/fonts.xml

@@ -8,19 +8,41 @@
 
   <font name="Arial Unicode"
         type="truetype"
-        file_win="ARIALUNI.TTF"
+        file_win="arialuni.ttf"
         file_mac="Arial Unicode.ttf" />
 
+  <font name="Unicode Korean"
+        type="truetype"
+        file_win="malgun.ttf">
+    <fallback font="Arial Unicode" />
+  </font>
+  <font name="Unicode Chinese"
+        type="truetype"
+        file_win="msjh.ttc">
+    <fallback font="Unicode Korean" size="8" />
+  </font>
+  <font name="Unicode Japanese"
+        type="truetype"
+        file_win="YuGothR.ttc">
+    <fallback font="Unicode Chinese" size="8" />
+  </font>
+  <font name="Unicode"
+        type="truetype"
+        file="Arial.ttf"
+        file_mac="Arial Unicode.ttf">
+    <fallback font="Unicode Japanese" size="8" />
+  </font>
+
   <font name="Aseprite"
         type="spritesheet"
         file="aseprite_font.png">
-    <fallback font="Arial Unicode" size="8" />
+    <fallback font="Unicode" size="8" />
   </font>
 
   <font name="Aseprite Mini"
         type="spritesheet"
         file="aseprite_mini.png">
-    <fallback font="Arial Unicode" size="6" />
+    <fallback font="Unicode" size="6" />
   </font>
 
 </fonts>

src/app/ui/skin/font_data.cpp

@@ -28,6 +28,7 @@ FontData::~FontData()
 {
   // Destroy all fonts
   for (auto& it : m_fonts)
+    if (it.second)
       it.second->dispose();
 }
 
@@ -53,8 +54,13 @@ she::Font* FontData::getFont(int size)
       break;
   }
 
-  if (font && m_fallback)
+  if (m_fallback) {
-    font->setFallback(m_fallback->getFont(m_fallbackSize));
+    she::Font* fallback = m_fallback->getFont(m_fallbackSize);
+    if (font)
+      font->setFallback(fallback);
+    else
+      font = fallback;
+  }
   
   return m_fonts[size] = font;
 }

src/app/ui/skin/skin_theme.cpp

@@ -156,15 +156,15 @@ static FontData* load_font(std::map<std::string, FontData*>& fonts,
     if (fileStr && fontFilename.empty())
       fontFilename = app::find_font(fileStr);
 
-    if (!fontFilename.empty()) {
+    // The filename can be empty if the font was not found, anyway we
+    // want to keep the font information (e.g. to use the fallback
+    // information of this font).
     font.reset(new FontData(she::FontType::kTrueType));
     font->setFilename(fontFilename);
     font->setAntialias(antialias);
-    }
+
-    else {
+    if (!fontFilename.empty())
-      throw base::Exception("Invalid file for <font name=\"%s\" ...> in '%s'\n",
+      LOG(VERBOSE) << "SKIN: Font file '" << fontFilename << "' not found\n";
-                            name.c_str(), xmlFilename.c_str());
-    }
   }
   else {
     throw base::Exception("Invalid type=\"%s\" in '%s' for <font name=\"%s\" ...>\n",

src/ft/hb_face.h

@@ -20,7 +20,7 @@ namespace ft {
   class HBFace : public FaceFT {
   public:
     HBFace(FT_Face face) : FaceFT(face) {
-      m_font = hb_ft_font_create((FT_Face)face, nullptr);
+      m_font = (face ? hb_ft_font_create((FT_Face)face, nullptr): nullptr);
       m_buffer = hb_buffer_create();
     }