summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-02-04 00:24:15 +0000
committerKarl Berry <karl@freefriends.org>2017-02-04 00:24:15 +0000
commite58e53d80e768eed3f7878ed935ada2681050292 (patch)
treea1dfabd4cc7fc747637b06c7fe2f053ba7584502 /Master
parent1695ee39260dc57440f56f72d4f0f78fe821c053 (diff)
csquotes (3feb17)
git-svn-id: svn://tug.org/texlive/trunk@43132 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/csquotes/csquotes.pdfbin290756 -> 290799 bytes
-rw-r--r--Master/texmf-dist/doc/latex/csquotes/csquotes.tex11
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csq-compat.def2
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.def2
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.sty6
5 files changed, 13 insertions, 8 deletions
diff --git a/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf b/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf
index 850f309dde8..98a761d96f9 100644
--- a/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf
+++ b/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/csquotes/csquotes.tex b/Master/texmf-dist/doc/latex/csquotes/csquotes.tex
index 2700b9fec9e..0170187a872 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.2},
- date={2016/12/28}}
+ revision={v5.2a},
+ date={2017/02/03}}
\hypersetup{%
pdftitle={The csquotes Package},
@@ -110,7 +110,7 @@ This package provides advanced facilities for inline and display quotations. It
\subsection{License}
-Copyright © 2003--2011 Philipp Lehman, 2015--2016 Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c or any later version.\fnurl{http://www.latex-project.org/lppl/}
+Copyright © 2003--2011 Philipp Lehman, 2015--2017 Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c or any later version.\fnurl{http://www.latex-project.org/lppl/}
\subsection{Contributions}
@@ -1549,6 +1549,11 @@ This revision history is a list of changes relevant to users of this package. Ch
\begin{changelog}
+\begin{release}{5.2a}{2017-02-03}
+ \item Fix behaviour of \cmd{blockquote} inside \cmd{parbox} and
+ related constructs
+\end{release}
+
\begin{release}{5.2}{2016-12-28}
\item Add \cmd{textdel} auxiliary command.\see{aux}
\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 71d8d991cb4..9f546873e45 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}
- [2016/12/28 v5.2 csquotes backwards compatibility (JAW)]
+ [2017/02/03 v5.2a 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 a47730d6b45..1137ed8ac7b 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}
- [2016/12/28 v5.2 csquotes generic definitions (JAW)]
+ [2017/02/03 v5.2a 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 6179f44e495..ab7a9f0388e 100644
--- a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
+++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
@@ -1,5 +1,5 @@
% Copyright (c) 2003-2011 Philipp Lehman.
-% (c) 2015-2016 Joseph Wright.
+% (c) 2015-2017 Joseph Wright.
%
% Permission is granted to copy, distribute and/or modify this
% software under the terms of the LaTeX Project Public License
@@ -12,7 +12,7 @@
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{csquotes}
- [2016/12/28 v5.2 context-sensitive quotations (JAW)]
+ [2017/02/03 v5.2a context-sensitive quotations (JAW)]
%% Compatibility and requirements
@@ -1137,7 +1137,7 @@
\csq@ifnested
{\csq@err@nbquote}
{\csq@getpunct{%
- \ifbool{inner}
+ \ifboolexpr{ bool {inner} and bool {hmode} }
{\csq@bquote@ii}
{\ifbool{csdisplay}
{\csq@bquote@i}