csquotes (15apr15)

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

8 files changed, 148 insertions, 152 deletions

diff --git a/Master/texmf-dist/doc/latex/csquotes/README b/Master/texmf-dist/doc/latex/csquotes/README
index d1b66e3a946..f0ed6e1d5fa 100644
--- a/Master/texmf-dist/doc/latex/csquotes/README
+++ b/Master/texmf-dist/doc/latex/csquotes/README
@@ -1,6 +1,6 @@
-$Id: README,v 5.1d 2011/10/22 19:17:39 lehman stable $
+# `csquotes`: Context sensitive quotation facilities
 
-ABOUT
+## About
 
 This package provides advanced facilities for inline and display
 quotations. It is designed for a wide range of tasks ranging from
@@ -14,80 +14,88 @@ demands of academic writing, especially in the humanities and the
 social sciences. All quote styles as well as the optional active
 quotes are freely configurable.
 
-LICENSE
+## License
 
-Copyright (c) 2003-2011 Philipp Lehman, author-maintained.
+Copyright (c) 2003-2011 Philipp Lehman, 2015 Joseph Wright.
 Permission is granted to copy, distribute and/or modify this
 software under the terms of the LaTeX Project Public License (LPPL),
-version 1.3.
+version 1.3c or any later version.
 
 This software is provided 'as is', without warranty of any kind,
 either expressed or implied, including, but not limited to, the
 implied warranties of merchantability and fitness for a particular
 purpose.
 
-REQUIREMENTS
+## Requirements
 
 - e-TeX
-- etoolbox 1.7 or later
-- keyval
+- `etoolbox` 1.7 or later
+- `keyval`
 
 AUTOMATIC INSTALLATION
 
-TeX Live: The csquotes package is included in TeX Live.
+TeX Live: The `csquotes` package is included in TeX Live.
           Use the TeX Live package manager to install it.
 
-MiKTeX:   The csquotes package is included in MiKTeX.
+MiKTeX:   The `csquotes` package is included in MiKTeX.
           Use the MiKTeX package manager to install it.
 
-SEMI-AUTOMATIC INSTALLATION
+## Semi-automatic installation
 
 1. Download the file
 
-   http://www.ctan.org/tex-archive/install/macros/latex/contrib/csquotes.tds.zip
+   http://mirror.ctan.org/install/macros/latex/contrib/csquotes.tds.zip
 
 2. Unpack the archive in the root directory of the local TeX
    installation tree, for example
 
-	/usr/local/share/texmf/
+        /usr/local/share/texmf/
+    
    or
-	/usr/share/texmf-local/
+
+        /usr/share/texmf-local/
+
    or
-	C:\Local TeX Files\
+
+        C:\Local TeX Files\
 
 3. Update the file hash tables (also known as the file name
    database).
    
