fourier (4mar20)

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

3 files changed, 57 insertions, 48 deletions

diff --git a/Master/texmf-dist/tex/latex/fourier/fmxfutm.fd b/Master/texmf-dist/tex/latex/fourier/fmxfutm.fd
index 5dd14e4ca0d..11b6a85e302 100644
--- a/Master/texmf-dist/tex/latex/fourier/fmxfutm.fd
+++ b/Master/texmf-dist/tex/latex/fourier/fmxfutm.fd
@@ -12,4 +12,4 @@
 
 
 
-\endinput
+\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/fourier/fourier-orns.sty b/Master/texmf-dist/tex/latex/fourier/fourier-orns.sty
index 92a4a5a3552..77eef8fbe94 100644
--- a/Master/texmf-dist/tex/latex/fourier/fourier-orns.sty
+++ b/Master/texmf-dist/tex/latex/fourier/fourier-orns.sty
@@ -1,54 +1,62 @@
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.1}
-\def\filedate{2020/01/14}
+\def\fileversion{2.2}
+\def\filedate{2020/03/03}
 \ProvidesPackage{fourier-orns}%
   [\filedate\space\fileversion\space fourier-ornaments package]
 
+\newif\ifFourier@noOTF
+\newif\ifFourier@TU
+\DeclareOption{noOTF}{\Fourier@noOTFtrue}
+\ProcessOptions
+
 \RequirePackage{iftex}[2019/10/24]
