From 9f1eaa35727d3beceac55ce27d9fa6ec9d763edc Mon Sep 17 00:00:00 2001
From: niepra01 <rolf.niepraschk@ptb.de>
Date: Tue, 5 Dec 2017 10:19:04 +0100
Subject: [PATCH] "tabular" --> "xtabular"

---
 .../antragsbestaetigung-test-de.tex           |  5 +---
 antragsbestaetigung/ptb-confirm-de.lco        |  4 +--
 antragsbestaetigung/ptb-confirm-en.lco        |  4 +--
 antragsbestaetigung/ptb-confirm.cls           |  8 +++---
 ptbletter/ptbletter-new-engines.clo           | 25 +++++++++----------
 5 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/antragsbestaetigung/antragsbestaetigung-test-de.tex b/antragsbestaetigung/antragsbestaetigung-test-de.tex
index 72cadc6..6de523c 100644
--- a/antragsbestaetigung/antragsbestaetigung-test-de.tex
+++ b/antragsbestaetigung/antragsbestaetigung-test-de.tex
@@ -22,16 +22,13 @@
 \Town{Köln}%{{DB}}
 \Land{}%{{DB}} Leer, wenn Deutschland
 
-\Device{{Testleck gegen Atmosphäre Helium}, 
+\Device{{Testleck gegen Atmosphäre Helium XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX}, 
   {Testleck gegen Atmosphäre R134a}}%{{DB}}
 %^-- besser zu enumerate-Liste wandeln
 \Condition{\SI{23+-0.5}{\degreeCelsius}}%{{DB}}
 \ScheduleDate{2017-08-28}%{{DB}}
 \Fee{1626.98}
 
-\subject{Antragsbestätigung %{{DB}}
-7.5-1V-17-54}
-
 \date{2017-07-18}%{{DB}} 
 
 \begin{document}
diff --git a/antragsbestaetigung/ptb-confirm-de.lco b/antragsbestaetigung/ptb-confirm-de.lco
index 32dd5a9..541781f 100644
--- a/antragsbestaetigung/ptb-confirm-de.lco
+++ b/antragsbestaetigung/ptb-confirm-de.lco
@@ -9,12 +9,12 @@ Aufgrund Ihres Antrags vom \usekomavar{yourmail}, hier eingegangen per
 Kalibrierung durch:
 
 \medskip\noindent
-\begin{tabular}{@{}l@{~~}l@{}}
+\begin{tabularx}{\textwidth}{@{}l@{~~}X@{}}
 Gerät(e): \the\vl@devTabLines
 Kalibrierbedingungen: & \vl@Condition \\
 Vorgesehenes Datum: & \vl@ScheduleDate \\
 Gebühr:  & \vl@Fee\,€ \\
-\end{tabular}
+\end{tabularx}
 
 \medskip\noindent Ihr Antrag wird mit einem separaten Kostenbescheid
 abgerechnet. Die Höhe der festen Gebühr (Durchschnittsgebühr) basiert auf der
diff --git a/antragsbestaetigung/ptb-confirm-en.lco b/antragsbestaetigung/ptb-confirm-en.lco
index 5c525ae..e0c4406 100644
--- a/antragsbestaetigung/ptb-confirm-en.lco
+++ b/antragsbestaetigung/ptb-confirm-en.lco
@@ -9,12 +9,12 @@ According to your order of  \usekomavar{yourmail}, received here via
 calibration:
 
 \medskip\noindent
-\begin{tabular}{@{}l@{~~}l@{}}
+\begin{tabularx}{\textwidth}{@{}l@{~~}X@{}}
 Device(s): & \the\vl@devTabLines
 Calibration conditions: & \vl@Condition \\
 Scheduled date: & \vl@ScheduleDate \\
 Calibration fee:  & \vl@Fee\,€ \\
-\end{tabular}
+\end{tabularx}
 
 \medskip\noindent Your order will be settled with a separate invoice that uses
 fixed calibration fees according to the decree of the Ministry of Commerce of
diff --git a/antragsbestaetigung/ptb-confirm.cls b/antragsbestaetigung/ptb-confirm.cls
index eba18ba..8c5d448 100644
--- a/antragsbestaetigung/ptb-confirm.cls
+++ b/antragsbestaetigung/ptb-confirm.cls
@@ -4,10 +4,9 @@
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{ptb-confirm}
-    [2017/12/04 v0.2a Bestaetigung (RN)]
+    [2017/12/05 v0.2b Bestaetigung (RN)]
 
-\RequirePackage{eso-pic,graphicx,xcolor}
-\RequirePackage{trimspaces,amsmath}
+\RequirePackage{eso-pic,graphicx,xcolor,tabularx,trimspaces,amsmath}
 
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{ptbletter}}
 
@@ -77,8 +76,7 @@
   \fi
   \vl@devTabLines{}%
   \def\do#1{%
-    \vl@devTabLines\expandafter{\the\vl@devTabLines &}%
-    \vl@devTabLines\expandafter{\the\vl@devTabLines #1\\}%
+    \vl@devTabLines\expandafter{\the\vl@devTabLines & #1\\}%
   } 
   \expandafter\docsvlist\expandafter{\vl@Device}% 
   \begin{letter}{%
diff --git a/ptbletter/ptbletter-new-engines.clo b/ptbletter/ptbletter-new-engines.clo
index 1787d52..42dc3f2 100644
--- a/ptbletter/ptbletter-new-engines.clo
+++ b/ptbletter/ptbletter-new-engines.clo
@@ -20,18 +20,17 @@
     BoldFont=*-bold,
     ItalicFont=*-italic,
     BoldItalicFont=*-bolditalic]
+  \RequirePackage[TT={Scale=0.85}]{dejavu-otf}
+  \iffalse
+  \setmonofont{AnonymousPro-Regular}[%
+    Extension = .ttf,
+    BoldFont = AnonymousPro-Bold,
+    ItalicFont = AnonymousPro-Italic,
+    BoldItalicFont = AnonymousPro-BoldItalic,
+    Scale     = MatchLowercase
+  ]
+  \fi
+  \RequirePackage{newunicodechar}
+  \newunicodechar{^^^^20ac}{\officialeuro}
 }
-\RequirePackage[TT={Scale=0.85}]{dejavu-otf}
-\iffalse
-\setmonofont{AnonymousPro-Regular}[%
-  Extension = .ttf,
-  BoldFont = AnonymousPro-Bold,
-  ItalicFont = AnonymousPro-Italic,
-  BoldItalicFont = AnonymousPro-BoldItalic,
-  Scale     = MatchLowercase
-]
-\fi
-\RequirePackage{newunicodechar}
-\newunicodechar{^^^^20ac}{\officialeuro}
-
 \endinput
-- 
GitLab