summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/inconsolata
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-12-31 01:18:47 +0000
committerKarl Berry <karl@freefriends.org>2016-12-31 01:18:47 +0000
commitf418ba7403fc5d4ffa940e9c9b843a390bd1836c (patch)
treea05b25014cc6393e19789ad285f9d38149dfeb48 /Master/texmf-dist/tex/latex/inconsolata
parent9951b346b34b388752bfb9fa7f9f94879646023b (diff)
inconsolata (30dec16)
git-svn-id: svn://tug.org/texlive/trunk@42815 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/inconsolata')
-rw-r--r--Master/texmf-dist/tex/latex/inconsolata/inconsolata.fontspec (renamed from Master/texmf-dist/tex/latex/inconsolata/Inconsolatazi4.fontspec)0
-rw-r--r--Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty104
-rw-r--r--Master/texmf-dist/tex/latex/inconsolata/inconsolatan.fontspec6
-rw-r--r--Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd24
-rw-r--r--Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd24
-rw-r--r--Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd24
-rw-r--r--Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd24
-rw-r--r--Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd26
-rw-r--r--Master/texmf-dist/tex/latex/inconsolata/zi4.sty106
9 files changed, 261 insertions, 77 deletions
diff --git a/Master/texmf-dist/tex/latex/inconsolata/Inconsolatazi4.fontspec b/Master/texmf-dist/tex/latex/inconsolata/inconsolata.fontspec
index 4f6c3b14873..4f6c3b14873 100644
--- a/Master/texmf-dist/tex/latex/inconsolata/Inconsolatazi4.fontspec
+++ b/Master/texmf-dist/tex/latex/inconsolata/inconsolata.fontspec
diff --git a/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty b/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty
index aeada49e6a4..676fad3a60f 100644
--- a/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty
+++ b/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty
@@ -1,52 +1,117 @@
-% Copyright 2014 Michael Sharpe
+% Copyright 2014--2016 Michael Sharpe
% Based initially on Karl Berry's inconsolata.sty.
% You may freely use, modify and/or distribute this file.
-\def\fileversion{1.10}
-\def\filedate{2016/02/22}
+\def\fileversion{1.11}
+\def\filedate{2016/12/29}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{inconsolata}[\filedate\space v\fileversion]
\message{`inconsolata-zi4' v\fileversion, \filedate\space Text macros for Inconsolata (msharpe)}
\RequirePackage{textcomp}
-\RequirePackage{keyval}
+\RequirePackage{xkeyval}
\newcount\zifour@ocount
\newif\ifzifour@altzero
\newif\ifzifour@noupq
-\define@key{zifour}{scaled}[1.0]{\def\zifour@scaled{s*[#1]}}
-
-\DeclareOption*{%
- \begingroup
- \edef\x{\endgroup
- \noexpand\setkeys{zifour}{\CurrentOption}}%
- \x}
+\newif\ifzifour@mono
+\newif\ifzifour@hyphen
+% hyphenation is inhibited by default, but word spacing is, by default
+% variable. The option mono makes word spacing mono also.
+\def\zifour@sp{.5em}
+\def\zifour@stretch{.25em}
+\def\zifour@shrink{.167em}
+\def\zifour@extrasp{.167em}
+\def\zifour@spn{.45em}
+\def\zifour@stretchn{.225em}
+\def\zifour@shrinkn{.15em}
+\def\zifour@extraspn{.15em}
% by default, change \tt to mean zi4.
\newcommand*{\zifour@default}{%
- \renewcommand*{\ttdefault}{zi4}%
-}
+ \renewcommand*{\ttdefault}{zi4}}%
+
+\newcommand\zifour@scaled{s*[1]}
+%\define@key{zifour}{scaled}[1.0]{\def\zifour@scaled{s*[#1]}}
+\DeclareOptionX{scaled}[1.0]{\renewcommand{\zifour@scaled}{s*[##1]}}
+\DeclareOptionX{scale}[1.0]{\renewcommand{\zifour@scaled}{s*[##1]}}
+%\DeclareOption*{%
+% \begingroup
+% \edef\x{\endgroup
+% \noexpand\setkeys{zifour}{\CurrentOption}}%
+% \x}
+
+\DeclareOptionX{hyphenate}{%
+ \zifour@hyphentrue}
+
+\DeclareOptionX{mono}{%
+ \zifour@monotrue}
% option [nott] to avoid changing tt.
-\DeclareOption{nott}{%
+\DeclareOptionX{nott}{%
\renewcommand*{\zifour@default}{}%
}
% option [noupquote] to prevent loading upquote.
-\DeclareOption{noupquote}{%
+\DeclareOptionX{noupquote}{%
\zifour@noupqtrue}%
% option var0---use unslashed zero (slashed is default)
-\DeclareOption{var0}{%
+\DeclareOptionX{var0}{%
\zifour@altzerotrue\advance\zifour@ocount \tw@ %
}
-\DeclareOption{varl}{%
+\DeclareOptionX{varl}{%
\advance\zifour@ocount \@ne %
}
-\DeclareOption{varqu}{%
+\DeclareOptionX{varqu}{%
\advance\zifour@ocount 4\relax %
}
+\DeclareOptionX{narrow}{%
+ \gdef\zifour@narrow{n} %
+}
+\DeclareOptionX{spacing}[.5em]{%
+ \gdef\zifour@spx{#1}}
+\DeclareOptionX{stretch}[.25em]{%
+ \gdef\zifour@stretchx{#1}}
+\DeclareOptionX{shrink}[.167em]{%
+ \gdef\zifour@shrinkx{#1}}
+\DeclareOptionX{extrasp}[.167em]{%
+ \gdef\zifour@extraspx{#1}}
-\ProcessOptions*
+\ProcessOptionsX
+
+\ifzifour@mono%
+\def\zifour@stretch{0em}
+\def\zifour@shrink{0em}
+\def\zifour@extrasp{.5em}
+\def\zifour@stretchn{0em}
+\def\zifour@shrinkn{0em}
+\def\zifour@extraspn{.45em}
+\fi
+\ifdefined\zifour@narrow%
+ \let\zifour@sp\zifour@spn
+ \let\zifour@stretch\zifour@stretchn
+ \let\zifour@shrink\zifour@shrinkn
+ \let\zifour@extrasp\zifour@extraspn
+\fi
+% Allow values specified in options to override mono
+\ifdefined\zifour@spx\let\zifour@sp\zifour@spx\fi
+\ifdefined\zifour@stretchx\let\zifour@stretch\zifour@stretchx\fi
+\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{%
+ \fontdimen2\font=\zifour@sp%
+ \fontdimen3\font=\zifour@stretch%
+ \fontdimen4\font=\zifour@shrink%
+ \fontdimen7\font=\zifour@extrasp%
+ \zifour@hyph%
+} % used to change default text spacing via fd files
+%\show\zifour@spc
\zifour@default
\edef\zifour@opt{\the\zifour@ocount}
\ifzifour@altzero
@@ -59,6 +124,7 @@
\def\altzero{{\fontfamily{zi4}%
\fontshape{scit}%
\selectfont 0}}
+
\def\zifour@T@ne@nc{T1}
\def\zifour@OT@ne@nc{OT1}
diff --git a/Master/texmf-dist/tex/latex/inconsolata/inconsolatan.fontspec b/Master/texmf-dist/tex/latex/inconsolata/inconsolatan.fontspec
new file mode 100644
index 00000000000..dc88ceb4309
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/inconsolata/inconsolatan.fontspec
@@ -0,0 +1,6 @@
+\defaultfontfeatures[inconsolatan]
+ {
+ Extension = .otf ,
+ UprightFont = InconsolataN-Regular,
+ BoldFont = InconsolataN-Bold
+ }
diff --git a/Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd b/Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd
index d55c114d707..aec098f8da0 100644
--- a/Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd
+++ b/Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd
@@ -1,27 +1,37 @@
-% Copyright 2014 Michael Sharpe.
+% Copyright 2014--2016 Michael Sharpe.
% You may freely use, modify and/or distribute this file.
-\ProvidesFile{ly1zi4.fd}[2014/06/22 LY1/zi4 (Inconsolata)]
+\ProvidesFile{ly1zi4.fd}[2016/12/29 LY1/zi4 (Inconsolata)]
\ifdefined\zifour@scaled
\else
\def\zifour@scaled{}
\fi
+\ifdefined\zifour@narrow
+\else
+ \def\zifour@narrow{}
+\fi
+
\ifdefined\zifour@opt
\else
\def\zifour@opt{0}\def\zifour@altopt{2}
\fi
-\DeclareFontFamily{LY1}{zi4}{\hyphenchar\font=\m@ne}
+\ifdefined\zifour@spc
+\else
+ \def\zifour@spc{\hyphenchar\font=\m@ne}
+\fi
+
+\DeclareFontFamily{LY1}{zi4}{\zifour@spc}
\DeclareFontShape{LY1}{zi4}{m}{n}{%
- <-> \zifour@scaled ly1-zi4r-\zifour@opt}{}
+ <-> \zifour@scaled ly1-zi4\zifour@narrow r-\zifour@opt}{}
\DeclareFontShape{LY1}{zi4}{m}{scit}{%
- <-> \zifour@scaled ly1-zi4r-\zifour@altopt}{}
+ <-> \zifour@scaled ly1-zi4\zifour@narrow r-\zifour@altopt}{}
\DeclareFontShape{LY1}{zi4}{b}{n}{%
- <-> \zifour@scaled ly1-zi4b-\zifour@opt}{}
+ <-> \zifour@scaled ly1-zi4\zifour@narrow b-\zifour@opt}{}
\DeclareFontShape{LY1}{zi4}{b}{scit}{%
- <-> \zifour@scaled ly1-zi4b-\zifour@altopt}{}
+ <-> \zifour@scaled ly1-zi4\zifour@narrow b-\zifour@altopt}{}
\DeclareFontShape{LY1}{zi4}{bx}{n}{%
<-> ssub * zi4/b/n}{}
\DeclareFontShape{LY1}{zi4}{bx}{scit}{%
diff --git a/Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd b/Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd
index c096b843524..a2f1e01fc67 100644
--- a/Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd
+++ b/Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd
@@ -1,27 +1,37 @@
-% Copyright 2014 Michael Sharpe.
+% Copyright 2014--2016 Michael Sharpe.
% You may freely use, modify and/or distribute this file.
-\ProvidesFile{ot1zi4.fd}[2014/06/22 OT1/zi4 (Inconsolata)]
+\ProvidesFile{ot1zi4.fd}[2016/12/29 OT1/zi4 (Inconsolata)]
\ifdefined\zifour@scaled
\else
\def\zifour@scaled{}
\fi
+\ifdefined\zifour@narrow
+\else
+ \def\zifour@narrow{}
+\fi
+
\ifdefined\zifour@opt
\else
\def\zifour@opt{0}\def\zifour@altopt{2}
\fi
-\DeclareFontFamily{OT1}{zi4}{\hyphenchar\font=\m@ne}
+\ifdefined\zifour@spc
+\else
+ \def\zifour@spc{\hyphenchar\font=\m@ne}
+\fi
+
+\DeclareFontFamily{OT1}{zi4}{\zifour@spc}
\DeclareFontShape{OT1}{zi4}{m}{n}{%
- <-> \zifour@scaled ot1-zi4r-\zifour@opt}{}
+ <-> \zifour@scaled ot1-zi4\zifour@narrow r-\zifour@opt}{}
\DeclareFontShape{OT1}{zi4}{m}{scit}{%
- <-> \zifour@scaled ot1-zi4r-\zifour@altopt}{}
+ <-> \zifour@scaled ot1-zi4\zifour@narrow r-\zifour@altopt}{}
\DeclareFontShape{OT1}{zi4}{b}{n}{%
- <-> \zifour@scaled ot1-zi4b-\zifour@opt}{}
+ <-> \zifour@scaled ot1-zi4\zifour@narrow b-\zifour@opt}{}
\DeclareFontShape{OT1}{zi4}{b}{scit}{%
- <-> \zifour@scaled ot1-zi4b-\zifour@altopt}{}
+ <-> \zifour@scaled ot1-zi4\zifour@narrow b-\zifour@altopt}{}
\DeclareFontShape{OT1}{zi4}{bx}{n}{%
<-> ssub * zi4/b/n}{}
\DeclareFontShape{OT1}{zi4}{bx}{scit}{%
diff --git a/Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd b/Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd
index 9c72497268f..e160f7ce0bf 100644
--- a/Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd
+++ b/Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd
@@ -1,27 +1,37 @@
-% Copyright 2014 Michael Sharpe.
+% Copyright 2014--2016 Michael Sharpe.
% You may freely use, modify and/or distribute this file.
-\ProvidesFile{qxzi4.fd}[2014/06/22 QX/zi4 (Inconsolata)]
+\ProvidesFile{qxzi4.fd}[2016/12/29 QX/zi4 (Inconsolata)]
\ifdefined\zifour@scaled
\else
\def\zifour@scaled{}
\fi
+\ifdefined\zifour@narrow
+\else
+ \def\zifour@narrow{}
+\fi
+
\ifdefined\zifour@opt
\else
\def\zifour@opt{0}\def\zifour@altopt{2}
\fi
-\DeclareFontFamily{QX}{zi4}{\hyphenchar\font=\m@ne}
+\ifdefined\zifour@spc
+\else
+ \def\zifour@spc{\hyphenchar\font=\m@ne}
+\fi
+
+\DeclareFontFamily{QX}{zi4}{\zifour@spc}
\DeclareFontShape{QX}{zi4}{m}{n}{%
- <-> \zifour@scaled qx-zi4r-\zifour@opt}{}
+ <-> \zifour@scaled qx-zi4\zifour@narrow r-\zifour@opt}{}
\DeclareFontShape{QX}{zi4}{m}{scit}{%
- <-> \zifour@scaled qx-zi4r-\zifour@altopt}{}
+ <-> \zifour@scaled qx-zi4\zifour@narrow r-\zifour@altopt}{}
\DeclareFontShape{QX}{zi4}{b}{n}{%
- <-> \zifour@scaled qx-zi4b-\zifour@opt}{}
+ <-> \zifour@scaled qx-zi4\zifour@narrow b-\zifour@opt}{}
\DeclareFontShape{QX}{zi4}{b}{scit}{%
- <-> \zifour@scaled qx-zi4b-\zifour@altopt}{}
+ <-> \zifour@scaled qx-zi4\zifour@narrow b-\zifour@altopt}{}
\DeclareFontShape{QX}{zi4}{bx}{n}{%
<-> ssub * zi4/b/n}{}
\DeclareFontShape{QX}{zi4}{bx}{scit}{%
diff --git a/Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd b/Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd
index d544cc724fb..50359d2b16f 100644
--- a/Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd
+++ b/Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd
@@ -1,27 +1,37 @@
-% Copyright 2014 Michael Sharpe.
+% Copyright 2014--2016 Michael Sharpe.
% You may freely use, modify and/or distribute this file.
-\ProvidesFile{t1zi4.fd}[2014/06/22 T1/zi4 (Inconsolata)]
+\ProvidesFile{t1zi4.fd}[2016/12/29 T1/zi4 (Inconsolata)]
\ifdefined\zifour@scaled
\else
\def\zifour@scaled{}
\fi
+\ifdefined\zifour@narrow
+\else
+ \def\zifour@narrow{}
+\fi
+
\ifdefined\zifour@opt
\else
\def\zifour@opt{0}\def\zifour@altopt{2}
\fi
-\DeclareFontFamily{T1}{zi4}{\hyphenchar\font=\m@ne}
+\ifdefined\zifour@spc
+\else
+ \def\zifour@spc{\hyphenchar\font=\m@ne}
+\fi
+
+\DeclareFontFamily{T1}{zi4}{\zifour@spc}
\DeclareFontShape{T1}{zi4}{m}{n}{%
- <-> \zifour@scaled t1-zi4r-\zifour@opt}{}
+ <-> \zifour@scaled t1-zi4\zifour@narrow r-\zifour@opt}{}
\DeclareFontShape{T1}{zi4}{m}{scit}{%
- <-> \zifour@scaled t1-zi4r-\zifour@altopt}{}
+ <-> \zifour@scaled t1-zi4\zifour@narrow r-\zifour@altopt}{}
\DeclareFontShape{T1}{zi4}{b}{n}{%
- <-> \zifour@scaled t1-zi4b-\zifour@opt}{}
+ <-> \zifour@scaled t1-zi4\zifour@narrow b-\zifour@opt}{}
\DeclareFontShape{T1}{zi4}{b}{scit}{%
- <-> \zifour@scaled t1-zi4b-\zifour@altopt}{}
+ <-> \zifour@scaled t1-zi4\zifour@narrow b-\zifour@altopt}{}
\DeclareFontShape{T1}{zi4}{bx}{n}{%
<-> ssub * zi4/b/n}{}
\DeclareFontShape{T1}{zi4}{bx}{scit}{%
diff --git a/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd b/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd
index a7445bc3104..f6b285106d4 100644
--- a/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd
+++ b/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd
@@ -1,24 +1,30 @@
-%Filename: ts1zi4.fd
-%Created by: tex zi4-drv
-%Created using fontinst v1.933
+% Copyright 2014--2016 Michael Sharpe.
+% You may freely use, modify and/or distribute this file.
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1zi4.fd}
- [2014/06/22 Fontinst v1.933 font definitions for TS1/zi4.]
+\ProvidesFile{ts1zi4.fd}[2016/12/29 TS1/zi4 (Inconsolata)]
\ifdefined\zifour@scaled
\else
\def\zifour@scaled{}
\fi
-\DeclareFontFamily{TS1}{zi4}{\hyphenchar\font=\m@ne}
+\ifdefined\zifour@narrow
+\else
+ \def\zifour@narrow{}
+\fi
+
+\ifdefined\zifour@spc
+\else
+ \def\zifour@spc{\hyphenchar\font=\m@ne}
+\fi
+
+\DeclareFontFamily{TS1}{zi4}{\zifour@spc}
\DeclareFontShape{TS1}{zi4}{m}{n}{
- <-> \zifour@scaled ts1-zi4r
+ <-> \zifour@scaled ts1-zi4\zifour@narrow r
}{}
\DeclareFontShape{TS1}{zi4}{b}{n}{
- <-> \zifour@scaled ts1-zi4b
+ <-> \zifour@scaled ts1-zi4\zifour@narrow b
}{}
\DeclareFontShape{TS1}{zi4}{m}{scit}{
<-> ssub * zi4/m/n
diff --git a/Master/texmf-dist/tex/latex/inconsolata/zi4.sty b/Master/texmf-dist/tex/latex/inconsolata/zi4.sty
index 5d6ef381615..676fad3a60f 100644
--- a/Master/texmf-dist/tex/latex/inconsolata/zi4.sty
+++ b/Master/texmf-dist/tex/latex/inconsolata/zi4.sty
@@ -1,52 +1,117 @@
-% Copyright 2014 Michael Sharpe
+% Copyright 2014--2016 Michael Sharpe
% Based initially on Karl Berry's inconsolata.sty.
% You may freely use, modify and/or distribute this file.
-\def\fileversion{1.10}
-\def\filedate{2016/02/22}
+\def\fileversion{1.11}
+\def\filedate{2016/12/29}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{zi4}[\filedate\space v\fileversion]
+\ProvidesPackage{inconsolata}[\filedate\space v\fileversion]
\message{`inconsolata-zi4' v\fileversion, \filedate\space Text macros for Inconsolata (msharpe)}
\RequirePackage{textcomp}
-\RequirePackage{keyval}
+\RequirePackage{xkeyval}
\newcount\zifour@ocount
\newif\ifzifour@altzero
\newif\ifzifour@noupq
-\define@key{zifour}{scaled}[1.0]{\def\zifour@scaled{s*[#1]}}
-
-\DeclareOption*{%
- \begingroup
- \edef\x{\endgroup
- \noexpand\setkeys{zifour}{\CurrentOption}}%
- \x}
+\newif\ifzifour@mono
+\newif\ifzifour@hyphen
+% hyphenation is inhibited by default, but word spacing is, by default
+% variable. The option mono makes word spacing mono also.
+\def\zifour@sp{.5em}
+\def\zifour@stretch{.25em}
+\def\zifour@shrink{.167em}
+\def\zifour@extrasp{.167em}
+\def\zifour@spn{.45em}
+\def\zifour@stretchn{.225em}
+\def\zifour@shrinkn{.15em}
+\def\zifour@extraspn{.15em}
% by default, change \tt to mean zi4.
\newcommand*{\zifour@default}{%
- \renewcommand*{\ttdefault}{zi4}%
-}
+ \renewcommand*{\ttdefault}{zi4}}%
+
+\newcommand\zifour@scaled{s*[1]}
+%\define@key{zifour}{scaled}[1.0]{\def\zifour@scaled{s*[#1]}}
+\DeclareOptionX{scaled}[1.0]{\renewcommand{\zifour@scaled}{s*[##1]}}
+\DeclareOptionX{scale}[1.0]{\renewcommand{\zifour@scaled}{s*[##1]}}
+%\DeclareOption*{%
+% \begingroup
+% \edef\x{\endgroup
+% \noexpand\setkeys{zifour}{\CurrentOption}}%
+% \x}
+
+\DeclareOptionX{hyphenate}{%
+ \zifour@hyphentrue}
+
+\DeclareOptionX{mono}{%
+ \zifour@monotrue}
% option [nott] to avoid changing tt.
-\DeclareOption{nott}{%
+\DeclareOptionX{nott}{%
\renewcommand*{\zifour@default}{}%
}
% option [noupquote] to prevent loading upquote.
-\DeclareOption{noupquote}{%
+\DeclareOptionX{noupquote}{%
\zifour@noupqtrue}%
% option var0---use unslashed zero (slashed is default)
-\DeclareOption{var0}{%
+\DeclareOptionX{var0}{%
\zifour@altzerotrue\advance\zifour@ocount \tw@ %
}
-\DeclareOption{varl}{%
+\DeclareOptionX{varl}{%
\advance\zifour@ocount \@ne %
}
-\DeclareOption{varqu}{%
+\DeclareOptionX{varqu}{%
\advance\zifour@ocount 4\relax %
}
+\DeclareOptionX{narrow}{%
+ \gdef\zifour@narrow{n} %
+}
+\DeclareOptionX{spacing}[.5em]{%
+ \gdef\zifour@spx{#1}}
+\DeclareOptionX{stretch}[.25em]{%
+ \gdef\zifour@stretchx{#1}}
+\DeclareOptionX{shrink}[.167em]{%
+ \gdef\zifour@shrinkx{#1}}
+\DeclareOptionX{extrasp}[.167em]{%
+ \gdef\zifour@extraspx{#1}}
-\ProcessOptions*
+\ProcessOptionsX
+
+\ifzifour@mono%
+\def\zifour@stretch{0em}
+\def\zifour@shrink{0em}
+\def\zifour@extrasp{.5em}
+\def\zifour@stretchn{0em}
+\def\zifour@shrinkn{0em}
+\def\zifour@extraspn{.45em}
+\fi
+\ifdefined\zifour@narrow%
+ \let\zifour@sp\zifour@spn
+ \let\zifour@stretch\zifour@stretchn
+ \let\zifour@shrink\zifour@shrinkn
+ \let\zifour@extrasp\zifour@extraspn
+\fi
+% Allow values specified in options to override mono
+\ifdefined\zifour@spx\let\zifour@sp\zifour@spx\fi
+\ifdefined\zifour@stretchx\let\zifour@stretch\zifour@stretchx\fi
+\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{%
+ \fontdimen2\font=\zifour@sp%
+ \fontdimen3\font=\zifour@stretch%
+ \fontdimen4\font=\zifour@shrink%
+ \fontdimen7\font=\zifour@extrasp%
+ \zifour@hyph%
+} % used to change default text spacing via fd files
+%\show\zifour@spc
\zifour@default
\edef\zifour@opt{\the\zifour@ocount}
\ifzifour@altzero
@@ -59,6 +124,7 @@
\def\altzero{{\fontfamily{zi4}%
\fontshape{scit}%
\selectfont 0}}
+
\def\zifour@T@ne@nc{T1}
\def\zifour@OT@ne@nc{OT1}