(no commit message)

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 2237c8e29d21d30fe0783f42f410b0e7be7c05a5..0f9e0778afd241c78f0ecec26f339228e7abda2a 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -377,7 +377,11 @@ class wsHTML5Compiler {
                                $fontforge = new cubeCommandLine('convert.pe');
                                $fontforge->setPath(CONVERTER_PATH);
                                foreach ($this->fontDocs[$font] as $document_id => $dummy) {
-                                       $fontforge->setArg(null, WS_DOCS . '/' . $document_id . '/fonts/web/' . $font . '.ttf');
+                                       if (file_exists(WS_DOCS . '/' . $document_id . '/fonts/web/' . $font . '.otf')) {
+                                               $fontforge->setArg(null, WS_DOCS . '/' . $document_id . '/fonts/web/' . $font . '.otf');
+                                       } else {
+                                               $fontforge->setArg(null, WS_DOCS . '/' . $document_id . '/fonts/web/' . $font . '.ttf');
+                                       }
                                }
                                $fontforge->setArg(null, '-');
                                $fontforge->setArg(null, $this->vdir . '/data/style/F' . $index . '.' . $format);