summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/csquotes
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-07-05 23:58:59 +0000
committerKarl Berry <karl@freefriends.org>2009-07-05 23:58:59 +0000
commit8af54b0bd151881cc1c52e60da853902e60a9c47 (patch)
tree43e07c03fb0f5e50d89458f1e5c13dd74708539e /Master/texmf-dist/tex/latex/csquotes
parent1d437f574468c600a966d8a5004eed5593de8b8d (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')
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.def68
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.sty96
2 files changed, 108 insertions, 56 deletions
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.def b/Master/texmf-dist/tex/latex/csquotes/csquotes.def
index 03c2719e337..c00f2cf114e 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.4 2009/05/30 13:12:20 lehman stable $
+% $Id: csquotes.def,v 4.4a 2009/07/04 14:49:23 lehman stable $
\ProvidesFile{csquotes.def}
-[\csq@rcsid $Id: csquotes.def,v 4.4 2009/05/30 13:12:20 lehman stable $
+[\csq@rcsid $Id: csquotes.def,v 4.4a 2009/07/04 14:49:23 lehman stable $
csquotes generic definitions]
% Set defaults
@@ -118,6 +118,18 @@
[0.05em]
{\quotesinglbase}
{\textquoteright}
+\DeclareQuoteStyle[brazilian]{portuguese}% verified
+ {\textquotedblleft}
+ {\textquotedblright}
+ [0.05em]
+ {\textquoteleft}
+ {\textquoteright}
+\DeclareQuoteStyle[portuguese]{portuguese}% unsure
+ {\guillemotleft}
+ {\guillemotright}
+ [0.05em]
+ {\textquotedblleft}
+ {\textquotedblright}
\DeclareQuoteStyle{russian}% verified
{\guillemotleft}
{\guillemotright}
@@ -166,27 +178,30 @@
% Predefined aliases
+\DeclareQuoteAlias[quotes]{danish}{danish}
\DeclareQuoteAlias[american]{english}{american}
\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}
\DeclareQuoteAlias[quotes]{german}{austrian}
\DeclareQuoteAlias[quotes]{german}{german}
+\DeclareQuoteAlias[swiss]{german}{swiss}
\DeclareQuoteAlias[quotes]{italian}{italian}
+\DeclareQuoteAlias[guillemets]{norwegian}{norwegian}
+\DeclareQuoteAlias[brazilian]{portuguese}{brazilian}
+\DeclareQuoteAlias[portuguese]{portuguese}{portuguese}
\DeclareQuoteAlias[mexican]{spanish}{mexican}
\DeclareQuoteAlias[spanish]{spanish}{spanish}
\DeclareQuoteAlias[quotes]{swedish}{swedish}
-\DeclareQuoteAlias[swiss]{german}{swiss}
% Babel aliases
\DeclareQuoteAlias{american}{USenglish}
\DeclareQuoteAlias{american}{usenglish}
+\DeclareQuoteAlias{brazilian}{brazil}
\DeclareQuoteAlias{british}{UKenglish}
\DeclareQuoteAlias{british}{ukenglish}
\DeclareQuoteAlias{french}{frenchb}
@@ -194,6 +209,7 @@
\DeclareQuoteAlias{austrian}{naustrian}
\DeclareQuoteAlias{norwegian}{norsk}
\DeclareQuoteAlias{norwegian}{nynorsk}
+\DeclareQuoteAlias{portuguese}{portuges}
% Language options
@@ -217,9 +233,9 @@
\DeclareQuoteGlyph{OT2}{39}% = \textquoteright
\DeclareQuoteGlyph{OT2}{60}% = \guillemotleft
\DeclareQuoteGlyph{OT2}{62}% = \guillemotright
-\DeclareQuoteGlyph{OT2}{91}% = [[ ligature = \guillemotleft
-\DeclareQuoteGlyph{OT2}{93}% = ]] ligature = \guillemotright
\DeclareQuoteGlyph{OT2}{96}% = \textquoteleft
+%\DeclareQuoteGlyph{OT2}{91}% = [[ ligature = \guillemotleft
+%\DeclareQuoteGlyph{OT2}{93}% = ]] ligature = \guillemotright
\DeclareQuoteGlyph{OT4}{34}% = \textquotedblright
\DeclareQuoteGlyph{OT4}{39}% = \textquoteright
@@ -239,9 +255,9 @@
\DeclareQuoteGlyph{T1}{20}% = \guillemotright
\DeclareQuoteGlyph{T1}{34}% = \textquotedbl
\DeclareQuoteGlyph{T1}{39}% = \textquoteright
-\DeclareQuoteGlyph{T1}{60}% = << ligature = \guillemotleft
-\DeclareQuoteGlyph{T1}{62}% = >> ligature = \guillemotright
\DeclareQuoteGlyph{T1}{96}% = \textquoteleft
+%\DeclareQuoteGlyph{T1}{60}% = << ligature = \guillemotleft
+%\DeclareQuoteGlyph{T1}{62}% = >> ligature = \guillemotright
\DeclareQuoteGlyph{LY1}{34}% = \textquotedbl
\DeclareQuoteGlyph{LY1}{39}% = \textquoteright
@@ -260,55 +276,69 @@
\DeclareQuoteGlyph{T2A}{17}% = \textquotedblright
\DeclareQuoteGlyph{T2A}{34}% = \textquotedbl
\DeclareQuoteGlyph{T2A}{39}% = \textquoteright
-\DeclareQuoteGlyph{T2A}{60}% = << ligature = \guillemotleft
-\DeclareQuoteGlyph{T2A}{62}% = >> ligature = \guillemotright
\DeclareQuoteGlyph{T2A}{96}% = \textquoteleft
\DeclareQuoteGlyph{T2A}{189}% = \quotedblbase
\DeclareQuoteGlyph{T2A}{190}% = \guillemotleft
\DeclareQuoteGlyph{T2A}{191}% = \guillemotright
+%\DeclareQuoteGlyph{T2A}{60}% = << ligature = \guillemotleft
+%\DeclareQuoteGlyph{T2A}{62}% = >> ligature = \guillemotright
\DeclareQuoteGlyph{T2B}{16}% = \textquotedblleft
\DeclareQuoteGlyph{T2B}{17}% = \textquotedblright
\DeclareQuoteGlyph{T2B}{34}% = \textquotedbl
\DeclareQuoteGlyph{T2B}{39}% = \textquoteright
-\DeclareQuoteGlyph{T2B}{60}% = << ligature = \guillemotleft
-\DeclareQuoteGlyph{T2B}{62}% = >> ligature = \guillemotright
\DeclareQuoteGlyph{T2B}{96}% = \textquoteleft
\DeclareQuoteGlyph{T2B}{189}% = \quotedblbase
\DeclareQuoteGlyph{T2B}{190}% = \guillemotleft
\DeclareQuoteGlyph{T2B}{191}% = \guillemotright
+%\DeclareQuoteGlyph{T2B}{60}% = << ligature = \guillemotleft
+%\DeclareQuoteGlyph{T2B}{62}% = >> ligature = \guillemotright
\DeclareQuoteGlyph{T2C}{16}% = \textquotedblleft
\DeclareQuoteGlyph{T2C}{17}% = \textquotedblright
\DeclareQuoteGlyph{T2C}{34}% = \textquotedbl
\DeclareQuoteGlyph{T2C}{39}% = \textquoteright
-\DeclareQuoteGlyph{T2C}{60}% = << ligature = \guillemotleft
-\DeclareQuoteGlyph{T2C}{62}% = >> ligature = \guillemotright
\DeclareQuoteGlyph{T2C}{96}% = \textquoteleft
\DeclareQuoteGlyph{T2C}{189}% = \quotedblbase
\DeclareQuoteGlyph{T2C}{190}% = \guillemotleft
\DeclareQuoteGlyph{T2C}{191}% = \guillemotright
+%\DeclareQuoteGlyph{T2C}{60}% = << ligature = \guillemotleft
+%\DeclareQuoteGlyph{T2C}{62}% = >> ligature = \guillemotright
\DeclareQuoteGlyph{X2}{16}% = \textquotedblleft
\DeclareQuoteGlyph{X2}{17}% = \textquotedblright
\DeclareQuoteGlyph{X2}{34}% = \textquotedbl
\DeclareQuoteGlyph{X2}{39}% = \textquoteright
-\DeclareQuoteGlyph{X2}{60}% = << ligature = \guillemotleft
-\DeclareQuoteGlyph{X2}{62}% = >> ligature = \guillemotright
\DeclareQuoteGlyph{X2}{96}% = \textquoteleft
\DeclareQuoteGlyph{X2}{189}% = \quotedblbase
\DeclareQuoteGlyph{X2}{190}% = \guillemotleft
\DeclareQuoteGlyph{X2}{191}% = \guillemotright
+%\DeclareQuoteGlyph{X2}{60}% = << ligature = \guillemotleft
+%\DeclareQuoteGlyph{X2}{62}% = >> ligature = \guillemotright
\DeclareQuoteGlyph{LCY}{13}% = \textquotesingle
\DeclareQuoteGlyph{LCY}{34}% = \textquotedbl
\DeclareQuoteGlyph{LCY}{39}% = \textquoteright
-\DeclareQuoteGlyph{LCY}{60}% = << ligature = \guillemotleft
-\DeclareQuoteGlyph{LCY}{62}% = >> ligature = \guillemotright
\DeclareQuoteGlyph{LCY}{96}% = \textquoteleft
\DeclareQuoteGlyph{LCY}{253}% = \guillemotleft
\DeclareQuoteGlyph{LCY}{254}% = \guillemotright
\DeclareQuoteGlyph{LCY}{255}% = \quotedblbase
+%\DeclareQuoteGlyph{LCY}{60}% = << ligature = \guillemotleft
+%\DeclareQuoteGlyph{LCY}{62}% = >> ligature = \guillemotright
+
+% Unicode (XeTeX)
+\DeclareQuoteGlyph{EU1}{34}% = \textquotedbl
+\DeclareQuoteGlyph{EU1}{39}% = \textquotesingle
+\DeclareQuoteGlyph{EU1}{171}% = \guillemotleft
+\DeclareQuoteGlyph{EU1}{172}% = \guillemotright
+\DeclareQuoteGlyph{EU1}{8249}% = \guilsinglleft
+\DeclareQuoteGlyph{EU1}{8250}% = \guilsinglright
+\DeclareQuoteGlyph{EU1}{8216}% = \textquoteleft
+\DeclareQuoteGlyph{EU1}{8217}% = \quotesinglbase
+\DeclareQuoteGlyph{EU1}{8218}% = \textquoteright
+\DeclareQuoteGlyph{EU1}{8220}% = \textquotedblleft
+\DeclareQuoteGlyph{EU1}{8221}% = \textquotedblright
+\DeclareQuoteGlyph{EU1}{8222}% = \quotedblbase
\endinput
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}