diff options
author | Karl Berry <karl@freefriends.org> | 2009-07-05 23:58:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-07-05 23:58:59 +0000 |
commit | 8af54b0bd151881cc1c52e60da853902e60a9c47 (patch) | |
tree | 43e07c03fb0f5e50d89458f1e5c13dd74708539e /Master/texmf-dist/tex/latex/csquotes/csquotes.sty | |
parent | 1d437f574468c600a966d8a5004eed5593de8b8d (diff) |
csquotes 4.4a (4jul09)
git-svn-id: svn://tug.org/texlive/trunk@14127 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/csquotes/csquotes.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/csquotes/csquotes.sty | 96 |
1 files changed, 59 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty index 0d9a486f7a1..ea4cf320843 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.4 2009/05/30 13:12:20 lehman stable $ +% $Id: csquotes.sty,v 4.4a 2009/07/04 14:49:23 lehman stable $ % Copyright (c) 2003-2009 Philipp Lehman. % @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{csquotes} -[\csq@rcsid $Id: csquotes.sty,v 4.4 2009/05/30 13:12:20 lehman stable $ +[\csq@rcsid $Id: csquotes.sty,v 4.4a 2009/07/04 14:49:23 lehman stable $ context-sensitive quotations] %% Compatibility and requirements @@ -604,6 +604,16 @@ % 1008/3002 question mark % 1009 suppress punctuation (biblatex only) +\mathchardef\csq@sf@comma=1003 +\mathchardef\csq@sf@semicolon=1004 +\mathchardef\csq@sf@colon=1005 +\mathchardef\csq@sf@period=1006 +\mathchardef\csq@sf@exclam=1007 +\mathchardef\csq@sf@question=1008 +\mathchardef\csq@sf@threshold@low=1002 +\mathchardef\csq@sf@threshold@term=1005 +\mathchardef\csq@sf@threshold@high=1009 + \def\csq@setsfcodes{% \ifcsdef{csq@sfcodes@\f@encoding} {\csuse{csq@sfcodes@\f@encoding}} @@ -641,24 +651,24 @@ } \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 +\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 - \ifnum\inputlineno=\m@ne\else - \@tempcnta"80 - \@tempcntb"9C - \csq@tempa - \@tempcnta"C0 - \@tempcntb"DF - \csq@tempa - \fi + \@tempcnta"C0 + \@tempcntb"DF + \csq@tempa +\fi \endgroup \csdef{csq@sfactor@1250}{1003} @@ -677,58 +687,70 @@ 1000% \fi} -\newcommand*{\ifquotepunct}{% - \ifnum\csq@spacefactor>1002 +\newcommand*{\ifquotecomma}{% + \ifnum\csq@spacefactor=\csq@sf@comma \expandafter\@firstoftwo \else \expandafter\@secondoftwo \fi} -\newcommand*{\ifquotecomma}{% - \ifnum\csq@spacefactor=1003 +\newcommand*{\ifquotesemicolon}{% + \ifnum\csq@spacefactor=\csq@sf@semicolon \expandafter\@firstoftwo \else \expandafter\@secondoftwo \fi} -\newcommand*{\ifquotesemicolon}{% - \ifnum\csq@spacefactor=1004 +\newcommand*{\ifquotecolon}{% + \ifnum\csq@spacefactor=\csq@sf@colon \expandafter\@firstoftwo \else \expandafter\@secondoftwo \fi} -\newcommand*{\ifquotecolon}{% - \ifnum\csq@spacefactor=1005 +\newcommand*{\ifquoteperiod}{% + \ifnum\csq@spacefactor=\csq@sf@period \expandafter\@firstoftwo \else \expandafter\@secondoftwo \fi} -\newcommand*{\ifquoteterm}{% - \ifnum\csq@spacefactor>1005 +\newcommand*{\ifquoteexclam}{% + \ifnum\csq@spacefactor=\csq@sf@exclam \expandafter\@firstoftwo \else \expandafter\@secondoftwo \fi} -\newcommand*{\ifquoteperiod}{% - \ifnum\csq@spacefactor=1006 +\newcommand*{\ifquotequestion}{% + \ifnum\csq@spacefactor=\csq@sf@question \expandafter\@firstoftwo \else \expandafter\@secondoftwo \fi} -\newcommand*{\ifquoteexclam}{% - \ifnum\csq@spacefactor=1007 - \expandafter\@firstoftwo +\newcommand*{\ifquotepunct}{% + \ifnum\csq@spacefactor>\csq@sf@threshold@low + \ifnum\csq@spacefactor<\csq@sf@threshold@high + \expandafter\expandafter + \expandafter\@firstoftwo + \else + \expandafter\expandafter + \expandafter\@secondoftwo + \fi \else \expandafter\@secondoftwo \fi} -\newcommand*{\ifquotequestion}{% - \ifnum\csq@spacefactor=1008 - \expandafter\@firstoftwo +\newcommand*{\ifquoteterm}{% + \ifnum\csq@spacefactor>\csq@sf@threshold@term + \ifnum\csq@spacefactor<\csq@sf@threshold@high + \expandafter\expandafter + \expandafter\@firstoftwo + \else + \expandafter\expandafter + \expandafter\@secondoftwo + \fi \else \expandafter\@secondoftwo \fi} |