1 files changed, 19 insertions, 5 deletions
diff --git a/Master/texmf-dist/source/latex/changes/changes.dtx b/Master/texmf-dist/source/latex/changes/changes.dtx
index c5aab1a552c..1ca69d8a931 100644
--- a/Master/texmf-dist/source/latex/changes/changes.dtx
+++ b/Master/texmf-dist/source/latex/changes/changes.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{1509}
+% \CheckSum{1510}
 %
 % \iffalse meta-comment
 %
@@ -58,6 +58,7 @@
 % \changes{v3.1.0}{2018/12/17}{new script for markup removal, improved user manual}
 % \changes{v3.1.1}{2018/12/18}{bugfix: uneven dot fills in summaries}
 % \changes{v3.1.2}{2019/01/26}{bugfix: problems with amsart class}
+% \changes{v3.1.3}{2019/07/21}{bugfix: option clash for ulem and truncate; documentation of known problems and solutions}
 % \GetFileInfo{changes.dtx}
 % \RecordChanges
 %
@@ -98,8 +99,8 @@
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{changes}
-[2019/01/26 v3.1.2 changes package]
-\typeout{*** changes package 2019/01/26 v3.1.2 ***}
+[2019/07/21 v3.1.3 changes package]
+\typeout{*** changes package 2019/07/21 v3.1.3 ***}
 %    \end{macrocode}
 %
 % Package \chpackage{xkeyval} provides options with key-value-pairs.
@@ -500,6 +501,17 @@
 }{}
 %    \end{macrocode}
 %
+% \subsubsection{Package options}
+%
+% In order to avoid option clashes for options, state them here instead at the moment of requiring the package.
+% Thanks for Markus Pahlow for pointing this out and providing the solution.
+%    \begin{macrocode}
+\ExecuteOptionsX{
+	ulem={normalem,normalbf},
+	truncate={breakall,fit}
+}
+%    \end{macrocode}
+%
 % \subsubsection{Option processing}
 %
 % Process the options.
@@ -531,6 +543,7 @@
 %    \end{macrocode}
 %
 % Package \chpackage{ulem} provides commands for striking out text.
+% Providing the needed package options via \chcommand{ExecuteOptionsX}.
 %    \begin{macrocode}
 \ifthenelse{
 	\equal{\Changes@optionaddedmarkup}{uline}\or
@@ -549,7 +562,7 @@
 	\equal{\Changes@optionhighlightmarkup}{uuline}\or
 	\equal{\Changes@optionhighlightmarkup}{uwave}
 }
-	{\RequirePackage[normalem,normalbf]{ulem}}
+	{\RequirePackage{ulem}}
 	{}
 %    \end{macrocode}
 %
@@ -1461,8 +1474,9 @@
 %
 % The list of changes truncates text, therefore the \chpackage{truncate} package is used.
 % (Using fit and redefining the marker: suggestion and code by Frank Mittelbach)
+% Providing the needed package options via \chcommand{ExecuteOptionsX}.
 %    \begin{macrocode}
-\RequirePackage[breakall,fit]{truncate}
+\RequirePackage{truncate}
 \renewcommand\TruncateMarker{ [\dots\negthinspace]\ }
 %    \end{macrocode}
 %