From ff146fb7722720da2c8f7de56ccc44e5682c7bc9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 23 Jan 2011 01:09:02 +0000 Subject: csquotes 5.1b (20jan11) git-svn-id: svn://tug.org/texlive/trunk@21148 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/csquotes/README | 2 +- Master/texmf-dist/doc/latex/csquotes/RELEASE | 2 +- Master/texmf-dist/doc/latex/csquotes/csquotes.pdf | Bin 241010 -> 241004 bytes Master/texmf-dist/doc/latex/csquotes/csquotes.tex | 8 ++++++-- .../texmf-dist/tex/latex/csquotes/csq-compat.def | 4 ++-- Master/texmf-dist/tex/latex/csquotes/csquotes.cfg | 2 +- Master/texmf-dist/tex/latex/csquotes/csquotes.def | 14 ++++++++++---- Master/texmf-dist/tex/latex/csquotes/csquotes.sty | 16 ++++++++++++---- 8 files changed, 33 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/csquotes/README b/Master/texmf-dist/doc/latex/csquotes/README index ead72a9ea8d..529d37c4ecb 100644 --- a/Master/texmf-dist/doc/latex/csquotes/README +++ b/Master/texmf-dist/doc/latex/csquotes/README @@ -1,4 +1,4 @@ -$Id: README,v 5.1a 2011/01/11 17:42:53 lehman stable $ +$Id: README,v 5.1b 2011/01/20 20:31:49 lehman stable $ ABOUT diff --git a/Master/texmf-dist/doc/latex/csquotes/RELEASE b/Master/texmf-dist/doc/latex/csquotes/RELEASE index cb5f7b0612a..31eb7db1610 100644 --- a/Master/texmf-dist/doc/latex/csquotes/RELEASE +++ b/Master/texmf-dist/doc/latex/csquotes/RELEASE @@ -1,4 +1,4 @@ -$Id: RELEASE,v 5.1a 2011/01/11 17:42:53 lehman stable $ +$Id: RELEASE,v 5.1b 2011/01/20 20:31:49 lehman stable $ RELEASE NOTES FOR VERSION 5.1 diff --git a/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf b/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf index 5f6cc5dd82a..fe1419fd855 100644 Binary files a/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf and b/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/csquotes/csquotes.tex b/Master/texmf-dist/doc/latex/csquotes/csquotes.tex index 5743300d9d4..c24ace23848 100644 --- a/Master/texmf-dist/doc/latex/csquotes/csquotes.tex +++ b/Master/texmf-dist/doc/latex/csquotes/csquotes.tex @@ -1,4 +1,4 @@ -% $Id: csquotes.tex,v 5.1a 2011/01/11 17:42:53 lehman stable $ +% $Id: csquotes.tex,v 5.1b 2011/01/20 20:31:49 lehman stable $ \documentclass{ltxdockit}[2010/09/26] \usepackage[latin9]{inputenc} \usepackage[american]{babel} @@ -13,7 +13,7 @@ \MakeAutoQuote*{<}{>} \MakeShortVerb{\|} -\rcsid{$Id: csquotes.tex,v 5.1a 2011/01/11 17:42:53 lehman stable $} +\rcsid{$Id: csquotes.tex,v 5.1b 2011/01/20 20:31:49 lehman stable $} \titlepage{% title={The \sty{csquotes} Package}, @@ -1532,6 +1532,10 @@ This revision history is a list of changes relevant to users of this package. Ch \begin{changelog} +\begin{release}{5.1b}{2011-01-20} +\item Fixed conflict with \sty{polyglossia} and French +\end{release} + \begin{release}{5.1a}{2011-01-11} \item Small fix for paragraph environments inside \cmd{blockquote} \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 9e69adde272..f7d71814080 100644 --- a/Master/texmf-dist/tex/latex/csquotes/csq-compat.def +++ b/Master/texmf-dist/tex/latex/csquotes/csq-compat.def @@ -1,7 +1,7 @@ -% $Id: csq-compat.def,v 5.1a 2011/01/11 17:42:53 lehman stable $ +% $Id: csq-compat.def,v 5.1b 2011/01/20 20:31:49 lehman stable $ \ProvidesFile{csquotes.def} -[\csq@rcsid $Id: csq-compat.def,v 5.1a 2011/01/11 17:42:53 lehman stable $ +[\csq@rcsid $Id: csq-compat.def,v 5.1b 2011/01/20 20:31:49 lehman stable $ csquotes backwards compatibility] \def\csq@getversion#1{% diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg b/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg index ef108e10908..187a4cd95b0 100644 --- a/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg +++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg @@ -1,4 +1,4 @@ -% $Id: csquotes.cfg,v 5.1a 2011/01/11 17:42:53 lehman stable $ +% $Id: csquotes.cfg,v 5.1b 2011/01/20 20:31:49 lehman stable $ \ProvidesFile{csquotes.cfg} diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.def b/Master/texmf-dist/tex/latex/csquotes/csquotes.def index facb9972ac1..5483a2377b9 100644 --- a/Master/texmf-dist/tex/latex/csquotes/csquotes.def +++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.def @@ -1,7 +1,7 @@ -% $Id: csquotes.def,v 5.1a 2011/01/11 17:42:53 lehman stable $ +% $Id: csquotes.def,v 5.1b 2011/01/20 20:31:49 lehman stable $ \ProvidesFile{csquotes.def} -[\csq@rcsid $Id: csquotes.def,v 5.1a 2011/01/11 17:42:53 lehman stable $ +[\csq@rcsid $Id: csquotes.def,v 5.1b 2011/01/20 20:31:49 lehman stable $ csquotes generic definitions] % Set defaults @@ -426,8 +426,9 @@ % \mkfrenchclosequote{\guillemotright} % % and will use a command called \@frenchquotespace to space out the -% quotation marks. The spacing is: +% quotation marks. The default spacing is: % +% \penalty\@M % \hskip 0.8\fontdimen2\font % plus 0.3\fontdimen3\font % minus 0.3\fontdimen4\font @@ -443,11 +444,16 @@ % as follows: % % \renewcommand*{\@frenchquotespace}{% +% \penalty\@M % \hskip\fontdimen2\font\relax} % % or: % -% \renewcommand*{\@frenchquotespace}{\space} +% \renewcommand*{\@frenchquotespace}{% +% \penalty\@M\space} % % In either case, the difference to the default values is so subtle, % you will hardly notice it in most cases. +% +% Don't forget to add the penalty if you redefine \@frenchquotespace! +% You certainly don't want to allow a linebreak at that point. diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty index 4d2d602b602..2e58fd40b26 100644 --- a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty +++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty @@ -1,4 +1,4 @@ -% $Id: csquotes.sty,v 5.1a 2011/01/11 17:42:53 lehman stable $ +% $Id: csquotes.sty,v 5.1b 2011/01/20 20:31:49 lehman stable $ % Copyright (c) 2003-2011 Philipp Lehman. % @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{csquotes} -[\csq@rcsid $Id: csquotes.sty,v 5.1a 2011/01/11 17:42:53 lehman stable $ +[\csq@rcsid $Id: csquotes.sty,v 5.1b 2011/01/20 20:31:49 lehman stable $ context-sensitive quotations] \def\csq@version$#1: #2.#3 ${#2#3} @@ -2219,16 +2219,24 @@ \let\csq@themarker\csq@omitmarker} \newrobustcmd*{\mkfrenchopenquote}[1]{% - \leavevmode#1\penalty\@M\@frenchquotespace} + \leavevmode#1\@frenchquotespace} \newrobustcmd*{\mkfrenchclosequote}[1]{% - \leavevmode\penalty\@M\@frenchquotespace#1} + \leavevmode\@frenchquotespace#1} \newcommand*{\@frenchquotespace}{% + \penalty\@M \hskip 0.8\fontdimen2\font plus 0.3\fontdimen3\font minus 0.3\fontdimen4\font} +\AtEndPreamble{% + \@ifpackageloaded{polyglossia} + {\@ifpackagelater{polyglossia}{2009/11/20} + {\let\@frenchquotespace\@empty} + {}} + {}} + % German \newrobustcmd*{\fixligatures}{% -- cgit v1.2.3