From a196d8f7ad75be358f67b4b929d56c7ff30f3642 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Feb 2024 21:21:49 +0100 Subject: use font InconsolataN (not Inconsolata), and fix use it also for web; update font notes --- _quarto.yml | 2 +- fonts/inconsolata/README | 133 +++++++++++++++++++++ fonts/inconsolata/opentype/InconsolataN-Bold.otf | Bin 0 -> 28464 bytes .../inconsolata/opentype/InconsolataN-Regular.otf | Bin 0 -> 26540 bytes fonts/inconsolata/opentype/Inconsolatazi4-Bold.otf | Bin 0 -> 47780 bytes .../opentype/Inconsolatazi4-Regular.otf | Bin 0 -> 37420 bytes fonts/inconsolata/woff2/InconsolataN-Bold.woff2 | Bin 0 -> 18432 bytes fonts/inconsolata/woff2/InconsolataN-Regular.woff2 | Bin 0 -> 18320 bytes fonts/inconsolata/woff2/Inconsolatazi4-Bold.woff2 | Bin 0 -> 25920 bytes .../inconsolata/woff2/Inconsolatazi4-Regular.woff2 | Bin 0 -> 22644 bytes fonts/index.md | 15 ++- styles/main.scss | 3 + 12 files changed, 151 insertions(+), 2 deletions(-) create mode 100644 fonts/inconsolata/README create mode 100644 fonts/inconsolata/opentype/InconsolataN-Bold.otf create mode 100644 fonts/inconsolata/opentype/InconsolataN-Regular.otf create mode 100644 fonts/inconsolata/opentype/Inconsolatazi4-Bold.otf create mode 100644 fonts/inconsolata/opentype/Inconsolatazi4-Regular.otf create mode 100644 fonts/inconsolata/woff2/InconsolataN-Bold.woff2 create mode 100644 fonts/inconsolata/woff2/InconsolataN-Regular.woff2 create mode 100644 fonts/inconsolata/woff2/Inconsolatazi4-Bold.woff2 create mode 100644 fonts/inconsolata/woff2/Inconsolatazi4-Regular.woff2 diff --git a/_quarto.yml b/_quarto.yml index e822670..f35ae9f 100644 --- a/_quarto.yml +++ b/_quarto.yml @@ -32,7 +32,7 @@ mainfontoptions: sansfont: Cabin sansfontoptions: - Scale=MatchLowercase -monofont: Inconsolata +monofont: InconsolataN monofontoptions: - Scale=MatchLowercase diff --git a/fonts/inconsolata/README b/fonts/inconsolata/README new file mode 100644 index 0000000..5881839 --- /dev/null +++ b/fonts/inconsolata/README @@ -0,0 +1,133 @@ +The PostScript fonts in this distribution were derived from Inconsolata-Regular.ttf, v.1.013, and Inconsolata-Bold.ttf, v.1.014, downloaded from googlefonts.com. Both were converted to PostScript format and nine glyphs were added to each, providing upright single and double quotes, a more shapely lower-case l series, and horizontal arrows. As Inconsolata-Regular.ttf is offered under the SIL font licence, so is the derived font Inconsolatazi4-Regular.pfb. Inconsolata-Bold.ttf was released under the Apache 2 licence, and so therefore is the derived font Inconsolatazi4-Bold.pfb. + +The TeX font metrics, virtual fonts and font definition files for Inconsolata, +i.e., the other files in the archive Inconsolata.zip, may be distributed and/or modified +under the conditions of the LaTeX Project Public License, either version 1.3 of +this license or (at your option) any later version. The latest version of this +license is in http://www.latex-project.org/lppl.txt and version 1.3 or later is +part of all distributions of LaTeX version 2003/12/01 or later. Those files and +LaTeX support file zi4.sty are + + Copyright (c) 2013--2019 Michael Sharpe + +Files provided "as is", with no warranties. + +Current version: 1.121 + +Changes in version 1.121 +Corrected an error in i4-ot1-0.enc. (Thanks, Takuo Watanabe.) + +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.) + +Changes in version 1.113 +Corrected three glyphs that had overlapping strokes. + +Changes in version 1.112 +Corrected a bug in sty file handling of scale[d] option. (Thanks Isaac Sánchez Barrera.) + +Changes in version 1.111 +Corrected internal filename for zi4.sty. + +Changes in version 1.11 +1. Added narrow versions of the Inconsolata fonts, reducing widths by 10%. The narrow versions may be better for printing code. +2. Added a number of options to allow control over hyphenation and word spacing. +3. Some small changes to glyph shapes. +4. Added documentation for the above. + +Changes in version 1.10 +Fixed names of Stylistic Sets and added to documentation. + +Changes in version 1.09 +Restored the ss01--ss03 lookup tables that had gone missing. + +Changes in version 1.08 +Changed "euro" to "Euro" in encoding files, regenerated tfms and map file. + +Changes in version 1.071 +Modified some metadata in the font files. + +Changes in version 1.07 +1. Changed glyph name zdot to zdotaccent. +2. Corrected unicode values for Zcaron and zcaron. + +Changes in version 1.06 +Changed glyph name asciigrave.Var to grave.Var, rightarrow.Var to rightarrow, leftarrow.Var to leftarrow, and modified the encoding files accordingly. The result appears to be that the variant forms now not only look correct when rendered, but copy properly from pdf to text. + +Changes in version 1.05 +(1) Modifications to all fd files to remove error that became visible only when used without the sty file. +(2) Added a brief .fontspec file so that, when using the fonts with fontspec, you can write +\fontspec{inconsolata} +to load the basic fontnames. + +Changes in version 1.04 +Modified all fonts so that glyph names of the variant forms permit correct copying from pdf to ASCII. + +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.) + +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: + +Mac OS X: To install, open a Terminal window and cd to inside the downloaded TDS folder. + +Method A (recommended): type + +sudo mkdir -p /usr/local/texlive/texmf-local/web2c +sudo cp -Rfp * /usr/local/texlive/texmf-local +sudo echo Map zi4.map >> /usr/local/texlive/texmf-local/web2c/updmap.cfg +sudo mktexlsr +sudo -H updmap-sys + +Method B: If you insist on making your font installations in your home folder, potentially making your personal installation become out of sync with updates to TeXLive, use instead + +(i) if you checked Update for All Users in TeXLive utility + +cp -Rfp * ~/Library/texmf + +then + +updmap --enable Map=zi4.map + +(ii) otherwise + +cp -Rfp * ~/Library/texmf + +then + +sudo updmap-sys --enable Map=zi4.map + +Linux: Very similar to Mac OS X. + +MikTeX: Copy the Inconsolata-zi4.tds.zip to the root of the folder you use for personal additions to the TeX trees, open a command window, chdir to that folder, and type + +unzip Inconsolata-zi4.tds +initexmf --update-fndb +initexmf --edit-config-file updmap + +The latter command should open updmap.cfg in your default editor, commonly Notepad. Add the line + +Map zi4.map + +to updmap.cfg, save and close. Then, in the command window, type + +initexmf --mkmaps + +You can ignore error messages that may occur here. This should result in a properly enabled garamondx. + +Please send comments and bug reports or suggestions for improvement to + +msharpe at ucsd dot edu \ No newline at end of file diff --git a/fonts/inconsolata/opentype/InconsolataN-Bold.otf b/fonts/inconsolata/opentype/InconsolataN-Bold.otf new file mode 100644 index 0000000..1cfd9d1 Binary files /dev/null and b/fonts/inconsolata/opentype/InconsolataN-Bold.otf differ diff --git a/fonts/inconsolata/opentype/InconsolataN-Regular.otf b/fonts/inconsolata/opentype/InconsolataN-Regular.otf new file mode 100644 index 0000000..ef52fe3 Binary files /dev/null and b/fonts/inconsolata/opentype/InconsolataN-Regular.otf differ diff --git a/fonts/inconsolata/opentype/Inconsolatazi4-Bold.otf b/fonts/inconsolata/opentype/Inconsolatazi4-Bold.otf new file mode 100644 index 0000000..065ab61 Binary files /dev/null and b/fonts/inconsolata/opentype/Inconsolatazi4-Bold.otf differ diff --git a/fonts/inconsolata/opentype/Inconsolatazi4-Regular.otf b/fonts/inconsolata/opentype/Inconsolatazi4-Regular.otf new file mode 100644 index 0000000..a735537 Binary files /dev/null and b/fonts/inconsolata/opentype/Inconsolatazi4-Regular.otf differ diff --git a/fonts/inconsolata/woff2/InconsolataN-Bold.woff2 b/fonts/inconsolata/woff2/InconsolataN-Bold.woff2 new file mode 100644 index 0000000..a3165e2 Binary files /dev/null and b/fonts/inconsolata/woff2/InconsolataN-Bold.woff2 differ diff --git a/fonts/inconsolata/woff2/InconsolataN-Regular.woff2 b/fonts/inconsolata/woff2/InconsolataN-Regular.woff2 new file mode 100644 index 0000000..026df8d Binary files /dev/null and b/fonts/inconsolata/woff2/InconsolataN-Regular.woff2 differ diff --git a/fonts/inconsolata/woff2/Inconsolatazi4-Bold.woff2 b/fonts/inconsolata/woff2/Inconsolatazi4-Bold.woff2 new file mode 100644 index 0000000..4487b51 Binary files /dev/null and b/fonts/inconsolata/woff2/Inconsolatazi4-Bold.woff2 differ diff --git a/fonts/inconsolata/woff2/Inconsolatazi4-Regular.woff2 b/fonts/inconsolata/woff2/Inconsolatazi4-Regular.woff2 new file mode 100644 index 0000000..8b252fa Binary files /dev/null and b/fonts/inconsolata/woff2/Inconsolatazi4-Regular.woff2 differ diff --git a/fonts/index.md b/fonts/index.md index 6cd4f38..b964e8c 100644 --- a/fonts/index.md +++ b/fonts/index.md @@ -1,5 +1,8 @@ Skriftfamilien [ETbb](etbb/) er designet -af [Michael Sharpe](https://ctan.org/pkg/etbb), +af [Dmitry Krasny](https://edwardtufte.github.io/et-book/) +med modifikationer +af [Daniel Benjamin Miller](https://github.com/dbenjaminmiller/xetbook) +og [Michael Sharpe](https://ctan.org/pkg/etbb), baseret på [Bembo](https://en.wikipedia.org/wiki/Bembo). Yderligere information om ETbb kan findes (på engelsk) i [Luc Devroyes designnoter](http://luc.devroye.org/fonts-102567.html) @@ -12,3 +15,13 @@ inspireret af Gill Sans. Yderligere information om Cabin kan findes (på engelsk) i [Luc Devroyes designnoter](http://luc.devroye.org/fonts-53317.html) og [identifont](http://www.identifont.com/differences?first=Cabin&second=Gill+Sans) + +Skriftfamilien [Inconsolata](inconsolata/) er designet +af [Raph Levien](https://levien.com/type/myfonts/inconsolata.html) +med modifikationer +af [Michael Sharpe](http://ftp.jaist.ac.jp/pub/CTAN/fonts/inconsolata/), +inspireret af Avenir and Franklin Gothic. +Yderligere information om Cabin kan findes (på engelsk) +på [Wikipedia](https://en.wikipedia.org/wiki/Inconsolata) +i [Luc Devroyes designnoter](http://luc.devroye.org/fonts-53317.html) +og [identifont](http://www.identifont.com/differences?first=Cabin&second=Gill+Sans) diff --git a/styles/main.scss b/styles/main.scss index 15b340b..f0c0279 100644 --- a/styles/main.scss +++ b/styles/main.scss @@ -35,3 +35,6 @@ $input-btn-font-family: $font-family-sans-serif; @include font-face(Cabin, normal, "400 700", cabin, "Cabin-Regular-VF"); @include font-face(Cabin, italic, "400 700", cabin, "Cabin-Italic-VF"); + +@include font-face(InconsolataN, normal, 400, inconsolata, InconsolataN-Regular); +@include font-face(InconsolataN, normal, 700, inconsolata, InconsolataN-Bold); -- cgit v1.2.3