From 96612011f3313d7e63ed895063fc3f162c99b371 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Hilbig?= <mail@andrehilbig.de>
Date: Wed, 8 Apr 2015 14:36:45 +0200
Subject: [PATCH] =?UTF-8?q?Option=20f=C3=BCr=20Schule-Paket=20hinzugef?=
 =?UTF-8?q?=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ahilbig-common.sty | 42 +++++++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/ahilbig-common.sty b/ahilbig-common.sty
index 98372d1..05ae50e 100644
--- a/ahilbig-common.sty
+++ b/ahilbig-common.sty
@@ -26,13 +26,25 @@
 %                                                                                                  |
 \ProvidesPackage{ahilbig-common}
 
+\newif\ifdraftversion
+\newif\ifbw
+\newif\ifcd
+\newif\ifschule
+
+\DeclareOption{draft}{\draftversiontrue}
+\DeclareOption{blackandwhite}{\bwtrue}
+\DeclareOption{cd}{\cdtrue}
+\DeclareOption{schule}{\schuletrue}
+
+\ProcessOptions
+
 \RequirePackage[german=guillemets]{csquotes}
 
 % Automatische Skalierung zu grosser (breiter) Grafiken
 \RequirePackage[Export]{adjustbox}
 \adjustboxset{max size={\textwidth}{0.9\textheight}}
 
-\RequirePackage{svn-multi}
+%\RequirePackage{svn-multi}
 %\RequirePackage[all]{svn-multi}
 %\RequirePackage[filehooks,autokw]{svn-multi}
 \RequirePackage{staves}
@@ -53,6 +65,13 @@
 
 \RequirePackage[official]{eurosym} 
 \RequirePackage{fancybox} 
+\@ifclassloaded{beamer}{}{\RequirePackage{beamerarticle}}
+\ifschule
+	\RequirePackage{schule}
+	\let\schuleSo\so
+	\let\so\relax
+\fi
+
 \RequirePackage{tabularx} 
 \RequirePackage{xmpmulti} 
 \RequirePackage{pdfcomment} 
@@ -105,18 +124,6 @@
 
 \RequirePackage{comment}
 
-\newif\ifdraftversion
-\newif\ifbw
-\newif\ifcd
-
-\DeclareOption{draft}{\draftversiontrue}
-\DeclareOption{blackandwhite}{\bwtrue}
-\DeclareOption{cd}{\cdtrue}
-
-\ProcessOptions
-
-
-\@ifclassloaded{beamer}{}{\RequirePackage{beamerarticle}}
 \RequirePackage{pgfkeys}
 \RequirePackage{ifluatex}
 \ifluatex
@@ -125,6 +132,7 @@
  \RequirePackage[utf8]{inputenc}
 \fi
 
+
 \def\UrlFont{}
 
 %%\ifcd\else
@@ -176,6 +184,14 @@
 \providecommand{\RightArrow}{\textcolor{structure.fg}{$\Rightarrow$}}
 \providecommand{\TCs}[1]{\textcolor{structure.fg}{#1}}
 
+\newenvironment{colitemize}[1][2]{
+	\begin{multicols}{#1}
+		\begin{itemize}
+}{
+		\end{itemize}
+	\end{multicols}
+}
+
 \mode<article>
 {
 %%  \ifcmmath