diff options
| -rw-r--r-- | default.beamer | 46 | ||||
| -rw-r--r-- | default.context | 51 | ||||
| -rw-r--r-- | default.latex | 47 | ||||
| -rw-r--r-- | default.man | 4 |
4 files changed, 78 insertions, 70 deletions
diff --git a/default.beamer b/default.beamer index 7e2835f19..1419b09a9 100644 --- a/default.beamer +++ b/default.beamer @@ -1,25 +1,8 @@ \documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$babel-lang$,$endif$$if(handout)$handout,$endif$$if(beamer)$ignorenonframetext,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$} -$if(theme)$ -\usetheme{$theme$} -$endif$ -$if(colortheme)$ -\usecolortheme{$colortheme$} -$endif$ -$if(fonttheme)$ -\usefonttheme{$fonttheme$} -$endif$ -$if(mainfont)$ -\usefonttheme{serif} % use mainfont rather than sansfont for slide text -$endif$ -$if(innertheme)$ -\useinnertheme{$innertheme$} -$endif$ -$if(outertheme)$ -\useoutertheme{$outertheme$} -$endif$ \setbeamertemplate{caption}[numbered] \setbeamertemplate{caption label separator}{: } \setbeamercolor{caption name}{fg=normal text.fg} +\beamertemplatenavigationsymbols$if(navigation)$$navigation$$else$empty$endif$ $if(fontfamily)$ \usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$} $else$ @@ -41,7 +24,9 @@ $endif$ \usepackage{fontspec} \fi \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} +$if(euro)$ \newcommand{\euro}{€} +$endif$ $if(mainfont)$ \setmainfont[$for(mainfontoptions)$$mainfontoptions$$sep$,$endfor$]{$mainfont$} $endif$ @@ -59,6 +44,24 @@ $if(CJKmainfont)$ \setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$} $endif$ \fi +$if(theme)$ +\usetheme{$theme$} +$endif$ +$if(colortheme)$ +\usecolortheme{$colortheme$} +$endif$ +$if(fonttheme)$ +\usefonttheme{$fonttheme$} +$endif$ +$if(mainfont)$ +\usefonttheme{serif} % use mainfont rather than sansfont for slide text +$endif$ +$if(innertheme)$ +\useinnertheme{$innertheme$} +$endif$ +$if(outertheme)$ +\useoutertheme{$outertheme$} +$endif$ % use upquote if available, for straight quotes in verbatim environments \IfFileExists{upquote.sty}{\usepackage{upquote}}{} % use microtype if available @@ -86,7 +89,8 @@ $if(natbib)$ \bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$} $endif$ $if(biblatex)$ -\usepackage{biblatex} +\usepackage$if(biblio-style)$[style=$biblio-style$]$endif${biblatex} +$if(biblatexoptions)$\ExecuteBibliographyOptions{$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$}$endif$ $for(bibliography)$ \addbibresource{$bibliography$} $endfor$ @@ -128,8 +132,7 @@ $endif$ \widowpenalties 1 10000 \raggedbottom -% Comment these out if you don't want a slide with just the -% part/section/subsection/subsubsection title: +$if(section-titles)$ \AtBeginPart{ \let\insertpartnumber\relax \let\partname\relax @@ -148,6 +151,7 @@ $endif$ \let\subsectionname\relax \frame{\subsectionpage} } +$endif$ $if(links-as-notes)$ % Make links footnotes instead of hotlinks: diff --git a/default.context b/default.context index c5ad2113f..4a3457934 100644 --- a/default.context +++ b/default.context @@ -38,23 +38,25 @@ $if(pagenumbering)$ \setuppagenumbering[$for(pagenumbering)$$pagenumbering$$sep$,$endfor$] $endif$ % use microtypography -\definefontfeature[default][default][protrusion=quality,expansion=quality,onum=yes,pnum=yes] -\definefontfeature[smallcaps][smallcaps][protrusion=quality,expansion=quality,onum=yes,pnum=yes] +\definefontfeature[default][default][script=latn, protrusion=quality, expansion=quality, itlc=yes, textitalics=yes, onum=yes, pnum=yes] +\definefontfeature[smallcaps][script=latn, protrusion=quality, expansion=quality, smcp=yes, onum=yes, pnum=yes] \setupalign[hz,hanging] +\setupitaliccorrection[global, always] \setupbodyfontenvironment[default][em=italic] % use italic as em, not slanted +\usemodule[simplefonts$if(fontsize)$,$fontsize$$endif$] +\setmainfontfallback[DejaVu Serif][range={greekandcoptic, greekextended}, force=yes, rscale=auto] $if(mainfont)$ -\definefontfamily[mainfont][serif][$mainfont$] +\setmainfont[$mainfont$] $endif$ $if(sansfont)$ -\definefontfamily[sansfont][sans][$sansfont$] +\setsansfont[$sansfont$][rscale=auto] $endif$ $if(monofont)$ -\definefontfamily[monofont][mono][$monofont$][features=none] +\setmonofont[$monofont$][features=none, rscale=auto] $endif$ $if(mathfont)$ -\definefontfamily[mathfont][math][$mathfont$] +\setmathfont[$mathfont$][rscale=auto] $endif$ -\setupbodyfont[mainfont$if(fontsize)$,$fontsize$$endif$] \setupwhitespace[$if(whitespace)$$whitespace$$else$medium$endif$] $if(indenting)$ \setupindenting[$for(indenting)$$indenting$$sep$,$endfor$] @@ -93,31 +95,28 @@ $endif$ \setupthinrules[width=15em] % width of horizontal rules -\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)$ -\title{$title$} +\startalignment[middle] + {\tfd $title$} +$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 $endif$ $if(abstract)$ \midaligned{\it Abstract} diff --git a/default.latex b/default.latex index 7491765da..c10b617c6 100644 --- a/default.latex +++ b/default.latex @@ -24,7 +24,9 @@ $endif$ \usepackage{fontspec} \fi \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} +$if(euro)$ \newcommand{\euro}{€} +$endif$ $if(mainfont)$ \setmainfont[$for(mainfontoptions)$$mainfontoptions$$sep$,$endfor$]{$mainfont$} $endif$ @@ -53,7 +55,9 @@ $if(geometry)$ \usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry} $endif$ \usepackage{hyperref} +$if(colorlinks)$ \PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref +$endif$ \hypersetup{unicode=true, $if(title-meta)$ pdftitle={$title-meta$}, @@ -61,9 +65,6 @@ $endif$ $if(author-meta)$ pdfauthor={$author-meta$}, $endif$ -$if(subtitle)$ - pdfsubject={$subtitle$}, -$endif$ $if(keywords)$ pdfkeywords={$for(keywords)$$keywords$$sep$; $endfor$}, $endif$ @@ -96,7 +97,8 @@ $if(natbib)$ \bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$} $endif$ $if(biblatex)$ -\usepackage{biblatex} +\usepackage$if(biblio-style)$[style=$biblio-style$]$endif${biblatex} +$if(biblatexoptions)$\ExecuteBibliographyOptions{$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$}$endif$ $for(bibliography)$ \addbibresource{$bibliography$} $endfor$ @@ -154,6 +156,18 @@ $if(numbersections)$ $else$ \setcounter{secnumdepth}{0} $endif$ +$if(subparagraph)$ +$else$ +% Redefines (sub)paragraphs to behave more like sections +\ifx\paragraph\undefined\else +\let\oldparagraph\paragraph +\renewcommand{\paragraph}[1]{\oldparagraph{#1}\mbox{}} +\fi +\ifx\subparagraph\undefined\else +\let\oldsubparagraph\subparagraph +\renewcommand{\subparagraph}[1]{\oldsubparagraph{#1}\mbox{}} +\fi +$endif$ $if(dir)$ \ifxetex % load bidi as late as possible as it modifies e.g. graphicx @@ -171,30 +185,21 @@ $if(dir)$ \newenvironment{LTR}{\beginL}{\endL} \fi $endif$ +$for(header-includes)$ +$header-includes$ +$endfor$ $if(title)$ -\title{$title$$if(subtitle)$\\\vspace{0.5em}{\large $subtitle$}$endif$} +\title{$title$} +$endif$ +$if(subtitle)$ +\providecommand{\subtitle}[1]{} +\subtitle{$subtitle$} $endif$ $if(author)$ \author{$for(author)$$author$$sep$ \and $endfor$} $endif$ \date{$date$} -$for(header-includes)$ -$header-includes$ -$endfor$ - -$if(subparagraph)$ -$else$ -% Redefines (sub)paragraphs to behave more like sections -\ifx\paragraph\undefined\else -\let\oldparagraph\paragraph -\renewcommand{\paragraph}[1]{\oldparagraph{#1}\mbox{}} -\fi -\ifx\subparagraph\undefined\else -\let\oldsubparagraph\subparagraph -\renewcommand{\subparagraph}[1]{\oldsubparagraph{#1}\mbox{}} -\fi -$endif$ \begin{document} $if(title)$ diff --git a/default.man b/default.man index 896e5d7e0..44b59198b 100644 --- a/default.man +++ b/default.man @@ -8,12 +8,12 @@ $endif$ $if(adjusting)$ .ad $adjusting$ $endif$ +.TH "$title$" "$section$" "$date$" "$footer$" "$header$" $if(hyphenate)$ .hy $else$ -.nh +.nh \" Turn off hyphenation by default. $endif$ -.TH "$title$" "$section$" "$date$" "$footer$" "$header$" $for(header-includes)$ $header-includes$ $endfor$ |