summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-03-28 23:10:18 +0000
committerKarl Berry <karl@freefriends.org>2011-03-28 23:10:18 +0000
commit5821532477f392106277500f4f4747409957fc76 (patch)
tree758ebb87beac58bde67d54fab9fc2fedcbc9125f /Master/texmf-dist/tex
parent5d418e5d01cadb145d62f7e48545d38bbf91d064 (diff)
csquotes (28mar11)
git-svn-id: svn://tug.org/texlive/trunk@21867 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csq-compat.def4
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.def4
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.sty19
4 files changed, 19 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/csquotes/csq-compat.def b/Master/texmf-dist/tex/latex/csquotes/csq-compat.def
index f7d71814080..02c1469e78b 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.1b 2011/01/20 20:31:49 lehman stable $
+% $Id: csq-compat.def,v 5.1c 2011/03/25 20:24:11 lehman stable $
\ProvidesFile{csquotes.def}
-[\csq@rcsid $Id: csq-compat.def,v 5.1b 2011/01/20 20:31:49 lehman stable $
+[\csq@rcsid $Id: csq-compat.def,v 5.1c 2011/03/25 20:24:11 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 187a4cd95b0..a9da426e9ae 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.1b 2011/01/20 20:31:49 lehman stable $
+% $Id: csquotes.cfg,v 5.1c 2011/03/25 20:24:11 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 5483a2377b9..f4663a5cb65 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.1b 2011/01/20 20:31:49 lehman stable $
+% $Id: csquotes.def,v 5.1c 2011/03/25 20:24:11 lehman stable $
\ProvidesFile{csquotes.def}
-[\csq@rcsid $Id: csquotes.def,v 5.1b 2011/01/20 20:31:49 lehman stable $
+[\csq@rcsid $Id: csquotes.def,v 5.1c 2011/03/25 20:24:11 lehman stable $
csquotes generic definitions]
% Set defaults
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
index 2e58fd40b26..82cf213566f 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.1b 2011/01/20 20:31:49 lehman stable $
+% $Id: csquotes.sty,v 5.1c 2011/03/25 20:24:11 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.1b 2011/01/20 20:31:49 lehman stable $
+[\csq@rcsid $Id: csquotes.sty,v 5.1c 2011/03/25 20:24:11 lehman stable $
context-sensitive quotations]
\def\csq@version$#1: #2.#3 ${#2#3}
@@ -528,12 +528,20 @@
\fi
\csq@tempa}
-\appto\@parboxrestore{%
+\def\blx@hook@parboxrestore{%
\let\csq@theeverypar\@empty
\csq@qlevel\z@
\toggletrue{csq@parbox}%
\togglefalse{csq@block}}
+\protected\def\blx@parboxrestore{%
+ \ifx\protect\noexpand % \@outputpage
+ \else
+ \blx@hook@parboxrestore
+ \fi}
+
+\appto\@parboxrestore{\blx@parboxrestore}
+
%% Restore kerning
\def\csq@fixkern{%
@@ -795,7 +803,8 @@
\def\csq@resetlang{%
\ifdef\csq@mainlang
- {\csuse{otherlanguage*}{\csq@mainlang}}% FIXME
+ {\csuse{otherlanguage*}{\csq@mainlang}%
+ \let\csq@resetlang\relax}
{}}
\protected\long\def\csq@switchlang#1{%
@@ -844,7 +853,7 @@
\righthyphenmin#2\relax}
\appto\csq@hook@multilang{%
- \appto\@parboxrestore{\csq@resetlang}%
+ \appto\blx@hook@parboxrestore{\csq@resetlang}%
\ifundef\l@usenglish
{\ifundef\l@USenglish
{}