(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index c48b754fef0a44b36b6f2d160ae69ddd0aa8f329..ea96ed2f1568f7d9a616a3b386b9cc9cdafe5047 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -733,7 +733,7 @@ class wsUrl {
                $formats = array('ttf', 'otf', 'TTF', 'OTF');\r
 \r
                $dr = opendir(FONT_PATH);\r
-               $fonts = array();\r
+               $fonts = array('Arial (police système)' => "system");\r
                while ($file = readdir($dr)) {\r
                        if ($file == '.' || $file == '..' || !in_array(files::getExtension($file), $formats)) {\r
                                continue;\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 9c4b3796bdc8dad4794ee45dc9576af12e3915ad..32ff719e385e257c7ba184b6462c14b4939860bd 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -1338,8 +1338,10 @@ class wsDAOBook extends commonDAO {
                }\r
                // Fonts\r
                if ($theme->parametres->fontKit == 'auto') {\r
-                       $flex->addFont(FONT_PATH . '/' . $lang->font, 'BoldFont', $lang->charset);\r
-                       $flex->addFont(FONT_PATH . '/' . $lang->font, 'GeneralFont', $lang->charset);\r
+                       if ($lang->font != 'system') {\r
+                               $flex->addFont(FONT_PATH . '/' . $lang->font, 'BoldFont', $lang->charset);\r
+                               $flex->addFont(FONT_PATH . '/' . $lang->font, 'GeneralFont', $lang->charset);\r
+                       }\r
                        $flex->addFont(FONT_PATH . '/FluidbookCredits.ttf', 'CreditsFont', 'ASCII');\r
                        $flexLight->addFont(FONT_PATH . '/FluidbookLoader.ttf', 'LoaderFont', 'Numerals');\r
                } else if ($theme->parametres->fontKit == 'vagrounded') {\r