From cea6c743ec8fb02aaf40c5294ba1659cd06dab1f Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <thorsten.glaser@teckids.org>
Date: Thu, 27 Aug 2015 14:22:32 +0200
Subject: [PATCH] =?UTF-8?q?[verein.git]=20revert=20all=20changes=20in=20we?=
=?UTF-8?q?bsite-staging=20that=20aren=E2=80=99t=20for=20master=20atm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
(„make the branch free“)
---
teckids.sty | 5 -----
teckidspubmat.cls | 36 ++++++++++++------------------------
2 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/teckids.sty b/teckids.sty
index 103964a..4321f4a 100644
--- a/teckids.sty
+++ b/teckids.sty
@@ -43,11 +43,6 @@
\RequirePackage{pxfonts}
\renewcommand{\familydefault}{\sfdefault}
-% Hurenkinder und Schusterjungen verhindern
-\clubpenalty10000
-\widowpenalty10000
-\displaywidowpenalty=10000
-
\newcommand\0{\scalebox{-1}[1]{0}}
\DeclareGraphicsExtensions{.pdf,.eps,.png,.jpg}
diff --git a/teckidspubmat.cls b/teckidspubmat.cls
index 194287a..cbf93d9 100644
--- a/teckidspubmat.cls
+++ b/teckidspubmat.cls
@@ -28,35 +28,23 @@
\RequirePackage{teckids}
-\usepackage{fancyhdr}
-\geometry{footskip=0.6cm}
-\usepackage{calc}
-\newlength{\myheight}
-\pagestyle{fancy}
-\fancyhf{}
-\renewcommand{\headrulewidth}{0.6pt}
-\renewcommand{\footrulewidth}{0.6pt}
-\fancyhead[L]{\headmark}
-\fancyhead[R]{\today}
-\fancyfoot[L]{
- \settoheight{\myheight}{\thepage}
- \raisebox{\myheight-\height}{
- \includegraphics[width=3cm]{cc-by-sa}
- }
-}
-\fancyfoot[R]{
- \settoheight{\myheight}{\thepage}
- \raisebox{\myheight-\height}{
- \teckidslogo[3cm]{}
- }
-}
+\RequirePackage[automark]{scrpage2}
+\pagestyle{scrheadings}
+\clearscrheadings
+\clearscrplain
+\lohead{\headmark}
+\rohead{\today}
+\lofoot{\rule{\textwidth}{1pt}
+\includegraphics[width=3cm]{cc-by-sa}}
+\rofoot{\teckidslogo[3cm]{}}
\newcommand{\teckidspubmat}[2]{
\hypersetup{
pdfauthor = {#2, and others; see gitweb of Teckids e.V.}
}
-\fancyhead[L]{\Large #1}
-\fancyfoot[C]{\footnotesize
+\lohead{\Large #1}
+\cofoot{\footnotesize
+\linebreak% wegen \rule im \lofoot
\copyright 2014 #2\linebreak
Lizenziert unter einer Creative Commons Namensnennung - \linebreak
Weitergabe unter gleichen Bedingungen 3.0 Deutschland Lizenz.}
--
GitLab