diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/csquotes')
| -rw-r--r-- | Master/texmf-dist/tex/latex/csquotes/csquotes.cfg | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/csquotes/csquotes.sty | 88 |
2 files changed, 68 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg b/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg index 3b03468422b..84a4bd9c207 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.7 2007/03/25 20:23:41 lehman stable $ +% $Id: csquotes.cfg,v 3.8 2008/01/05 17:58:56 lehman stable $ -\ProvidesFile{csquotes.cfg}[2007/03/25 v3.7 Quotation configuration] +\ProvidesFile{csquotes.cfg}[2008/01/05 v3.8 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 f26ae8bae8d..4135e979135 100644 --- a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty +++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty @@ -1,6 +1,6 @@ -% $Id: csquotes.sty,v 3.7 2007/03/25 20:23:41 lehman stable $ +% $Id: csquotes.sty,v 3.8 2008/01/05 17:58:56 lehman stable $ -% Copyright (c) 2003--2007 Philipp Lehman, author-maintained. +% Copyright (c) 2003--2008 Philipp Lehman, author-maintained. % % Permission is granted to copy, distribute and/or modify this % software under the terms of the LaTeX Project Public License @@ -12,7 +12,7 @@ % purpose. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{csquotes}[2007/03/25 v3.7 Quotation facilities] +\ProvidesPackage{csquotes}[2008/01/05 v3.8 quotation facilities] %% Compatibility and requirements @@ -45,7 +45,7 @@ \AtEndOfPackage{% \def\do#1#2{\catcode`#1=#2\relax} \csq@docatcodes - \let\csq@docatcodes\csq@undefined + \let\csq@docatcodes\@undefined \let\do\noexpand} \catcode`\~=\active @@ -146,8 +146,6 @@ \csq@ifblank@i#1&&\@secondoftwo\@firstoftwo:} \long\def\csq@ifblank@i#1#2#4#5:{#4} -\providecommand*{\ifstringblank}{\csq@ifblank} - \newcommand*{\ifblockquote}{% \ifcsq@block \expandafter\@firstoftwo @@ -583,6 +581,8 @@ \def\csq@kernmark{13sp} \def\csq@frenchmark{17sp} \let\csq@themark\csq@kernmark +\let\csq@thekern@open\z@ +\let\csq@thekern@close\z@ \def\csq@setmark@open{% \penalty\@M @@ -639,6 +639,10 @@ \let\nonfrenchspacing\csq@setencodes} \def\csq@setfrcodes{% + \ifnum\sfcode`\A=\@m + \else + \csq@setazcodes + \fi \sfcode`\,=1003 \sfcode`\;=1004 \sfcode`\:=1005 @@ -656,6 +660,27 @@ \sfcode`\?=3002 } +\begingroup + \let\csq@setazcodes\@empty + \def\csq@tempa{% + \xdef\csq@setazcodes{\csq@setazcodes\sfcode\the\@tempcnta=\@m} + \ifnum\@tempcnta<\@tempcntb + \advance\@tempcnta\@ne + \expandafter\csq@tempa + \fi} + \@tempcnta`\A + \@tempcntb`\Z + \csq@tempa + \ifnum\inputlineno=\m@ne\else + \@tempcnta"80 + \@tempcntb"9C + \csq@tempa + \@tempcnta"C0 + \@tempcntb"DF + \csq@tempa + \fi +\endgroup + \csq@csdef{csq@sfactor@1250}{1003} \csq@csdef{csq@sfactor@1500}{1004} \csq@csdef{csq@sfactor@2000}{1005} @@ -783,7 +808,7 @@ \def\csq@hyph#1{% \csq@savelang - \lowercase{\hyphenrules{#1}}} + \lowercase{\csq@hyphenrules{#1}}} \def\csq@nohyph#1{% \begingroup @@ -791,6 +816,16 @@ \csq@warn@nobabel{No hyphenation rules for `\csq@tempa'}% \endgroup} +\def\csq@hyphenrules#1{% + \language\csname l@#1\endcsname\relax + \csq@ifundefined{#1 hyphenmins} + {\csq@sethyphenmins\tw@\thr@@} + {\expandafter\expandafter\expandafter\csq@sethyphenmins + \csname#1 hyphenmins\endcsname}} +\def\csq@sethyphenmins#1#2{% + \lefthyphenmin#1\relax + \righthyphenmin#2\relax} + \csq@add\csq@mkbabel{% \csq@add\@parboxrestore{\csq@resetlang}% \csq@ifcsundefined{l@usenglish} @@ -1285,21 +1320,21 @@ \def\csq@do@delspecial#1#2{% \csq@info{Deallocating character \string#1}% - \csq@cslet{csq@special@\number`#1}\csq@undefined - \csq@cslet{csq@saved@\number`#1}\csq@undefined - \csq@cslet{csq@string@\number`#1}\csq@undefined - \csq@cslet{csq@textdef@\number`#1}\csq@undefined - \csq@cslet{csq@xtxtdef@\number`#1}\csq@undefined - \csq@cslet{csq@pdfdef@\number`#1}\csq@undefined} + \csq@cslet{csq@special@\number`#1}\@undefined + \csq@cslet{csq@saved@\number`#1}\@undefined + \csq@cslet{csq@string@\number`#1}\@undefined + \csq@cslet{csq@textdef@\number`#1}\@undefined + \csq@cslet{csq@xtxtdef@\number`#1}\@undefined + \csq@cslet{csq@pdfdef@\number`#1}\@undefined} \def\csq@do@delutfspecial#1{% \csq@info{Deallocating character \csq@utfprint{#1}}% - \csq@cslet{csq@special@\csq@number{#1}}\csq@undefined - \csq@cslet{csq@saved@\csq@number{#1}}\csq@undefined - \csq@cslet{csq@string@\csq@number{#1}}\csq@undefined - \csq@cslet{csq@textdef@\csq@number{#1}}\csq@undefined - \csq@cslet{csq@xtxtdef@\csq@number{#1}}\csq@undefined - \csq@cslet{csq@pdfdef@\csq@number{#1}}\csq@undefined} + \csq@cslet{csq@special@\csq@number{#1}}\@undefined + \csq@cslet{csq@saved@\csq@number{#1}}\@undefined + \csq@cslet{csq@string@\csq@number{#1}}\@undefined + \csq@cslet{csq@textdef@\csq@number{#1}}\@undefined + \csq@cslet{csq@xtxtdef@\csq@number{#1}}\@undefined + \csq@cslet{csq@pdfdef@\csq@number{#1}}\@undefined} \def\csq@mkenable{% \let\do\csq@do@dospecial @@ -2244,6 +2279,12 @@ [0.025em] {\guilsinglright} {\guilsinglright} +\DeclareQuoteStyle[guillemets*]{swedish}% verified + {\guillemotright} + {\guillemotleft} + [0.025em] + {\guilsinglright} + {\guilsinglleft} % Fallback style @@ -2266,6 +2307,8 @@ \DeclareQuoteAlias[american]{english}{canadian} \DeclareQuoteAlias[american]{english}{english} \DeclareQuoteAlias[british]{english}{british} +\DeclareQuoteAlias[british]{english}{australian}% unsure +\DeclareQuoteAlias[british]{english}{newzealand}% unsure \DeclareQuoteAlias[guillemets]{norwegian}{norwegian} \DeclareQuoteAlias[quotes]{danish}{danish} \DeclareQuoteAlias[quotes]{french}{french} @@ -2359,16 +2402,17 @@ %% Last minute setup \AtBeginDocument{% + \providecommand*{\ifstringblank}{\csq@ifblank}% \@ifpackageloaded{babel} {\csq@mkbabel} {\csq@mknobabel}% - \let\csq@mkbabel\csq@undefined - \let\csq@mknobabel\csq@undefined + \let\csq@mkbabel\@undefined + \let\csq@mknobabel\@undefined \@ifpackageloaded{hyperref} {\expandafter\pdfstringdefDisableCommands \expandafter{\csq@mkhyperref}} {}% - \let\csq@mkhyperref\csq@undefined + \let\csq@mkhyperref\@undefined \csq@add\@noligs{\@verbatimquotes}% \@ifpackageloaded{verbatim} {\addto@hook\every@verbatim{\@verbatimquotes}} |