tinos (6jan17)

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

10 files changed, 16 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/fonts/tinos/README b/Master/texmf-dist/doc/fonts/tinos/README
index 1dcdbb916f3..15e88f0f6fa 100644
--- a/Master/texmf-dist/doc/fonts/tinos/README
+++ b/Master/texmf-dist/doc/fonts/tinos/README
@@ -1,5 +1,5 @@
 This is the README for the tinos package, version
-2017-01-03.
+2017-01-05.
 
 This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
 support for the Tinos family of fonts, designed by Steve
@@ -39,8 +39,7 @@ TrueType fonts were obtained from
 https://fonts.google.com
 
 and are licensed under the Apache License, version 2; the
-text may be found in the doc directory. The OpenType fonts
-were created by fontforge. The support files were created
-using autoinst and are licensed under the terms of the LaTeX
-Project Public License. The maintainer of this package is
-Bob Tennent (rdt at cs.queensu.ca)
+text may be found in the doc directory. The support files
+were created using autoinst and are licensed under the terms
+of the LaTeX Project Public License. The maintainer of this
+package is Bob Tennent (rdt at cs.queensu.ca)
diff --git a/Master/texmf-dist/fonts/opentype/google/tinos/Tinos-Bold.otf b/Master/texmf-dist/fonts/opentype/google/tinos/Tinos-Bold.otf
deleted file mode 100644
index 368500cdb62..00000000000
--- a/Master/texmf-dist/fonts/opentype/google/tinos/Tinos-Bold.otf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/opentype/google/tinos/Tinos-BoldItalic.otf b/Master/texmf-dist/fonts/opentype/google/tinos/Tinos-BoldItalic.otf
deleted file mode 100644
index 7ed8d5d3a66..00000000000
--- a/Master/texmf-dist/fonts/opentype/google/tinos/Tinos-BoldItalic.otf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/opentype/google/tinos/Tinos-Italic.otf b/Master/texmf-dist/fonts/opentype/google/tinos/Tinos-Italic.otf
deleted file mode 100644
index 6a5833d79d0..00000000000
--- a/Master/texmf-dist/fonts/opentype/google/tinos/Tinos-Italic.otf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/opentype/google/tinos/Tinos-Regular.otf b/Master/texmf-dist/fonts/opentype/google/tinos/Tinos-Regular.otf
deleted file mode 100644
index 6710d80e31f..00000000000
--- a/Master/texmf-dist/fonts/opentype/google/tinos/Tinos-Regular.otf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/truetype/google/tinos/Tinos-Bold.ttf b/Master/texmf-dist/fonts/truetype/google/tinos/Tinos-Bold.ttf
new file mode 100644
index 00000000000..c16befbc980
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/google/tinos/Tinos-Bold.ttf
diff --git a/Master/texmf-dist/fonts/truetype/google/tinos/Tinos-BoldItalic.ttf b/Master/texmf-dist/fonts/truetype/google/tinos/Tinos-BoldItalic.ttf
new file mode 100644
index 00000000000..58fc85eacba
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/google/tinos/Tinos-BoldItalic.ttf
diff --git a/Master/texmf-dist/fonts/truetype/google/tinos/Tinos-Italic.ttf b/Master/texmf-dist/fonts/truetype/google/tinos/Tinos-Italic.ttf
new file mode 100644
index 00000000000..64dd43bdbba
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/google/tinos/Tinos-Italic.ttf
diff --git a/Master/texmf-dist/fonts/truetype/google/tinos/Tinos-Regular.ttf b/Master/texmf-dist/fonts/truetype/google/tinos/Tinos-Regular.ttf
new file mode 100644
index 00000000000..ae5030d1406
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/google/tinos/Tinos-Regular.ttf
diff --git a/Master/texmf-dist/tex/latex/tinos/tinos.sty b/Master/texmf-dist/tex/latex/tinos/tinos.sty
index 47beb1ee66f..087b29cb9ea 100644
--- a/Master/texmf-dist/tex/latex/tinos/tinos.sty
+++ b/Master/texmf-dist/tex/latex/tinos/tinos.sty
@@ -1,16 +1,16 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{tinos}
-    [2017/01/03 (Bob Tennent)  Supports Tinos fonts for all LaTeX engines.]
+    [2017/01/05 (Bob Tennent)  Supports Tinos fonts for all LaTeX engines.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
-\newif\iftinos@otf 
+\newif\iftinos@ttf 
 \ifxetex
-  \tinos@otftrue
+  \tinos@ttftrue
 \else\ifluatex
-  \tinos@otftrue
+  \tinos@ttftrue
 \else  % [pdf]LaTeX
-  \tinos@otffalse
+  \tinos@ttffalse
 \fi\fi
 
 
@@ -19,28 +19,28 @@
 \DeclareOptionX{scale}{\renewcommand*{\Tinos@scale}{#1}}
 
 
-\DeclareOptionX{type1}{\tinos@otffalse}
+\DeclareOptionX{type1}{\tinos@ttffalse}
 
 \ProcessOptionsX\relax
 
-\iftinos@otf\else % type1
+\iftinos@ttf\else % type1
     \def\tinos@figurestyle{LF}
     \def\tinos@figurealign{T}
 \fi
 
 
-\iftinos@otf
+\iftinos@ttf
   \RequirePackage{fontspec}
 \else
   \RequirePackage{fontenc,fontaxes}
 \fi
 
-\iftinos@otf
+\iftinos@ttf
   \ifxetex\XeTeXtracingfonts=1\fi
   \defaultfontfeatures{
         Ligatures = TeX ,
         Scale     = \Tinos@scale ,
-        Extension = .otf }
+        Extension = .ttf }
   \setmainfont
       [ UprightFont    = *-Regular ,
         ItalicFont     = *-Italic ,
@@ -54,7 +54,7 @@
 \fi
 
 
-\iftinos@otf
+\iftinos@ttf
   % turn off defaults in case other fonts are selected:
   \defaultfontfeatures{}
 \fi