inconsolata (18may19)

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

2 files changed, 40 insertions, 30 deletions

diff --git a/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty b/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty
index 39c3ed119b0..5be3b861af7 100644
--- a/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty
+++ b/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty
@@ -1,9 +1,9 @@
-% Copyright 2014--2017 Michael Sharpe
+% Copyright 2014--2019 Michael Sharpe
 % Based initially on Karl Berry's inconsolata.sty.
 % You may freely use, modify and/or distribute this file.
 
-\def\fileversion{1.112}
-\def\filedate{2017/01/04}
+\def\fileversion{1.12}
+\def\filedate{2019/05/17}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{inconsolata}[\filedate\space v\fileversion]
 \message{`inconsolata-zi4' v\fileversion, \filedate\space Text macros for Inconsolata (msharpe)}
@@ -21,11 +21,11 @@
 \def\zifour@sp{.5em}
 \def\zifour@stretch{.25em}
 \def\zifour@shrink{.167em}
-\def\zifour@extrasp{.167em}
+\def\zifour@extrasp{0em}
 \def\zifour@spn{.45em}
 \def\zifour@stretchn{.225em}
 \def\zifour@shrinkn{.15em}
-\def\zifour@extraspn{.15em}
+\def\zifour@extraspn{0em}
 
 % by default, change \tt to mean zi4.
 \newcommand*{\zifour@default}{%
@@ -40,16 +40,19 @@
 %  \edef\x{\endgroup
 %    \noexpand\setkeys{zifour}{\CurrentOption}}%
 %  \x}
-
+\def\zifour@hyph{\hyphenchar\font=\m@ne}
 \DeclareOptionX{hyphenate}{%
-	\zifour@hyphentrue}
+	\def\zifour@hyph{}}
 
 \DeclareOptionX{mono}{%
 	\zifour@monotrue}
 
 % option [nott] to avoid changing tt.
 \DeclareOptionX{nott}{%
-  \renewcommand*{\zifour@default}{}%
+  \def\zifour@hyph{}\zifour@monofalse%
+  \def\zifour@extrasp{0em}%
+  \renewcommand*{\zifour@default}{%
+  \renewcommand*{\rmdefault}{zi4}}%
 }
 % option [noupquote] to prevent loading upquote.
 \DeclareOptionX{noupquote}{%
@@ -78,6 +81,7 @@
  \gdef\zifour@extraspx{#1}}
 
 \ProcessOptionsX
+\zifour@default
 
 \ifzifour@mono%
 \def\zifour@stretch{0em}
@@ -99,12 +103,14 @@
 \ifdefined\zifour@shrinkx\let\zifour@shrink\zifour@shrinkx\fi
 \ifdefined\zifour@extraspx\let\zifour@extrasp\zifour@extraspx\fi
 
-\ifzifour@hyphen%
-  \def\zifour@hyph{}
-\else%
-  \def\zifour@hyph{\hyphenchar\font=\m@ne}
-\fi
-\def\zifour@spc{%
+%\ifzifour@hyphen%
+%  \edef\zifour@hyph{\hyphenchar\font=45 }
+%\else%
+%  \edef\zifour@hyph{\hyphenchar\font=\m@ne}
+%\fi
+%\show\zifour@hyph
+
+\edef\zifour@spc{%
 	\fontdimen2\font=\zifour@sp%
 	\fontdimen3\font=\zifour@stretch%
 	\fontdimen4\font=\zifour@shrink%
@@ -112,7 +118,6 @@
 	\zifour@hyph%
 } % used to change default text spacing via fd files
 %\show\zifour@spc
-\zifour@default
 \edef\zifour@opt{\the\zifour@ocount}
 \ifzifour@altzero 
   \advance\zifour@ocount -\tw@
diff --git a/Master/texmf-dist/tex/latex/inconsolata/zi4.sty b/Master/texmf-dist/tex/latex/inconsolata/zi4.sty
index 5c8ad00ee5c..8e6b8d66f0b 100644
--- a/Master/texmf-dist/tex/latex/inconsolata/zi4.sty
+++ b/Master/texmf-dist/tex/latex/inconsolata/zi4.sty
@@ -1,9 +1,9 @@
-% Copyright 2014--2017 Michael Sharpe
+% Copyright 2014--2019 Michael Sharpe
 % Based initially on Karl Berry's inconsolata.sty.
 % You may freely use, modify and/or distribute this file.
 
-\def\fileversion{1.112}
-\def\filedate{2017/01/04}
+\def\fileversion{1.12}
+\def\filedate{2019/05/17}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zi4}[\filedate\space v\fileversion]
 \message{`inconsolata-zi4' v\fileversion, \filedate\space Text macros for Inconsolata (msharpe)}
@@ -21,11 +21,11 @@
 \def\zifour@sp{.5em}
 \def\zifour@stretch{.25em}
 \def\zifour@shrink{.167em}
-\def\zifour@extrasp{.167em}
+\def\zifour@extrasp{0em}
 \def\zifour@spn{.45em}
 \def\zifour@stretchn{.225em}
 \def\zifour@shrinkn{.15em}
-\def\zifour@extraspn{.15em}
+\def\zifour@extraspn{0em}
 
 % by default, change \tt to mean zi4.
 \newcommand*{\zifour@default}{%
@@ -40,16 +40,19 @@
 %  \edef\x{\endgroup
 %    \noexpand\setkeys{zifour}{\CurrentOption}}%
 %  \x}
-
+\def\zifour@hyph{\hyphenchar\font=\m@ne}
 \DeclareOptionX{hyphenate}{%
-	\zifour@hyphentrue}
+	\def\zifour@hyph{}}
 
 \DeclareOptionX{mono}{%
 	\zifour@monotrue}
 
 % option [nott] to avoid changing tt.
 \DeclareOptionX{nott}{%
-  \renewcommand*{\zifour@default}{}%
+  \def\zifour@hyph{}\zifour@monofalse%
+  \def\zifour@extrasp{0em}%
+  \renewcommand*{\zifour@default}{%
+  \renewcommand*{\rmdefault}{zi4}}%
 }
 % option [noupquote] to prevent loading upquote.
 \DeclareOptionX{noupquote}{%
@@ -78,6 +81,7 @@
  \gdef\zifour@extraspx{#1}}
 
 \ProcessOptionsX
+\zifour@default
 
 \ifzifour@mono%
 \def\zifour@stretch{0em}
@@ -99,12 +103,14 @@
 \ifdefined\zifour@shrinkx\let\zifour@shrink\zifour@shrinkx\fi
 \ifdefined\zifour@extraspx\let\zifour@extrasp\zifour@extraspx\fi
 
-\ifzifour@hyphen%
-  \def\zifour@hyph{}
-\else%
-  \def\zifour@hyph{\hyphenchar\font=\m@ne}
-\fi
-\def\zifour@spc{%
+%\ifzifour@hyphen%
+%  \edef\zifour@hyph{\hyphenchar\font=45 }
+%\else%
+%  \edef\zifour@hyph{\hyphenchar\font=\m@ne}
+%\fi
+%\show\zifour@hyph
+
+\edef\zifour@spc{%
 	\fontdimen2\font=\zifour@sp%
 	\fontdimen3\font=\zifour@stretch%
 	\fontdimen4\font=\zifour@shrink%
@@ -112,7 +118,6 @@
 	\zifour@hyph%
 } % used to change default text spacing via fd files
 %\show\zifour@spc
-\zifour@default
 \edef\zifour@opt{\the\zifour@ocount}
 \ifzifour@altzero 
   \advance\zifour@ocount -\tw@