From 854e58562c53db186600a8fa2dc0b55ab957c0ff Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Thu, 14 Nov 2024 07:05:29 +0100
Subject: [PATCH] Fix \DeclareHyphenationExceptions with polyglossia and
 language variants (#1381)

---
 doc/latex/biblatex/CHANGES.md   | 1 +
 doc/latex/biblatex/biblatex.tex | 1 +
 tex/latex/biblatex/biblatex.sty | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/doc/latex/biblatex/CHANGES.md b/doc/latex/biblatex/CHANGES.md
index a0c99a1a6..6705ac974 100644
--- a/doc/latex/biblatex/CHANGES.md
+++ b/doc/latex/biblatex/CHANGES.md
@@ -6,6 +6,7 @@
   `\mkcomprange` or `\mkseqrange` (or their starred counterpart, respectively)
   depending on the `citepagerange` value.
 - Use `\mkautorange` in standard styles.
+- Fix `\DeclareHyphenationExceptions` with polyglossia and language variants.
 
 # RELEASE NOTES FOR VERSION 3.20
 - Added new option settings `minyearinit` and `minyearfull` for
diff --git a/doc/latex/biblatex/biblatex.tex b/doc/latex/biblatex/biblatex.tex
index f6d11c99c..706f25032 100644
--- a/doc/latex/biblatex/biblatex.tex
+++ b/doc/latex/biblatex/biblatex.tex
@@ -15081,6 +15081,7 @@ \section{Revision History}
 \item Added option \opt{citepagerange} to customize the format of page ranges\see{use:opt:pre:gen}
 \item Added \cmd{mkautorange} and \cmd{mkautorange*} which forwards to \cmd{mknormrange}, \cmd{mkcomprange} or \cmd{mkseqrange} (or their starred counterpart, respectively) depending on the \opt{citepagerange} value\see{aut:aux:msc}
 \item Use \cmd{mkautorange} in standard styles.
+\item Fix \cmd{DeclareHyphenationExceptions} with \sty{polyglossia} and language variants.
 \end{release}
 \begin{release}{3.20}{2024-03-22}
 \item Added new \opt{uniquename} options \see{use:opt:pre:int}
diff --git a/tex/latex/biblatex/biblatex.sty b/tex/latex/biblatex/biblatex.sty
index 6495db6b4..ca0aea13b 100644
--- a/tex/latex/biblatex/biblatex.sty
+++ b/tex/latex/biblatex/biblatex.sty
@@ -562,6 +562,9 @@
     {\ifundef\xpg@ifdefined
        {}
        {\def\blx@ifhyphenationundef#1#2#3{\xpg@ifdefined{#1}{#3}{#2}}}%
+     \ifundef\pghyphenation
+       {}
+       {\def\blx@hyphexcept#1#2{\pghyphenation{#1}{#2}}}%
      % This is required for languages which are never explicitly selected
      % \xpg@bloaded is not defined in polyglossia < v1.45
      \ifundef\xpg@bloaded