From 0af27b4800d1199d1e9f9535a6654a1ad4eb9137 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 30 Oct 2016 21:48:54 +0000 Subject: noto (30oct16) git-svn-id: svn://tug.org/texlive/trunk@42389 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/noto/noto.sty | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/tex/latex/noto/noto.sty') diff --git a/Master/texmf-dist/tex/latex/noto/noto.sty b/Master/texmf-dist/tex/latex/noto/noto.sty index 229ab75e7aa..7905cf9aeae 100644 --- a/Master/texmf-dist/tex/latex/noto/noto.sty +++ b/Master/texmf-dist/tex/latex/noto/noto.sty @@ -16,14 +16,18 @@ \newif\ifnoto@sfdefault \noto@sfdefaultfalse \newif\ifnoto@sf \noto@sftrue \newif\ifnoto@rm \noto@rmtrue +\newif\ifnoto@tt \noto@tttrue \newcommand*{\NotoSans@scale}{1} -\DeclareOptionX{scaled}{\renewcommand*{\NotoSans@scale}{#1}} -\DeclareOptionX{scale}{\renewcommand*{\NotoSans@scale}{#1}} +\newcommand*{\NotoMono@scale}{1} +\DeclareOptionX{scaled}{\renewcommand*{\NotoSans@scale}{#1}\renewcommand*{\NotoMono@scale}{#1}} +\DeclareOptionX{scale}{\renewcommand*{\NotoSans@scale}{#1}\renewcommand*{\NotoMono@scale}{#1}} + \DeclareOptionX{sf}{\noto@sftrue\noto@rmfalse} \DeclareOptionX{rm}{\noto@rmtrue\noto@sffalse} +\DeclareOptionX{nott}{\noto@ttfalse} \DeclareOptionX{sfdefault}{\noto@sfdefaulttrue} \DeclareOptionX{type1}{\noto@otffalse} @@ -36,6 +40,7 @@ \else % type1 \def\bfseries@sf{b} \def\mdseries@sf{m} + \def\mdseries@tt{m} \fi \ifnoto@otf\else % type1 @@ -63,6 +68,7 @@ BoldFont = *-\noto@boldstyle , BoldItalicFont = *-\noto@boldstyle Italic ] {NotoSans} + \let\notosansfamily\sfdefault \fi \ifnoto@rm \setmainfont @@ -72,8 +78,10 @@ BoldItalicFont = *-\noto@boldstyle Italic ] {NotoSerif} \fi - % grab current family in case of subsequent change: - \let\notosansfamily\sfdefault + \ifnoto@tt + \setmonofont [] {NotoMono} + \let\notomonofamily\ttdefault + \fi \ifnoto@sfdefault\renewcommand*\familydefault{\notosansfamily}\fi \newfontfamily\notosans [ UprightFont = *-\noto@regstyle , @@ -87,13 +95,17 @@ BoldFont = *-\noto@boldstyle , BoldItalicFont = *-\noto@boldstyle Italic ] {NotoSerif} + \newfontfamily\notomono [] {NotoMono} \else % type1 \def\notosansfamily{NotoSans-\noto@figurealign\noto@figurestyle} \def\notoseriffamily{NotoSerif-\noto@figurealign\noto@figurestyle} + \def\notomonofamily{NotoMono-\noto@figurealign\noto@figurestyle} \newcommand*\notoserif{\fontfamily{\notoseriffamily}\selectfont} \newcommand*\notosans{\fontfamily{\notosansfamily}\selectfont} + \newcommand*\notomono{\fontfamily{\notomonofamily}\selectfont} \ifnoto@rm \def\rmdefault{\notoseriffamily} \fi \ifnoto@sf \def\sfdefault{\notosansfamily} \fi + \ifnoto@tt \def\ttdefault{\notomonofamily} \fi \ifnoto@sfdefault\edef\familydefault{\sfdefault}\fi \fi -- cgit v1.2.3