summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/csquotes
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-07-26 21:51:50 +0000
committerKarl Berry <karl@freefriends.org>2009-07-26 21:51:50 +0000
commited7edd5d64a690ffa0537f417f369c5f40fb8eed (patch)
treed04c3695604b61681cca20f9e6231bfa689d67c5 /Master/texmf-dist/tex/latex/csquotes
parent8b60efe1c27cce5141a056e673beca041a6ba806 (diff)
csquotes 4.4b (25jul09)
git-svn-id: svn://tug.org/texlive/trunk@14459 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/csquotes')
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.def61
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.sty37
2 files changed, 50 insertions, 48 deletions
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.def b/Master/texmf-dist/tex/latex/csquotes/csquotes.def
index c00f2cf114e..432400d63b9 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.4a 2009/07/04 14:49:23 lehman stable $
+% $Id: csquotes.def,v 4.4b 2009/07/24 19:02:53 lehman stable $
\ProvidesFile{csquotes.def}
-[\csq@rcsid $Id: csquotes.def,v 4.4a 2009/07/04 14:49:23 lehman stable $
+[\csq@rcsid $Id: csquotes.def,v 4.4b 2009/07/24 19:02:53 lehman stable $
csquotes generic definitions]
% Set defaults
@@ -327,18 +327,20 @@
%\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
+\DeclareQuoteGlyph{EU1}{"0022}% = neutral quotation mark, double = \textquotedbl
+\DeclareQuoteGlyph{EU1}{"0027}% = neutral quotation mark, single = \textquotesingle
+\DeclareQuoteGlyph{EU1}{"00AB}% = angle quotation mark, left-pointing double = \guillemotleft
+\DeclareQuoteGlyph{EU1}{"00BB}% = angle quotation mark, right-pointing double = \guillemotright
+\DeclareQuoteGlyph{EU1}{"2018}% = comma quotation mark, single turned = \textquoteleft
+\DeclareQuoteGlyph{EU1}{"2019}% = comma quotation mark, single = \textquoteright
+\DeclareQuoteGlyph{EU1}{"201A}% = comma quotation mark, low single = \quotesinglbase
+\DeclareQuoteGlyph{EU1}{"201B}% = comma quotation mark, single reversed = n.a.
+\DeclareQuoteGlyph{EU1}{"201C}% = comma quotation mark, double turned = \textquotedblleft
+\DeclareQuoteGlyph{EU1}{"201D}% = comma quotation mark, double = \textquotedblright
+\DeclareQuoteGlyph{EU1}{"201E}% = comma quotation mark, low double = \quotedblbase
+\DeclareQuoteGlyph{EU1}{"201F}% = comma quotation mark, double reversed = n.a.
+\DeclareQuoteGlyph{EU1}{"2039}% = angle quotation mark, left-pointing single = \guilsinglleft
+\DeclareQuoteGlyph{EU1}{"203A}% = angle quotation mark, right-pointing single = \guilsinglright
\endinput
@@ -347,10 +349,15 @@
% The \fixligatures command used in the above styles is provided
% by csquotes.sty. It is used as follows:
%
-% \fixligatures\textquoteleft
+% \fixligatures\textquoteleft
%
-% and will prevent the undesirable ligatures ?` and !` with
-% T1 encoding.
+% and will suppress the ligatures
+%
+% ?` -> \textquestiondown
+% and
+% !` -> \textexclamdown
+%
+% in T1 encoding.
% \initfrenchquotes is also provided by csquotes.sty. This command
% is intended for use in the 'outer initialization' argument of
@@ -359,11 +366,11 @@
% required by some styles which use the same quotation marks on both
% the outer and the inner level. If enabled, you get:
%
-% <<outer quote <<inner quote>>
+% <<outer quote <<inner quote>>
%
% instead of
%
-% <<outer quote <<inner quote>> >>
+% <<outer quote <<inner quote>> >>
%
% That is, if two nested quotations end simultaneously, the second
% closing mark is omitted.
@@ -372,15 +379,15 @@
% intended for spaced-out quotation marks as used in French. They
% are employed as follows:
%
-% \mkfrenchopenquote{\guillemotleft}
-% \mkfrenchclosequote{\guillemotright}
+% \mkfrenchopenquote{\guillemotleft}
+% \mkfrenchclosequote{\guillemotright}
%
% and will use a command called \@frenchquotespace to space out the
% quotation marks. The spacing is:
%
-% \hskip 0.8\fontdimen2\font
-% plus 0.3\fontdimen3\font
-% minus 0.3\fontdimen4\font
+% \hskip 0.8\fontdimen2\font
+% plus 0.3\fontdimen3\font
+% minus 0.3\fontdimen4\font
%
% This is similar to what the \og and \fg commands of babel's
% french.ldf use. It yields a stretchable space whose natural size
@@ -392,12 +399,12 @@
% If you prefer a full interword space, redefine \@frenchquotespace
% as follows:
%
-% \renewcommand*{\@frenchquotespace}{%
-% \hskip\fontdimen2\font\relax}
+% \renewcommand*{\@frenchquotespace}{%
+% \hskip\fontdimen2\font\relax}
%
% or:
%
-% \renewcommand*{\@frenchquotespace}{\space}
+% \renewcommand*{\@frenchquotespace}{\space}
%
% In either case, the difference to the default values is so subtle,
% you will hardly notice it in most cases.
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
index ea4cf320843..52a825789da 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.4a 2009/07/04 14:49:23 lehman stable $
+% $Id: csquotes.sty,v 4.4b 2009/07/24 19:02:53 lehman stable $
% Copyright (c) 2003-2009 Philipp Lehman.
%
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{csquotes}
-[\csq@rcsid $Id: csquotes.sty,v 4.4a 2009/07/04 14:49:23 lehman stable $
+[\csq@rcsid $Id: csquotes.sty,v 4.4b 2009/07/24 19:02:53 lehman stable $
context-sensitive quotations]
%% Compatibility and requirements
@@ -59,7 +59,7 @@
{}
{\csq@error
{Outdated 'biblatex' package}
- {Upgrade to biblatex v0.8d (2009/05/30) or later.\MessageBreak
+ {Upgrade to biblatex v0.8d (2009/05/30) or later.\MessageBreak
I found: '\csuse{ver@biblatex.sty}'}}}
{}}
@@ -1840,28 +1840,23 @@
% Author interface
-\newrobustcmd*{\@enablequotes}{}
-\newrobustcmd*{\@disablequotes}{}
-\newrobustcmd*{\@verbatimquotes}{}
+\newrobustcmd*{\@enablequotes}{%
+ \csq@quiettrue
+ \csq@mkenable
+ \csq@quietfalse}
+\newrobustcmd*{\@disablequotes}{%
+ \csq@quiettrue
+ \csq@mkdisable
+ \csq@quietfalse}
+\newrobustcmd*{\@verbatimquotes}{%
+ \csq@quiettrue
+ \csq@mkverbatim
+ \csq@quietfalse}
\newrobustcmd*{\@deletequotes}{%
\csq@quiettrue
\csq@mkdelete
\csq@quietfalse}
-\AtBeginDocument{%
- \protected\def\@enablequotes{%
- \csq@quiettrue
- \csq@mkenable
- \csq@quietfalse}%
- \protected\def\@disablequotes{%
- \csq@quiettrue
- \csq@mkdisable
- \csq@quietfalse}%
- \protected\def\@verbatimquotes{%
- \csq@quiettrue
- \csq@mkverbatim
- \csq@quietfalse}}
-
% Legacy
\newrobustcmd*{\RestoreQuotes}{%
@@ -1992,7 +1987,7 @@
%% Space factor codes
\newrobustcmd*{\DeclareQuoteGlyph}[2]{%
- \csgappto{csq@sfcodes@#1}{\sfcode#2=\z@\relax}}
+ \csxappto{csq@sfcodes@#1}{\sfcode\detokenize{#2}=\z@}}
%% Set defaults