Merge with master

This commit is contained in:
Benjamin Kellermann 2017-02-20 20:41:26 +01:00
commit 7b3ed0f2ed
2 changed files with 5 additions and 4 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.swp

View File

@ -81,7 +81,7 @@
\RequirePackage{fmtcount} \RequirePackage{fmtcount}
\RequirePackage{scrpage2} \RequirePackage{scrlayer-scrpage}
\RequirePackage{graphicx} \RequirePackage{graphicx}
\RequirePackage{tikz} \RequirePackage{tikz}
\RequirePackage[pdftex,% \RequirePackage[pdftex,%
@ -319,7 +319,7 @@
\node[% \node[%
below right=\logoXsep of logo.south west, below right=\logoXsep of logo.south west,
text width=\columnwidth, text width=\columnwidth,
font=\sf\bfseries, font=\textbf, %FIX for texlive 2016
inner xsep=0mm, inner xsep=0mm,
](DSsubtitle){% ](DSsubtitle){%
das wissenschaftliche fachblatt für datenreisende\\ das wissenschaftliche fachblatt für datenreisende\\
@ -333,12 +333,12 @@
\node[ \node[
left=0cm of chaosknoten.north west, left=0cm of chaosknoten.north west,
anchor=north east, anchor=north east,
]{\fontspec[Scale=3.9]{Linux Biolinum O}\bfseries\#\@volume}; ]{\fontspec[Scale=3.9]{Linux Biolinum O}\bffamily\#\@volume};
\node[ \node[
below right=0cm of logo.west|-chaosknoten.north, below right=0cm of logo.west|-chaosknoten.north,
inner xsep=0pt, inner xsep=0pt,
text width=\columnwidth, text width=\columnwidth,
font=\sf\bfseries, font=\textbf,
] (issn) {% ] (issn) {%
ISSN 0930-1054 \textbullet\ \@year\\ ISSN 0930-1054 \textbullet\ \@year\\
\DSTitlePage@price \DSTitlePage@price