noto (30oct16)

git-svn-id: svn://tug.org/texlive/trunk@42389 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 88 insertions, 4 deletions

diff --git a/Master/texmf-dist/tex/latex/noto/LY1NotoMono-TLF.fd b/Master/texmf-dist/tex/latex/noto/LY1NotoMono-TLF.fd
new file mode 100644
index 00000000000..05d347a002a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/noto/LY1NotoMono-TLF.fd
@@ -0,0 +1,18 @@
+%% Generated by autoinst on 2016/10/28
+%%
+\ProvidesFile{LY1NotoMono-TLF.fd}
+    [2016/10/28 (autoinst)  Font definitions for LY1/NotoMono-TLF.]
+
+\expandafter\ifx\csname NotoMono@scale\endcsname\relax
+    \let\NotoMono@@scale\@empty
+\else
+    \edef\NotoMono@@scale{s*[\csname NotoMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{NotoMono-TLF}{}
+
+\DeclareFontShape{LY1}{NotoMono-TLF}{m}{n}{
+      <-> \NotoMono@@scale NotoMono-tlf-ly1
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/noto/OT1NotoMono-TLF.fd b/Master/texmf-dist/tex/latex/noto/OT1NotoMono-TLF.fd
new file mode 100644
index 00000000000..4d641e00d6f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/noto/OT1NotoMono-TLF.fd
@@ -0,0 +1,18 @@
+%% Generated by autoinst on 2016/10/28
+%%
+\ProvidesFile{OT1NotoMono-TLF.fd}
+    [2016/10/28 (autoinst)  Font definitions for OT1/NotoMono-TLF.]
+
+\expandafter\ifx\csname NotoMono@scale\endcsname\relax
+    \let\NotoMono@@scale\@empty
+\else
+    \edef\NotoMono@@scale{s*[\csname NotoMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{NotoMono-TLF}{}
+
+\DeclareFontShape{OT1}{NotoMono-TLF}{m}{n}{
+      <-> \NotoMono@@scale NotoMono-tlf-ot1
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/noto/T1NotoMono-TLF.fd b/Master/texmf-dist/tex/latex/noto/T1NotoMono-TLF.fd
new file mode 100644
index 00000000000..25b5cff6c2f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/noto/T1NotoMono-TLF.fd
@@ -0,0 +1,18 @@
+%% Generated by autoinst on 2016/10/28
+%%
+\ProvidesFile{T1NotoMono-TLF.fd}
+    [2016/10/28 (autoinst)  Font definitions for T1/NotoMono-TLF.]
+
+\expandafter\ifx\csname NotoMono@scale\endcsname\relax
+    \let\NotoMono@@scale\@empty
+\else
+    \edef\NotoMono@@scale{s*[\csname NotoMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{NotoMono-TLF}{}
+
+\DeclareFontShape{T1}{NotoMono-TLF}{m}{n}{
+      <-> \NotoMono@@scale NotoMono-tlf-t1
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/noto/TS1NotoMono-TLF.fd b/Master/texmf-dist/tex/latex/noto/TS1NotoMono-TLF.fd
new file mode 100644
index 00000000000..32e9de029d4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/noto/TS1NotoMono-TLF.fd
@@ -0,0 +1,18 @@
+%% Generated by autoinst on 2016/10/28
+%%
+\ProvidesFile{TS1NotoMono-TLF.fd}
+    [2016/10/28 (autoinst)  Font definitions for TS1/NotoMono-TLF.]
+
+\expandafter\ifx\csname NotoMono@scale\endcsname\relax
+    \let\NotoMono@@scale\@empty
+\else
+    \edef\NotoMono@@scale{s*[\csname NotoMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{NotoMono-TLF}{}
+
+\DeclareFontShape{TS1}{NotoMono-TLF}{m}{n}{
+      <-> \NotoMono@@scale NotoMono-tlf-ts1
+}{}
+
+\endinput
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