frenchmath (22may19)

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

4 files changed, 73 insertions, 74 deletions

diff --git a/Master/texmf-dist/doc/latex/frenchmath/README.md b/Master/texmf-dist/doc/latex/frenchmath/README.md
index dcaa86e91bc..28cc6dc4cef 100644
--- a/Master/texmf-dist/doc/latex/frenchmath/README.md
+++ b/Master/texmf-dist/doc/latex/frenchmath/README.md
@@ -6,7 +6,7 @@
 The package provides:
 - capital letters in upright shape for mathematical mode according to French rule (package option),
 - correct spacing after commas and before a semicolon in math mode,
-- some useful macros and aliases for symbols used in France : infeg, supeg, paral,...
+- some useful macros and aliases for symbols used in France : `\infeg`, `\supeg`, `\paral`,...
 - several macros for writing french operator names like pgcd, ppcm, Card, rg, Vect,...
 
 
diff --git a/Master/texmf-dist/doc/latex/frenchmath/frenchmath.pdf b/Master/texmf-dist/doc/latex/frenchmath/frenchmath.pdf
index ba10fc9c2f3..29ea11e0cf7 100644
--- a/Master/texmf-dist/doc/latex/frenchmath/frenchmath.pdf
+++ b/Master/texmf-dist/doc/latex/frenchmath/frenchmath.pdf
diff --git a/Master/texmf-dist/source/latex/frenchmath/frenchmath.dtx b/Master/texmf-dist/source/latex/frenchmath/frenchmath.dtx
index 547efed53fa..f9f413d6478 100644
--- a/Master/texmf-dist/source/latex/frenchmath/frenchmath.dtx
+++ b/Master/texmf-dist/source/latex/frenchmath/frenchmath.dtx
@@ -2,8 +2,6 @@
 %
 % Copyright (C) 2019 by Antoine Missier <antoine.missier@ac-toulouse.fr>
 %
-% Version 0.1 : 27/12/2011
-% Version 1.0 : création fichiers dtx et ins
 % This file may be distributed and/or modified under the conditions of
 % the LaTeX Project Public License, either version 1.3 of this license
 % or (at your option) any later version.  The latest version of this
@@ -22,7 +20,7 @@
 %<*package> 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{frenchmath}   
-    [2019/05/15 v1.3 .dtx frenchmath file]
+    [2019/05/22 v1.4 .dtx frenchmath file]
 %</package>
 %<*driver>
 \documentclass{ltxdoc}
@@ -32,7 +30,7 @@
 \usepackage{lmodern}
 \usepackage{frenchmath}
 % pour l'exemple de la doc on utilise \PV pour simuler le ; d'origine
-\DeclareMathSymbol{\PV}\mathpunct{up}{059} % 059 = code du ;
+\DeclareMathSymbol{\PV}\mathpunct{UpSh}{059} % 059 = code du ;
 \DisableCrossrefs         
 %\CodelineIndex
 %\RecordChanges
@@ -53,7 +51,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{679}
+% \CheckSum{692}
 %
 % \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
@@ -72,24 +70,25 @@
 %   Right brace   \}     Tilde         \~}
 %
 %
-% \changes{v1.0}{15/01/2019}{Initial version}
-% \changes{v1.1}{15/04/2019}{Nouvelles macros pour les repères, 
-% changements mineurs dans la documentation}
-% \changes{v1.1}{07/04/2019}{ajouté |\Oij| et |Oijk|}
-% \changes{v1.1}{07/04/2019}{ajouté |\ensuremath| dans |\curs|}
-% \changes{v1.2}{25/04/2019}{ajouté |\Ouv|}
+% \changes{v0.1}{27/12/2011}{Version personnelle préliminaire}
+% \changes{v1.0}{15/01/2019}{Première version publiée, création des fichiers dtx et ins}
+% \changes{v1.1}{07/04/2019}{Nouvelles macros pour les repères (Oij, Oijk),
+% ajouté ensuremath dans curs}
+% \changes{v1.1}{15/04/2019}{Changements mineurs dans la documentation}
 % \changes{v1.2}{25/04/2019}{L'option capsrm fonctionne à présent avec beamer, 
-% modifications du fichier README.md}
+% ajouté Ouv, modifications du fichier README.md}
 % \changes{v1.2}{27/04/2019}{capsrm -> capsup}
