diff options
-rw-r--r-- | default.beamer | 7 | ||||
-rw-r--r-- | default.context | 136 | ||||
-rw-r--r-- | default.latex | 7 |
3 files changed, 101 insertions, 49 deletions
diff --git a/default.beamer b/default.beamer index 3a0d76b43..dcbc16196 100644 --- a/default.beamer +++ b/default.beamer @@ -67,14 +67,15 @@ $endif$ \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts }{} $if(lang)$ -\ifxetex +\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex + \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$$sep$,$endfor$,main=$babel-lang$]{babel} + $babel-newcommands$ +\else \usepackage{polyglossia} \setmainlanguage[$polyglossia-lang.options$]{$polyglossia-lang.name$} $for(polyglossia-otherlangs)$ \setotherlanguage[$polyglossia-otherlangs.options$]{$polyglossia-otherlangs.name$} $endfor$ -\else - \usepackage[shorthands=off,$babel-lang$]{babel} \fi $endif$ $if(natbib)$ diff --git a/default.context b/default.context index 1bfc6bc14..d4e8d29f0 100644 --- a/default.context +++ b/default.context @@ -1,7 +1,3 @@ -\startmode[*mkii] - \enableregime[utf-8] - \setupcolors[state=start] -\stopmode $if(context-lang)$ \mainlanguage[$context-lang$] $endif$ @@ -9,28 +5,74 @@ $if(context-dir)$ \setupalign[$context-dir$] \setupdirections[bidi=on,method=two] $endif$ - % Enable hyperlinks -\setupinteraction[state=start, color=middleblue] - -\setuppapersize [$if(papersize)$$papersize$$else$letter$endif$][$if(papersize)$$papersize$$else$letter$endif$] -\setuplayout [width=middle, backspace=1.5in, cutspace=1.5in, - height=middle, topspace=0.75in, bottomspace=0.75in] - -\setuppagenumbering[location={footer,center}] - -\setupbodyfont[11pt] - +\setupinteraction + [state=start, + style=$if(style)$$style$$else$normal$endif$, + color=$if(linkcolor)$$linkcolor$$else$black$endif$, + contrastcolor=$if(linkcolor)$$linkcolor$$else$black$endif$$if(title)$, + title=$title$$endif$$if(subtitle)$, + subtitle=$subtitle$$endif$$if(author)$, + author=$for(author)$$author$$sep$; $endfor$$endif$$if(keywords)$, + keyword=$keywords$$endif$] +% make chapter, section bookmarks visible when opening document +\placebookmarks[chapter, section, subsection, subsubsection, subsubsubsection, subsubsubsubsection][chapter, section] +\setupinteractionscreen[option=bookmark] +\setuptagging[state=start] + +$if(papersize)$ +\setuppapersize[$for(papersize)$$papersize$$sep$, + $endfor$] +$endif$ +$if(layout)$ +\setuplayout[$for(layout)$$layout$$sep$, + $endfor$] +$endif$ +$if(pagenumbering)$ +\setuppagenumbering[$for(pagenumbering)$$pagenumbering$$sep$, + $endfor$] +$endif$ +\definefontfeature[default][default][protrusion=quality,expansion=quality,onum=yes] % use microtypography +\setupalign[hz,hanging] +\setupbodyfontenvironment[default][em=italic] % use italic as em, not slanted +$if(mainfont)$ +\definefontfamily[mainfont][serif][$mainfont$] +$endif$ +$if(sansfont)$ +\definefontfamily[sansfont][sans][$sansfont$] +$endif$ +$if(monofont)$ +\definefontfamily[monofont][mono][$monofont$][features=none] +$endif$ +$if(mathfont)$ +\definefontfamily[mathfont][math][$mathfont$] +$endif$ +\setupbodyfont[mainfont$if(fontsize)$,$fontsize$$endif$] +$if(whitespace)$ +\setupwhitespace[$whitespace$] +$else$ \setupwhitespace[medium] +$endif$ +$if(interlinespace)$ +\setupinterlinespace[$interlinespace$] +$endif$ -\setuphead[chapter] [style=\tfd] -\setuphead[section] [style=\tfc] -\setuphead[subsection] [style=\tfb] -\setuphead[subsubsection][style=\bf] +\setuphead[chapter] [style=\tfd,header=empty] +\setuphead[section] [style=\tfc] +\setuphead[subsection] [style=\tfb] +\setuphead[subsubsection] [style=\bf] +\setuphead[subsubsubsection] [style=\sc] +\setuphead[subsubsubsubsection][style=\it] +$if(headertext)$ +\setupheadertexts[$headertext$] +$endif$ +$if(footertext)$ +\setupfootertexts[$footertext$] +$endif$ $if(number-sections)$ $else$ -\setuphead[chapter, section, subsection, subsubsection][number=no] +\setuphead[chapter, section, subsection, subsubsection, subsubsubsection, subsubsubsubsection][number=no] $endif$ \definedescription @@ -45,42 +87,50 @@ $endif$ \setupthinrules[width=15em] % width of horizontal rules -\setupdelimitedtext - [blockquote] - [before={\blank[medium]}, - after={\blank[medium]}, - indentnext=no, - ] - -$if(toc)$ -\setupcombinedlist[content][list={$placelist$}] - +\setuphead[title][ + style={\tfd\raggedcenter}, + before={\startalignment[middle]}, + after={ +$if(subtitle)$ + \smallskip + {\tfa $subtitle$} +$endif$ +$if(author)$ + \smallskip + {\tfa $for(author)$$author$$sep$\crlf $endfor$} $endif$ +$if(date)$ + \smallskip + {\tfa $date$} +$endif$ + \bigskip\stopalignment}] + $for(header-includes)$ $header-includes$ $endfor$ \starttext $if(title)$ -\startalignment[center] - \blank[2*big] - {\tfd $title$} -$if(author)$ - \blank[3*medium] - {\tfa $for(author)$$author$$sep$\crlf $endfor$} +\title{$title$} $endif$ -$if(date)$ - \blank[2*medium] - {\tfa $date$} -$endif$ - \blank[3*medium] -\stopalignment +$if(abstract)$ +\midaligned{\it Abstract} +\startnarrower[2*middle] +$abstract$ +\stopnarrower +\blank[big] $endif$ $for(include-before)$ $include-before$ $endfor$ $if(toc)$ -\placecontent +\completecontent +$endif$ +$if(lot)$ +\completelistoftables +$endif$ +$if(lof)$ +\completelistoffigures $endif$ $body$ diff --git a/default.latex b/default.latex index 5ea656054..935c2422d 100644 --- a/default.latex +++ b/default.latex @@ -68,14 +68,15 @@ $endif$ hidelinks$endif$} \urlstyle{same} % don't use monospace font for urls $if(lang)$ -\ifxetex +\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex + \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$$sep$,$endfor$,main=$babel-lang$]{babel} + $babel-newcommands$ +\else \usepackage{polyglossia} \setmainlanguage[$polyglossia-lang.options$]{$polyglossia-lang.name$} $for(polyglossia-otherlangs)$ \setotherlanguage[$polyglossia-otherlangs.options$]{$polyglossia-otherlangs.name$} $endfor$ -\else - \usepackage[shorthands=off,$babel-lang$]{babel} \fi $endif$ $if(natbib)$ |