From 956f54bed49e9e056ccb6ec59fce0aa5af4c2633 Mon Sep 17 00:00:00 2001 From: Reinhard Kotucha Date: Sat, 25 Nov 2006 01:31:17 +0000 Subject: update. git-svn-id: svn://tug.org/texlive/trunk@2511 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/csquotes/csquotes.cfg | 4 +- Master/texmf-dist/tex/latex/csquotes/csquotes.sty | 79 ++++++++++++++++------- 2 files changed, 56 insertions(+), 27 deletions(-) (limited to 'Master/texmf-dist/tex/latex/csquotes') diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg b/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg index 5307376a662..f4f62b93850 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.5 2006/08/24 22:54:30 lehman stable $ +% $Id: csquotes.cfg,v 3.6 2006/11/09 21:55:06 lehman stable $ -\ProvidesFile{csquotes.cfg}[2006/08/24 v3.5 Quotation configuration] +\ProvidesFile{csquotes.cfg}[2006/11/09 v3.6 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 16279aa59e7..3f28890bb73 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.5 2006/08/24 22:54:30 lehman stable $ +% $Id: csquotes.sty,v 3.6 2006/11/09 21:55:06 lehman stable $ % Copyright (c) 2003--2006 Philipp Lehman, author-maintained. % @@ -12,7 +12,7 @@ % purpose. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{csquotes}[2006/08/24 v3.5 Quotation facilities] +\ProvidesPackage{csquotes}[2006/11/09 v3.6 Quotation facilities] %% Compatibility and requirements @@ -49,7 +49,7 @@ \let\do\noexpand} \catcode`\~=\active -\catcode`\&=3 % three +\catcode`\&=3 \catcode`\:=12 \catcode`\"=12 @@ -144,7 +144,7 @@ % Miscellaneous tests -\long\def\csq@ifblank#1{% by D. Arseneau +\long\def\csq@ifblank#1{% from url.sty \csq@ifblank@i#1&&\@secondoftwo\@firstoftwo:} \long\def\csq@ifblank@i#1#2#4#5:{#4} @@ -1031,9 +1031,7 @@ \let\csq@error\@gobbletwo \let\csq@warning\@gobblethree \let\csq@info\@gobble - \let\label\@gobble - \let\index\@gobble - \let\glossary\@gobble + \csq@mkblockquote \@fileswfalse \csq@blockfalse \def\par{\aftergroup\csq@blocktrue\@par}% @@ -1051,11 +1049,15 @@ \fi \csq@tempa \endgroup - {\csq@bquote@ii{#1}{#2}{#3}{#4}{#5}} - {\csq@bquote@iii{#1}{#2}{#3}{#4}{#5}}} + \csq@bquote@ii\csq@bquote@iii{#1}{#2}{#3}{#4}{#5}} \let\csq@nbgobble\@firstofone +\def\csq@mkblockquote{% + \let\label\@gobble + \let\index\@gobble + \let\glossary\@gobble} + \long\def\csq@bquote@ii#1#2#3#4#5{% \csq@checkblockcite \begin{\csq@blockenvironment}% @@ -1086,6 +1088,13 @@ #1\csq@qopen@i\quotetext#5\endquotetext \csq@tempa\mkfinblockpunct{#4}} +\newcommand*{\BlockquoteDisable}[1]{% + \begingroup + \toks@=\expandafter{\csq@mkblockquote}% + \@temptokena={#1}% + \xdef\csq@mkblockquote{\the\toks@ \the\@temptokena}% + \endgroup} + % Block quotes + babel \DeclareRobustCommand*{\foreignblockquote}[1]{% @@ -1828,7 +1837,7 @@ \fi \csq@ifblank{#1} {\csq@setstyle{#2}} - {\csq@setstyle{#2@#1}}} + {\csq@setstyle{#2/#1}}} \def\csq@resetqstyle{% \csq@info{Enabling multilingual support}% @@ -1841,7 +1850,7 @@ \let\if@safe@actives\iftrue \csq@ifblank{#1} {\edef\csq@tempa{#2}} - {\edef\csq@tempa{#2@#1}}% + {\edef\csq@tempa{#2/#1}}% \csq@ifcsundefined{csq@qstyle@\csq@tempa} {} {\csq@info{Redefining quotation style `\csq@tempa'}}% @@ -1899,7 +1908,7 @@ \let\if@safe@actives\iftrue \csq@ifblank{#1} {\edef\csq@tempa{#2}} - {\edef\csq@tempa{#2@#1}}% + {\edef\csq@tempa{#2/#1}}% \csq@ifcsundefined{csq@qstyle@\csq@tempa} {\csq@error {Quote style not defined} @@ -2084,19 +2093,19 @@ {\quotedblbase} {\textquotedblleft} [0.05em] - {\textquoteright}% ??? - {\textquoteright}% ??? + {\textquoteright}% unsure + {\textquoteright}% unsure \DeclareQuoteStyle[guillemets]{danish} {\guillemotright} {\guillemotleft} - {\textquoteright}% ??? - {\textquoteright}% ??? + {\textquoteright}% unsure + {\textquoteright}% unsure \DeclareQuoteStyle{dutch} {\quotedblbase} {\textquotedblright} [0.05em] - {\quotesinglbase}% ??? - {\textquoteright}% ??? + {\quotesinglbase}% unsure + {\textquoteright}% unsure \DeclareQuoteStyle[american]{english}% verified {\textquotedblleft} {\textquotedblright} @@ -2188,7 +2197,7 @@ {\textquoteright} \DeclareQuoteStyle[guillemets]{italian} {\guillemotleft} - [\textquotedblright]% ??? + [\textquotedblright]% unsure {\guillemotright} [0.025em] {\textquotedblleft} @@ -2205,12 +2214,14 @@ [0.05em] {\quotesinglbase} {\textquoteright} -\DeclareQuoteStyle{spanish} - {\guillemotleft} - {\guillemotright} - [0.025em] - {\textquotedblleft} - {\textquotedblright} +\DeclareQuoteStyle{spanish}% verified + {\guillemotleft} + [\guillemotright] + {\guillemotright} + [0.025em] + {\textquotedblleft} + [\textquotedblright]% unsure + {\textquotedblright} \DeclareQuoteStyle[quotes]{swedish}% verified {\textquotedblright} {\textquotedblright} @@ -2260,6 +2271,7 @@ \DeclareQuoteAlias{american}{usenglish} \DeclareQuoteAlias{british}{UKenglish} \DeclareQuoteAlias{british}{ukenglish} +\DeclareQuoteAlias{french}{frenchb} \DeclareQuoteAlias{german}{ngerman} \DeclareQuoteAlias{austrian}{naustrian} \DeclareQuoteAlias{norwegian}{norsk} @@ -2361,6 +2373,22 @@ \@ifpackageloaded{fancyvrb} {\csq@add\FV@CatCodes{\@verbatimquotes}} {}% + \@ifpackageloaded{amsmath} + {\let\ams@collect@body\collect@body + \def\collect@body{\@disablequotes\ams@collect@body}} + {\@ifpackageloaded{amstext} + {\let\ams@collect@body\collect@body + \def\collect@body{\@disablequotes\ams@collect@body}} + {}}% + \@ifpackageloaded{endnotes} + {\BlockquoteDisable{% + \renewcommand{\endnote}[2][]{% + \csq@ifblank{#1} + {\endnotemark\relax} + {\endnotemark[#1]}}% + \renewcommand{\endnotetext}[2][]{}% + \let\addtoendnotes\@gobble}} + {}% \csq@setstyle{default}% \csq@mkenable \csq@checkblockcite} @@ -2376,6 +2404,7 @@ \DeclareOption*{% \begingroup + \let\if@safe@actives\iftrue \edef\csq@tempa{\endgroup \noexpand\setkeys{csq}{\CurrentOption}}% \csq@tempa} -- cgit v1.2.3