@@ -38,23 +38,25 @@ $if(pagenumbering)$
38\setuppagenumbering[$for(pagenumbering)$$pagenumbering$$sep$,$endfor$]
38\setuppagenumbering[$for(pagenumbering)$$pagenumbering$$sep$,$endfor$]
40% use microtypography
40% use microtypography
41−\definefontfeature[default][default][protrusion=quality,expansion=quality,onum=yes,pnum=yes]
41+\definefontfeature[default][default][script=latn, protrusion=quality, expansion=quality, itlc=yes, textitalics=yes, onum=yes, pnum=yes]
42−\definefontfeature[smallcaps][smallcaps][protrusion=quality,expansion=quality,onum=yes,pnum=yes]
42+\definefontfeature[smallcaps][script=latn, protrusion=quality, expansion=quality, smcp=yes, onum=yes, pnum=yes]
43\setupalign[hz,hanging]
43\setupalign[hz,hanging]
44+\setupitaliccorrection[global, always]
44\setupbodyfontenvironment[default][em=italic] % use italic as em, not slanted
45\setupbodyfontenvironment[default][em=italic] % use italic as em, not slanted
46+\usemodule[simplefonts$if(fontsize)$,$fontsize$$endif$]
47+\setmainfontfallback[DejaVu Serif][range={greekandcoptic, greekextended}, force=yes, rscale=auto]
45$if(mainfont)$
48$if(mainfont)$
46−\definefontfamily[mainfont][serif][$mainfont$]
49+\setmainfont[$mainfont$]
48$if(sansfont)$
51$if(sansfont)$
49−\definefontfamily[sansfont][sans][$sansfont$]
52+\setsansfont[$sansfont$][rscale=auto]
51$if(monofont)$
54$if(monofont)$
52−\definefontfamily[monofont][mono][$monofont$][features=none]
55+\setmonofont[$monofont$][features=none, rscale=auto]
54$if(mathfont)$
57$if(mathfont)$
55−\definefontfamily[mathfont][math][$mathfont$]
58+\setmathfont[$mathfont$][rscale=auto]
57−\setupbodyfont[mainfont$if(fontsize)$,$fontsize$$endif$]
58\setupwhitespace[$if(whitespace)$$whitespace$$else$medium$endif$]
60\setupwhitespace[$if(whitespace)$$whitespace$$else$medium$endif$]
59$if(indenting)$
61$if(indenting)$
60\setupindenting[$for(indenting)$$indenting$$sep$,$endfor$]
62\setupindenting[$for(indenting)$$indenting$$sep$,$endfor$]