From 81b6a547189eb927301900c37e667fd5d6670e61 Mon Sep 17 00:00:00 2001
From: niepra01 <rolf.niepraschk@ptb.de>
Date: Thu, 10 Dec 2015 15:52:32 +0100
Subject: [PATCH] Hersteller mit Sonderzeichen, Hersteller Teil der Tabelle
---
kalibrierschein/IK-0000.clo | 7 +++----
kalibrierschein/IK-2015.clo | 5 ++---
kalibrierschein/KK-0000.clo | 5 ++---
kalibrierschein/KK-2015.clo | 5 ++---
kalibrierschein/kalibrierschein.cls | 14 ++++++++------
5 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/kalibrierschein/IK-0000.clo b/kalibrierschein/IK-0000.clo
index 793b999..ea7ba5a 100644
--- a/kalibrierschein/IK-0000.clo
+++ b/kalibrierschein/IK-0000.clo
@@ -1,5 +1,5 @@
-\ProvidesFile{IK-0000.clo}[2014/01/28 v1.0b class option (RN/PTB)]
+\ProvidesFile{IK-0000.clo}[2015/12/10 v1.0c class option (RN/PTB)]
\iffalse
@@ -62,13 +62,12 @@ footskip=0bp,
\advance\@tempdimb-60bp %
\@tempdimc=\@tempdimb \advance\@tempdimc-10bp %
\put(\@tempdima,\@tempdimb){Hersteller:}
- \put(\@tempdimd,\@tempdimb){\ks@manufacturer}
+ \put(\@tempdimd,\@tempdimb){\ks@printDevicesTable{348bp}{46bp}{29bp}}
\put(\@tempdima,\@tempdimc){\scriptsize\itshape Manufacturer:}
%--------------------------------
\advance\@tempdimb-60bp %
\@tempdimc=\@tempdimb \advance\@tempdimc-10bp %
\put(\@tempdima,\@tempdimb){Typ:}
- \put(\@tempdimd,\@tempdimb){\ks@printTabLines{348bp}{15bp}}
\put(\@tempdima,\@tempdimc){\scriptsize\itshape Type:}
%--------------------------------
\@tempdimb=478bp %
@@ -106,7 +105,7 @@ footskip=0bp,
\advance\@tempdimb-30bp %
\@tempdimc=\@tempdimb \advance\@tempdimc-10bp %
\put(\@tempdima,\@tempdimb){Kalibrierzeichen:}
- \put(\@tempdimd,\@tempdimb){\ks@shielded{\ks@calibMark}}
+ \put(\@tempdimd,\@tempdimb){\ks@calibMark}
\put(\@tempdima,\@tempdimc){\scriptsize\itshape Calibration mark:}
%--------------------------------
\advance\@tempdimb-30bp %
diff --git a/kalibrierschein/IK-2015.clo b/kalibrierschein/IK-2015.clo
index f2f2890..cfcda94 100644
--- a/kalibrierschein/IK-2015.clo
+++ b/kalibrierschein/IK-2015.clo
@@ -1,5 +1,5 @@
-\ProvidesFile{IK-2015.clo}[2015/01/26 v1.0b class option (RN/PTB)]
+\ProvidesFile{IK-2015.clo}[2015/12/10 v1.0c class option (RN/PTB)]
\iffalse
@@ -63,13 +63,12 @@ footskip=0bp,
\advance\@tempdimb-60bp %
\@tempdimc=\@tempdimb \advance\@tempdimc-10bp %
\put(\@tempdima,\@tempdimb){Hersteller:}
- \put(\@tempdimd,\@tempdimb){\ks@manufacturer}
+ \put(\@tempdimd,\@tempdimb){\ks@printDevicesTable{348bp}{46bp}{29bp}}
\put(\@tempdima,\@tempdimc){\scriptsize\itshape Manufacturer:}
%--------------------------------
\advance\@tempdimb-60bp %
\@tempdimc=\@tempdimb \advance\@tempdimc-10bp %
\put(\@tempdima,\@tempdimb){Typ:}
- \put(\@tempdimd,\@tempdimb){\ks@printTabLines{348bp}{28bp}}
\put(\@tempdima,\@tempdimc){\scriptsize\itshape Type:}
%--------------------------------
%%%\@tempdimb=478bp %
diff --git a/kalibrierschein/KK-0000.clo b/kalibrierschein/KK-0000.clo
index d243d46..d404e2b 100644
--- a/kalibrierschein/KK-0000.clo
+++ b/kalibrierschein/KK-0000.clo
@@ -1,5 +1,5 @@
-\ProvidesFile{KK-0000.clo}[2014/01/28 v1.0b class option (RN/PTB)]
+\ProvidesFile{KK-0000.clo}[2015/12/10 v1.0c class option (RN/PTB)]
\iffalse
@@ -62,13 +62,12 @@ footskip=0bp,
\advance\@tempdimb-60bp %
\@tempdimc=\@tempdimb \advance\@tempdimc-10bp %
\put(\@tempdima,\@tempdimb){Hersteller:}
- \put(\@tempdimd,\@tempdimb){\ks@manufacturer}
+ \put(\@tempdimd,\@tempdimb){\ks@printDevicesTable{348bp}{46bp}{29bp}}
\put(\@tempdima,\@tempdimc){\scriptsize\itshape Manufacturer:}
%--------------------------------
\advance\@tempdimb-60bp %
\@tempdimc=\@tempdimb \advance\@tempdimc-10bp %
\put(\@tempdima,\@tempdimb){Typ:}
- \put(\@tempdimd,\@tempdimb){\ks@printTabLines{348bp}{28bp}}
\put(\@tempdima,\@tempdimc){\scriptsize\itshape Type:}
%--------------------------------
\@tempdimb=478bp %
diff --git a/kalibrierschein/KK-2015.clo b/kalibrierschein/KK-2015.clo
index a3a4746..43bf454 100644
--- a/kalibrierschein/KK-2015.clo
+++ b/kalibrierschein/KK-2015.clo
@@ -1,5 +1,5 @@
-\ProvidesFile{KK-2015.clo}[2015/01/26 v1.0b class option (RN/PTB)]
+\ProvidesFile{KK-2015.clo}[2015/12/10 v1.0c class option (RN/PTB)]
\iffalse
@@ -63,13 +63,12 @@ footskip=0bp,
\advance\@tempdimb-60bp %
\@tempdimc=\@tempdimb \advance\@tempdimc-10bp %
\put(\@tempdima,\@tempdimb){Hersteller:}
- \put(\@tempdimd,\@tempdimb){\ks@manufacturer}
+ \put(\@tempdimd,\@tempdimb){\ks@printDevicesTable{348bp}{46bp}{29bp}}
\put(\@tempdima,\@tempdimc){\scriptsize\itshape Manufacturer:}
%--------------------------------
\advance\@tempdimb-60bp %
\@tempdimc=\@tempdimb \advance\@tempdimc-10bp %
\put(\@tempdima,\@tempdimb){Typ:}
- \put(\@tempdimd,\@tempdimb){\ks@printTabLines{348bp}{28bp}}
\put(\@tempdima,\@tempdimc){\scriptsize\itshape Type:}
%--------------------------------
%%%\@tempdimb=478bp %
diff --git a/kalibrierschein/kalibrierschein.cls b/kalibrierschein/kalibrierschein.cls
index b9d440e..948a98a 100644
--- a/kalibrierschein/kalibrierschein.cls
+++ b/kalibrierschein/kalibrierschein.cls
@@ -234,14 +234,15 @@
\fi
}
-\newcommand*\ks@printTabLines[2]{%
- \typeout{#1,#2}%
+\newcommand*\ks@printDevicesTable[3]{% #1 = width, #2 = 1. offset, #3 = 2. offset
\ks@tab{}%
\ks@getColSpec{\ks@type}{\ks@colSpec}%
\edef\@tempa{\noexpand\begin{tabularx}{#1}[t]{@{}\ks@colSpec @{}}}%
\ks@tab\expandafter{\@tempa}%
- \ks@addTabLine{\ks@type}%
+ \ks@addTabLine{\ks@manufacturer}%
\ks@add{\tabularnewline[#2]}%
+ \ks@addTabLine{\ks@type}%
+ \ks@add{\tabularnewline[#3]}%
\ks@addTabLine{\ks@serialNo}%
\ks@add{\end{tabularx}}%
\begingroup
@@ -281,9 +282,10 @@
Typ des Ger\"ates}
\newcommand*\type[1]{\xdef\ks@type{\trim@spaces{#1}}}
-\newcommand*\ks@manufacturer{%
- Name des Herstellers, Auftraggebers}
-\newcommand*\manufacturer[1]{\xdef\ks@manufacturer{\trim@spaces{#1}}}
+\newcommand*\ks@manufacturer{Namen der Hersteller}
+\newcommand*\manufacturer[1]{%
+ \xdef\ks@manufacturer{\trim@spaces{\detokenize{#1}}}%
+}
\newcommand*\ks@object{%
Name des Ger\"ates, kurze Charakterisierung}
--
GitLab