-   On teTeX and TeX Live systems, run texhash as root ('sudo
-   texhash'). On MiKTeX, run 'initexmf --update-fndb' in a command
+   On teTeX and TeX Live systems, run `texhash` as root (`sudo
+   texhash`). On MiKTeX, run `initexmf --update-fndb` in a command
    window or use the 'Refresh FNDB' button of the MiKTeX Options
    window.
 
-MANUAL INSTALLATION
+## Manual installation
 
-1. Copy the files 'csquotes.sty', 'csquotes.def', 'csq-compat.def',
-   and 'csquotes.cfg' to
+1. Copy the files `csquotes.sty`,  `csquotes.def`, `csq-compat.def`,
+   and `csquotes.cfg` to
 
-	<TEXMFLOCAL>/tex/latex/csquotes/
+        <TEXMFLOCAL>/tex/latex/csquotes/
 
-   where <TEXMFLOCAL> denotes the root of the local TeX installation
+   where `<TEXMFLOCAL>` denotes the root of the local TeX installation
    tree, for example
 
-	/usr/local/share/texmf/
+        /usr/local/share/texmf/
+
    or
-	/usr/share/texmf-local/
+
+        /usr/share/texmf-local/
+
    or
-	C:\Local TeX Files\
 
-2. The file 'csquotes.pdf' goes to
+        C:\Local TeX Files\
+
+2. The file `csquotes.pdf` goes to
 
-	<TEXMFLOCAL>/doc/latex/csquotes/
+        <TEXMFLOCAL>/doc/latex/csquotes/
 
 3. Update the file hash tables (also known as the file name
    database).
 
-   On teTeX and TeX Live systems, run texhash as root ('sudo
-   texhash'). On MiKTeX, run 'initexmf --update-fndb' in a command
+   On teTeX and TeX Live systems, run `texhash` as root (`sudo
+   texhash`). On MiKTeX, run `initexmf --update-fndb` in a command
    window or use the 'Refresh FNDB' button of the MiKTeX Options
    window.
 
@@ -95,12 +103,12 @@ Note that you may have to create some or all of the above
 directories if this is the first package you're installing locally
 (as opposed to via a package manager).
 
-USAGE
+## Usage
 
-Refer to csquotes.pdf for a systematic reference manual.
+Refer to `csquotes.pdf` for a systematic reference manual.
 
-CHANGES
+## Changes
 
 A list of changes relevant to users of this package is included at
-the end of csquotes.pdf. Skimming the respective section of the
+the end of `csquotes.pdf`. Skimming the respective section of the
 manual is highly recommended.
diff --git a/Master/texmf-dist/doc/latex/csquotes/RELEASE b/Master/texmf-dist/doc/latex/csquotes/RELEASE
index 2546b238102..0d78aeb454d 100644
--- a/Master/texmf-dist/doc/latex/csquotes/RELEASE
+++ b/Master/texmf-dist/doc/latex/csquotes/RELEASE
@@ -1,97 +1,95 @@
-$Id: RELEASE,v 5.1d 2011/10/22 19:17:39 lehman stable $
+# Release notes for version 5.1
 
-RELEASE NOTES FOR VERSION 5.1
+## Improved block quotation facilities
 
-*  Improved block quotation facilities
+The highlight of this release is an extension of the block
+quotation facilities. When measuring the length of a quotation,
+`\blockquote` and related commands can determine either the word
+count or the number of lines. See the pointers in the changelog
+for details.
 
-   The hightlight of this release is an extension of the block
-   quotation facilities. When measuring the length of a quotation,
-   \blockquote and related commands can determine either the word
-   count or the number of lines. See the pointers in the changelog
-   for details.
+# Release notes for version 5.0
 
-RELEASE NOTES FOR VERSION 5.0
+## Backwards compatibility
 
-*  Backwards compatibility
+This release introduces some changes which are not backwards
+compatible out of the box. In order to ease the transition to the
+new version, I've implemented a 'version' option which emulates
+older versions of `csquotes`.
 
-   This release introduces some changes which are not backwards
-   compatible out of the box. In order to ease the transition to the
-   new version, I've implemented a 'version' option which emulates
-   older versions of csquotes.
+It is quite possible that you do not need to set this option at
+all, even though you have older documents using `csquotes`. You
+only need the 'version' option in older documents if:
 
-   It is quite possible that you do not need to set this option at
-   all, even though you have older documents using csquotes. You
-   only need the 'version' option in older documents if:
+  - you are using the `<punct>` argument of `\blockquote` and/or
+  - you have redefined any of the old
+     `\mk(pre|mid|fin)(text|block|disp)punct` hooks.
 
-   - you are using the <punct> argument of \blockquote and/or
-   - you have redefined any of the old
-     '\mk(pre|mid|fin)(text|block|disp)punct' hooks.
+If these conditions do not apply and you run 5.0 with the default
+settings, the output will be similar to 4.4. There is absolutely
+no need to set `version=4.4` if you didn't use the old hooks and
+the `<punct>` argument of `\blockquote` anyway.
 
-   If these conditions do not apply and you run 5.0 with the default
-   settings, the output will be similar to 4.4. There is absolutely
-   no need to set 'version=4.4' if you didn't use the old hooks and
-   the <punct> argument of \blockquote anyway.
+I've also removed some legacy aliases. This is rather old stuff
+from `csquotes` 3.x and even 2.x which has been marked as
+depreciated for some time. Setting `version=4.4` will restore
+them as well.
 
-   I've also removed some legacy aliases. This is rather old stuff
-   from csquotes 3.x and even 2.x which has been marked as
-   depreciated for some time. Setting 'version=4.4' will restore
-   them as well.
+## Punctuation look-ahead
 
-*  Punctuation look-ahead
-
-   This release comes with a new punctuation look-ahead feature,
-   i.e., in addition to the <punct> argument of advanced quotation
-   commands like \textquote, these commands can now scan ahead for
-   trailing punctuation after their last argument and move it around
-   if desired.
+This release comes with a new punctuation look-ahead feature,
+i.e., in addition to the `<punct>` argument of advanced quotation
+commands like `\textquote`, these commands can now scan ahead for
+trailing punctuation after their last argument and move it around
+if desired.
    
-   This is required by quoting conventions such as the US quotation
-   style which requires that a period or a comma immediately after a
-   closing quotation mark be moved inside the quotes even if it is
-   not part of the quoted text.
-
-   The implementation of the look-ahead feature also implies a new
-   interpretation of the optional <punct> argument supported by
-   certain quotation commands. In previous version, the <punct>
-   argument was intended for terminal punctuation which is NOT part
-   of the quoted text. Starting with this release, it is intended
-   for punctuation which IS part of the quoted text (but may need to
-   be moved around).
-
-   The modified syntax is more intuitive to use because terminal
-   punctuation which is NOT part of the quoted text is simply placed
-   after the last argument of the command, i.e.:
-
-	\textquote[citation][.]{quoted text}
+This is required by quoting conventions such as the US quotation
+style which requires that a period or a comma immediately after a
+closing quotation mark be moved inside the quotes even if it is
+not part of the quoted text.
+
+The implementation of the look-ahead feature also implies a new
+interpretation of the optional `<punct>` argument supported by
+certain quotation commands. In previous version, the `<punct>`
+argument was intended for terminal punctuation which is NOT part
+of the quoted text. Starting with this release, it is intended
+for punctuation which IS part of the quoted text (but may need to
+be moved around).
+
+The modified syntax is more intuitive to use because terminal
+punctuation which is NOT part of the quoted text is simply placed
+after the last argument of the command, i.e.:
+
+    \textquote[citation][.]{quoted text}
    
-   becomes:
+becomes:
    
-	\textquote[citation]{quoted text}.
+    \textquote[citation]{quoted text}.
 
-   All of this is discussed at length in the manual. See the
-   changelog in the manual for pointers to the relevant sections.
+All of this is discussed at length in the manual. See the
+changelog in the manual for pointers to the relevant sections.
 
-*  Revised quotation hooks
+## Revised quotation hooks
 
-   The old quotation hooks:
+The old quotation hooks:
 
-	\mkpretextpunct
-	\mkmidtextpunct
-	\mkfintextpunct
-	\mkpreblockpunct
-	\mkmidblockpunct
-	\mkfinblockpunct
-	\mkpredisppunct
-	\mkmiddisppunct
-	\mkfindisppunct
+    \mkpretextpunct
+    \mkmidtextpunct
+    \mkfintextpunct
+    \mkpreblockpunct
+    \mkmidblockpunct
+    \mkfinblockpunct
+    \mkpredisppunct
+    \mkmiddisppunct
+    \mkfindisppunct
 
-   have been removed and are replaced by new hooks:
+have been removed and are replaced by new hooks:
 
-	\mktextquote
-	\mkblockquote
-	\mkbegdispquote
-	\mkenddispquote
+    \mktextquote
+    \mkblockquote
+    \mkbegdispquote
+    \mkenddispquote
 
-   which are much more powerful while being more intuitive to use.
-   If you have been using the old hooks in some documents, set
-   'version=4.4' to emulate the old interface.
+which are much more powerful while being more intuitive to use.
+If you have been using the old hooks in some documents, set
+`version=4.4` to emulate the old interface.
diff --git a/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf b/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf
index 70892e61c9f..10719efac42 100644
--- a/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf
+++ b/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf
diff --git a/Master/texmf-dist/doc/latex/csquotes/csquotes.tex b/Master/texmf-dist/doc/latex/csquotes/csquotes.tex
index c22e4293ec9..511bc1da6f6 100644
--- a/Master/texmf-dist/doc/latex/csquotes/csquotes.tex
+++ b/Master/texmf-dist/doc/latex/csquotes/csquotes.tex
@@ -1,6 +1,5 @@
-% $Id: csquotes.tex,v 5.1d 2011/10/22 19:17:39 lehman stable $
 \documentclass{ltxdockit}[2010/09/26]
-\usepackage[latin9]{inputenc}
+\usepackage[utf8]{inputenc}
 \usepackage[american]{babel}
 \usepackage[strict,autostyle=once]{csquotes}
 \usepackage{tabularx}
@@ -9,25 +8,23 @@
 \usepackage{shortvrb}
 \usepackage{needspace}
 \usepackage{pifont}
-\MakeAutoQuote{«}{»}
+\MakeAutoQuote{«}{»}
 \MakeAutoQuote*{<}{>}
 \MakeShortVerb{\|}
 
-\rcsid{$Id: csquotes.tex,v 5.1d 2011/10/22 19:17:39 lehman stable $}
-
 \titlepage{%
   title={The \sty{csquotes} Package},
   subtitle={Context Sensitive Quotation Facilities},
-  url={http://www.ctan.org/tex-archive/macros/latex/contrib/csquotes/},
-  author={Philipp Lehman},
-  email={plehman@gmx.net},
-  revision={\rcsrevision},
-  date={\rcstoday}}
+  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}}
 
 \hypersetup{%
   pdftitle={The csquotes Package},
   pdfsubject={Context Sensitive Quotation Facilities},
-  pdfauthor={Philipp Lehman},
+  pdfauthor={Philipp Lehman, Joseph Wright},
   pdfkeywords={tex, e-tex, latex, quote, quotation,
   smart quotes, babel, polyglossia, multilingual typesetting}}
 
@@ -113,7 +110,7 @@ This package provides advanced facilities for inline and display quotations. It
 
 \subsection{License}
 
-Copyright © 2003--2011 Philipp Lehman. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c.\fnurl{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt} This package is author"=maintained.
+Copyright © 2003--2011 Philipp Lehman, 2015 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}
 
