Unverified Commit 0777e61e authored by Vít Starý Novotný's avatar Vít Starý Novotný
Browse files

Hotfix biblatex v3.15a 

See https://github.com/plk/biblatex/issues/1058 and
https://tex.stackexchange.com/a/581469/70941. The hotfix should be
reverted after BibLaTeX v3.17.
parent ba2251a1

fithesis.dtx

+7 −5
Original line number Original line Diff line number Diff line
@@ -1527,15 +1527,17 @@ 
        \thesis@requireLocale{\thesis@locale}

        \thesis@requireLocale{\thesis@locale}

      \fi

      \fi

%    \end{macrocode}

%    \end{macrocode}

% Coerce LuaTeX into defining |\l@|\textit{locale} for

% Coerce Lua\TeX{} into defining |\l@|\textit{locale} for

% \textit{locale}s with known hyphenation patterns, unless

% \textit{locale}s with known hyphenation patterns, unless

% \textsf{babel} has been loaded. In that case

% \textsf{babel} or \textsf{polyglossia} have been loaded.

% |\l@|\textit{locale} has already been defined.

% In that case, |\l@|\textit{locale} has already been defined.

% \changes{v1.0.0}{2020/02/21}{Only load \textsf{babel} in

%   Lua\TeX{} if \textsf{polyglossia} has not been loaded yet.}

%    \begin{macrocode}

%    \begin{macrocode}

    \ifluatex

    \ifluatex

      \ltx@ifpackageloaded{babel}{}{

      \ltx@ifpackageloaded{babel}{}{

        % See <article.gmane.org/gmane.comp.tex.luatex.user/5680>

        \ltx@ifpackageloaded{polyglossia}{}{

        \RequirePackage[base]{babel}}

          \thesis@require{babel}}}

    \fi

    \fi

%    \end{macrocode}

%    \end{macrocode}

% Fix the value of the |\ifthesis@english| macro.

% Fix the value of the |\ifthesis@english| macro.

style/mu/base.dtx

+4 −0
Original line number Original line Diff line number Diff line
@@ -432,6 +432,10 @@ 
      \thesis@bibliography@setup{

      \thesis@bibliography@setup{

        style = iso-numeric,

        style = iso-numeric,

        sorting = none}

        sorting = none}

      % FIXME: This is a hotfix for biblatex.

      % It should be removed after v3.17 has been released.

      % See https://tex.stackexchange.com/a/581469/70941.

      \thesis@require{expl3}

      \thesis@require[

      \thesis@require[

        backend=biber,

        backend=biber,

        style=\thesis@bibliography@style,

        style=\thesis@bibliography@style,