Merge branch 'master' into topology-1

This commit is contained in:
Maximilian Keßler 2021-12-12 20:14:12 +01:00
commit 4aa3ce8c18
5 changed files with 65 additions and 48 deletions

View file

@ -122,7 +122,7 @@ __END_OPTIONS_X__
\NewDocumentCommand{\declarebigtheorem}{O{} O{} m m O{}}{ \NewDocumentCommand{\declarebigtheorem}{O{} O{} m m O{}}{
%First, store the name of the theorem in \theoremname %First, store the name of the theorem in \theoremname
\if__PACKAGE_PREFIX__english __IF__(english)
\ifthenelse{\isempty{#2}}{\def\theoremname{#4}}{\def\theoremname{#2}} \ifthenelse{\isempty{#2}}{\def\theoremname{#4}}{\def\theoremname{#2}}
\else \else
\ifthenelse{\isempty{#1}}{\def\theoremname{#4}}{\def\theoremname{#1}} \ifthenelse{\isempty{#1}}{\def\theoremname{#4}}{\def\theoremname{#1}}
@ -132,58 +132,56 @@ __END_OPTIONS_X__
\ifthenelse{\isempty{#5}}{\declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}, sibling = __PACKAGE_PREFIX__dummy]{#4}}{} \ifthenelse{\isempty{#5}}{\declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}, sibling = __PACKAGE_PREFIX__dummy]{#4}}{}
%Define the versions theorem*, theorem**, dtheorem %Define the versions theorem*, theorem**, dtheorem
__IF__(lecturenumbers)
\if__PACKAGE_PREFIX__lecturenumbers __IF__(numbersmallenvironments)
\if__PACKAGE_PREFIX__numbersmallenvironments
\declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}, sibling=__PACKAGE_PREFIX__smalldummy]{#4*} \declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}, sibling=__PACKAGE_PREFIX__smalldummy]{#4*}
\declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}\if__PACKAGE_PREFIX__showstars *\else\fi, sibling=__PACKAGE_PREFIX__smalldummy]{#4**} \declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}__IF__(showstars) *\else\fi, sibling=__PACKAGE_PREFIX__smalldummy]{#4**}
\declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}\if__PACKAGE_PREFIX__showdaggers $^{\dagger}$\else\fi, sibling=__PACKAGE_PREFIX__smalldummy]{d#4} \declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}__IF__(showdaggers) $^{\dagger}$\else\fi, sibling=__PACKAGE_PREFIX__smalldummy]{d#4}
\else \else
\declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}, numbered=no]{#4*} \declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}, numbered=no]{#4*}
\declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}\if__PACKAGE_PREFIX__showstars *\else\fi, numbered = no]{#4**} \declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}__IF__(showstars) *\else\fi, numbered = no]{#4**}
\declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}\if__PACKAGE_PREFIX__showdaggers $^{\dagger}$\else\fi, numbered = no]{d#4} \declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}__IF__(showdaggers) $^{\dagger}$\else\fi, numbered = no]{d#4}
\fi \fi
\else \else
\declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}, sibling=__PACKAGE_PREFIX__dummy]{#4*} \declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}, sibling=__PACKAGE_PREFIX__dummy]{#4*}
\declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}\if__PACKAGE_PREFIX__showstars *\else\fi, sibling=__PACKAGE_PREFIX__dummy]{#4**} \declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}__IF__(showstars) *\else\fi, sibling=__PACKAGE_PREFIX__dummy]{#4**}
\declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}\if__PACKAGE_PREFIX__showdaggers $^{\dagger}$\else\fi, sibling=__PACKAGE_PREFIX__dummy]{d#4} \declaretheorem[style = #3, name = \makefirstuc{\expandafter\theoremname}__IF__(showdaggers) $^{\dagger}$\else\fi, sibling=__PACKAGE_PREFIX__dummy]{d#4}
\fi \fi
\if__PACKAGE_PREFIX__includestars\else\renewenvironment{#4**}{\comment}{\endcomment}\fi __IF__(includestars)\else\renewenvironment{#4**}{\comment}{\endcomment}\fi
} }
\NewDocumentCommand{\declaresmalltheorem}{O{} O{} m m}{ \NewDocumentCommand{\declaresmalltheorem}{O{} O{} m m}{
%Get the name of the theorem and store it in \theoremname %Get the name of the theorem and store it in \theoremname
\if__PACKAGE_PREFIX__english __IF__(english)
\ifthenelse{\isempty{#2}}{\def\theoremname{#4}}{\def\theoremname{#2}} \ifthenelse{\isempty{#2}}{\def\theoremname{#4}}{\def\theoremname{#2}}
\else \else
\ifthenelse{\isempty{#1}}{\def\theoremname{#4}}{\def\theoremname{#1}} \ifthenelse{\isempty{#1}}{\def\theoremname{#4}}{\def\theoremname{#1}}
\fi \fi
\if__PACKAGE_PREFIX__numbersmallenvironments __IF__(numbersmallenvironments)
\if__PACKAGE_PREFIX__numbersmallenvironmentswiththeorem __IF__(numbersmallenvironmentswiththeorem)
\declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}, sibling = __PACKAGE_PREFIX__smalldummy]{#4} \declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}, sibling = __PACKAGE_PREFIX__smalldummy]{#4}
\declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}\if__PACKAGE_PREFIX__showstars *\else\fi, sibling=__PACKAGE_PREFIX__smalldummy]{#4*} \declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}__IF__(showstars) *\else\fi, sibling=__PACKAGE_PREFIX__smalldummy]{#4*}
\declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}\if__PACKAGE_PREFIX__showdaggers $^{\dagger}$\else\fi, sibling=__PACKAGE_PREFIX__smalldummy]{d#4} \declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}__IF__(showdaggers) $^{\dagger}$\else\fi, sibling=__PACKAGE_PREFIX__smalldummy]{d#4}
\else \else
\declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}, sibling=__PACKAGE_PREFIX__dummy]{#4} \declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}, sibling=__PACKAGE_PREFIX__dummy]{#4}
\declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}\if__PACKAGE_PREFIX__showstars *\else\fi, sibling=__PACKAGE_PREFIX__dummy]{#4*} \declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}__IF__(showstars) *\else\fi, sibling=__PACKAGE_PREFIX__dummy]{#4*}
\declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}\if__PACKAGE_PREFIX__showdaggers $^{\dagger}$\else\fi, sibling=__PACKAGE_PREFIX__dummy]{d#4} \declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}__IF__(showdaggers) $^{\dagger}$\else\fi, sibling=__PACKAGE_PREFIX__dummy]{d#4}
\fi \fi
\else \else
\declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}, numbered = no]{#4} \declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}, numbered = no]{#4}
\declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}\if__PACKAGE_PREFIX__showstars *\else\fi, numbered = no]{#4*} \declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}__IF__(showstars) *\else\fi, numbered = no]{#4*}
\declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}\if__PACKAGE_PREFIX__showdaggers $^{\dagger}$\else\fi, numbered = no]{d#4} \declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}__IF__(showdaggers) $^{\dagger}$\else\fi, numbered = no]{d#4}
\fi \fi
\declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}, sibling=__PACKAGE_PREFIX__dummy]{n#4} \declaretheorem[style=#3,name=\makefirstuc{\expandafter\theoremname}, sibling=__PACKAGE_PREFIX__dummy]{n#4}
\if__PACKAGE_PREFIX__includestars\else\renewenvironment{#4*}{\comment}{\endcomment}\fi __IF__(includestars)\else\renewenvironment{#4*}{\comment}{\endcomment}\fi
} }
%%%% If requested, now define some default theoremstyles %%%% If requested, now define some default theoremstyles
\if__PACKAGE_PREFIX__defaulttheorems __IF__(defaulttheorems)
\RequirePackage[default styles]{mkessler-thmstyle} % Easy setup of mdframed styles \RequirePackage[default styles]{mkessler-thmstyle} % Easy setup of mdframed styles
\declarebigtheorem[Satz][Theorem]{thmredmarginandfill}{theorem} \if__PACKAGE_PREFIX__english\else\AtBeginDocument{\def\theoremautorefname{Satz}}\fi \declarebigtheorem[Satz][Theorem]{thmredmarginandfill}{theorem} __IF__(english)\else\AtBeginDocument{\def\theoremautorefname{Satz}}\fi
\declarebigtheorem{thmredmarginandfill}{proposition} \declarebigtheorem{thmredmarginandfill}{proposition}
\declarebigtheorem[Korollar]{thmredmarginandfill}{corollary} \declarebigtheorem[Korollar]{thmredmarginandfill}{corollary}
\declarebigtheorem{thmorangemarginandfill}{lemma} \declarebigtheorem{thmorangemarginandfill}{lemma}
@ -210,9 +208,9 @@ __END_OPTIONS_X__
%%%% Specially treated stuff %%%% Specially treated stuff
\declaresmalltheorem[\if__PACKAGE_PREFIX__markoral Mündliche Anmerkung\else Bemerkung\fi][\if__PACKAGE_PREFIX__markoral Oral remark\else remark\fi]{thmyellowmargin}{oral} \declaresmalltheorem[__IF__(markoral) Mündliche Anmerkung\else Bemerkung\fi][__IF__(markoral) Oral remark\else remark\fi]{thmyellowmargin}{oral}
% Option to remove oral remarks when needed % Option to remove oral remarks when needed
\if__PACKAGE_PREFIX__includeoral\else __IF__(includeoral)\else
\renewenvironment{oral}{\comment}{\endcomment} \renewenvironment{oral}{\comment}{\endcomment}
\renewenvironment{oral*}{\comment}{\endcomment} \renewenvironment{oral*}{\comment}{\endcomment}
\renewenvironment{doral}{\comment}{\endcomment} \renewenvironment{doral}{\comment}{\endcomment}
@ -242,26 +240,26 @@ __END_OPTIONS_X__
%%%%%%%%%%%% Non-mdframed theorems %%%%%%%%%%%% Non-mdframed theorems
\theoremstyle{plain} \theoremstyle{plain}
\newtheorem{variant}{\if__PACKAGE_PREFIX__english Variant\else Variante\fi} \newtheorem{variant}{__IF__(english) Variant\else Variante\fi}
\newtheorem{assumption}{\if__PACKAGE_PREFIX__english Assumption\else Annahme\fi} \newtheorem{assumption}{__IF__(english) Assumption\else Annahme\fi}
\theoremstyle{definition} \theoremstyle{definition}
\newtheorem*{note}{\if__PACKAGE_PREFIX__english Note\else Anmerkung\fi} \newtheorem*{note}{__IF__(english) Note\else Anmerkung\fi}
\newtheorem*{warning}{\color{red}\if__PACKAGE_PREFIX__english Warning \else Warnung\fi} \newtheorem*{warning}{\color{red}__IF__(english) Warning \else Warnung\fi}
\newtheorem*{goal}{\if__PACKAGE_PREFIX__english Goal \else Ziel\fi} \newtheorem*{goal}{__IF__(english) Goal \else Ziel\fi}
\newtheorem*{strategy}{\if__PACKAGE_PREFIX__english Proof Strategy \else Beweisstrategie\fi} \newtheorem*{strategy}{__IF__(english) Proof Strategy \else Beweisstrategie\fi}
\newtheorem*{goal*}{\if__PACKAGE_PREFIX__english Goal* \else Ziel*\fi} \newtheorem*{goal*}{__IF__(english) Goal* \else Ziel*\fi}
\newtheorem*{problem}{Problem} \newtheorem*{problem}{Problem}
\newtheorem*{info}{Information} \newtheorem*{info}{Information}
\newtheorem*{answer}{\if__PACKAGE_PREFIX__english Answer\else Antwort\fi} \newtheorem*{answer}{__IF__(english) Answer\else Antwort\fi}
\newtheorem{observe}[theorem]{\if__PACKAGE_PREFIX__english Observe\else Beobachte\fi} \newtheorem{observe}[theorem]{__IF__(english) Observe\else Beobachte\fi}
\newtheorem*{property}{\if__PACKAGE_PREFIX__english Property\else Eigenschaft\fi} \newtheorem*{property}{__IF__(english) Property\else Eigenschaft\fi}
\newtheorem*{intuition}{Intuition} \newtheorem*{intuition}{Intuition}
\newtheorem*{recall}{\if__PACKAGE_PREFIX__english Recall\else Erinnerung\fi} \newtheorem*{recall}{__IF__(english) Recall\else Erinnerung\fi}
\newtheorem*{idea}{\if__PACKAGE_PREFIX__english Idea\else Idee\fi} \newtheorem*{idea}{__IF__(english) Idea\else Idee\fi}
\newtheorem{exercise}{\if__PACKAGE_PREFIX__english Exercise\else Aufgabe\fi}[section] \newtheorem{exercise}{__IF__(english) Exercise\else Aufgabe\fi}[section]
\newtheorem{reminder}{\if__PACKAGE_PREFIX__english Reminder\else Erinnerung\fi} \newtheorem{reminder}{__IF__(english) Reminder\else Erinnerung\fi}
\fi % end of default theorems \fi % end of default theorems

