3 files changed, 40 insertions, 27 deletions
diff --git a/Master/texmf-dist/doc/latex/mismath/mismath.pdf b/Master/texmf-dist/doc/latex/mismath/mismath.pdf
index bf2b361d5b4..41b750cf13c 100644
--- a/Master/texmf-dist/doc/latex/mismath/mismath.pdf
+++ b/Master/texmf-dist/doc/latex/mismath/mismath.pdf
diff --git a/Master/texmf-dist/source/latex/mismath/mismath.dtx b/Master/texmf-dist/source/latex/mismath/mismath.dtx
index 6676472f1b3..1db0844782b 100644
--- a/Master/texmf-dist/source/latex/mismath/mismath.dtx
+++ b/Master/texmf-dist/source/latex/mismath/mismath.dtx
@@ -20,7 +20,7 @@
 %<*package> 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{mismath}   
-    [2023/02/24 v2.5 .dtx mismath file]
+    [2023/03/01 v2.6 .dtx mismath file]
 %</package>
 %<*driver>
 \documentclass{ltxdoc}
@@ -71,7 +71,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{634}
+% \CheckSum{635}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -182,13 +182,18 @@
 %    - a new `tensor' command,
 %    - small changes in the documentation}
 %
+% \changes{v2.6}{2023/03/01}{
+%    - A bug correction with the \C macro when using babel with russian
+%        (thanks to Murray Eisenberg for this bug report on TeX StackExchange)
+%    - Tiny changes in the documentation}
+%
 % \GetFileInfo{mismath.sty}
 %
 % \title{\textsf{mismath}\\ Miscellaneous mathematical macros\thanks{This document
 % corresponds to \textsf{mismath}~\fileversion, dated \filedate. 
 % Thanks to François Bastouil for help in English translation.}}
 % \author{Antoine Missier \\ \texttt{antoine.missier@ac-toulouse.fr}}
-% \date{February 24, 2023}
+% \date{March 1, 2023}
 %
 % \maketitle
 % \tableofcontents
@@ -229,11 +234,10 @@
 % if there is not another command with the same name in the packages loaded 
 % before \textsf{mismath}. If a macro is already defined,
 % a warning message will be produced and the \textsf{mismath} definition 
-% will simply be ignored. To keep \textsf{mismath} command, 
-% either load \textsf{mismath} before the other package 
-% with which it is in conflict for the name of that command 
-% (assuming the other package supports it), or use 
-% |\let\|\meta{command}|\relax| before loading \textsf{mismath}.
+% will simply be ignored. To keep the \textsf{mismath} command or the other one, use 
+% |\let\|\meta{command}|\relax|, before loading \textsf{mismath}, or after.
+% If the other one is defined with |\AtBeginDocument|, do the same for 
+% |\let\|\meta{command}|\relax| and for loading mismath.
 %
 % \medskip
 % \DescribeEnv{\oarg{options}}
@@ -626,7 +630,9 @@
 % whereas ``openwork'' letters ($\mathbb{R}, \mathbb{Z}, \ldots$) 
 % are reserved for writing at blackboard~\cite{LSHORT};
 % and likewise to designate a field: $\F$ or $\K$ (Körper in German).
-% We get these symbols with the macros:
+% We get these symbols with the macros
+% \footnote{The \texttt{\bslash C} macro is incompatible with \texttt{russian} option
+% of \textsf{babel}; then it will not be defined by \textsf{mismath}.}:
 % \begin{center}
 % |\R|, |\C|, |\Z|, |\N|, |\Q|, |\F|, |\K|.
 % \end{center}
@@ -665,7 +671,6 @@
 % |$\dlim_{x\to +\infty}\frac{1}{x}$| \quad  gives \quad  $\dlim_{x \to +\infty}\frac{1}{x}$.
 % \end{center}
 %
-% \medskip 
 % \DescribeMacro{\lbar} \DescribeMacro{\hlbar}
 % Large bars over expressions are obtained with |\overline|
 % or, shorter, its alias |\lbar|, to get for instance $\lbar{z_1z_2}$.
@@ -676,6 +681,7 @@
 % is better than $\lbar{z+z'}=\lbar{z}+\lbar{z'}$.
 % \end{center}
 %
+% \pagebreak
 % \DescribeMacro{\eqdef} \DescribeMacro{\eqdef*}
 % The |\eqdef| macro writes equality symbol topped with `def'
 % or with `$\scriptstyle \Delta$' for |\eqdef*|
@@ -992,7 +998,7 @@
 % \setlength{\extrarowheight}{1pt}
 % \begin{tabular}{ll}
 % \hline
-% \textsf{Deprecated command} & \textsf{New alternative} \\
+% Deprecated command & New alternative \\
 % \hline
 % |\enumber| & |\MathUp{e}| \\
 % |\inumber| & |\MathUp{i}| \\
@@ -1026,6 +1032,7 @@
 \@ifpackageloaded{mathtools}{}{\RequirePackage{mathtools}}
 \@ifpackageloaded{esvect}{}{\RequirePackage[b]{esvect}}
 \RequirePackage{ifthen}
+\RequirePackage{xparse} % for \NewDocumentCommand
 \RequirePackage{xspace}
 \RequirePackage{iftex}
 \ifmm@ibrackets\RequirePackage{ibrackets}\fi
@@ -1058,13 +1065,12 @@
 \newcommand\mm@macro[2]{
     \@ifundefined{#1}{
         \expandafter\def\csname #1\endcsname{#2}
-    }{\\mm@warning{#1}}
+    }{\mm@warning{#1}}
 }
-\newcommand\mm@operator[3][]{% 
-    \ifthenelse{\equal{#1}{}}{\def\tempa{#3}}{\def\tempa{#1}}
-    \@ifundefined{\tempa}{
+\NewDocumentCommand\mm@operator{O{#3}mm}{%
+    \@ifundefined{#1}{
         \DeclareMathOperator{#2}{#3}
-    }{\mm@warning{\tempa}}
+    }{\mm@warning{#1}}
 }
     
 %    \end{macrocode}
@@ -1075,7 +1081,7 @@
 % This command works also fine with other sans serif fonts like \textsf{cmbright}.
 %
 % Moreover for \textsf{beamer}, which changes the family default font (sans serif)
-% $\e, \i, \j$ have no effect without |\AtBeginDocument|.
+% |\e|, |\i|, |\j| have no effect without |\AtBeginDocument|.
 % 
 % |\AtBeginDocument| is also necessary to redefine |\i| when calling 
 % the \textsf{hyperref} package which overwrites the |\i| definition.
@@ -1369,7 +1375,10 @@
 
 \mm@macro{mathset}{\mathbf}
 \mm@macro{R}{\ensuremath{\mathset{R}}\xspace} 
-\mm@macro{C}{\ensuremath{\mathset{C}}\xspace}
+%\mm@macro{C}{\ensuremath{\mathset{C}}\xspace}
+\AtBeginDocument{\@ifpackagewith{babel}{russian}{\mm@warning{C}
+    }{\mm@macro{C}{\ensuremath{\mathset{C}}\xspace}}
+}
 \mm@macro{N}{\ensuremath{\mathset{N}}\xspace}
 \mm@macro{Z}{\ensuremath{\mathset{Z}}\xspace}
 \mm@macro{Q}{\ensuremath{\mathset{Q}}\xspace}
@@ -1388,12 +1397,14 @@
     \providecommand*{\hlbar}[1]{\overline{\vphantom{t}#1}}}{
     \mm@warning{hlbar} }
 \newcommand\@eqdef{\stackrel{\mathup{def}}{=}}
-\newcommand\@@eqdef{\stackrel{\Delta}{=}}
+\newcommand\@@eqdef{\stackrel{\mathrm{\Delta}}{=}}
 \mm@macro{eqdef}{\@ifstar{\@@eqdef}{\@eqdef}}
 \mm@macro{unbr}{\underbrace}
 \mm@macro{iif}{if and only if\xspace}
 
 %    \end{macrocode}
+% We used |\mathurm| before |\Delta| in the case of defining capital Greek letters
+% in italic (for example with the \textsf{fixmath} package).
 % Without |\mbox{}|, space produced by |\| in macro |\then| would be suppressed in tables.
 % \medskip
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/tex/latex/mismath/mismath.sty b/Master/texmf-dist/tex/latex/mismath/mismath.sty
index c8fda5df873..ec445540693 100644
--- a/Master/texmf-dist/tex/latex/mismath/mismath.sty
+++ b/Master/texmf-dist/tex/latex/mismath/mismath.sty
@@ -22,7 +22,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{mismath}
-    [2023/02/24 v2.5 .dtx mismath file]
+    [2023/03/01 v2.6 .dtx mismath file]
 \newif\ifmm@ibrackets % initialized to false
 \DeclareOption{ibrackets}{\mm@ibracketstrue}
 \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{amsmath}}
@@ -31,6 +31,7 @@
 \@ifpackageloaded{mathtools}{}{\RequirePackage{mathtools}}
 \@ifpackageloaded{esvect}{}{\RequirePackage[b]{esvect}}
 \RequirePackage{ifthen}
+\RequirePackage{xparse} % for \NewDocumentCommand
 \RequirePackage{xspace}
 \RequirePackage{iftex}
 \ifmm@ibrackets\RequirePackage{ibrackets}\fi
@@ -44,13 +45,12 @@
 \newcommand\mm@macro[2]{
     \@ifundefined{#1}{
         \expandafter\def\csname #1\endcsname{#2}
-    }{\\mm@warning{#1}}
+    }{\mm@warning{#1}}
 }
-\newcommand\mm@operator[3][]{%
-    \ifthenelse{\equal{#1}{}}{\def\tempa{#3}}{\def\tempa{#1}}
-    \@ifundefined{\tempa}{
+\NewDocumentCommand\mm@operator{O{#3}mm}{%
+    \@ifundefined{#1}{
         \DeclareMathOperator{#2}{#3}
-    }{\mm@warning{\tempa}}
+    }{\mm@warning{#1}}
 }
 
 \providecommand{\mathup}[1]{{\operatorfont #1}} % also in kpfonts
@@ -264,7 +264,9 @@
 
 \mm@macro{mathset}{\mathbf}
 \mm@macro{R}{\ensuremath{\mathset{R}}\xspace}
-\mm@macro{C}{\ensuremath{\mathset{C}}\xspace}
+\AtBeginDocument{\@ifpackagewith{babel}{russian}{\mm@warning{C}
+    }{\mm@macro{C}{\ensuremath{\mathset{C}}\xspace}}
+}
 \mm@macro{N}{\ensuremath{\mathset{N}}\xspace}
 \mm@macro{Z}{\ensuremath{\mathset{Z}}\xspace}
 \mm@macro{Q}{\ensuremath{\mathset{Q}}\xspace}
@@ -283,7 +285,7 @@
     \providecommand*{\hlbar}[1]{\overline{\vphantom{t}#1}}}{
     \mm@warning{hlbar} }
 \newcommand\@eqdef{\stackrel{\mathup{def}}{=}}
-\newcommand\@@eqdef{\stackrel{\Delta}{=}}
+\newcommand\@@eqdef{\stackrel{\mathrm{\Delta}}{=}}
 \mm@macro{eqdef}{\@ifstar{\@@eqdef}{\@eqdef}}
 \mm@macro{unbr}{\underbrace}
 \mm@macro{iif}{if and only if\xspace}