summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-11-20 22:00:05 +0000
committerKarl Berry <karl@freefriends.org>2017-11-20 22:00:05 +0000
commite29305a27617046929c0491662bbaabe22b55851 (patch)
tree967cf176422f89992f0409afca0e09c850567f59 /Master/texmf-dist/tex/latex
parentcc42cb8fe09e2282deed2b6841755274e5b11a28 (diff)
plex (20nov17)
git-svn-id: svn://tug.org/texlive/trunk@45863 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/plex/plex-mono.sty30
-rw-r--r--Master/texmf-dist/tex/latex/plex/plex-sans.sty35
-rw-r--r--Master/texmf-dist/tex/latex/plex/plex-serif.sty11
3 files changed, 53 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/plex/plex-mono.sty b/Master/texmf-dist/tex/latex/plex/plex-mono.sty
index 7532d1ac766..84e3038159d 100644
--- a/Master/texmf-dist/tex/latex/plex/plex-mono.sty
+++ b/Master/texmf-dist/tex/latex/plex/plex-mono.sty
@@ -34,6 +34,8 @@
\newcommand*{\IBMPlexMono@scale}{1}
\DeclareOptionX{scale}{\renewcommand*{\IBMPlexMono@scale}{#1}}
+\newif\ifplexmono@ligatures \plexmono@ligaturestrue
+
\DeclareOptionX{type1}{\plexmono@otffalse}
@@ -43,31 +45,45 @@
\DeclareOptionX{el}{\edef\mdseries@tt{el}\def\plexmono@medstyle{ExtraLight}}
\DeclareOptionX{light}{\edef\mdseries@tt{l}\def\plexmono@medstyle{Light}}
\DeclareOptionX{l}{\edef\mdseries@tt{l}\def\plexmono@medstyle{Light}}
+\DeclareOptionX{textmd}{\edef\mdseries@tt{tx}\def\plexserif@medstyle{Text}}
+\DeclareOptionX{txmd}{\edef\mdseries@tt{tx}\def\plexserif@medstyle{Text}}
\DeclareOptionX{text}{\edef\bfseries@tt{tx}\def\plexmono@boldstyle{Text}}
\DeclareOptionX{tx}{\edef\bfseries@tt{tx}\def\plexmono@boldstyle{Text}}
\DeclareOptionX{medium}{\edef\bfseries@tt{mb}\def\plexmono@boldstyle{Medium}}
\DeclareOptionX{m}{\edef\bfseries@tt{mb}\def\plexmono@boldstyle{Medium}}
\DeclareOptionX{semibold}{\edef\bfseries@tt{sb}\def\plexmono@boldstyle{SemiBold}}
\DeclareOptionX{sb}{\edef\bfseries@tt{sb}\def\plexmono@boldstyle{SemiBold}}
+\DeclareOptionX{nomap}{\plexmono@ligaturesfalse}
\ProcessOptionsX\relax
\ifplexmono@otf
+ \def\plexmono@regular{Regular}
\ifxetex\XeTeXtracingfonts=1\fi
- \defaultfontfeatures{
- Ligatures = TeX ,
- Scale = \IBMPlexMono@scale ,
- Extension = .otf }
- \setmonofont
+ \ifplexmono@ligatures
+ \defaultfontfeatures{
+ Ligatures = TeX ,
+ Scale = \IBMPlexMono@scale ,
+ Extension = .otf }
+ \else
+ \defaultfontfeatures{
+ Scale = \IBMPlexMono@scale ,
+ Extension = .otf }
+ \fi
+ \setmonofont
[ UprightFont = *-\plexmono@medstyle ,
- ItalicFont = *-\plexmono@medstyle Italic ,
+ ItalicFont = *-\ifx\plexmono@medstyle\plexmono@regular
+ Italic
+ \else\plexmono@medstyle Italic\fi ,
BoldFont = *-\plexmono@boldstyle ,
BoldItalicFont = *-\plexmono@boldstyle Italic ]
{IBMPlexMono}
\newfontfamily\plexmono
[ UprightFont = *-\plexmono@medstyle ,
- ItalicFont = *-\plexmono@medstyle Italic ,
+ ItalicFont = *-\ifx\plexmono@medstyle\plexmono@regular
+ Italic
+ \else\plexmono@medstyle Italic\fi ,
BoldFont = *-\plexmono@boldstyle ,
BoldItalicFont = *-\plexmono@boldstyle Italic ]
{IBMPlexMono}
diff --git a/Master/texmf-dist/tex/latex/plex/plex-sans.sty b/Master/texmf-dist/tex/latex/plex/plex-sans.sty
index a05630477a3..16eea807e7c 100644
--- a/Master/texmf-dist/tex/latex/plex/plex-sans.sty
+++ b/Master/texmf-dist/tex/latex/plex/plex-sans.sty
@@ -40,24 +40,27 @@
\DeclareOptionX{type1}{\plexsans@otffalse}
\DeclareOptionX{sfdefault}{\plexsans@sfdefaulttrue}
-\DeclareOptionX{thin}{\edef\mdseries@rm{t}\def\plexsans@medstyle{Thin}}
-\DeclareOptionX{t}{\edef\mdseries@rm{t}\def\plexsans@medstyle{Thin}}
-\DeclareOptionX{extralight}{\edef\mdseries@rm{el}\def\plexsans@medstyle{ExtraLight}}
-\DeclareOptionX{el}{\edef\mdseries@rm{el}\def\plexsans@medstyle{ExtraLight}}
-\DeclareOptionX{light}{\edef\mdseries@rm{l}\def\plexsans@medstyle{Light}}
-\DeclareOptionX{l}{\edef\mdseries@rm{l}\def\plexsans@medstyle{Light}}
-\DeclareOptionX{text}{\edef\bfseries@rm{tx}\def\plexsans@boldstyle{Text}}
-\DeclareOptionX{tx}{\edef\bfseries@rm{tx}\def\plexsans@boldstyle{Text}}
-\DeclareOptionX{medium}{\edef\bfseries@rm{mb}\def\plexsans@boldstyle{Medium}}
-\DeclareOptionX{m}{\edef\bfseries@rm{mb}\def\plexsans@boldstyle{Medium}}
-\DeclareOptionX{semibold}{\edef\bfseries@rm{sb}\def\plexsans@boldstyle{SemiBold}}
-\DeclareOptionX{sb}{\edef\bfseries@rm{sb}\def\plexsans@boldstyle{SemiBold}}
+\DeclareOptionX{thin}{\edef\mdseries@sf{t}\def\plexsans@medstyle{Thin}}
+\DeclareOptionX{t}{\edef\mdseries@sf{t}\def\plexsans@medstyle{Thin}}
+\DeclareOptionX{extralight}{\edef\mdseries@sf{el}\def\plexsans@medstyle{ExtraLight}}
+\DeclareOptionX{el}{\edef\mdseries@sf{el}\def\plexsans@medstyle{ExtraLight}}
+\DeclareOptionX{light}{\edef\mdseries@sf{l}\def\plexsans@medstyle{Light}}
+\DeclareOptionX{l}{\edef\mdseries@sf{l}\def\plexsans@medstyle{Light}}
+\DeclareOptionX{textmd}{\edef\mdseries@sf{tx}\def\plexsans@medstyle{Text}}
+\DeclareOptionX{txmd}{\edef\mdseries@sf{tx}\def\plexsans@medstyle{Text}}
+\DeclareOptionX{text}{\edef\bfseries@sf{tx}\def\plexsans@boldstyle{Text}}
+\DeclareOptionX{tx}{\edef\bfseries@sf{tx}\def\plexsans@boldstyle{Text}}
+\DeclareOptionX{medium}{\edef\bfseries@sf{mb}\def\plexsans@boldstyle{Medium}}
+\DeclareOptionX{m}{\edef\bfseries@sf{mb}\def\plexsans@boldstyle{Medium}}
+\DeclareOptionX{semibold}{\edef\bfseries@sf{sb}\def\plexsans@boldstyle{SemiBold}}
+\DeclareOptionX{sb}{\edef\bfseries@sf{sb}\def\plexsans@boldstyle{SemiBold}}
\ProcessOptionsX\relax
\ifplexsans@otf
+ \def\plexsans@regular{Regular}
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
@@ -65,14 +68,18 @@
Extension = .otf }
\setsansfont
[ UprightFont = *-\plexsans@medstyle ,
- ItalicFont = *-\plexsans@medstyle Italic ,
+ ItalicFont = *-\ifx\plexsans@medstyle\plexsans@regular
+ Italic
+ \else\plexsans@medstyle Italic\fi ,
BoldFont = *-\plexsans@boldstyle ,
BoldItalicFont = *-\plexsans@boldstyle Italic ]
{IBMPlexSans}
\let\plexsansfamily\sfdefault
\newfontfamily\plexsans
[ UprightFont = *-\plexsans@medstyle ,
- ItalicFont = *-\plexsans@medstyle Italic ,
+ ItalicFont = *-\ifx\plexsans@medstyle\plexsans@regular
+ Italic
+ \else\plexsans@medstyle Italic\fi ,
BoldFont = *-\plexsans@boldstyle ,
BoldItalicFont = *-\plexsans@boldstyle Italic ]
{IBMPlexSans}
diff --git a/Master/texmf-dist/tex/latex/plex/plex-serif.sty b/Master/texmf-dist/tex/latex/plex/plex-serif.sty
index 20a828cb410..707fa133623 100644
--- a/Master/texmf-dist/tex/latex/plex/plex-serif.sty
+++ b/Master/texmf-dist/tex/latex/plex/plex-serif.sty
@@ -45,6 +45,8 @@
\DeclareOptionX{l}{\edef\mdseries@rm{l}\def\plexserif@medstyle{Light}}
\DeclareOptionX{text}{\edef\bfseries@rm{tx}\def\plexserif@boldstyle{Text}}
\DeclareOptionX{tx}{\edef\bfseries@rm{tx}\def\plexserif@boldstyle{Text}}
+\DeclareOptionX{textmd}{\edef\mdseries@rm{tx}\def\plexserif@medstyle{Text}}
+\DeclareOptionX{txmd}{\edef\mdseries@rm{tx}\def\plexserif@medstyle{Text}}
\DeclareOptionX{medium}{\edef\bfseries@rm{mb}\def\plexserif@boldstyle{Medium}}
\DeclareOptionX{m}{\edef\bfseries@rm{mb}\def\plexserif@boldstyle{Medium}}
\DeclareOptionX{semibold}{\edef\bfseries@rm{sb}\def\plexserif@boldstyle{SemiBold}}
@@ -54,6 +56,7 @@
\ifplexserif@otf
+ \def\plexserif@regular{Regular}
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
@@ -61,13 +64,17 @@
Extension = .otf }
\setmainfont
[ UprightFont = *-\plexserif@medstyle ,
- ItalicFont = *-\plexserif@medstyle Italic ,
+ ItalicFont = *-\ifx\plexserif@medstyle\plexserif@regular
+ Italic
+ \else\plexserif@medstyle Italic\fi ,
BoldFont = *-\plexserif@boldstyle ,
BoldItalicFont = *-\plexserif@boldstyle Italic ]
{IBMPlexSerif}
\newfontfamily\plexserif
[ UprightFont = *-\plexserif@medstyle ,
- ItalicFont = *-\plexserif@medstyle Italic ,
+ ItalicFont = *-\ifx\plexserif@medstyle\plexserif@regular
+ Italic
+ \else\plexserif@medstyle Italic\fi ,
BoldFont = *-\plexserif@boldstyle ,
BoldItalicFont = *-\plexserif@boldstyle Italic ]
{IBMPlexSerif}