From a4d341ae43329bb5bb112644ff349ca39fa5326b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 5 Jul 2013 19:06:11 +0000 Subject: inconsolata (4jul13) git-svn-id: svn://tug.org/texlive/trunk@31100 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/fonts/inconsolata/OFL.txt | 1 - Master/texmf-dist/doc/fonts/inconsolata/README | 7 +- .../doc/fonts/inconsolata/inconsolata-zi4-doc.pdf | Bin 398250 -> 398828 bytes .../doc/fonts/inconsolata/inconsolata-zi4-doc.tex | 5 +- .../public/inconsolata/Inconsolata-zi4b.otf | Bin 0 -> 41816 bytes .../public/inconsolata/Inconsolata-zi4r.otf | Bin 0 -> 33888 bytes .../fonts/tfm/public/inconsolata/ts1-zi4b.tfm | Bin 0 -> 1244 bytes .../fonts/tfm/public/inconsolata/ts1-zi4r.tfm | Bin 0 -> 1244 bytes .../tex/latex/inconsolata/inconsolata.sty | 89 +++++++++++++++++++++ Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd | 30 +++++++ 10 files changed, 128 insertions(+), 4 deletions(-) create mode 100644 Master/texmf-dist/fonts/opentype/public/inconsolata/Inconsolata-zi4b.otf create mode 100644 Master/texmf-dist/fonts/opentype/public/inconsolata/Inconsolata-zi4r.otf create mode 100644 Master/texmf-dist/fonts/tfm/public/inconsolata/ts1-zi4b.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/inconsolata/ts1-zi4r.tfm create mode 100644 Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty create mode 100644 Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd diff --git a/Master/texmf-dist/doc/fonts/inconsolata/OFL.txt b/Master/texmf-dist/doc/fonts/inconsolata/OFL.txt index 27bc97daa96..d9ae615922b 100644 --- a/Master/texmf-dist/doc/fonts/inconsolata/OFL.txt +++ b/Master/texmf-dist/doc/fonts/inconsolata/OFL.txt @@ -1,5 +1,4 @@ Copyright (c) 2011, Raph Levien (firstname.lastname@gmail.com), Copyright (c) 2012, Cyreal (cyreal.org) -Copyright (c) 2013, Michael Sharpe (msharpe@ucsd.edu) This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL diff --git a/Master/texmf-dist/doc/fonts/inconsolata/README b/Master/texmf-dist/doc/fonts/inconsolata/README index fb078ac046d..8790fc8f666 100644 --- a/Master/texmf-dist/doc/fonts/inconsolata/README +++ b/Master/texmf-dist/doc/fonts/inconsolata/README @@ -12,9 +12,12 @@ LaTeX support file zi4.sty are Files provided "as is", with no warranties. -Version: 1.0 - +Version: 1.01 +Changes in version 1.01 +(1) Added the ts1 tfms and fd that were inadvertently omitted from version 1.0. +(2) Added inconsolata.sty to doc/fonts/inconsolata. It is essentially a copy of zi4.sty, and should be copied to your personal texmf tree if you wish to retain the old name. +(3) Added the otf versions of the fonts to the distribution. Installation: diff --git a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-zi4-doc.pdf b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-zi4-doc.pdf index dba3279c2b3..d05662d568c 100644 Binary files a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-zi4-doc.pdf and b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-zi4-doc.pdf 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 index a47a09f5fa2..d43e86badfd 100644 --- a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-zi4-doc.tex +++ b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-zi4-doc.tex @@ -32,7 +32,10 @@ \begin{document} %\show\textquotesingle \maketitle -This package provides a number of modifications 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. +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 diff --git a/Master/texmf-dist/fonts/opentype/public/inconsolata/Inconsolata-zi4b.otf b/Master/texmf-dist/fonts/opentype/public/inconsolata/Inconsolata-zi4b.otf new file mode 100644 index 00000000000..3bca9de0407 Binary files /dev/null and b/Master/texmf-dist/fonts/opentype/public/inconsolata/Inconsolata-zi4b.otf differ diff --git a/Master/texmf-dist/fonts/opentype/public/inconsolata/Inconsolata-zi4r.otf b/Master/texmf-dist/fonts/opentype/public/inconsolata/Inconsolata-zi4r.otf new file mode 100644 index 00000000000..2ca04f2e337 Binary files /dev/null and b/Master/texmf-dist/fonts/opentype/public/inconsolata/Inconsolata-zi4r.otf differ diff --git a/Master/texmf-dist/fonts/tfm/public/inconsolata/ts1-zi4b.tfm b/Master/texmf-dist/fonts/tfm/public/inconsolata/ts1-zi4b.tfm new file mode 100644 index 00000000000..ba0545ac1fd Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/inconsolata/ts1-zi4b.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/inconsolata/ts1-zi4r.tfm b/Master/texmf-dist/fonts/tfm/public/inconsolata/ts1-zi4r.tfm new file mode 100644 index 00000000000..764940d3cf2 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/inconsolata/ts1-zi4r.tfm differ diff --git a/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty b/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty new file mode 100644 index 00000000000..c8bed851ad4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty @@ -0,0 +1,89 @@ +% Copyright 2013 Michael Sharpe +% Based initially on Karl Berry's inconsolata.sty. +% You may freely use, modify and/or distribute this file. + +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{inconsolata}[2013/06/09 zi4a] + +\RequirePackage{textcomp} +\RequirePackage{keyval} + +\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} + +% by default, change \tt to mean zi4. +\newcommand*{\zifour@default}{% + \renewcommand*{\ttdefault}{zi4}% +} + +% option [nott] to avoid changing tt. +\DeclareOption{nott}{% + \renewcommand*{\zifour@default}{}% +} +% option [noupquote] to prevent loading upquote. +\DeclareOption{noupquote}{% + \zifour@noupqtrue}% + +% option var0---use unslashed zero (slashed is default) +\DeclareOption{var0}{% + \zifour@altzerotrue\advance\zifour@ocount \tw@ % +} +\DeclareOption{varl}{% + \advance\zifour@ocount \@ne % +} +\DeclareOption{varqu}{% + \advance\zifour@ocount 4\relax % +} + +\ProcessOptions* +\zifour@default +\edef\zifour@opt{\the\zifour@ocount} +\ifzifour@altzero + \advance\zifour@ocount -\tw@ +\else + \advance\zifour@ocount \tw@ +\fi +\edef\zifour@altopt{\the\zifour@ocount} +% define an \altzero macro which flips to slashed, unslashed +\def\altzero{{\fontfamily{zi4}% + \fontshape{scit}% + \selectfont 0}} + +\def\zifour@T@ne@nc{T1} +\def\zifour@OT@ne@nc{OT1} +\def\zifour@LY@ne@nc{LY1} +\def\zifour@QX@nc{QX} +\def\zifour@TQS{% +\UndeclareTextCommand{\textquotesingle}{\encodingdefault} +\DeclareTextSymbol{\textquotesingle}{TS1}{39}} + +\ifzifour@noupq% do nothing + % Try to correct for wrong slots for QX + \ifx\encodingdefault\zifour@QX@nc + \zifour@TQS + \else + \ifx\encodingdefault\zifour@LY@ne@nc + \zifour@TQS + \fi + \fi +\else + \AtBeginDocument{% + \ifx\encodingdefault\zifour@T@ne@nc % do nothing + \else + \ifx\encodingdefault\zifour@OT@ne@nc % do nothing + \else + \zifour@TQS + \fi + \fi + \usepackage{upquote}} +\fi + +\endinput diff --git a/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd b/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd new file mode 100644 index 00000000000..90adb4babd1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/inconsolata/ts1zi4.fd @@ -0,0 +1,30 @@ +%Filename: ts1zi4.fd +%Created by: tex zi4-drv +%Created using fontinst v1.933 + +%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY + +\ProvidesFile{ts1zi4.fd} + [2013/06/07 Fontinst v1.933 font definitions for TS1/zi4.] + +\expandafter\ifx\csname zifour@scaled\endcsname\relax + \let\zifour@scaled\@empty +\fi + +\DeclareFontFamily{TS1}{zi4}{} + +\DeclareFontShape{TS1}{zi4}{m}{n}{ + <-> \zifour@scaled ts1-zi4r +}{} +\DeclareFontShape{TS1}{zi4}{b}{n}{ + <-> \zifour@scaled ts1-zi4b +}{} +\DeclareFontShape{TS1}{zi4}{m}{scit}{ + <-> TS1/zi4/m/n +}{} +\DeclareFontShape{TS1}{zi4}{b}{scit}{ + <-> TS1/zi4/b/n +}{} + + +\endinput -- cgit v1.2.3