From 456df783332b7ebb38f737f0a3dbcf7b70ead26c Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Wed, 14 Sep 2022 20:03:56 +0000
Subject: csquotes (14sep22)

git-svn-id: svn://tug.org/texlive/trunk@64389 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/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   | 12 +++++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'Master/texmf-dist/tex')

diff --git a/Master/texmf-dist/tex/latex/csquotes/csq-compat.def b/Master/texmf-dist/tex/latex/csquotes/csq-compat.def
index 3e7a6ead616..9a19bf1fa4b 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}
-  [2022-09-09 v5.2m csquotes backwards compatibility (JAW)]
+  [2022-09-14 v5.2n 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 a310943d579..80f8cb57136 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}
-  [2022-09-09 v5.2m csquotes generic definitions (JAW)]
+  [2022-09-14 v5.2n 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 4973fbbbe4d..0a5cbb4e844 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}
-  [2022-09-09 v5.2m context-sensitive quotations (JAW)]
+  [2022-09-14 v5.2n context-sensitive quotations (JAW)]
 
 %% Compatibility and requirements
 
@@ -1008,9 +1008,15 @@
 % {<init>}{<endinit>}{<text>}
 
 \long\def\csq@quote@i#1#2#3{%
-  \csq@bqgroup#1\csq@oqopen@i{#3}\csq@qclose@i{#2}}
+  \csq@bqgroup\expandafter\let\expandafter\csq@font\the\font
+  #1\csq@oqopen@i#3%
+  \expandafter\ifx\the\font\csq@font\else\expandafter\csq@font\fi
+  \csq@qclose@i{#2}}
 \long\def\csq@quote@ii#1#2#3{%
-  \csq@bqgroup#1\csq@iqopen@i{#3}\csq@qclose@i{#2}}
+  \csq@bqgroup\expandafter\let\expandafter\csq@font\the\font
+  #1\csq@iqopen@i#3%
+  \expandafter\ifx\the\font\csq@font\else\expandafter\csq@font\fi
+  \csq@qclose@i{#2}}
 
 % Plain quotes + language switching
 
-- 
cgit v1.2.3