diff --git a/antragsbestaetigung/ptbletter-test.tex b/antragsbestaetigung/ptbletter-test.tex
index 2f87688a9610acd82b075733fb68c3189d3e2398..90f324723acfd63ea1a8b1170d857e0cfbf6fc70 100644
--- a/antragsbestaetigung/ptbletter-test.tex
+++ b/antragsbestaetigung/ptbletter-test.tex
@@ -2,38 +2,38 @@
\documentclass[%
,ngerman
,visualize
+,twoside
+,serif
+,BLN
]{ptbletter}
\usepackage{blindtext}
-\setkomavar{backaddress}{PTB\\Abbestr. 2--12\\10587 Berlin}
-%\setkomavar{backaddress}{PTB\\Postfach 33 45\\38023 Braunschweig}
+\yourref{hugo}
+\yourmail{2015-05-08}
-\setkomavar{yourref}{hugo}
-\setkomavar{yourmail}{2015-05-08}
+\handledby{Peter Silie}
+\myref{pesi}
+\mymail{2015-05-14}
+\myphone{7316}
+\myfax{7777}
+\myemail{Peter.Silie@ptb.de}
-\setkomavar{handledby}{Peter Silie}
-\setkomavar{myref}{pesi}
-\setkomavar{mymail}{2015-05-14}
-\setkomavar{myphone}{7316}
-\setkomavar{myfax}{7777}
-\setkomavar{fromemail}{Peter.Silie@ptb.de}
+\subject{Neuordnung der Welt}
-\setkomavar{subject}{Neuordnung der Welt}
-
-\setkomavar{date}{2015-05-21}
+\date{2015-05-21}
\begin{document}
\begin{letter}{%
Petra Mustermann\\
Vor dem Berg 1\\
-12345 Musterhausen%
+12345 Musterhausen
}
\opening{Liebe Vereinsvorsitzende,}
-\blindtext[2]
+\blindtext[12]
\end{letter}
diff --git a/antragsbestaetigung/ptbletter.cls b/antragsbestaetigung/ptbletter.cls
index c615e2eaafe42a09ea54b2c8ce075b1f97302cfc..9a20ba1d73f88f7c2bd8ee1f8a0b47cbc2d4b2fc 100644
--- a/antragsbestaetigung/ptbletter.cls
+++ b/antragsbestaetigung/ptbletter.cls
@@ -4,13 +4,29 @@
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{ptbletter}
- [2015/05/08 v0.1a PTB-Brief-Klasse (RN)]
+ [2015/05/22 v0.1b PTB-Brief-Klasse (RN)]
+
+\let\ptb@tempdima=\@ovxx
+\let\ptb@tempdimb=\@ovyy
+\let\ptb@tempdimc=\@ovdx
+\let\ptb@tempdimd=\@clnwd
+\let\ptb@tempdime=\@clnht
+\let\ptb@tempdimf=\@dashdim
+
+\newif\ifptb@BLN \ptb@BLNtrue
+\newif\ifPTB@serif \PTB@seriffalse
+
+% TODO: BS, BLN, serif, sanserif
\DeclareOption{german}{\def\ptb@lang{main=ngerman}}
\DeclareOption{ngerman}{\def\ptb@lang{main=ngerman}}
\DeclareOption{de}{\def\ptb@lang{main=ngerman}}
\DeclareOption{english}{\def\ptb@lang{main=english}}
\DeclareOption{en}{\def\ptb@lang{main=english}}
+\DeclareOption{BS}{\ptb@BLNfalse}
+\DeclareOption{BLN}{\ptb@BLNtrue}
+\DeclareOption{sanserif}{\PTB@seriffalse}
+\DeclareOption{serif}{\PTB@seriftrue}
\DeclareOption{visualize}{%
\PassOptionsToClass{\CurrentOption}{scrlttr2}
@@ -30,23 +46,29 @@
\ProcessOptions\relax
\LoadClass[%
-,fontsize=10pt
+,fontsize=11pt
,DINmtext
,fromrule=off% ???
,backaddress=plain
,refline=nodate
+,enlargefirstpage
]{scrlttr2}
+% Texbreite beibehalten, linken Rand anpassen
+\ptb@tempdima=\textwidth
+\RequirePackage[verbose,inner=72bp,textwidth=\ptb@tempdima]{geometry}
+
\RequirePackage{hyphsubst}% Trennregeln austauschen
\HyphSubstIfExists{ngerman-x-latest}{%
\HyphSubstLet{ngerman}{ngerman-x-latest}}{}
\HyphSubstIfExists{german-x-latest}{%
\HyphSubstLet{german}{german-x-latest}}{}
-\RequirePackage{ifxetex,ifluatex,url}
+\RequirePackage{ifxetex,ifluatex,url,array}
\newif\ifXeOrLua \XeOrLuafalse
\ifxetex\XeOrLuatrue\else\ifluatex\XeOrLuatrue\fi\fi
+% TODO: Mathematik?
\ifXeOrLua% XeLaTeX oder luaLaTeX
\RequirePackage{fontspec}
\setmainfont{TeX Gyre Pagella}[Ligatures=TeX]
@@ -68,6 +90,14 @@
\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}
%\preto\@classoptionslist{ngerman,}
% Ohne Sprachangabe "deutsch" verwenden. Bessere Lösung?
@@ -86,41 +116,111 @@
\RequirePackage[babel=once]{csquotes}
}
\@setplength{toaddrhpos}{72bp}
-\@setplength{toaddrvpos}{123bp}
+\@setplength{toaddrvpos}{124bp}
%\@setplength{toaddrwidth}{85mm}
\@setplength{lochpos}{-354bp}% "-" --> vom linken Blattand aus
\@setplength{locvpos}{146bp}% --> vom oberen Blattand aus
\@setplength{locwidth}{212bp}
-\@setplength{locheight}{132bp}
+\@setplength{locheight}{135bp}
+
+%\@setplength{refaftervskip}{75bp}
+
+%\@setplength{refhpos}{72bp}
+\@setplength{refvpos}{304bp}
+%\@setplength{refwidth}{40mm}
+\@setplength{refaftervskip}{\z@}
+
+\@setplength{firstfoothpos}{72bp}
+\@setplength{firstfootvpos}{764bp}
+\@setplength{firstheadwidth}{469bp}
+\@setplength{firstfootwidth}{\useplength{firstheadwidth}}
+
+\footskip= 30bp %
-\@setplength{refaftervskip}{75bp}
+\@setplength{subjectaftervskip}{23bp}
%\@setplength{refvpos}{1sp}
%\@setplength{refhpos}{1sp}
%\@setplength{refwidth}{110bp}
\removereffields
-\setkomavar{backaddressseparator}{\,\,\textbullet\,\,}
-
\addtokomafont{addressee}{\sffamily}
-\addtokomafont{refvalue}{\normalfont}
-
-\setkomavar{location}{% TODO: Tabelle!
-\raggedright\usekomafont{refvalue}%
-{\usekomafont{refname}\usekomavar*{yourref}:}~\usekomavar{yourref}\\
-{\usekomafont{refname}\usekomavar*{yourmail}:}~\usekomavar{yourmail}\\
-{\usekomafont{refname}\usekomavar*{myref}:}~\usekomavar{myref}\\
-{\usekomafont{refname}\usekomavar*{mymail}:}~\usekomavar{mymail}\\
-~\\
-{\usekomafont{refname}\usekomavar*{handledby}:}~\usekomavar{handledby}\\
-{\usekomafont{refname}\usekomavar*{myphone}:}~\usekomavar{myphone}\\
-{\usekomafont{refname}\usekomavar*{myfax}:}~\usekomavar{myfax}\\
-{\usekomafont{refname}\usekomavar*{fromemail}:}~\usekomavar{fromemail}\\
-~\\
-{\usekomafont{refname}\usekomavar*{date}:}~\usekomavar{date}
+\setkomafont{refname}{\sffamily\tiny}
+\setkomafont{refvalue}{\normalfont}
+
+\setkomavar{location}{%
+ \extrarowheight=-1bp %
+ \begin{tabular}{@{}>{\usekomafont{refname}}l<{:}@{~\,}>{\usekomafont{refvalue}}l@{}}
+ \usekomavar*{yourref} & \usekomavar{yourref}\\
+ \usekomavar*{yourmail} & \usekomavar{yourmail}\\
+ \usekomavar*{myref} & \usekomavar{myref}\\
+ \usekomavar*{mymail} & \usekomavar{mymail}\\
+ \multicolumn{2}{@{}l@{}}{} \\
+ \usekomavar*{handledby} & \usekomavar{handledby}\\
+ \usekomavar*{myphone} & \usekomavar{myphone}\\
+ \usekomavar*{myfax} & \usekomavar{myfax}\\
+ \usekomavar*{fromemail} & \usekomavar{fromemail}\\
+ \multicolumn{2}{@{}l@{}}{} \\
+ \usekomavar*{date} & \usekomavar{date}
+ \end{tabular}
}
+\setkomavar{firstfoot}{% TODO: engl/dt
+ \parbox{\useplength{firstfootwidth}}{%
+ \sffamily\tiny
+ \begin{tabular}{@{}l@{}}
+ Hausadresse, Lieferanschrift:\\
+ \ifptb@BLN Abbestr. 2--12 \else Bundesallee 100 \fi \\
+ \ifptb@BLN 10587 Berlin \else 38116 Braunschweig\fi \\
+ DEUTSCHLAND
+ \end{tabular}%
+ \hfill
+ \begin{tabular}{@{}l@{~}l@{}}
+ Telefon: & \ifptb@BLN +49 30 3481-0 \else +49 531 592-0 \fi \\
+ Telefax: & \ifptb@BLN +49 30 3481-7490 \else +49 531 592-9292 \fi \\
+ E-Mail: & \ifptb@BLN poststelle\_ib@ptb.de \else poststelle@ptb.de \fi \\
+ Internet: & http://www.ptb.de
+ \end{tabular}%
+ \hfill
+ \begin{tabular}{@{}l@{~}l@{}}
+ \multicolumn{2}{@{}l@{}}{Deutsche Bundesbank, Filiale Leipzig} \\
+ IBAN: & DE38 8600 0000 0086 0010 40 \\
+ BIC: & MARKDEF1860 \\
+ VAT-Nr.: & DE 811 240 952
+ \end{tabular}%
+ \hfill
+ \begin{tabular}{@{}l@{}}
+ \ifptb@BLN PTB Braunschweig \else PTB Berlin-Charlottenburg \fi \\
+ \ifptb@BLN Bundesallee 100 \else Abbestr. 2--12 \fi \\
+ \ifptb@BLN 38116 Braunschweig \else 10587 Berlin \fi \\
+ DEUTSCHLAND
+ \end{tabular}%
+ \hfill \mbox{}
+ }%
+}
+
+\setkomavar{backaddressseparator}{\,\,\textbullet\,\,}
+\ifptb@BLN
+ \setkomavar{backaddress}{PTB\\Abbestr. 2--12\\10587 Berlin}
+\else
+ \setkomavar{backaddress}{PTB\\Postfach 33 45\\38023 Braunschweig}
+\fi
+
+\newcommand*\handledby[1]{\setkomavar{handledby}{#1}}
+\newcommand*\myref[1]{\setkomavar{myref}{#1}}
+\newcommand*\mymail[1]{\setkomavar{mymail}{#1}}
+\newcommand*\myphone[1]{\setkomavar{myphone}{#1}}
+\newcommand*\myfax[1]{\setkomavar{myfax}{#1}}
+\newcommand*\myemail[1]{\setkomavar{fromemail}{#1}}
+
+\newcommand*\yourref[1]{\setkomavar{yourref}{#1}}
+\newcommand*\yourmail[1]{\setkomavar{yourmail}{#1}}
+
+\newcommand*\backaddress[1]{\setkomavar{backaddress}{#1}}
+\newcommand*\subject[1]{\setkomavar{subject}{#1}}
+\renewcommand*\date[1]{\setkomavar{date}{#1}}
+
\newkomavar[\mymailname]{mymail}
\newkomavar[\myphonename]{myphone}
\newkomavar[\myfaxname]{myfax}