Updated the LaTeX header for letters

diff --git a/CRM/Utils/PDF/Utils.php b/CRM/Utils/PDF/Utils.php
index 4364915b095db72ccb42ac0dec5232bc04ec47a9..9e878b51ca268d31370266e4001d351d04ca1ff1 100644 (file)
--- a/CRM/Utils/PDF/Utils.php
+++ b/CRM/Utils/PDF/Utils.php
@@ -43,18 +43,21 @@ class CRM_Utils_PDF_Utils {
     $head='\documentclass[12pt]{letter}
 \usepackage{url}
 \usepackage{ucs}
+\usepackage{array}
 \usepackage{graphicx}
 \usepackage[T1]{fontenc}
 \usepackage{fullpage}
 \usepackage{fontspec,xunicode}
 %% VERY IMPORTANT.  Configures supported languages and fonts to use for each one.
 \usepackage[Latin, Hebrew, Arabics, CJK, Diacritics]{ucharclasses}
-\setDefaultTransitions{\fontspec{FreeSerif}}{}
-\setTransitionsForLatin{\fontspec{FreeSerif}}{}
-\setTransitionsForArabics{\fontspec{FreeSerif}}{}
-\setTransitionsForCJK{\fontspec{WenQuanYi Zen Hei}}{}
-\setTransitionsForDiacritics{\fontspec{FreeSerif}}{}
-\setTransitionTo{Hebrew}{\fontspec{FreeSerif}}
+\newfontfamily{\normalfont}{FreeSerif}
+\newfontfamily{\cjkfont}{WenQuanYi Zen Hei}
+\setDefaultTransitions{\normalfont}{}
+\setTransitionsForLatin{\normalfont}{}
+\setTransitionsForArabics{\normalfont}{}
+\setTransitionsForCJK{\cjkfont}{}
+\setTransitionsForDiacritics{\normalfont}{}
+\setTransitionTo{Hebrew}{\normalfont}
 \setmainfont{FreeSerif}
 
 \newcommand{\fsfclosing}[1]{\par\nobreak\vspace{\parskip}
@@ -123,7 +126,8 @@ right  = 1.0in]{geometry}
       header('Content-Type: application/pdf');
       header('Content-Disposition: attachment; filename="' . $fileName . '"');
       echo $pdf;
-//      CRM_Utils_PDF_Utils::enqueuePDF($pdf);
+      // quidam: comment previous line and uncomment next one during printing
+      //CRM_Utils_PDF_Utils::enqueuePDF($pdf);
 
     }
   }
@@ -334,6 +338,7 @@ right  = 1.0in]{geometry}
       CRM_Utils_System::setHttpHeader('Content-Type', 'application/pdf');
       CRM_Utils_System::setHttpHeader('Content-Disposition', 'attachment; filename="' . $fileName . '"');
       echo $pdf;
+      // quidam: comment previous line and uncomment next one during printing
       //CRM_Utils_PDF_Utils::enqueuePDF($pdf);
 
     }