summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty')
-rw-r--r--Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty137
1 files changed, 97 insertions, 40 deletions
diff --git a/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty b/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty
index 612e5ad219d..da916de3e97 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty
+++ b/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty
@@ -1,5 +1,5 @@
%% comfortaa.sty
-%% Copyright 2011 Mohamed El Morabity
+%% Copyright 2019 Mohamed El Morabity
%
% This work 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)
@@ -8,49 +8,106 @@
% distributions of LaTeX version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is Mohamed El Morabity
%
% This work consists of all files listed in manifest.txt.
+
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{comfortaa}[2011/08/14 Comfortaa]
-
-\RequirePackage{keyval}
-\RequirePackage{slantsc}
-
-% Taken from inconsolata.sty
-\define@key{comfortaa}{scale}[1.0]{\def\comfortaa@scale{s*[#1]}}
-\DeclareOption*{%
- \begingroup
- \edef\x{\endgroup
- \noexpand\setkeys{comfortaa}{\CurrentOption}}%
- \x%
-}
-
-\DeclareOption{defaultsans}{%
- \renewcommand*{\sfdefault}{fco}%
-}
-
-\DeclareOption{default}{%
- \renewcommand*{\sfdefault}{fco}%
- \renewcommand*{\familydefault}{fco}%
-}
-
-\ProcessOptions*
-
-\newcommand{\fcofamily}{%
- \fontfamily{fco}%
- \selectfont%
-}
-
-% Fix search of words containing fi/fl ligatures in PDFs
-\@ifundefined{pdfglyphtounicode}{}{%
- % fi
- \pdfglyphtounicode{uniF001}{FB01}%
- % fl
- \pdfglyphtounicode{uniF002}{FB02}%
- \pdfgentounicode=1%
-}
+\ProvidesPackage{comfortaa}[2019/06/15 Style file for Comfortaa.]
+
+\RequirePackage{ifluatex}
+\RequirePackage{ifxetex}
+\RequirePackage{xkeyval}
+
+\newif\ifcomfortaa@otf
+\ifxetex
+ \comfortaa@otftrue
+\else
+ \ifluatex
+ \comfortaa@otftrue
+ \else
+ \comfortaa@otffalse
+ \fi
+\fi
+
+\newif\ifcomfortaa@default
+\comfortaa@defaultfalse
+
+\newif\ifcomfortaa@defaultsans
+\comfortaa@defaultsansfalse
+
+\newcommand*{\comfortaa@scale}{1}
+\DeclareOptionX{scale}{\renewcommand*{\comfortaa@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\comfortaa@scale}{#1}}
+
+\DeclareOptionX{default}{\comfortaa@defaulttrue}
+\DeclareOptionX{defaultsans}{\comfortaa@defaultsanstrue}
+\DeclareOptionX{type1}{\comfortaa@otffalse}
+
+\ProcessOptionsX
+\relax
+
+
+\newcommand*{\comfortaafamily}{comfortaa}
+
+\ifcomfortaa@otf
+ \RequirePackage{fontspec}
+
+ \ifxetex
+ \XeTeXtracingfonts=1
+ \fi
+
+ \newcommand*{\comfortaa@otf@slant}{0.167}
+ \newcommand*{\comfortaa@otf@features}{%
+ Extension=.ttf,%
+ Ligatures=Common,%
+ Scale=\comfortaa@scale,%
+ FontFace={l}{n}{*-Light},%
+ FontFace={l}{it}{Font=*-Light,FakeSlant=\comfortaa@otf@slant},%
+ UprightFont={*-Regular},%
+ ItalicFont={*-Regular},%
+ ItalicFeatures={FakeSlant=\comfortaa@otf@slant},%
+ FontFace={b}{n}{*-Bold},%
+ FontFace={b}{it}{Font=*-Bold,FakeSlant=\comfortaa@otf@slant},%
+ BoldFont={*-Bold},%
+ BoldItalicFont={*-Bold},%
+ BoldItalicFeatures={FakeSlant=\comfortaa@otf@slant}%
+ }
+
+ \newfontfamily{\comfortaa}[%
+ \comfortaa@otf@features,%
+ NFSSFamily=\comfortaafamily%
+ ]{Comfortaa}
+
+ % Legacy compatibility
+ \newfontfamily{\fcofamily}[%
+ \comfortaa@otf@features,%
+ NFSSFamily=fco%
+ ]{Comfortaa}
+
+ \ifcomfortaa@defaultsans
+ \setsansfont[%
+ \comfortaa@otf@features%
+ ]{Comfortaa}
+ \fi
+ \ifcomfortaa@default
+ \setmainfont[%
+ \comfortaa@otf@features%
+ ]{Comfortaa}
+ \fi
+\else
+ \newcommand*{\comfortaa}{\fontfamily{\comfortaafamily}\selectfont}
+ % Legacy compatibility
+ \newcommand*{\fcofamily}{\comfortaa}
+
+ \ifcomfortaa@defaultsans
+ \renewcommand*{\sfdefault}{\comfortaafamily}
+ \fi
+ \ifcomfortaa@default
+ \renewcommand*{\familydefault}{\comfortaafamily}
+ \fi
+\fi
\endinput