inconsolata update (7sep10)

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

12 files changed, 114 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/fonts/inconsolata/ChangeLog b/Master/texmf-dist/doc/fonts/inconsolata/ChangeLog
new file mode 100644
index 00000000000..78993812bed
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/inconsolata/ChangeLog
@@ -0,0 +1,9 @@
+2010-09-06  Karl Berry  <karl@gnu.org>
+
+	* GNUmakefile (otftotfm_opt): need --no-type1 to avoid Inconsolata.pfb
+	being rebuilt from the otf by otftotfm;
+	need --no-warn-missing to avoid warnings since --no-virtual is in use.
+
+	* fi4-ot1tt.enc (less, greater): use instead of angleleft, angleright.
+	From Jim Whitehead II, 6 Sep 2010 18:24:46.
+
diff --git a/Master/texmf-dist/doc/fonts/inconsolata/GNUmakefile b/Master/texmf-dist/doc/fonts/inconsolata/GNUmakefile
index 1e397faa94b..c0078e515df 100644
--- a/Master/texmf-dist/doc/fonts/inconsolata/GNUmakefile
+++ b/Master/texmf-dist/doc/fonts/inconsolata/GNUmakefile
@@ -1,8 +1,8 @@
-# Copyright 2009 Karl Berry.
+# Copyright 2009, 2010 Karl Berry.
 # You may freely use, modify and/or distribute this file.
 
-default: test-spacing.pdf inconsolata.pdf # fonttable.pdf
-# ly1-nfsstest.pdf # check-coverage # compare-ts1-fix
+default: test-textless.pdf test-spacing.pdf inconsolata.pdf
+# fonttable.pdf # ly1-nfsstest.pdf # check-coverage # compare-ts1-fix
 
 # nice dump of what's in the font, showing glyph names.
 fonttable.pdf: fonttable.ps
@@ -26,33 +26,38 @@ test.pdf: test.tex \
 	pdflatex '\nonstopmode\input $<' || { rm -f $@; exit 1; }
 
 
-# another test document, checking stretch & shrink being zero.
+# test document checking stretch & shrink being zero.
 test-spacing.pdf: test-spacing.tex ec-inconsolata.tfm
 	pdflatex '\nonstopmode\input $<' || { rm -f $@; exit 1; }
 
+# test document for \textless.
+test-textless.pdf: test-textless.tex rm-inconsolata.tfm
+	pdflatex '\nonstopmode\input $<' || { rm -f $@; exit 1; }
+
 # make individual tfm's from our handcrafted encoding files using otftotfm.
 # This being a typewriter font, there are no kerns or ligatures, so no
 # -fkern -fliga.
 otftotfm = otftotfm $(otftotfm_opt)
-otftotfm_opt = --fixed-width --no-virtual --no-encoding
+otftotfm_opt = --fixed-width --no-virtual --no-encoding \
+--no-warn-missing --no-type1
 
 ec-inconsolata.tfm: Inconsolata.otf Inconsolata.pfb fi4-ec.enc
-	$(otftotfm) -e fi4-ec.enc $< `basename $@ .tfm`
+	$(otftotfm) -e fi4-ec.enc $< `basename $@ .tfm`;ls -l Inconsolata.pfb
 
 ei1-inconsolata.tfm: Inconsolata.otf Inconsolata.pfb fi4-ei1.enc
-	$(otftotfm) -e fi4-ei1.enc $< `basename $@ .tfm`
+	$(otftotfm) -e fi4-ei1.enc $< `basename $@ .tfm`;ls -l Inconsolata.pfb
 
 rm-inconsolata.tfm: Inconsolata.otf Inconsolata.pfb fi4-ot1tt.enc
-	$(otftotfm) -e fi4-ot1tt.enc $< `basename $@ .tfm`
+	$(otftotfm) -e fi4-ot1tt.enc $< `basename $@ .tfm`;ls -l Inconsolata.pfb
 
 qx-inconsolata.tfm: Inconsolata.otf Inconsolata.pfb
