update indentation, colors and fix linting

georglauterbach · Jul 26, 2023 · 70428d6 · 70428d6
1 parent a4d18e4
commit 70428d6
Show file tree

Hide file tree

Showing 12 changed files with 114 additions and 159 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -9,17 +9,5 @@ root = true
 end_of_line          = lf
 insert_final_newline = true
 charset              = utf-8
-indent_style         = tab
-indent_size          = 4
-
-# Text
-
-[*.{md,txt}]
-indent_style = space
-indent_size = 2
-
-# YAML & JSON
-
-[*.{yml,yaml,json,jsonc}]
-indent_style = space
-indent_size = 2
+indent_style         = space
+indent_size          = 2
diff --git a/README.md b/README.md
@@ -14,7 +14,8 @@ The order is already given by the order of the files under `include/`. Files und
 \input{tex/include/01-language_german}
 % import this one too
 \input{tex/include/02-generic}
-
+% ...
+\input{tex/include/99-last}
 % ...
 
 \begin{document}

diff --git a/colors.jsonc b/colors.jsonc
diff --git a/include/02-generic.tex b/include/02-generic.tex
@@ -11,19 +11,19 @@
 % ? >> formatting
 
 \usepackage{%
-	float,
-	microtype,
-	booktabs,
-	enumitem,
-	emptypage,
-	subcaption,
-	multicol,
-	blindtext,
-	titlepic,
-	tabularx,
-	makecell,
-	listliketab,
-	tabto,
+  float,
+  microtype,
+  booktabs,
+  enumitem,
+  emptypage,
+  subcaption,
+  multicol,
+  blindtext,
+  titlepic,
+  tabularx,
+  makecell,
+  listliketab,
+  tabto,
 }
 
 \newcommand{\ctab}{\tab\hspace{-5em}}
@@ -45,9 +45,9 @@
 \settitlemarks{section,subsection}
 
 \newpagestyle{fancy}{%
-	\headrule%
-	\sethead{\thesection.~\sectiontitle}{}{\thesubsection.~\subsectiontitle}
-	\setfoot{}{\thepage}{}%
+  \headrule%
+  \sethead{\thesection.~\sectiontitle}{}{\thesubsection.~\subsectiontitle}
+  \setfoot{}{\thepage}{}%
 }
 
 % ? >> graphics

diff --git a/include/03-font.tex b/include/03-font.tex
@@ -5,17 +5,17 @@
 %   └───────────────────────────────────────────────────────┘
 
 \usepackage{%
-	fontspec,
-	textcomp,
-	verbatim,
-	fancyvrb,
-	lmodern, % Latin Modern font
+  fontspec,
+  textcomp,
+  verbatim,
+  fancyvrb,
+  lmodern, % Latin Modern font
 }
 
 \setmonofont[%
-	Contextuals={Alternate},
-	Scale=MatchLowercase,
-	BoldFont={Fira Code Bold},
-	ItalicFont={Fira Code},
-	BoldItalicFont={Fira Code Bold}
+  Contextuals={Alternate},
+  Scale=MatchLowercase,
+  BoldFont={Fira Code Bold},
+  ItalicFont={Fira Code},
+  BoldItalicFont={Fira Code Bold}
 ]{Fira Code}
diff --git a/include/05-lecture.tex b/include/05-lecture.tex
@@ -8,23 +8,23 @@
 \newcounter{lecture}
 
 \newcommand{\lecture}[1]{
-	\refstepcounter{lecture}
+  \refstepcounter{lecture}
 
-	\vspace{.5em}
-	\begin{center}
-		\begin{minipage}{7cm}
-			\hrule
-			\vspace*{.5em}
-			\begin{center}
-				\ifenglish%
-					L \thelecture~~//~~#1
-				\else
-					VL \thelecture~~//~~#1
-				\fi
-			\end{center}
-			\vspace{.4em}
-			\hrule
-		\end{minipage}
-	\end{center}
-	\vspace*{.5em}
+  \vspace{.5em}
+  \begin{center}
+    \begin{minipage}{7cm}
+      \hrule
+      \vspace*{.5em}
+      \begin{center}
+        \ifenglish%
+          L \thelecture~~//~~#1
+        \else
+          VL \thelecture~~//~~#1
+        \fi
+      \end{center}
+      \vspace{.4em}
+      \hrule
+    \end{minipage}
+  \end{center}
+  \vspace*{.5em}
 }
