Improve tooltip links

Permit to use bold markup

diff --git a/fluidbook/fonts/BFluidbook.otf b/fluidbook/fonts/BFluidbook.otf
new file mode 100644 (file)
index 0000000..7c83953
Binary files /dev/null and b/fluidbook/fonts/BFluidbook.otf differ

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index af7c9ff70036c8903603627a3857f1c1a26386b8..08a3756b2d6075f2ca718aa5d59918dd19a669ca 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -1393,8 +1393,14 @@ class wsDAOBook extends commonDAO {
                // Fonts
                if ($theme->parametres->fontKit == 'auto') {
                        if ($lang->font != 'system') {
-                               $flex->addFont(FONT_PATH . '/' . $lang->font, 'BoldFont', $lang->charset);
-                               $flex->addFont(FONT_PATH . '/' . $lang->font, 'GeneralFont', $lang->charset);
+                               $font = FONT_PATH . '/' . $lang->font;
+                               $bfont = FONT_PATH . '/B' . $lang->font;
+                               if (!file_exists($bfont)) {
+                                       $bfont = $font;
+                               }
+
+                               $flex->addFont($bfont, 'BoldFont', $lang->charset);
+                               $flex->addFont($font, 'GeneralFont', $lang->charset);
                        }
                        $flex->addFont(FONT_PATH . '/FluidbookCredits.ttf', 'CreditsFont', 'ASCII');
                        $flexLight->addFont(FONT_PATH . '/FluidbookLoader.ttf', 'LoaderFont', 'Numerals');

diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index 5abda243fa7947d121f23dda6d8153167d3c1887..e959863a440c24ecfed23c2e1cc79e0b4534702b 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -311,6 +311,7 @@ class tooltipLink extends normalLink {
        public function getAdditionnalContent() {
                $res = parent::getAdditionnalContent();
                $res .= ' data-tooltip-maxwidth="' . $this->compiler->book->parametres->linkTooltipMaxWidth . '" ';
+               $res .= ' data-tooltip-touch="1" ';
                return $res;
        }