Skip to content
Snippets Groups Projects
Commit 282545a4 authored by Rolf Niepraschk's avatar Rolf Niepraschk
Browse files

tt-Font geändert, Paket "paralist" --> "enumitem"

parent ab79ab9c
Branches
No related tags found
No related merge requests found
...@@ -64,15 +64,19 @@ ...@@ -64,15 +64,19 @@
\HyphSubstIfExists{german-x-latest}{% \HyphSubstIfExists{german-x-latest}{%
\HyphSubstLet{german}{german-x-latest}}{} \HyphSubstLet{german}{german-x-latest}}{}
\RequirePackage{ifxetex,ifluatex,url,array} \RequirePackage{ifxetex,ifluatex,url,array,tabularx}
\newif\ifXeOrLua \XeOrLuafalse \newif\ifXeOrLua \XeOrLuafalse
\ifxetex\XeOrLuatrue\else\ifluatex\XeOrLuatrue\fi\fi \ifxetex\XeOrLuatrue\else\ifluatex\XeOrLuatrue\fi\fi
% TODO: Mathematik? % TODO: Mathematik?
\ifXeOrLua% XeLaTeX oder luaLaTeX \ifXeOrLua% XeLaTeX oder luaLaTeX
\RequirePackage{fontspec} \RequirePackage{fontspec}
\setmainfont{TeX Gyre Pagella}[Ligatures=TeX] \AtBeginDocument{% ???
\setsansfont{TeX Gyre Heros}[Scale=MatchUppercase,Ligatures=TeX] \setromanfont{TeX Gyre Pagella}[Scale=1,Ligatures=TeX]
\setsansfont{TeX Gyre Heros}[Scale=MatchUppercase,Ligatures=TeX]
}
\RequirePackage[TT={Scale=0.85}]{dejavu-otf}
\iffalse
\setmonofont{AnonymousPro-Regular}[% \setmonofont{AnonymousPro-Regular}[%
Extension = .ttf, Extension = .ttf,
BoldFont = AnonymousPro-Bold, BoldFont = AnonymousPro-Bold,
...@@ -80,14 +84,22 @@ ...@@ -80,14 +84,22 @@
BoldItalicFont = AnonymousPro-BoldItalic, BoldItalicFont = AnonymousPro-BoldItalic,
Scale = MatchLowercase Scale = MatchLowercase
] ]
\fi
\else \else
\RequirePackage[utf8]{inputenc} \RequirePackage[utf8]{inputenc}
\RequirePackage[T1]{fontenc} \RequirePackage[T1]{fontenc}
\usepackage[scaled=0.85]{DejaVuSansMono}
\RequirePackage{textcomp} \RequirePackage{textcomp}
\RequirePackage{mathpazo} \RequirePackage{mathpazo}
\RequirePackage{tgpagella} \RequirePackage{tgpagella}
\RequirePackage{tgheros} \RequirePackage{tgheros}
\RequirePackage[ttdefault=true,scale=1.034]{AnonymousPro} %\RequirePackage[ttdefault=true,scale=1.034]{AnonymousPro}
\fi
\def\tiny{\@setfontsize\tiny{7}{8.17}}
\ifptb@serif
\renewcommand*\familydefault{\rmdefault}
\else
\renewcommand*\familydefault{\sfdefault}
\fi \fi
%\RequirePackage{etoolbox} %\RequirePackage{etoolbox}
...@@ -107,14 +119,6 @@ ...@@ -107,14 +119,6 @@
\defineshorthand{"'}{\closeautoquote} \defineshorthand{"'}{\closeautoquote}
\AtEndOfClass{\shorthandon{"}} \AtEndOfClass{\shorthandon{"}}
\def\tiny{\@setfontsize\tiny{7}{8.17}}
\ifptb@serif
\renewcommand*\familydefault{\rmdefault}
\else
\renewcommand*\familydefault{\sfdefault}
\fi
\@setplength{toaddrhpos}{72bp} \@setplength{toaddrhpos}{72bp}
\@setplength{toaddrvpos}{124bp} \@setplength{toaddrvpos}{124bp}
%\@setplength{toaddrwidth}{85mm} %\@setplength{toaddrwidth}{85mm}
...@@ -147,11 +151,12 @@ ...@@ -147,11 +151,12 @@
\addtokomafont{addressee}{\sffamily} \addtokomafont{addressee}{\sffamily}
\setkomafont{refname}{\sffamily\tiny} \setkomafont{refname}{\sffamily\tiny}
\setkomafont{refvalue}{\normalfont} \setkomafont{refvalue}{\normalfont\footnotesize}
\setkomavar{location}{% \setkomavar{location}{%
\extrarowheight=-1bp % \extrarowheight=-1bp %
\begin{tabular}{@{}>{\usekomafont{refname}}l<{:}@{~\,}>{\usekomafont{refvalue}}l@{}} \begin{tabular}%
{@{}>{\usekomafont{refname}}l<{:}@{~\,}>{\usekomafont{refvalue}}l@{}}
\usekomavar*{yourref} & \usekomavar{yourref}\\ \usekomavar*{yourref} & \usekomavar{yourref}\\
\usekomavar*{yourmail} & \usekomavar{yourmail}\\ \usekomavar*{yourmail} & \usekomavar{yourmail}\\
\usekomavar*{myref} & \usekomavar{myref}\\ \usekomavar*{myref} & \usekomavar{myref}\\
...@@ -259,34 +264,6 @@ ...@@ -259,34 +264,6 @@
swissgerman,nswissgerman}\enclname{Anlagen}% swissgerman,nswissgerman}\enclname{Anlagen}%
\AtBeginDocument{% \AtBeginDocument{%
\RequirePackage{paralist}
\newcommand*\ptb@begin@list[1]{%
%\ptb@tempdima=\parindent
%\ptb@tempdimb=\parskip
\@nameuse{#1}%
%\parindent=\ptb@tempdima
%\parskip=\ptb@tempdimb
}
\def\enumerate{%
\ptb@begin@list{compactenum}%
}
\def\itemize{%
\ptb@begin@list{compactitem}%
}
\def\description{%
\ptb@begin@list{compactdesc}%
}
\let\enditemize\endcompactitem
\let\endenumerate\endcompactenum
\let\enddescription\endcompactdesc
\pltopsep=\medskipamount
\plitemsep=\medskipamount
\setlength\leftmargini{1.5em}
\setlength\leftmarginii{1.1em}
\setlength\leftmarginiii{1.1em}
\setlength\leftmarginiv{1.1em}
\setlength\labelsep{.5em}
\ifxetex\else \ifxetex\else
\RequirePackage[% \RequirePackage[%
,factor=1500 ,factor=1500
...@@ -299,6 +276,9 @@ ...@@ -299,6 +276,9 @@
]{microtype} ]{microtype}
\fi \fi
} }
\RequirePackage{enumitem}
\setlist{leftmargin=*,nosep,topsep=.5em,itemsep=.25em}
\setlist[1]{labelindent=1em}
\iflanguage{ngerman}{% \iflanguage{ngerman}{%
\newcommand*\MFG{Mit freundlichen Gr\"u\ss en} \newcommand*\MFG{Mit freundlichen Gr\"u\ss en}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment