csquotes (24oct11)

git-svn-id: svn://tug.org/texlive/trunk@24393 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 30 insertions, 19 deletions

diff --git a/Master/texmf-dist/tex/latex/csquotes/csq-compat.def b/Master/texmf-dist/tex/latex/csquotes/csq-compat.def
index 02c1469e78b..28aceed087c 100644
--- a/Master/texmf-dist/tex/latex/csquotes/csq-compat.def
+++ b/Master/texmf-dist/tex/latex/csquotes/csq-compat.def
@@ -1,7 +1,7 @@
-% $Id: csq-compat.def,v 5.1c 2011/03/25 20:24:11 lehman stable $
+% $Id: csq-compat.def,v 5.1d 2011/10/22 19:17:39 lehman stable $
 
 \ProvidesFile{csquotes.def}
-[\csq@rcsid $Id: csq-compat.def,v 5.1c 2011/03/25 20:24:11 lehman stable $
+[\csq@rcsid $Id: csq-compat.def,v 5.1d 2011/10/22 19:17:39 lehman stable $
  csquotes backwards compatibility]
 
 \def\csq@getversion#1{%
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg b/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg
index a9da426e9ae..d78f719fc3c 100644
--- a/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg
+++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg
@@ -1,4 +1,4 @@
-% $Id: csquotes.cfg,v 5.1c 2011/03/25 20:24:11 lehman stable $
+% $Id: csquotes.cfg,v 5.1d 2011/10/22 19:17:39 lehman stable $
 
 \ProvidesFile{csquotes.cfg}
 
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.def b/Master/texmf-dist/tex/latex/csquotes/csquotes.def
index f4663a5cb65..bdc98f25aa0 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 5.1c 2011/03/25 20:24:11 lehman stable $
+% $Id: csquotes.def,v 5.1d 2011/10/22 19:17:39 lehman stable $
 
 \ProvidesFile{csquotes.def}
-[\csq@rcsid $Id: csquotes.def,v 5.1c 2011/03/25 20:24:11 lehman stable $
+[\csq@rcsid $Id: csquotes.def,v 5.1d 2011/10/22 19:17:39 lehman stable $
  csquotes generic definitions]
 
 % Set defaults
@@ -122,11 +122,9 @@
   {\textquoteright}
 \DeclareQuoteStyle[guillemets]{italian}
   {\guillemotleft}
-  [\textquotedblright]% unsure
   {\guillemotright}
   [0.025em]
   {\textquotedblleft}
-  [\textquotedblright]% unsure
   {\textquotedblright}
 \DeclareQuoteStyle[guillemets]{norwegian}
   {\guillemotleft}
@@ -212,7 +210,7 @@
 \DeclareQuoteAlias[quotes]{german}{austrian}
 \DeclareQuoteAlias[quotes]{german}{german}
 \DeclareQuoteAlias[swiss]{german}{swiss}
-\DeclareQuoteAlias[quotes]{italian}{italian}
+\DeclareQuoteAlias[guillemets]{italian}{italian}
 \DeclareQuoteAlias[guillemets]{norwegian}{norwegian}
 \DeclareQuoteAlias[brazilian]{portuguese}{brazilian}
 \DeclareQuoteAlias[portuguese]{portuguese}{portuguese}
@@ -361,11 +359,11 @@
 \DeclareQuoteGlyph{EU1}{"2018}% = comma quot. mark, single turned         = \textquoteleft
 \DeclareQuoteGlyph{EU1}{"2019}% = comma quot. mark, single                = \textquoteright
 \DeclareQuoteGlyph{EU1}{"201A}% = comma quot. mark, low single            = \quotesinglbase
-\DeclareQuoteGlyph{EU1}{"201B}% = comma quot. mark, single reversed       = n.a.
+\DeclareQuoteGlyph{EU1}{"201B}% = comma quot. mark, single reversed       = n/a
 \DeclareQuoteGlyph{EU1}{"201C}% = comma quot. mark, double turned         = \textquotedblleft
 \DeclareQuoteGlyph{EU1}{"201D}% = comma quot. mark, double                = \textquotedblright
 \DeclareQuoteGlyph{EU1}{"201E}% = comma quot. mark, low double            = \quotedblbase
-\DeclareQuoteGlyph{EU1}{"201F}% = comma quot. mark, double reversed       = n.a.
+\DeclareQuoteGlyph{EU1}{"201F}% = comma quot. mark, double reversed       = n/a
 \DeclareQuoteGlyph{EU1}{"2039}% = angle quot. mark, left-pointing single  = \guilsinglleft
 \DeclareQuoteGlyph{EU1}{"203A}% = angle quot. mark, right-pointing single = \guilsinglright
 
@@ -377,11 +375,11 @@
 \DeclareQuoteGlyph{EU2}{"2018}% = comma quot. mark, single turned         = \textquoteleft
 \DeclareQuoteGlyph{EU2}{"2019}% = comma quot. mark, single                = \textquoteright
 \DeclareQuoteGlyph{EU2}{"201A}% = comma quot. mark, low single            = \quotesinglbase
-\DeclareQuoteGlyph{EU2}{"201B}% = comma quot. mark, single reversed       = n.a.
+\DeclareQuoteGlyph{EU2}{"201B}% = comma quot. mark, single reversed       = n/a
 \DeclareQuoteGlyph{EU2}{"201C}% = comma quot. mark, double turned         = \textquotedblleft
 \DeclareQuoteGlyph{EU2}{"201D}% = comma quot. mark, double                = \textquotedblright
 \DeclareQuoteGlyph{EU2}{"201E}% = comma quot. mark, low double            = \quotedblbase
-\DeclareQuoteGlyph{EU2}{"201F}% = comma quot. mark, double reversed       = n.a.
+\DeclareQuoteGlyph{EU2}{"201F}% = comma quot. mark, double reversed       = n/a
 \DeclareQuoteGlyph{EU2}{"2039}% = angle quot. mark, left-pointing single  = \guilsinglleft
 \DeclareQuoteGlyph{EU2}{"203A}% = angle quot. mark, right-pointing single = \guilsinglright
 
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
index 82cf213566f..aef0dcba32e 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 5.1c 2011/03/25 20:24:11 lehman stable $
+% $Id: csquotes.sty,v 5.1d 2011/10/22 19:17:39 lehman stable $
 
 % Copyright (c) 2003-2011 Philipp Lehman.
 %
@@ -18,7 +18,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{csquotes}
-[\csq@rcsid $Id: csquotes.sty,v 5.1c 2011/03/25 20:24:11 lehman stable $
+[\csq@rcsid $Id: csquotes.sty,v 5.1d 2011/10/22 19:17:39 lehman stable $
  context-sensitive quotations]
 
 \def\csq@version$#1: #2.#3 ${#2#3}
@@ -488,7 +488,9 @@
       \csq@thequote@iclose
       \let\csq@kernchar@i\csq@thequote@iclose
     \fi
-    \csq@setmarker@close
+    \ifnum\csq@qlevel>\@ne
+      \csq@setmarker@close
+    \fi
     \ifblank{#1}{}{\expandafter#1}%
     \expandafter\csq@eqgroup
       \expandafter\def
@@ -567,7 +569,7 @@
   \settowidth{\@tempdima}{%
     \csq@kernchar@i\csq@kernchar@ii}%
   \settowidth{\@tempdimb}{%
-    \csq@kernchar@i\relax\csq@kernchar@ii}%
+    \csq@kernchar@i\kern\z@\csq@kernchar@ii}%
   \ifdim\@tempdima=\@tempdimb
   \else
     \addtolength{\@tempdima}{-\@tempdimb}%
@@ -983,6 +985,7 @@
 \AfterEndPreamble{% babel
   \begingroup
   \makeatletter
+  \endlinechar\m@ne
   \edef\csq@tempa{%
     \noexpand\scantokens{%
       \gdef\noexpand\csq@autopunct{\csq@autopunct}%
@@ -1959,18 +1962,28 @@
        {\csq@setqstyle[]}}}
 
 \def\csq@setqstyle[#1]#2{%
-  \ifnum\csq@reset=\@ne
+  \ifnum\csq@reset>\z@
     \csq@info{Disabling multilingual quotes}%
     \csq@reset\z@
   \fi
   \ifblank{#1}
-    {\csq@setstyle{#2}}
-    {\csq@setstyle{#2/#1}}}
+    {\DeclareQuoteAlias{#2}{default}}
+    {\DeclareQuoteAlias{#2/#1}{default}}}
 
 \def\csq@resetqstyle{%
   \csq@info{Enabling multilingual quotes}%
   \csq@reset\@ne}
 
+\AtEndPreamble{%
+  \def\csq@setqstyle[#1]#2{%
+    \ifnum\csq@reset=\@ne
+      \csq@info{Disabling multilingual quotes}%
+      \csq@reset\z@
+    \fi
+    \ifblank{#1}
+      {\csq@setstyle{#2}}
+      {\csq@setstyle{#2/#1}}}}
+
 %% Define quote styles
 
 \newrobustcmd*{\DeclareQuoteStyle}[2][]{%