summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/csquotes
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-06-25 11:08:49 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-06-25 11:08:49 +0000
commit01878727fa413ae2e8a1c0f103979a79af40de08 (patch)
treef4bfdb3c720661a7f635a8c2ecd7a6ea0e63811c /Master/texmf-dist/tex/latex/csquotes
parent5f1540b23e02f3f8a40cbb0a73bdd9588d4cc1b8 (diff)
csquotes v4.2 200_/06/24
git-svn-id: svn://tug.org/texlive/trunk@9033 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/csquotes')
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.cfg4
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.def4
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.sty34
3 files changed, 30 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg b/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg
index 99682c71726..4dbcfded413 100644
--- a/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg
+++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg
@@ -1,6 +1,6 @@
-% $Id: csquotes.cfg,v 4.1 2008/04/11 18:43:44 lehman stable $
+% $Id: csquotes.cfg,v 4.2 2008/06/24 17:09:34 lehman stable $
-\ProvidesFile{csquotes.cfg}[2008/04/11 v4.1 csquotes configuration]
+\ProvidesFile{csquotes.cfg}[2008/06/24 v4.2 csquotes configuration]
% Put your definitions here.
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.def b/Master/texmf-dist/tex/latex/csquotes/csquotes.def
index 5ff079cfce4..9f997626da7 100644
--- a/Master/texmf-dist/tex/latex/csquotes/csquotes.def
+++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.def
@@ -1,6 +1,6 @@
-% $Id: csquotes.def,v 4.1 2008/04/11 18:43:44 lehman stable $
+% $Id: csquotes.def,v 4.2 2008/06/24 17:09:34 lehman stable $
-\ProvidesFile{csquotes.def}[2008/04/11 v4.1 csquotes generic definitions]
+\ProvidesFile{csquotes.def}[2008/06/24 v4.2 csquotes generic definitions]
% Set defaults
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
index 0e975f0e87e..c255dc5e476 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 4.1 2008/04/11 18:43:44 lehman stable $
+% $Id: csquotes.sty,v 4.2 2008/06/24 17:09:34 lehman stable $
% Copyright (c) 2003-2008 Philipp Lehman.
%
@@ -15,11 +15,19 @@
% particular purpose.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{csquotes}[2008/04/11 v4.1 context-sensitive quotations]
+\ProvidesPackage{csquotes}[2008/06/24 v4.2 context-sensitive quotations]
%% Compatibility and requirements
\RequirePackage{etoolbox}
+\@ifpackagelater{etoolbox}{2008/06/22}
+ {}
+ {\PackageError{biblatex}
+ {Outdated 'etoolbox' package}
+ {Upgrade to etoolbox 1.6 (2008/06/22) or later.\MessageBreak
+ I found: '\csname ver@etoolbox.sty\endcsname'.\MessageBreak
+ This is a fatal error. I'm aborting now.}%
+ \endinput}
\RequirePackage{keyval}
\@ifpackageloaded{inputenc}
@@ -261,6 +269,19 @@
{Only valid UTF-8 sequences representing a single
character\MessageBreak may be allocated as active quotes}}
+\protected\def\csq@err@nbquote{%
+ \csq@mismatch{%
+ You have nested a block quotation. Block quotation
+ commands\MessageBreak may only be used on quotation level 0}}%
+
+\protected\def\csq@err@patch#1{%
+ \csq@error
+ {Patching #1 failed}
+ {This is an internal issue typically caused by a
+ conflict\MessageBreak between biblatex and some
+ other package. Modifying\MessageBreak the package
+ loading order may fix the problem}}
+
\protected\def\csq@err@ucs{%
\csq@error
{ucs package not supported}
@@ -270,11 +291,6 @@
If you continue now, I will reject all UTF-8 encoded
arguments\MessageBreak as invalid}}
-\protected\def\csq@err@nbquote{%
- \csq@mismatch{%
- You have nested a block quotation. Block quotation
- commands\MessageBreak may only be used on quotation level 0}}%
-
% Warnings
\protected\def\csq@warn@nobabel#1{%
@@ -2185,7 +2201,9 @@
\let\addtoendnotes\@gobble}}
{}%
\ifdef\collect@body % amsmath
- {\pretocmd\collect@body{\@disablequotes}}
+ {\pretocmd\collect@body{\@disablequotes}
+ {}
+ {\csq@err@patch{'amsmath' package}}}
{}}
\AtBeginDocument{%