summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-09-24 00:07:28 +0000
committerKarl Berry <karl@freefriends.org>2009-09-24 00:07:28 +0000
commit128027ae3421c129fb4182fabad6bad8cdfad161 (patch)
treeca224f46078ca613e0c46f333f757a08faf388b7 /Master/texmf-dist/tex
parent9ff121e6af2b00416f9286c5a4a917ffa7a21764 (diff)
csquotes 4.4c (23sep09)
git-svn-id: svn://tug.org/texlive/trunk@15435 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.def4
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.sty60
2 files changed, 32 insertions, 32 deletions
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.def b/Master/texmf-dist/tex/latex/csquotes/csquotes.def
index 432400d63b9..19e1d00b72e 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 4.4b 2009/07/24 19:02:53 lehman stable $
+% $Id: csquotes.def,v 4.4c 2009/09/23 18:54:12 lehman stable $
\ProvidesFile{csquotes.def}
-[\csq@rcsid $Id: csquotes.def,v 4.4b 2009/07/24 19:02:53 lehman stable $
+[\csq@rcsid $Id: csquotes.def,v 4.4c 2009/09/23 18:54:12 lehman stable $
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 52a825789da..490145e160c 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.4b 2009/07/24 19:02:53 lehman stable $
+% $Id: csquotes.sty,v 4.4c 2009/09/23 18:54:12 lehman stable $
% Copyright (c) 2003-2009 Philipp Lehman.
%
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{csquotes}
-[\csq@rcsid $Id: csquotes.sty,v 4.4b 2009/07/24 19:02:53 lehman stable $
+[\csq@rcsid $Id: csquotes.sty,v 4.4c 2009/09/23 18:54:12 lehman stable $
context-sensitive quotations]
%% Compatibility and requirements
@@ -39,10 +39,14 @@
{}
{\AtEndPreamble{%
\@ifpackageloaded{inputenc}
- {\csq@warning
- {Load 'inputenc' before 'csquotes'}
- {'inputenc' package loaded too late}
- {Always load 'inputenc' before 'csquotes'}}
+ {\csq@warn@loadfirst{inputenc}}
+ {}}}
+
+\@ifpackageloaded{inputenx}
+ {}
+ {\AtEndPreamble{%
+ \@ifpackageloaded{inputenx}
+ {\csq@warn@loadfirst{inputenx}}
{}}}
\@ifpackageloaded{ucs}
@@ -336,6 +340,12 @@
% Warnings
+\protected\def\csq@warn@loadfirst#1{%
+ \csq@warning
+ {Load '#1' before 'csquotes'}
+ {'#1' package loaded too late}
+ {Always load '#1' before 'csquotes'}}
+
\protected\def\csq@warn@nobabel#1{%
\csq@warning
{The 'babel' package is not available.\MessageBreak #1}
@@ -1073,10 +1083,7 @@
\long\def\csq@bquote@i#1#2#3#4#5{%
\begingroup
- \def\@elt##1{\global\value{##1}\the\value{##1}\relax}%
- \edef\csq@tempa{\cl@@ckpt}%
- \let\@elt\relax
- \csq@mkblockquote
+ \@blockquote@prehook
\@fileswfalse
\csq@blockfalse
\let\csq@newline\newline
@@ -1095,13 +1102,16 @@
\else
\aftergroup\@secondoftwo
\fi
- \csq@tempa
+ \@blockquote@posthook
\endgroup
\csq@bquote@ii\csq@bquote@iii{#1}{#2}{#3}{#4}{#5}}
\let\csq@nbgobble\@firstofone
-\def\csq@mkblockquote{%
+\newcommand*{\@blockquote@prehook}{%
+ \def\@elt##1{\global\value{##1}\the\value{##1}\relax}%
+ \edef\csq@tempa{\cl@@ckpt}%
+ \let\@elt\relax
\let\csq@nbgobble\@gobble
\let\csq@bquote\@gobblefive
\let\csq@error\@gobbletwo
@@ -1111,6 +1121,9 @@
\let\index\@gobble
\let\glossary\@gobble}
+\newcommand*{\@blockquote@posthook}{%
+ \csq@tempa}
+
\long\def\csq@bquote@ii#1#2#3#4#5{%
\begin{\csq@blockenvironment}%
\csq@blocktrue
@@ -1140,12 +1153,7 @@
#1\csq@oqopen@i\quotetext#5\endquotetext
\csq@tempa\mkfinblockpunct{#4}}
-\newrobustcmd*{\BlockquoteDisable}[1]{%
- \begingroup
- \toks@=\expandafter{\csq@mkblockquote}%
- \@temptokena={#1}%
- \xdef\csq@mkblockquote{\the\toks@ \the\@temptokena}%
- \endgroup}
+\newrobustcmd*{\BlockquoteDisable}{\gappto\@blockquote@prehook}
% Block quotes + babel
@@ -1679,22 +1687,14 @@
{\begingroup
\def\@inpenc@undefined@##1{\def\csq@tempa{##1}}%
\@inpenc@undefined
- \ifx\csq@tempa\csq@utfenc
- \aftergroup\@firstoftwo
- \else
- \aftergroup\@secondoftwo
- \fi
+ \ifdefstring\csq@tempa{utf8}
+ {\aftergroup\@firstoftwo}
+ {\aftergroup\@secondoftwo}%
\endgroup}}}
{\def\csq@ifutfenc{%
\csq@ifucs
{\csq@err@ucs\@secondoftwo}
- {\ifx\inputencodingname\csq@utfenc
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi}}}
-
-\def\csq@utfenc{utf8}
+ {\ifdefstring\inputencodingname{utf8}}}}
% {<char>}{<true>}{<false>}