diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index a6282d7e4c6..46a0162d6f1 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -192,7 +192,7 @@ if (! defined('ODTPHP_PATHTOPCLZIP')) { define('ODTPHP_PATHTOPCLZIP', (!isset( if (! defined('ARTICHOW_PATH')) { define('ARTICHOW_PATH', (!isset($dolibarr_lib_ARTICHOW))?DOL_DOCUMENT_ROOT.'/includes/artichow/':(empty($dolibarr_lib_ARTICHOW)?'':$dolibarr_lib_ARTICHOW.'/')); } // Other required path if (! defined('ARTICHOW_FONT')) { define('ARTICHOW_FONT', (!isset($dolibarr_font_DOL_DEFAULT_TTF_BOLD))?DOL_DOCUMENT_ROOT.'/includes/fonts':dirname($dolibarr_font_DOL_DEFAULT_TTF_BOLD)); } -if (! defined('ARTICHOW_FONT_NAMES')) { define('ARTICHOW_FONT_NAMES', (!isset($dolibarr_font_DOL_DEFAULT_TTF_BOLD))?'Tuffy,TuffyBold,TuffyBoldItalic,TuffyItalic':'DejaVuSans,DejaVuSans-Bold,DejaVuSans-BoldOblique,DejaVuSans-Oblique'); } +if (! defined('ARTICHOW_FONT_NAMES')) { define('ARTICHOW_FONT_NAMES', (!isset($dolibarr_font_DOL_DEFAULT_TTF_BOLD))?'Aerial,AerialBd,AerialBdIt,AerialIt':'DejaVuSans,DejaVuSans-Bold,DejaVuSans-BoldOblique,DejaVuSans-Oblique'); } if (! defined('DOL_DEFAULT_TTF')) { define('DOL_DEFAULT_TTF', (!isset($dolibarr_font_DOL_DEFAULT_TTF))?DOL_DOCUMENT_ROOT.'/includes/fonts/Aerial.ttf':(empty($dolibarr_font_DOL_DEFAULT_TTF)?'':$dolibarr_font_DOL_DEFAULT_TTF)); } if (! defined('DOL_DEFAULT_TTF_BOLD')) { define('DOL_DEFAULT_TTF_BOLD', (!isset($dolibarr_font_DOL_DEFAULT_TTF_BOLD))?DOL_DOCUMENT_ROOT.'/includes/fonts/AerialBd.ttf':(empty($dolibarr_font_DOL_DEFAULT_TTF_BOLD)?'':$dolibarr_font_DOL_DEFAULT_TTF_BOLD)); } // Old path to root deprecated (no more used). diff --git a/htdocs/includes/fonts/Tuffy.ttf b/htdocs/includes/fonts/Tuffy.ttf deleted file mode 100644 index 8151817be0c..00000000000 Binary files a/htdocs/includes/fonts/Tuffy.ttf and /dev/null differ diff --git a/htdocs/includes/fonts/TuffyBold.ttf b/htdocs/includes/fonts/TuffyBold.ttf deleted file mode 100644 index 2f45b4f1778..00000000000 Binary files a/htdocs/includes/fonts/TuffyBold.ttf and /dev/null differ diff --git a/htdocs/includes/fonts/TuffyBoldItalic.ttf b/htdocs/includes/fonts/TuffyBoldItalic.ttf deleted file mode 100644 index 554faf20211..00000000000 Binary files a/htdocs/includes/fonts/TuffyBoldItalic.ttf and /dev/null differ diff --git a/htdocs/includes/fonts/TuffyItalic.ttf b/htdocs/includes/fonts/TuffyItalic.ttf deleted file mode 100644 index 5f972ec086f..00000000000 Binary files a/htdocs/includes/fonts/TuffyItalic.ttf and /dev/null differ