From 565a46a1bdc5e2d41c84a47adeb95363d36f4129 Mon Sep 17 00:00:00 2001 From: Ulli Kehrle Date: Sat, 30 Dec 2017 15:01:41 +0100 Subject: updated everything --- skript.cls | 88 +++++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 58 insertions(+), 30 deletions(-) (limited to 'skript.cls') diff --git a/skript.cls b/skript.cls index 0cdb41a..3fe51c9 100644 --- a/skript.cls +++ b/skript.cls @@ -27,10 +27,15 @@ \RequirePackage{mathtools} \RequirePackage{amsmath, amssymb} +\RequirePackage{stackengine} + +\RequirePackage{microtype} + \ifxetexorluatex \RequirePackage[babelshorthands]{polyglossia} \setdefaultlanguage{german} + \PolyglossiaSetup{german}{indentfirst=true} \RequirePackage{fontspec} \defaultfontfeatures{Mapping=tex-text} \RequirePackage{empheq} @@ -55,7 +60,7 @@ \def\rAngle{\rangle\rangle} \fi % fonts -\setkomafont{disposition}{\rmfamily} +\setkomafont{disposition}{\bfseries\rmfamily} \RequirePackage[obeyDraft, obeyFinal, @@ -65,40 +70,42 @@ prependcaption, textsize=small]{todonotes} -\setkomafont{chapter}{\Huge} -\addtokomafont{chapterprefix}{\raggedleft} -\renewcommand*{\chapterformat}{% - \hrulefill\enskip\mbox{\scalebox{3}{\thechapter\autodot}}\vspace{-0.6\baselineskip}} -\usepackage{etoolbox} -\newcommand\chaptertopline{\smash{\raisebox{-3.5\baselineskip}{\rule{\textwidth}{.4pt}}}} -\makeatletter -\preto{\@@makeschapterhead}{\chaptertopline} -\preto{\@@makechapterhead}{\ifunnumbered{chapter}{\chaptertopline}{}} -\makeatother +\setkomafont{chapter}{\fontsize{26}{24}\selectfont} +\let\raggedchapter\raggedleft \preto{\chapterheadendvskip}{\noindent\hrulefill\par} \RedeclareSectionCommand[ - beforeskip=12ex, - afterskip=2\baselineskip]{chapter} + beforeskip=15ex, + afterskip=25ex]{chapter} % fonts \RequirePackage{setspace} -\setstretch{1.1} -% \setlength\parskip{4pt} -% \setlength\parindent{0pt} +\setstretch{1.08} +\setlength\parskip{0pt} +\setlength\parindent{2em} \RequirePackage[amsmath, thmmarks, framed]{ntheorem} +\RequirePackage{silence} \RequirePackage[framemethod=tikz]{mdframed} +\WarningFilter{mdframed}{You got a bad break} -\RequirePackage[xindy]{imakeidx} +\RequirePackage{makeidx} +\RequirePackage[totoc]{idxlayout} \RequirePackage[unicode,colorlinks,bookmarksopen=true]{hyperref} +\makeatletter +\pdfstringdefDisableCommands{\let\(\fake@math} +\newcommand\fake@math{}% just for safety +\def\fake@math#1\){\detokenize{#1}} +\makeatother \RequirePackage[capitalise, nameinlink]{cleveref} +\RequirePackage{ifdraft} + \pagestyle{scrheadings} -\clearscrheadfoot -\ohead{\headmark} +% \clearscrheadfoot +% \ohead{\headmark} \cfoot{\pagemark} -\ifoot{\tiny Revision\gitVtags: \gitAbbrevHash{} (\gitAuthorDate)} -\automark{section} +\ifoptionfinal{}{\ofoot{\tiny Revision\gitVtags: \gitAbbrevHash{} (\gitAuthorDate)}} +% \automark[chapter]{section} \RequirePackage[ backend=biber, @@ -128,16 +135,18 @@ \end{tikzpicture}} \usepackage{enumitem} -\setenumerate{label=(\alph*)} +\setenumerate{label=(\alph*),leftmargin=2em} +\newlist{wenumerate}{enumerate}{1} +\setlist[wenumerate]{leftmargin=3em} \makeatletter \makeatletter \newtheoremstyle{mychange}% {\item[\hskip\labelsep \theorem@headerfont ##2\hskip 0.3em\ ##1\theorem@separator]}% - {\item[\hskip\labelsep \theorem@headerfont ##2\hskip 0.3em\ ##1\ (##3)\theorem@separator]} + {\item[\hskip\labelsep \theorem@headerfont ##2\hskip 0.3em\ ##1\ {\normalfont(##3)}\theorem@separator]} \newtheoremstyle{nonumbermychange}% {\item[\hskip\labelsep \theorem@headerfont ##1\theorem@separator]}% - {\item[\hskip\labelsep \theorem@headerfont ##1\ (##3)\theorem@separator]} + {\item[\hskip\labelsep \theorem@headerfont ##1\ {\normalfont(##3)}\theorem@separator]} \makeatother \DeclareDocumentCommand\newmdtheoremenv{s O{} m o m o }{% \IfBooleanTF{#1}{% @@ -157,20 +166,22 @@ \newcounter{defsatzusw} \def\newthm#1#2{ \newmdtheoremenv[ntheorem, + usetwoside=false, leftmargin=1em, - linewidth=6pt, + linewidth=0.5em, % linecolor=myurlcolor!20, linecolor=green!30, leftline=true, rightline=false, bottomline=false, topline=false, - innerleftmargin=1em, + innerleftmargin=0.5em, ]{#1}[defsatzusw]{#2} \newmdtheoremenv*[ntheorem, + usetwoside=false, leftmargin=1em, - linewidth=6pt, + linewidth=0.5em, % linecolor=myurlcolor!20, linecolor=green!30, leftline=true, rightline=false, bottomline=false, topline=false, - innerleftmargin=1em, + innerleftmargin=0.5em, ]{#1-nn}{#2} } \def\newdef#1#2{\newtheorem{#1}[defsatzusw]{#2}\newtheorem*{#1-nn}{#2}} @@ -194,15 +205,20 @@ \newdef{bemerkung}{Bemerkung} \newdef{bemerkungen}{Bemerkungen} \newdef{definition}{Definition} +\newdef{notation}{Notation} \newdef{warnung}{Warnung} -\newdef{frage}{Frage} +\newdef{achtung}{Achtung} \newdef{erinnerung}{Erinnerung} +\theoremindent=\parindent +\theoremheaderfont{\scshape} +\newdef{frage}{Frage} +\newdef{problem}{Problem} \newdef{beispiel}{Beispiel} \newdef{beispiele}{Beispiele} -\newdef{problem}{Problem} \theoremstyle{nonumberplain} \theoremheaderfont{\itshape} +\theoremindent=0pt \theorembodyfont{\normalfont} \theoremseparator{.} % \theoremsymbol{\scalebox{0.8}{\ensuremath{\blacksquare}}} @@ -214,5 +230,17 @@ \renewcommand{\thesection}{\arabic{section}} \renewcommand\sectionformat{\S \thesection\autodot \hspace{1ex}} +\renewcommand\subsectionformat{\S \thesubsection\autodot \hspace{1ex}} +%\usepackage{textcase} +\ifxetex + \DeclareRobustCommand{\spacedlowsmallcaps}[1]{{\scshape\MakeLowercase{#1}}}% +\else + \DeclareRobustCommand{\spacedlowsmallcaps}[1]{\textls[80]{\scshape\MakeLowercase{#1}}}% +\fi +\setkomafont{section}{\Large\normalfont\spacedlowsmallcaps} +\setkomafont{subsection}{\large\normalfont\spacedlowsmallcaps} + +\let\emph\relax +\DeclareTextFontCommand{\emph}{\bfseries} \endinput \ No newline at end of file -- cgit v1.2.3-24-g4f1b