-	$(otftotfm) -e fi4-qxtt.enc $< `basename $@ .tfm`
+	$(otftotfm) -e fi4-qxtt.enc $< `basename $@ .tfm`;ls -l Inconsolata.pfb
 
 texnansi-inconsolata.tfm: Inconsolata.otf Inconsolata.pfb fi4-texnansi.enc
-	$(otftotfm) -e fi4-texnansi.enc $< `basename $@ .tfm`
+	$(otftotfm) -e fi4-texnansi.enc $< `basename $@ .tfm`;ls -l Inconsolata.pfb
 
 ts1-inconsolata.tfm: Inconsolata.otf Inconsolata.pfb fi4-ts1.enc
-	$(otftotfm) -e fi4-ts1.enc $< `basename $@ .tfm`
+	$(otftotfm) -e fi4-ts1.enc $< `basename $@ .tfm`;ls -l Inconsolata.pfb
 
 # The original distribution only has pfa; we want to work with pfb.
 Inconsolata.pfb: Inconsolata.pfa
@@ -104,9 +109,10 @@ all-concat.enc: $(wildcard fi4-*.enc)
 # distribution tarball for CTAN.
 dist: inconsolata.zip
 inconsolata.zip: Inconsolata.otf Inconsolata.pfb Inconsolata.sfd \
-		GNUmakefile README fonttable.pdf test.pdf test.tex \
+		ChangeLog GNUmakefile NEWS README \
+		fonttable.pdf test.pdf test*.tex \
 		inconsolata.sty *-inconsolata.tfm \
 		fi4.map fi4*.enc *fi4.fd inconsolata.pdf inconsolata.tex
 	rm -f $@
