From 66a43e051194001b16db6930ed7e0e30e8dcf2c2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 25 Aug 2006 18:03:24 +0000 Subject: csquotes 3.5 (24aug06) git-svn-id: svn://tug.org/texlive/trunk@2013 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/csquotes/csquotes.cfg | 4 +- Master/texmf-dist/tex/latex/csquotes/csquotes.sty | 81 +++++++++++++++++------ 2 files changed, 61 insertions(+), 24 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg b/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg index a88047f604d..5307376a662 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 3.4 2006/04/02 15:58:08 lehman stable $ +% $Id: csquotes.cfg,v 3.5 2006/08/24 22:54:30 lehman stable $ -\ProvidesFile{csquotes.cfg}[2006/04/02 v3.4 Quotation configuration] +\ProvidesFile{csquotes.cfg}[2006/08/24 v3.5 Quotation configuration] % Put your definitions here. diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty index 0cb999d5862..16279aa59e7 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 3.4 2006/04/02 15:58:08 lehman stable $ +% $Id: csquotes.sty,v 3.5 2006/08/24 22:54:30 lehman stable $ % Copyright (c) 2003--2006 Philipp Lehman, author-maintained. % @@ -12,9 +12,30 @@ % purpose. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{csquotes}[2006/04/02 v3.4 Quotation facilities] +\ProvidesPackage{csquotes}[2006/08/24 v3.5 Quotation facilities] + +%% Compatibility and requirements + \RequirePackage{keyval} +\@ifpackageloaded{inputenc} + {} + {\AtBeginDocument{% + \@ifpackageloaded{inputenc} + {\csq@warning + {Load `inputenc' before `csquotes'} + {`inputenc' package loaded too late} + {Always load `inputenc' before `csquotes'}} + {}}} + +\@ifpackageloaded{ucs} + {\let\csq@ifucs\@firstoftwo} + {\let\csq@ifucs\@secondoftwo + \AtBeginDocument{% + \@ifpackageloaded{ucs} + {\let\csq@ifucs\@firstoftwo} + {}}} + %% Category codes \def\csq@docatcodes{\do\~\do\&\do\:\do\"} @@ -127,7 +148,7 @@ \csq@ifblank@i#1&&\@secondoftwo\@firstoftwo:} \long\def\csq@ifblank@i#1#2#4#5:{#4} -\newcommand*{\ifstringblank}{\csq@ifblank} +\providecommand*{\ifstringblank}{\csq@ifblank} \newcommand*{\ifblockquote}{% \ifcsq@block \expandafter\@firstoftwo @@ -291,8 +312,8 @@ \def\csq@err@ucs{% \csq@error - {UCS package not supported} - {The UCS package is not supported. If you want to use + {ucs package not supported} + {The ucs package is not supported. If you want to use UTF-8\MessageBreak encoded active quotes, try `\string\usepackage[utf8]{inputenc}'.\MessageBreak If you continue now, I will reject all UTF-8 encoded @@ -1318,6 +1339,12 @@ \let\csq@mkpdfstrings\@empty \csq@add\csq@mkhyperref{\csq@mkpdfstrings} +\csq@ifcsundefined{inpenc@prehook}% inputenc 2006/05/05 v1.1b + {} + {\addto@hook\inpenc@prehook{% + \csq@info{Input encoding change}% + \csq@mkdelete}} + % Regular specials % {}{}{}{} @@ -1591,18 +1618,7 @@ \def\csq@ifutfchar#1{% \csq@ifcsundefined{@inpenc@undefined} {\@secondoftwo} - {\begingroup - \def\@inpenc@undefined@##1{\def\csq@tempa{##1}}% - \@inpenc@undefined - \ifx\csq@tempa\csq@utfenc - \aftergroup\@firstoftwo - \else - \aftergroup\@secondoftwo - \ifx\csq@tempa\csq@ucsenc - \csq@err@ucs - \fi - \fi - \endgroup}% + {\csq@ifutfenc}% {\csq@ifsingle{#1} {\ifnum`#1<128\relax \expandafter\@secondoftwo @@ -1616,8 +1632,29 @@ {\csq@err@invldchar \@gobbletwo}}} +\csq@ifcsundefined{inputencodingname}% inputenc 2006/05/05 v1.1b + {\def\csq@ifutfenc{% + \csq@ifucs + {\csq@err@ucs\@secondoftwo} + {\begingroup + \def\@inpenc@undefined@##1{\def\csq@tempa{##1}}% + \@inpenc@undefined + \ifx\csq@tempa\csq@utfenc + \aftergroup\@firstoftwo + \else + \aftergroup\@secondoftwo + \fi + \endgroup}}} + {\def\csq@ifutfenc{% + \csq@ifucs + {\csq@err@ucs\@secondoftwo} + {\ifx\inputencodingname\csq@utfenc + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi}}} + \def\csq@utfenc{utf8} -\def\csq@ucsenc{utf8x} % {}{}{} @@ -2088,13 +2125,13 @@ \DeclareQuoteStyle[quotes]{french} {\mkfrenchopenquote{\guillemotleft}} {\mkfrenchclosequote{\guillemotright}} - {\mkfrenchopenquote{\textquotedblleft}} - {\mkfrenchclosequote{\textquotedblright}} + {\textquotedblleft} + {\textquotedblright} \DeclareQuoteStyle[quotes*]{french} {\mkfrenchopenquote{\guillemotleft}} {\mkfrenchclosequote{\guillemotright}} - {\textquotedblleft} - {\textquotedblright} + {\mkfrenchopenquote{\textquotedblleft}} + {\mkfrenchclosequote{\textquotedblright}} \DeclareQuoteStyle[guillemets]{french} [\initfrenchquotes] {\mkfrenchopenquote{\guillemotleft}} -- cgit v1.2.3