@@ -148,7 +145,7 @@ This option controls multilingual support. It requires either the \sty{babel} pa
   \multicolumn{1}{@{}H}{Option key} & \multicolumn{1}{@{}H}{Possible values} \\
   \cmidrule(r){1-1}\cmidrule{2-2}
   croatian	& quotes, guillemets, guillemets\*\\
-  danish	& quotes, guillemets \\
+  danish	& quotes, guillemets, topquotes \\
   english	& american, british\\
   french	& quotes, quotes\*, guillemets, guillemets\*\\
   german	& quotes, guillemets, swiss \\
@@ -1027,7 +1024,7 @@ The \cmd{textins} command passes its \prm{text} argument to \cmd{mktextins} for
 \newcommand{<<\mktextmod>>}[1]{[#1]}
 \end{ltxcode}
 %
-You may redefine the above hooks to change the format of the printed output. For example, if you prefer replacements to be indicated by «[\textellipsis text]» rather than «[\textellipsis\unkern] [text]», redefine \cmd{mktextelpins} accordingly:
+You may redefine the above hooks to change the format of the printed output. For example, if you prefer replacements to be indicated by «[\textellipsis text]» rather than «[\textellipsis\unkern] [text]», redefine \cmd{mktextelpins} accordingly:
 
 \begin{ltxcode}
 \newcommand{<<\mktextelpins>>}[1]{[\textellipsis #1]}
@@ -1532,6 +1529,11 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \begin{changelog}
 
+\begin{release}{5.1e}{2015-04-15}
+\item New maintainer: Joseph Wright
+\item Update \opt{danish} quote styles
+\end{release}
+
 \begin{release}{5.1d}{2011-10-22}
 \item Slightly modified quote style \opt{italian/guillemets}
 \item Made variant \opt{guillemets} the default for \opt{italian}
@@ -1893,8 +1895,8 @@ This revision history is a list of changes relevant to users of this package. Ch
 %\begin{release}{2.1}{2004-06-15}
 %\item Added auxiliary environment \env{quoteblock}\see{cfg:aux}
 %\item Added support for language reset in footnotes\see{hnt:ftn}
-%\item Disable active characters in \cmd{verb} and \env{verbatim}\see{hnt:mod}
-%\item Disable active characters in \cmd{index} and \cmd{glossary}\see{hnt:mod}
+%\item Disable active characters in \cmd{verb} and \env{verbatim}\see{hnt:mod}
+%\item Disable active characters in \cmd{index} and \cmd{glossary}\see{hnt:mod}
 %\item Added package option and style variants for Norwegian
 %\item Removed some uncertain quote styles and aliases
 %\item Rearranged quote styles and aliases
diff --git a/Master/texmf-dist/tex/latex/csquotes/csq-compat.def b/Master/texmf-dist/tex/latex/csquotes/csq-compat.def
index 28aceed087c..83743489f7d 100644
--- a/Master/texmf-dist/tex/latex/csquotes/csq-compat.def
+++ b/Master/texmf-dist/tex/latex/csquotes/csq-compat.def
@@ -1,8 +1,5 @@
-% $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.1d 2011/10/22 19:17:39 lehman stable $
- csquotes backwards compatibility]
+  [2015/04/15 v5.1e csquotes backwards compatibility (JAW)]
 
 \def\csq@getversion#1{%
   \expandafter\csq@getversion@i
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg b/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg
index d78f719fc3c..321b8a0dc58 100644
--- a/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg
+++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.cfg
@@ -1,5 +1,3 @@
-% $Id: csquotes.cfg,v 5.1d 2011/10/22 19:17:39 lehman stable $
-
 \ProvidesFile{csquotes.cfg}
 
 % Put your definitions here.
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.def b/Master/texmf-dist/tex/latex/csquotes/csquotes.def
index bdc98f25aa0..0f9666e0e0f 100644
--- a/Master/texmf-dist/tex/latex/csquotes/csquotes.def
+++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.def
@@ -1,8 +1,5 @@
-% $Id: csquotes.def,v 5.1d 2011/10/22 19:17:39 lehman stable $
-
 \ProvidesFile{csquotes.def}
-[\csq@rcsid $Id: csquotes.def,v 5.1d 2011/10/22 19:17:39 lehman stable $
- csquotes generic definitions]
+  [2015/04/15 v5.1e csquotes generic definitions (JAW)]
 
 % Set defaults
 
@@ -34,13 +31,19 @@
   {\quotedblbase}
   {\textquotedblleft}
   [0.05em]
-  {\textquoteright}% unsure
-  {\textquoteright}% unsure
+  {\textquoteright}
+  {\textquoteright}
 \DeclareQuoteStyle[guillemets]{danish}
   {\guillemotright}
   {\guillemotleft}
-  {\textquoteright}% unsure
-  {\textquoteright}% unsure
+  {\textquoteleft}
+  {\textquoteright}
+\DeclareQuoteStyle[topquotes]{danish}
+  {\textquotedblleft}
+  {\textquotedblright}
+  [0.05em]
+  {\textquoteleft}
+  {\textquoteright}
 \DeclareQuoteStyle{dutch}
   {\quotedblbase}
   {\textquotedblright}
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
index aef0dcba32e..a0a28cb4835 100644
--- a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
+++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
@@ -1,28 +1,18 @@
-% $Id: csquotes.sty,v 5.1d 2011/10/22 19:17:39 lehman stable $
-
 % Copyright (c) 2003-2011 Philipp Lehman.
+%           (c) 2015 Joseph Wright.
 %
 % Permission is granted to copy, distribute and/or modify this
 % software under the terms of the LaTeX Project Public License
-% (LPPL), version 1.3.
-%
-% The LPPL maintenance status of this software is
-% 'author-maintained'.
+% (LPPL), version 1.3c or any later version.
 %
 % This software is provided 'as is', without warranty of any kind,
 % either expressed or implied, including, but not limited to, the
 % implied warranties of merchantability and fitness for a
 % particular purpose.
 
-\def\csq@rcsid$#1: #2 #3 #4 #5${#4 v#3}
-
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{csquotes}
-[\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}
-\edef\csq@version{\csq@version$Revision: 5.1 $}
+  [2015/04/15 v5.1e context-sensitive quotations (JAW)]
 
 %% Compatibility and requirements