inconsolata (15jan18)

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

6 files changed, 25 insertions, 32 deletions

diff --git a/Master/texmf-dist/doc/fonts/inconsolata/README b/Master/texmf-dist/doc/fonts/inconsolata/README
index bd9c985d750..f18a6100d36 100644
--- a/Master/texmf-dist/doc/fonts/inconsolata/README
+++ b/Master/texmf-dist/doc/fonts/inconsolata/README
@@ -8,11 +8,14 @@ license is in http://www.latex-project.org/lppl.txt and version 1.3 or later is
 part of all distributions of LaTeX version 2003/12/01 or later. Those files and
 LaTeX support file zi4.sty are
 
-  Copyright (c) 2013--2017 Michael Sharpe
+  Copyright (c) 2013--2018 Michael Sharpe
 
 Files provided "as is", with no warranties.
 
-Current version: 1.113
+Current version: 1.114
+
+Changes in version 1.114
+Corrected error in the fd files that did not permit multiple calls to \usefont under some circumstances. (Thanks  Haruhiko Okumura.) 
 
 Changes in version 1.113
 Corrected three glyphs that had overlapping strokes.
diff --git a/Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd b/Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd
index aec098f8da0..e161dfc48f2 100644
--- a/Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd
+++ b/Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd
@@ -1,7 +1,7 @@
-% Copyright 2014--2016 Michael Sharpe.
+% Copyright 2014--2018 Michael Sharpe.
 % You may freely use, modify and/or distribute this file.
 
-\ProvidesFile{ly1zi4.fd}[2016/12/29 LY1/zi4 (Inconsolata)]
+\ProvidesFile{ly1zi4.fd}[2018/01/14 LY1/zi4 (Inconsolata)]
 
 \ifdefined\zifour@scaled
 \else
@@ -18,10 +18,8 @@
   \def\zifour@opt{0}\def\zifour@altopt{2}
 \fi
 
-\ifdefined\zifour@spc
-\else
-	\def\zifour@spc{\hyphenchar\font=\m@ne}
-\fi
+\def\zifour@spcx{\hyphenchar\font=\m@ne}
+\@ifundefined{zifour@spc}{\global\let\zifour@spc\zifour@spcx}{}
 
 \DeclareFontFamily{LY1}{zi4}{\zifour@spc}
 \DeclareFontShape{LY1}{zi4}{m}{n}{%
diff --git a/Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd b/Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd
index a2f1e01fc67..cd07777077f 100644
--- a/Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd
+++ b/Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd
@@ -1,7 +1,7 @@
-% Copyright 2014--2016 Michael Sharpe.
+% Copyright 2014--2018 Michael Sharpe.
 % You may freely use, modify and/or distribute this file.
 
-\ProvidesFile{ot1zi4.fd}[2016/12/29 OT1/zi4 (Inconsolata)]
+\ProvidesFile{ot1zi4.fd}[2018/01/14 OT1/zi4 (Inconsolata)]
 
 \ifdefined\zifour@scaled
 \else
@@ -18,10 +18,8 @@
   \def\zifour@opt{0}\def\zifour@altopt{2}
 \fi
 
-\ifdefined\zifour@spc
-\else
-	\def\zifour@spc{\hyphenchar\font=\m@ne}
-\fi
+\def\zifour@spcx{\hyphenchar\font=\m@ne}
+\@ifundefined{zifour@spc}{\global\let\zifour@spc\zifour@spcx}{}
 
 \DeclareFontFamily{OT1}{zi4}{\zifour@spc}
 \DeclareFontShape{OT1}{zi4}{m}{n}{%
diff --git a/Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd b/Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd
index e160f7ce0bf..174003e356f 100644
--- a/Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd
+++ b/Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd
@@ -1,7 +1,7 @@
-% Copyright 2014--2016 Michael Sharpe.
+% Copyright 2014--2018 Michael Sharpe.
 % You may freely use, modify and/or distribute this file.
 
-\ProvidesFile{qxzi4.fd}[2016/12/29 QX/zi4 (Inconsolata)]
+\ProvidesFile{qxzi4.fd}[2018/01/14 QX/zi4 (Inconsolata)]
 
 \ifdefined\zifour@scaled
 \else
@@ -18,10 +18,8 @@
   \def\zifour@opt{0}\def\zifour@altopt{2}
 \fi
 
-\ifdefined\zifour@spc
-\else
-	\def\zifour@spc{\hyphenchar\font=\m@ne}
-\fi
+\def\zifour@spcx{\hyphenchar\font=\m@ne}
+\@ifundefined{zifour@spc}{\global\let\zifour@spc\zifour@spcx}{}
 
 \DeclareFontFamily{QX}{zi4}{\zifour@spc}
 \DeclareFontShape{QX}{zi4}{m}{n}{%
diff --git a/Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd b/Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd
index 50359d2b16f..6cf6be6c237 100644
--- a/Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd
+++ b/Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd
@@ -1,7 +1,7 @@
-% Copyright 2014--2016 Michael Sharpe.
+% Copyright 2014--2018 Michael Sharpe.
 % You may freely use, modify and/or distribute this file.
 
-\ProvidesFile{t1zi4.fd}[2016/12/29 T1/zi4 (Inconsolata)]
+\ProvidesFile{t1zi4.fd}[2018/01/14 T1/zi4 (Inconsolata)]
 
 \ifdefined\zifour@scaled
 \else
@@ -18,10 +18,8 @@
   \def\zifour@opt{0}\def\zifour@altopt{2}
 \fi
 
-\ifdefined\zifour@spc
-\else
-	\def\zifour@spc{\hyphenchar\font=\m@ne}
-\fi
+\def\zifour@spcx{\hyphenchar\font=\m@ne}
+\@ifundefined{zifour@spc}{\global\let\zifour@spc\zifour@spcx}{}
 
 \DeclareFontFamily{T1}{zi4}{\zifour@spc}
 \DeclareFontShape{T1}{zi4}{m}{n}{%
diff --git a/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd b/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd
index f6b285106d4..06c9087e902 100644
--- a/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd
+++ b/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd
@@ -1,7 +1,7 @@
-% Copyright 2014--2016 Michael Sharpe.
+% Copyright 2014--2018 Michael Sharpe.
 % You may freely use, modify and/or distribute this file.
 
-\ProvidesFile{ts1zi4.fd}[2016/12/29 TS1/zi4 (Inconsolata)]
+\ProvidesFile{ts1zi4.fd}[2018/01/14 TS1/zi4 (Inconsolata)]
 
 \ifdefined\zifour@scaled
 \else
@@ -13,10 +13,8 @@
 	\def\zifour@narrow{}
 \fi
 
-\ifdefined\zifour@spc
-\else
-	\def\zifour@spc{\hyphenchar\font=\m@ne}
-\fi
+\def\zifour@spcx{\hyphenchar\font=\m@ne}
+\@ifundefined{zifour@spc}{\global\let\zifour@spc\zifour@spcx}{}
 
 \DeclareFontFamily{TS1}{zi4}{\zifour@spc}