@@ -21,11 +21,15 @@ $if(euro)$
21 \usepackage{eurosym}
21 \usepackage{eurosym}
23\else % if luatex or xelatex
23\else % if luatex or xelatex
25 \usepackage{mathspec}
26 \usepackage{mathspec}
27− \usepackage{fontspec}
28+ \usepackage{unicode-math}
31+ \usepackage{unicode-math}
29 \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase}
33 \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase}
30$for(fontfamilies)$
34$for(fontfamilies)$
31 \newfontfamily{$fontfamilies.name$}[$fontfamilies.options$]{$fontfamilies.font$}
35 \newfontfamily{$fontfamilies.name$}[$fontfamilies.options$]{$fontfamilies.font$}
@@ -43,7 +47,15 @@ $if(monofont)$
43 \setmonofont[Mapping=tex-ansi$if(monofontoptions)$,$for(monofontoptions)$$monofontoptions$$sep$,$endfor$$endif$]{$monofont$}
47 \setmonofont[Mapping=tex-ansi$if(monofontoptions)$,$for(monofontoptions)$$monofontoptions$$sep$,$endfor$$endif$]{$monofont$}
45$if(mathfont)$
49$if(mathfont)$
46 \setmathfont(Digits,Latin,Greek)[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$}
52 \setmathfont(Digits,Latin,Greek)[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$}
54+ \setmathfont[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$}
57+ \setmathfont[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$}
48$if(CJKmainfont)$
60$if(CJKmainfont)$
49 \usepackage{xeCJK}
61 \usepackage{xeCJK}