summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-07-18 22:17:21 +0000
committerKarl Berry <karl@freefriends.org>2015-07-18 22:17:21 +0000
commitc81484965cefe100dae0bf33174a2d9dc221e6a2 (patch)
tree2fe0a4f4015c732e1490af5b796fc742cefcd995
parent4ee00388635ab97c7160548e1f23ba8e4f960887 (diff)
csquotes (18jul15)
git-svn-id: svn://tug.org/texlive/trunk@37891 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/csquotes/csquotes.pdfbin289027 -> 289589 bytes
-rw-r--r--Master/texmf-dist/doc/latex/csquotes/csquotes.tex28
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csq-compat.def4
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.def19
-rw-r--r--Master/texmf-dist/tex/latex/csquotes/csquotes.sty2
5 files changed, 38 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf b/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf
index 10719efac42..deb5ccbdb27 100644
--- a/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf
+++ b/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/csquotes/csquotes.tex b/Master/texmf-dist/doc/latex/csquotes/csquotes.tex
index 511bc1da6f6..18932372077 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.1e},
- date={2015/04/15}}
+ revision={v5.1f},
+ date={2015/07/18}}
\hypersetup{%
pdftitle={The csquotes Package},
@@ -144,6 +144,7 @@ This option controls multilingual support. It requires either the \sty{babel} pa
\toprule
\multicolumn{1}{@{}H}{Option key} & \multicolumn{1}{@{}H}{Possible values} \\
\cmidrule(r){1-1}\cmidrule{2-2}
+ austrian & quotes, guillemets \\
croatian & quotes, guillemets, guillemets\*\\
danish & quotes, guillemets, topquotes \\
english & american, british\\
@@ -620,6 +621,7 @@ If available, this package will load the configuration file \path{csquotes.cfg}.
\toprule
\multicolumn{1}{@{}H}{Quote style} & \multicolumn{1}{@{}H}{Style variants} \\
\cmidrule(r){1-1}\cmidrule{2-2}
+ austrian & quotes, guillemets \\
croatian & quotes, guillemets, guillemets\*\\
danish & quotes, guillemets \\
dutch & -- \\
@@ -677,15 +679,15 @@ This command may be used in the configuration file or in the document preamble.
\multicolumn{1}{@{}H}{Alias} & \multicolumn{1}{@{}H}{Backend style or alias} \\
\cmidrule(r){1-1}\cmidrule(r){2-2}\cmidrule(r){3-3}\cmidrule{4-4}
american & english/american &
- naustrian & austrian \\
- australian & english/british &
newzealand & english/british \\
- austrian & german/quotes &
+ australian & english/british &
ngerman & german \\
- brazil & brazilian &
+ austrian & austrian/quotes &
norsk & norwegian \\
- brazilian & portuguese/brazilian &
+ brazil & brazilian &
norwegian & norwegian/guillemets \\
+ brazilian & portuguese/brazilian &
+ nswissgerman & swissgerman \\
british & english/british &
nynorsk & norwegian \\
canadian & english/american &
@@ -699,10 +701,12 @@ This command may be used in the configuration file or in the document preamble.
french & french/quotes &
swiss & german/swiss \\
german & german/quotes &
- UKenglish & british \\
+ swissgerman & german/swiss \\
italian & italian/guillemets &
- USenglish & american \\
+ UKenglish & british \\
mexican & spanish/mexican &
+ USenglish & american \\
+ naustrian & austrian &
\\
\bottomrule
\end{tabularx}
@@ -1529,9 +1533,13 @@ This revision history is a list of changes relevant to users of this package. Ch
\begin{changelog}
+\begin{release}{5.1f}{2015-07-18}
+\item Update \opt{(n)swissgerman} and \opt{(n)austrian} quote styles
+\end{release}
+
\begin{release}{5.1e}{2015-04-15}
\item New maintainer: Joseph Wright
-\item Update \opt{danish} quote styles
+\item Update \opt{danish} quote style
\end{release}
\begin{release}{5.1d}{2011-10-22}
diff --git a/Master/texmf-dist/tex/latex/csquotes/csq-compat.def b/Master/texmf-dist/tex/latex/csquotes/csq-compat.def
index 83743489f7d..3e10f96255a 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{csquotes.def}
- [2015/04/15 v5.1e csquotes backwards compatibility (JAW)]
+\ProvidesFile{csq-compat.def}
+ [2015/07/18 v5.1f 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 0f9666e0e0f..b06aaebad24 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}
- [2015/04/15 v5.1e csquotes generic definitions (JAW)]
+ [2015/07/18 v5.1f csquotes generic definitions (JAW)]
% Set defaults
@@ -9,6 +9,18 @@
% Predefined backend styles
+\DeclareQuoteStyle[quotes]{austrian}% verified
+ {\quotedblbase}
+ {\textquotedblleft}
+ [0.05em]
+ {\quotesinglbase}
+ {\fixligatures\textquoteleft}
+\DeclareQuoteStyle[guillemets]{austrian}% verified
+ {\guillemotright}
+ {\guillemotleft}
+ [0.025em]
+ {\guilsinglright}
+ {\guilsinglleft}
\DeclareQuoteStyle[quotes]{croatian}% verified
{\quotedblbase}
{\textquotedblright}
@@ -201,6 +213,7 @@
% Predefined aliases
+\DeclareQuoteAlias[quotes]{austrian}{austrian}
\DeclareQuoteAlias[quotes]{croatian}{croatian}
\DeclareQuoteAlias[quotes]{danish}{danish}
\DeclareQuoteAlias[american]{english}{american}
@@ -210,9 +223,9 @@
\DeclareQuoteAlias[british]{english}{australian}% unsure
\DeclareQuoteAlias[british]{english}{newzealand}% unsure
\DeclareQuoteAlias[quotes]{french}{french}
-\DeclareQuoteAlias[quotes]{german}{austrian}
\DeclareQuoteAlias[quotes]{german}{german}
\DeclareQuoteAlias[swiss]{german}{swiss}
+\DeclareQuoteAlias[swiss]{german}{swissgerman}
\DeclareQuoteAlias[guillemets]{italian}{italian}
\DeclareQuoteAlias[guillemets]{norwegian}{norwegian}
\DeclareQuoteAlias[brazilian]{portuguese}{brazilian}
@@ -230,12 +243,14 @@
\DeclareQuoteAlias{british}{ukenglish}
\DeclareQuoteAlias{german}{ngerman}
\DeclareQuoteAlias{austrian}{naustrian}
+\DeclareQuoteAlias{swissgerman}{nswissgerman}
\DeclareQuoteAlias{norwegian}{norsk}
\DeclareQuoteAlias{norwegian}{nynorsk}
\DeclareQuoteAlias{portuguese}{portuges}
% Language options
+\DeclareQuoteOption{austrian}
\DeclareQuoteOption{danish}
\DeclareQuoteOption{english}
\DeclareQuoteOption{french}
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
index a0a28cb4835..efa9ffb0373 100644
--- a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
+++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
@@ -12,7 +12,7 @@
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{csquotes}
- [2015/04/15 v5.1e context-sensitive quotations (JAW)]
+ [2015/07/18 v5.1f context-sensitive quotations (JAW)]
%% Compatibility and requirements