diff --git a/docs/docs.pdf b/docs/docs.pdf index 1305fc3..6189939 100644 Binary files a/docs/docs.pdf and b/docs/docs.pdf differ diff --git a/docs/parts/reference.tex b/docs/parts/reference.tex index 53f420d..6099d76 100644 --- a/docs/parts/reference.tex +++ b/docs/parts/reference.tex @@ -40,6 +40,7 @@ \item \verb|\startDocument| Initialize the document. Has to be called after \verb|\begin{document}| \item \verb|\usetcolorboxes| Initialize tcolorboxes. In main body, if you want to use fancy boxes. (requires \texttt{most} or up) \item \verb|\translate|\{\textit{string}\}\{\textit{string}\} First \textit{string} is English, second \textit{string} is German. Switches automatically based on language selected + \item \verb|\tr|\{\textit{string}\}\{\textit{string}\} Shorthand for \verb|\translate| \end{itemize} \newpage @@ -339,6 +340,33 @@ See \ref{sec:counters} for a guide on how to change the current number. \verb|\shortaxiom| & \shortaxiom \\ \verb|\shortproof| & \shortproof \\ \end{tables} +\newpage + +\fhlc{Aquamarine}{Inline (Named)} +\begin{tables}{ll}{Command & Output} + \verb|\fancyex|\{\textit{string}\} & \fancyex{Exercise} \\ + \verb|\fancydef|\{\textit{string}\} & \fancydef{Definition} \\ + \verb|\fancytheorem|\{\textit{string}\} & \fancytheorem{Theorem} \\ + \verb|\fancylemma|\{\textit{string}\} & \fancylemma{Lemma} \\ + \verb|\fancycorollary|\{\textit{string}\} & \fancycorollary{Corollary} \\ + \verb|\fancyproposition|\{\textit{string}\} & \fancyproposition{Corollary} \\ + \verb|\fancyfact|\{\textit{string}\} & \fancyfact{Fact} \\ + \verb|\fancyaxiom|\{\textit{string}\} & \fancyaxiom{Axiom} \\ + \verb|\fancyproof|\{\textit{string}\} & \fancyproof{Proof} \\ +\end{tables} + +\fhlc{Aquamarine}{Shortened (Named)} +\begin{tables}{ll}{Command & Output} + \verb|\compactex|\{\textit{string}\} & \compactex{Exercise} \\ + \verb|\compactdef|\{\textit{string}\} & \compactdef{Definition} \\ + \verb|\compacttheorem|\{\textit{string}\} & \compacttheorem{Theorem} \\ + \verb|\compactlemma|\{\textit{string}\} & \compactlemma{Lemma} \\ + \verb|\compactcorollary|\{\textit{string}\} & \compactcorollary{Corollary} \\ + \verb|\compactproposition|\{\textit{string}\} & \compactproposition{Corollary} \\ + \verb|\compactfact|\{\textit{string}\} & \compactfact{Fact} \\ + \verb|\compactaxiom|\{\textit{string}\} & \compactaxiom{Axiom} \\ + \verb|\compactproof|\{\textit{string}\} & \compactproof{Proof} \\ +\end{tables} \subsubsection{Changing the counters} diff --git a/main/core.tex b/main/core.tex index 93311e1..773ff8b 100644 --- a/main/core.tex +++ b/main/core.tex @@ -128,3 +128,4 @@ % translate the document between two languages \newcommand{\translate}[2]{\ifnum\value{lang}<2{#1}\else{#2}\fi} +\newcommand{\tr}[2]{\translate{#1}{#2}} diff --git a/main/style/counters.tex b/main/style/counters.tex index 1a76b2f..a6b3265 100644 --- a/main/style/counters.tex +++ b/main/style/counters.tex @@ -99,16 +99,16 @@ overlay={\node[overlaystyle,draw=red!75!black,fill=red!75!black] at (frame.north \newcommand{\inlineproof}{\bg{magenta}{\translate{Proof}{Beweis}:}} % Enhanced inline environments -\newcommand{\compactexample}[1]{\bg{gray}{\translate{Example}{Beispiel} \usenumberArabic{examples}:} \textit{(#1)}} -\newcommand{\compactdefinition}[1]{\bg{blue}{Definition \usenumberArabic{definitions}:} \textit{(#1)}} -\newcommand{\compactformula}[1]{\bg{red}{\translate{Formula}{Formel} \usenumberArabic{formulas}:} \textit{(#1)}} -\newcommand{\compactlemma}[1]{\bg{Aquamarine}{Lemma \usenumberArabic{lemmas}:} \textit{(#1)}} -\newcommand{\compacttheorem}[1]{\bg{ForestGreen}{\translate{Theorem}{\theoremde} \usenumberArabic{theorems}:} \textit{(#1)}} -\newcommand{\compactaxiom}[1]{\bg{JungleGreen}{Axiom \usenumberArabic{axioms}:} \textit{(#1)}} -\newcommand{\compactcorollary}[1]{\bg{teal}{\translate{Corollary}{Korollar} \usenumberArabic{corollaries}:} \textit{(#1)}} -\newcommand{\compactfact}[1]{\bg{SeaGreen}{\translate{Fact}{Fakt} \usenumberArabic{facts}:} \textit{(#1)}} -\newcommand{\compactproposition}[1]{\bg{Cyan}{Proposition \usenumberArabic{propositions}:} \textit{(#1)}} -\newcommand{\compactproof}[1]{\bg{magenta}{\translate{Proof}{Beweis}: \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{\fancyproof}[1]{\bg{magenta}{\translate{Proof}{Beweis}: \textit{(#1)}}} % short environments (abbreviated) \newcommand{\shortex}{\textbf{\translate{Ex}{Bsp} \usenumberArabic{examples}:}} @@ -121,3 +121,15 @@ overlay={\node[overlaystyle,draw=red!75!black,fill=red!75!black] at (frame.north \newcommand{\shortfact}{\bg{SeaGreen}{F \usenumberArabic{facts}:}} \newcommand{\shortproposition}{\bg{Cyan}{P \usenumberArabic{propositions}:}} \newcommand{\shortproof}{\bg{magenta}{\translate{Proof}{Beweis}:}} + +% Enhanced short environments (abbreviated) +\newcommand{\compactex}[1]{\bg{gray}{\translate{Ex}{Bsp} \usenumberArabic{examples}:} \textit{(#1)}} +\newcommand{\compactdef}[1]{\bg{blue}{D \usenumberArabic{definitions}:} \textit{(#1)}} +\newcommand{\compactformula}[1]{\bg{red}{F \usenumberArabic{formulas}:} \textit{(#1)}} +\newcommand{\compactlemma}[1]{\bg{Aquamarine}{L \usenumberArabic{lemmas}:} \textit{(#1)}} +\newcommand{\compacttheorem}[1]{\bg{ForestGreen}{\translate{T}{\StrMid{\theoremde}{1}{1}} \usenumberArabic{theorems}:} \textit{(#1)}} +\newcommand{\compactaxiom}[1]{\bg{JungleGreen}{A \usenumberArabic{axioms}:} \textit{(#1)}} +\newcommand{\compactcorollary}[1]{\bg{teal}{\translate{C}{K} \usenumberArabic{corollaries}:} \textit{(#1)}} +\newcommand{\compactfact}[1]{\bg{SeaGreen}{F \usenumberArabic{facts}:} \textit{(#1)}} +\newcommand{\compactproposition}[1]{\bg{Cyan}{P \usenumberArabic{propositions}:} \textit{(#1)}} +\newcommand{\compactproof}[1]{\bg{magenta}{\translate{Proof}{Beweis}: \textit{(#1)}}}