From d260fc2570723e22441c83267acdccca37d4a5f1 Mon Sep 17 00:00:00 2001
From: niepra01 <rolf.niepraschk@ptb.de>
Date: Tue, 26 May 2015 12:46:57 +0200
Subject: [PATCH] Bessere Sprachumschaltung
---
.../antragsbestaetigung-test.tex | 8 +------
antragsbestaetigung/antragsbestaetigung.cls | 19 +++++++++++++++
ptbletter/ptbletter-doc.tex | 1 -
ptbletter/ptbletter.cls | 24 +++++++++----------
4 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/antragsbestaetigung/antragsbestaetigung-test.tex b/antragsbestaetigung/antragsbestaetigung-test.tex
index 8f61d67..53b41ab 100644
--- a/antragsbestaetigung/antragsbestaetigung-test.tex
+++ b/antragsbestaetigung/antragsbestaetigung-test.tex
@@ -1,11 +1,5 @@
-\documentclass[%
-,ngerman
-%,visualize
-,twoside
-,serif
-,BLN
-]{ptbletter}
+\documentclass[en]{antragsbestaetigung}
\usepackage{blindtext}
diff --git a/antragsbestaetigung/antragsbestaetigung.cls b/antragsbestaetigung/antragsbestaetigung.cls
index 7c0dcb7..d425e8e 100644
--- a/antragsbestaetigung/antragsbestaetigung.cls
+++ b/antragsbestaetigung/antragsbestaetigung.cls
@@ -1 +1,20 @@
+% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
+
+\setcounter{errorcontextlines}{100} \listfiles
+
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesClass{ptbletter}
+ [2015/05/26 v0.1a PTB-Brief-Klasse (RN)]
+
+%\DeclareOption{de}{\def\ptb@lang{main=ngerman}}
+
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{ptbletter}}
+
+\ProcessOptions\relax
+
+\LoadClass[%
+,BLN
+]{ptbletter}
+
+
\endinput
diff --git a/ptbletter/ptbletter-doc.tex b/ptbletter/ptbletter-doc.tex
index 8877916..78b8498 100644
--- a/ptbletter/ptbletter-doc.tex
+++ b/ptbletter/ptbletter-doc.tex
@@ -1,7 +1,6 @@
\documentclass[%
,ngerman
-%,visualize
,twoside
,serif
,BLN
diff --git a/ptbletter/ptbletter.cls b/ptbletter/ptbletter.cls
index d8bd2d5..0c8a9f4 100644
--- a/ptbletter/ptbletter.cls
+++ b/ptbletter/ptbletter.cls
@@ -4,7 +4,7 @@
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{ptbletter}
- [2015/05/22 v0.1b PTB-Brief-Klasse (RN)]
+ [2015/05/26 v0.1c PTB-Brief-Klasse (RN)]
\let\ptb@tempdima=\@ovxx
\let\ptb@tempdimb=\@ovyy
@@ -16,8 +16,6 @@
\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}}
@@ -170,16 +168,16 @@
\parbox{\useplength{firstfootwidth}}{%
\sffamily\tiny
\begin{tabular}{@{}l@{}}
- Hausadresse, Lieferanschrift:\\
+ \iflanguage{ngerman}{Hausadresse, Lieferanschrift:}{Domicile:} \\
\ifptb@BLN Abbestr. 2--12 \else Bundesallee 100 \fi \\
\ifptb@BLN 10587 Berlin \else 38116 Braunschweig\fi \\
- DEUTSCHLAND
+ \iflanguage{ngerman}{DEUTSCHLAND}{GERMANY} \\
\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 \\
+ \usekomavar*{fromphone} & \ifptb@BLN +49 30 3481-0 \else +49 531 592-0 \fi \\
+ \usekomavar*{fromfax} & \ifptb@BLN +49 30 3481-7490 \else +49 531 592-9292 \fi \\
+ \usekomavar*{fromemail} & \ifptb@BLN poststelle\_ib@ptb.de \else poststelle@ptb.de \fi \\
Internet: & http://www.ptb.de
\end{tabular}%
\hfill
@@ -194,7 +192,7 @@
\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
+ \iflanguage{ngerman}{DEUTSCHLAND}{GERMANY}
\end{tabular}%
\hfill \mbox{}
}%
@@ -229,15 +227,17 @@
\defcaptionname{american,australian,british,canadian,%
english,newzealand,UKenglish,USenglish}\yourrefname{Your reference}%
\defcaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\yourmailname{My letter of}%
+ english,newzealand,UKenglish,USenglish}\yourmailname{Your letter of}%
\defcaptionname{american,australian,british,canadian,%
english,newzealand,UKenglish,USenglish}\myrefname{My reference}%
+\defcaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\mymailname{My letter of}%
\defcaptionname{american,australian,british,canadian,%
english,newzealand,UKenglish,USenglish}\myphonename{Telephone}%
\defcaptionname{american,australian,british,canadian,%
english,newzealand,UKenglish,USenglish}\myfaxname{Fax}%
-\defcaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\emailname{E-mail}%
+%\defcaptionname{american,australian,british,canadian,%
+% english,newzealand,UKenglish,USenglish}\emailname{E-mail}%
\defcaptionname{american,australian,british,canadian,%
english,newzealand,UKenglish,USenglish}\handledbyname{Handled by}%
--
GitLab