csquotes (3dec19)

git-svn-id: svn://tug.org/texlive/trunk@53014 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 18 insertions, 10 deletions

diff --git a/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf b/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf
index 5044c7bac53..8c6842882b4 100644
--- a/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf
+++ b/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf
diff --git a/Master/texmf-dist/doc/latex/csquotes/csquotes.tex b/Master/texmf-dist/doc/latex/csquotes/csquotes.tex
index e08a46865eb..35665fb62c6 100644
--- a/Master/texmf-dist/doc/latex/csquotes/csquotes.tex
+++ b/Master/texmf-dist/doc/latex/csquotes/csquotes.tex
@@ -18,8 +18,8 @@
   url={http://www.ctan.org/pkg/csquotes/},
   author={Philipp Lehman, Joseph Wright},
   email={joseph.wright@morningstar2.co.uk},
-  revision={v5.2h},
-  date={2019-11-15}}
+  revision={v5.2i},
+  date={2019-12-02}}
 
 \hypersetup{%
   pdftitle={The csquotes Package},
@@ -1542,6 +1542,11 @@ The scope of these hooks must always be confined to a group.
 This revision history is a list of changes relevant to users of this package. Changes of a more technical nature which do not affect the user interface or the behavior of the package are not included in the list. If an entry in the revision history states that a feature has been \emph{extended}, this indicates a syntactically backwards compatible modification, such as the addition of an optional argument to an existing command. Entries stating that a feature has been \emph{modified}, \emph{renamed}, or \emph{removed} demand attention. They indicate a modification which may require changes to existing documents in some, hopefully rare, cases. The \opt{version} option from \secref{opt:opt} may be helpful in this case. The numbers on the right indicate the relevant section of this manual.
 
 \begin{changelog}
+
+\begin{release}{5.2i}{2019-12-02}
+\item Fix issue with \cmd{csq@mainlang}
+\end{release}
+
 \begin{release}{5.2h}{2019-11-15}
 \item Fix issue with \cmd{langname}
 \end{release}
diff --git a/Master/texmf-dist/tex/latex/csquotes/csq-compat.def b/Master/texmf-dist/tex/latex/csquotes/csq-compat.def
index 81a37db6b95..d7a6e504d96 100644
--- a/Master/texmf-dist/tex/latex/csquotes/csq-compat.def
+++ b/Master/texmf-dist/tex/latex/csquotes/csq-compat.def
@@ -1,5 +1,5 @@
 \ProvidesFile{csq-compat.def}
-  [2019-11-15 v5.2h csquotes backwards compatibility (JAW)]
+  [2019-12-02 v5.2i csquotes backwards compatibility (JAW)]
 
 \def\csq@getversion#1{%
   \expandafter\csq@getversion@i
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.def b/Master/texmf-dist/tex/latex/csquotes/csquotes.def
index a870f8a2c68..18479e170a3 100644
--- a/Master/texmf-dist/tex/latex/csquotes/csquotes.def
+++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.def
@@ -1,5 +1,5 @@
 \ProvidesFile{csquotes.def}
-  [2019-11-15 v5.2h csquotes generic definitions (JAW)]
+  [2019-12-02 v5.2i csquotes generic definitions (JAW)]
 
 % Set defaults
 
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
index 0d61ab8b237..9fa48021243 100644
--- a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
+++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
@@ -12,7 +12,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{csquotes}
-  [2019-11-15 v5.2h context-sensitive quotations (JAW)]
+  [2019-12-02 v5.2i context-sensitive quotations (JAW)]
 
 %% Compatibility and requirements
 
@@ -807,18 +807,21 @@
           {\edef\csq@mainlang{\languagename}}
           {\csq@warn@multilang{Cannot detect main document language}}}}}
 
+\newcommand*{\csq@otherlang@star}{\csuse{otherlanguage*}}
+\newcommand*{\csq@otherlang@star@end}{\csuse{endotherlanguage*}}
+
 \def\csq@resetlang{%
   \ifdef\csq@mainlang
-    {\csuse{otherlanguage*}{\csq@mainlang}%
+    {\expandafter\csq@otherlang@star\expandafter{\csq@mainlang}%
      \let\csq@resetlang\relax}
     {}}
 
 \protected\long\def\csq@switchlang#1{%
   \ifdef\csq@mainlang
     {\begingroup
-     \csuse{otherlanguage*}{\csq@mainlang}%
+     \expandafter\csq@otherlang@star\expandafter{\csq@mainlang}%
      #1%
-     \csuse{endotherlanguage*}%
+     \csq@otherlang@star@end
      \endgroup}
     {#1}}
 
@@ -826,9 +829,9 @@
 
 \def\csq@lang#1{%
   \csq@savelang
-  \lowercase{\csuse{otherlanguage*}{#1}}}
+  \lowercase{\csq@otherlang@star{#1}}}
 \def\csq@endlang{%
-  \csuse{endotherlanguage*}}
+  \csq@otherlang@star@end}
 
 \def\csq@nolang#1{%
   \begingroup