Tweak PDF creation.

wilx · wilx · commit 30026707f0aa · 2017-04-08T19:32:31.000+02:00
diff --git a/docs/latex-header.tex b/docs/latex-header.tex
@@ -16,7 +16,29 @@
 \usepackage{textcomp}
 \usepackage{upquote}
 \usepackage{etoolbox}
-\usepackage{selnolig}
+
+\setmainfont[Ligatures={TeX, Common}]{TeX Gyre Pagella}
+\setmonofont[Scale=MatchLowercase,Ligatures={NoCommon}]{DejaVu Sans Mono}
+%\setromanfont{Georgia}
+%\setsansfont{DejaVu Sans}
+
+\newfontfamily{\cjkfont}{WenQuanYi Zen Hei}[]
+\newfontfamily{\devanagarifont}{Lohit Devanagari}[]
+\newfontfamily{\tamilfont}{Lohit Tamil}[]
+\newfontfamily{\cyrilicfont}{CMU Serif}
+
+%% These unfortunately break too many things. PDF will have to be without
+%% contributors' native names.
+% \ifxetex
+%   \usepackage{xeCJK}
+%   \setCJKmainfont{WenQuanYi Zen Hei}
+%   \setCJKmonofont{WenQuanYi Zen Hei Mono}
+% \else
+%   %% Adding senolig breaks compilation in the CJK support.
+%   %\usepackage{selnolig}
+%   \usepackage{luatexja-fontspec}
+%   \setmainjfont{WenQuanYi Zen Hei}
+% \fi
 
 \pagestyle{fancy}
 \chead{\raisebox{\baselineskip}{\includegraphics[width=1.5cm,keepaspectratio]{./docs/log4cplus}}}
diff --git a/scripts/build-pdf.pl b/scripts/build-pdf.pl
@@ -36,7 +36,7 @@
       , '--latex-engine=lualatex',
       , '--include-in-header=docs/latex-header.tex'
       , '--include-before-body=docs/latex-body.tex'
-      , '-V', 'lang=english',
+      , '-V', 'lang=en-US',
       , '-V', 'geometry:a4paper');
 
 # pre-compute  various source information strings