-\iftutex
+\iftutex \Fourier@TUtrue \fi
+\ifFourier@noOTF \Fourier@TUfalse \fi
+\ifFourier@TU
   \RequirePackage{fontspec}
   \newfontfamily\FourierOrns{FourierOrns-Regular.otf}[
-   BoldFont   = FourierOrns-Bold.otf ,
-   ItalicFont = FourierOrns-Italic.otf ,
-   BoldItalicFont = FourierOrns-BoldItalic.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}}
-  \newcommand*{\warning}{\TakeFourierOrnament{"26A0}}
-  \newcommand*{\noway}{\TakeFourierOrnament{"26D4}}
-  \newcommand*{\oldpilcrowone}{\TakeFourierOrnament{"E0A0}}
-  \newcommand*{\oldpilcrowtwo}{\TakeFourierOrnament{"E0A1}}
-  \newcommand*{\oldpilcrowthree}{\TakeFourierOrnament{"E0A2}}
-  \newcommand*{\oldpilcrowfour}{\TakeFourierOrnament{"E0A3}}
-  \newcommand*{\oldpilcrowfive}{\TakeFourierOrnament{"E0A4}}
-  \newcommand*{\oldpilcrowsix}{\TakeFourierOrnament{"E0A5}}
-  \newcommand*{\bomb}{\TakeFourierOrnament{"E0B2}}
-  \newcommand*{\grimace}{\TakeFourierOrnament{"E0B3}}
-  \newcommand*{\textthing}{\TakeFourierOrnament{"E0B4}}
-  \newcommand*{\textxswup}{\TakeFourierOrnament{"E0B5}}
-  \newcommand*{\textxswdown}{\TakeFourierOrnament{"E0B6}}
-  \newcommand*{\decoone}{\TakeFourierOrnament{"E0C1}}
-  \newcommand*{\decothreeleft}{\TakeFourierOrnament{"E0C2}}
-  \newcommand*{\decothreeright}{\TakeFourierOrnament{"E0C3}}
-  \newcommand*{\decofourleft}{\TakeFourierOrnament{"E0C4}}
-  \newcommand*{\decofourright}{\TakeFourierOrnament{"E0C5}}
-  \newcommand*{\decosix}{\TakeFourierOrnament{"E0C6}}
-  \newcommand*{\decotwo}{\TakeFourierOrnament{"E0D0}}
-  \newcommand*{\floweroneleft}{\TakeFourierOrnament{"E0D1}}
-  \newcommand*{\floweroneright}{\TakeFourierOrnament{"E0D2}}
-  \newcommand*{\starredbullet}{\TakeFourierOrnament{"E0C7}}
-  \newcommand*{\leafNE}{\TakeFourierOrnament{"E0E0}}
-  \newcommand*{\leafSE}{\TakeFourierOrnament{"E0E1}}
-  \newcommand*{\leafNW}{\TakeFourierOrnament{"E0E2}}
-  \newcommand*{\leafSW}{\TakeFourierOrnament{"E0E3}}
-  \newcommand*{\leafleft}{\TakeFourierOrnament{"E0E4}}
-  \newcommand*{\leafright}{\TakeFourierOrnament{"E0E5}}
-  \newcommand*{\aldinesmall}{\TakeFourierOrnament{"2767}}
-  \newcommand*{\aldineleft}{\TakeFourierOrnament{"E0D8}}
-  \newcommand*{\aldineright}{\TakeFourierOrnament{"2766}}
-  \newcommand*{\aldine}{\TakeFourierOrnament{"E0DA}}
-  \newcommand*{\lefthand}{\TakeFourierOrnament{"261E}}
-  \newcommand*{\righthand}{\TakeFourierOrnament{"261C}}
+  \renewcommand*{\textpertenthousand}{\TakeFourierOrnament{37}}
+  \newcommand*{\eurologo}{\TakeFourierOrnament{101}}
+  \newcommand*{\noway}{\TakeFourierOrnament{48}}
+  \newcommand*{\warning}{\TakeFourierOrnament{49}}
+  \newcommand*{\caution}{\TakeFourierOrnament{50}}
+  \newcommand*{\oldpilcrowone}{\TakeFourierOrnament{51}}
+  \newcommand*{\oldpilcrowtwo}{\TakeFourierOrnament{52}}
+  \newcommand*{\oldpilcrowthree}{\TakeFourierOrnament{53}}
+  \newcommand*{\oldpilcrowfour}{\TakeFourierOrnament{54}}
+  \newcommand*{\oldpilcrowfive}{\TakeFourierOrnament{55}}
+  \newcommand*{\oldpilcrowsix}{\TakeFourierOrnament{56}}
+  \newcommand*{\bomb}{\TakeFourierOrnament{57}}
+  \newcommand*{\grimace}{\TakeFourierOrnament{89}}
+  \newcommand*{\textthing}{\TakeFourierOrnament{90}}
+  \newcommand*{\textxswup}{\TakeFourierOrnament{84}}
+  \newcommand*{\textxswdown}{\TakeFourierOrnament{83}}
+  \newcommand*{\decoone}{\TakeFourierOrnament{85}}
+  \newcommand*{\decothreeleft}{\TakeFourierOrnament{82}}
+  \newcommand*{\decothreeright}{\TakeFourierOrnament{81}}
+  \newcommand*{\decofourleft}{\TakeFourierOrnament{80}}
+  \newcommand*{\decofourright}{\TakeFourierOrnament{79}}
+  \newcommand*{\decosix}{\TakeFourierOrnament{86}}
+  \newcommand*{\decotwo}{\TakeFourierOrnament{87}}
+  \newcommand*{\floweroneleft}{\TakeFourierOrnament{69}}
+  \newcommand*{\floweroneright}{\TakeFourierOrnament{70}}
+  \newcommand*{\starredbullet}{\TakeFourierOrnament{88}}
+  \newcommand*{\leafNE}{\TakeFourierOrnament{71}}
+  \newcommand*{\leafSE}{\TakeFourierOrnament{73}}
+  \newcommand*{\leafNW}{\TakeFourierOrnament{72}}
+  \newcommand*{\leafSW}{\TakeFourierOrnament{74}}
+  \newcommand*{\leafleft}{\TakeFourierOrnament{76}}
+  \newcommand*{\leafright}{\TakeFourierOrnament{75}}
+  \newcommand*{\aldinesmall}{\TakeFourierOrnament{68}}
+  \newcommand*{\aldineleft}{\TakeFourierOrnament{65}}
+  \newcommand*{\aldineright}{\TakeFourierOrnament{66}}
+  \newcommand*{\aldine}{\TakeFourierOrnament{67}}
+  \newcommand*{\lefthand}{\TakeFourierOrnament{77}}
+  \newcommand*{\righthand}{\TakeFourierOrnament{78}}
 \else
   \newcommand*{\TakeFourierOrnament}[1]{{%
     \fontencoding{U}\fontfamily{futs}\selectfont\char#1}}
@@ -93,7 +101,6 @@
       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 0a1d4e40cb2..f9425482105 100644
--- a/Master/texmf-dist/tex/latex/fourier/fourier.sty
+++ b/Master/texmf-dist/tex/latex/fourier/fourier.sty
@@ -1,5 +1,5 @@
-\def\fileversion{2.1}%
-\def\filedate{2020/01/14}%
+\def\fileversion{2.2}%
+\def\filedate{2020/03/03}%
 \NeedsTeXFormat{LaTeX2e}%
 \ProvidesPackage{fourier}%
 [\filedate\space\fileversion\space fourier-GUTenberg package]%
@@ -57,7 +57,9 @@
 \renewcommand{\rmdefault}{fut\textfamilyextension}
 \RequirePackage[T1]{fontenc}
 \RequirePackage{textcomp}
-\RequirePackage{fourier-orns}
+\RequirePackage[noOTF]{fourier-orns}
+\DeclareTextCommand{\textpertenthousand}{T1}
+   {\%\char 24\char 24 }  % space or `relax as delimiter?
 \DeclareSymbolFont{operators}{T1}{fut\mathfamilyextension}{m}{n}%
 \SetSymbolFont{operators}{bold}{T1}{fut\mathfamilyextension}{b}{n}%