diff --git a/antragsbestaetigung/antragsbestaetigung-test-de.pdf b/antragsbestaetigung/antragsbestaetigung-test-de.pdf index 2b20ba0df4ff1d9d12e35eee4be8d9c20e3c8b63..f2ed8dbf8ce3daf09da2cba63ebc51d0155ab502 100644 Binary files a/antragsbestaetigung/antragsbestaetigung-test-de.pdf and b/antragsbestaetigung/antragsbestaetigung-test-de.pdf differ diff --git a/antragsbestaetigung/antragsbestaetigung-test-de.tex b/antragsbestaetigung/antragsbestaetigung-test-de.tex index 6de523ca80454ca260471ef9d010bafedc23cbd7..e99cc13163d7430a3e71f0b42b9f54336e3cfd35 100644 --- a/antragsbestaetigung/antragsbestaetigung-test-de.tex +++ b/antragsbestaetigung/antragsbestaetigung-test-de.tex @@ -24,7 +24,6 @@ \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} diff --git a/antragsbestaetigung/antragsbestaetigung-test-en.pdf b/antragsbestaetigung/antragsbestaetigung-test-en.pdf index fdc8d8252b3c3cec2bf1203456825b02a25123ef..99209ff509b2f73283608e987c8879e3856bc47f 100644 Binary files a/antragsbestaetigung/antragsbestaetigung-test-en.pdf and b/antragsbestaetigung/antragsbestaetigung-test-en.pdf differ diff --git a/antragsbestaetigung/antragsbestaetigung-test-en.tex b/antragsbestaetigung/antragsbestaetigung-test-en.tex index 19065d58129f2d4077bf41035bcd7ff8d95a313d..c0caab16b6f156d711157e57537aa6ced0031f87 100644 --- a/antragsbestaetigung/antragsbestaetigung-test-en.tex +++ b/antragsbestaetigung/antragsbestaetigung-test-en.tex @@ -1,19 +1,17 @@ -\documentclass[en]{ptb-confirm} +\documentclass[ en ]{ptb-confirm} \missingEntries{ 0 } -\yourref{4711-0815} -\yourmail{2015-05-08} - \handledby{Dr. Karl Jousten} \myref{7.5-1V-15-05} -\mymail{2015-05-14} -\myphone{7316} -\myfax{7777} +%%%\mymail{2015-05-14} +\myphone{7216} +\myfax{7490} \myemail{Karl.Jousten@ptb.de} -\DateOfApplication{2015-04-23} +\yourref{4711-0815} +\yourmail{2015-05-08} \KindOfEnquiry{email} \DateOfEnquiry{}% wenn leer, dann identisch zu \DateOfApplication @@ -29,7 +27,7 @@ \ScheduleDate{2015-07-13} \Fee{1789.98} -\date{2015-05-26} +\date{2017-07-18}%{{DB}} \begin{document} \end{document} diff --git a/antragsbestaetigung/ptb-confirm-en.lco b/antragsbestaetigung/ptb-confirm-en.lco index e0c4406eb809d3b888e6013f662dec0256af0413..7053ec879f23cb3c88e58c80b4bd8c6160b418c8 100644 --- a/antragsbestaetigung/ptb-confirm-en.lco +++ b/antragsbestaetigung/ptb-confirm-en.lco @@ -10,7 +10,7 @@ calibration: \medskip\noindent \begin{tabularx}{\textwidth}{@{}l@{~~}X@{}} -Device(s): & \the\vl@devTabLines +Device(s): \the\vl@devTabLines Calibration conditions: & \vl@Condition \\ Scheduled date: & \vl@ScheduleDate \\ Calibration fee: & \vl@Fee\,€ \\ diff --git a/antragsbestaetigung/ptb-confirm.cls b/antragsbestaetigung/ptb-confirm.cls index 8c5d4487a87a485cdc6669c4b2f2e307d92559b6..394ea445e9929851b9f5484fc15c53d87012c03e 100644 --- a/antragsbestaetigung/ptb-confirm.cls +++ b/antragsbestaetigung/ptb-confirm.cls @@ -78,7 +78,7 @@ \def\do#1{% \vl@devTabLines\expandafter{\the\vl@devTabLines & #1\\}% } - \expandafter\docsvlist\expandafter{\vl@Device}% + \expandafter\docsvlist\expandafter{\vl@Device}% \begin{letter}{% \vl@Company \\ \vl@Name \smallskip \\ diff --git a/ptbletter/ptbletter-new-engines.clo b/ptbletter/ptbletter-new-engines.clo index 42dc3f27d06049f2d26b50a62f32fb4da04fe4e6..c662ec94ec5ad59ec3ee1ee5cb7bf15e3c501061 100644 --- a/ptbletter/ptbletter-new-engines.clo +++ b/ptbletter/ptbletter-new-engines.clo @@ -1,36 +1,33 @@ % Rolf Niepraschk, Rolf.Niepraschk@ptb.de \ProvidesFile{ptbletter-new-engines.clo}% - [2017/12/04 v0.1a PTB-Brief -- new engines (RN)] + [2017/12/05 v0.1b PTB-Brief -- new engines (RN)] \RequirePackage{fontspec} \RequirePackage{unicode-math} -\AtBeginDocument{% ??? - \setromanfont{texgyrepagella}[ - Ligatures=TeX, - Extension=.otf, - UprightFont=*-regular, - BoldFont=*-bold, - ItalicFont=*-italic, - BoldItalicFont=*-bolditalic] - \setsansfont{texgyreheros}[ - Ligatures=TeX, - Extension=.otf, - UprightFont=*-regular, - 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} -} +\setromanfont{texgyrepagella}[ + Ligatures=TeX, + Scale=MatchUppercase, + Extension=.otf, + UprightFont=*-regular, + BoldFont=*-bold, + ItalicFont=*-italic, + BoldItalicFont=*-bolditalic] +\setsansfont{texgyreheros}[ + Ligatures=TeX, + Extension=.otf, + UprightFont=*-regular, + BoldFont=*-bold, + ItalicFont=*-italic, + BoldItalicFont=*-bolditalic] +\setmonofont{DejaVuSansMono}[% + Scale=0.9, + UprightFont = *, + ItalicFont=*-Oblique, + BoldFont=*-Bold, + BoldItalicFont=*-BoldOblique, + Extension = .ttf] +\RequirePackage{newunicodechar} +\newunicodechar{^^^^20ac}{\officialeuro} + \endinput diff --git a/ptbletter/ptbletter-old-engines.clo b/ptbletter/ptbletter-old-engines.clo index d3af9ef2ddc691d67929a8af24a7bbae1c0596a5..f5391febf40d491a731ca44fe0d2787e9966d058 100644 --- a/ptbletter/ptbletter-old-engines.clo +++ b/ptbletter/ptbletter-old-engines.clo @@ -1,15 +1,14 @@ % Rolf Niepraschk, Rolf.Niepraschk@ptb.de \ProvidesFile{ptbletter-old-engines.clo}% - [2017/12/04 v0.1a PTB-Brief -- old engines (RN)] + [2017/12/05 v0.1b PTB-Brief -- old engines (RN)] \RequirePackage[utf8]{inputenc} \RequirePackage[T1]{fontenc} -\usepackage[scaled=0.85]{DejaVuSansMono} +\usepackage[scaled=0.9]{DejaVuSansMono} \RequirePackage{textcomp} \RequirePackage{mathpazo} \RequirePackage{tgpagella} \RequirePackage{tgheros} -%\RequirePackage[ttdefault=true,scale=1.034]{AnonymousPro} \endinput diff --git a/ptbletter/ptbletter.cls b/ptbletter/ptbletter.cls index 0e0012d6c7efb1c1ba15ff05cabdd46a00d0ab89..9958ca72fe883a9a64fc9cc50487131010cd823c 100644 --- a/ptbletter/ptbletter.cls +++ b/ptbletter/ptbletter.cls @@ -107,7 +107,7 @@ \defineshorthand{"'}{\closeautoquote} } -\AtEndOfClass{\shorthandon{"}} +%%%\AtEndOfClass{\shorthandon{"}} \@setplength{toaddrhpos}{72bp} \@setplength{toaddrvpos}{124bp}