csquotes (14jul16)

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

5 files changed, 40 insertions, 9 deletions

diff --git a/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf b/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf
index a4c799732cf..2fd9b0c8c4b 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 b3efaf45579..22d06249ec6 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.1g},
-  date={2016/01/31}}
+  revision={v5.1h},
+  date={2016/07/14}}
 
 \hypersetup{%
   pdftitle={The csquotes Package},
@@ -1533,6 +1533,10 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \begin{changelog}
 
+\begin{release}{5.1h}{2016-07-14}
+\item Adapt \cmd{fixligatures} to work correctly with \luatex
+\end{release}
+
 \begin{release}{5.1g}{2016-01-31}
 \item Update for new \acr{TU} Unicode encoding
 \end{release}
diff --git a/Master/texmf-dist/tex/latex/csquotes/csq-compat.def b/Master/texmf-dist/tex/latex/csquotes/csq-compat.def
index 6ff6a54e2e6..b834f837cbc 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}
-  [2016/01/31 v5.1g csquotes backwards compatibility (JAW)]
+  [2016/07/14 v5.1h 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 4d85ba55996..46cb88a25d8 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}
-  [2016/01/31 v5.1g csquotes generic definitions (JAW)]
+  [2016/07/14 v5.1h csquotes generic definitions (JAW)]
 
 % Set defaults
 
@@ -129,6 +129,12 @@
   {\guillemotright}
   {\textquotedblleft} 
   {\textquotedblright}
+\DeclareQuoteStyle{icelandic}
+  {\quotedblbase}
+  {\textquotedblleft}
+  [0.05em]
+  {\quotesinglbase}
+  {\fixligatures\textquoteleft}
 \DeclareQuoteStyle[quotes]{italian}
   {\textquotedblleft}
   {\textquotedblright}
@@ -255,6 +261,7 @@
 \DeclareQuoteOption{english}
 \DeclareQuoteOption{french}
 \DeclareQuoteOption{german}
+\DeclareQuoteOption{icelandic}
 \DeclareQuoteOption{italian}
 \DeclareQuoteOption{norwegian}
 \DeclareQuoteOption{spanish}
diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
index dead738f966..35ae4d6d31f 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}
-  [2016/01/31 v5.1g context-sensitive quotations (JAW)]
+  [2016/07/14 v5.1h context-sensitive quotations (JAW)]
 
 %% Compatibility and requirements
 
@@ -25,7 +25,27 @@
      {Outdated 'etoolbox' package}
      {Upgrade to etoolbox v1.7 (2008/06/28) or later.\MessageBreak
       I found: '\csuse{ver@etoolbox.sty}'.\MessageBreak
-      This is a fatal error. I'm aborting now.}%
+      This is a fatal error. I'm aborting now.}%\documentclass{article}
+
+\usepackage{amsmath}
+\usepackage{xparse}
+\usepackage{xcolor}
+
+\NewDocumentCommand\MyMacro{k_}{%
+    \IfNoValueTF{#1}{%
+        \mathbf{A}
+    }{%
+        A_{\textcolor{red}{#1}}
+    }%
+}
+
+\begin{document}
+
+With a subscript: $\MyMacro_{\pi}$ 
+
+Without any subscript: $\MyMacro$ 
+
+\end{document}
    \endinput}
 
 \@ifpackageloaded{inputenc}
@@ -2254,13 +2274,13 @@
 \newrobustcmd*{\fixligatures}{%
   \ifhmode
     \ifnum\spacefactor>3000
-      \relax
+      \kern0pt
     \else
       \ifnum\spacefactor=1007
-        \relax
+        \kern0pt
       \else
         \ifnum\spacefactor=1008
-          \relax
+          \kern0pt
         \fi
       \fi
     \fi