summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-11-30 00:25:49 +0000
committerKarl Berry <karl@freefriends.org>2008-11-30 00:25:49 +0000
commit12c250fa4675512940f0f2f11a24a1c6b06d2de3 (patch)
treefa7129fb5e6132f36ce2ee015403767c893d44d3 /Master/texmf-dist/tex
parent1c92a89feaff3bdd0644925dfd991004ff71bdeb (diff)
csquotes 4.3 (29nov08)
git-svn-id: svn://tug.org/texlive/trunk@11476 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.cfg8
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.def7
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.sty120
3 files changed, 78 insertions, 57 deletions
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg b/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg
index 4dbcfded413..ef1ba59ccac 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 4.2 2008/06/24 17:09:34 lehman stable $
+% $Id: csquotes.cfg,v 4.3 2008/11/23 16:02:45 lehman stable $
-\ProvidesFile{csquotes.cfg}[2008/06/24 v4.2 csquotes configuration]
+\ProvidesFile{csquotes.cfg}[2008/11/23 v4.3 csquotes configuration]
% Put your definitions here.
@@ -17,7 +17,7 @@
% processed before any options specified in the document preamble,
% so you can still override them in the preamble.
-\ExecuteQuoteOptions{strict=true,babel=tryonce}
+\ExecuteQuoteOptions{strict=true,babel=try}
% CHANGING THE DEFAULT PARAMETERS
@@ -245,3 +245,5 @@
{\endquote\endgroup}
\SetBlockEnvironment{smallparaquote}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.def b/Master/texmf-dist/tex/latex/csquotes/csquotes.def
index 9f997626da7..53104924cff 100644
--- a/Master/texmf-dist/tex/latex/csquotes/csquotes.def
+++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.def
@@ -1,9 +1,12 @@
-% $Id: csquotes.def,v 4.2 2008/06/24 17:09:34 lehman stable $
+% $Id: csquotes.def,v 4.3 2008/11/23 16:02:45 lehman stable $
-\ProvidesFile{csquotes.def}[2008/06/24 v4.2 csquotes generic definitions]
+\ProvidesFile{csquotes.def}
+[\csq@rcsid $Id: csquotes.def,v 4.3 2008/11/23 16:02:45 lehman stable $
+ csquotes generic definitions]
% Set defaults
+\ExecuteQuoteOptions{babel=tryonce}
\SetBlockEnvironment{quote}
\SetBlockThreshold{3}
\SetCiteCommand{\cite}
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
index c255dc5e476..1d56c2337d3 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.2 2008/06/24 17:09:34 lehman stable $
+% $Id: csquotes.sty,v 4.3 2008/11/23 16:02:45 lehman stable $
% Copyright (c) 2003-2008 Philipp Lehman.
%
@@ -14,21 +14,26 @@
% implied warranties of merchantability and fitness for a
% particular purpose.
+\def\csq@rcsid$#1: #2 #3 #4 #5${#4 v#3}
+
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{csquotes}[2008/06/24 v4.2 context-sensitive quotations]
+\ProvidesPackage{csquotes}
+[\csq@rcsid $Id: csquotes.sty,v 4.3 2008/11/23 16:02:45 lehman stable $
+ context-sensitive quotations]
%% Compatibility and requirements
\RequirePackage{etoolbox}
-\@ifpackagelater{etoolbox}{2008/06/22}
+\RequirePackage{keyval}
+
+\@ifpackagelater{etoolbox}{2008/06/28}
{}
- {\PackageError{biblatex}
+ {\PackageError{csquotes}
{Outdated 'etoolbox' package}
- {Upgrade to etoolbox 1.6 (2008/06/22) or later.\MessageBreak
+ {Upgrade to etoolbox v1.7 (2008/06/28) or later.\MessageBreak
I found: '\csname ver@etoolbox.sty\endcsname'.\MessageBreak
This is a fatal error. I'm aborting now.}%
\endinput}
-\RequirePackage{keyval}
\@ifpackageloaded{inputenc}
{}
@@ -278,7 +283,7 @@
\csq@error
{Patching #1 failed}
{This is an internal issue typically caused by a
- conflict\MessageBreak between biblatex and some
+ conflict\MessageBreak between csquotes and some
other package. Modifying\MessageBreak the package
loading order may fix the problem}}
@@ -465,32 +470,30 @@
\csq@addto@everypar{\csq@theeverypar}%
\fi
\begingroup
- \settowidth{\@tempdima}{%
- \csq@theqmark@oopen\csq@theqmark@iopen}%
- \settowidth{\@tempdimb}{%
- \csq@theqmark@oopen\unkern\csq@theqmark@iopen}%
- \ifdim\@tempdima=\@tempdimb
- \def\csq@tempa{\endgroup
- \let\csq@thekern@open\csq@theqmark@kern}%
- \else
- \addtolength{\@tempdima}{-\@tempdimb}%
- \edef\csq@tempa{\endgroup
- \def\noexpand\csq@thekern@open{\the\@tempdima}}%
- \fi
+ \settowidth{\@tempdima}{%
+ \csq@theqmark@oopen\csq@theqmark@iopen}%
+ \settowidth{\@tempdimb}{%
+ \csq@theqmark@oopen\unkern\csq@theqmark@iopen}%
+ \ifdim\@tempdima=\@tempdimb
+ \let\csq@tempa\endgroup
+ \else
+ \addtolength{\@tempdima}{-\@tempdimb}%
+ \edef\csq@tempa{\endgroup
+ \def\noexpand\csq@thekern@open{\the\@tempdima}}%
+ \fi
\csq@tempa
\begingroup
- \settowidth{\@tempdima}{%
- \csq@theqmark@iclose\csq@theqmark@oclose}%
- \settowidth{\@tempdimb}{%
- \csq@theqmark@iclose\unkern\csq@theqmark@oclose}%
- \ifdim\@tempdima=\@tempdimb
- \def\csq@tempa{\endgroup
- \let\csq@thekern@close\csq@theqmark@kern}%
- \else
- \addtolength{\@tempdima}{-\@tempdimb}%
- \edef\csq@tempa{\endgroup
- \def\noexpand\csq@thekern@close{\the\@tempdima}}%
- \fi
+ \settowidth{\@tempdima}{%
+ \csq@theqmark@iclose\csq@theqmark@oclose}%
+ \settowidth{\@tempdimb}{%
+ \csq@theqmark@iclose\unkern\csq@theqmark@oclose}%
+ \ifdim\@tempdima=\@tempdimb
+ \let\csq@tempa\endgroup
+ \else
+ \addtolength{\@tempdima}{-\@tempdimb}%
+ \edef\csq@tempa{\endgroup
+ \def\noexpand\csq@thekern@close{\the\@tempdima}}%
+ \fi
\csq@tempa
\fi
\ifnum\csq@qlevel=\tw@
@@ -521,22 +524,24 @@
\def\csq@restkern@ii{%
\ifcat a\noexpand\csq@kerntok@ii
\expandafter\csq@restkern@iii
- \fi
- \ifcat 1\noexpand\csq@kerntok@ii
- \expandafter\csq@restkern@iii
+ \else
+ \ifcat 1\noexpand\csq@kerntok@ii
+ \expandafter\expandafter
+ \expandafter\csq@restkern@iii
+ \fi
\fi}
\def\csq@restkern@iii{%
\begingroup
- \settowidth{\@tempdima}{%
- \csq@kerntok@i\csq@kerntok@ii}%
- \settowidth{\@tempdimb}{%
- \csq@kerntok@i\relax\csq@kerntok@ii}%
- \ifdim\@tempdima=\@tempdimb
- \else
- \addtolength{\@tempdima}{-\@tempdimb}%
- \penalty\@M\hskip\@tempdima\relax
- \fi
+ \settowidth{\@tempdima}{%
+ \csq@kerntok@i\csq@kerntok@ii}%
+ \settowidth{\@tempdimb}{%
+ \csq@kerntok@i\relax\csq@kerntok@ii}%
+ \ifdim\@tempdima=\@tempdimb
+ \else
+ \addtolength{\@tempdima}{-\@tempdimb}%
+ \penalty\@M\hskip\@tempdima\relax
+ \fi
\endgroup}
%% Detect and kern adjoining quotes
@@ -544,8 +549,9 @@
\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@thekern@open{\csq@theqmark@kern}
+\def\csq@thekern@close{\csq@theqmark@kern}
+\def\csq@theqmark@kern{0.1em}
\def\csq@setmark@open{%
\penalty\@M
@@ -553,8 +559,8 @@
\hskip\csq@themark\relax}
\def\csq@setmark@close{%
- \kern-\csq@themark
- \kern\csq@themark}
+ \kern-\csq@themark\relax
+ \kern\csq@themark\relax}
\def\csq@addkern@open{%
\ifdim\lastskip=\csq@kernmark
@@ -1344,8 +1350,8 @@
\ifdef\inpenc@prehook % inputenc 2006/05/05 v1.1b
{\AtBeginDocument{%
\addto@hook\inpenc@prehook{%
- \csq@info{Input encoding change}%
- \csq@mkdelete}}}
+ \csq@info{Input encoding change}%
+ \csq@mkdelete}}}
{}
% Regular specials
@@ -2012,7 +2018,10 @@
\newrobustcmd*{\textooquote}{%
\csq@resetstyle
- \csq@theqmark@oopen}
+ \csq@theqmark@oopen
+ \csq@setmark@open
+ \let\csq@kerntok@i\csq@theqmark@oopen
+ \csq@restkern}
\newrobustcmd*{\textmoquote}{%
\csq@resetstyle
@@ -2020,10 +2029,14 @@
\newrobustcmd*{\textcoquote}{%
\csq@resetstyle
- \csq@theqmark@oclose}
+ \csq@addkern@close
+ \csq@theqmark@oclose
+ \let\csq@kerntok@i\csq@theqmark@oclose
+ \csq@restkern}
\newrobustcmd*{\textoiquote}{%
\csq@resetstyle
+ \csq@addkern@open
\csq@theqmark@iopen}
\newrobustcmd*{\textmiquote}{%
@@ -2032,7 +2045,10 @@
\newrobustcmd*{\textciquote}{%
\csq@resetstyle
- \csq@theqmark@iclose}
+ \csq@theqmark@iclose
+ \csq@setmark@close
+ \let\csq@kerntok@i\csq@theqmark@iclose
+ \csq@restkern}
%% Space factor codes