1 files changed, 11 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty
index c3004903605..883a46c8dc4 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossary-bookindex}[2017/11/14 v1.24 (NLCT)]
+\ProvidesPackage{glossary-bookindex}[2017/11/24 v1.25 (NLCT)]
 \RequirePackage{multicol}
 \RequirePackage{glossary-tree}
 \newcommand{\glsxtrbookindexcols}{2}
@@ -79,13 +79,20 @@
   \newcommand*{\glsxtrbookindexbookmark}[2]{}
 }
 \newcommand*{\glsxtrbookindexcolspread}{}
+\newcommand*{\glsxtrbookindexmulticolsenv}{multicols}
 \newglossarystyle{bookindex}{%
   \setglossarystyle{index}%
   \renewenvironment{theglossary}%
   {%
     \ifdefempty\glsxtrbookindexcolspread
-    {\begin{multicols}{\glsxtrbookindexcols}}%
-    {\begin{multicols}{\glsxtrbookindexcols}[\glsxtrbookindexcolspread]}%
+    {%
+      \expandafter\begin\expandafter{\glsxtrbookindexmulticolsenv}%
+        {\glsxtrbookindexcols}%
+    }%
+    {%
+      \expandafter\begin\expandafter{\glsxtrbookindexmulticolsenv}%
+        {\glsxtrbookindexcols}[\glsxtrbookindexcolspread]%
+    }%
     \setlength{\parindent}{0pt}%
     \setlength{\parskip}{0pt plus 0.3pt}%
     \let\@glsxtr@bookindex@sep\glsxtrbookindexparentchildsep
@@ -102,7 +109,7 @@
      \@glsxtr@bookindex@subsubatendgroup
      \@glsxtr@bookindex@subatendgroup
      \@glsxtr@bookindex@atendgroup
-     \end{multicols}%
+     \expandafter\end\expandafter{\glsxtrbookindexmulticolsenv}%
   }%
   \renewcommand*{\glossaryheader}{\raggedright}%
   \renewcommand*{\glossentry}[2]{%