From cfbef13d4b76a2f86572a1d06e79aa7d81eaafb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hilbig?= Date: Tue, 23 Jul 2019 22:57:06 +0200 Subject: [PATCH] Letzte commits --- ahilbig-script.sty | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/ahilbig-script.sty b/ahilbig-script.sty index d32a3d4..589c11b 100644 --- a/ahilbig-script.sty +++ b/ahilbig-script.sty @@ -33,6 +33,8 @@ \DeclareOption{onelecture}{\onelecturetrue} \newif\ifgitinfo \DeclareOption{gitinfo}{\gitinfotrue} +\newif\ifgitfileinfo +\DeclareOption{gitfileinfo}{\gitfileinfotrue} \ProcessOptions %\RequirePackage{caption} @@ -40,6 +42,10 @@ %\RequirePackage[draft]{ddi-common} %\RequirePackage[blackandwhite]{ddi-common} %\RequirePackage[cd]{ddi-common} + +% seit 2018-02-11 gab es einen colorlet error daher nun: +\RequirePackage[dvipsnames]{xcolor} +% --- \RequirePackage{ahilbig-common} \RequirePackage{ahilbig-semester} @@ -62,6 +68,7 @@ \RequirePackage{subcaption} + \RequirePackage{varsfromjobname} % Element[e] aus \jobname extrahieren %\RequirePackage{qrcode} % Wird in maintitle genutzt - auskommentiert @@ -88,6 +95,15 @@ \providecommand\versionsinfo{} \fi +\ifgitfileinfo + \RequirePackage{gitfile-info} + \providecommand\versionsinfo{% + \gfiInfo + } +\else + \providecommand\versionsinfo{} +\fi + \ifonelecture \RequirePackage{chngcntr} @@ -1665,7 +1681,7 @@ \newcount\ddimemoryline -\newenvironment{object}[1] +\newenvironment{scriptobject}[1] { \def\objectname{#1} \ddimemoryline=0\relax @@ -1689,7 +1705,7 @@ \endscope } -\def\attribute#1 #2=#3;{% +\def\scriptattribute#1 #2=#3;{% \node [@kind,minimum height=4mm,text height=1mm,text depth=0pt,anchor=base west] (\objectname-#2) at (0,-1*\ddimemoryline) {\scantokens{\javacode|#3|}}; \node [text height=1mm,text depth=0pt,minimum height=4mm,anchor=base east] at (0,-1*\ddimemoryline) {\javacode|#1 #2|}; \advance\ddimemoryline by 1\relax