fourier (14jan20)

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

3 files changed, 31 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/fonts/fourier/README b/Master/texmf-dist/doc/fonts/fourier/README
index f58e3e2e9c9..c57aa433487 100644
--- a/Master/texmf-dist/doc/fonts/fourier/README
+++ b/Master/texmf-dist/doc/fonts/fourier/README
@@ -1,4 +1,4 @@
-Fourier-GUTenberg distribution, Michel Bovani michel.bovani@wanadoo.fr
+Fourier-GUTenberg distribution, Michel Bovani michel.bovani@icloud.com
 
 1 VERSIONS
 2 LICENCE
@@ -9,7 +9,14 @@ Fourier-GUTenberg distribution, Michel Bovani michel.bovani@wanadoo.fr
 1 VERSION
 
 
-This version number is 2.0 (2019-11-27)
+This version number is 2.1 (2020-01-14)
+NEW in version 2.1:
+* in fourier-orns.sty, the otf versions of the font are now searched by file name rather than by font name in order xelatex to find them easily.
+Thanks to Marcel Krüger and Norbert Preining for pointing this out.
+* in fourier-orns.sty, the \danger command is now also defined in the otf context.
+* in fourier.sty there is now a warning message to suggest the use of fourier-otf.sty when xelatex or lualatex are used. Thanks to Daniel Flipo for suggesting this.
+
+
 NEW in version 2.0:
 * In expert modes (need you buy the expert utopia pfb fonts):
   - Possibility is provided to use superior letters of the commercial utopia font
diff --git a/Master/texmf-dist/tex/latex/fourier/fourier-orns.sty b/Master/texmf-dist/tex/latex/fourier/fourier-orns.sty
index aa67aefca93..92a4a5a3552 100644
--- a/Master/texmf-dist/tex/latex/fourier/fourier-orns.sty
+++ b/Master/texmf-dist/tex/latex/fourier/fourier-orns.sty
@@ -1,13 +1,16 @@
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.0}
-\def\filedate{2019/11/18}
+\def\fileversion{2.1}
+\def\filedate{2020/01/14}
 \ProvidesPackage{fourier-orns}%
   [\filedate\space\fileversion\space fourier-ornaments package]
 
 \RequirePackage{iftex}[2019/10/24]
 \iftutex
   \RequirePackage{fontspec}
-  \newfontfamily\FourierOrns{FourierOrns}
+  \newfontfamily\FourierOrns{FourierOrns-Regular.otf}[
+   BoldFont   = FourierOrns-Bold.otf ,
+   ItalicFont = FourierOrns-Italic.otf ,
+   BoldItalicFont = FourierOrns-BoldItalic.otf ]
   \newcommand*{\TakeFourierOrnament}[1]{{\FourierOrns \char#1}}
   \renewcommand*{\textpertenthousand}{\TakeFourierOrnament{"2031}}
   \newcommand*{\eurologo}{\TakeFourierOrnament{"20AC}}
@@ -52,11 +55,7 @@
   \newcommand*{\eurologo}{\TakeFourierOrnament{69}}
   \newcommand*{\noway}{\TakeFourierOrnament{65}}
   \newcommand*{\warning}{\TakeFourierOrnament{66}}
-  \newcommand*{\danger}{\PackageWarning{fourier-orns}{%
-      Command \protect\danger\space is deprecated.\MessageBreak
-      Use \protect\warning\space instead; reported}%
-      \warning}
-  \newcommand*{\bomb}{\TakeFourierOrnament{76}}
+   \newcommand*{\bomb}{\TakeFourierOrnament{76}}
   \newcommand*{\grimace}{\TakeFourierOrnament{77}}
   \newcommand*{\textthing}{\TakeFourierOrnament{78}}
   \newcommand*{\oldpilcrowone}{\TakeFourierOrnament{79}}
@@ -90,6 +89,11 @@
   \newcommand*{\lefthand}{\TakeFourierOrnament{116}}
   \newcommand*{\righthand}{\TakeFourierOrnament{117}}
 \fi
+ \newcommand*{\danger}{\PackageWarning{fourier-orns}{%
+      Command \protect\danger\space is deprecated.\MessageBreak
+      Use \protect\warning\space instead; reported}%
+      \warning}
+
 %
 %
 \endinput
diff --git a/Master/texmf-dist/tex/latex/fourier/fourier.sty b/Master/texmf-dist/tex/latex/fourier/fourier.sty
index fe97bedb990..0a1d4e40cb2 100644
--- a/Master/texmf-dist/tex/latex/fourier/fourier.sty
+++ b/Master/texmf-dist/tex/latex/fourier/fourier.sty
@@ -1,8 +1,16 @@
-\def\fileversion{2.0}%
-\def\filedate{2019/11/27}%
+\def\fileversion{2.1}%
+\def\filedate{2020/01/14}%
 \NeedsTeXFormat{LaTeX2e}%
 \ProvidesPackage{fourier}%
 [\filedate\space\fileversion\space fourier-GUTenberg package]%
+\RequirePackage{iftex}[2019/10/24]
+\iftutex
+\PackageWarningNoLine{fourier}{%
+   Please consider loading "fourier-otf.sty" instead of\MessageBreak
+   "fourier.sty" with Unicode engines LuaTeX or XeTeX,\MessageBreak
+   so that Type1 fonts get replaced by OpenType fonts.\MessageBreak
+   See file "Erewhon-Math.pdf" for more information}
+\fi
 \DeclareFontEncoding{FML}{}{}
   \DeclareFontSubstitution{FML}{futm}{m}{it}
 \DeclareFontEncoding{FMS}{}{}