diff --git a/fithesis.dtx b/fithesis.dtx index 3cafacd93cfa6b92f9caa13d40317b60ce5dc246..dcbfcb0e3ee65dd73f8852505b4d89eddb8509c3 100644 --- a/fithesis.dtx +++ b/fithesis.dtx @@ -1527,15 +1527,17 @@ \thesis@requireLocale{\thesis@locale} \fi % \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 -% \textsf{babel} has been loaded. In that case -% |\l@|\textit{locale} has already been defined. +% \textsf{babel} or \textsf{polyglossia} have been loaded. +% 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} \ifluatex \ltx@ifpackageloaded{babel}{}{ - % See <article.gmane.org/gmane.comp.tex.luatex.user/5680> - \RequirePackage[base]{babel}} + \ltx@ifpackageloaded{polyglossia}{}{ + \thesis@require{babel}}} \fi % \end{macrocode} % Fix the value of the |\ifthesis@english| macro. diff --git a/style/mu/base.dtx b/style/mu/base.dtx index 51898073c7e753079e1a9d1b84b33969f02fed0d..12a29c5226c24bb7f1db3c26033b55f93a6916ee 100644 --- a/style/mu/base.dtx +++ b/style/mu/base.dtx @@ -432,6 +432,10 @@ \thesis@bibliography@setup{ style = iso-numeric, 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[ backend=biber, style=\thesis@bibliography@style,