From 282545a4bd70bd0fc8d4f6aeb744b3ba9de66b3e Mon Sep 17 00:00:00 2001
From: niepra01 <rolf.niepraschk@ptb.de>
Date: Thu, 30 Nov 2017 13:32:24 +0100
Subject: [PATCH] =?UTF-8?q?tt-Font=20ge=C3=A4ndert,=20Paket=20"paralist"?=
=?UTF-8?q?=20-->=20"enumitem"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ptbletter/ptbletter.cls | 64 ++++++++++++++---------------------------
1 file changed, 22 insertions(+), 42 deletions(-)
diff --git a/ptbletter/ptbletter.cls b/ptbletter/ptbletter.cls
index 157ded2..07435a1 100644
--- a/ptbletter/ptbletter.cls
+++ b/ptbletter/ptbletter.cls
@@ -64,15 +64,19 @@
\HyphSubstIfExists{german-x-latest}{%
\HyphSubstLet{german}{german-x-latest}}{}
-\RequirePackage{ifxetex,ifluatex,url,array}
+\RequirePackage{ifxetex,ifluatex,url,array,tabularx}
\newif\ifXeOrLua \XeOrLuafalse
\ifxetex\XeOrLuatrue\else\ifluatex\XeOrLuatrue\fi\fi
% TODO: Mathematik?
\ifXeOrLua% XeLaTeX oder luaLaTeX
\RequirePackage{fontspec}
- \setmainfont{TeX Gyre Pagella}[Ligatures=TeX]
- \setsansfont{TeX Gyre Heros}[Scale=MatchUppercase,Ligatures=TeX]
+ \AtBeginDocument{% ???
+ \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}[%
Extension = .ttf,
BoldFont = AnonymousPro-Bold,
@@ -80,14 +84,22 @@
BoldItalicFont = AnonymousPro-BoldItalic,
Scale = MatchLowercase
]
+ \fi
\else
\RequirePackage[utf8]{inputenc}
\RequirePackage[T1]{fontenc}
+ \usepackage[scaled=0.85]{DejaVuSansMono}
\RequirePackage{textcomp}
\RequirePackage{mathpazo}
\RequirePackage{tgpagella}
\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
%\RequirePackage{etoolbox}
@@ -107,14 +119,6 @@
\defineshorthand{"'}{\closeautoquote}
\AtEndOfClass{\shorthandon{"}}
-\def\tiny{\@setfontsize\tiny{7}{8.17}}
-
-\ifptb@serif
- \renewcommand*\familydefault{\rmdefault}
-\else
- \renewcommand*\familydefault{\sfdefault}
-\fi
-
\@setplength{toaddrhpos}{72bp}
\@setplength{toaddrvpos}{124bp}
%\@setplength{toaddrwidth}{85mm}
@@ -147,11 +151,12 @@
\addtokomafont{addressee}{\sffamily}
\setkomafont{refname}{\sffamily\tiny}
-\setkomafont{refvalue}{\normalfont}
+\setkomafont{refvalue}{\normalfont\footnotesize}
\setkomavar{location}{%
\extrarowheight=-1bp %
- \begin{tabular}{@{}>{\usekomafont{refname}}l<{:}@{~\,}>{\usekomafont{refvalue}}l@{}}
+ \begin{tabular}%
+ {@{}>{\usekomafont{refname}}l<{:}@{~\,}>{\usekomafont{refvalue}}l@{}}
\usekomavar*{yourref} & \usekomavar{yourref}\\
\usekomavar*{yourmail} & \usekomavar{yourmail}\\
\usekomavar*{myref} & \usekomavar{myref}\\
@@ -259,34 +264,6 @@
swissgerman,nswissgerman}\enclname{Anlagen}%
\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
\RequirePackage[%
,factor=1500
@@ -299,6 +276,9 @@
]{microtype}
\fi
}
+\RequirePackage{enumitem}
+\setlist{leftmargin=*,nosep,topsep=.5em,itemsep=.25em}
+\setlist[1]{labelindent=1em}
\iflanguage{ngerman}{%
\newcommand*\MFG{Mit freundlichen Gr\"u\ss en}
--
GitLab