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

Inkompatibilitäten beseitigt

parent 245087c7
No related merge requests found
Hide whitespace changes
Inline Side-by-side
arbeitsanweisung/vl-aa-new-engines.clo 0 → 100644
+ 20
− 0
View file @ 2b33a941
% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
\ProvidesFile{vl-aa-new-engines.clo}[2018/05/15 v0.1a AA -- new engines (RN)]
\RequirePackage[no-math]{fontspec}
\RequirePackage{unicode-math}
\setromanfont[Ligatures=TeX]{TeX Gyre Pagella}
\setsansfont[Ligatures=TeX]{TeX Gyre Heros}
\setmonofont{AnonymousPro-Regular}[%
Extension = .ttf,
BoldFont = AnonymousPro-Bold,
ItalicFont = AnonymousPro-Italic,
BoldItalicFont = AnonymousPro-BoldItalic,
Scale = MatchLowercase
]
\setmathfont[math-style=ISO,bold-style=ISO]{TeXGyrePagellaMath-Regular}
%%%{TeX Gyre Pagella Math}
\endinput
arbeitsanweisung/vl-aa-old-engines.clo 0 → 100644
+ 12
− 0
View file @ 2b33a941
% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
\ProvidesFile{vl-aa-old-engines.clo}[2018/05/15 v0.1a AA -- old engines (RN)]
\RequirePackage[utf8]{inputenc}
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}
\RequirePackage{tgpagella,qpxmath}
\RequirePackage{tgheros}
\RequirePackage[ttdefault=true,scale=1.034]{AnonymousPro}
\endinput
arbeitsanweisung/vl-arbeitsanweisung.cls
+ 153
− 176
View file @ 2b33a941
\setcounter{errorcontextlines}{100}
\NeedsTeXFormat{LaTeX2e}[1999/12/01] \NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{vl-arbeitsanweisung} \ProvidesClass{vl-arbeitsanweisung}
[2014/08/15 v0.1d Dokumentenklasse (RN/PTB)] [2018/05/15 v1.0a Dokumentenklasse (RN/PTB)]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
\ProcessOptions\relax \ProcessOptions\relax
\PassOptionsToPackage{paper=a4,pagesize,twoside,headinclude}{typearea} \PassOptionsToPackage{headinclude,usegeometry}{typearea}
\LoadClass[% \LoadClass[%
,twoside
,fontsize=12pt% ??? ,fontsize=12pt% ???
,headings=normal ,headings=normal
,toc=bibliographynumbered ,toc=bibliographynumbered
...@@ -16,6 +16,25 @@ ...@@ -16,6 +16,25 @@
%,origlongtable %,origlongtable
]{scrartcl} ]{scrartcl}
\RequirePackage[%
paper=a4paper,
headheight=16mm,
marginparwidth=5mm,
left=22mm,
right=16mm,
textheight=238mm,
top=20bp,
headsep=10mm,
footskip=15mm,
]{geometry}
\renewcommand*\maketitle[1][1]{%
\begingroup
\centering \noindent\usekomafont{title}
\Large \@title \par \bigskip\medskip
\endgroup
}
\RequirePackage{babel} \RequirePackage{babel}
\RequirePackage{tabularx} \RequirePackage{tabularx}
\let\ptb@endtabularx=\TX@endtabularx \let\ptb@endtabularx=\TX@endtabularx
...@@ -23,7 +42,8 @@ ...@@ -23,7 +42,8 @@
\RequirePackage{pdflscape,picture,trimspaces,url,varwidth,placeins} \RequirePackage{pdflscape,picture,trimspaces,url,varwidth,placeins}
\RequirePackage{zref-totpages,graphicx,booktabs,array,pdfpages} \RequirePackage{zref-totpages,graphicx,booktabs,array,pdfpages}
\RequirePackage{longtable,siunitx,ragged2e,ifxetex,ifluatex,relsize} \RequirePackage{longtable,siunitx,ragged2e,ifxetex,ifluatex,relsize}
\RequirePackage[manualmark]{scrpage2} %%%\RequirePackage[manualmark]{scrpage2}
\RequirePackage{siunitx-PTB}
\let\ptb@tempdima=\@clnwd \let\ptb@tempdima=\@clnwd
\let\ptb@tempdimb=\@clnht \let\ptb@tempdimb=\@clnht
...@@ -38,12 +58,6 @@ ...@@ -38,12 +58,6 @@
\newcommand*\ptb@Date{} \newcommand*\ptb@Date{}
\newcommand*\ptb@tempa{0} \newcommand*\ptb@tempa{0}
\newcommand*\Devision[1]{\xdef\ptb@Devision{\trim@spaces{#1}}}
\newcommand*\Department[1]{\xdef\ptb@Department{\trim@spaces{#1}}}
\newcommand*\WorkingGroup[1]{\xdef\ptb@WorkingGroup{\trim@spaces{#1}}}
\newcommand*\Object[1]{\xdef\ptb@Object{\trim@spaces{#1}}}
\newcommand*\Edition[1]{\xdef\ptb@Edition{\trim@spaces{#1}}}
\ifxetex \ifxetex
\def\ptb@tempa{1}% \def\ptb@tempa{1}%
\else \else
...@@ -53,19 +67,9 @@ ...@@ -53,19 +67,9 @@
\fi \fi
\ifcase\ptb@tempa % pdfTeX \ifcase\ptb@tempa % pdfTeX
\RequirePackage[T1]{fontenc} \input{vl-aa-old-engines.clo}
\RequirePackage[utf8]{inputenc} \or % XeTeX oder luaTeX
\RequirePackage{textcomp} \input{vl-aa-new-engines.clo}
\RequirePackage{lmodern}
\RequirePackage{tgpagella,qpxmath}
%\RequirePackage{mathpazo}
\RequirePackage{tgheros}
\or % Unicode (XeTeX oder luaTeX)
\RequirePackage{fontspec,unicode-math}
\setmainfont[Ligatures=TeX]{TeX Gyre Pagella}
\setsansfont[Ligatures=TeX]{TeX Gyre Heros}
\setmonofont[Scale=MatchLowercase]{Latin Modern Mono}
\setmathfont{TeX Gyre Pagella Math}
\fi \fi
\RequirePackage[ \RequirePackage[
...@@ -79,70 +83,24 @@ ...@@ -79,70 +83,24 @@
\MakeAutoQuote{»}{«}% Alt Gr + y / Alt Gr + x \MakeAutoQuote{»}{«}% Alt Gr + y / Alt Gr + x
\MakeAutoQuote{„}{“}% Alt Gr + v / Alt Gr + b \MakeAutoQuote{„}{“}% Alt Gr + v / Alt Gr + b
\newcommand*\ptb@rulewidth{.4mm} \newcommand*\Devision[1]{\xdef\ptb@Devision{\trim@spaces{#1}}}
\newcommand*\Department[1]{\xdef\ptb@Department{\trim@spaces{#1}}}
\newcolumntype{C}{>{\centering}X} \newcommand*\WorkingGroup[1]{\xdef\ptb@WorkingGroup{\trim@spaces{#1}}}
\newcommand*\Object[1]{\xdef\ptb@Object{\trim@spaces{#1}}}
\newcommand*\ptb@f@@t{% \newcommand*\Edition[1]{\xdef\ptb@Edition{\trim@spaces{#1}}}
\begingroup
\let\TX@endtabularx=\ptb@endtabularx
\normalfont\sffamily\tiny\extrarowheight=.3\baselineskip
\arrayrulewidth=\ptb@rulewidth \extratabsurround=0pt %
\renewcommand*\tabularxcolumn[1]{m{##1}}%
\begin{tabularx}{\textwidth}[t]{@{}|C|C|C|C|C|@{}} \firsthline
Erstellt: \\
Abteilung~\ptb@Devision, Fachbereich~\ptb@Department
&
Ausgabe-Nr.: \\ \ptb@Edition
&
Datum: \\ \ptb@Date
&
Kurzbezeichnung: \\ \ptb@Ident
&
Seite von Seiten \\ \thepage~von \ztotpages
\tabularnewline \lasthline
\end{tabularx}%
\endgroup
}
\newcommand*\ptb@VWD[1]{%
\begin{varwidth}{\linewidth}\centering #1\end{varwidth}}
\newcommand*\ptb@firstf@@t{% \RequirePackage{tocstyle}
\begingroup \usetocstyle{allwithdot}
\let\TX@endtabularx=\ptb@endtabularx \settocfeature{raggedhook}{\raggedright}% verhindert auch Trennung
\normalfont\sffamily\tiny\extrarowheight=.3\baselineskip \settocfeature{pagenumberbox}{\makebox[1.5em][r]}
\arrayrulewidth=\ptb@rulewidth \extratabsurround=0pt % \settocfeature{entryhook}{\overfullrule=\z@}
\renewcommand\tabularxcolumn[1]{m{##1}}%
\begin{tabularx}{\textwidth}{@{}|C|C|C|c|c|c|@{}} \firsthline
Erstellt: \\
Abteilung~\ptb@Devision, Fachbereich~\ptb@Department \\
AG~\ptb@WorkingGroup
&
Geprüft: \\ Leiter~\ptb@Department \\~
&
Genehmigt: \\ QMV-\ptb@Devision \\~
&
\ptb@VWD{Ausgabe-Nr.: \\ \ptb@Edition\\~}
&
\ptb@VWD{Kurzbezeichnung: \\ \ptb@Ident\\~}
&
\ptb@VWD{Seite von Seiten \\ \thepage~von \ztotpages\\~}
\tabularnewline
&&&&& \tabularnewline \BeforeStartingTOC[toc]{\microtypesetup{protrusion=false}}
&&&&& \tabularnewline \AfterStartingTOC[toc]{\microtypesetup{protrusion=true}}
am:~\dotfill \addtokomafont{caption}{\small}
& \addtokomafont{captionlabel}{\bfseries\sffamily}
am:~\dotfill \setcapindent{1em}
&
am:~\dotfill
&
&& \tabularnewline \lasthline
\end{tabularx}%
\endgroup
}
\AtBeginDocument{% \AtBeginDocument{%
\edef\ptb@Ident{\ptb@Department-AA-\ptb@Object}% \edef\ptb@Ident{\ptb@Department-AA-\ptb@Object}%
...@@ -150,89 +108,119 @@ ...@@ -150,89 +108,119 @@
\date{}% \date{}%
} }
\newcommand*\ptb@foot{% \newcommand*\ptb@rulewidth{.4mm}
\ifnum\c@page=\@ne\ptb@firstf@@t\else\ptb@f@@t\fi \newcolumntype{C}{>{\centering}X}
\newcommand*\ptb@VWD[1]{%
\begin{varwidth}{\linewidth}\centering #1\end{varwidth}}
\newcommand*\ptb@head@even{%
\begin{picture}(0,0)
\linethickness{\ptb@rulewidth}%
\put(0,-2.5mm){\line(1,0){\textwidth}}%
\end{picture}
\normalfont\sffamily\bfseries\large
PTB\hfill Qualit\"atsmanagement-Arbeitsanweisung\hfill\ptb@Ident
} }
\newcommand*\ptb@head{% \newcommand*\ptb@head@odd{%
\begin{picture}(0,0) \begin{picture}(0,0)
\linethickness{\ptb@rulewidth}% \linethickness{\ptb@rulewidth}%
\put(0,-2.5mm){\line(1,0){\textwidth}}% \put(0,-2.5mm){\line(1,0){\textwidth}}%
\end{picture} \end{picture}
\normalfont\sffamily\bfseries\large \normalfont\sffamily\bfseries\large
PTB\hfill Qualit\"atsmanagement-Arbeitsanweisung\hfill\ptb@Ident{} \ptb@Ident \hfill Qualit\"atsmanagement-Arbeitsanweisung \hfill PTB
} }
\defpagestyle{headings}%
{% Kopf
%(OLL,OLD)% Linie
{\ptb@head}% Gerade Seiten
{\ptb@head}% Ungerade Seiten
{% Einseitig
}
%(\textwidth,.8pt)% Linie
}%
{% Fuss
%(OLL,OLD)% Linie
{\ptb@foot}% Gerade Seiten
{\ptb@foot}% Ungerade Seiten
{% Einseitig
}
%(\textwidth,2mm)% Linie
}
\RequirePackage[% \newcommand*\ptb@first@foot{%
headheight=16mm, \raisebox{-4bp}[0pt][0pt]{%
marginparwidth=5mm,
left=22mm,
right=16mm,
textheight=225mm,
top=35mm,
headsep=14mm,
footskip=15mm,
]{geometry}
\renewcommand*\maketitle[1][1]{%
\begingroup \begingroup
\centering \noindent\usekomafont{title} \let\TX@endtabularx=\ptb@endtabularx
\Large \@title \par \bigskip\medskip \normalfont\sffamily\tiny\extrarowheight=.3\baselineskip
\arrayrulewidth=\ptb@rulewidth \extratabsurround=0pt %
\renewcommand\tabularxcolumn[1]{m{##1}}%
\begin{tabularx}{\textwidth}[b]{@{}|C|C|C|c|c|c|@{}} \firsthline
Erstellt: \\
Abteilung~\ptb@Devision, Fachbereich~\ptb@Department \\
AG~\ptb@WorkingGroup
&
Geprüft: \\ Leiter~\ptb@Department \\~
&
Genehmigt: \\ QMV-\ptb@Devision \\~
&
\ptb@VWD{Ausgabe-Nr.: \\ \ptb@Edition\\~}
&
\ptb@VWD{Kurzbezeichnung: \\ \ptb@Ident\\~}
&
\ptb@VWD{Seite von Seiten \\ \thepage~von \ztotpages\\~}
\tabularnewline
&&&&& \tabularnewline
&&&&& \tabularnewline
am:~\dotfill
&
am:~\dotfill
&
am:~\dotfill
&
&& \tabularnewline \lasthline
\end{tabularx}%
\endgroup
}%
}
\newcommand*\ptb@foot@even{%
\begingroup
\let\TX@endtabularx=\ptb@endtabularx
\normalfont\sffamily\tiny\extrarowheight=.3\baselineskip
\arrayrulewidth=\ptb@rulewidth \extratabsurround=0pt %
\renewcommand*\tabularxcolumn[1]{m{##1}}%
\begin{tabularx}{\textwidth}[b]{@{}|C|C|C|C|C|@{}} \firsthline
Erstellt: \\
Abteilung~\ptb@Devision, Fachbereich~\ptb@Department
&
Ausgabe-Nr.: \\ \ptb@Edition
&
Datum: \\ \ptb@Date
&
Kurzbezeichnung: \\ \ptb@Ident
&
Seite von Seiten \\ \thepage~von \ztotpages
\tabularnewline \lasthline
\end{tabularx}%
\endgroup
}
\newcommand*\ptb@foot@odd{%
\begingroup
\let\TX@endtabularx=\ptb@endtabularx
\normalfont\sffamily\tiny\extrarowheight=.3\baselineskip
\arrayrulewidth=\ptb@rulewidth \extratabsurround=0pt %
\renewcommand*\tabularxcolumn[1]{m{##1}}%
\begin{tabularx}{\textwidth}[b]{@{}|C|C|C|C|C|@{}} \firsthline
Seite von Seiten \\ \thepage~von \ztotpages
&
Kurzbezeichnung: \\ \ptb@Ident
&
Datum: \\ \ptb@Date
&
Ausgabe-Nr.: \\ \ptb@Edition
&
Erstellt: \\
Abteilung~\ptb@Devision, Fachbereich~\ptb@Department
\tabularnewline \lasthline
\end{tabularx}%
\endgroup \endgroup
} }
\emergencystretch=3em % \RequirePackage[manualmark,draft=false]{scrlayer-scrpage}
\pagestyle{headings} \pagestyle{scrheadings}
\def\titlepagestyle{headings} \clearpairofpagestyles
\cehead{\ptb@head@even}
\RequirePackage{tocstyle} \cohead{\ptb@head@odd}
%\RequirePackage[tocflat]{tocstyle} \cefoot{\ptb@foot@even}
%\usetocstyle{KOMAlike} \cofoot{\ifnum\c@page=\@ne\ptb@first@foot\else\ptb@foot@odd\fi}
\usetocstyle{allwithdot} \setkomafont{pageheadfoot}{\normalfont\normalsize}
\settocfeature{raggedhook}{\raggedright}% verhindert auch Trennung
\settocfeature{pagenumberbox}{\makebox[1.5em][r]}
\settocfeature{entryhook}{\overfullrule=\z@}
\BeforeStartingTOC[toc]{\microtypesetup{protrusion=false}}
\AfterStartingTOC[toc]{\microtypesetup{protrusion=true}}
\addtokomafont{caption}{\small}
\addtokomafont{captionlabel}{\bfseries\sffamily}
\setcapindent{1em}
%\setcapwidth[c]{.8\textwidth}
\renewcommand{\floatpagefraction}{.9}
\renewcommand{\textfraction}{.1}
\renewcommand{\topfraction}{.9}
\renewcommand{\bottomfraction}{.5}
\setcounter{topnumber}{3}
\setcounter{bottomnumber}{1}
\setcounter{totalnumber}{5}
\renewcommand{\dbltopfraction}{.8}
\renewcommand{\dblfloatpagefraction}{.6}
% Einzelne Abbildungen nicht auf dem leeren Blatt zentrieren.
\setlength\@fptop{0pt}
% Kompaktere Listen % Kompaktere Listen
\RequirePackage[neverdecrease]{paralist} \RequirePackage[neverdecrease]{paralist}
\newcommand*\ptb@begin@list[1]{% \newcommand*\ptb@begin@list[1]{%
\ptb@tempdima=\parindent \ptb@tempdima=\parindent
...@@ -256,9 +244,19 @@ footskip=15mm, ...@@ -256,9 +244,19 @@ footskip=15mm,
\pltopsep=\medskipamount \pltopsep=\medskipamount
\plitemsep=\medskipamount \plitemsep=\medskipamount
\DeclareSIUnit\torr{Torr} \renewcommand{\floatpagefraction}{.9}
\DeclareSIUnit\mbar{\milli bar} \renewcommand{\textfraction}{.1}
\renewcommand{\topfraction}{.9}
\renewcommand{\bottomfraction}{.5}
\setcounter{topnumber}{3}
\setcounter{bottomnumber}{1}
\setcounter{totalnumber}{5}
\renewcommand{\dbltopfraction}{.8}
\renewcommand{\dblfloatpagefraction}{.6}
% Einzelne Abbildungen nicht auf dem leeren Blatt zentrieren.
\@fptop=0pt %
% TODO: nach siunitx-PTB.sty ???
\sisetup{% Formatierung von Maßzahlen (z.B. Spaltentyp "S" in Tabellen) \sisetup{% Formatierung von Maßzahlen (z.B. Spaltentyp "S" in Tabellen)
,retain-zero-exponent=true ,retain-zero-exponent=true
,retain-unity-mantissa=true ,retain-unity-mantissa=true
...@@ -267,29 +265,8 @@ footskip=15mm, ...@@ -267,29 +265,8 @@ footskip=15mm,
,zero-decimal-to-integer=false ,zero-decimal-to-integer=false
} }
\addto\extrasgerman{\sisetup{locale=DE}} \emergencystretch=3em %
\addto\extrasngerman{\sisetup{locale=DE}}
\addto\extrasenglish{\sisetup{locale=US}}
\renewcommand*\tabularxcolumn[1]{m{#1}}% vert. zentriert
\keepXColumns
\newcommand\tabsection[1]{%
\multicolumn{\LT@cols}{@{}l@{}}{}\\[-.5em]
\multicolumn{\LT@cols}{@{}l@{}}%
{\makebox[0pt][l]{\parbox[b]{\TX@target}{%
\usekomafont{disposition}#1}}} \\*[.25em]}
\raggedbottom
\RequirePackage[final]{hyperref} \RequirePackage[final]{hyperref}
\endinput \endinput
%%
%% End of file `arbeitsanweisung.cls'.
Zu ltablex-Problemen:
http://www.latex-community.org/forum/viewtopic.php?f=45&p=39984
(Axel Sommerfeld)
kalibrierschein/siunitx-PTB.sty
+ 2
− 2
View file @ 2b33a941
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
\providecommand*\vl@tempd{} \providecommand*\vl@tempd{}
\providecommand*\vl@tempe{} \providecommand*\vl@tempe{}
\DeclareSIUnit\torr{torr} \DeclareSIUnit\torr{Torr}
\DeclareSIUnit\mbar{mbar} \DeclareSIUnit\mbar{\milli bar}
%%%\AtBeginDocument{% %%%\AtBeginDocument{%
\sisetup{% \sisetup{%
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment