yhmath (17mar20)

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

1 files changed, 29 insertions, 18 deletions

diff --git a/Master/texmf-dist/source/fonts/yhmath/yhmath.dtx b/Master/texmf-dist/source/fonts/yhmath/yhmath.dtx
index ddf3b5c4d8e..4f3a9acae89 100644
--- a/Master/texmf-dist/source/fonts/yhmath/yhmath.dtx
+++ b/Master/texmf-dist/source/fonts/yhmath/yhmath.dtx
@@ -2,7 +2,7 @@
 % yhmath.dtx
 % 
 % originally written by Yannis Haralambous, extended by Norbert Preining
-% in 2013, 2019. See pdf for details.
+% in 2013, 2019-2020. See pdf for details.
 %
 % \fi
 %
@@ -12,7 +12,7 @@
           \ProvidesFile{yhmath.dtx}
 %</dtx>
 %<package>\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-%<package>\ProvidesPackage{yhmath}[2019/02/24 v1.5]
+%<package>\ProvidesPackage{yhmath}[2020/03/17 v1.6]
 %<driver> \ProvidesFile{yhmath.drv}
 %<fdfile> \ProvidesFile{OMXyhex.fd}
 % \fi
@@ -33,14 +33,14 @@
 %
 % \GetFileInfo{yhmath.dtx}
 %
-% \def\fileversion{1.5}
-% \def\filedate{2019/02/24}
+% \def\fileversion{1.6}
+% \def\filedate{2020/03/17}
 %
 % \title{My humble additions to (La)\TeX{} mathematics\thanks{This file is
 %          \fileversion, last revised \filedate.}}
 % \author{Yannis Haralambous, Norbert Preining\\
 %           \texttt{\small yannis1962@gmail.com}, \texttt{\small norbert@preining.info}}
-% \date{January 4, 1996 (YH); February 24, 2019 (NP)}
+% \date{January 4, 1996 (YH); March 17, 2020 (NP)}
 % \maketitle
 %
 % \CheckSum{107}
@@ -51,6 +51,7 @@
 % \changes{v1.3}{2018/01/31}{Add license statements (NP)}
 % \changes{v1.4}{2019/02/18}{Package options, dates, backward compatibility (NP)}
 % \changes{v1.5}{2019/02/24}{Fixes to math delimiters, make font extensible (NP)}
+% \changes{v1.6}{2020/03/17}{Fix to the widering definition (NP)}
 %
 % \begin{abstract}
 % This package provides a set of big delimiters, intermediate to those
@@ -74,6 +75,12 @@
 %
 % \section{Changes}
 %
+% \subsection{Version v1.6}
+%
+% Fixes definition order of widering to make yhmath compatible with
+% other packages defining widering (GH Issue 4).
+%
+% 
 % \subsection{Version v1.5}
 %
 % Fixes for the math delimiters $<$, $>$, and $/$ where incorporated,
@@ -330,18 +337,6 @@
 \RequirePackage{amsmath}
 %    \end{macrocode}
 %
-% |\widering| is also defined in other packages (fourier, newtx, newpx etc)
-% but they do the definition in AtBeginDocument without checking for the
-% existence, so loading this package (yhmath) with others defining 
-% widering will create problems - use option nowidering to undef it.
-% First define the macro, and clear it if the respective package
-% option is given. Here is a (clumsy) definition of |\widering|, that is
-% a ring over an horizontal parenthesis.
-%    \begin{macrocode}
-\newcommand{\widering}[1]{\overset{\smash{\lower1.333ex\hbox{$%
-\displaystyle\ring{}$}}}{\wideparen{#1}}}
-%    \end{macrocode}
-%
 % \subsection{Option handling}
 %
 % Three options are supported: |minimal| which defines only those
@@ -351,6 +346,8 @@
 %
 %    \begin{macrocode}
 \newif\if@yh@full
+\newif\if@yh@nowidering
+\@yh@nowideringfalse
 \DeclareOption{minimal}{%
   \@yh@fullfalse%
 }%
@@ -358,7 +355,7 @@
   \@yh@fulltrue%
 }%
 \DeclareOption{nowidering}{%
-  \let\widering\@undefined%
+  \@yh@nowideringtrue%
 }
 %    \end{macrocode}
 %
@@ -463,6 +460,20 @@
 \fi
 %    \end{macrocode}
 %
+% |\widering| is also defined in other packages (fourier, newtx, newpx etc)
+% but they do the definition in AtBeginDocument without checking for the
+% existence, so loading this package (yhmath) with others defining 
+% widering will create problems - use option nowidering to undef it.
+% Here is a (clumsy) definition of |\widering|, that is a ring over an
+% horizontal parenthesis.
+%    \begin{macrocode}
+\if@yh@nowidering\else
+\newcommand{\widering}[1]{\overset{\smash{\lower1.333ex\hbox{$%
+\displaystyle\ring{}$}}}{\wideparen{#1}}}%
+\fi
+%    \end{macrocode}
+%
+%
 % The |amatrix| environment is defined
 %    \begin{macrocode}
 \newenvironment{amatrix}{\left\langle\begin{matrix}}{\end{matrix}\right\rangle}