From 45690659769317dec996e2895692a42558af1dfc Mon Sep 17 00:00:00 2001 From: niepra01 <rolf.niepraschk@ptb.de> Date: Fri, 1 Dec 2017 09:55:48 +0100 Subject: [PATCH] mehr nac "siunitx-PTB.sty" ausgelagert --- kalibrierschein/kalibrierschein.cls | 34 ++-------------------------- kalibrierschein/siunitx-PTB.sty | 35 +++++++++++++++++++++++++++++ kalibrierschein/test-ks-IK-2015.tex | 2 +- ptbletter/ptbletter.cls | 10 +++++---- 4 files changed, 44 insertions(+), 37 deletions(-) diff --git a/kalibrierschein/kalibrierschein.cls b/kalibrierschein/kalibrierschein.cls index 2d970c4..e9f1368 100644 --- a/kalibrierschein/kalibrierschein.cls +++ b/kalibrierschein/kalibrierschein.cls @@ -6,7 +6,7 @@ \newcommand*\ks@langs{ngerman,main=english} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{kalibrierschein} - [2015/12/10 v0.2b Dokumentenklasse (RN/PTB)] + [2017/12/01 v0.2c Dokumentenklasse (RN/PTB)] \DeclareOption{BS}{\def\ks@location{Braunschweig}} \DeclareOption{BLN}{\def\ks@location{Berlin}} \DeclareOption{KK}{\edef\ks@kalType{\CurrentOption}} @@ -34,17 +34,13 @@ %\RequirePackage{showframe} \RequirePackage[\ks@langs]{babel} -\RequirePackage{iflang} \RequirePackage[autostyle=true,german=guillemets,maxlevel=3]{csquotes}% +\RequirePackage{iflang} \IfLanguageName{ngerman}{% - \typeout{ngerman} \AtEndOfClass{\shorthandon{"}} \defineshorthand{"`}{\openautoquote} \defineshorthand{"'}{\closeautoquote} - \AtBeginDocument{\sisetup{locale=DE}} }{% - \typeout{english} - \AtBeginDocument{\sisetup{locale=UK}} } \MakeAutoQuote{»}{«} \AtEndOfClass{% @@ -333,32 +329,6 @@ \RequirePackage{siunitx-PTB} -\let\ke@orig@SI=\SI -\renewcommand*\SI[2][]{% tolerant gegenüber "?" statt Zahl - \def\ks@tempa{#1}% - \edef\ks@tempb{\trim@spaces{#2}}% - \ks@SI@i -} -\newcommand*\ks@SI@i[2][]{% - \def\ks@tempc{?}% - \ifx\ks@tempb\ks@tempc - \ensuremath{\textbf{??}}\,\si[#1]{#2}% - \else - \edef\ks@tempe{\noexpand\ke@orig@SI[\ks@tempa]{\ks@tempb}[#1]{#2}}% - \ks@tempe - \fi -} -\let\ke@orig@num=\num -\renewcommand*\num[1]{% tolerant gegenüber "?" statt Zahl - \edef\ks@tempb{\trim@spaces{#1}}% - \def\ks@tempc{?}% - \ifx\ks@tempb\ks@tempc - \ensuremath{\textbf{??}}% - \else - \ke@orig@num{#1}% - \fi -} - \newcommand\resultTable[3][]{% \@tempcnta=#2 % \@tempcntb=\numexpr(\@tempcnta-1)*2 % diff --git a/kalibrierschein/siunitx-PTB.sty b/kalibrierschein/siunitx-PTB.sty index 929082c..f81907b 100644 --- a/kalibrierschein/siunitx-PTB.sty +++ b/kalibrierschein/siunitx-PTB.sty @@ -40,5 +40,40 @@ }% } +\let\ke@orig@SI=\SI +\renewcommand*\SI[2][]{% tolerant gegenüber "?" statt Zahl + \def\ks@tempa{#1}% + \edef\ks@tempb{\trim@spaces{#2}}% + \ks@SI@i +} +\newcommand*\ks@SI@i[2][]{% + \def\ks@tempc{?}% + \ifx\ks@tempb\ks@tempc + \ensuremath{\textbf{??}}\,\si[#1]{#2}% + \else + \edef\ks@tempe{\noexpand\ke@orig@SI[\ks@tempa]{\ks@tempb}[#1]{#2}}% + \ks@tempe + \fi +} +\let\ke@orig@num=\num +\renewcommand*\num[1]{% tolerant gegenüber "?" statt Zahl + \edef\ks@tempb{\trim@spaces{#1}}% + \def\ks@tempc{?}% + \ifx\ks@tempb\ks@tempc + \ensuremath{\textbf{??}}% + \else + \ke@orig@num{#1}% + \fi +} + +\RequirePackage{iflang} +\IfLanguageName{ngerman}{% + \typeout{ngerman} + \AtBeginDocument{\sisetup{locale=DE}} +}{% + \typeout{english} + \AtBeginDocument{\sisetup{locale=UK}} +} + \endinput diff --git a/kalibrierschein/test-ks-IK-2015.tex b/kalibrierschein/test-ks-IK-2015.tex index 82f4991..61b06b0 100644 --- a/kalibrierschein/test-ks-IK-2015.tex +++ b/kalibrierschein/test-ks-IK-2015.tex @@ -1,7 +1,7 @@ %--------------------------- \listfiles -\documentclass[de,IK,2015]{kalibrierschein} +\documentclass[en,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/ptbletter/ptbletter.cls b/ptbletter/ptbletter.cls index 06b0941..a11cd69 100644 --- a/ptbletter/ptbletter.cls +++ b/ptbletter/ptbletter.cls @@ -4,7 +4,7 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{ptbletter} - [2017/11/30 v0.2a PTB-Brief-Klasse (RN)] + [2017/12/01 v0.2b PTB-Brief-Klasse (RN)] \let\ptb@tempdima=\@ovxx \let\ptb@tempdimb=\@ovyy @@ -51,12 +51,14 @@ ,backaddress=plain ,refline=nodate ,enlargefirstpage +,pagenumber=no +,parskip=never ]{scrlttr2} % Texbreite beibehalten, linken Rand anpassen -\ptb@tempdima=\textwidth -\RequirePackage[verbose,inner=72bp,textwidth=\ptb@tempdima]{geometry} -%\textheight=1.1\textheight +\oddsidemargin=0.0pt % +\evensidemargin=34.7124pt % +\raggedbottom \RequirePackage{hyphsubst}% Trennregeln austauschen \HyphSubstIfExists{ngerman-x-latest}{% -- GitLab