move to new figure spacing commands

Author: thomasWeise

bookbase

@@ -20,7 +20,7 @@ \chapter*{Preface}%
 This version may change since this book is, well, work in progress.
 The book is released under the \emph{Attribution-NonCommercial-ShareAlike~4.0 International license} (\href{http://creativecommons.org/licenses/by-nc-sa/4.0/}{\mbox{CC~BY-NC-SA~4.0}}).
 You can freely share it.
-You can also copy text or figures, as long as you cite the book as the original source, e.g., by using the following Bib\TeX:%
+You can also copy text or figures, as long as you cite the book as the original source~\cite{programmingWithPython}, e.g., by using the following Bib\TeX:%
 %
 \begin{lstlisting}[style=text_style]
 @book{programmingWithPython,

text/front/preface/preface.tex

@@ -16,28 +16,28 @@
 \label{fig:clone01welcomeToPycharm}%
 ]{\tightbox{\includegraphics[width=0.45\linewidth]{\currentDir/clone01welcomeToPycharm}}}%
 %
-\strut\hfill\strut%
+\floatSep%
 %
 \subfloat[][%
 Selecting \menu{URL:} \expandafter\url{\programmingWithPythonCodeRepo} and a reasonable destination \menu{Directory:} in the next dialog, then click \menu{Clone}.%
 \label{fig:clone02selectRepoAndDestination}%
 ]{\tightbox{\includegraphics[width=0.45\linewidth]{\currentDir/clone02selectRepoAndDestination}}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 Wait while \pycharm\ is cloning (downloading) the repository.%
 \label{fig:clone03cloning}%
 ]{\tightbox{\includegraphics[width=0.45\linewidth]{\currentDir/clone03cloning}}}%
 %
-\strut\hfill\strut%
+\floatSep%
 %
 \subfloat[][%
 If asked, click \menu{Trust Project} after confirming that you indeed downloaded the right code and if you trust our code.%
 \label{fig:clone04trustProject}%
 ]{\tightbox{\includegraphics[width=0.45\linewidth]{\currentDir/clone04trustProject}}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 The project with all the examples from this book is now downloaded and can be accessed in \pycharm.%

text/main/basics/gettingStarted/examples/examples.tex

@@ -17,22 +17,22 @@
 \label{fig:firstProgram01createPycharmProject}%
 ]{\tightbox{\includegraphics[width=0.47\linewidth]{\currentDir/firstProgram01createPycharmProject}}}%
 %
-\strut\hfill\strut%
+\floatSep%
 %
 \subfloat[][%
 Creating a new project in \pycharm, step~2: Make sure that \menu{Pure Python} is selected in the left pane, then select a name for the project (here: \directory{00\_veryFirstProject}), a directory location (some path on my \ubuntu\ machine, you will pick some other directory), and we select the current \python\ installation as \menu{Custom Environment}. %
 We finally click \menu{Create}.%
 \label{fig:firstProgram02createPycharmProject}%
 ]{\tightbox{\includegraphics[width=0.47\linewidth]{\currentDir/firstProgram02createPycharmProject}}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 The new and empty project has been created.%
 \label{fig:firstProgram03pycharmProjectCreated}%
 ]{\tightbox{\includegraphics[width=0.775\linewidth]{\currentDir/firstProgram03pycharmProjectCreated}}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 We create a new \python\ file within this project by right-clicking on the project folder \directory{00\_veryFirstProject} and selecting \menu{New>Python File}.%
@@ -52,14 +52,14 @@
 \label{fig:firstProgram05createPythonFile}%
 ]{\tightbox{\includegraphics[width=0.775\linewidth]{\currentDir/firstProgram05createPythonFile}}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 The new and empty file \directory{very\_first\_program.py} has been created in the project \directory{00\_veryFirstProject}.%
 \label{fig:firstProgram06pythonFileCreated}%
 ]{\tightbox{\includegraphics[width=0.775\linewidth]{\currentDir/firstProgram06pythonFileCreated}}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 We enter the text from \cref{lst:very_first_program}. \pycharm\ automatically saves it.%
@@ -83,7 +83,7 @@
 \label{fig:firstProgram08runProgram}%
 ]{\tightbox{\includegraphics[width=0.775\linewidth,trim={0 200px 0 0},clip]{\currentDir/firstProgram08runProgram}}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 And indeed, in the console pane at the bottom of the \pycharm\ window, the text \inQuotes{Hello World!} appears.%

text/main/basics/gettingStarted/firstProgram/firstProgram.tex

@@ -21,7 +21,7 @@
 For each \pgls{OS}, the installation steps and software availability may be different, so I cannot possibly cover them all.
 Personally, I strongly recommend using \linux~\cite{T1999TLE,B2022ELATCL,H2022LML} for programming, work, and research.
 If you are a student of computer science or any related field, then it is my personal opinion that you should get familiar with this operating system.
-Maybe you could start with the very easy-to-use \ubuntu\ \linux~\cite{CN2020ULB}.
+Maybe you could start with the very easy-to-use \ubuntu\ \linux~\cite{CN2020ULB,H2020ULU2E}.
 Either way, in the following, I will try to provide examples and instructions for both \ubuntu\ and the commercial Microsoft \windows~\cite{B2023W1IO} \pgls{OS}.
 
 Once the necessary software is installed, we will here also learn how to write and execute our very first small \python\ program in \cref{sec:ourFirstProgram}%.

text/main/basics/gettingStarted/gettingStarted.tex

@@ -4,39 +4,39 @@
 \centering%
 %
 \subfloat[][%
-Installing \pycharm\ using the snap install command in a \pgls{terminal} opened with \ubuntuTerminal.%
+Installing \pycharm\ using the \bashil{snap install} command in a \pgls{terminal} opened with \ubuntuTerminal.%
 \label{fig:installingPyCharmUbuntu01snapInstall}%
 ]{\includegraphics[width=0.7\linewidth]{\currentDir/installingPyCharmUbuntu01snapInstall}}%
 %
-\\[10pt]
+\floatRowSep%
 %
 \subfloat[][%
-This command requires the super user password.%
+This command requires the super user password, which we type in and then press~\keys{\enter}.%
 \label{fig:installingPyCharmUbuntu02sudo}%
 ]{\includegraphics[width=0.7\linewidth]{\currentDir/installingPyCharmUbuntu02sudo}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 The installation begins.%
 \label{fig:installingPyCharmUbuntu03snapInstall}%
 ]{\includegraphics[width=0.7\linewidth]{\currentDir/installingPyCharmUbuntu03snapInstall}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 The software package is downloaded.%
 \label{fig:installingPyCharmUbuntu04snapInstall}%
 ]{\includegraphics[width=0.7\linewidth]{\currentDir/installingPyCharmUbuntu04snapInstall}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 The package is installed.%
 \label{fig:installingPyCharmUbuntu05snapInstallFinished}%
 ]{\includegraphics[width=0.7\linewidth]{\currentDir/installingPyCharmUbuntu05snapInstallFinished}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 Open the launcher by pressing \OSwin\ and type in \bashil{pycharm} to find the \pycharm\ executable, then double-click it.%

text/main/basics/gettingStarted/installingPyCharm/installingPyCharmUbuntu/installingPyCharmUbuntu.tex

@@ -16,7 +16,7 @@
 \label{fig:installingPyCharmWindows02download}%
 ]{\tightbox{\includegraphics[width=0.47\linewidth]{\currentDir/installingPyCharmWindows02download}}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 Selecting the normal \windows\ installer for the \pycharm\ Community Edition.%
@@ -49,7 +49,7 @@
 \label{fig:installingPyCharmWindows06runInstaller}%
 ]{\tightbox{\includegraphics[width=0.47\linewidth]{\currentDir/installingPyCharmWindows06runInstaller}}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 The installer is starting.%
@@ -64,7 +64,7 @@
 ]{\tightbox{\includegraphics[height=3.75cm]{\currentDir/installingPyCharmWindows08runInstaller}}}%
 \hfill\strut%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 The welcome screen of the installer. We click \keys{Next}.%
@@ -85,7 +85,7 @@
 \label{fig:installingPyCharmWindows11installation}%
 ]{\tightbox{\includegraphics[height=4cm]{\currentDir/installingPyCharmWindows11installation}}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 The start menu folder choose dialog. We click \keys{Install}.%
@@ -115,35 +115,35 @@
 \ContinuedFloat%
 \centering%
 %
-\strut\hfill\strut%
+\floatSep%
 \subfloat[][%
 The welcome screen of \pycharm.%
 \label{fig:installingPyCharmWindows15running}%
 ]{\tightbox{\includegraphics[width=0.4\linewidth]{\currentDir/installingPyCharmWindows15running}}}%
 %
-\strut\hfill\strut\strut\hfill\strut%%
+\floatSep%%
 %
 \subfloat[][%
 We read the user agreement, confirm that we read it, and click \keys{Continue}.%
 \label{fig:installingPyCharmWindows16running}%
 ]{\tightbox{\includegraphics[width=0.4\linewidth]{\currentDir/installingPyCharmWindows16running}}}%
-\strut\hfill\strut%
+\floatSep%
 %
-\\[10pt]%
+\floatRowSep%
 %
-\strut\hfill\strut%
+\floatSep%
 \subfloat[][%
 We do not want to send any data and click \keys{Don't Send}.%
 \label{fig:installingPyCharmWindows17running}%
 ]{\tightbox{\includegraphics[width=0.4\linewidth]{\currentDir/installingPyCharmWindows17running}}}%
 %
-\strut\hfill\strut\strut\hfill\strut%%
+\floatSep%%
 %
 \subfloat[][%
 Finally, \pycharm\ is ready to use.%
 \label{fig:installingPyCharmWindows18running}%
 ]{\tightbox{\includegraphics[width=0.4\linewidth]{\currentDir/installingPyCharmWindows18running}}}%
-\strut\hfill\strut%
+\floatSep%
 %
 \caption[]{The installation steps of \pycharm\ under \windows~(continued).}%
 \label{fig:installingPyCharmWindowsC}%

text/main/basics/gettingStarted/installingPyCharm/installingPyCharmWindows/installingPyCharmWindows.tex

@@ -20,7 +20,7 @@
 \tightbox{\includegraphics[height=2.8cm]{\currentDir/installingPythonWindows03python}}%
 }%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][The install screen, where we click \keys{Get}.%
 \label{fig:installingPythonWindows04installGet}]{%
@@ -33,7 +33,7 @@
 \tightbox{\includegraphics[width=0.485\linewidth]{\currentDir/installingPythonWindows05downloading}}%
 }%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][The installation is finished.%
 \label{fig:installingPythonWindows06finished}]{%

text/main/basics/gettingStarted/installingPython/installingPythonWindows/installingPythonWindows.tex

@@ -11,15 +11,15 @@
 \label{fig:terminalPython1cd}%
 ]{\includegraphics[width=0.9\linewidth]{\currentDir/terminalPython1cd}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 Execute a \python\ program \inQuotes{program.py} by typing \bashil{python3 program.py} and hit \keys{\enter}. %
 In our case, the program is \inQuotes{very\_first\_program.py}.%
 \label{fig:terminalPython2python}%
 ]{\includegraphics[width=0.9\linewidth]{\currentDir/terminalPython2python}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 As expected, the text \inQuotes{Hello World!} appears in the \pgls{terminal}.%
@@ -38,7 +38,7 @@
 \label{fig:pycharmConsole1consoleButton}%
 ]{\tightbox{\includegraphics[width=0.76\linewidth]{\currentDir/pycharmConsole1consoleButton}}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 The \pycharm\ \python\ console is open.%
@@ -57,7 +57,7 @@
 \label{fig:pycharmConsole3writingCode}%
 ]{\tightbox{\includegraphics[width=0.76\linewidth]{\currentDir/pycharmConsole3writingCode}}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 And indeed, the output is \inQuotes{Hello World!}.%
@@ -76,21 +76,21 @@
 \label{fig:terminalConsole1python}%
 ]{\includegraphics[width=0.852\linewidth]{\currentDir/terminalConsole1python}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 The \python\ console opens in the \pgls{terminal}.%
 \label{fig:terminalConsole2pythonRunning}%
 ]{\includegraphics[width=0.852\linewidth]{\currentDir/terminalConsole2pythonRunning}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 We enter the \inQuotes{Hello World!} program from \cref{lst:very_first_program} and press \keys{\enter}.%
 \label{fig:terminalConsole3writingCode}%
 ]{\includegraphics[width=0.852\linewidth]{\currentDir/terminalConsole3writingCode}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 And indeed, the output is \inQuotes{Hello World!}.%
@@ -109,7 +109,7 @@
 \label{fig:terminalConsole5exit}%
 ]{\includegraphics[width=0.852\linewidth]{\currentDir/terminalConsole5exit}}%
 %
-\\[10pt]%
+\floatRowSep%
 %
 \subfloat[][%
 We are back in the normal \pgls{terminal}.%

text/main/basics/gettingStarted/pythonInTheTerminal/pythonInTheTerminal.tex

@@ -79,7 +79,7 @@
 ~~~~%
 }%
 %
-\strut\hfill\strut%
+\floatSep%
 %
 \subfloat[][%
 The truth table for the logical disjunction\pythonIdx{bool!disjunction} (\emph{logical or})\pythonIdx{or}: \pythonil{a or b}.%
@@ -102,7 +102,7 @@
 ~~~~%
 }%
 %
-\strut\hfill\strut%
+\floatSep%
 %
 \subfloat[][%
 The truth table for the logical negation\pythonIdx{bool!negation} (\emph{logical not}\pythonIdx{not}): \pythonil{not a}.%

text/main/basics/simpleDataTypesAndOperations/bool/bool.tex

@@ -20,7 +20,7 @@
 \includegraphics[width=0.23\linewidth]{\currentDir/assignment1}%
 \strut\hspace{1.2cm}\strut}%
 %
-\strut\hfill\strut%
+\floatSep%
 %
 \subfloat[][%
 \pythonil{int_var = (3 * int_var) + 1}%
@@ -40,7 +40,7 @@
 \includegraphics[width=0.23\linewidth]{\currentDir/assignment3}%
 \strut\hspace{1.2cm}\strut}%
 %
-\strut\hfill\strut%
+\floatSep%
 %
 \subfloat[][%
 \pythonil{new_var = float_var * int_var}%