From c65a72db39857dee2b41e6fbffbbedfcf4129bc9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 23 Jun 2014 23:27:20 +0000 Subject: inconsolata (23jun14) git-svn-id: svn://tug.org/texlive/trunk@34361 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/fonts/inconsolata/Inconsolatazi4.fontspec | 6 ++++++ Master/texmf-dist/doc/fonts/inconsolata/README | 8 +++++++- Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty | 7 +++++-- Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd | 14 ++++++++------ Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd | 14 ++++++++------ Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd | 14 ++++++++------ Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd | 14 ++++++++------ Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd | 7 ++++--- Master/texmf-dist/tex/latex/inconsolata/zi4.sty | 7 +++++-- 9 files changed, 59 insertions(+), 32 deletions(-) create mode 100644 Master/texmf-dist/doc/fonts/inconsolata/Inconsolatazi4.fontspec (limited to 'Master') diff --git a/Master/texmf-dist/doc/fonts/inconsolata/Inconsolatazi4.fontspec b/Master/texmf-dist/doc/fonts/inconsolata/Inconsolatazi4.fontspec new file mode 100644 index 00000000000..4f6c3b14873 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/inconsolata/Inconsolatazi4.fontspec @@ -0,0 +1,6 @@ +\defaultfontfeatures[inconsolata] + { + Extension = .otf , + UprightFont = Inconsolatazi4-Regular, + BoldFont = Inconsolatazi4-Bold + } diff --git a/Master/texmf-dist/doc/fonts/inconsolata/README b/Master/texmf-dist/doc/fonts/inconsolata/README index 352f3f267f3..ac4a391b414 100644 --- a/Master/texmf-dist/doc/fonts/inconsolata/README +++ b/Master/texmf-dist/doc/fonts/inconsolata/README @@ -12,7 +12,13 @@ LaTeX support file zi4.sty are Files provided "as is", with no warranties. -Version: 1.04 +Version: 1.05 + +Changes in version 1.05 +(1) Modifications to all fd files to remove error that became visible only when used without the sty file. +(2) Added a brief .fontspec file so that, when using the fonts with fontspec, you can write +\fontspec{inconsolata} +to load the basic fontnames. Changes in version 1.04 Modified all fonts so that glyph names of the variant forms permit correct copying from pdf to ASCII. diff --git a/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty b/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty index c8bed851ad4..80011e94a6b 100644 --- a/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty +++ b/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty @@ -1,9 +1,12 @@ -% Copyright 2013 Michael Sharpe +% Copyright 2014 Michael Sharpe % Based initially on Karl Berry's inconsolata.sty. % You may freely use, modify and/or distribute this file. +\def\fileversion{1.05} +\def\filedate{2014/06/22} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{inconsolata}[2013/06/09 zi4a] +\ProvidesPackage{inconsolata}[\filedate\space v\fileversion] +\message{`inconsolata-zi4' v\fileversion, \filedate\space Text macros for Inconsolata (msharpe)} \RequirePackage{textcomp} \RequirePackage{keyval} diff --git a/Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd b/Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd index 7ba888bf85e..d55c114d707 100644 --- a/Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd +++ b/Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd @@ -1,14 +1,16 @@ -% Copyright 2013 Michael Sharpe. +% Copyright 2014 Michael Sharpe. % You may freely use, modify and/or distribute this file. -\ProvidesFile{ly1zi4.fd}[2013/06/09 LY1/zi4 (Inconsolata)] +\ProvidesFile{ly1zi4.fd}[2014/06/22 LY1/zi4 (Inconsolata)] -\expandafter\ifx\csname zifour@scaled\endcsname\relax - \let\zifour@scaled\@empty +\ifdefined\zifour@scaled +\else + \def\zifour@scaled{} \fi -\expandafter\ifx\csname zifour@opt\endcsname\relax - \def\zifour@opt{\z@}\def\zifour@altopt{\tw@} +\ifdefined\zifour@opt +\else + \def\zifour@opt{0}\def\zifour@altopt{2} \fi \DeclareFontFamily{LY1}{zi4}{\hyphenchar\font=\m@ne} diff --git a/Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd b/Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd index 6234fdd4218..c096b843524 100644 --- a/Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd +++ b/Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd @@ -1,14 +1,16 @@ -% Copyright 2013 Michael Sharpe. +% Copyright 2014 Michael Sharpe. % You may freely use, modify and/or distribute this file. -\ProvidesFile{ot1zi4.fd}[2013/06/09 OT1/zi4 (Inconsolata)] +\ProvidesFile{ot1zi4.fd}[2014/06/22 OT1/zi4 (Inconsolata)] -\expandafter\ifx\csname zifour@scaled\endcsname\relax - \let\zifour@scaled\@empty +\ifdefined\zifour@scaled +\else + \def\zifour@scaled{} \fi -\expandafter\ifx\csname zifour@opt\endcsname\relax - \def\zifour@opt{\z@}\def\zifour@altopt{\tw@} +\ifdefined\zifour@opt +\else + \def\zifour@opt{0}\def\zifour@altopt{2} \fi \DeclareFontFamily{OT1}{zi4}{\hyphenchar\font=\m@ne} diff --git a/Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd b/Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd index b7da2686aae..9c72497268f 100644 --- a/Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd +++ b/Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd @@ -1,14 +1,16 @@ -% Copyright 2013 Michael Sharpe. +% Copyright 2014 Michael Sharpe. % You may freely use, modify and/or distribute this file. -\ProvidesFile{qxzi4.fd}[2013/06/09 QX/zi4 (Inconsolata)] +\ProvidesFile{qxzi4.fd}[2014/06/22 QX/zi4 (Inconsolata)] -\expandafter\ifx\csname zifour@scaled\endcsname\relax - \let\zifour@scaled\@empty +\ifdefined\zifour@scaled +\else + \def\zifour@scaled{} \fi -\expandafter\ifx\csname zifour@opt\endcsname\relax - \def\zifour@opt{\z@}\def\zifour@altopt{\tw@} +\ifdefined\zifour@opt +\else + \def\zifour@opt{0}\def\zifour@altopt{2} \fi \DeclareFontFamily{QX}{zi4}{\hyphenchar\font=\m@ne} diff --git a/Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd b/Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd index cf7ea402829..d544cc724fb 100644 --- a/Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd +++ b/Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd @@ -1,14 +1,16 @@ -% Copyright 2013 Michael Sharpe. +% Copyright 2014 Michael Sharpe. % You may freely use, modify and/or distribute this file. -\ProvidesFile{t1zi4.fd}[2013/06/09 T1/zi4 (Inconsolata)] +\ProvidesFile{t1zi4.fd}[2014/06/22 T1/zi4 (Inconsolata)] -\expandafter\ifx\csname zifour@scaled\endcsname\relax - \let\zifour@scaled\@empty +\ifdefined\zifour@scaled +\else + \def\zifour@scaled{} \fi -\expandafter\ifx\csname zifour@opt\endcsname\relax - \def\zifour@opt{\z@}\def\zifour@altopt{\tw@} +\ifdefined\zifour@opt +\else + \def\zifour@opt{0}\def\zifour@altopt{2} \fi \DeclareFontFamily{T1}{zi4}{\hyphenchar\font=\m@ne} diff --git a/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd b/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd index fd5543f43f8..a7445bc3104 100644 --- a/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd +++ b/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd @@ -5,10 +5,11 @@ %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{ts1zi4.fd} - [2013/06/07 Fontinst v1.933 font definitions for TS1/zi4.] + [2014/06/22 Fontinst v1.933 font definitions for TS1/zi4.] -\expandafter\ifx\csname zifour@scaled\endcsname\relax - \let\zifour@scaled\@empty +\ifdefined\zifour@scaled +\else + \def\zifour@scaled{} \fi \DeclareFontFamily{TS1}{zi4}{\hyphenchar\font=\m@ne} diff --git a/Master/texmf-dist/tex/latex/inconsolata/zi4.sty b/Master/texmf-dist/tex/latex/inconsolata/zi4.sty index 0ac47dcb2b7..934135dd276 100644 --- a/Master/texmf-dist/tex/latex/inconsolata/zi4.sty +++ b/Master/texmf-dist/tex/latex/inconsolata/zi4.sty @@ -1,9 +1,12 @@ -% Copyright 2013 Michael Sharpe +% Copyright 2014 Michael Sharpe % Based initially on Karl Berry's inconsolata.sty. % You may freely use, modify and/or distribute this file. +\def\fileversion{1.05} +\def\filedate{2014/06/22} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{zi4}[2013/06/09 zi4a] +\ProvidesPackage{zi4}[\filedate\space v\fileversion] +\message{`inconsolata-zi4' v\fileversion, \filedate\space Text macros for Inconsolata (msharpe)} \RequirePackage{textcomp} \RequirePackage{keyval} -- cgit v1.2.3