-% \changes{v1.3}{10/05/2019}{intégration de icomma et psset{comma=true}, 
+% \changes{v1.3}{15/05/2019}{Intégration de icomma et psset{comma=true}, 
 % changements dans la documentation}
+% \changes{v1.4}{2019/05/22}{Changement de la définition de fonte up -> UpSh, 
+% car incompatibilité avec l'extension unicode-math}
 %
 % \GetFileInfo{frenchmath.sty}
 %
 % \title{L'extension \textsf{frenchmath}\thanks{Ce document
-%     correspond à \textsf{frenchmath}~\fileversion, dernière modification le 15/05/2019.}}
+%     correspond à \textsf{frenchmath}~\fileversion, dernière modification le 22/05/2019.}}
 % \author{Antoine Missier \\ \texttt{antoine.missier@ac-toulouse.fr}}
-% \date{15 mai 2019}
+% \date{22 mai 2019}
 % \maketitle
 %
 % \section{Introduction}
@@ -328,7 +327,7 @@
 \RequirePackage{xspace} % utile pour les commandes \curs, \ssi, \Oij
 \RequirePackage{icomma} % virgule intelligente
 
-\DeclareSymbolFont{up}{\encodingdefault}{\familydefault}{m}{n} 
+\DeclareSymbolFont{UpSh}{\encodingdefault}{\familydefault}{m}{n} 
 %    \end{macrocode}
 % L'option \texttt{capsup} redéfinit toutes les lettres majuscules
 % du mode mathématique ; |\AtBeginDocument| est nécessaire pour que 
@@ -336,35 +335,35 @@
 % \smallskip
 %    \begin{macrocode}
 \ifthenelse{\boolean{capsit}}{}{\AtBeginDocument{
-    \DeclareMathSymbol{A}\mathalpha{up}{`A} %'A codage octal du A
-    \DeclareMathSymbol{B}\mathalpha{up}{`B}
-    \DeclareMathSymbol{C}\mathalpha{up}{`C}
-    \DeclareMathSymbol{D}\mathalpha{up}{`D}
-    \DeclareMathSymbol{E}\mathalpha{up}{`E}
-    \DeclareMathSymbol{F}\mathalpha{up}{`F}
-    \DeclareMathSymbol{G}\mathalpha{up}{`G}
-    \DeclareMathSymbol{H}\mathalpha{up}{`H}
-    \DeclareMathSymbol{I}\mathalpha{up}{`I}
-    \DeclareMathSymbol{J}\mathalpha{up}{`J}
-    \DeclareMathSymbol{K}\mathalpha{up}{`K}
-    \DeclareMathSymbol{L}\mathalpha{up}{`L}
-    \DeclareMathSymbol{M}\mathalpha{up}{`M}
-    \DeclareMathSymbol{N}\mathalpha{up}{`N}
-    \DeclareMathSymbol{O}\mathalpha{up}{`O}
-    \DeclareMathSymbol{P}\mathalpha{up}{`P}
-    \DeclareMathSymbol{Q}\mathalpha{up}{`Q}
-    \DeclareMathSymbol{R}\mathalpha{up}{`R}
-    \DeclareMathSymbol{S}\mathalpha{up}{`S}
-    \DeclareMathSymbol{T}\mathalpha{up}{`T}
-    \DeclareMathSymbol{U}\mathalpha{up}{`U}
-    \DeclareMathSymbol{V}\mathalpha{up}{`V}
-    \DeclareMathSymbol{W}\mathalpha{up}{`W}
-    \DeclareMathSymbol{X}\mathalpha{up}{`X}
-    \DeclareMathSymbol{Y}\mathalpha{up}{`Y}
-    \DeclareMathSymbol{Z}\mathalpha{up}{`Z}
+    \DeclareMathSymbol{A}\mathalpha{UpSh}{`A} %'A codage octal du A
+    \DeclareMathSymbol{B}\mathalpha{UpSh}{`B}
+    \DeclareMathSymbol{C}\mathalpha{UpSh}{`C}
+    \DeclareMathSymbol{D}\mathalpha{UpSh}{`D}
+    \DeclareMathSymbol{E}\mathalpha{UpSh}{`E}
+    \DeclareMathSymbol{F}\mathalpha{UpSh}{`F}
+    \DeclareMathSymbol{G}\mathalpha{UpSh}{`G}
+    \DeclareMathSymbol{H}\mathalpha{UpSh}{`H}
+    \DeclareMathSymbol{I}\mathalpha{UpSh}{`I}
+    \DeclareMathSymbol{J}\mathalpha{UpSh}{`J}
+    \DeclareMathSymbol{K}\mathalpha{UpSh}{`K}
+    \DeclareMathSymbol{L}\mathalpha{UpSh}{`L}
+    \DeclareMathSymbol{M}\mathalpha{UpSh}{`M}
+    \DeclareMathSymbol{N}\mathalpha{UpSh}{`N}
+    \DeclareMathSymbol{O}\mathalpha{UpSh}{`O}
+    \DeclareMathSymbol{P}\mathalpha{UpSh}{`P}
+    \DeclareMathSymbol{Q}\mathalpha{UpSh}{`Q}
+    \DeclareMathSymbol{R}\mathalpha{UpSh}{`R}
+    \DeclareMathSymbol{S}\mathalpha{UpSh}{`S}
+    \DeclareMathSymbol{T}\mathalpha{UpSh}{`T}
+    \DeclareMathSymbol{U}\mathalpha{UpSh}{`U}
+    \DeclareMathSymbol{V}\mathalpha{UpSh}{`V}
+    \DeclareMathSymbol{W}\mathalpha{UpSh}{`W}
+    \DeclareMathSymbol{X}\mathalpha{UpSh}{`X}
+    \DeclareMathSymbol{Y}\mathalpha{UpSh}{`Y}
+    \DeclareMathSymbol{Z}\mathalpha{UpSh}{`Z}
 }}
 \AtBeginDocument{\@ifpackageloaded{pstricks-add}{\psset{comma=true}}{}}
