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 1/2] 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

From 305d3510552fb9e8e628bf556422c1fe7b4c4eff Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Thu, 14 Nov 2024 07:06:46 +0100
Subject: [PATCH 2/2] Remove redundant hyphenation exceptions

They are all inherited by german.ldf
---
 tex/latex/biblatex/lbx/austrian.lbx     | 5 -----
 tex/latex/biblatex/lbx/naustrian.lbx    | 5 -----
 tex/latex/biblatex/lbx/ngerman.lbx      | 5 -----
 tex/latex/biblatex/lbx/nswissgerman.lbx | 5 -----
 tex/latex/biblatex/lbx/swissgerman.lbx  | 5 -----
 5 files changed, 25 deletions(-)

diff --git a/tex/latex/biblatex/lbx/austrian.lbx b/tex/latex/biblatex/lbx/austrian.lbx
index 39ee155aa..86e4c10a6 100644
--- a/tex/latex/biblatex/lbx/austrian.lbx
+++ b/tex/latex/biblatex/lbx/austrian.lbx
@@ -8,9 +8,4 @@
   january          = {{J\"anner}{J\"an\adddot}},
 }
 
-\DeclareHyphenationExceptions{%
-  Pa-tent-an-mel-dung
-  Pa-tent-an-meld
-}
-
 \endinput
diff --git a/tex/latex/biblatex/lbx/naustrian.lbx b/tex/latex/biblatex/lbx/naustrian.lbx
index bcd218185..bc742a02a 100644
--- a/tex/latex/biblatex/lbx/naustrian.lbx
+++ b/tex/latex/biblatex/lbx/naustrian.lbx
@@ -14,9 +14,4 @@
 % sectiontotals    = {{Paragrafen}{\S\S}},
 }
 
-\DeclareHyphenationExceptions{%
-  Pa-tent-an-mel-dung
-  Pa-tent-an-meld
-}
-
 \endinput
diff --git a/tex/latex/biblatex/lbx/ngerman.lbx b/tex/latex/biblatex/lbx/ngerman.lbx
index e8e26aedf..b760ed82e 100644
--- a/tex/latex/biblatex/lbx/ngerman.lbx
+++ b/tex/latex/biblatex/lbx/ngerman.lbx
@@ -13,9 +13,4 @@
 % sectiontotals    = {{Paragrafen}{\S\S}},
 }
 
-\DeclareHyphenationExceptions{%
-  Pa-tent-an-mel-dung
-  Pa-tent-an-meld
-}
-
 \endinput
diff --git a/tex/latex/biblatex/lbx/nswissgerman.lbx b/tex/latex/biblatex/lbx/nswissgerman.lbx
index f54a078b2..988b7fb97 100644
--- a/tex/latex/biblatex/lbx/nswissgerman.lbx
+++ b/tex/latex/biblatex/lbx/nswissgerman.lbx
@@ -22,9 +22,4 @@
 % sectiontotals    = {{Paragrafen}{\S\S}},
 }
 
-\DeclareHyphenationExceptions{%
-  Pa-tent-an-mel-dung
-  Pa-tent-an-meld
-}
-
 \endinput
diff --git a/tex/latex/biblatex/lbx/swissgerman.lbx b/tex/latex/biblatex/lbx/swissgerman.lbx
index f82ad9b05..82946b504 100644
--- a/tex/latex/biblatex/lbx/swissgerman.lbx
+++ b/tex/latex/biblatex/lbx/swissgerman.lbx
@@ -16,9 +16,4 @@
   countryuk        = {{Grossbritannien}{GB}},
 }
 
-\DeclareHyphenationExceptions{%
-  Pa-tent-an-mel-dung
-  Pa-tent-an-meld
-}
-
 \endinput