diff options
author | Karl Berry <karl@freefriends.org> | 2010-09-12 17:58:12 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-09-12 17:58:12 +0000 |
commit | fe4604f3f7266c2c0b5f1b8ef8880d4992131042 (patch) | |
tree | ca90dd532eb924202b493d80726b9675fc5e5c53 /Master/texmf-dist/tex/latex/csquotes | |
parent | 83d140b277b427096e87ff58a7307adb3fd585c4 (diff) |
csquotes 5.0b (6aug10)
git-svn-id: svn://tug.org/texlive/trunk@19675 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/csquotes')
4 files changed, 22 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 0a8f667b209..d787fe51902 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.0 2010/06/02 19:13:37 lehman stable $ +% $Id: csq-compat.def,v 5.0b 2010/08/06 18:16:03 lehman stable $ \ProvidesFile{csquotes.def} -[\csq@rcsid $Id: csq-compat.def,v 5.0 2010/06/02 19:13:37 lehman stable $ +[\csq@rcsid $Id: csq-compat.def,v 5.0b 2010/08/06 18:16:03 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 9004271d451..39953d0b3b1 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.0 2010/06/02 19:22:07 lehman stable $ +% $Id: csquotes.cfg,v 5.0b 2010/08/06 18:16:03 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 43e7d3b8796..f5611ca08e8 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.0 2010/06/02 19:13:37 lehman stable $ +% $Id: csquotes.def,v 5.0b 2010/08/06 18:16:03 lehman stable $ \ProvidesFile{csquotes.def} -[\csq@rcsid $Id: csquotes.def,v 5.0 2010/06/02 19:13:37 lehman stable $ +[\csq@rcsid $Id: csquotes.def,v 5.0b 2010/08/06 18:16:03 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 dea2ebf12b6..a29534c45f3 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.0a 2010/06/09 20:45:32 lehman stable $ +% $Id: csquotes.sty,v 5.0b 2010/08/06 18:16:03 lehman stable $ % Copyright (c) 2003-2010 Philipp Lehman. % @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{csquotes} -[\csq@rcsid $Id: csquotes.sty,v 5.0a 2010/06/09 20:45:32 lehman stable $ +[\csq@rcsid $Id: csquotes.sty,v 5.0b 2010/08/06 18:16:03 lehman stable $ context-sensitive quotations] \def\csq@version$#1: #2.#3 ${#2#3} @@ -98,6 +98,7 @@ \providecommand{\@gobblethree}[3]{} \providecommand{\@gobblefive}[5]{} +\providecommand{\@gobbletwo@optarg}[2][]{} % {<item>}{<list>}{<separator>} @@ -910,7 +911,7 @@ \ifx#1&% \expandafter\csq@getpunct@v \fi - \if\noexpand#1\noexpand\@let@token + \ifx#1\@let@token \expandafter\csq@getpunct@iii \fi \csq@getpunct@ii} @@ -922,7 +923,7 @@ \ifx#1&% \expandafter\csq@getpunct@vi \fi - \if\noexpand#1\noexpand\@let@token + \ifx#1\@let@token \expandafter\csq@getpunct@vii \fi \csq@getpunct@iv} @@ -936,11 +937,21 @@ \newrobustcmd*{\DeclareAutoPunct}[1]{% \ifblank{#1} {\def\csq@autopunct{}} - {\edef\csq@autopunct{\detokenize{#1}}}} + {\def\csq@autopunct{#1}}} \let\csq@autopunct\@empty \def\csq@allpunct{.,;:!?} +\AfterEndPreamble{% babel + \begingroup + \makeatletter + \edef\csq@tempa{% + \noexpand\scantokens{% + \gdef\noexpand\csq@autopunct{\csq@autopunct}% + \gdef\noexpand\csq@allpunct{\csq@allpunct}}}% + \csq@tempa + \endgroup} + % Plain quotes \newrobustcmd*{\enquote}{% @@ -1137,6 +1148,7 @@ \let\csq@error\@gobbletwo \let\csq@warning\@gobble \let\csq@info\@gobble + \let\marginpar\@gobbletwo@optarg \let\label\@gobble \let\index\@gobble \let\glossary\@gobble} |