View file

@ -1,19 +1,21 @@
__HEADER__(Write up lecture notes as script) __HEADER__(Write up lecture notes as script)
__LANGUAGE_OPTIONS__ \RequirePackage{xkeyval}
__LANGUAGE_OPTIONS_X__
__NEW_IF__(showversion,true) __NEW_IF__(showversion,true)
\DeclareOption{show version}{__SET_IF__(showversion,true)} \DeclareOptionX{show version}{__SET_IF__(showversion,true)}
\DeclareOption{hideversion}{__SET_IF__(showversion,false)} \DeclareOptionX{hideversion}{__SET_IF__(showversion,false)}
__NEW_IF__(fancyfoot,false) __NEW_IF__(fancyfoot,false)
\DeclareOption{fancyfoot}{__SET_IF__(fancyfoot,true)} \DeclareOptionX{fancyfoot}{__SET_IF__(fancyfoot,true)}
__NEW_IF__(gitversion,false) __NEW_IF__(gitversion,false)
\DeclareOption{git}{__SET_IF__(gitversion,true)} \DeclareOption{git}{__SET_IF__(gitversion,true)}
__END_OPTIONS__ __END_OPTIONS_X__
\RequirePackage{xifthen} \RequirePackage{xifthen}

View file

@ -24,8 +24,10 @@ __HEADER__(Hacky math packages for some (custom@) fixes)
\let__PACKAGE_MACRO__(stored@varphi)\varphi \let__PACKAGE_MACRO__(stored@varphi)\varphi
\AtBeginDocument{ \AtBeginDocument{
\let\phi__PACKAGE_MACRO__(stored@varphi) \let\phi__PACKAGE_MACRO__(stored@varphi)
\let\varphi__PACKAGE_MACRO__(stored@varphi)
\let\uglyphi__PACKAGE_MACRO__(stored@phi) \let\uglyphi__PACKAGE_MACRO__(stored@phi)
\let\oldphi__PACKAGE_MACRO__(stored@phi) \let\oldphi__PACKAGE_MACRO__(stored@phi)
\let\goldenratio__PACKAGE_MACRO__(stored@phi)
} }
\let__PACKAGE_MACRO__(stored@epsilon)\epsilon \let__PACKAGE_MACRO__(stored@epsilon)\epsilon
@ -33,4 +35,5 @@ __HEADER__(Hacky math packages for some (custom@) fixes)
\AtBeginDocument{ \AtBeginDocument{
\let\epsilon__PACKAGE_MACRO__(stored@varepsilon) \let\epsilon__PACKAGE_MACRO__(stored@varepsilon)
\let\uglyepsilon__PACKAGE_MACRO__(stored@epsilon) \let\uglyepsilon__PACKAGE_MACRO__(stored@epsilon)
\let\oldepsilon__PACKAGE_MACRO__(stored@epsilon)
} }

