csquotes (14nov19)

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

5 files changed, 22 insertions, 22 deletions

diff --git a/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf b/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf
index ceff68e6607..a1507080d40 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 47e7bfea8db..a0e0090190b 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={2.5f},
-  date={2019-11-11}}
+  revision={5.2g},
+  date={2019-11-14}}
 
 \hypersetup{%
   pdftitle={The csquotes Package},
@@ -1542,6 +1542,10 @@ 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.2g}{2019-11-14}
+\item Fix issue with \cmd{languagename}
+\end{release}
+
 \begin{release}{5.2f}{2019-11-11}
 \item Added language option \opt{serbian}\see{opt:opt}
 \item Improved \sty{polyglossia} support\see{opt:opt}
diff --git a/Master/texmf-dist/tex/latex/csquotes/csq-compat.def b/Master/texmf-dist/tex/latex/csquotes/csq-compat.def
index 61e880d956b..6ed72d174bd 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-11 v2.5f csquotes backwards compatibility (JAW)]
+  [2019-11-14 v5.2g 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 a6b7fe10a52..ec7834d7526 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-11 v2.5f csquotes generic definitions (JAW)]
+  [2019-11-14 v5.2g 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 7c68115a9be..9cc48633a21 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-11 v2.5f context-sensitive quotations (JAW)]
+  [2019-11-14 v5.2g context-sensitive quotations (JAW)]
 
 %% Compatibility and requirements
 
@@ -781,25 +781,21 @@
      \endgroup}}
 
 \def\csq@resetstyle{%
-  \ifundef\babelname
-    {\csq@resetstyle@i{\languagename}}%
-    {\csq@resetstyle@i{\babelname}}}
+  \ifnum\csq@reset=\@ne
+    \ifundef\babelname
+      {\ifundef\languagename
+         {\csq@warn@multilang{Cannot detect current language}}
+         {\csq@resetstyle@i{\languagename}}}%
+      {\csq@resetstyle@i{\babelname}}%
+  \fi}
 
 \def\csq@resetstyle@i#1{%
-  \begingroup
-  \edef\csq@tempa{\endgroup
-    \noexpand\csq@resetstyle@ii{#1}}%
-  \csq@tempa}
-
-\def\csq@resetstyle@ii#1{%
-  \ifnum\csq@reset=\@ne
-    \ifx\csq@currentstyle#1
-    \else
-      \ifcsundef{csq@qstyle@#1}
-        {\csq@warn@style#1
-         \csq@setstyle{fallback}}
-        {\csq@setstyle{#1}}%
-    \fi
+  \ifx\csq@currentstyle#1\relax
+  \else
+    \ifcsundef{csq@qstyle@#1}
+      {\csq@warn@style#1
+       \csq@setstyle{fallback}}
+      {\csq@setstyle{#1}}%
   \fi}
 
 \def\csq@savelang{%