Merge branch 'master' of git.c3d2.de:schleuderpackage

Conflicts:
	example/schleuderbeispiel.tex
This commit is contained in:
john stone 2013-07-20 01:16:30 +02:00
commit 3c8425739f
2 changed files with 22 additions and 2 deletions

View File

@ -60,6 +60,7 @@
\rehead[]{\tikz[overlay]{\node[xshift=0.3mm,yshift=0.9mm]{\includegraphics[width=1cm]{Logo_CCC}};}}
\rohead[]{\tikz[overlay]{\node[xshift=0.3mm,yshift=0.9mm]{\includegraphics[width=1cm]{Logo_CCC}};}}
\chead{\@runninghead}
\setheadsepline{0.5pt}
\ifoot[]{Datenschleuder. \@volume / \@year}
@ -79,6 +80,7 @@
\renewcommand{\maketitle}{%
\twocolumn[
\renewcommand{\@runninghead}{\@runningheadtmp}
\textsf{\Huge\@title}
\begin{center}%
@ -95,6 +97,10 @@
\define@key{DSarticleKeys}{title}{\title{#1}}%
\define@key{DSarticleKeys}{author}{\author{#1}}
\define@key{DSarticleKeys}{DSabstract}{\renewcommand{\@DSabstract}{#1}}
\newcommand{\@runninghead}{}
\newcommand{\@runningheadtmp}{}
\newcommand{\runninghead}[1]{\renewcommand{\@runningheadtmp}{#1}}
\define@key{DSarticleKeys}{runninghead}[\@title]{\runninghead{#1}}
\newenvironment{DSarticle}[1][]{%
\setkeys{DSarticleKeys}{#1}%

View File

@ -10,17 +10,31 @@
% Article 1 (with old-fashioned commands)
\title{Krasser Artikel!!k!}
\author{Mr. Ultracool}
\DSabstract{
\runninghead{Korrekt}
\DSabstract{%
blablabblablb blablabblablb blablabblablb blablabblablb blablabblablb blablabblablb blablabblablb blablabblablb blablabblablb blablabblablb blablabblablb blablabblablb blablabblablb
}
\maketitle
\lipsum[30-41]
% Article 1 (with old-fashioned commands)
\title{Noch was tolles}
\author{Mr. Wahnsinn}
\runninghead{Tolltoll}
\DSabstract{%
blablabblablb blablabblablb blablabblablb blablabblablb blablabblablb blablabblablb blablabblablb blablabblablb blablabblablb blablabblablb blablabblablb blablabblablb blablabblablb
}
\maketitle
\makeatletter
\makeatother
\lipsum[1-3]
% Article 2 (with DSarticle environment)
\begin{DSarticle}[%
title=Something not so cool,
runninghead={uncool},
author=Ms. Boring,
DSabstract={
DSabstract={%
abstract abstract abstract abstract abstract abstract abstract abstract abstract abstract abstract abstract abstract abstract abstract abstract abstract abstract abstract abstract abstract abstract
}
]