diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/fonts/fourier/README | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/fonts/fourier/fourier-orns-doc.pdf | bin | 104446 -> 48352 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/fonts/fourier/fourier-orns-doc.tex | 70 | ||||
| -rw-r--r-- | Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-Bold.otf | bin | 33064 -> 31388 bytes | |||
| -rw-r--r-- | Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-BoldItalic.otf | bin | 33292 -> 31612 bytes | |||
| -rw-r--r-- | Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-Italic.otf | bin | 33188 -> 31544 bytes | |||
| -rw-r--r-- | Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-Regular.otf | bin | 33080 -> 31436 bytes | |||
| -rw-r--r-- | Master/texmf-dist/tex/latex/fourier/fmxfutm.fd | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/fourier/fourier-orns.sty | 95 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/fourier/fourier.sty | 8 |
10 files changed, 113 insertions, 70 deletions
diff --git a/Master/texmf-dist/doc/fonts/fourier/README b/Master/texmf-dist/doc/fonts/fourier/README index c57aa433487..e3991428e04 100644 --- a/Master/texmf-dist/doc/fonts/fourier/README +++ b/Master/texmf-dist/doc/fonts/fourier/README @@ -7,9 +7,13 @@ Fourier-GUTenberg distribution, Michel Bovani michel.bovani@icloud.com %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 1 VERSION +This version number is 2.2 (2020-03-03) +NEW in version 2.2 : +* fourier-orns have now a noOTF option in order to use it with type1 PostScript fonts and luaTeX/XeTeX engines. +* chars in the OTF fonts are now slotted in place of digits or letters. +* fourier calls fournier-orns with the noOTF option. +* the \pertenthousand fourier composite char, which have been dropped by the new latex, is back. - -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. diff --git a/Master/texmf-dist/doc/fonts/fourier/fourier-orns-doc.pdf b/Master/texmf-dist/doc/fonts/fourier/fourier-orns-doc.pdf Binary files differindex d4f81666b58..e534d523d75 100644 --- a/Master/texmf-dist/doc/fonts/fourier/fourier-orns-doc.pdf +++ b/Master/texmf-dist/doc/fonts/fourier/fourier-orns-doc.pdf diff --git a/Master/texmf-dist/doc/fonts/fourier/fourier-orns-doc.tex b/Master/texmf-dist/doc/fonts/fourier/fourier-orns-doc.tex index 6ae299d3bd7..b5e7eb123aa 100644 --- a/Master/texmf-dist/doc/fonts/fourier/fourier-orns-doc.tex +++ b/Master/texmf-dist/doc/fonts/fourier/fourier-orns-doc.tex @@ -1,8 +1,9 @@ -\documentclass[a4paper,11pt]{article} +% !TEX TS-program = LuaLaTeX +\documentclass[a4paper,11pt,draft]{article} \usepackage[utf8]{inputenc} \usepackage{array,xcolor} \usepackage{fourier-orns} -\usepackage[frenchb,english]{babel} +\usepackage[french,english]{babel} \setlength{\leftmargini}{1em} \newcommand{\fourier}{Fourier-GUT\kern-0.15em\textit{enberg}} \title{\floweroneleft{}\,The \emph{fourier-orns} package\,\floweroneright} @@ -10,7 +11,7 @@ %%\renewcommand{\FrenchLabelItem}{\textbullet} \renewcommand\arraystretch{1.5} \renewcommand{\labelitemi}{\starredbullet} - +\setmainfont{Linux Libertine O} \begin{document} \maketitle @@ -21,10 +22,10 @@ Remember that: \item You have to install \fourier{} anyway. \item If you call \textit{fourier}, you should \emph{not} call \textit{fourier-orns}, because \textit{fourier} will do it anyway. All the commands described here may be used with \textit{fourier}. +\item Thanks to Daniel Flipo (\texttt{daniel.flipo@free.fr}), there are now opentype versions of the fourier ornaments fonts. Those fonts are automatically selected and the \texttt{fontspec} package is called, when the \TeX{} engine is lua\TeX{} or Xe\TeX{}. +\item There is a \texttt{noOTF} option which force the use of PostScript type 1 fonts, even when the \TeX{} engine is lua\TeX{} or Xe\TeX{}. Note that the \textit{fourier} call for \textit{fourier-orns} uses that option. \end{itemize} -Thanks to Daniel Flipo (\texttt{daniel.flipo@free.fr}), there are now opentype versions of the fourier ornaments fonts. Those fonts are automatically selected an the \texttt{fontspec} package is called, when the \TeX{} engine is lua\TeX{} or Xe\TeX{}. - \bigskip Here are the provided symbols: @@ -67,7 +68,7 @@ but \verb=\textsl{\eurologo}= \textsl{\eurologo} will do it. \verb=\aldineleft= &\aldineleft&\verb=\aldineright=& \aldineright\tabularnewline \verb=\aldine=&\aldine& \verb=\aldinesmall=& \aldinesmall \end{tabular} -\item A complete set of old style pilcrow here in \verb=\LARGE= size: +\item A complete set of old style pilcrows here in \verb=\LARGE= size: \begin{tabular}{l>{\centering\LARGE}p{1cm}l>{\centering\LARGE}p{3cm}} \verb=\oldpilcrowone=&\oldpilcrowone&\verb=\oldpilcrowfive=&\oldpilcrowfive\tabularnewline @@ -79,23 +80,52 @@ but \verb=\textsl{\eurologo}= \textsl{\eurologo} will do it. Old pilcrow ``with tails'' can be used like that: \begin{verbatim} \definecolor{newred}{cmyk}{0,1,1,0.1} -\noindent \textcolor{newred}{\oldpilcrowfour}\,We few, we happy few, -we band of brothers; -\textcolor{newred}{\oldpilcrowfive}\,For he to-day that sheds his -blood with me -\textcolor{newred}{\oldpilcrowsix}\,Shall be my brother; be he ne'er -so vile, -\textcolor{newred}{\oldpilcrowfour}\,This day shall gentle his -condition. +\noindent \textcolor{newred}{\oldpilcrowfour}\,We few, + we happy few, we band of brothers; \textcolor{newred} + {\oldpilcrowfive}\,For he to-day that sheds his blood with + me \textcolor{newred}{\oldpilcrowsix}\,Shall be my brother; +be he ne'er so vile, \textcolor{newred} +{\oldpilcrowfour}\,This day shall gentle his condition. \end{verbatim} \definecolor{newred}{cmyk}{0,1,1,0.1} -\noindent \textcolor{newred}{\oldpilcrowfour}\,We few, we happy few, we band of brothers; -\textcolor{newred}{\oldpilcrowfive}\,For he to-day that sheds his blood with me -\textcolor{newred}{\oldpilcrowsix}\,Shall be my brother; be he ne'er so vile, -\textcolor{newred}{\oldpilcrowfour}\,This day shall gentle his condition. +\noindent \textcolor{newred}{\oldpilcrowfour}\,We few, + we happy few, we band of brothers; \textcolor{newred} + {\oldpilcrowfive}\,For he to-day that sheds his blood with + me \textcolor{newred}{\oldpilcrowsix}\,Shall be my brother; +be he ne'er so vile, \textcolor{newred} +{\oldpilcrowfour}\,This day shall gentle his condition. \end{itemize} - - +{\centering {\Large\FourierOrns W} + +} +\vspace\baselineskip + +Finally, the opentype version of \textit{fourier-orns} provides a \verb+\FourierOrns+ command in order to select the font. As chars in the font are now slotted in place of digits or letters, the correspondence in the table below can be used, but, remember, only when using opentype fonts. + +\begin{center}\begin{tabular}{ccccccccccc} +\hline +1&2&3&4&5&6&7&8&9&0\\ +%\hline +{\FourierOrns 1}&{\FourierOrns 2}&{\FourierOrns 3}&{\FourierOrns 4}& +{\FourierOrns 5}&{\FourierOrns 6}&{\FourierOrns 7}&{\FourierOrns 8}&{\FourierOrns 9}&{\FourierOrns 0}\\ +\hline +A&B&C&D&E&F&G&H&I&J\\ +%\hline +{\FourierOrns A}&{\FourierOrns B}&{\FourierOrns C}&{\FourierOrns D}&{\FourierOrns E}& +{\FourierOrns F}&{\FourierOrns G}&{\FourierOrns H}&{\FourierOrns I}&{\FourierOrns J}\\ +\hline +K&L&M&N&O&P&Q&R&S&T\\ +%\hline +{\FourierOrns K }&{\FourierOrns L}&{\FourierOrns M}&{\FourierOrns N}&{\FourierOrns O}& +{\FourierOrns P}&{\FourierOrns Q}&{\FourierOrns R}&{\FourierOrns S}&{\FourierOrns T}\\ +\hline +U&V&W&X&Y&Z\\ +{\FourierOrns U}&{\FourierOrns V}&{\FourierOrns W}&{\FourierOrns X}&{\FourierOrns Y} +&{\FourierOrns Z}\\ +\hline +\end{tabular}\end{center} + +For instance, you could type \verb+{\FourierOrns E 2 F}+ to obtain {\FourierOrns E 2 F}. \end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-Bold.otf b/Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-Bold.otf Binary files differindex f6f68f3853d..775fb3632fb 100644 --- a/Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-Bold.otf +++ b/Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-Bold.otf diff --git a/Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-BoldItalic.otf b/Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-BoldItalic.otf Binary files differindex 34199b288c8..7f9a261dbd7 100644 --- a/Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-BoldItalic.otf +++ b/Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-BoldItalic.otf diff --git a/Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-Italic.otf b/Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-Italic.otf Binary files differindex 1fe442e2b7f..ee54b734f7e 100644 --- a/Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-Italic.otf +++ b/Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-Italic.otf diff --git a/Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-Regular.otf b/Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-Regular.otf Binary files differindex cd0a4fe4c67..3cc8a9b191b 100644 --- a/Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-Regular.otf +++ b/Master/texmf-dist/fonts/opentype/public/fourier/FourierOrns-Regular.otf 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}% |