From e29305a27617046929c0491662bbaabe22b55851 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 20 Nov 2017 22:00:05 +0000 Subject: plex (20nov17) git-svn-id: svn://tug.org/texlive/trunk@45863 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/fonts/plex/README | 22 ++++++++----- .../fonts/opentype/ibm/plex/IBMPlexMono-Italic.otf | Bin 0 -> 54376 bytes .../ibm/plex/IBMPlexMono-RegularItalic.otf | Bin 54376 -> 0 bytes .../fonts/opentype/ibm/plex/IBMPlexSans-Italic.otf | Bin 0 -> 72560 bytes .../ibm/plex/IBMPlexSans-RegularItalic.otf | Bin 72560 -> 0 bytes .../opentype/ibm/plex/IBMPlexSerif-Italic.otf | Bin 0 -> 74204 bytes .../ibm/plex/IBMPlexSerif-RegularItalic.otf | Bin 74204 -> 0 bytes Master/texmf-dist/tex/latex/plex/plex-mono.sty | 30 +++++++++++++----- Master/texmf-dist/tex/latex/plex/plex-sans.sty | 35 ++++++++++++--------- Master/texmf-dist/tex/latex/plex/plex-serif.sty | 11 +++++-- 10 files changed, 68 insertions(+), 30 deletions(-) create mode 100644 Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexMono-Italic.otf delete mode 100644 Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexMono-RegularItalic.otf create mode 100644 Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexSans-Italic.otf delete mode 100644 Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexSans-RegularItalic.otf create mode 100644 Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexSerif-Italic.otf delete mode 100644 Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexSerif-RegularItalic.otf (limited to 'Master') diff --git a/Master/texmf-dist/doc/fonts/plex/README b/Master/texmf-dist/doc/fonts/plex/README index 117667d5664..f58725c961d 100644 --- a/Master/texmf-dist/doc/fonts/plex/README +++ b/Master/texmf-dist/doc/fonts/plex/README @@ -1,4 +1,4 @@ -This is the README for the plex package, version 2017-11-14. +This is the README for the plex package, version 2017-11-20. This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for the IBMPlex families of fonts. Serif, Sans and @@ -36,15 +36,23 @@ Font encodings supported are OT1, T1, LY1 and TS1. The following options select lighter bold fonts: -sb semibold -mb medium -tx text + sb semibold + mb medium + tx text and the following options select lighter regular fonts -l light -el extralight -t thin + l light + el extralight + t thin + +For slightly heavier regular fonts use the options + + txmd textmd + +The nomap option to plex-mono will suppress the tex-text +mapping of TeX "smart quotes" and other ligatures into +unicode glyphs for xeLaTeX and luaLaTeX. The OpenType fonts were obtained from diff --git a/Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexMono-Italic.otf b/Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexMono-Italic.otf new file mode 100644 index 00000000000..d159c071141 Binary files /dev/null and b/Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexMono-Italic.otf differ diff --git a/Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexMono-RegularItalic.otf b/Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexMono-RegularItalic.otf deleted file mode 100644 index d159c071141..00000000000 Binary files a/Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexMono-RegularItalic.otf and /dev/null differ diff --git a/Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexSans-Italic.otf b/Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexSans-Italic.otf new file mode 100644 index 00000000000..7f2a0960dd8 Binary files /dev/null and b/Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexSans-Italic.otf differ diff --git a/Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexSans-RegularItalic.otf b/Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexSans-RegularItalic.otf deleted file mode 100644 index 7f2a0960dd8..00000000000 Binary files a/Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexSans-RegularItalic.otf and /dev/null differ diff --git a/Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexSerif-Italic.otf b/Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexSerif-Italic.otf new file mode 100644 index 00000000000..8fe0377aab2 Binary files /dev/null and b/Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexSerif-Italic.otf differ diff --git a/Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexSerif-RegularItalic.otf b/Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexSerif-RegularItalic.otf deleted file mode 100644 index 8fe0377aab2..00000000000 Binary files a/Master/texmf-dist/fonts/opentype/ibm/plex/IBMPlexSerif-RegularItalic.otf and /dev/null differ 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} -- cgit v1.2.3