From 87d9fd097f6d26395cd79705c4d5a38ac3e8e0e9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 16 Jul 2013 21:53:04 +0000 Subject: inconsolata (16jul13) git-svn-id: svn://tug.org/texlive/trunk@31210 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/fonts/inconsolata/README | 6 +- .../doc/fonts/inconsolata/inconsolata-doc.pdf | Bin 0 -> 448324 bytes .../doc/fonts/inconsolata/inconsolata-doc.tex | 124 +++++++++++++++++++++ .../doc/fonts/inconsolata/inconsolata-zi4-doc.pdf | Bin 398828 -> 0 bytes .../doc/fonts/inconsolata/inconsolata-zi4-doc.tex | 110 ------------------ .../public/inconsolata/Inconsolatazi4-Bold.otf | Bin 47744 -> 48208 bytes .../public/inconsolata/Inconsolatazi4-Regular.otf | Bin 39244 -> 39708 bytes Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd | 4 + Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd | 4 + Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd | 4 + Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd | 4 + Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd | 12 +- 12 files changed, 154 insertions(+), 114 deletions(-) create mode 100644 Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.pdf create mode 100644 Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.tex delete mode 100644 Master/texmf-dist/doc/fonts/inconsolata/inconsolata-zi4-doc.pdf delete mode 100644 Master/texmf-dist/doc/fonts/inconsolata/inconsolata-zi4-doc.tex diff --git a/Master/texmf-dist/doc/fonts/inconsolata/README b/Master/texmf-dist/doc/fonts/inconsolata/README index 9ff8f384879..e29d6a642a6 100644 --- a/Master/texmf-dist/doc/fonts/inconsolata/README +++ b/Master/texmf-dist/doc/fonts/inconsolata/README @@ -12,7 +12,11 @@ LaTeX support file zi4.sty are Files provided "as is", with no warranties. -Version: 1.02 +Version: 1.03 + +Changes in version 1.03 +(1) Added ss01, ss02 and ss03 tables to the otf versions, providing options for glyph variants under fontspec. +(2) Corrections to some of the fd files affecting bold weight. Changes in version 1.02 (1) The otf versions of the fonts were modified so their names and properties are better-behaved than the original ones. (Thanks to Greg' Ar Tourter for very useful feedback.) diff --git a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.pdf b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.pdf new file mode 100644 index 00000000000..a841624e757 Binary files /dev/null and b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.pdf differ diff --git a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.tex b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.tex new file mode 100644 index 00000000000..6dfcdde2cfe --- /dev/null +++ b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.tex @@ -0,0 +1,124 @@ +% !TEX TS-program = pdflatexmk +\documentclass[11pt]{article} +\usepackage[margin=1in]{geometry} +\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent +\usepackage{graphicx} +\usepackage{booktabs} +\pdfmapfile{+zi4.map} +%SetFonts +% libertine text and newtxmath +%\usepackage{lmodern} +\usepackage[lining]{libertine} +\usepackage[T1]{fontenc} +%\usepackage[scaled=.83]{beramono} +\usepackage[varqu]{zi4} +%\usepackage{amsmath,amsthm} +\usepackage[libertine,cmbraces]{newtxmath} +\usepackage{textcomp} +\renewcommand\rmdefault{LinuxLibertineT-OsF} +\usepackage[supstfm=libertinesups,% + supscaled=1.2,% + raised=-.13em]{superiors} +%SetFonts +%\UndeclareTextCommand{\textquotesingle}{LY1} +%\DeclareTextSymbol{\textquotesingle}{TS1}{39} +%\usepackage{upquote} +\title{The Inconsolata Package} +\author{Michael Sharpe} +\date{\today} % Activate to display a given date or no date + +\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 +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. +\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 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. +\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} +\texttt{`xy' " \textasciigrave \textquotesingle} +\end{verbatim} +renders (with option \texttt{varqu}) as \texttt{`xy' " \textasciigrave \textquotesingle}. With the \texttt{upquote} package, verbatim text, eg: +\begin{verbatim} +\verb|`xy' "| +\end{verbatim} + renders as you would expect it in code samples: +\verb|`xy' "| + +\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}. + +\newpage +\section*{Effects of the options varqu, noupquote} +\textbf{With \texttt{varqu}:} \texttt{upquote} loaded by default---all encodings render the same. + +\begin{center} + \begin{tabular}{@{} ccc @{}} + \toprule + Input & Text mode & Verbatim mode \\ + \midrule + \verb|\textasciigrave| & \texttt{\textasciigrave} & \\ + \verb|\textquotesingle| & \texttt{\textquotesingle} & \\ + \texttt{"} & \texttt{"} & \verb|"| \\ + \verb|'| & \texttt{'} & \verb|'| \\ + \verb|`| & \texttt{`} & \verb|`| \\ + \bottomrule + \end{tabular} +\end{center} +\textbf{Without \texttt{varqu}:} \texttt{upquote} loaded by default---all encodings render the same. +\begin{center} +\includegraphics{novarqu-crop} +\end{center} +\textbf{Without \texttt{varqu}, \texttt{noupquote}:} \texttt{upquote} NOT loaded---all encodings render the same. +\begin{center} +\includegraphics{novarqu-noupq-crop} +\end{center} +\textbf{With \texttt{varqu}, \texttt{noupquote}:} \texttt{upquote} NOT loaded---all encodings render the same. +\begin{center} +\includegraphics{novarqu-noupq-crop} +\end{center} + + +\textbf{Conclusion:} To me, it is overwhelmingly clear that the best results come from +specifying the option \texttt{varqu}, not specifying \texttt{noupquote}, and avoiding the QX encoding wherever possible. + +\textbf{A technical note concerning LY1 or QX encodings:} These encodings make their own definitions of \verb|\textquotesingle| as glyphs in the main text font. Using the TS1 glyph with upright shape so that \texttt{upquote} works correctly with these encodings requires the incantation: +\begin{verbatim} +\UndeclareTextCommand{\textquotesingle}{LY1} % or QX +\DeclareTextSymbol{\textquotesingle}{TS1}{39} +\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}: +\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} +\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 +\end{verbatim} +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} + + + + \ No newline at end of file diff --git a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-zi4-doc.pdf b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-zi4-doc.pdf deleted file mode 100644 index d05662d568c..00000000000 Binary files a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-zi4-doc.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-zi4-doc.tex b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-zi4-doc.tex deleted file mode 100644 index d43e86badfd..00000000000 --- a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-zi4-doc.tex +++ /dev/null @@ -1,110 +0,0 @@ -% !TEX TS-program = pdflatexmk -\documentclass[11pt]{article} -\usepackage[margin=1in]{geometry} -\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent -\usepackage{graphicx} -\usepackage{booktabs} -\pdfmapfile{+zi4.map} -%SetFonts -% libertine text and newtxmath -%\usepackage{lmodern} -\usepackage[lining]{libertine} -\usepackage[T1]{fontenc} -%\usepackage[scaled=.83]{beramono} -\usepackage[varqu]{zi4} -%\usepackage{amsmath,amsthm} -\usepackage[libertine,cmbraces]{newtxmath} -\usepackage{textcomp} -\makeatletter -\libertine@liningfalse %old-style figures in text, not math -\makeatother -\usepackage[supstfm=libertinesups,% - supscaled=1.2,% - raised=-.13em]{superiors} -%SetFonts -%\UndeclareTextCommand{\textquotesingle}{LY1} -%\DeclareTextSymbol{\textquotesingle}{TS1}{39} -%\usepackage{upquote} -\title{The Inconsolata-zi4 Package} -\author{Michael Sharpe} -\date{\today} % Activate to display a given date or no date - -\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 -will change the typewriter font family to \texttt{zi4}, the family name used -by this package. 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. -\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 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 TS1-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. -\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} -\texttt{`xy' " \textasciigrave \textquotesingle} -\end{verbatim} -renders (with option \texttt{varqu}) as \texttt{`xy' " \textasciigrave \textquotesingle}. However, if you load the \texttt{upquote} package, then verbatim text, eg: -\begin{verbatim} -\verb|`xy' "| -\end{verbatim} - renders more as you would expect it in code samples: -\begin{verbatim} -`xy' " -\end{verbatim} - -\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}. - -\newpage -\section*{Effects of the options varqu, noupquote} -\textbf{With \texttt{varqu}:} \texttt{upquote} loaded by default---all encodings render the same. - -\begin{center} - \begin{tabular}{@{} ccc @{}} - \toprule - Input & Text mode & Verbatim mode \\ - \midrule - \verb|\textasciigrave| & \texttt{\textasciigrave} & \\ - \verb|\textquotesingle| & \texttt{\textquotesingle} & \\ - \texttt{"} & \texttt{"} & \verb|"| \\ - \verb|'| & \texttt{'} & \verb|'| \\ - \verb|`| & \texttt{`} & \verb|`| \\ - \bottomrule - \end{tabular} -\end{center} -\textbf{Without \texttt{varqu}:} \texttt{upquote} loaded by default---all encodings render the same. -\begin{center} -\includegraphics{novarqu-crop} -\end{center} -\textbf{Without \texttt{varqu}, \texttt{noupquote}:} \texttt{upquote} NOT loaded---all encodings render the same. -\begin{center} -\includegraphics{novarqu-noupq-crop} -\end{center} -\textbf{With \texttt{varqu}, \texttt{noupquote}:} \texttt{upquote} NOT loaded---all encodings render the same. -\begin{center} -\includegraphics{novarqu-noupq-crop} -\end{center} - - -\textbf{Conclusion:} To me, it is overwhelmingly clear that the best results come from -specifying the option \texttt{varqu}, not specifying \texttt{noupquote}, and avoiding the QX encoding wherever possible. - -\textbf{A technical note concerning LY1 or QX encodings:} These encodings make their own definitions of \verb|\textquotesingle| as glyphs in the main text font. Using the TS1 glyph with upright shape so that \texttt{upquote} works correctly with these encodings requires the incantation: -\begin{verbatim} -\UndeclareTextCommand{\textquotesingle}{LY1} % or QX -\DeclareTextSymbol{\textquotesingle}{TS1}{39} -\usepackage{upquote} -\end{verbatim} -which is built-in to the \texttt{zi4.sty} code and need not be repeated. -\end{document} - - - - \ No newline at end of file diff --git a/Master/texmf-dist/fonts/opentype/public/inconsolata/Inconsolatazi4-Bold.otf b/Master/texmf-dist/fonts/opentype/public/inconsolata/Inconsolatazi4-Bold.otf index 10343a1108b..3d9543d6808 100644 Binary files a/Master/texmf-dist/fonts/opentype/public/inconsolata/Inconsolatazi4-Bold.otf and b/Master/texmf-dist/fonts/opentype/public/inconsolata/Inconsolatazi4-Bold.otf differ diff --git a/Master/texmf-dist/fonts/opentype/public/inconsolata/Inconsolatazi4-Regular.otf b/Master/texmf-dist/fonts/opentype/public/inconsolata/Inconsolatazi4-Regular.otf index 2498763141f..37d2d46c36a 100644 Binary files a/Master/texmf-dist/fonts/opentype/public/inconsolata/Inconsolatazi4-Regular.otf and b/Master/texmf-dist/fonts/opentype/public/inconsolata/Inconsolatazi4-Regular.otf differ diff --git a/Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd b/Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd index 95107a35aa9..7ba888bf85e 100644 --- a/Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd +++ b/Master/texmf-dist/tex/latex/inconsolata/ly1zi4.fd @@ -20,6 +20,10 @@ <-> \zifour@scaled ly1-zi4b-\zifour@opt}{} \DeclareFontShape{LY1}{zi4}{b}{scit}{% <-> \zifour@scaled ly1-zi4b-\zifour@altopt}{} +\DeclareFontShape{LY1}{zi4}{bx}{n}{% + <-> ssub * zi4/b/n}{} +\DeclareFontShape{LY1}{zi4}{bx}{scit}{% + <-> ssub * zi4/b/scit}{} \endinput diff --git a/Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd b/Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd index 50714f28dd3..6234fdd4218 100644 --- a/Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd +++ b/Master/texmf-dist/tex/latex/inconsolata/ot1zi4.fd @@ -20,5 +20,9 @@ <-> \zifour@scaled ot1-zi4b-\zifour@opt}{} \DeclareFontShape{OT1}{zi4}{b}{scit}{% <-> \zifour@scaled ot1-zi4b-\zifour@altopt}{} +\DeclareFontShape{OT1}{zi4}{bx}{n}{% + <-> ssub * zi4/b/n}{} +\DeclareFontShape{OT1}{zi4}{bx}{scit}{% + <-> ssub * zi4/b/scit}{} \endinput diff --git a/Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd b/Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd index 78680810d0c..b7da2686aae 100644 --- a/Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd +++ b/Master/texmf-dist/tex/latex/inconsolata/qxzi4.fd @@ -20,6 +20,10 @@ <-> \zifour@scaled qx-zi4b-\zifour@opt}{} \DeclareFontShape{QX}{zi4}{b}{scit}{% <-> \zifour@scaled qx-zi4b-\zifour@altopt}{} +\DeclareFontShape{QX}{zi4}{bx}{n}{% + <-> ssub * zi4/b/n}{} +\DeclareFontShape{QX}{zi4}{bx}{scit}{% + <-> ssub * zi4/b/scit}{} \endinput diff --git a/Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd b/Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd index 16b402b27b3..cf7ea402829 100644 --- a/Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd +++ b/Master/texmf-dist/tex/latex/inconsolata/t1zi4.fd @@ -20,6 +20,10 @@ <-> \zifour@scaled t1-zi4b-\zifour@opt}{} \DeclareFontShape{T1}{zi4}{b}{scit}{% <-> \zifour@scaled t1-zi4b-\zifour@altopt}{} +\DeclareFontShape{T1}{zi4}{bx}{n}{% + <-> ssub * zi4/b/n}{} +\DeclareFontShape{T1}{zi4}{bx}{scit}{% + <-> ssub * zi4/b/scit}{} \endinput diff --git a/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd b/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd index 90adb4babd1..fd5543f43f8 100644 --- a/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd +++ b/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd @@ -11,7 +11,7 @@ \let\zifour@scaled\@empty \fi -\DeclareFontFamily{TS1}{zi4}{} +\DeclareFontFamily{TS1}{zi4}{\hyphenchar\font=\m@ne} \DeclareFontShape{TS1}{zi4}{m}{n}{ <-> \zifour@scaled ts1-zi4r @@ -20,10 +20,16 @@ <-> \zifour@scaled ts1-zi4b }{} \DeclareFontShape{TS1}{zi4}{m}{scit}{ - <-> TS1/zi4/m/n + <-> ssub * zi4/m/n }{} \DeclareFontShape{TS1}{zi4}{b}{scit}{ - <-> TS1/zi4/b/n + <-> ssub * zi4/b/n +}{} +\DeclareFontShape{TS1}{zi4}{bx}{n}{ + <-> ssub * zi4/b/n +}{} +\DeclareFontShape{TS1}{zi4}{bx}{scit}{ + <-> ssub * zi4/b/n }{} -- cgit v1.2.3