Skip to content
Snippets Groups Projects
Commit 1edf036c authored by Rolf Niepraschk's avatar Rolf Niepraschk
Browse files

diverse siunitx-keys angepasst; in \printResultTable: "print-zero-exponent = false"

parent ad2c9973
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
\newif\ifnoCMC \noCMCfalse \newif\ifnoCMC \noCMCfalse
\NeedsTeXFormat{LaTeX2e}[1999/12/01] \NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{kalibrierschein} \ProvidesClass{kalibrierschein}
[2021/03/12 v0.6b documentclass PTB `Kalibrierschein' (RN/PTB)] [2021/06/03 v0.6c documentclass PTB `Kalibrierschein' (RN/PTB)]
\DeclareOption{BS}{\def\ks@location{Braunschweig}} \DeclareOption{BS}{\def\ks@location{Braunschweig}}
\DeclareOption{BLN}{\def\ks@location{Berlin}} \DeclareOption{BLN}{\def\ks@location{Berlin}}
\DeclareOption{KK}{\edef\ks@kalType{\CurrentOption}} \DeclareOption{KK}{\edef\ks@kalType{\CurrentOption}}
...@@ -67,7 +67,7 @@ footskip=0bp, ...@@ -67,7 +67,7 @@ footskip=0bp,
\newcommand*\ks@draftName{Draft}% \newcommand*\ks@draftName{Draft}%
\useshorthands{"} \useshorthands{"}
\defineshorthand{"`}{\openautoquote} \defineshorthand{"`}{\openautoquote}
\defineshorthand{"'}{\closeautoquote} \defineshorthand{"'}{\closeautoquote}
} }
\AtEndOfClass{\shorthandon{"}} \AtEndOfClass{\shorthandon{"}}
\MakeAutoQuote{»}{«} \MakeAutoQuote{»}{«}
...@@ -129,7 +129,7 @@ footskip=0bp, ...@@ -129,7 +129,7 @@ footskip=0bp,
\else% TeX+dvips \else% TeX+dvips
\fi \fi
\fi \fi
\fi \fi
\RequirePackage{amsmath} \RequirePackage{amsmath}
...@@ -154,12 +154,12 @@ footskip=0bp, ...@@ -154,12 +154,12 @@ footskip=0bp,
\RequirePackage{picture}% noch nötig? \RequirePackage{picture}% noch nötig?
\newdimen\ks@tempdima \newdimen\ks@tempdima
\newdimen\ks@tempdimb \newdimen\ks@tempdimb
\newdimen\ks@tempdimc \newdimen\ks@tempdimc
\newdimen\ks@tempdimd \newdimen\ks@tempdimd
\newdimen\ks@tempdime \newdimen\ks@tempdime
\newdimen\ks@tempdimf \newdimen\ks@tempdimf
\newcommand*\ks@tempa{} \newcommand*\ks@tempa{}
\newcommand*\ks@tempb{} \newcommand*\ks@tempb{}
...@@ -175,7 +175,7 @@ footskip=0bp, ...@@ -175,7 +175,7 @@ footskip=0bp,
} }
\newcommand*\ks@addTabLine[1]{% \newcommand*\ks@addTabLine[1]{%
\def\@tempc{}% \def\@tempc{}%
\@for\@tempa:=#1\do{% \@for\@tempa:=#1\do{%
\begingroup \begingroup
\let\\=\relax\let\newline=\relax \let\\=\relax\let\newline=\relax
...@@ -203,7 +203,7 @@ footskip=0bp, ...@@ -203,7 +203,7 @@ footskip=0bp,
\ks@getColSpec{\ks@type}{\ks@colSpec}% \ks@getColSpec{\ks@type}{\ks@colSpec}%
\edef\@tempa{\noexpand\begin{tabular}[t]{@{}\ks@colSpec @{}}}% \edef\@tempa{\noexpand\begin{tabular}[t]{@{}\ks@colSpec @{}}}%
\ks@tab\expandafter{\@tempa}% \ks@tab\expandafter{\@tempa}%
\ks@addTabLine{\ks@manufacturer}% \ks@addTabLine{\ks@manufacturer}%
\ks@add{\tabularnewline[#1]}% \ks@add{\tabularnewline[#1]}%
\ks@addTabLine{\ks@type}% \ks@addTabLine{\ks@type}%
\ks@add{\tabularnewline[#2]}% \ks@add{\tabularnewline[#2]}%
...@@ -328,7 +328,7 @@ footskip=0bp, ...@@ -328,7 +328,7 @@ footskip=0bp,
\extrarowheight=.2ex % \extrarowheight=.2ex %
%\tabcolsep=0pt % %\tabcolsep=0pt %
\sisetup{% \sisetup{%
retain-zero-exponent print-zero-exponent = false% default
}% }%
\par\mbox{}\vskip-\baselineskip\the\ks@tab \par\mbox{}\vskip-\baselineskip\the\ks@tab
\endgroup \endgroup
...@@ -345,7 +345,7 @@ footskip=0bp, ...@@ -345,7 +345,7 @@ footskip=0bp,
\expandafter\trim@spaces\expandafter{\ks@tempb}}% \expandafter\trim@spaces\expandafter{\ks@tempb}}%
\ifx\ks@tempb\@empty\else \ifx\ks@tempb\@empty\else
\expandafter\ks@add\expandafter{\ks@tempb\tabularnewline}% \expandafter\ks@add\expandafter{\ks@tempb\tabularnewline}%
\fi \fi
}% }%
\let\\=\ks@tempa \let\\=\ks@tempa
\extrarowheight=-.1ex % \extrarowheight=-.1ex %
...@@ -375,7 +375,7 @@ footskip=0bp, ...@@ -375,7 +375,7 @@ footskip=0bp,
\color{lightgray}Fehler:~\ks@missingEntries}}}}}}% \color{lightgray}Fehler:~\ks@missingEntries}}}}}}%
}% }%
}% }%
\fi \fi
} }
} }
...@@ -403,7 +403,7 @@ footskip=0bp, ...@@ -403,7 +403,7 @@ footskip=0bp,
\newcommand\Section[2]{% \newcommand\Section[2]{%
\section{#1\newline\itshape\small#2}% \section{#1\newline\itshape\small#2}%
} }
\newenvironment{english}[1][.8]{% \newenvironment{english}[1][.8]{%
\otherlanguage{english}% \otherlanguage{english}%
\useshorthands{"} \useshorthands{"}
\defineshorthand{"`}{\openautoquote}% \defineshorthand{"`}{\openautoquote}%
......
% Rolf Niepraschk, PTB, Rolf.Niepraschk@ptb.de % Rolf Niepraschk, PTB, Rolf.Niepraschk@ptb.de
\ProvidesPackage{siunitx-PTB}[2021/05/31 v0.1h Additions to `siunitx'' (PTB/RN)] \ProvidesPackage{siunitx-PTB}[2021/06/03 v0.1i Additions to `siunitx'' (PTB/RN)]
\RequirePackage{amsmath,siunitx} \RequirePackage{amsmath,siunitx}
...@@ -36,23 +36,24 @@ ...@@ -36,23 +36,24 @@
%%%,input-uncertainty-signs = +- %%%,input-uncertainty-signs = +-
%%%,output-open-uncertainty = %%%,output-open-uncertainty =
%%%,output-close-uncertainty = %%%,output-close-uncertainty =
%%,separate-uncertainty = true ,bracket-ambiguous-numbers = true
,bracket-numbers = true
%,per-mode = symbol %,per-mode = symbol
,per-mode = reciprocal ,per-mode = power
%,per-mode=symbol-or-fraction %,per-mode=symbol-or-fraction
,mode = text % !!! ,mode = text % !!!
,tight-spacing = false ,tight-spacing = false
,separate-uncertainty ,uncertainty-mode = separate
%%%,inter-unit-product = \ensuremath{{}\cdot{}} %%%,inter-unit-product = \ensuremath{{}\cdot{}}
% weil default ( {}^{\circ} ) manchmal problematisch ("firamath"!?) % weil default ( {}^{\circ} ) manchmal problematisch ("firamath"!?)
,text-degree = \textdegree %%% ,text-degree = \textdegree
,math-degree = \textdegree %%% ,math-degree = \textdegree
,math-celsius = \textdegree\text{C} %%% ,math-celsius = \textdegree\text{C}
,text-celsius = \textdegree\text{C} %%% ,text-celsius = \textdegree\text{C}
,detect-weight=true, detect-family=true ,reset-text-series = false, text-series-to-math = true% vormals: detect-weight=true
,list-units=brackets ,reset-text-family = false, text-family-to-math = true% vormals: detect-family=true
}% ,list-units = bracket
%,print-zero-exponent = false
}%
%%%} %%%}
\AtBeginDocument{ \AtBeginDocument{
...@@ -100,8 +101,8 @@ ...@@ -100,8 +101,8 @@
} }
} }
\addto\extrasgerman{\setupGerman} \addto\extrasgerman{\setupGerman}
\addto\extrasngerman{\setupGerman} \addto\extrasngerman{\setupGerman}
\addto\extrasenglish{\sisetup{locale=US}} \addto\extrasenglish{\sisetup{locale=US}}
\endinput \endinput
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment