From b420ec89b441a0c0c11e24d464cae2e6ab61c043 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Sun, 28 Feb 2016 08:38:36 +0100
Subject: [PATCH] Make definition of \v (bold math vector) conditional on
 unicode-math version. This should close Bug #1293.

---
 Doc/UserManual/Macros.tex |  7 ++++++-
 Doc/UserManual/Setup.tex  | 11 +++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Doc/UserManual/Macros.tex b/Doc/UserManual/Macros.tex
index 130577c92cd..ffd56fa1da7 100644
--- a/Doc/UserManual/Macros.tex
+++ b/Doc/UserManual/Macros.tex
@@ -14,7 +14,12 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % Vectors
-\renewcommand{\v}[1]{\ensuremath{\mathbf{#1}}}
+\ifolducm
+  \def\v#1{\ensuremath{\mathbf{#1}}} % for unicode-math <= 0.7f
+\else
+  \def\v#1{\symbf{#1}}
+\fi
+
 % unused \newcommand{\unitvec}[1]{\ensuremath{\widehat{\vect{#1}}}}
 \newcommand{\Nabla}{\v{\nabla}}
 
diff --git a/Doc/UserManual/Setup.tex b/Doc/UserManual/Setup.tex
index 97ffdf3c105..cb8be89ff06 100644
--- a/Doc/UserManual/Setup.tex
+++ b/Doc/UserManual/Setup.tex
@@ -53,15 +53,14 @@
 \usepackage{dingbat}
 \usepackage{amssymb}
 
-% BROKEN under texlive2015:
-% \usepackage[bold-style=ISO]{unicode-math} % must come after ams and symbols
-% WORKAROUND:
-\def\mathup#1{\text{#1}}
-
+\usepackage[bold-style=ISO]{unicode-math} % must come after ams and symbols
+\newif\ifolducm
+\makeatletter
+\@ifpackagelater{unicode-math}{2014/07/01}{\olducmfalse}{\olducmtrue}
+\makeatother
 
 % prevent unicode-math from overwriting
 
-
 \AtBeginDocument{\renewcommand{\Re}{\operatorname{Re}}}
 \AtBeginDocument{\renewcommand{\Im}{\operatorname{Im}}}
 
-- 
GitLab