diff --git a/include/21-code.tex b/include/21-code.tex
@@ -13,4 +13,4 @@
 \newmintinline[mintCpp]{cpp}{breaklines}
 \newmintinline[mintRust]{rust}{breaklines}
 
-\renewcommand{\tt}[1]{\texttt{#1}}
+\renewcommand{\code}[1]{\texttt{#1}}
diff --git a/include/23-colors.tex b/include/23-colors.tex
@@ -9,32 +9,35 @@
 
 % base colors
 
-\definecolor{BaseBlack}       {RGB}  {  0,   0,   0}
-\definecolor{BaseGrey}        {RGB}  {242, 242, 242}
-\definecolor{BaseWhite}       {RGB}  {255, 255, 255}
+\definecolor{BaseBlack}       {HTML} {000000}
+\definecolor{BaseGrey}        {HTML} {F2F2F2}
+\definecolor{BaseWhite}       {HTML} {FFFFFF}
 
 % scheme 1
-
-\definecolor{RichBlackFOGRA}  {RGB}  {  0,  18,  25}
-\definecolor{BlueSapphire}    {RGB}  {  0,  95, 115}
-\definecolor{ViridianGreen}   {RGB}  { 10, 147, 150}
-\definecolor{MiddleBlueGreen} {RGB}  {148, 210, 189}
-\definecolor{MediumChampagne} {RGB}  {233, 216, 166}
-\definecolor{Gamboge}         {RGB}  {238, 155,   0}
-\definecolor{AlloyOrange}     {RGB}  {202, 103,   2}
-\definecolor{Mahogany}        {RGB}  {187,  62,   3}
-\definecolor{Rufous}          {RGB}  {174,  32,  18}
-\definecolor{RubyRed}         {RGB}  {155,  34,  38}
+% https://coolors.co/001219-005f73-0a9396-94d2bd-e9d8a6-ee9b00-ca6702-bb3e03-ae2012-9b2226
+
+\definecolor{RichBlackFOGRA}  {HTML} {001219}
+\definecolor{BlueSapphire}    {HTML} {005f73}
+\definecolor{ViridianGreen}   {HTML} {0A9396}
+\definecolor{MiddleBlueGreen} {HTML} {94D2BD}
+\definecolor{MediumChampagne} {HTML} {E9D8A6}
+\definecolor{Gamboge}         {HTML} {EE9B00}
+\definecolor{AlloyOrange}     {HTML} {CA6702}
+\definecolor{Mahogany}        {HTML} {BB3E03}
+\definecolor{Rufous}          {HTML} {AE2012}
+\definecolor{RubyRed}         {HTML} {9B2226}
 
 % scheme 2
+% https://coolors.co/e63946-f1faee-a8dadc-457b9d-1d3557
 
-\definecolor{ImperialRed}     {RGB}  {230,  57,  70}
-\definecolor{Honeydew}        {RGB}  {241, 250, 238}
-\definecolor{PowderBlue}      {RGB}  {168, 218, 220}
-\definecolor{CeladonBlue}     {RGB}  { 69, 123, 157}
-\definecolor{PrussianBlue}    {RGB}  { 29,  53,  87}
+\definecolor{ImperialRed}     {HTML} {E63946}
+\definecolor{Honeydew}        {HTML} {F1FAEE}
+\definecolor{PowderBlue}      {HTML} {A8DADC}
+\definecolor{CeladonBlue}     {HTML} {457B9D}
+\definecolor{PrussianBlue}    {HTML} {1D3557}
 
 % scheme 3 | IBM Color Blind Pallette - Extended
+% https://coolors.co/648fff-785ef0-dc267f-fe6100-ffb000-00ffa6
 
 \definecolor{CornflowerBlue}  {HTML} {648FFF}
 \definecolor{MediumSlateBlue} {HTML} {785EF0}

diff --git a/include/24-units.tex b/include/24-units.tex
@@ -7,19 +7,15 @@
 \usepackage{siunitx}
 
 \ifenglish%
-
   \sisetup{%
-  	locale={US},
-  	input-decimal-markers={.},
-  	group-separator={\,}
+    locale={US},
+    input-decimal-markers={.},
+    group-separator={\,}
   }
-
-\else
-
+\else%
   \sisetup{%
-  	locale={DE},
-  	input-decimal-markers={\,},
-  	group-separator={.}
+    locale={DE},
+    input-decimal-markers={\,},
+    group-separator={.}
   }
-
-\fi
+\fi%
diff --git a/include/30-math.tex b/include/30-math.tex
@@ -7,24 +7,24 @@
 % ? >> packages
 
 \usepackage{%
-	amsmath,
-	amsfonts,
-	mathtools,
-	amssymb,
-	mathrsfs,
-	mathtools
+  amsmath,
+  amsfonts,
+  mathtools,
+  amssymb,
+  mathrsfs,
+  mathtools
 }
 
 \usepackage{%
-	cancel,
-	bm,
-	stmaryrd,
-	colonequals,
-	proof,
-	centernot,
-	relsize,
-	rotating,
-	tabstackengine
+  cancel,
+  bm,
+  stmaryrd,
+  colonequals,
+  proof,
+  centernot,
+  relsize,
+  rotating,
+  tabstackengine
 }
 
 \TABstackMath%
@@ -46,9 +46,7 @@
 
 % ? >> fixes
 
-\def\thm@space@setup{%
-	\thm@preskip=\parskip\thm@postskip=0pt
-}
+\def\thm@space@setup{\thm@preskip=\parskip\thm@postskip=0pt}
 \makeatother
 
 % >> absolute signs

diff --git a/include/42-frames.tex b/include/42-frames.tex
@@ -13,17 +13,17 @@
 \framesloadedtrue%
 
 \usepackage[%
-	framemethod=TikZ,
-	roundcorner=2pt,
-	hidealllines=false,
-	frametitlerule=false,
-	skipabove=\baselineskip,
-	skipbelow=\baselineskip,
-	frametitleaboveskip=7pt,
-	frametitlebelowskip=7pt,
-	innertopmargin=10pt,
-	innerbottommargin=10pt,
-	]{mdframed}%
+  framemethod=TikZ,
+  roundcorner=2pt,
+  hidealllines=false,
+  frametitlerule=false,
+  skipabove=\baselineskip,
+  skipbelow=\baselineskip,
+  frametitleaboveskip=7pt,
+  frametitlebelowskip=7pt,
+  innertopmargin=10pt,
+  innerbottommargin=10pt,
+]{mdframed}%
 
 \mdfdefinestyle{definition}{linewidth=.5pt,linecolor=CornflowerBlue,frametitlebackgroundcolor={CornflowerBlue!20}}
 \mdfdefinestyle{notation}{linewidth=.5pt,linecolor=SelectiveYellow,frametitlebackgroundcolor={SelectiveYellow!20}}

diff --git a/include/99-last.tex b/include/99-last.tex
@@ -68,28 +68,28 @@
 
 \ifframesloaded%
 
-\let\oldLemma\lemma
+\let\oldLemma\lemma%
 \renewcommand{\lemma}{\crefalias{definition}{lemma}\oldLemma}
 
-\let\oldAxiom\axiom
+\let\oldAxiom\axiom%
 \renewcommand{\axiom}{\crefalias{definition}{axiom}\oldAxiom}
 
-\let\oldNotation\notation
+\let\oldNotation\notation%
 \renewcommand{\notation}{\crefalias{definition}{notation}\oldNotation}
 
-\let\oldProblem\problem
+\let\oldProblem\problem%
 \renewcommand{\problem}{\crefalias{definition}{problem}\oldProblem}
 
-\let\oldTheorem\theorem
+\let\oldTheorem\theorem%
 \renewcommand{\theorem}{\crefalias{definition}{theorem}\oldTheorem}
 
-\let\oldCorollary\corollary
+\let\oldCorollary\corollary%
 \renewcommand{\corollary}{\crefalias{definition}{corollary}\oldCorollary}
 
-\let\oldProof\proof
+\let\oldProof\proof%
 \renewcommand{\proof}{\crefalias{definition}{proof}\oldProof}
 
-\let\oldExample\example
+\let\oldExample\example%
 \renewcommand{\example}{\crefalias{definition}{example}\oldExample}
 
 \fi% ifframesloaded