aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--default.beamer2
-rw-r--r--default.latex8
2 files changed, 8 insertions, 2 deletions
diff --git a/default.beamer b/default.beamer
index 9198ef010..8cab25b8e 100644
--- a/default.beamer
+++ b/default.beamer
@@ -29,7 +29,7 @@ $endif$
\usepackage{ifxetex,ifluatex}
\usepackage{fixltx2e} % provides \textsubscript
\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
- \usepackage[T1]{fontenc}
+ \usepackage[$if(fontenc)$$fontenc$$else$T1$endif$]{fontenc}
\usepackage[utf8]{inputenc}
$if(euro)$
\usepackage{eurosym}
diff --git a/default.latex b/default.latex
index 9180551fc..0579f304d 100644
--- a/default.latex
+++ b/default.latex
@@ -12,7 +12,7 @@ $endif$
\usepackage{ifxetex,ifluatex}
\usepackage{fixltx2e} % provides \textsubscript
\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
- \usepackage[T1]{fontenc}
+ \usepackage[$if(fontenc)$$fontenc$$else$T1$endif$]{fontenc}
\usepackage[utf8]{inputenc}
$if(euro)$
\usepackage{eurosym}
@@ -136,8 +136,11 @@ $if(strikeout)$
% avoid problems with \sout in headers with hyperref:
\pdfstringdefDisableCommands{\renewcommand{\sout}{}}
$endif$
+$if(indent)$
+$else$
\setlength{\parindent}{0pt}
\setlength{\parskip}{6pt plus 2pt minus 1pt}
+$endif$
\setlength{\emergencystretch}{3em} % prevent overfull lines
\providecommand{\tightlist}{%
\setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
@@ -175,6 +178,8 @@ $for(header-includes)$
$header-includes$
$endfor$
+$if(subparagraph)$
+$else$
% Redefines (sub)paragraphs to behave more like sections
\ifx\paragraph\undefined\else
\let\oldparagraph\paragraph
@@ -184,6 +189,7 @@ $endfor$
\let\oldsubparagraph\subparagraph
\renewcommand{\subparagraph}[1]{\oldsubparagraph{#1}\mbox{}}
\fi
+$endif$
\begin{document}
$if(title)$