CRM-13307

----------------------------------------
* CRM-13307: allow for additional fonts to be used when making mailing labels
  http://issues.civicrm.org/jira/browse/CRM-13307

diff --git a/CRM/Utils/PDF/Label.php b/CRM/Utils/PDF/Label.php
index 3bf9d5fd3b53a8bb6c61839d46fd46ddd584af32..ed79dd37d2c569917750b4a3ac0f401236592a92 100644 (file)
--- a/CRM/Utils/PDF/Label.php
+++ b/CRM/Utils/PDF/Label.php
@@ -246,12 +246,23 @@ class CRM_Utils_PDF_Label extends TCPDF {
       'times' => ts('Times New Roman'),
       'dejavusans' => ts('Deja Vu Sans (UTF-8)'),
     );
+
+
+    // Check to see if we have any additional fonts to add. You can specify more fonts in
+    // civicrm.settings.php via: $config['CiviCRM Preferences']['additional_fonts']
+    // CRM-13307
+    $additionalFonts = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'additional_fonts');
+    if (is_array($additionalFonts)) {
+      $fontLabel = array_merge($fontLabel, $additionalFonts);
+    }
+
     $tcpdfFonts = $this->fontlist;
     foreach ($tcpdfFonts as $fontName) {
       if (array_key_exists($fontName, $fontLabel)) {
         $list[$fontName] = $fontLabel[$fontName];
       }
     }
+
     return $list;
   }
 }