-	zip $@ $^
-	ls -l $@
+	zip -q $@ $^
+	@ls -l $@
diff --git a/Master/texmf-dist/doc/fonts/inconsolata/NEWS b/Master/texmf-dist/doc/fonts/inconsolata/NEWS
new file mode 100644
index 00000000000..9d97ab79af2
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/inconsolata/NEWS
@@ -0,0 +1,5 @@
+Public domain.
+
+2010/09/06 need less/greater for ot1tt.
+2009/11/28 make stretch and shrink zero, extraspace = wordspace, like cmtt.
+2009/06/07 initial release.
diff --git a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata.pdf b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata.pdf
index 7acbf3342cf..adba67a7223 100644
--- a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata.pdf
+++ b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata.pdf
diff --git a/Master/texmf-dist/doc/fonts/inconsolata/test-spacing.tex b/Master/texmf-dist/doc/fonts/inconsolata/test-spacing.tex
new file mode 100644
index 00000000000..6b3b0d38895
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/inconsolata/test-spacing.tex
@@ -0,0 +1,58 @@
+% From Enrico Gregorio, testing stretch and shrink of the font.
+% Public domain.
+\documentclass{article}
+\usepackage[T1]{fontenc}
+\usepackage{inconsolata}
+\parindent=0pt
+
+\begin{document}
+\ttfamily
+Inconsolata
+
+\settowidth{\dimen0}{123456789012345678901234567}
+
+\vbox{\hsize=\dimen0
+1234567890123456789012345\\
+This should be monospaced\\
+without spaces shrinking!\\
+1 3 5 7 9 1 3 5 7 9 1 3 5 28
+}
+
+In the following only 30
+characters should fit:
+
+\settowidth{\dimen0}{A}
+
+\leavevmode\hbox to30\dimen0{%
+1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8} (they are 35)
+
+\hbox{%
+123456789012345678901234567890}
+
+% 
+\bigskip \hrule \bigskip
+
+\fontfamily{cmtt}\selectfont
+Computer Modern Typewriter
+
+\settowidth{\dimen0}{123456789012345678901234567}
+
+\vbox{\hsize=\dimen0
+1234567890123456789012345\\
+This should be monospaced\\
+without spaces shrinking!\\
+1 3 5 7 9 1 3 5 7 9 1 3 5 28
+}
+
+In the following only 30
+characters should fit:
+
+\settowidth{\dimen0}{A}
+
+\leavevmode\hbox to30\dimen0{%
+1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8} (they are 35)
+
+\hbox{%
+123456789012345678901234567890}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/fonts/inconsolata/test-textless.tex b/Master/texmf-dist/doc/fonts/inconsolata/test-textless.tex
new file mode 100644
index 00000000000..f2246b0e459
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/inconsolata/test-textless.tex
@@ -0,0 +1,12 @@
+\documentclass{article}
+\usepackage{inconsolata}
+\begin{document}
+\texttt{This is a lessthan sign in Inconsolata: <}
+
+\texttt{This is a lessthan sign in Inconsolata: \textless{}}
+
+\begin{verbatim}
+This is a verbatim lessthan sign: <
+\end{verbatim}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/fonts/inconsolata/test.pdf b/Master/texmf-dist/doc/fonts/inconsolata/test.pdf
index ac1d5ab6a48..3f87e2b8380 100644
--- a/Master/texmf-dist/doc/fonts/inconsolata/test.pdf
+++ b/Master/texmf-dist/doc/fonts/inconsolata/test.pdf
diff --git a/Master/texmf-dist/doc/fonts/inconsolata/testmin.tex b/Master/texmf-dist/doc/fonts/inconsolata/testmin.tex
new file mode 100644
index 00000000000..820f5a6f93f
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/inconsolata/testmin.tex
@@ -0,0 +1,7 @@
+\documentclass{article}
+\usepackage{inconsolata}  % can use [scaled=1.1]
+\usepackage[T1]{fontenc}
+\begin{document}
+\thispagestyle{empty}
+{\tt Inconsolata.}
+\end{document}
diff --git a/Master/texmf-dist/fonts/enc/dvips/inconsolata/fi4-ot1tt.enc b/Master/texmf-dist/fonts/enc/dvips/inconsolata/fi4-ot1tt.enc
index b5c8b26ffff..e18d46a27ad 100644
--- a/Master/texmf-dist/fonts/enc/dvips/inconsolata/fi4-ot1tt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/inconsolata/fi4-ot1tt.enc
@@ -1,7 +1,7 @@
 % @psencodingfile{
 %   filename  = "fi4-ot1tt.enc",
 %   license   = "public domain",
-%   date      = "31may09",
+%   date      = "6sep10",
 %   author    = "Karl Berry",
 %   email     = "tex-fonts@tug.org",
 %   docstring = "Typewriter OT1 (plus [Ll]slash) as a dvips .enc file,
@@ -72,9 +72,9 @@
 /nine
 /colon
 /semicolon
-/angleleft
+/less
 /equal
-/angleright
+/greater
 /question
 /at
 /A
diff --git a/Master/texmf-dist/fonts/tfm/public/inconsolata/rm-inconsolata.tfm b/Master/texmf-dist/fonts/tfm/public/inconsolata/rm-inconsolata.tfm
index 7db453fde01..e059c291f58 100644
--- a/Master/texmf-dist/fonts/tfm/public/inconsolata/rm-inconsolata.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/inconsolata/rm-inconsolata.tfm
diff --git a/Master/texmf-dist/fonts/type1/public/inconsolata/Inconsolata.pfb b/Master/texmf-dist/fonts/type1/public/inconsolata/Inconsolata.pfb
index 8e3390345db..40f35a12c25 100644
--- a/Master/texmf-dist/fonts/type1/public/inconsolata/Inconsolata.pfb
+++ b/Master/texmf-dist/fonts/type1/public/inconsolata/Inconsolata.pfb
diff --git a/Master/texmf-dist/doc/fonts/inconsolata/Inconsolata.sfd b/Master/texmf-dist/source/fonts/inconsolata/Inconsolata.sfd
index 3415c8b9d53..3415c8b9d53 100644
--- a/Master/texmf-dist/doc/fonts/inconsolata/Inconsolata.sfd
+++ b/Master/texmf-dist/source/fonts/inconsolata/Inconsolata.sfd