From 76a4b4b9cfab13a7adbdbeb36b3b0d3478648484 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 14 Nov 2019 21:53:57 +0000 Subject: csquotes (14nov19) git-svn-id: svn://tug.org/texlive/trunk@52793 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/csquotes/csq-compat.def | 2 +- Master/texmf-dist/tex/latex/csquotes/csquotes.def | 2 +- Master/texmf-dist/tex/latex/csquotes/csquotes.sty | 32 ++++++++++------------ 3 files changed, 16 insertions(+), 20 deletions(-) (limited to 'Master/texmf-dist/tex/latex') 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{% -- cgit v1.2.3