-\DeclareMathSymbol{;}\mathbin{up}{059} % \mathpunct à l'origine
+\DeclareMathSymbol{;}\mathbin{UpSh}{059} % \mathpunct à l'origine
 
 \newcommand*\curs[1]{\ensuremath{\mathscr{#1}}\xspace}
 \newcommand\infeg{\leqslant} 
@@ -436,7 +435,7 @@
 % \bibitem{VECT} \emph{Typesetting vectors with beautiful arrow with \LaTeXe}.
 % Extension \LaTeX\ \textsf{esvect} d'Eddie Saudrais, CTAN, v1.3 11/07/2013.
 % \bibitem{MIS} \emph{\textsf{mismath} -- Miscellaneus mathematical macros}. Extension \LaTeX\ 
-% d'Antoine Missier, CTAN, v1.3 08/05/2019.
+% d'Antoine Missier, CTAN, v1.4 22/05/2019.
 % \end{thebibliography}
 
 % \Finale
diff --git a/Master/texmf-dist/tex/latex/frenchmath/frenchmath.sty b/Master/texmf-dist/tex/latex/frenchmath/frenchmath.sty
index c93bd7ef69a..40ec7994f35 100644
--- a/Master/texmf-dist/tex/latex/frenchmath/frenchmath.sty
+++ b/Master/texmf-dist/tex/latex/frenchmath/frenchmath.sty
@@ -22,7 +22,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{frenchmath}
-    [2019/05/15 v1.3 .dtx frenchmath file]
+    [2019/05/22 v1.4 .dtx frenchmath file]
 \RequirePackage{ifthen}
 \newboolean{capsit}
 \DeclareOption{capsit}{\setboolean{capsit}{true}}
@@ -35,37 +35,37 @@
 \RequirePackage{xspace} % utile pour les commandes \curs, \ssi, \Oij
 \RequirePackage{icomma} % virgule intelligente
 
-\DeclareSymbolFont{up}{\encodingdefault}{\familydefault}{m}{n}
+\DeclareSymbolFont{UpSh}{\encodingdefault}{\familydefault}{m}{n}
 \ifthenelse{\boolean{capsit}}{}{\AtBeginDocument{
-    \DeclareMathSymbol{A}\mathalpha{up}{`A} %'A codage octal du A
-    \DeclareMathSymbol{B}\mathalpha{up}{`B}
-    \DeclareMathSymbol{C}\mathalpha{up}{`C}
-    \DeclareMathSymbol{D}\mathalpha{up}{`D}
-    \DeclareMathSymbol{E}\mathalpha{up}{`E}
-    \DeclareMathSymbol{F}\mathalpha{up}{`F}
-    \DeclareMathSymbol{G}\mathalpha{up}{`G}
-    \DeclareMathSymbol{H}\mathalpha{up}{`H}
-    \DeclareMathSymbol{I}\mathalpha{up}{`I}
-    \DeclareMathSymbol{J}\mathalpha{up}{`J}
-    \DeclareMathSymbol{K}\mathalpha{up}{`K}
-    \DeclareMathSymbol{L}\mathalpha{up}{`L}
-    \DeclareMathSymbol{M}\mathalpha{up}{`M}
-    \DeclareMathSymbol{N}\mathalpha{up}{`N}
-    \DeclareMathSymbol{O}\mathalpha{up}{`O}
-    \DeclareMathSymbol{P}\mathalpha{up}{`P}
-    \DeclareMathSymbol{Q}\mathalpha{up}{`Q}
-    \DeclareMathSymbol{R}\mathalpha{up}{`R}
-    \DeclareMathSymbol{S}\mathalpha{up}{`S}
-    \DeclareMathSymbol{T}\mathalpha{up}{`T}
-    \DeclareMathSymbol{U}\mathalpha{up}{`U}
-    \DeclareMathSymbol{V}\mathalpha{up}{`V}
-    \DeclareMathSymbol{W}\mathalpha{up}{`W}
-    \DeclareMathSymbol{X}\mathalpha{up}{`X}
-    \DeclareMathSymbol{Y}\mathalpha{up}{`Y}
-    \DeclareMathSymbol{Z}\mathalpha{up}{`Z}
+    \DeclareMathSymbol{A}\mathalpha{UpSh}{`A} %'A codage octal du A
+    \DeclareMathSymbol{B}\mathalpha{UpSh}{`B}
+    \DeclareMathSymbol{C}\mathalpha{UpSh}{`C}
+    \DeclareMathSymbol{D}\mathalpha{UpSh}{`D}
+    \DeclareMathSymbol{E}\mathalpha{UpSh}{`E}
+    \DeclareMathSymbol{F}\mathalpha{UpSh}{`F}
+    \DeclareMathSymbol{G}\mathalpha{UpSh}{`G}
+    \DeclareMathSymbol{H}\mathalpha{UpSh}{`H}
+    \DeclareMathSymbol{I}\mathalpha{UpSh}{`I}
+    \DeclareMathSymbol{J}\mathalpha{UpSh}{`J}
+    \DeclareMathSymbol{K}\mathalpha{UpSh}{`K}
+    \DeclareMathSymbol{L}\mathalpha{UpSh}{`L}
+    \DeclareMathSymbol{M}\mathalpha{UpSh}{`M}
+    \DeclareMathSymbol{N}\mathalpha{UpSh}{`N}
+    \DeclareMathSymbol{O}\mathalpha{UpSh}{`O}
+    \DeclareMathSymbol{P}\mathalpha{UpSh}{`P}
+    \DeclareMathSymbol{Q}\mathalpha{UpSh}{`Q}
+    \DeclareMathSymbol{R}\mathalpha{UpSh}{`R}
+    \DeclareMathSymbol{S}\mathalpha{UpSh}{`S}
+    \DeclareMathSymbol{T}\mathalpha{UpSh}{`T}
+    \DeclareMathSymbol{U}\mathalpha{UpSh}{`U}
+    \DeclareMathSymbol{V}\mathalpha{UpSh}{`V}
+    \DeclareMathSymbol{W}\mathalpha{UpSh}{`W}
+    \DeclareMathSymbol{X}\mathalpha{UpSh}{`X}
+    \DeclareMathSymbol{Y}\mathalpha{UpSh}{`Y}
+    \DeclareMathSymbol{Z}\mathalpha{UpSh}{`Z}
 }}
 \AtBeginDocument{\@ifpackageloaded{pstricks-add}{\psset{comma=true}}{}}
-\DeclareMathSymbol{;}\mathbin{up}{059} % \mathpunct à l'origine
+\DeclareMathSymbol{;}\mathbin{UpSh}{059} % \mathpunct à l'origine
 
 \newcommand*\curs[1]{\ensuremath{\mathscr{#1}}\xspace}
 \newcommand\infeg{\leqslant}