summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/fonts/roboto/ChangeLogLaTeX.txt6
-rw-r--r--Master/texmf-dist/doc/fonts/roboto/README11
-rw-r--r--Master/texmf-dist/tex/latex/roboto/roboto-mono.sty14
-rw-r--r--Master/texmf-dist/tex/latex/roboto/roboto.sty108
4 files changed, 121 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/fonts/roboto/ChangeLogLaTeX.txt b/Master/texmf-dist/doc/fonts/roboto/ChangeLogLaTeX.txt
new file mode 100644
index 00000000000..46d0c9adb7a
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/roboto/ChangeLogLaTeX.txt
@@ -0,0 +1,6 @@
+2019-03-01 and 2019-03-03:
+
+ FontFace and NFSSFamily declarations provided by Mario
+ Haustein added to roboto.sty and roboto-mono.sty so that
+ \fontseries{...} and \fontfamily{...} commands work as
+ expected with xelatex and lualatex.
diff --git a/Master/texmf-dist/doc/fonts/roboto/README b/Master/texmf-dist/doc/fonts/roboto/README
index e78fa65f646..e0a96762d1d 100644
--- a/Master/texmf-dist/doc/fonts/roboto/README
+++ b/Master/texmf-dist/doc/fonts/roboto/README
@@ -1,5 +1,5 @@
This is the README for the roboto package, version
-2019-03-01.
+2019-03-03.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
support for the Roboto, RobotoCondensed, RobotoMono and
@@ -89,6 +89,15 @@ Commands \roboto, \robotocondensed, \robotoslab, and
\robotomono select the Roboto, RobotoCondensed, RobotoSlab
and RobotoMono font family, respectively.
+Similarly, commands \robotoLF, \robotoTLF, \robotoOsF
+and \robotoTOsF select figure styles proportional-lining,
+tabular-lining, proportional-oldstyle and tabular-oldstyle,
+respectively.
+
+Thanks to code contributed by Mario Haustein, commands
+\fontfamily{...} and \fontseries{...} work as expected with
+xelatex and lualatex.
+
The original fonts are available at
http://www.google.com/webfonts and are licensed under the
Apache License, (version 2); the text may be found in
diff --git a/Master/texmf-dist/tex/latex/roboto/roboto-mono.sty b/Master/texmf-dist/tex/latex/roboto/roboto-mono.sty
index 5e90a8f021c..a84818aa941 100644
--- a/Master/texmf-dist/tex/latex/roboto/roboto-mono.sty
+++ b/Master/texmf-dist/tex/latex/roboto/roboto-mono.sty
@@ -1,10 +1,10 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{roboto-mono}
- [2019/02/28 (Bob Tennent) Supports RobotoMono fonts for all LaTeX engines.]
+ [2019/03/03 (Bob Tennent) Supports RobotoMono fonts for all LaTeX engines.]
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
-\newif\ifrobotomono@otf
+\newif\ifrobotomono@otf
\ifxetex
\robotomono@otftrue
\else\ifluatex
@@ -53,6 +53,8 @@
\fi
+\def\robotomonofamily{RobotoMono-TLF}
+
\ifrobotomono@otf
\RequirePackage{fontspec}
\else
@@ -67,7 +69,7 @@
Scale = \RobotoMono@scale ,
Extension = .ttf }
\setmonofont
- [
+ [
UprightFont = *-\robotomono@regstyle ,
ItalicFont = *-\ifx\robotomono@regstyle\robotomono@regular Italic\else\robotomono@regstyle Italic\fi ,
BoldFont = *-\robotomono@boldstyle ,
@@ -93,14 +95,13 @@
FontFace = {b}{sl}{*-Bold},
FontFace = {b}{it}{*-BoldItalic} ]
{RobotoMono}
- % grab current family in case of subsequent change:
- \let\robotomonofamily\ttdefault
\newfontfamily\robotomono
- [
+ [
UprightFont = *-\robotomono@regstyle ,
ItalicFont = *-\ifx\robotomono@regstyle\robotomono@regular Italic\else\robotomono@regstyle Italic\fi ,
BoldFont = *-\robotomono@boldstyle ,
BoldItalicFont = *-\robotomono@boldstyle Italic ,
+ NFSSFamily = \robotomonofamily,
FontFace = {t}{n}{*-Thin},
FontFace = {t}{sc}{*-Thin},
FontFace = {t}{sl}{*-Thin},
@@ -123,7 +124,6 @@
FontFace = {b}{it}{*-BoldItalic} ]
{RobotoMono}
\else % type1
- \def\robotomonofamily{RobotoMono-TLF}
\newcommand*\robotomono{\fontfamily{\robotomonofamily}\selectfont}
\def\ttdefault{\robotomonofamily}
\fi
diff --git a/Master/texmf-dist/tex/latex/roboto/roboto.sty b/Master/texmf-dist/tex/latex/roboto/roboto.sty
index 7cf03f8a798..2094cc139ef 100644
--- a/Master/texmf-dist/tex/latex/roboto/roboto.sty
+++ b/Master/texmf-dist/tex/latex/roboto/roboto.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{roboto}
- [2019/03/01 (Bob Tennent) Supports Roboto fonts for all LaTeX engines.]
+ [2019/03/03 (Bob Tennent) Supports Roboto fonts for all LaTeX engines.]
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
@@ -76,6 +76,21 @@
\fi
+\ifroboto@lining
+ \def\roboto@figurestyle{LF}
+\else
+ \def\roboto@figurestyle{OsF}
+\fi
+\ifroboto@tabular
+ \def\roboto@figurealign{T}
+\else
+ \def\roboto@figurealign{}
+\fi
+
+\edef\robotofamily{Roboto-\roboto@figurealign\roboto@figurestyle}
+\edef\robotocondensedfamily{RobotoCondensed-\roboto@figurealign\roboto@figurestyle}
+\edef\robotoslabfamily{RobotoSlab-LF}
+
\ifroboto@otf
\ifroboto@lining
\def\roboto@figurestyle{Lining}
@@ -194,6 +209,7 @@
ItalicFont = *-\ifx\roboto@regstyle\roboto@regular Italic\else\roboto@regstyle Italic\fi,
BoldFont = *-\roboto@boldstyle ,
BoldItalicFont = *-\roboto@boldstyle Italic ,
+ NFSSFamily = \robotofamily,
FontFace = {t}{n}{*-Thin},
FontFace = {t}{sc}{*-Thin},
FontFace = {t}{sl}{*-Thin},
@@ -225,6 +241,7 @@
ItalicFont = *-\ifx\roboto@regstyle\roboto@regular Italic\else\roboto@regstyle Italic\fi,
BoldFont = *-Bold ,
BoldItalicFont = *-BoldItalic ,
+ NFSSFamily = \robotocondensedfamily,
FontFace = {l}{n}{*-Light},
FontFace = {l}{sc}{*-Light},
FontFace = {l}{sl}{*-Light},
@@ -241,6 +258,7 @@
\newfontfamily\robotoslab
[ UprightFont = *-\roboto@regstyle ,
BoldFont = *-Bold ,
+ NFSSFamily = \robotoslabfamily,
FontFace = {t}{n}{*-Thin},
FontFace = {t}{sc}{*-Thin},
FontFace = {t}{sl}{*-Thin},
@@ -255,11 +273,12 @@
FontFace = {b}{sl}{*-Bold} ]
{RobotoSlab}
\newfontfamily\robotoOsF
- [ Numbers = {\roboto@figurealign,OldStyle},
+ [ Numbers = {Proportional,OldStyle},
UprightFont = *-\roboto@regstyle ,
ItalicFont = *-\ifx\roboto@regstyle\roboto@regular Italic\else\roboto@regstyle Italic\fi,
BoldFont = *-\roboto@boldstyle ,
BoldItalicFont = *-\roboto@boldstyle Italic ,
+ NFSSFamily = Roboto-OsF,
FontFace = {t}{n}{*-Thin},
FontFace = {t}{sc}{*-Thin},
FontFace = {t}{sl}{*-Thin},
@@ -286,11 +305,76 @@
FontFace = {k}{it}{*-BlackItalic} ]
{Roboto}
\newfontfamily\robotoLF
- [ Numbers = {\roboto@figurealign,Lining},
+ [ Numbers = {Proportional,Lining},
UprightFont = *-\roboto@regstyle ,
ItalicFont = *-\ifx\roboto@regstyle\roboto@regular Italic\else\roboto@regstyle Italic\fi,
BoldFont = *-\roboto@boldstyle ,
BoldItalicFont = *-\roboto@boldstyle Italic ,
+ NFSSFamily = Roboto-LF,
+ FontFace = {t}{n}{*-Thin},
+ FontFace = {t}{sc}{*-Thin},
+ FontFace = {t}{sl}{*-Thin},
+ FontFace = {t}{it}{*-ThinItalic},
+ FontFace = {l}{n}{*-Light},
+ FontFace = {l}{sc}{*-Light},
+ FontFace = {l}{sl}{*-Light},
+ FontFace = {l}{it}{*-LightItalic},
+ FontFace = {m}{n}{*-Regular},
+ FontFace = {m}{sc}{*-Regular},
+ FontFace = {m}{sl}{*-Regular},
+ FontFace = {m}{it}{*-Italic},
+ FontFace = {mb}{n}{*-Medium},
+ FontFace = {mb}{sc}{*-Medium},
+ FontFace = {mb}{sl}{*-Medium},
+ FontFace = {mb}{it}{*-MediumItalic},
+ FontFace = {b}{n}{*-Bold},
+ FontFace = {b}{sc}{*-Bold},
+ FontFace = {b}{sl}{*-Bold},
+ FontFace = {b}{it}{*-BoldItalic},
+ FontFace = {k}{n}{*-Black},
+ FontFace = {k}{sc}{*-Black},
+ FontFace = {k}{sl}{*-Black},
+ FontFace = {k}{it}{*-BlackItalic} ]
+ {Roboto}
+ \newfontfamily\robotoTOsF
+ [ Numbers = {Monospaced,OldStyle},
+ UprightFont = *-\roboto@regstyle ,
+ ItalicFont = *-\ifx\roboto@regstyle\roboto@regular Italic\else\roboto@regstyle Italic\fi,
+ BoldFont = *-\roboto@boldstyle ,
+ BoldItalicFont = *-\roboto@boldstyle Italic ,
+ NFSSFamily = Roboto-TOsF,
+ FontFace = {t}{n}{*-Thin},
+ FontFace = {t}{sc}{*-Thin},
+ FontFace = {t}{sl}{*-Thin},
+ FontFace = {t}{it}{*-ThinItalic},
+ FontFace = {l}{n}{*-Light},
+ FontFace = {l}{sc}{*-Light},
+ FontFace = {l}{sl}{*-Light},
+ FontFace = {l}{it}{*-LightItalic},
+ FontFace = {m}{n}{*-Regular},
+ FontFace = {m}{sc}{*-Regular},
+ FontFace = {m}{sl}{*-Regular},
+ FontFace = {m}{it}{*-Italic},
+ FontFace = {mb}{n}{*-Medium},
+ FontFace = {mb}{sc}{*-Medium},
+ FontFace = {mb}{sl}{*-Medium},
+ FontFace = {mb}{it}{*-MediumItalic},
+ FontFace = {b}{n}{*-Bold},
+ FontFace = {b}{sc}{*-Bold},
+ FontFace = {b}{sl}{*-Bold},
+ FontFace = {b}{it}{*-BoldItalic},
+ FontFace = {k}{n}{*-Black},
+ FontFace = {k}{sc}{*-Black},
+ FontFace = {k}{sl}{*-Black},
+ FontFace = {k}{it}{*-BlackItalic} ]
+ {Roboto}
+ \newfontfamily\robotoTLF
+ [ Numbers = {Monospaced,Lining},
+ UprightFont = *-\roboto@regstyle ,
+ ItalicFont = *-\ifx\roboto@regstyle\roboto@regular Italic\else\roboto@regstyle Italic\fi,
+ BoldFont = *-\roboto@boldstyle ,
+ BoldItalicFont = *-\roboto@boldstyle Italic ,
+ NFSSFamily = Roboto-TLF,
FontFace = {t}{n}{*-Thin},
FontFace = {t}{sc}{*-Thin},
FontFace = {t}{sl}{*-Thin},
@@ -316,24 +400,28 @@
FontFace = {k}{sl}{*-Black},
FontFace = {k}{it}{*-BlackItalic} ]
{Roboto}
- \DeclareTextFontCommand{\oldstylenums}{\robotoOsF}
- \DeclareTextFontCommand{\liningnums}{\robotoLF}
\else % type1
- \def\robotofamily{Roboto-\roboto@figurealign\roboto@figurestyle}
- \def\robotocondensedfamily{RobotoCondensed-\roboto@figurealign\roboto@figurestyle}
- \def\robotoslabfamily{RobotoSlab-LF}
\newcommand*\roboto{\fontfamily{\robotofamily}\selectfont}
\newcommand*\robotocondensed{\fontfamily{\robotocondensedfamily}\selectfont}
\newcommand*\robotoslab{\fontfamily{\robotoslabfamily}\selectfont}
+ \newcommand*\robotoLF{\fontfamily{Roboto-LF}\selectfont}
+ \newcommand*\robotoTLF{\fontfamily{Roboto-TLF}\selectfont}
+ \newcommand*\robotoOsF{\fontfamily{Roboto-OsF}\selectfont}
+ \newcommand*\robotoTOsF{\fontfamily{Roboto-TOsF}\selectfont}
\def\sfdefault{\robotofamily}
\ifroboto@condensed\def\sfdefault{\robotocondensedfamily}\fi
\ifroboto@default\edef\familydefault{\sfdefault}\edef\seriesdefault{\mdseries@sf}\fi
\ifroboto@slab\edef\rmdefault{\robotoslabfamily}\fi
- \DeclareTextFontCommand{\oldstylenums}{\fontfamily{Roboto-\roboto@figurealign OsF}\selectfont}
- \DeclareTextFontCommand{\liningnums}{\fontfamily{Roboto-\roboto@figurealign LF}\selectfont}
+\fi
+\ifroboto@tabular
+ \DeclareTextFontCommand{\oldstylenums}{\robotoTOsF}
+ \DeclareTextFontCommand{\liningnums}{\robotoTLF}
+\else
+ \DeclareTextFontCommand{\oldstylenums}{\robotoOsF}
+ \DeclareTextFontCommand{\liningnums}{\robotoLF}
\fi
\ifroboto@otf