2 files changed, 11 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/fonts/gofonts/README b/Master/texmf-dist/doc/fonts/gofonts/README
index 6fb2e7cf667..b626e6842d3 100644
--- a/Master/texmf-dist/doc/fonts/gofonts/README
+++ b/Master/texmf-dist/doc/fonts/gofonts/README
@@ -1,4 +1,4 @@
-This is the README for the gofonts package, version 2017-04-01.
+This is the README for the gofonts package, version 2017-04-02.
 
 This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
 support for the GoSans and GoMono families of fonts designed
@@ -47,7 +47,7 @@ scale the fonts.
 Font encodings supported are OT1, T1, LY1 and TS1.
 
 For GoSans, the medium option activates that series as the
-default bold series. Command \gomedium and \gobold allow for
+default bold series. Commands \gomedium and \gobold allow for
 localized use of those series.
 
 The original TrueType fonts were obtained from
diff --git a/Master/texmf-dist/tex/latex/gofonts/GoSans.sty b/Master/texmf-dist/tex/latex/gofonts/GoSans.sty
index 767001078d2..b312799fc18 100644
--- a/Master/texmf-dist/tex/latex/gofonts/GoSans.sty
+++ b/Master/texmf-dist/tex/latex/gofonts/GoSans.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{GoSans}
-    [2017/04/01 (Bob Tennent and autoinst)  Style file for Go Sans fonts.]
+    [2017/04/02 (Bob Tennent and autoinst)  Style file for Go Sans fonts.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -63,38 +63,27 @@
         BoldItalicFont     = *-\go@boldstyle-Italic ,
         SmallCapsFont = {GoSmallcaps},
         ItalicFeatures = {SmallCapsFont=GoSmallcaps-Italic},
+        FontFace = {mb}{n}{Font=*-Medium},
+        FontFace = {mb}{it}{Font=*-Medium-Italic},
+        FontFace = {b}{n}{Font=*-Bold},
+        FontFace = {b}{it}{Font=*-Bold-Italic},
       ]
       {Go}
   % grab current family in case of subsequent change:
   \let\gofamily\sfdefault  
   \ifgo@default\renewcommand*\familydefault{\gofamily}\fi
 
-  \newfontfamily\gomedium
-      [ UprightFont    = *-Regular ,
-        ItalicFont     = *-Regular-Italic ,
-        BoldFont    = *-Medium ,
-        BoldItalicFont     = *-Medium-Italic
-      ]
-      {Go}
-  \newfontfamily\gobold
-      [ UprightFont    = *-Regular ,
-        ItalicFont     = *-Regular-Italic ,
-        BoldFont    = *-Bold ,
-        BoldItalicFont     = *-Bold-Italic ,
-      ]
-      {Go}
-
 \else % type1
 
-  \def\go@family{Go-TLF}
-  \renewcommand*\sfdefault{\go@family}
+  \def\gofamily{Go-TLF}
+  \renewcommand*\sfdefault{\gofamily}
   \ifgo@default\edef\familydefault{\sfdefault}\edef\seriesdefault{\mdseries@sf}\fi
 
-  \def\gomedium{\fontfamily{\go@family}\fontseries{mb}\selectfont}
-  \def\gobold{\fontfamily{\go@family}\fontseries{b}\selectfont}
 
 \fi
 
+\def\gomedium{\fontfamily{\gofamily}\fontseries{mb}\selectfont}
+\def\gobold{\fontfamily{\gofamily}\fontseries{b}\selectfont}
 
 \ifgo@ttf
   \defaultfontfeatures{}