Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
d1220c9fb8
@ -58,7 +58,8 @@ $for(beameroption)$
|
|||||||
\setbeameroption{$beameroption$}
|
\setbeameroption{$beameroption$}
|
||||||
$endfor$
|
$endfor$
|
||||||
% Prevent slide breaks in the middle of a paragraph
|
% Prevent slide breaks in the middle of a paragraph
|
||||||
\widowpenalties 1 10000
|
\widowpenalty10000
|
||||||
|
\clubpenalty10000
|
||||||
\raggedbottom
|
\raggedbottom
|
||||||
$if(section-titles)$
|
$if(section-titles)$
|
||||||
\setbeamertemplate{part page}{
|
\setbeamertemplate{part page}{
|
||||||
@ -129,15 +130,17 @@ $endif$
|
|||||||
$if(mainfont)$
|
$if(mainfont)$
|
||||||
\setmainfont[$for(mainfontoptions)$$mainfontoptions$$sep$,$endfor$]{$mainfont$}
|
\setmainfont[$for(mainfontoptions)$$mainfontoptions$$sep$,$endfor$]{$mainfont$}
|
||||||
$else$
|
$else$
|
||||||
\setmainfont[Scale=1.0]{Georgia}
|
\setmainfont[Scale=1.0]{PT Serif}
|
||||||
$endif$
|
$endif$
|
||||||
$if(sansfont)$
|
$if(sansfont)$
|
||||||
\setsansfont[$for(sansfontoptions)$$sansfontoptions$$sep$,$endfor$]{$sansfont$}
|
\setsansfont[$for(sansfontoptions)$$sansfontoptions$$sep$,$endfor$]{$sansfont$}
|
||||||
|
$else$
|
||||||
|
\setmainfont[Scale=1.0]{PT Sans}
|
||||||
$endif$
|
$endif$
|
||||||
$if(monofont)$
|
$if(monofont)$
|
||||||
\setmonofont[$for(monofontoptions)$$monofontoptions$$sep$,$endfor$]{$monofont$}
|
\setmonofont[$for(monofontoptions)$$monofontoptions$$sep$,$endfor$]{$monofont$}
|
||||||
$else$
|
$else$
|
||||||
\setmonofont[Scale=0.75]{Pragmata Pro}
|
\setmonofont[Scale=0.75]{Iosevka Prog}
|
||||||
$endif$
|
$endif$
|
||||||
$for(fontfamilies)$
|
$for(fontfamilies)$
|
||||||
\newfontfamily{$fontfamilies.name$}[$for(fontfamilies.options)$$fontfamilies.options$$sep$,$endfor$]{$fontfamilies.font$}
|
\newfontfamily{$fontfamilies.name$}[$for(fontfamilies.options)$$fontfamilies.options$$sep$,$endfor$]{$fontfamilies.font$}
|
||||||
@ -230,6 +233,9 @@ $endif$
|
|||||||
$if(author-meta)$
|
$if(author-meta)$
|
||||||
pdfauthor={$author-meta$},
|
pdfauthor={$author-meta$},
|
||||||
$endif$
|
$endif$
|
||||||
|
$if(lang)$
|
||||||
|
pdflang={$lang$},
|
||||||
|
$endif$
|
||||||
$if(subject)$
|
$if(subject)$
|
||||||
pdfsubject={$subject$},
|
pdfsubject={$subject$},
|
||||||
$endif$
|
$endif$
|
||||||
|
Loading…
Reference in New Issue
Block a user