[Counters] Completely redo numbering logic
This commit is contained in:
@@ -19,16 +19,41 @@
|
||||
\newcounter{remarks}
|
||||
\newcounter{all}
|
||||
|
||||
\newcommand{\definitions}{definitions}
|
||||
\newcommand{\useSubsection}{\ifnum\value{numberSubsections}>0{\arabic{subsection}.}\else{}\fi}
|
||||
\newcommand{\useSubsubsection}{\ifnum\value{numberSubsections}>1{\arabic{subsubsection}.}\else{}\fi}
|
||||
|
||||
\newcommand{\usenumberArabic}[1]{\ifnum\value{numberingConfig}<4{\arabic{section}.\useSubsection\useSubsubsection\ifnum\value{numberingConfig}<3{\ifnum\value{numberingConfig}<2{\arabic{#1}\stepcounter{#1}}\else{
|
||||
\ifx#1\definitions
|
||||
\arabic{#1}\stepcounter{#1}
|
||||
\else
|
||||
\arabic{all}\stepcounter{all}
|
||||
\fi}\fi}\else{\arabic{all}\stepcounter{all}}\fi}\else{}\fi}
|
||||
% ┌ ┐
|
||||
% │ Numbering of sections │
|
||||
% └ ┘
|
||||
\newcommand{\subsectionRendering}{
|
||||
\ifnum\value{numberSubsections}=1%
|
||||
\arabic{section}.\arabic{subsection}%
|
||||
\else
|
||||
\ifnum\value{numberSubsections}=2%
|
||||
\arabic{section}.\arabic{subsection}.\arabic{subsubsection}%
|
||||
\else
|
||||
\arabic{section}%
|
||||
\fi
|
||||
\fi}
|
||||
|
||||
\newcommand{\usenumberArabic}[1]{%
|
||||
\ifnum\value{numberingConfig}=1
|
||||
\subsectionRendering.\arabic{#1}\stepcounter{#1}%
|
||||
\else
|
||||
\ifnum\value{numberingConfig}=2
|
||||
\ifthenelse{\equal{#1}{definitions}}{%
|
||||
\subsectionRendering.\arabic{definitions}\stepcounter{definitions}%
|
||||
}{%
|
||||
\subsectionRendering.\arabic{all}\stepcounter{all}%
|
||||
}%
|
||||
\else
|
||||
\ifnum\value{numberingConfig}=3
|
||||
\subsectionRendering.\arabic{all}\stepcounter{all}%
|
||||
\else
|
||||
\relax%
|
||||
\fi
|
||||
\fi
|
||||
\fi}
|
||||
|
||||
% ────────────────────────────────────────────────────────────────────
|
||||
|
||||
|
||||
% Reset definition, lemma, etc counters, add a new page
|
||||
@@ -54,82 +79,96 @@
|
||||
\newsectionNoPB
|
||||
|
||||
|
||||
% ────────────────────────────────────────────────────────────────────
|
||||
% ╭────────────────────────────────────────────────╮
|
||||
% │ Tcolorboxes │
|
||||
% ╰────────────────────────────────────────────────╯
|
||||
% ────────────────────────────────────────────────────────────────────
|
||||
|
||||
% Definitions
|
||||
\newtcolorbox{definition}[2][]{mainboxstyle,colback=blue!5!white,colframe=blue!75!black,colbacktitle=blue!75!black,title={\large #2},overlay={\node[overlaystyle,draw=blue!75!black,fill=blue!75!black] at (frame.north east) {\large Definition \usenumberArabic{definitions}};},#1}
|
||||
\newtcolorbox{definition}[2][]{mainboxstyle,colback=blue!5!white,colframe=blue!75!black,colbacktitle=blue!75!black,title={\large #2},overlay={\node[overlaystyle,draw=blue!75!black,fill=blue!75!black] at (frame.north east) {\large Definition\usenumberArabic{definitions}};},#1}
|
||||
|
||||
% Theorems
|
||||
\newtcolorbox{theorem}[2][]{mainboxstyle,colback=ForestGreen!5!white,colframe=ForestGreen!75!black,colbacktitle=ForestGreen!75!black,title={\large #2},
|
||||
overlay={\node[overlaystyle,draw=ForestGreen!75!black,fill=ForestGreen!75!black] at (frame.north east) {\large \translate{Theorem}{\theoremde} \usenumberArabic{theorems}};},#1}
|
||||
overlay={\node[overlaystyle,draw=ForestGreen!75!black,fill=ForestGreen!75!black] at (frame.north east) {\large \translate{Theorem}{\theoremde}\usenumberArabic{theorems}};},#1}
|
||||
|
||||
% Lemmas
|
||||
\newtcolorbox{lemma}[2][]{mainboxstyle,colback=Aquamarine!5!white,colframe=Aquamarine!75!black,colbacktitle=Aquamarine!75!black,title={\large #2},
|
||||
overlay={\node[overlaystyle,draw=Aquamarine!75!black,fill=Aquamarine!75!black] at (frame.north east) {\large Lemma \usenumberArabic{lemmas}};},#1}
|
||||
overlay={\node[overlaystyle,draw=Aquamarine!75!black,fill=Aquamarine!75!black] at (frame.north east) {\large Lemma\usenumberArabic{lemmas}};},#1}
|
||||
|
||||
% Corollaries
|
||||
\newtcolorbox{corollary}[2][]{mainboxstyle,colback=teal!5!white,colframe=teal!75!black,colbacktitle=teal!75!black,title={\large #2},
|
||||
overlay={\node[overlaystyle,draw=teal!75!black,fill=teal!75!black] at (frame.north east) {\large \translate{Corollary}{Korollar} \usenumberArabic{corollaries}};},#1}
|
||||
overlay={\node[overlaystyle,draw=teal!75!black,fill=teal!75!black] at (frame.north east) {\large \translate{Corollary}{Korollar}\usenumberArabic{corollaries}};},#1}
|
||||
|
||||
% Axioms
|
||||
\newtcolorbox{axiom}[2][]{mainboxstyle,colback=JungleGreen!5!white,colframe=JungleGreen!75!black,colbacktitle=JungleGreen!75!black,title={\large #2},
|
||||
overlay={\node[overlaystyle,draw=JungleGreen!75!black,fill=JungleGreen!75!black] at (frame.north east) {\large Axiom \usenumberArabic{axioms}};},#1}
|
||||
overlay={\node[overlaystyle,draw=JungleGreen!75!black,fill=JungleGreen!75!black] at (frame.north east) {\large Axiom\usenumberArabic{axioms}};},#1}
|
||||
|
||||
% Facts
|
||||
\newtcolorbox{fact}[2][]{mainboxstyle,colback=SeaGreen!5!white,colframe=SeaGreen!75!black,colbacktitle=SeaGreen!75!black,title={\large #2},
|
||||
overlay={\node[overlaystyle,draw=SeaGreen!75!black,fill=SeaGreen!75!black] at (frame.north east) {\large \translate{Fact}{Fakt} \usenumberArabic{facts}};},#1}
|
||||
overlay={\node[overlaystyle,draw=SeaGreen!75!black,fill=SeaGreen!75!black] at (frame.north east) {\large \translate{Fact}{Fakt}\usenumberArabic{facts}};},#1}
|
||||
|
||||
% Propositions
|
||||
\newtcolorbox{proposition}[2][]{mainboxstyle,colback=Cyan!5!white,colframe=Cyan!75!black,colbacktitle=Cyan!75!black,title={\large #2},
|
||||
overlay={\node[overlaystyle,draw=Cyan!75!black,fill=Cyan!75!black] at (frame.north east) {\large Proposition \usenumberArabic{propositions}};},#1}
|
||||
overlay={\node[overlaystyle,draw=Cyan!75!black,fill=Cyan!75!black] at (frame.north east) {\large Proposition\usenumberArabic{propositions}};},#1}
|
||||
|
||||
% Examples
|
||||
\newtcolorbox{example}[2][]{mainboxstyle,colback=gray!5!white,colframe=gray!75!black,colbacktitle=gray!75!black,title={\large #2},
|
||||
overlay={\node[overlaystyle,draw=gray!75!black,fill=gray!75!black] at (frame.north east) {\large \translate{Example}{Beispiel} \usenumberArabic{examples}};},#1}
|
||||
overlay={\node[overlaystyle,draw=gray!75!black,fill=gray!75!black] at (frame.north east) {\large \translate{Example}{Beispiel}\usenumberArabic{examples}};},#1}
|
||||
|
||||
% Formula
|
||||
\newtcolorbox{formula}[2][]{mainboxstyle,colback=red!5!white,colframe=red!75!black,colbacktitle=red!75!black,title={\large #2},
|
||||
overlay={\node[overlaystyle,draw=red!75!black,fill=red!75!black] at (frame.north east) {\large \translate{Formula}{Formel} \usenumberArabic{formulas}};},#1}
|
||||
overlay={\node[overlaystyle,draw=red!75!black,fill=red!75!black] at (frame.north east) {\large \translate{Formula}{Formel}\usenumberArabic{formulas}};},#1}
|
||||
|
||||
% Remark
|
||||
\newtcolorbox{remark}[2][]{mainboxstyle,colback=green!5!white,colframe=green!75!black,colbacktitle=green!75!black,title={\large #2},
|
||||
overlay={\node[overlaystyle,draw=green!75!black,fill=green!75!black] at (frame.north east) {\large \translate{Remark}{Bemerkung} \usenumberArabic{remarks}};},#1}
|
||||
|
||||
|
||||
% ────────────────────────────────────────────────────────────────────
|
||||
% ╭────────────────────────────────────────────────╮
|
||||
% │ Inline environments │
|
||||
% ╰────────────────────────────────────────────────╯
|
||||
% ────────────────────────────────────────────────────────────────────
|
||||
|
||||
|
||||
% Inline environments (inline)
|
||||
\newcommand{\inlineex}{\bg{gray}{\translate{Example}{Beispiel} \usenumberArabic{examples}:}}
|
||||
\newcommand{\inlinedef}{\bg{blue}{Definition \usenumberArabic{definitions}:}}
|
||||
\newcommand{\inlineformula}{\bg{red}{\translate{Formula}{Formel} \usenumberArabic{formulas}:}}
|
||||
\newcommand{\inlinelemma}{\bg{Aquamarine}{Lemma \usenumberArabic{lemmas}:}}
|
||||
\newcommand{\inlinetheorem}{\bg{ForestGreen}{\translate{Theorem}{\theoremde} \usenumberArabic{theorems}:}}
|
||||
\newcommand{\inlineaxiom}{\bg{JungleGreen}{Axiom \usenumberArabic{axioms}:}}
|
||||
\newcommand{\inlinecorollary}{\bg{teal}{\translate{Corollary}{Korollar} \usenumberArabic{corollaries}:}}
|
||||
\newcommand{\inlinefact}{\bg{SeaGreen}{\translate{Fact}{Fakt} \usenumberArabic{facts}:}}
|
||||
\newcommand{\inlineproposition}{\bg{Cyan}{Proposition \usenumberArabic{propositions}:}}
|
||||
\newcommand{\inlineremark}{\bg{green}{\translate{Remark}{Bemerkung} \usenumberArabic{remarks}:}}
|
||||
\newcommand{\inlineex}{\bg{gray}{\translate{Example}{Beispiel}\usenumberArabic{examples}:}}
|
||||
\newcommand{\inlinedef}{\bg{blue}{Definition\usenumberArabic{definitions}:}}
|
||||
\newcommand{\inlineformula}{\bg{red}{\translate{Formula}{Formel}\usenumberArabic{formulas}:}}
|
||||
\newcommand{\inlinelemma}{\bg{Aquamarine}{Lemma\usenumberArabic{lemmas}:}}
|
||||
\newcommand{\inlinetheorem}{\bg{ForestGreen}{\translate{Theorem}{\theoremde}\usenumberArabic{theorems}:}}
|
||||
\newcommand{\inlineaxiom}{\bg{JungleGreen}{Axiom\usenumberArabic{axioms}:}}
|
||||
\newcommand{\inlinecorollary}{\bg{teal}{\translate{Corollary}{Korollar}\usenumberArabic{corollaries}:}}
|
||||
\newcommand{\inlinefact}{\bg{SeaGreen}{\translate{Fact}{Fakt}\usenumberArabic{facts}:}}
|
||||
\newcommand{\inlineproposition}{\bg{Cyan}{Proposition\usenumberArabic{propositions}:}}
|
||||
\newcommand{\inlineremark}{\bg{green}{\translate{Remark}{Bemerkung}\usenumberArabic{remarks}:}}
|
||||
\newcommand{\inlineproof}{\bg{magenta}{\translate{Proof}{Beweis}:}}
|
||||
|
||||
% Enhanced inline environments
|
||||
\newcommand{\fancyex}[1]{\bg{gray}{\translate{Example}{Beispiel} \usenumberArabic{examples}:} \textit{(#1)}}
|
||||
\newcommand{\fancydef}[1]{\bg{blue}{Definition \usenumberArabic{definitions}:} \textit{(#1)}}
|
||||
\newcommand{\fancyformula}[1]{\bg{red}{\translate{Formula}{Formel} \usenumberArabic{formulas}:} \textit{(#1)}}
|
||||
\newcommand{\fancylemma}[1]{\bg{Aquamarine}{Lemma \usenumberArabic{lemmas}:} \textit{(#1)}}
|
||||
\newcommand{\fancytheorem}[1]{\bg{ForestGreen}{\translate{Theorem}{\theoremde} \usenumberArabic{theorems}:} \textit{(#1)}}
|
||||
\newcommand{\fancyaxiom}[1]{\bg{JungleGreen}{Axiom \usenumberArabic{axioms}:} \textit{(#1)}}
|
||||
\newcommand{\fancycorollary}[1]{\bg{teal}{\translate{Corollary}{Korollar} \usenumberArabic{corollaries}:} \textit{(#1)}}
|
||||
\newcommand{\fancyfact}[1]{\bg{SeaGreen}{\translate{Fact}{Fakt} \usenumberArabic{facts}:} \textit{(#1)}}
|
||||
\newcommand{\fancyproposition}[1]{\bg{Cyan}{Proposition \usenumberArabic{propositions}:} \textit{(#1)}}
|
||||
\newcommand{\fancyremark}[1]{\bg{green}{\translate{Remark}{Bemerkung} \usenumberArabic{remarks}:} \textit{(#1)}}
|
||||
\newcommand{\fancyex}[1]{\bg{gray}{\translate{Example}{Beispiel}\usenumberArabic{examples}:} \textit{(#1)}}
|
||||
\newcommand{\fancydef}[1]{\bg{blue}{Definition\usenumberArabic{definitions}:} \textit{(#1)}}
|
||||
\newcommand{\fancyformula}[1]{\bg{red}{\translate{Formula}{Formel}\usenumberArabic{formulas}:} \textit{(#1)}}
|
||||
\newcommand{\fancylemma}[1]{\bg{Aquamarine}{Lemma\usenumberArabic{lemmas}:} \textit{(#1)}}
|
||||
\newcommand{\fancytheorem}[1]{\bg{ForestGreen}{\translate{Theorem}{\theoremde}\usenumberArabic{theorems}:} \textit{(#1)}}
|
||||
\newcommand{\fancyaxiom}[1]{\bg{JungleGreen}{Axiom\usenumberArabic{axioms}:} \textit{(#1)}}
|
||||
\newcommand{\fancycorollary}[1]{\bg{teal}{\translate{Corollary}{Korollar}\usenumberArabic{corollaries}:} \textit{(#1)}}
|
||||
\newcommand{\fancyfact}[1]{\bg{SeaGreen}{\translate{Fact}{Fakt}\usenumberArabic{facts}:} \textit{(#1)}}
|
||||
\newcommand{\fancyproposition}[1]{\bg{Cyan}{Proposition\usenumberArabic{propositions}:} \textit{(#1)}}
|
||||
\newcommand{\fancyremark}[1]{\bg{green}{\translate{Remark}{Bemerkung}\usenumberArabic{remarks}:} \textit{(#1)}}
|
||||
\newcommand{\fancyproof}[1]{\bg{magenta}{\translate{Proof}{Beweis}: \textit{(#1)}}}
|
||||
|
||||
% short environments (abbreviated)
|
||||
\newcommand{\shortex}{\bg{gray}{\translate{Ex}{Bsp} \usenumberArabic{examples}:}}
|
||||
\newcommand{\shortdef}{\bg{blue}{D \usenumberArabic{definitions}:}}
|
||||
\newcommand{\short}{\bg{red}{F \usenumberArabic{formulas}:}}
|
||||
\newcommand{\shortlemma}{\bg{Aquamarine}{L \usenumberArabic{lemmas}:}}
|
||||
\newcommand{\shorttheorem}{\bg{ForestGreen}{\translate{T}{\StrMid{\theoremde}{1}{1}} \usenumberArabic{theorems}:}}
|
||||
\newcommand{\shortaxiom}{\bg{JungleGreen}{A \usenumberArabic{axioms}:}}
|
||||
\newcommand{\shortcorollary}{\bg{teal}{\translate{C}{K} \usenumberArabic{corollaries}:}}
|
||||
\newcommand{\shortfact}{\bg{SeaGreen}{F \usenumberArabic{facts}:}}
|
||||
\newcommand{\shortproposition}{\bg{Cyan}{P \usenumberArabic{propositions}:}}
|
||||
\newcommand{\shortremark}{\bg{green}{\tr{R}{B} \usenumberArabic{remarks}:}}
|
||||
\newcommand{\shortex}{\bg{gray}{\translate{Ex}{Bsp}\usenumberArabic{examples}:}}
|
||||
\newcommand{\shortdef}{\bg{blue}{D\usenumberArabic{definitions}:}}
|
||||
\newcommand{\short}{\bg{red}{F\usenumberArabic{formulas}:}}
|
||||
\newcommand{\shortlemma}{\bg{Aquamarine}{L\usenumberArabic{lemmas}:}}
|
||||
\newcommand{\shorttheorem}{\bg{ForestGreen}{\translate{T}{\StrMid{\theoremde}{1}{1}}\usenumberArabic{theorems}:}}
|
||||
\newcommand{\shortaxiom}{\bg{JungleGreen}{A\usenumberArabic{axioms}:}}
|
||||
\newcommand{\shortcorollary}{\bg{teal}{\translate{C}{K}\usenumberArabic{corollaries}:}}
|
||||
\newcommand{\shortfact}{\bg{SeaGreen}{F\usenumberArabic{facts}:}}
|
||||
\newcommand{\shortproposition}{\bg{Cyan}{P\usenumberArabic{propositions}:}}
|
||||
\newcommand{\shortremark}{\bg{green}{\tr{R}{B}\usenumberArabic{remarks}:}}
|
||||
\newcommand{\shortproof}{\bg{magenta}{\translate{Proof}{Beweis}:}}
|
||||
|
||||
% Enhanced short environments (abbreviated)
|
||||
|
||||
Reference in New Issue
Block a user