diff --git a/adressaufkleber/test-addressLabels.tex b/adressaufkleber/test-addressLabels.tex
index 5e67d4b627c258c792f0fe4d6edb70bf88699356..673634d04d9779c89e0a3802c25f4dd536706056 100644
--- a/adressaufkleber/test-addressLabels.tex
+++ b/adressaufkleber/test-addressLabels.tex
@@ -1,7 +1,7 @@
%---------------------------
-\listfiles
-\documentclass[ngerman]{vl-addressLabels}
+\documentclass[ de ]{vl-addressLabels}
+%\documentclass[ en ]{vl-addressLabels}
\firm{oclaro AG}
\attn{z.\,Hd.}% "z.\,Hd.", "Attn:" oder "c/o"
diff --git a/adressaufkleber/vl-addressLabels.cls b/adressaufkleber/vl-addressLabels.cls
index b2bf2ce764afead019509499ea55807e0c83a8d2..6510474f2be76c567f40217715e229dc5e44f243 100644
--- a/adressaufkleber/vl-addressLabels.cls
+++ b/adressaufkleber/vl-addressLabels.cls
@@ -1,8 +1,16 @@
\setcounter{errorcontextlines}{100}
+\listfiles
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{vl-addressLabels}
- [2013/01/17 v0.1d Dokumentenklasse (RN/PTB)]
+ [2015/04/30 v0.1e Dokumentenklasse (RN/PTB)]
+
+\newcommand*\vl@lang{ngerman}
+
+\DeclareOption{de}{\def\vl@lang{ngerman}}
+\DeclareOption{german}{\def\vl@lang{ngerman}}
+\DeclareOption{en}{\def\vl@lang{english}}
+
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
\ProcessOptions\relax
\PassOptionsToPackage{paper=a4,pagesize,twoside=false,headinclude}{typearea}
@@ -11,11 +19,6 @@
,fontsize=12pt
]{scrartcl}
-\def\@tempa{1}
-\ifx\LANG\@tempa
- \PassOptionsToPackage{ngerman}{babel}
-\fi
-
\def\huge{\@setfontsize\huge{20.26}{25.3}}
\def\large{\@setfontsize\large{12.17}{14.2}}
\def\tiny{\@setfontsize\tiny\@viipt\@viiipt}
@@ -26,59 +29,10 @@
\RequirePackage{eso-pic,graphicx}
-\RequirePackage{babel}
-
-\RequirePackage{picture}
-
-\let\@tempdimd=\@clnwd
-\let\@tempdime=\@clnht
-\let\@tempdimf=\@dashdim
-
-\AtBeginDocument{%
-\newif\ifGERMAN \GERMANfalse
-\newif\ifENGLISH \ENGLISHtrue
-\iflanguage{ngerman}{\GERMANtrue\ENGLISHfalse}{%
- \iflanguage{german}{\GERMANtrue\ENGLISHfalse}{}}
-%\iflanguage{english}{\ENGLISHtrue}{}
-
-\ifGERMAN % Wohl alles unnötig
-
-\fi
-\ifENGLISH
-
-\fi
-
-\mbox{}
-
-%-------- End AtBeginDocument ------------
-}
-
-\newcommand*\vl@firm{}
-\newcommand*\vl@attn{}% "z.\,Hd.", "Attn:" oder "c/o"
-\newcommand*\vl@name{}
-\newcommand*\vl@street{}
-\newcommand*\vl@zip{}
-\newcommand*\vl@town{}
-\newcommand*\vl@land{}
-
-\AddToShipoutPictureBG*{%
- \vlLabels
-}%
-
-\RequirePackage{url}
-
\RequirePackage{ifxetex,ifluatex}
\newif\ifXeOrLua \XeOrLuafalse
\ifxetex\XeOrLuatrue\else\ifluatex\XeOrLuatrue\fi\fi
-\RequirePackage[
-% factor=1500
-% ,verbose=true
-,final=true
-% ,letterspace=100
-,babel=true
-]{microtype}
-
\ifXeOrLua% XeLaTeX oder luaLaTeX
\typeout{############################ XeLaTeX oder luaLaTeX}
@@ -150,11 +104,58 @@
\fi
+\RequirePackage[\vl@lang]{babel}
+\RequirePackage{iflang}
+\IfLanguageName{ngerman}{%
+ \RequirePackage[babel=once,german=guillemets]{csquotes}
+ \AtEndOfClass{\shorthandon{"}}
+ \defineshorthand{"`}{\openautoquote}
+ \defineshorthand{"'}{\closeautoquote}
+ \MakeAutoQuote{»}{«}
+}{%
+ \RequirePackage[babel=once]{csquotes}
+}
+
+\RequirePackage{picture}
+
+\let\@tempdimd=\@clnwd
+\let\@tempdime=\@clnht
+\let\@tempdimf=\@dashdim
+
+\AtBeginDocument{%
+ \mbox{}
+}
+
+\newcommand*\vl@firm{}
+\newcommand*\vl@attn{}% "z.\,Hd.", "Attn:" oder "c/o"
+\newcommand*\vl@name{}
+\newcommand*\vl@street{}
+\newcommand*\vl@zip{}
+\newcommand*\vl@town{}
+\newcommand*\vl@land{}
+
+\AddToShipoutPictureBG*{%
+ \vlLabels
+}%
+
+\RequirePackage{url}
+
+\RequirePackage[
+% factor=1500
+% ,verbose=true
+,final=true
+% ,letterspace=100
+,babel=true
+]{microtype}
+
\newcommand*\vlReturn{%
\parbox[t]{\paperwidth}{%
Dr.~Karl Jousten \par
- \ifGERMAN Leiter der Arbeitsgruppe für Vakuummetrologie \par \fi
- \ifENGLISH Head of Section Vacuum Metrology \par \fi
+ \IfLanguageName{ngerman}{%
+ Leiter der Arbeitsgruppe für Vakuummetrologie
+ }{%
+ Head of Section Vacuum Metrology
+ }\par
Physikalisch-Technische Bundesanstalt \par
Abbestraße 2--12 \par
10587 Berlin \par
diff --git a/kalibrierschein/kalibrierschein.cls b/kalibrierschein/kalibrierschein.cls
index e1ccf8aec6d991b8440e42d725a0f5f80e3dce00..1f19d9f0de8a54eaf8b326567696c330246c1ecf 100644
--- a/kalibrierschein/kalibrierschein.cls
+++ b/kalibrierschein/kalibrierschein.cls
@@ -3,18 +3,20 @@
\newcommand*\ks@location{Berlin}
\newcommand*\ks@kalType{KK}
\newcommand*\ks@layout{-0000}
-\newcommand*\ks@LANG{0}
+\newcommand*\ks@langs{english,main=ngerman}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{kalibrierschein}
- [2015/04/27 v0.1u Dokumentenklasse (RN/PTB)]
+ [2015/04/30 v0.1v Dokumentenklasse (RN/PTB)]
\DeclareOption{BS}{\def\ks@location{Braunschweig}}
\DeclareOption{BLN}{\def\ks@location{Berlin}}
\DeclareOption{KK}{\edef\ks@kalType{\CurrentOption}}
\DeclareOption{IK}{\edef\ks@kalType{\CurrentOption}}
\DeclareOption{2015}{\edef\ks@layout{-\CurrentOption}}
-\DeclareOption{ngerman}{\def\ks@LANG{0}}
-\DeclareOption{german}{\def\ks@LANG{0}}
-\DeclareOption{english}{\def\ks@LANG{1}}
+\DeclareOption{german}{\def\ks@langs{english,main=ngerman}}
+\DeclareOption{ngerman}{\def\ks@langs{english,main=ngerman}}
+\DeclareOption{de}{\def\ks@langs{english,main=ngerman}}
+\DeclareOption{english}{\def\ks@langs{ngerman,main=english}}
+\DeclareOption{en}{\def\ks@langs{ngerman,main=english}}
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
\ProcessOptions\relax
\PassOptionsToPackage{paper=a4,pagesize,twoside=false,headinclude}{typearea}
@@ -31,15 +33,21 @@
%\RequirePackage{showframe}
-\ifcase\ks@LANG
- \RequirePackage[english,ngerman]{babel}
+\RequirePackage[\ks@langs]{babel}
+\RequirePackage{iflang}
+\IfLanguageName{ngerman}{%
+ \typeout{ngerman}
+ \RequirePackage[babel=once,german=guillemets]{csquotes}
+ \AtEndOfClass{\shorthandon{"}}
+ \defineshorthand{"`}{\openautoquote}
+ \defineshorthand{"'}{\closeautoquote}
+ \MakeAutoQuote{»}{«}
\AtBeginDocument{\sisetup{locale=DE}}
-\or
- \RequirePackage[ngerman,english]{babel}
+}{%
+ \typeout{english}
+ \RequirePackage[babel=once]{csquotes}
\AtBeginDocument{\sisetup{locale=US}}
-\or
-% ...
-\fi
+}
\def\huge{\@setfontsize\huge{20.26}{25.3}}
\def\large{\@setfontsize\large{12.17}{14.2}}
diff --git a/kalibrierschein/test-ks-IK-2015.tex b/kalibrierschein/test-ks-IK-2015.tex
index 151c699112480de2991a65e2af25e1a6742cc3ea..82f4991b199e6d26dff99246df57ea337a74cb31 100644
--- a/kalibrierschein/test-ks-IK-2015.tex
+++ b/kalibrierschein/test-ks-IK-2015.tex
@@ -1,7 +1,7 @@
%---------------------------
\listfiles
-\documentclass[ngerman,IK,2015]{kalibrierschein}
+\documentclass[de,IK,2015]{kalibrierschein}
\resultTable{ 6 }{%
{\(p_{cal}\)}&{\(p_{ind}\)}&{\(p_r\)}&{\(p_{ind} - p_r\)}&{\(e\)}&{\(U(k=2)\)}\\
mbar&mbar&mbar&mbar&&\\\toprule\endhead
diff --git a/kalibrierschein/test-ks-KK-2015.tex b/kalibrierschein/test-ks-KK-2015.tex
index b1dc624d59eccf95c4a10429bb4cefbf9a0b58c1..4882e934c56cab10ba017d9f766cd36588f2b3a5 100644
--- a/kalibrierschein/test-ks-KK-2015.tex
+++ b/kalibrierschein/test-ks-KK-2015.tex
@@ -1,7 +1,7 @@
%---------------------------
\listfiles
-\documentclass[ngerman,KK,2015]{kalibrierschein}
+\documentclass[en,KK,2015]{kalibrierschein}
\resultTable{ 6 }{%
{\(p_{cal}\)}&{\(p_{ind}\)}&{\(p_r\)}&{\(p_{ind} - p_r\)}&{\(e\)}&{\(U(k=2)\)}\\
mbar&mbar&mbar&mbar&&\\\toprule\endhead
@@ -39,6 +39,8 @@ mbar&mbar&mbar&mbar&&\\\toprule\endhead
\printFirstPage
\section{ Description of the calibration device }
+ \IfLanguageName{ngerman}{DEUTSCH}{ENGLISH}
+
%\num{9.99E-7 +- 9E-9} \par \bigskip
\num{9.99 +- 0.09} \par \bigskip
diff --git a/versandauftrag/test-versandauftrag.pdf b/versandauftrag/test-versandauftrag.pdf
index df55aa7c2c38b332fc0b9ae9c54d249f0ec92309..0e1149a490e1adbef00f61192ac155ea35c3bc96 100644
Binary files a/versandauftrag/test-versandauftrag.pdf and b/versandauftrag/test-versandauftrag.pdf differ
diff --git a/versandauftrag/test-versandauftrag.tex b/versandauftrag/test-versandauftrag.tex
index d8e32b04fa544a1851a4b58c9375b2834c0c3df7..c35790dd7a606269eb3c4d6de5a924e3e62ea1e3 100644
--- a/versandauftrag/test-versandauftrag.tex
+++ b/versandauftrag/test-versandauftrag.tex
@@ -1,4 +1,6 @@
-\documentclass[ngerman]{vl-versandauftrag}
+\documentclass[ de ]{vl-versandauftrag}
+%\documentclass[ en ]{vl-versandauftrag}
+%\documentclass[ngerman]{vl-versandauftrag}
\WorkingGroup{7.54}
\TelefonExtension{7216}
diff --git a/versandauftrag/vl-versandauftrag.cls b/versandauftrag/vl-versandauftrag.cls
index 7929f3942507cbaf35ae171bbc68112a9d8438c1..4e26931c6a33dd563bc8508334bf4cd262172912 100644
--- a/versandauftrag/vl-versandauftrag.cls
+++ b/versandauftrag/vl-versandauftrag.cls
@@ -2,7 +2,14 @@
\listfiles
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{vl-versandauftrag}
- [2015/04/24 v0.1g Dokumentenklasse (RN/PTB)]
+ [2015/04/30 v0.1h Dokumentenklasse (RN/PTB)]
+
+\newcommand*\vl@lang{ngerman}
+
+\DeclareOption{de}{\def\vl@lang{ngerman}}
+\DeclareOption{german}{\def\vl@lang{ngerman}}
+\DeclareOption{en}{\def\vl@lang{english}}
+
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
\ProcessOptions\relax
\PassOptionsToPackage{paper=a4,pagesize}{typearea}
@@ -25,11 +32,17 @@
\setlength\textheight{741bp}
\RequirePackage{eso-pic,pict2e,picture,xcolor,relsize,trimspaces}
-\RequirePackage{babel}
-\RequirePackage[babel=once,german=guillemets]{csquotes}
-\AtEndOfClass{\shorthandon{"}}
-\defineshorthand{"`}{\openautoquote}
-\defineshorthand{"'}{\closeautoquote}
+\RequirePackage[\vl@lang]{babel}
+\RequirePackage{iflang}
+\IfLanguageName{ngerman}{%
+ \RequirePackage[babel=once,german=guillemets]{csquotes}
+ \AtEndOfClass{\shorthandon{"}}
+ \defineshorthand{"`}{\openautoquote}
+ \defineshorthand{"'}{\closeautoquote}
+ \MakeAutoQuote{»}{«}
+}{%
+ \RequirePackage[babel=once]{csquotes}
+}
\definecolor{thisGray}{gray}{0.881}