Merge pull request #207 from prculley/bug9549_42

bug 9549 Chinese characters are not rendered properly in pdf reports

gramps/gen/config.py

@@ -283,6 +283,7 @@ register('paths.quick-backup-filename',
 register('preferences.date-format', 0)
 register('preferences.calendar-format-report', 0)
 register('preferences.cprefix', 'C%04d')
+register('preferences.alternate-fonthandler', False)
 register('preferences.default-source', False)
 register('preferences.tag-on-import', False)
 register('preferences.tag-on-import-format', _("Imported %Y/%m/%d %H:%M:%S"))

gramps/grampsapp.py

@@ -46,6 +46,7 @@ from .gen.const import APP_GRAMPS, USER_DIRLIST, HOME_DIR
 from .gen.constfunc import mac
 from .version import VERSION_TUPLE
 from .gen.constfunc import win, get_env_var
+from .gen.config import config
 
 #-------------------------------------------------------------------------
 #
@@ -449,6 +450,9 @@ def run():
         startcli(error, argpars)
 
 def main():
+    if win() and ('PANGOCAIRO_BACKEND' not in os.environ) and \
+            config.get('preferences.alternate-fonthandler'):
+        os.environ['PANGOCAIRO_BACKEND'] = "fontconfig"
     errors = run()
     if errors and isinstance(errors, list):
         for error in errors:

gramps/gui/configure.py

@@ -66,6 +66,7 @@ from gramps.gen.plug.utils import available_updates
 from .plug import PluginWindows
 from gramps.gen.errors import WindowActiveError
 from .spell import HAVE_GTKSPELL
+from gramps.gen.constfunc import win
 _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
@@ -1286,6 +1287,13 @@ class GrampsPreferences(ConfigureDialog):
         grid.set_row_spacing(6)
 
         current_line = 0
+        if win():
+            self.add_checkbox(grid,
+                    _('Use alternate Font handler for GUI and Reports '
+                      '(requires restart)'),
+                    current_line, 'preferences.alternate-fonthandler')
+
+            current_line += 1
         self.add_checkbox(grid,
                 _('Add default source on GEDCOM import'),
                 current_line, 'preferences.default-source')