summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/fonts/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/doc/fonts/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/doc/fonts/inconsolata')
-rw-r--r--Master/texmf-dist/doc/fonts/inconsolata/README8
-rw-r--r--Master/texmf-dist/doc/fonts/inconsolata/afmcmds.txt72
-rw-r--r--Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.pdfbin430646 -> 311607 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.tex42
4 files changed, 106 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/fonts/inconsolata/README b/Master/texmf-dist/doc/fonts/inconsolata/README
index 0d61623013c..5d3d4ef52d2 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.
-Current version: 1.10
+Current version: 1.11
+
+Changes in version 1.11
+1. Added narrow versions of the Inconsolata fonts, reducing widths by 10%. The narrow versions may be better for printing code.
+2. Added a number of options to allow control over hyphenation and word spacing.
+3. Some small changes to glyph shapes.
+4. Added documentation for the above.
Changes in version 1.10
Fixed names of Stylistic Sets and added to documentation.
diff --git a/Master/texmf-dist/doc/fonts/inconsolata/afmcmds.txt b/Master/texmf-dist/doc/fonts/inconsolata/afmcmds.txt
index 4625c16f4ac..336c7160d5c 100644
--- a/Master/texmf-dist/doc/fonts/inconsolata/afmcmds.txt
+++ b/Master/texmf-dist/doc/fonts/inconsolata/afmcmds.txt
@@ -70,3 +70,75 @@ afm2tfm Inconsolata-zi4b -T i4-qx-7.enc qx-zi4b-7.tfm
afm2tfm Inconsolata-zi4r -T i4-ts1.enc ts1-zi4r.tfm
afm2tfm Inconsolata-zi4b -T i4-ts1.enc ts1-zi4b.tfm
+
+# same again with narrow
+afm2tfm InconsolataN-Regular -T i4-t1-0.enc t1-zi4nr-0.tfm
+afm2tfm InconsolataN-Regular -T i4-t1-1.enc t1-zi4nr-1.tfm
+afm2tfm InconsolataN-Regular -T i4-t1-2.enc t1-zi4nr-2.tfm
+afm2tfm InconsolataN-Regular -T i4-t1-3.enc t1-zi4nr-3.tfm
+afm2tfm InconsolataN-Regular -T i4-t1-4.enc t1-zi4nr-4.tfm
+afm2tfm InconsolataN-Regular -T i4-t1-5.enc t1-zi4nr-5.tfm
+afm2tfm InconsolataN-Regular -T i4-t1-6.enc t1-zi4nr-6.tfm
+afm2tfm InconsolataN-Regular -T i4-t1-7.enc t1-zi4nr-7.tfm
+afm2tfm InconsolataN-Bold -T i4-t1-0.enc t1-zi4nb-0.tfm
+afm2tfm InconsolataN-Bold -T i4-t1-1.enc t1-zi4nb-1.tfm
+afm2tfm InconsolataN-Bold -T i4-t1-2.enc t1-zi4nb-2.tfm
+afm2tfm InconsolataN-Bold -T i4-t1-3.enc t1-zi4nb-3.tfm
+afm2tfm InconsolataN-Bold -T i4-t1-4.enc t1-zi4nb-4.tfm
+afm2tfm InconsolataN-Bold -T i4-t1-5.enc t1-zi4nb-5.tfm
+afm2tfm InconsolataN-Bold -T i4-t1-6.enc t1-zi4nb-6.tfm
+afm2tfm InconsolataN-Bold -T i4-t1-7.enc t1-zi4nb-7.tfm
+
+afm2tfm InconsolataN-Regular -T i4-ot1-0.enc ot1-zi4nr-0.tfm
+afm2tfm InconsolataN-Regular -T i4-ot1-1.enc ot1-zi4nr-1.tfm
+afm2tfm InconsolataN-Regular -T i4-ot1-2.enc ot1-zi4nr-2.tfm
+afm2tfm InconsolataN-Regular -T i4-ot1-3.enc ot1-zi4nr-3.tfm
+afm2tfm InconsolataN-Regular -T i4-ot1-4.enc ot1-zi4nr-4.tfm
+afm2tfm InconsolataN-Regular -T i4-ot1-5.enc ot1-zi4nr-5.tfm
+afm2tfm InconsolataN-Regular -T i4-ot1-6.enc ot1-zi4nr-6.tfm
+afm2tfm InconsolataN-Regular -T i4-ot1-7.enc ot1-zi4nr-7.tfm
+afm2tfm InconsolataN-Bold -T i4-ot1-0.enc ot1-zi4nb-0.tfm
+afm2tfm InconsolataN-Bold -T i4-ot1-1.enc ot1-zi4nb-1.tfm
+afm2tfm InconsolataN-Bold -T i4-ot1-2.enc ot1-zi4nb-2.tfm
+afm2tfm InconsolataN-Bold -T i4-ot1-3.enc ot1-zi4nb-3.tfm
+afm2tfm InconsolataN-Bold -T i4-ot1-4.enc ot1-zi4nb-4.tfm
+afm2tfm InconsolataN-Bold -T i4-ot1-5.enc ot1-zi4nb-5.tfm
+afm2tfm InconsolataN-Bold -T i4-ot1-6.enc ot1-zi4nb-6.tfm
+afm2tfm InconsolataN-Bold -T i4-ot1-7.enc ot1-zi4nb-7.tfm
+
+afm2tfm InconsolataN-Regular -T i4-ly1-0.enc ly1-zi4nr-0.tfm
+afm2tfm InconsolataN-Regular -T i4-ly1-1.enc ly1-zi4nr-1.tfm
+afm2tfm InconsolataN-Regular -T i4-ly1-2.enc ly1-zi4nr-2.tfm
+afm2tfm InconsolataN-Regular -T i4-ly1-3.enc ly1-zi4nr-3.tfm
+afm2tfm InconsolataN-Regular -T i4-ly1-4.enc ly1-zi4nr-4.tfm
+afm2tfm InconsolataN-Regular -T i4-ly1-5.enc ly1-zi4nr-5.tfm
+afm2tfm InconsolataN-Regular -T i4-ly1-6.enc ly1-zi4nr-6.tfm
+afm2tfm InconsolataN-Regular -T i4-ly1-7.enc ly1-zi4nr-7.tfm
+afm2tfm InconsolataN-Bold -T i4-ly1-0.enc ly1-zi4nb-0.tfm
+afm2tfm InconsolataN-Bold -T i4-ly1-1.enc ly1-zi4nb-1.tfm
+afm2tfm InconsolataN-Bold -T i4-ly1-2.enc ly1-zi4nb-2.tfm
+afm2tfm InconsolataN-Bold -T i4-ly1-3.enc ly1-zi4nb-3.tfm
+afm2tfm InconsolataN-Bold -T i4-ly1-4.enc ly1-zi4nb-4.tfm
+afm2tfm InconsolataN-Bold -T i4-ly1-5.enc ly1-zi4nb-5.tfm
+afm2tfm InconsolataN-Bold -T i4-ly1-6.enc ly1-zi4nb-6.tfm
+afm2tfm InconsolataN-Bold -T i4-ly1-7.enc ly1-zi4nb-7.tfm
+
+afm2tfm InconsolataN-Regular -T i4-qx-0.enc qx-zi4nr-0.tfm
+afm2tfm InconsolataN-Regular -T i4-qx-1.enc qx-zi4nr-1.tfm
+afm2tfm InconsolataN-Regular -T i4-qx-2.enc qx-zi4nr-2.tfm
+afm2tfm InconsolataN-Regular -T i4-qx-3.enc qx-zi4nr-3.tfm
+afm2tfm InconsolataN-Regular -T i4-qx-4.enc qx-zi4nr-4.tfm
+afm2tfm InconsolataN-Regular -T i4-qx-5.enc qx-zi4nr-5.tfm
+afm2tfm InconsolataN-Regular -T i4-qx-6.enc qx-zi4nr-6.tfm
+afm2tfm InconsolataN-Regular -T i4-qx-7.enc qx-zi4nr-7.tfm
+afm2tfm InconsolataN-Bold -T i4-qx-0.enc qx-zi4nb-0.tfm
+afm2tfm InconsolataN-Bold -T i4-qx-1.enc qx-zi4nb-1.tfm
+afm2tfm InconsolataN-Bold -T i4-qx-2.enc qx-zi4nb-2.tfm
+afm2tfm InconsolataN-Bold -T i4-qx-3.enc qx-zi4nb-3.tfm
+afm2tfm InconsolataN-Bold -T i4-qx-4.enc qx-zi4nb-4.tfm
+afm2tfm InconsolataN-Bold -T i4-qx-5.enc qx-zi4nb-5.tfm
+afm2tfm InconsolataN-Bold -T i4-qx-6.enc qx-zi4nb-6.tfm
+afm2tfm InconsolataN-Bold -T i4-qx-7.enc qx-zi4nb-7.tfm
+
+afm2tfm InconsolataN-Regular -T i4-ts1.enc ts1-zi4nr.tfm
+afm2tfm InconsolataN-Bold -T i4-ts1.enc ts1-zi4nb.tfm
diff --git a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.pdf b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.pdf
index cafec5245ad..97f161dc5b2 100644
--- a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.tex b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.tex
index 32f0bb837ef..255004ecd55 100644
--- a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.tex
+++ b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.tex
@@ -4,21 +4,21 @@
\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent
\usepackage{graphicx}
\usepackage{booktabs}
-%\pdfmapfile{+zi4.map}
+\pdfmapfile{=zi4.map}
%SetFonts
% libertine text and newtxmath
%\usepackage{lmodern}
-\usepackage[lining]{libertine}
+\usepackage[osf,sups]{baskervillef}
\usepackage[T1]{fontenc}
%\usepackage[scaled=.83]{beramono}
\usepackage[varqu]{zi4}
%\usepackage{amsmath,amsthm}
-\usepackage[libertine,cmbraces]{newtxmath}
+\usepackage[baskerville]{newtxmath}
\usepackage{textcomp}
-\renewcommand\rmdefault{LinuxLibertineT-OsF}
-\usepackage[supstfm=libertinesups,%
- supscaled=1.2,%
- raised=-.13em]{superiors}
+%\renewcommand\rmdefault{LinuxLibertineT-OsF}
+%\usepackage[supstfm=libertinesups,%
+% supscaled=1.2,%
+% raised=-.13em]{superiors}
%SetFonts
%\UndeclareTextCommand{\textquotesingle}{LY1}
%\DeclareTextSymbol{\textquotesingle}{TS1}{39}
@@ -31,22 +31,33 @@
%\show\textquotesingle
\maketitle
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.
+\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. As of version 1.11, narrower renditions are also provided, with widths reduced from 500 units to 450 units. \LaTeX\ support files are also provided for both.
\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
+To use {\texttt{Inconsolata} as your typewriter font, add \verb|\usepackage{inconsolata}| (or \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 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.)
+by this package, which replaces the old \textsf{inconsolata}, where the family name was \texttt{fi4}. (The original {\tt inconsolata} is now obsolete and is no longer distributed as part of \TeX Live.)
-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.
+As with Karl Berry's original \texttt{inconsolata} package, the new package offers four basic encodings---\texttt{T1}, \texttt{LY1}, \texttt{OT1} and \texttt{QX}---, plus a \texttt{TS1} text comanion encoding. It 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 The option \texttt{scaled=x} (or \texttt{scale=x}) allows you to scale all typewriter text and verbatim text by the factor \texttt{x}.
\item
The default zero in \texttt{zi4} is now slashed. The unslashed zero may be specified with the option \texttt{var0}.
\item For those who find the default lower-case L(\texttt{l}) a bit too close to the numeral~\texttt{1}, there is an option \texttt{varl} which substitutes a more distinctive shape for all glyphs related to lower-case L.
\item The \texttt{zi4} package loads the \texttt{textcomp} package, which points to a TS$1$-encoded font that has been modified to have uncurved left and right quotes, especially important in code fragments, by use of \texttt{textcomp} glyphs \verb|\textasciigrave| and \verb|\textquotesingle|. The \texttt{varqu} option provides further upright quote forms for glyphs that are not part of the \texttt{textcomp} package, such as
the default double quote glyph \texttt{quotedbl} and \texttt{quotesingle}, which by default have a small slant. (Note that the latter is not part of all encodings---it is present in \texttt{OT1}, \texttt{LY1} and \texttt{QX}, but not in \texttt{T1}.)
\item The package loads \texttt{upquote} by default, but provides an option \texttt{noupquote} to override it.
+\item (new in v.1.11) The option \texttt{narrow} causes the narrow versions to be used, having widths reduced by 10\%.
+\item (new in v.1.11) The default behavior of {\tt inconsolata} is to prevent all automatic hyphenation, to permit spacing to stretch and shrink, and to place some extra space after a line ending period. This version offers the following options to change the default behavior.
+\begin{itemize}
+\item
+Option {\tt hyphenate} allows automatic hyphenation to occur, which may be useful if your usage is simply to have blocks of text is quasi-typewritten form, though with variable word-spacing.
+\item option {\tt mono} forces the behavior to mimic that of the Computer Modern Typewriter font---all spaces have the same width as the glyphs, and a full extra space is inserted after a line-ending period.
+\item You may modify individual {\tt fontdimen} values that govern this behavior by means of the options {\tt spacing}, {\tt stretch}, {\tt shrink} and {\tt extrasp}. These will override any values changed by the option {\tt mono}, for example, giving you a way to get monospacing but prevent extra space after a period, with
+\begin{verbatim}
+\usepackage[mono,extrasp=0em]{inconsolata}
+\end{verbatim}
+\end{itemize}
\end{itemize}
When used in ordinary typewriter mode (ie, with \verb|\texttt{}| or the deprecated form \verb|{\tt }|), left and right quotes are rendered as in ordinary text. For example,
\begin{verbatim}
@@ -104,9 +115,10 @@ 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 four Opentype fonts named \textsf{Inconsolatazi4-Regular}, \textsf{Inconsolatazi4-Bold}, \textsf{InconsolataN-Regular} and \textsf{InconsolataN-Bold}, the last two being for the narrow variant. The narrow and the normal width versions may be loaded using \texttt{fontspec}:
\begin{verbatim}
-\fontspec{Inconsolatazi4} %slashed zero, curly quotes, default l
+\fontspec{inconsolata} % normal width, slashed zero, curly quotes, default l
+\fontspec{inconsolatan} % nnarrow width, 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 using one of the following example lines:
\begin{verbatim}
@@ -115,7 +127,7 @@ The fonts contain three Stylistic Set variants that may be used to control the s
\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.)
+To prevent automatic hyphenation, add the option {\tt HyphenChar=None} to the call. (Specifying {\tt inconsolata} as the font name tells {\tt fontspec} to look for the file {\tt inconsolata.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}