mehrere resultTable-Makros erlaubt; Überschrift "Gas"

kalibrierschein/kalibrierschein.cls

@@ -6,7 +6,7 @@
 \newcommand*\ks@LANG{0}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{kalibrierschein}
-  [2015/02/19 v0.1t Dokumentenklasse (RN/PTB)]
+  [2015/04/27 v0.1u Dokumentenklasse (RN/PTB)]
 \DeclareOption{BS}{\def\ks@location{Braunschweig}}
 \DeclareOption{BLN}{\def\ks@location{Berlin}}
 \DeclareOption{KK}{\edef\ks@kalType{\CurrentOption}}
@@ -238,18 +238,6 @@
 
 \newcolumntype{C}{>{\centering\arraybackslash}X}
 
-\newcommand*\ks@resultTable{%
-\begin{tabularx}{\textwidth}{CCC}
-  aaaaaaaa & aaaaaaaa & aaaaaaaa \\
-  $p$      & $p$      & $p$      \\ \toprule
-  00000000 & 00000000 & 00000000 \\
-  00000000 & 00000000 & 00000000 \\
-  00000000 & 00000000 & 00000000 \\
-  00000000 & 00000000 & 00000000 \\
-  00000000 & 00000000 & 00000000
-\end{tabularx}
-}
-
 %%%\AtBeginDocument{%
 \sisetup{%
   %%%,exponent-product = \ensuremath { \cdot }  % wird per "locale" gesetzt
@@ -272,20 +260,21 @@
 }%
 %%%}
 
-\newcommand\resultTable[2]{%
-  \ks@tab{}%
-  \@tempcnta=#1 %
+\newcommand\resultTable[3][]{%
+  \@tempcnta=#2 %
   \@tempcntb=\numexpr(\@tempcnta-1)*2 %
   \@tempdimc=\dimexpr (\textwidth - \@tempcntb\tabcolsep) / \@tempcnta %
+  \@tempcntb=\@tempcnta
+  \def\@tempa{}%
   \loop\ifnum\@tempcnta>\z@
-    \ks@add{S[table-column-width=\@tempdimc]}%
+    \edef\@tempa{\@tempa S[table-column-width=\the\@tempdimc]}
     \advance\@tempcnta\m@ne
-  \repeat %         Evtl. direkt longtable?
-  \edef\@tempa{\noexpand\begin{longtable}{@{}\the\ks@tab @{}}}%
-  \ks@tab\expandafter{\@tempa}%
-  \ks@add{#2}%
+  \repeat
+  \edef\@tempa{\noexpand\begin{longtable}{@{}\@tempa @{}}}%
+  \expandafter\ks@add\expandafter{\@tempa}%
+  \ks@add{\\\toprule\multicolumn{\the\@tempcntb}{@{}c@{}}{Gas:~#1}\\\toprule}%
+  \ks@add{#3}%
   \ks@add{\end{longtable}}%
-  \edef\ks@resultTable{\the\ks@tab}%
 }
 
 \newcommand*\printFirstPage{%
@@ -303,7 +292,7 @@
 }
 
 \newcommand*\printResultTable{%
-  \ks@resultTable
+  \the\ks@tab
 }
 
 \newcommand*\ks@applicant@table{%

kalibrierschein/test-ks-KK.tex

@@ -2,7 +2,28 @@
 %---------------------------
 \listfiles
 \documentclass[ngerman,KK]{kalibrierschein}
-\resultTable{ 6 }{%
+\resultTable[N$_2$]{ 6 }{%
+{\(p_{cal}\)}&{\(p_{ind}\)}&{\(p_r\)}&{\(p_{ind} - p_r\)}&{\(e\)}&{\(U(k=2)\)}\\
+mbar&mbar&mbar&mbar&&\\\toprule\endhead
+2.954E-08&3.27E-08&1.66E-09&3.10E-08&5.1E-02&2.6E-02\\
+4.970E-08&5.35E-08&1.65E-09&5.19E-08&4.3E-02&2.4E-02\\
+8.908E-08&9.53E-08&1.63E-09&9.37E-08&5.2E-02&2.4E-02\\
+2.991E-07&3.17E-07&1.68E-09&3.15E-07&5.4E-02&2.4E-02\\
+4.805E-07&5.29E-07&1.80E-09&5.27E-07&9.7E-02&2.4E-02\\
+4.810E-07&5.29E-07&2.00E-09&5.27E-07&9.6E-02&2.4E-02\\
+5.024E-07&5.30E-07&1.80E-09&5.28E-07&5.1E-02&2.4E-02\\
+8.916E-07&9.37E-07&1.52E-09&9.35E-07&4.9E-02&2.2E-02\\
+2.943E-06&3.07E-06&1.77E-09&3.07E-06&4.3E-02&2.2E-02\\
+4.922E-06&5.13E-06&2.02E-09&5.13E-06&4.2E-02&2.2E-02\\
+8.827E-06&9.25E-06&3.20E-09&9.24E-06&4.7E-02&2.2E-02\\
+2.957E-05&3.05E-05&4.10E-09&3.05E-05&3.1E-02&2.2E-02\\
+4.892E-05&5.01E-05&6.70E-09&5.01E-05&2.4E-02&2.2E-02\\
+8.768E-05&8.87E-05&7.70E-09&8.87E-05&1.1E-02&2.2E-02\\
+8.960E-05&8.88E-05&1.20E-08&8.88E-05&-9.1E-03&2.2E-02\\
+8.768E-05&8.88E-05&1.00E-08&8.88E-05&1.3E-02&2.2E-02\\\bottomrule
+}
+
+\resultTable[H$_2$]{ 6 }{%
 {\(p_{cal}\)}&{\(p_{ind}\)}&{\(p_r\)}&{\(p_{ind} - p_r\)}&{\(e\)}&{\(U(k=2)\)}\\
 mbar&mbar&mbar&mbar&&\\\toprule\endhead
 2.954E-08&3.27E-08&1.66E-09&3.10E-08&5.1E-02&2.6E-02\\
@@ -22,6 +43,7 @@ mbar&mbar&mbar&mbar&&\\\toprule\endhead
 8.960E-05&8.88E-05&1.20E-08&8.88E-05&-9.1E-03&2.2E-02\\
 8.768E-05&8.88E-05&1.00E-08&8.88E-05&1.3E-02&2.2E-02\\
 }
+
 \missingEntries{ 16 }
 \object{ Stabil Ion Gauge }
 \manufacturer{ Granville-Phillips }
@@ -38,10 +60,10 @@ mbar&mbar&mbar&mbar&&\\\toprule\endhead
 
 \printFirstPage
    \section{ Description of the calibration device }
-   
+
    %\num{9.99E-7 +- 9E-9} \par \bigskip
    \num{9.99 +- 0.09} \par \bigskip
-   
+
        The device was shipped under atmospheric pressure kept in the producers plastic shell.
        A memory module belonging to the stabil ion gauge (serial 06800) was provided. It was active during calibration.
      \section{ Calibration procedure }