Skip to content

Commit

Permalink
Fixing bugs
Browse files Browse the repository at this point in the history
- one related with marginfix package, removed from kaobook but who should stay
- one related to a sideref in a figure legend, which is not possible
  • Loading branch information
jhillairet committed May 14, 2023
1 parent a6cce59 commit 1911db6
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
8 changes: 4 additions & 4 deletions kao.sty
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@
\extrafloats{100} % Require more floats
\RequirePackage{marginnote} % Provides options for margin notes
%\RequirePackage{marginfix} % Make marginpars float freely; it should not be loaded as it prevents the marginnotes to stay aligned with the main text
\RequirePackage{marginfix} % Make marginpars float freely; it should not be loaded as it prevents the marginnotes to stay aligned with the main text
\RequirePackage{sidenotes} % Use sidenotes
\RequirePackage{chngcntr} % Reset counters at sections
Expand Down Expand Up @@ -564,9 +564,9 @@
\setlength\columnseprule{.4pt} % Set the width of vertical rules in tables
% The marginfix package prevents the margin notes to stay aligned with the main text, so it cannot be used. However, we define the \marginskip command, which is the only command we need from that package.
\newcommand\marginskip[1]{%
\marginpar{\@margin@par\vspace{#1 - \baselineskip}}% We subtract the \baselineskip that we have in margin pars.
}
%\newcommand\marginskip[1]{%
% \marginpar{\@margin@par\vspace{#1 - \baselineskip}}% We subtract the \baselineskip that we have in margin pars.
%}
\newlength{\kaomarginskipabove} % Specify the space above a marginfigure, margintable or marginlisting
\newlength{\kaomarginskipbelow} % Specify the space below a marginfigure, margintable or marginlisting
Expand Down
14 changes: 10 additions & 4 deletions main.tex
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
\documentclass[
a4paper, % Page size
fontsize=10pt, % Base font size
twoside=true, % Use different layouts for even and odd pages (in particular, if twoside=true, the margin column will be always on the outside)
%open=any, % If twoside=true, uncomment this to force new chapters to start on any page, not only on right (odd) pages
Expand All @@ -8,7 +9,13 @@
% NB JH 02/2022 : TexLive 2021 is necessary to compile correctly

% Choose the language
\usepackage[english]{babel} % Load characters and hyphenation
% Choose the language
\ifxetexorluatex
\usepackage{polyglossia}
\setmainlanguage{english}
\else
\usepackage[english]{babel} % Load characters and hyphenation
\fi
\usepackage[english=british]{csquotes} % English quotes

% Load the bibliography package
Expand All @@ -25,11 +32,10 @@
linkcolor=blue,
filecolor=magenta,
urlcolor=purple,
pdftitle={Overleaf Example},
pdftitle={Tokamak Dimensioning},
pdfpagemode=FullScreen,
}


%%%%%% Math packages
\usepackage{siunitx}

Expand Down Expand Up @@ -92,4 +98,4 @@

\input{sec_appendix.tex}

\end{document}
\end{document}
2 changes: 1 addition & 1 deletion sec_advisors.tex
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ \subsection{Line radiation}
\begin{center}
\includegraphics[width=1\textwidth]{figures/Puetterich_NF2010_Fig4 L_Z.png}
\end{center}
\caption{Cooling function ($L_Z$ of Tungsten as calculated in two different ways, from \sidecite{Puetterich2010}.}
\caption{Cooling function ($L_Z$ of Tungsten as calculated in two different ways, from \cite{Puetterich2010}.}
\label{fig:L_Z_W_Puetterich2010}
\end{figure}

Expand Down

0 comments on commit 1911db6

Please # to comment.