inconsolata (23feb16)

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

5 files changed, 26 insertions, 22 deletions

diff --git a/Master/texmf-dist/doc/fonts/inconsolata/README b/Master/texmf-dist/doc/fonts/inconsolata/README
index fa3754b3c25..0d61623013c 100644
--- a/Master/texmf-dist/doc/fonts/inconsolata/README
+++ b/Master/texmf-dist/doc/fonts/inconsolata/README
@@ -12,7 +12,10 @@ LaTeX support file zi4.sty are
 
 Files provided "as is", with no warranties.
 
-Current version: 1.09
+Current version: 1.10
+
+Changes in version 1.10
+Fixed names of Stylistic Sets and added to documentation.
 
 Changes in version 1.09
 Restored the ss01--ss03 lookup tables that had gone missing.
diff --git a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.pdf b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.pdf
index 78923367fc2..cafec5245ad 100644
--- a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.pdf
diff --git a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.tex b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.tex
index a296b87f080..32f0bb837ef 100644
--- a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.tex
+++ b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.tex
@@ -30,10 +30,15 @@
 \begin{document}
 %\show\textquotesingle
 \maketitle
-The package provides support files for the typewriter font
-\texttt{Inconsolata}. To use it add \verb|\usepackage{zi4}| to your document. This
+The package provides updated PostScript and Opentype versions of Raph Levien's fine sans serif typewriter font
+\texttt{Inconsolata} in regular and bold weights, adding some glyphs which may optionally replace existing \texttt{quotedbl} and \texttt{quotesingle} and lower-case~L, along with new slashed zero, \texttt{arrowright} and \texttt{arrowleft} glyphs. \LaTeX\ support files are also provided. 
+
+\section*{\LaTeX\ usage}
+To use {\texttt{Inconsolata} as your typewriter font, add \verb|\usepackage{zi4}| to your preamble after any other packages that might load another typewriter font. This
 will change the typewriter font family to \texttt{zi4}, the family name used
-by this package, which replaces the old \textsf{inconsolata}, where the family name was \texttt{fi4}. The package also provides extensions of the \texttt{Inconsolata} fonts in regular and bold weights, adding some glyphs which may optionally replace existing \texttt{quotedbl} and \texttt{quotesingle} and lower-case~L, along with new \texttt{arrowright} and \texttt{arrowleft} glyphs. As with Karl Berry's original \texttt{inconsolata} package, the \LaTeX\ package \texttt{zi4} offers four encodings---\texttt{T1}, \texttt{LY1}, \texttt{OT1} and \texttt{QX}---and provides the following options which some may find improve its utility for displaying verbatim text such as code fragments. 
+by this package, which replaces the old \textsf{inconsolata}, where the family name was \texttt{fi4}.  (The original {\tt inconsolata} is now obsolete and a new version of {\tt inconsolata.sty} is included in the package, so that \verb|\usepackage{inconsolata}| should have the same effect as \verb|\usepackage{zi4}|, unless you still have the original package somewhere taaking priority over the new one.) 
+
+As with Karl Berry's original \texttt{inconsolata} package, the \LaTeX\ package \texttt{zi4} offers four encodings---\texttt{T1}, \texttt{LY1}, \texttt{OT1} and \texttt{QX}---and provides the following options which some may find improve its utility for displaying verbatim text such as code fragments. 
 \begin{itemize}
 \item The option \texttt{scaled=x} allows you to scale all typewriter text and verbatim text by the factor \texttt{x}.
 \item
@@ -56,9 +61,9 @@ renders (with option \texttt{varqu}) as \texttt{`xy' " \textasciigrave \textquot
 
 \textbf{Note on the QX encoding:} The encoding files used as part of this package, derived from the \texttt{inconsolata} package, seem to have some inconsistencies with \texttt{qxenc.def} made necessary as a compromise to get text and verbatim modes functioning for a wide class of common characters.
 
-In the following examples, the claim that all encodings render the same applies only to the very limited selection of quote glyphs tested. In practice, QX encoding behaves worse than the other encodings for \texttt{zi4}.
+In the following examples, the claim that all encodings render the same applies only to the very limited selection of quote glyphs tested. In practice, QX encoding behaves worse than the others for \texttt{zi4}.
+
 
-\newpage
 \section*{Effects of the options varqu, noupquote}
 \textbf{With \texttt{varqu}:} \texttt{upquote} loaded by default---all encodings render the same.
 
@@ -99,23 +104,19 @@ specifying the option \texttt{varqu}, not specifying \texttt{noupquote}, and avo
 \usepackage{upquote}
 \end{verbatim}
 which is built-in to the \texttt{zi4.sty} code and need not be repeated.
-\section{Opentype issues} The package includes two Opentype fonts named \textsf{Inconsolatazi4-Regular} and \textsf{Inconsolatazi4-Bold}, which may be loaded with \texttt{fontspec}:
+\section*{Opentype issues} The package includes two Opentype fonts named \textsf{Inconsolatazi4-Regular} and \textsf{Inconsolatazi4-Bold}, which may be loaded with \texttt{fontspec}:
 \begin{verbatim}
 \fontspec{Inconsolatazi4} %slashed zero, curly quotes, default l
 \end{verbatim}
-The fonts contain three Stylistic Set variants that may be used to control the shape of lower case l (\texttt{ss01}), the form of zero (\texttt{ss02}) and the shape of quotes (\texttt{ss03}). One or more of these may be specified as follows:
-\begin{verbatim}
-\textsf[StylisticSet=1]{Inconsolatazi4-Regular} % shapely l
-\end{verbatim}
+The fonts contain three Stylistic Set variants that may be used to control the shape of lower case l (\texttt{ss01}), the form of zero (\texttt{ss02}) and the shape of quotes (\texttt{ss03}). One or more of these may be specified using one of the following example lines:
 \begin{verbatim}
-\textsf[StylisticSet=2]{Inconsolatazi4-Regular} % unslashed zero
-\end{verbatim}
-\begin{verbatim}
-\textsf[StylisticSet=3]{Inconsolatazi4-Regular} % straight quotes
-\end{verbatim}
-\begin{verbatim}
-\textsf[StylisticSet={1,3}]{Inconsolatazi4-Regular} % shapely l, upright quotes
+\setmonofont[StylisticSet=1]{Inconsolatazi4} % shapely l
+\setmonofont[StylisticSet=2]{Inconsolatazi4} % unslashed zero
+\setmonofont[StylisticSet=3]{Inconsolatazi4} % straight quotes
+\setmonofont[StylisticSet={1,3}]{Inconsolatazi4} % shapely l, upright quotes
 \end{verbatim}
+(Specifying {\tt Inconsolatazi4} as the font name tells {\tt fontspec} to look for the file {\tt Inconsolatazi4.fontspec} which spells out the names of the associated {\tt.otf} files.)
+
 Note that one cannot expect exactly the same rendition from \LaTeX\ typewriter modes and the \textsf{fontspec} typewriter modes. For one thing, in \LaTeX, the typewriter left quote symbol is \texttt{quoteleft}, while under \textsf{fontspec}, it is the \texttt{grave} symbol.
 \end{document}
 
diff --git a/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty b/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty
index 5d783f694b4..aeada49e6a4 100644
--- a/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty
+++ b/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty
@@ -2,8 +2,8 @@
 % Based initially on Karl Berry's inconsolata.sty.
 % You may freely use, modify and/or distribute this file.
 
-\def\fileversion{1.09}
-\def\filedate{2016/02/19}
+\def\fileversion{1.10}
+\def\filedate{2016/02/22}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{inconsolata}[\filedate\space v\fileversion]
 \message{`inconsolata-zi4' v\fileversion, \filedate\space Text macros for Inconsolata (msharpe)}
diff --git a/Master/texmf-dist/tex/latex/inconsolata/zi4.sty b/Master/texmf-dist/tex/latex/inconsolata/zi4.sty
index 1325664a89e..5d6ef381615 100644
--- a/Master/texmf-dist/tex/latex/inconsolata/zi4.sty
+++ b/Master/texmf-dist/tex/latex/inconsolata/zi4.sty
@@ -2,8 +2,8 @@
 % Based initially on Karl Berry's inconsolata.sty.
 % You may freely use, modify and/or distribute this file.
 
-\def\fileversion{1.09}
-\def\filedate{2016/02/19}
+\def\fileversion{1.10}
+\def\filedate{2016/02/22}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zi4}[\filedate\space v\fileversion]
 \message{`inconsolata-zi4' v\fileversion, \filedate\space Text macros for Inconsolata (msharpe)}