View file

@ -152,6 +152,7 @@ __END_OPTIONS_X__
\DeclareCategory{Alg} \DeclareCategory{Alg}
\DeclareCategory{Field} \DeclareCategory{Field}
\DeclareCategory{GrAb} \DeclareCategory{GrAb}
\DeclareCategory{Sch}
%Set theory %Set theory
\DeclareSimpleMathOperator{card} \DeclareSimpleMathOperator{card}
@ -164,12 +165,25 @@ __END_OPTIONS_X__
\DeclareSimpleMathOperator{Br} \DeclareSimpleMathOperator{Br}
\DeclareSimpleMathOperator{EXT} \DeclareSimpleMathOperator{EXT}
\DeclareSimpleMathOperator{Ind} \DeclareSimpleMathOperator{Ind}
\DeclareSimpleMathOperator{char} \DeclareSimpleMathOperator{Char}
\DeclareSimpleMathOperator{res} \DeclareSimpleMathOperator{res}
\DeclareSimpleMathOperator{inf} \DeclareSimpleMathOperator{inf}
\DeclareSimpleMathOperator{cov} \DeclareSimpleMathOperator{cov}
\newcommand{\del}{\partial} % Semantically correct operator for boundary maps \newcommand{\del}{\partial} % Semantically correct operator for boundary maps
%% Algebraic geometry
\DeclareSimpleMathOperator{eq}
\DeclareSimpleMathOperator{Idem}
\DeclareSimpleMathOperator{Supp}
\DeclareSimpleMathOperator{Ann}
\DeclareSimpleMathOperator{OC}
\DeclareSimpleMathOperator{red}
\DeclareSimpleMathOperator{can}
\DeclareSimpleMathOperator{Pic}
\newcommand\leftadjoint\vdash
\newcommand\rightadjoint\dashv
% Characteristic function % Characteristic function
\newcommand*{\cfun}{\ensuremath{\mathbbm{1}}} \newcommand*{\cfun}{\ensuremath{\mathbbm{1}}}
\newcommand*{\One}{\cfun} \newcommand*{\One}{\cfun}

View file

@ -1,8 +1,8 @@
__HEADER__((For now) removed parts of other packages. Not intended for use right now.)% Quotations __HEADER__((For now@) removed parts of other packages. Not intended for use right now.)% Quotations
\RequirePackage{csquotes} % quotations \RequirePackage{csquotes} % quotations
%%%% Utilities %%%% Utilities
\RequirePackage{comment} %comments \RequirePackage{commnt} %comments
\RequirePackage{todonotes} % todo notes \RequirePackage{todonotes} % todo notes
\RequirePackage{blindtext} % \blindtext filling \RequirePackage{blindtext} % \blindtext filling