summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/doc')
-rw-r--r--Master/texmf-dist/doc/fonts/inconsolata/README7
-rw-r--r--Master/texmf-dist/doc/fonts/inconsolata/afmcmds.txt267
-rw-r--r--Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.pdfbin311607 -> 259951 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.tex58
4 files changed, 179 insertions, 153 deletions
diff --git a/Master/texmf-dist/doc/fonts/inconsolata/README b/Master/texmf-dist/doc/fonts/inconsolata/README
index f18a6100d36..936585cb969 100644
--- a/Master/texmf-dist/doc/fonts/inconsolata/README
+++ b/Master/texmf-dist/doc/fonts/inconsolata/README
@@ -12,7 +12,12 @@ LaTeX support file zi4.sty are
Files provided "as is", with no warranties.
-Current version: 1.114
+Current version: 1.12
+
+Changes in version 1.12
+1. Added standard text ligatures, excepting f-ligatures, to improve rendering of text blocks other than verbatim.
+2. Changed the sty file to be better support the use of Inconsolata and Inconsolata Narrow as limited text fonts.
+3. Documentation additions and correction.
Changes in version 1.114
Corrected error in the fd files that did not permit multiple calls to \usefont under some circumstances. (Thanks Haruhiko Okumura.)
diff --git a/Master/texmf-dist/doc/fonts/inconsolata/afmcmds.txt b/Master/texmf-dist/doc/fonts/inconsolata/afmcmds.txt
index 336c7160d5c..ce719b67def 100644
--- a/Master/texmf-dist/doc/fonts/inconsolata/afmcmds.txt
+++ b/Master/texmf-dist/doc/fonts/inconsolata/afmcmds.txt
@@ -1,144 +1,143 @@
+afm2tfm Inconsolata-zi4r -T i4-t1-0.enc -v t1-zi4r-0 t1-zi4r-0
+afm2tfm Inconsolata-zi4r -T i4-t1-1.enc -v t1-zi4r-1 t1-zi4r-1
+afm2tfm Inconsolata-zi4r -T i4-t1-2.enc -v t1-zi4r-2 t1-zi4r-2
+afm2tfm Inconsolata-zi4r -T i4-t1-3.enc -v t1-zi4r-3 t1-zi4r-3
+afm2tfm Inconsolata-zi4r -T i4-t1-4.enc -v t1-zi4r-4 t1-zi4r-4
+afm2tfm Inconsolata-zi4r -T i4-t1-5.enc -v t1-zi4r-5 t1-zi4r-5
+afm2tfm Inconsolata-zi4r -T i4-t1-6.enc -v t1-zi4r-6 t1-zi4r-6
+afm2tfm Inconsolata-zi4r -T i4-t1-7.enc -v t1-zi4r-7 t1-zi4r-7
+afm2tfm Inconsolata-zi4b -T i4-t1-0.enc -v t1-zi4b-0 t1-zi4b-0
+afm2tfm Inconsolata-zi4b -T i4-t1-1.enc -v t1-zi4b-1 t1-zi4b-1
+afm2tfm Inconsolata-zi4b -T i4-t1-2.enc -v t1-zi4b-2 t1-zi4b-2
+afm2tfm Inconsolata-zi4b -T i4-t1-3.enc -v t1-zi4b-3 t1-zi4b-3
+afm2tfm Inconsolata-zi4b -T i4-t1-4.enc -v t1-zi4b-4 t1-zi4b-4
+afm2tfm Inconsolata-zi4b -T i4-t1-5.enc -v t1-zi4b-5 t1-zi4b-5
+afm2tfm Inconsolata-zi4b -T i4-t1-6.enc -v t1-zi4b-6 t1-zi4b-6
+afm2tfm Inconsolata-zi4b -T i4-t1-7.enc -v t1-zi4b-7 t1-zi4b-7
+afm2tfm Inconsolata-zi4r -T i4-ot1-0.enc -v ot1-zi4r-0 ot1-zi4r-0
+afm2tfm Inconsolata-zi4r -T i4-ot1-1.enc -v ot1-zi4r-1 ot1-zi4r-1
+afm2tfm Inconsolata-zi4r -T i4-ot1-2.enc -v ot1-zi4r-2 ot1-zi4r-2
+afm2tfm Inconsolata-zi4r -T i4-ot1-3.enc -v ot1-zi4r-3 ot1-zi4r-3
+afm2tfm Inconsolata-zi4r -T i4-ot1-4.enc -v ot1-zi4r-4 ot1-zi4r-4
+afm2tfm Inconsolata-zi4r -T i4-ot1-5.enc -v ot1-zi4r-5 ot1-zi4r-5
+afm2tfm Inconsolata-zi4r -T i4-ot1-6.enc -v ot1-zi4r-6 ot1-zi4r-6
+afm2tfm Inconsolata-zi4r -T i4-ot1-7.enc -v ot1-zi4r-7 ot1-zi4r-7
+afm2tfm Inconsolata-zi4b -T i4-ot1-0.enc -v ot1-zi4b-0 ot1-zi4b-0
+afm2tfm Inconsolata-zi4b -T i4-ot1-1.enc -v ot1-zi4b-1 ot1-zi4b-1
+afm2tfm Inconsolata-zi4b -T i4-ot1-2.enc -v ot1-zi4b-2 ot1-zi4b-2
+afm2tfm Inconsolata-zi4b -T i4-ot1-3.enc -v ot1-zi4b-3 ot1-zi4b-3
+afm2tfm Inconsolata-zi4b -T i4-ot1-4.enc -v ot1-zi4b-4 ot1-zi4b-4
+afm2tfm Inconsolata-zi4b -T i4-ot1-5.enc -v ot1-zi4b-5 ot1-zi4b-5
+afm2tfm Inconsolata-zi4b -T i4-ot1-6.enc -v ot1-zi4b-6 ot1-zi4b-6
+afm2tfm Inconsolata-zi4b -T i4-ot1-7.enc -v ot1-zi4b-7 ot1-zi4b-7
-afm2tfm Inconsolata-zi4r -T i4-t1-0.enc t1-zi4r-0.tfm
-afm2tfm Inconsolata-zi4r -T i4-t1-1.enc t1-zi4r-1.tfm
-afm2tfm Inconsolata-zi4r -T i4-t1-2.enc t1-zi4r-2.tfm
-afm2tfm Inconsolata-zi4r -T i4-t1-3.enc t1-zi4r-3.tfm
-afm2tfm Inconsolata-zi4r -T i4-t1-4.enc t1-zi4r-4.tfm
-afm2tfm Inconsolata-zi4r -T i4-t1-5.enc t1-zi4r-5.tfm
-afm2tfm Inconsolata-zi4r -T i4-t1-6.enc t1-zi4r-6.tfm
-afm2tfm Inconsolata-zi4r -T i4-t1-7.enc t1-zi4r-7.tfm
-afm2tfm Inconsolata-zi4b -T i4-t1-0.enc t1-zi4b-0.tfm
-afm2tfm Inconsolata-zi4b -T i4-t1-1.enc t1-zi4b-1.tfm
-afm2tfm Inconsolata-zi4b -T i4-t1-2.enc t1-zi4b-2.tfm
-afm2tfm Inconsolata-zi4b -T i4-t1-3.enc t1-zi4b-3.tfm
-afm2tfm Inconsolata-zi4b -T i4-t1-4.enc t1-zi4b-4.tfm
-afm2tfm Inconsolata-zi4b -T i4-t1-5.enc t1-zi4b-5.tfm
-afm2tfm Inconsolata-zi4b -T i4-t1-6.enc t1-zi4b-6.tfm
-afm2tfm Inconsolata-zi4b -T i4-t1-7.enc t1-zi4b-7.tfm
+afm2tfm Inconsolata-zi4r -T i4-ly1-0.enc -v ly1-zi4r-0 ly1-zi4r-0
+afm2tfm Inconsolata-zi4r -T i4-ly1-1.enc -v ly1-zi4r-1 ly1-zi4r-1
+afm2tfm Inconsolata-zi4r -T i4-ly1-2.enc -v ly1-zi4r-2 ly1-zi4r-2
+afm2tfm Inconsolata-zi4r -T i4-ly1-3.enc -v ly1-zi4r-3 ly1-zi4r-3
+afm2tfm Inconsolata-zi4r -T i4-ly1-4.enc -v ly1-zi4r-4 ly1-zi4r-4
+afm2tfm Inconsolata-zi4r -T i4-ly1-5.enc -v ly1-zi4r-5 ly1-zi4r-5
+afm2tfm Inconsolata-zi4r -T i4-ly1-6.enc -v ly1-zi4r-6 ly1-zi4r-6
+afm2tfm Inconsolata-zi4r -T i4-ly1-7.enc -v ly1-zi4r-7 ly1-zi4r-7
+afm2tfm Inconsolata-zi4b -T i4-ly1-0.enc -v ly1-zi4b-0 ly1-zi4b-0
+afm2tfm Inconsolata-zi4b -T i4-ly1-1.enc -v ly1-zi4b-1 ly1-zi4b-1
+afm2tfm Inconsolata-zi4b -T i4-ly1-2.enc -v ly1-zi4b-2 ly1-zi4b-2
+afm2tfm Inconsolata-zi4b -T i4-ly1-3.enc -v ly1-zi4b-3 ly1-zi4b-3
+afm2tfm Inconsolata-zi4b -T i4-ly1-4.enc -v ly1-zi4b-4 ly1-zi4b-4
+afm2tfm Inconsolata-zi4b -T i4-ly1-5.enc -v ly1-zi4b-5 ly1-zi4b-5
+afm2tfm Inconsolata-zi4b -T i4-ly1-6.enc -v ly1-zi4b-6 ly1-zi4b-6
+afm2tfm Inconsolata-zi4b -T i4-ly1-7.enc -v ly1-zi4b-7 ly1-zi4b-7
-afm2tfm Inconsolata-zi4r -T i4-ot1-0.enc ot1-zi4r-0.tfm
-afm2tfm Inconsolata-zi4r -T i4-ot1-1.enc ot1-zi4r-1.tfm
-afm2tfm Inconsolata-zi4r -T i4-ot1-2.enc ot1-zi4r-2.tfm
-afm2tfm Inconsolata-zi4r -T i4-ot1-3.enc ot1-zi4r-3.tfm
-afm2tfm Inconsolata-zi4r -T i4-ot1-4.enc ot1-zi4r-4.tfm
-afm2tfm Inconsolata-zi4r -T i4-ot1-5.enc ot1-zi4r-5.tfm
-afm2tfm Inconsolata-zi4r -T i4-ot1-6.enc ot1-zi4r-6.tfm
-afm2tfm Inconsolata-zi4r -T i4-ot1-7.enc ot1-zi4r-7.tfm
-afm2tfm Inconsolata-zi4b -T i4-ot1-0.enc ot1-zi4b-0.tfm
-afm2tfm Inconsolata-zi4b -T i4-ot1-1.enc ot1-zi4b-1.tfm
-afm2tfm Inconsolata-zi4b -T i4-ot1-2.enc ot1-zi4b-2.tfm
-afm2tfm Inconsolata-zi4b -T i4-ot1-3.enc ot1-zi4b-3.tfm
-afm2tfm Inconsolata-zi4b -T i4-ot1-4.enc ot1-zi4b-4.tfm
-afm2tfm Inconsolata-zi4b -T i4-ot1-5.enc ot1-zi4b-5.tfm
-afm2tfm Inconsolata-zi4b -T i4-ot1-6.enc ot1-zi4b-6.tfm
-afm2tfm Inconsolata-zi4b -T i4-ot1-7.enc ot1-zi4b-7.tfm
+afm2tfm Inconsolata-zi4r -T i4-qx-0.enc -v qx-zi4r-0 qx-zi4r-0
+afm2tfm Inconsolata-zi4r -T i4-qx-1.enc -v qx-zi4r-1 qx-zi4r-1
+afm2tfm Inconsolata-zi4r -T i4-qx-2.enc -v qx-zi4r-2 qx-zi4r-2
+afm2tfm Inconsolata-zi4r -T i4-qx-3.enc -v qx-zi4r-3 qx-zi4r-3
+afm2tfm Inconsolata-zi4r -T i4-qx-4.enc -v qx-zi4r-4 qx-zi4r-4
+afm2tfm Inconsolata-zi4r -T i4-qx-5.enc -v qx-zi4r-5 qx-zi4r-5
+afm2tfm Inconsolata-zi4r -T i4-qx-6.enc -v qx-zi4r-6 qx-zi4r-6
+afm2tfm Inconsolata-zi4r -T i4-qx-7.enc -v qx-zi4r-7 qx-zi4r-7
+afm2tfm Inconsolata-zi4b -T i4-qx-0.enc -v qx-zi4b-0 qx-zi4b-0
+afm2tfm Inconsolata-zi4b -T i4-qx-1.enc -v qx-zi4b-1 qx-zi4b-1
+afm2tfm Inconsolata-zi4b -T i4-qx-2.enc -v qx-zi4b-2 qx-zi4b-2
+afm2tfm Inconsolata-zi4b -T i4-qx-3.enc -v qx-zi4b-3 qx-zi4b-3
+afm2tfm Inconsolata-zi4b -T i4-qx-4.enc -v qx-zi4b-4 qx-zi4b-4
+afm2tfm Inconsolata-zi4b -T i4-qx-5.enc -v qx-zi4b-5 qx-zi4b-5
+afm2tfm Inconsolata-zi4b -T i4-qx-6.enc -v qx-zi4b-6 qx-zi4b-6
+afm2tfm Inconsolata-zi4b -T i4-qx-7.enc -v qx-zi4b-7 qx-zi4b-7
-afm2tfm Inconsolata-zi4r -T i4-ly1-0.enc ly1-zi4r-0.tfm
-afm2tfm Inconsolata-zi4r -T i4-ly1-1.enc ly1-zi4r-1.tfm
-afm2tfm Inconsolata-zi4r -T i4-ly1-2.enc ly1-zi4r-2.tfm
-afm2tfm Inconsolata-zi4r -T i4-ly1-3.enc ly1-zi4r-3.tfm
-afm2tfm Inconsolata-zi4r -T i4-ly1-4.enc ly1-zi4r-4.tfm
-afm2tfm Inconsolata-zi4r -T i4-ly1-5.enc ly1-zi4r-5.tfm
-afm2tfm Inconsolata-zi4r -T i4-ly1-6.enc ly1-zi4r-6.tfm
-afm2tfm Inconsolata-zi4r -T i4-ly1-7.enc ly1-zi4r-7.tfm
-afm2tfm Inconsolata-zi4b -T i4-ly1-0.enc ly1-zi4b-0.tfm
-afm2tfm Inconsolata-zi4b -T i4-ly1-1.enc ly1-zi4b-1.tfm
-afm2tfm Inconsolata-zi4b -T i4-ly1-2.enc ly1-zi4b-2.tfm
-afm2tfm Inconsolata-zi4b -T i4-ly1-3.enc ly1-zi4b-3.tfm
-afm2tfm Inconsolata-zi4b -T i4-ly1-4.enc ly1-zi4b-4.tfm
-afm2tfm Inconsolata-zi4b -T i4-ly1-5.enc ly1-zi4b-5.tfm
-afm2tfm Inconsolata-zi4b -T i4-ly1-6.enc ly1-zi4b-6.tfm
-afm2tfm Inconsolata-zi4b -T i4-ly1-7.enc ly1-zi4b-7.tfm
-
-afm2tfm Inconsolata-zi4r -T i4-qx-0.enc qx-zi4r-0.tfm
-afm2tfm Inconsolata-zi4r -T i4-qx-1.enc qx-zi4r-1.tfm
-afm2tfm Inconsolata-zi4r -T i4-qx-2.enc qx-zi4r-2.tfm
-afm2tfm Inconsolata-zi4r -T i4-qx-3.enc qx-zi4r-3.tfm
-afm2tfm Inconsolata-zi4r -T i4-qx-4.enc qx-zi4r-4.tfm
-afm2tfm Inconsolata-zi4r -T i4-qx-5.enc qx-zi4r-5.tfm
-afm2tfm Inconsolata-zi4r -T i4-qx-6.enc qx-zi4r-6.tfm
-afm2tfm Inconsolata-zi4r -T i4-qx-7.enc qx-zi4r-7.tfm
-afm2tfm Inconsolata-zi4b -T i4-qx-0.enc qx-zi4b-0.tfm
-afm2tfm Inconsolata-zi4b -T i4-qx-1.enc qx-zi4b-1.tfm
-afm2tfm Inconsolata-zi4b -T i4-qx-2.enc qx-zi4b-2.tfm
-afm2tfm Inconsolata-zi4b -T i4-qx-3.enc qx-zi4b-3.tfm
-afm2tfm Inconsolata-zi4b -T i4-qx-4.enc qx-zi4b-4.tfm
-afm2tfm Inconsolata-zi4b -T i4-qx-5.enc qx-zi4b-5.tfm
-afm2tfm Inconsolata-zi4b -T i4-qx-6.enc qx-zi4b-6.tfm
-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
+afm2tfm Inconsolata-zi4r -T i4-ts1.enc ts1-zi4r
+afm2tfm Inconsolata-zi4b -T i4-ts1.enc ts1-zi4b
# 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-t1-0.enc -v t1-zi4nr-0 t1-zi4nr-0
+afm2tfm InconsolataN-Regular -T i4-t1-1.enc -v t1-zi4nr-1 t1-zi4nr-1
+afm2tfm InconsolataN-Regular -T i4-t1-2.enc -v t1-zi4nr-2 t1-zi4nr-2
+afm2tfm InconsolataN-Regular -T i4-t1-3.enc -v t1-zi4nr-3 t1-zi4nr-3
+afm2tfm InconsolataN-Regular -T i4-t1-4.enc -v t1-zi4nr-4 t1-zi4nr-4
+afm2tfm InconsolataN-Regular -T i4-t1-5.enc -v t1-zi4nr-5 t1-zi4nr-5
+afm2tfm InconsolataN-Regular -T i4-t1-6.enc -v t1-zi4nr-6 t1-zi4nr-6
+afm2tfm InconsolataN-Regular -T i4-t1-7.enc -v t1-zi4nr-7 t1-zi4nr-7
+
+afm2tfm InconsolataN-Bold -T i4-t1-0.enc -v t1-zi4nb-0 t1-zi4nb-0
+afm2tfm InconsolataN-Bold -T i4-t1-1.enc -v t1-zi4nb-1 t1-zi4nb-1
+afm2tfm InconsolataN-Bold -T i4-t1-2.enc -v t1-zi4nb-2 t1-zi4nb-2
+afm2tfm InconsolataN-Bold -T i4-t1-3.enc -v t1-zi4nb-3 t1-zi4nb-3
+afm2tfm InconsolataN-Bold -T i4-t1-4.enc -v t1-zi4nb-4 t1-zi4nb-4
+afm2tfm InconsolataN-Bold -T i4-t1-5.enc -v t1-zi4nb-5 t1-zi4nb-5
+afm2tfm InconsolataN-Bold -T i4-t1-6.enc -v t1-zi4nb-6 t1-zi4nb-6
+afm2tfm InconsolataN-Bold -T i4-t1-7.enc -v t1-zi4nb-7 t1-zi4nb-7
-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-ot1-0.enc -v ot1-zi4nr-0 ot1-zi4nr-0
+afm2tfm InconsolataN-Regular -T i4-ot1-1.enc -v ot1-zi4nr-1 ot1-zi4nr-1
+afm2tfm InconsolataN-Regular -T i4-ot1-2.enc -v ot1-zi4nr-2 ot1-zi4nr-2
+afm2tfm InconsolataN-Regular -T i4-ot1-3.enc -v ot1-zi4nr-3 ot1-zi4nr-3
+afm2tfm InconsolataN-Regular -T i4-ot1-4.enc -v ot1-zi4nr-4 ot1-zi4nr-4
+afm2tfm InconsolataN-Regular -T i4-ot1-5.enc -v ot1-zi4nr-5 ot1-zi4nr-5
+afm2tfm InconsolataN-Regular -T i4-ot1-6.enc -v ot1-zi4nr-6 ot1-zi4nr-6
+afm2tfm InconsolataN-Regular -T i4-ot1-7.enc -v ot1-zi4nr-7 ot1-zi4nr-7
+afm2tfm InconsolataN-Bold -T i4-ot1-0.enc -v ot1-zi4nb-0 ot1-zi4nb-0
+afm2tfm InconsolataN-Bold -T i4-ot1-1.enc -v ot1-zi4nb-1 ot1-zi4nb-1
+afm2tfm InconsolataN-Bold -T i4-ot1-2.enc -v ot1-zi4nb-2 ot1-zi4nb-2
+afm2tfm InconsolataN-Bold -T i4-ot1-3.enc -v ot1-zi4nb-3 ot1-zi4nb-3
+afm2tfm InconsolataN-Bold -T i4-ot1-4.enc -v ot1-zi4nb-4 ot1-zi4nb-4
+afm2tfm InconsolataN-Bold -T i4-ot1-5.enc -v ot1-zi4nb-5 ot1-zi4nb-5
+afm2tfm InconsolataN-Bold -T i4-ot1-6.enc -v ot1-zi4nb-6 ot1-zi4nb-6
+afm2tfm InconsolataN-Bold -T i4-ot1-7.enc -v ot1-zi4nb-7 ot1-zi4nb-7
-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-ly1-0.enc -v ly1-zi4nr-0 ly1-zi4nr-0
+afm2tfm InconsolataN-Regular -T i4-ly1-1.enc -v ly1-zi4nr-1 ly1-zi4nr-1
+afm2tfm InconsolataN-Regular -T i4-ly1-2.enc -v ly1-zi4nr-2 ly1-zi4nr-2
+afm2tfm InconsolataN-Regular -T i4-ly1-3.enc -v ly1-zi4nr-3 ly1-zi4nr-3
+afm2tfm InconsolataN-Regular -T i4-ly1-4.enc -v ly1-zi4nr-4 ly1-zi4nr-4
+afm2tfm InconsolataN-Regular -T i4-ly1-5.enc -v ly1-zi4nr-5 ly1-zi4nr-5
+afm2tfm InconsolataN-Regular -T i4-ly1-6.enc -v ly1-zi4nr-6 ly1-zi4nr-6
+afm2tfm InconsolataN-Regular -T i4-ly1-7.enc -v ly1-zi4nr-7 ly1-zi4nr-7
+afm2tfm InconsolataN-Bold -T i4-ly1-0.enc -v ly1-zi4nb-0 ly1-zi4nb-0
+afm2tfm InconsolataN-Bold -T i4-ly1-1.enc -v ly1-zi4nb-1 ly1-zi4nb-1
+afm2tfm InconsolataN-Bold -T i4-ly1-2.enc -v ly1-zi4nb-2 ly1-zi4nb-2
+afm2tfm InconsolataN-Bold -T i4-ly1-3.enc -v ly1-zi4nb-3 ly1-zi4nb-3
+afm2tfm InconsolataN-Bold -T i4-ly1-4.enc -v ly1-zi4nb-4 ly1-zi4nb-4
+afm2tfm InconsolataN-Bold -T i4-ly1-5.enc -v ly1-zi4nb-5 ly1-zi4nb-5
+afm2tfm InconsolataN-Bold -T i4-ly1-6.enc -v ly1-zi4nb-6 ly1-zi4nb-6
+afm2tfm InconsolataN-Bold -T i4-ly1-7.enc -v ly1-zi4nb-7 ly1-zi4nb-7
-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-qx-0.enc -v qx-zi4nr-0 qx-zi4nr-0
+afm2tfm InconsolataN-Regular -T i4-qx-1.enc -v qx-zi4nr-1 qx-zi4nr-1
+afm2tfm InconsolataN-Regular -T i4-qx-2.enc -v qx-zi4nr-2 qx-zi4nr-2
+afm2tfm InconsolataN-Regular -T i4-qx-3.enc -v qx-zi4nr-3 qx-zi4nr-3
+afm2tfm InconsolataN-Regular -T i4-qx-4.enc -v qx-zi4nr-4 qx-zi4nr-4
+afm2tfm InconsolataN-Regular -T i4-qx-5.enc -v qx-zi4nr-5 qx-zi4nr-5
+afm2tfm InconsolataN-Regular -T i4-qx-6.enc -v qx-zi4nr-6 qx-zi4nr-6
+afm2tfm InconsolataN-Regular -T i4-qx-7.enc -v qx-zi4nr-7 qx-zi4nr-7
+afm2tfm InconsolataN-Bold -T i4-qx-0.enc -v qx-zi4nb-0 qx-zi4nb-0
+afm2tfm InconsolataN-Bold -T i4-qx-1.enc -v qx-zi4nb-1 qx-zi4nb-1
+afm2tfm InconsolataN-Bold -T i4-qx-2.enc -v qx-zi4nb-2 qx-zi4nb-2
+afm2tfm InconsolataN-Bold -T i4-qx-3.enc -v qx-zi4nb-3 qx-zi4nb-3
+afm2tfm InconsolataN-Bold -T i4-qx-4.enc -v qx-zi4nb-4 qx-zi4nb-4
+afm2tfm InconsolataN-Bold -T i4-qx-5.enc -v qx-zi4nb-5 qx-zi4nb-5
+afm2tfm InconsolataN-Bold -T i4-qx-6.enc -v qx-zi4nb-6 qx-zi4nb-6
+afm2tfm InconsolataN-Bold -T i4-qx-7.enc -v qx-zi4nb-7 qx-zi4nb-7
-afm2tfm InconsolataN-Regular -T i4-ts1.enc ts1-zi4nr.tfm
-afm2tfm InconsolataN-Bold -T i4-ts1.enc ts1-zi4nb.tfm
+afm2tfm InconsolataN-Regular -T i4-ts1.enc ts1-zi4nr
+afm2tfm InconsolataN-Bold -T i4-ts1.enc ts1-zi4nb
diff --git a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.pdf b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.pdf
index 97f161dc5b2..6d89ad1b0cf 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 255004ecd55..b21bd08d670 100644
--- a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.tex
+++ b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata-doc.tex
@@ -4,16 +4,16 @@
\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[osf,sups]{baskervillef}
+% inconsolata text
+\usepackage[nott]{inconsolata}
+\let\ttdefault\rmdefault
\usepackage[T1]{fontenc}
%\usepackage[scaled=.83]{beramono}
-\usepackage[varqu]{zi4}
+%\usepackage[varqu]{zi4}
%\usepackage{amsmath,amsthm}
-\usepackage[baskerville]{newtxmath}
+\usepackage{newtxmath}
\usepackage{textcomp}
%\renewcommand\rmdefault{LinuxLibertineT-OsF}
%\usepackage[supstfm=libertinesups,%
@@ -30,36 +30,38 @@
\begin{document}
%\show\textquotesingle
\maketitle
-The package provides updated PostScript and Opentype versions of Raph Levien's fine sans serif typewriter font
+The package provides updated \emph{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. 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{inconsolata}| (or \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 the line \verb|\usepackage{inconsolata}| (or, equivalently, \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 is no longer distributed as part of \TeX Live.)
-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.
+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 companion 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} (or \texttt{scale=x}) allows you to scale all typewriter text and verbatim text by the factor \texttt{x}.
+\item With option {\bf nott}, the effect is to make {\tt zi4} the default Roman font rather than the default Typewriter font, turning on hyphenation and variable spacing. If this option is specified, it would be a good idea to choose a serifed Typewriter for the sake of contrast. As there are neither italics nor small caps available, you will need to find another way to emphasize small portions of text, and bold would seem to be the easiest to set.
+(This document is typeset using this option.)
+\item The option \textbf{scaled=x} (or \textbf{scale=x}) allows you to scale all typewriter text and verbatim text by the factor \textbf{x}.
\item
-The default zero in \texttt{zi4} is now slashed. The unslashed zero may be specified with the option \texttt{var0}.
+The default zero in \textbf{zi4} is now slashed. The unslashed zero may be specified with the option \textbf{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
+\item The main package loads the \textbf{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 \textbf{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
+Option \textbf{hyphenate} allows automatic hyphenation to occur, which may be useful if your usage is simply to have blocks of text in quasi-typewritten form, though with variable word-spacing.
+\item option \textbf{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 \textbf{spacing}, \textbf{stretch}, {\tt shrink} and {\tt extrasp}. These will override any values changed by the option \textbf{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,
+When used in ordinary typewriter mode (i.e., 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}
@@ -70,9 +72,29 @@ renders (with option \texttt{varqu}) as \texttt{`xy' " \textasciigrave \textquot
renders as you would expect it in code samples:
\verb|`xy' "|
+\textbf{TeX Ligatures:} As of version {\tt 1.12}, text mode follows the usual TeX ligature rules with the exception of the f-ligatures, at least in T1 and LY1. Behavior on OT1 and QX encodings is limited to a subset of those rules. So, for example, in T1 and LY1:
+\begin{center}
+ \begin{tabular}{@{} cc @{}}
+ \toprule
+ Input & Output \\
+ \midrule
+ \verb|\texttt{a-b}| & a-b \\ %\texttt{a-b} \\
+ \verb|\texttt{a--b}| & a--b\\ %\texttt{a--b} \\
+ \verb|\texttt{a---b}| & a--b \\ %\texttt{a---b} \\
+ \verb|\texttt{<<a>>}| & <<a>> \\ %\texttt{<<a>>} \\
+ \verb|\texttt{?`}| & ?` \\ %\texttt{?`} \\
+ \verb|\texttt{!`}| & !` \\ %\texttt{!`} \\
+ \verb|\texttt{``}| & `` \\ %\texttt{``} \\
+ \verb|\texttt{''}| & '' \\ %\texttt{''} \\
+ \bottomrule
+ \end{tabular}
+\end{center}
+
+Obviously, the distinctions between {\tt hyphen}, {\tt endash} and {\tt emdash} are subtle, as is to be expected given that the glyphs are of fixed width.
+
\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 others 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{inconsolata}/\texttt{zi4}.
\section*{Effects of the options varqu, noupquote}
@@ -114,7 +136,7 @@ specifying the option \texttt{varqu}, not specifying \texttt{noupquote}, and avo
\DeclareTextSymbol{\textquotesingle}{TS1}{39}
\usepackage{upquote}
\end{verbatim}
-which is built-in to the \texttt{zi4.sty} code and need not be repeated.
+which is built-in to the \texttt{inconsolata.sty} (\textsc{aka} \texttt{zi4.sty}) code and need not be repeated.
\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{inconsolata} % normal width, slashed zero, curly quotes, default l