From 6f856ec2d9711419027c4e97c51e2bc0bf7871fd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 30 Nov 2009 01:12:32 +0000 Subject: inconsolata 2009/11/28 git-svn-id: svn://tug.org/texlive/trunk@16239 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/fonts/inconsolata/GNUmakefile | 8 ++++-- Master/texmf-dist/doc/fonts/inconsolata/README | 6 ++--- .../texmf-dist/doc/fonts/inconsolata/fonttable.pdf | Bin 44420 -> 44425 bytes .../doc/fonts/inconsolata/inconsolata.pdf | Bin 186654 -> 284997 bytes .../doc/fonts/inconsolata/inconsolata.tex | 28 ++++++++++----------- Master/texmf-dist/doc/fonts/inconsolata/test.pdf | Bin 131371 -> 170037 bytes .../tfm/public/inconsolata/ec-inconsolata.tfm | Bin 1312 -> 1312 bytes .../tfm/public/inconsolata/ei1-inconsolata.tfm | Bin 240 -> 240 bytes .../tfm/public/inconsolata/qx-inconsolata.tfm | Bin 1268 -> 1268 bytes .../tfm/public/inconsolata/rm-inconsolata.tfm | Bin 912 -> 912 bytes .../public/inconsolata/texnansi-inconsolata.tfm | Bin 1312 -> 1312 bytes .../tfm/public/inconsolata/ts1-inconsolata.tfm | Bin 1252 -> 1252 bytes .../fonts/type1/public/inconsolata/Inconsolata.pfb | Bin 34963 -> 69731 bytes .../tex/latex/inconsolata/inconsolata.sty | 2 +- Master/tlpkg/libexec/ctan2tds | 7 ++++-- 15 files changed, 29 insertions(+), 22 deletions(-) diff --git a/Master/texmf-dist/doc/fonts/inconsolata/GNUmakefile b/Master/texmf-dist/doc/fonts/inconsolata/GNUmakefile index 471df23c8db..1e397faa94b 100644 --- a/Master/texmf-dist/doc/fonts/inconsolata/GNUmakefile +++ b/Master/texmf-dist/doc/fonts/inconsolata/GNUmakefile @@ -1,7 +1,7 @@ # Copyright 2009 Karl Berry. # You may freely use, modify and/or distribute this file. -default: fonttable.pdf inconsolata.pdf +default: 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. @@ -26,11 +26,15 @@ test.pdf: test.tex \ pdflatex '\nonstopmode\input $<' || { rm -f $@; exit 1; } +# another test document, checking stretch & shrink being zero. +test-spacing.pdf: test-spacing.tex ec-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 = --no-virtual --no-encoding +otftotfm_opt = --fixed-width --no-virtual --no-encoding ec-inconsolata.tfm: Inconsolata.otf Inconsolata.pfb fi4-ec.enc $(otftotfm) -e fi4-ec.enc $< `basename $@ .tfm` diff --git a/Master/texmf-dist/doc/fonts/inconsolata/README b/Master/texmf-dist/doc/fonts/inconsolata/README index c44cad3c814..1681b80bd69 100644 --- a/Master/texmf-dist/doc/fonts/inconsolata/README +++ b/Master/texmf-dist/doc/fonts/inconsolata/README @@ -13,9 +13,9 @@ supported, with some missing glyphs (especially in TS1). The fi4 identification string used in some files (and macros) is the fontname prefix and LaTeX family name. -The small documentation is in inconsolata.{tex,pdf}. The fonttable.pdf -file shows all the glyphs in the font; it was created with t1testpage. -The test.{tex,pdf} files show typical usage. +The documentation is in inconsolata.{tex,pdf}. The fonttable.pdf file +shows all the glyphs in the font; it was created with t1testpage. The +test.{tex,pdf} files show typical usage. Best to send bug reports and suggestions to Karl for triage, at least; Raph was not involved with anything TeX-specific. diff --git a/Master/texmf-dist/doc/fonts/inconsolata/fonttable.pdf b/Master/texmf-dist/doc/fonts/inconsolata/fonttable.pdf index 9e38c51ade1..19ad1d4e567 100644 Binary files a/Master/texmf-dist/doc/fonts/inconsolata/fonttable.pdf and b/Master/texmf-dist/doc/fonts/inconsolata/fonttable.pdf differ diff --git a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata.pdf b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata.pdf index 2d63cd98d68..7acbf3342cf 100644 Binary files a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata.pdf and b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata.pdf differ diff --git a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata.tex b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata.tex index c31c5702409..211b815126a 100644 --- a/Master/texmf-dist/doc/fonts/inconsolata/inconsolata.tex +++ b/Master/texmf-dist/doc/fonts/inconsolata/inconsolata.tex @@ -26,9 +26,9 @@ document.) The location on CTAN for this packaging of the font with Raph's own web page is \url{http://levien.com/type/myfonts/inconsolata.html}. Raph discussed -its design principles and his working methods in an interview, which is -available online at \url{http://tug.org/interviews}. Its development is -ongoing. +Inconsolata's design principles and his working methods in an interview, +which is available online at \url{http://tug.org/interviews}. Its +development is ongoing. Please send questions and suggestions about the \TeX\ support to Karl (address above), not Raph. Raph only distributes the OpenType and @@ -63,11 +63,11 @@ To use one or another encoding, give the \LaTeX\ name to the \usepackage{inconsolata} \end{verbatim} -The \texttt{EI1} encoding deserves a few words of explanation. Raph -designed various glyphs which do not appear in any of the usual \TeX\ -encodings above; \texttt{EI1} provides access to these. There are no -named commands for them, just use \verb|\char| and enjoy. For the glyph -names, see the file \url{fi4-ei1.enc}. +About the \texttt{EI1} encoding: Raph designed various glyphs which do +not appear in any of the usual \TeX\ encodings above; \texttt{EI1} +provides access to these. There are no named commands for them, just +use \verb|\char| and enjoy. For the glyph names, see the file +\url{fi4-ei1.enc}. \section{\LaTeX\ usage} @@ -93,7 +93,7 @@ As seen here, the \LaTeX\ family name for Inconsolata is \texttt{fi4}. The other package option is \texttt{[scaled=R]}, which scales the font according to $R$; the default is 1.0 for no scaling (this document -itself does not specify any scaling). Here's an example: +does not specify any scaling). Here's an example: \begin{verbatim} \usepackage[scaled=.95]{inconsolata} @@ -121,9 +121,9 @@ packages for plain, such as plnfss \section{X usage} -If you want to use Inconsolata in X, for example in terminal windows, -and your system does not provide a premade package for it, it is -straightforward to set up yourself: +If you want to use Inconsolata in the X Window System, for example in +terminal windows, and your system does not provide a premade package for +it, it is straightforward to set up yourself: \begin{verbatim} cp Inconsolata.otf /some/dir @@ -138,8 +138,8 @@ xlsfonts | grep inconsolata # see if it's there For reasons I don't want to go into here, the \verb|\j| command does not work with the LY1 encoding. Perhaps it will be fixed one day. -Meanwhile, the glyph itself is available at the standard position (in -LY1) of \texttt{0x11} in \texttt{texnansi-inconsolata.tfm}. +Meanwhile, the glyph itself is available at the standard position in +LY1 of \texttt{0x11} in \texttt{texnansi-inconsolata.tfm}. \section{Font tables} diff --git a/Master/texmf-dist/doc/fonts/inconsolata/test.pdf b/Master/texmf-dist/doc/fonts/inconsolata/test.pdf index c31d6b8030e..ac1d5ab6a48 100644 Binary files a/Master/texmf-dist/doc/fonts/inconsolata/test.pdf and b/Master/texmf-dist/doc/fonts/inconsolata/test.pdf differ diff --git a/Master/texmf-dist/fonts/tfm/public/inconsolata/ec-inconsolata.tfm b/Master/texmf-dist/fonts/tfm/public/inconsolata/ec-inconsolata.tfm index 81539d04cb6..6adf53c5dd4 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/inconsolata/ec-inconsolata.tfm and b/Master/texmf-dist/fonts/tfm/public/inconsolata/ec-inconsolata.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/inconsolata/ei1-inconsolata.tfm b/Master/texmf-dist/fonts/tfm/public/inconsolata/ei1-inconsolata.tfm index 15831423d80..37b20d47a2b 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/inconsolata/ei1-inconsolata.tfm and b/Master/texmf-dist/fonts/tfm/public/inconsolata/ei1-inconsolata.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/inconsolata/qx-inconsolata.tfm b/Master/texmf-dist/fonts/tfm/public/inconsolata/qx-inconsolata.tfm index fcd04f45555..5e8539ce920 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/inconsolata/qx-inconsolata.tfm and b/Master/texmf-dist/fonts/tfm/public/inconsolata/qx-inconsolata.tfm differ 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 8f83039a749..7db453fde01 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/inconsolata/rm-inconsolata.tfm and b/Master/texmf-dist/fonts/tfm/public/inconsolata/rm-inconsolata.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/inconsolata/texnansi-inconsolata.tfm b/Master/texmf-dist/fonts/tfm/public/inconsolata/texnansi-inconsolata.tfm index 4ed2b0edd78..8a56ccbca84 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/inconsolata/texnansi-inconsolata.tfm and b/Master/texmf-dist/fonts/tfm/public/inconsolata/texnansi-inconsolata.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/inconsolata/ts1-inconsolata.tfm b/Master/texmf-dist/fonts/tfm/public/inconsolata/ts1-inconsolata.tfm index 67efedae947..a9baef44c44 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/inconsolata/ts1-inconsolata.tfm and b/Master/texmf-dist/fonts/tfm/public/inconsolata/ts1-inconsolata.tfm differ diff --git a/Master/texmf-dist/fonts/type1/public/inconsolata/Inconsolata.pfb b/Master/texmf-dist/fonts/type1/public/inconsolata/Inconsolata.pfb index 40f35a12c25..8e3390345db 100644 Binary files a/Master/texmf-dist/fonts/type1/public/inconsolata/Inconsolata.pfb and b/Master/texmf-dist/fonts/type1/public/inconsolata/Inconsolata.pfb differ diff --git a/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty b/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty index daac879890c..25443625b07 100644 --- a/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty +++ b/Master/texmf-dist/tex/latex/inconsolata/inconsolata.sty @@ -2,7 +2,7 @@ % You may freely use, modify and/or distribute this file. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{inconsolata}[2009/06/07 Inconsolata] +\ProvidesPackage{inconsolata}[2009/11/28 Inconsolata] % Without this, \texteuro and the like simply fail, so we may as well % always include it. diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 1bc0b8f05ad..88bcaeb25e7 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -442,6 +442,7 @@ $Master = "$mydir/../.."; 'pictex', "&MAKEpictex", 'pigpen', "&MAKEflatten", 'pinlabel', "&MAKEnosymlinks", + 'pitthesis', "die 'skipping, license noinfo", 'pl', "die 'skipping, not ready, cf. cc-pl, sorry", 'pl-qx', "&MAKEplqx", 'pointRuler', "die 'skipping, requires compilation'", @@ -562,7 +563,8 @@ $Master = "$mydir/../.."; 'texdraw', "&MAKEtexdraw", 'texpower', "&MAKEnosymlinks", 'texsis', "&MAKEtexsis", - 'thaifonts-scalable', "die 'Thai, fontforge format only, skip'", + 'thaifonts-scalable', "die 'skipping, Thai, fontforge format only'", + 'thesis-titlepage-fhAC',"die 'skipping, use ...fhac'", 'thsmc', "die 'skipping, requires nonfree font'", 'ticket', "&MAKEflatten", 'tipa', "&MAKEtipa", @@ -906,7 +908,8 @@ $standardtex='\.(cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$'; 'epslatex-fr', 'NULL', 'esint-type1', 'esint.tex', 'europecv', 'EuropeFlag|europasslogo|\.cls|\.def', - 'fancytooltips','fancytipmark\..*|' . $standardtex, + 'fancytooltips', 'fancytipmark\..*|' . $standardtex, + 'thesis-titlepage-fhac', 'LOGO.*|' . $standardtex, 'figflow', '\.tex', 'fltpoint', '\.sty|\.tex', 'font-change', 'font.*\.tex', -- cgit v1.2.3