From 015f59602dd3d67bf0308e310edeae053297da88 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 11 Feb 2018 22:50:35 +0000 Subject: csquotes (11feb18) git-svn-id: svn://tug.org/texlive/trunk@46601 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/csquotes/csquotes.pdf | Bin 291375 -> 291270 bytes Master/texmf-dist/doc/latex/csquotes/csquotes.tex | 10 +++--- .../texmf-dist/tex/latex/csquotes/csq-compat.def | 2 +- Master/texmf-dist/tex/latex/csquotes/csquotes.def | 37 ++++++++++++++++++--- Master/texmf-dist/tex/latex/csquotes/csquotes.sty | 4 +-- 5 files changed, 42 insertions(+), 11 deletions(-) diff --git a/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf b/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf index 40523bd1006..7bcc8eb2fdb 100644 Binary files a/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf and b/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/csquotes/csquotes.tex b/Master/texmf-dist/doc/latex/csquotes/csquotes.tex index e70bdeed994..ee687f5fc48 100644 --- a/Master/texmf-dist/doc/latex/csquotes/csquotes.tex +++ b/Master/texmf-dist/doc/latex/csquotes/csquotes.tex @@ -18,8 +18,8 @@ url={http://www.ctan.org/pkg/csquotes/}, author={Philipp Lehman, Joseph Wright}, email={joseph.wright@morningstar2.co.uk}, - revision={v5.2b}, - date={2017/03/11}} + revision={v5.2c}, + date={2018/02/11}} \hypersetup{% pdftitle={The csquotes Package}, @@ -110,7 +110,7 @@ This package provides advanced facilities for inline and display quotations. It \subsection{License} -Copyright © 2003--2011 Philipp Lehman, 2015--2017 Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c or any later version.\fnurl{http://www.latex-project.org/lppl/} +Copyright © 2003--2011 Philipp Lehman, 2015--2018 Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c or any later version.\fnurl{http://www.latex-project.org/lppl/} \subsection{Contributions} @@ -146,6 +146,7 @@ This option controls multilingual support. It requires either the \sty{babel} pa \cmidrule(r){1-1}\cmidrule{2-2} austrian & quotes, guillemets \\ croatian & quotes, guillemets, guillemets\*\\ + czech & quotes, guillemets \\ danish & quotes, guillemets, topquotes \\ english & american, british\\ french & quotes, quotes\*, guillemets, guillemets\*\\ @@ -633,6 +634,7 @@ If available, this package will load the configuration file \path{csquotes.cfg}. \cmidrule(r){1-1}\cmidrule{2-2} austrian & quotes, guillemets \\ croatian & quotes, guillemets, guillemets\*\\ + czech & quotes, guillemets \\ danish & quotes, guillemets \\ dutch & -- \\ english & american, british\\ @@ -1363,7 +1365,7 @@ Some care is still required when choosing active quotes. Note that you normally \subsection{\pdf Strings and \sty{hyperref} Support} \label{hnt:pdf} -This package interfaces with the \sty{hyperref} package as \pdf strings such as bookmarks are generated. See \secref{cfg:pdf} on how to configure the quotation marks used in \pdf strings. Support for \pdf strings is only available with the basic facilities presented in \secref{bas:reg,bas:bbl} as well as \secref{act:reg,act:bbl}. Be advised that the way \sty{hyperref} builds \pdf strings imposes severe limitations on the capabilities of all commands. Most notably, the nesting level of quotations cannot be tracked in this context. Nested quotations will generally get outer marks, but you may use starred commands or active inner quotes to request inner marks explicitly. If quotation marks are to be included in the document properties of a \pdf file, you must use \cmd{hypersetup} to specify the strings. The replacement mechanism will not function within the optional argument to \cmd{usepackage}. See the \sty{hyperref} manual for information further details. +This package interfaces with the \sty{hyperref} package as \pdf strings such as bookmarks are generated. See \secref{cfg:pdf} on how to configure the quotation marks used in \pdf strings. Support for \pdf strings is only available with the basic facilities presented in \secref{bas:reg,bas:bbl} as well as \secref{act:reg,act:bbl}. Be advised that the way \sty{hyperref} builds \pdf strings imposes severe limitations on the capabilities of all commands. Most notably, the nesting level of quotations cannot be tracked in this context. Nested quotations will generally get outer marks, but you may use starred commands or active inner quotes to request inner marks explicitly. If quotation marks are to be included in the document properties of a \pdf file, you must use \cmd{hypersetup} to specify the strings. The replacement mechanism will not function within the optional argument to \cmd{usepackage}. See the \sty{hyperref} manual for further details. \subsection{Footnotes Inside Quotations} \label{hnt:ftn} diff --git a/Master/texmf-dist/tex/latex/csquotes/csq-compat.def b/Master/texmf-dist/tex/latex/csquotes/csq-compat.def index 2b253ddc851..f0b6749c267 100644 --- a/Master/texmf-dist/tex/latex/csquotes/csq-compat.def +++ b/Master/texmf-dist/tex/latex/csquotes/csq-compat.def @@ -1,5 +1,5 @@ \ProvidesFile{csq-compat.def} - [2017/03/11 v5.2b csquotes backwards compatibility (JAW)] + [2018/02/11 v5.2c csquotes backwards compatibility (JAW)] \def\csq@getversion#1{% \expandafter\csq@getversion@i diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.def b/Master/texmf-dist/tex/latex/csquotes/csquotes.def index c7f8530b5fe..aac6bc3208a 100644 --- a/Master/texmf-dist/tex/latex/csquotes/csquotes.def +++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.def @@ -1,5 +1,5 @@ \ProvidesFile{csquotes.def} - [2017/03/11 v5.2b csquotes generic definitions (JAW)] + [2018/02/11 v5.2c csquotes generic definitions (JAW)] % Set defaults @@ -39,12 +39,18 @@ [0.025em] {\quotesinglbase} {\textquoteright} -\DeclareQuoteStyle{czech} +\DeclareQuoteStyle[quotes]{czech} {\quotedblbase} {\textquotedblleft} [0.025em] {\quotesinglbase} {\fixligatures\textquoteleft} +\DeclareQuoteStyle[guillemets]{czech} + {\guillemotright} + {\guillemotleft} + [0.025em] + {\guilsinglright} + {\guilsinglleft} \DeclareQuoteStyle[quotes]{danish} {\quotedblbase} {\textquotedblleft} @@ -130,10 +136,22 @@ [0.025em] {\guilsinglleft} {\guilsinglright} +\DeclareQuoteStyle[guillemets]{galician} + {\guillemotleft} + {\guillemotright} + [0.025em] + {\textquotedblleft} + {\textquotedblright} +\DeclareQuoteStyle[quotes]{galician} + {\textquotedblleft} + {\textquotedblright} + [0.05em] + {\textquoteleft} + {\textquoteright} \DeclareQuoteStyle{greek}% verified {\guillemotleft} {\guillemotright} - {\textquotedblleft} + {\textquotedblleft} {\textquotedblright} \DeclareQuoteStyle{icelandic} {\quotedblbase} @@ -153,6 +171,12 @@ [0.025em] {\textquotedblleft} {\textquotedblright} +\DeclareQuoteStyle{latvian} + {\quotedblbase} + {\textquotedblright} + [0.05em] + {\quotesinglbase} + {\textquoteright} \DeclareQuoteStyle[guillemets]{norwegian} {\guillemotleft} {\guillemotright} @@ -188,7 +212,7 @@ [0.05em] {\textquoteleft} {\textquoteright} -\DeclareQuoteStyle{slovak} +\DeclareQuoteStyle{slovak} {\quotedblbase} {\textquotedblleft} [0.025em] @@ -241,7 +265,9 @@ \DeclareQuoteAlias[british]{english}{australian}% unsure \DeclareQuoteAlias[british]{english}{newzealand}% unsure \DeclareQuoteAlias[quotes]{french}{french} +\DeclareQuoteAlias[quotes]{galician}{galician} \DeclareQuoteAlias[quotes]{german}{german} +\DeclareQuoteAlias[quotes]{czech}{czech} \DeclareQuoteAlias[swiss]{german}{swiss} \DeclareQuoteAlias[swiss]{german}{swissgerman} \DeclareQuoteAlias[guillemets]{italian}{italian} @@ -269,12 +295,15 @@ % Language options \DeclareQuoteOption{austrian} +\DeclareQuoteOption{czech} \DeclareQuoteOption{danish} \DeclareQuoteOption{english} \DeclareQuoteOption{french} +\DeclareQuoteOption{galician} \DeclareQuoteOption{german} \DeclareQuoteOption{icelandic} \DeclareQuoteOption{italian} +\DeclareQuoteOption{latvian} \DeclareQuoteOption{norwegian} \DeclareQuoteOption{portuguese} \DeclareQuoteOption{spanish} diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty index 91b20d1ab72..f9ada5d765a 100644 --- a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty +++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty @@ -1,5 +1,5 @@ % Copyright (c) 2003-2011 Philipp Lehman. -% (c) 2015-2017 Joseph Wright. +% (c) 2015-2018 Joseph Wright. % % Permission is granted to copy, distribute and/or modify this % software under the terms of the LaTeX Project Public License @@ -12,7 +12,7 @@ \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{csquotes} - [2017/03/11 v5.2b context-sensitive quotations (JAW)] + [2018/02/11 v5.2c context-sensitive quotations (JAW)] %% Compatibility and requirements -- cgit v1.2.3