From 1b9f0e516f2fb836504336ba3405007b6823e85d Mon Sep 17 00:00:00 2001
From: Janis Hutz <development@janishutz.com>
Date: Sun, 22 Feb 2026 12:15:52 +0100
Subject: [PATCH] [General] Fix some issues

---
 config/main.sty       |  4 ++--
 janishutz-helpers.tex | 22 +++++++++++++++++++---
 src/style/spacing.sty | 18 +++++++++++++++++-
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/config/main.sty b/config/main.sty
index c17caea..6e0e211 100644
--- a/config/main.sty
+++ b/config/main.sty
@@ -13,8 +13,8 @@
 % - #1 is the name of the descriptor
 % - #2 is the number (correctly rendered according to settings and preceded with space if not disabled)
 % - #3 is the name passed (non-empty asserted)
-\newcommand{\shortDescriptorTemplate}[3]{\bg{#1color}{\shortNamingTranslate{#1} #2} \textit{(#3)}\ }
-\newcommand{\inlineDescriptorTemplate}[3]{\bg{#1color}{\namingTranslate{#1} #2}: \textit{(#3)}\ }
+\newcommand{\shortDescriptorTemplate}[3]{\bg{#1color}{\shortNamingTranslate{#1} #2} \textit{(#3)}}
+\newcommand{\inlineDescriptorTemplate}[3]{\bg{#1color}{\namingTranslate{#1} #2}: \textit{(#3)}}
 
 % These are used if no name is provided and argument #4 from above is the missing argument
 \newcommand{\anonymousShortDescriptorTemplate}[2]{\bg{#1color}{\shortNamingTranslate{#1} #2}\ }
diff --git a/janishutz-helpers.tex b/janishutz-helpers.tex
index 5693743..25996ca 100644
--- a/janishutz-helpers.tex
+++ b/janishutz-helpers.tex
@@ -108,8 +108,8 @@
 % - #1 is the name of the descriptor
 % - #2 is the number (correctly rendered according to settings and preceded with space if not disabled)
 % - #3 is the name passed (non-empty asserted)
-\newcommand{\shortDescriptorTemplate}[3]{\bg{#1color}{\shortNamingTranslate{#1} #2} \textit{(#3)}\ }
-\newcommand{\inlineDescriptorTemplate}[3]{\bg{#1color}{\namingTranslate{#1} #2}: \textit{(#3)}\ }
+\newcommand{\shortDescriptorTemplate}[3]{\bg{#1color}{\shortNamingTranslate{#1} #2} \textit{(#3)}}
+\newcommand{\inlineDescriptorTemplate}[3]{\bg{#1color}{\namingTranslate{#1} #2}: \textit{(#3)}}
 
 % These are used if no name is provided and argument #4 from above is the missing argument
 \newcommand{\anonymousShortDescriptorTemplate}[2]{\bg{#1color}{\shortNamingTranslate{#1} #2}\ }
@@ -1236,6 +1236,10 @@
     \belowdisplayskip 1pt plus 2pt minus 1pt
     \abovedisplayshortskip -10pt
     \belowdisplayshortskip 1pt plus 2pt minus 1pt
+    \floatsep 1pt plus 2pt minus 1pt
+    \intextsep 1pt plus 2pt minus 1pt
+    \textfloatsep 1pt plus 2pt minus 1pt
+    \abovecaptionskip 2pt
     \setlist{noitemsep,topsep=1pt,partopsep=0pt}
 }
 \newcommand{\smallverticalspacing}{
@@ -1243,6 +1247,10 @@
     \belowdisplayskip 5pt plus 5pt minus 2pt
     \abovedisplayshortskip -5pt
     \belowdisplayshortskip 3pt plus 4pt minus 2pt
+    \floatsep 4pt plus 3pt minus 2pt
+    \intextsep 4pt plus 3pt minus 2pt
+    \textfloatsep 4pt plus 3pt minus 2pt
+    \abovecaptionskip 4pt
     \setlist{itemsep=2pt,topsep=2pt,partopsep=1pt}
 }
 \newcommand{\mediumverticalspacing}{
@@ -1250,13 +1258,21 @@
     \belowdisplayskip 9pt plus 6pt minus 3pt
     \abovedisplayshortskip 0pt
     \belowdisplayshortskip 5pt plus 4pt minus 2pt
+    \floatsep 7pt plus 4pt minus 3pt
+    \intextsep 7pt plus 4pt minus 3pt
+    \textfloatsep 7pt plus 4pt minus 3pt
+    \abovecaptionskip 7pt
     \setlist{itemsep=4pt,topsep=4pt,partopsep=2pt}
 }
 \newcommand{\largeverticalspacing}{
-    \abovedisplayskip 13pt plus 3pt minus 1pt
+    \abovedisplayskip 13pt plus 5pt minus 4pt
     \belowdisplayskip 15pt plus 9pt minus 6pt
     \abovedisplayshortskip 5pt plus 2pt minus 3pt
     \belowdisplayshortskip 7pt plus 5pt minus 2pt
+    \floatsep 12pt plus 5pt minus 4pt
+    \intextsep 12pt plus 5pt minus 4pt
+    \textfloatsep 12pt plus 5pt minus 4pt
+    \abovecaptionskip 10pt
     \setlist{itemsep=6pt,topsep=6pt,partopsep=2pt}
 }
 
diff --git a/src/style/spacing.sty b/src/style/spacing.sty
index fa39caf..8f149bb 100644
--- a/src/style/spacing.sty
+++ b/src/style/spacing.sty
@@ -3,6 +3,10 @@
     \belowdisplayskip 1pt plus 2pt minus 1pt
     \abovedisplayshortskip -10pt
     \belowdisplayshortskip 1pt plus 2pt minus 1pt
+    \floatsep 1pt plus 2pt minus 1pt
+    \intextsep 1pt plus 2pt minus 1pt
+    \textfloatsep 1pt plus 2pt minus 1pt
+    \abovecaptionskip 2pt
     \setlist{noitemsep,topsep=1pt,partopsep=0pt}
 }
 \newcommand{\smallverticalspacing}{
@@ -10,6 +14,10 @@
     \belowdisplayskip 5pt plus 5pt minus 2pt
     \abovedisplayshortskip -5pt
     \belowdisplayshortskip 3pt plus 4pt minus 2pt
+    \floatsep 4pt plus 3pt minus 2pt
+    \intextsep 4pt plus 3pt minus 2pt
+    \textfloatsep 4pt plus 3pt minus 2pt
+    \abovecaptionskip 4pt
     \setlist{itemsep=2pt,topsep=2pt,partopsep=1pt}
 }
 \newcommand{\mediumverticalspacing}{
@@ -17,12 +25,20 @@
     \belowdisplayskip 9pt plus 6pt minus 3pt
     \abovedisplayshortskip 0pt
     \belowdisplayshortskip 5pt plus 4pt minus 2pt
+    \floatsep 7pt plus 4pt minus 3pt
+    \intextsep 7pt plus 4pt minus 3pt
+    \textfloatsep 7pt plus 4pt minus 3pt
+    \abovecaptionskip 7pt
     \setlist{itemsep=4pt,topsep=4pt,partopsep=2pt}
 }
 \newcommand{\largeverticalspacing}{
-    \abovedisplayskip 13pt plus 3pt minus 1pt
+    \abovedisplayskip 13pt plus 5pt minus 4pt
     \belowdisplayskip 15pt plus 9pt minus 6pt
     \abovedisplayshortskip 5pt plus 2pt minus 3pt
     \belowdisplayshortskip 7pt plus 5pt minus 2pt
+    \floatsep 12pt plus 5pt minus 4pt
+    \intextsep 12pt plus 5pt minus 4pt
+    \textfloatsep 12pt plus 5pt minus 4pt
+    \abovecaptionskip 10pt
     \setlist{itemsep=6pt,topsep=6pt,partopsep=2pt}
 }