Skip to content

Commit

Permalink
Merge pull request #39 from googlefonts/autofix
Browse files Browse the repository at this point in the history
Major development of 9-axis masters
  • Loading branch information
raphlinus authored Dec 12, 2019
2 parents 88ce425 + 06cae59 commit d7269b5
Show file tree
Hide file tree
Showing 156 changed files with 245,776 additions and 126,489 deletions.
17 changes: 10 additions & 7 deletions FONTLOG.txt
Original file line number Diff line number Diff line change
@@ -1,28 +1,31 @@
FONTLOG for the Inconsolata font

This file provides detailed information on the Inconsolata Bold
This file provides detailed information on the Inconsolata
font Software.

This information should be distributed along with the
Inconsolata fonts and any derivative works.

Basic Font Information

Inconsolata Bold is a Unicode typeface family that supports
Inconsolata is a Unicode typeface family that supports
languages that use the Latin script and its variants, and
could be expanded to support other scripts.

It is a variable font that supports widths from 50 to 200
and weights from 200 to 900.

More specifically, this release supports the following Unicode
ranges: Latin-1

There are three source files:
1. sources/legacy/Inconsolata-Regular.glyphs (Legacy version ported to Glyphs)
2. sources/legacy/Inconsolata Bold-OTF.vfb (Merged contours)
3. sources/legacy/Inconsolata Bold-TTF.vfb (TTF countours)
4. sources/Inconsolata.glyphs (latest Glyphs file with two masters)
There is one source file:
1. sources/Inconsolata-vf.glyphs (latest Glyphs file with 9 masters)

ChangeLog

11 December 2019 (Raph Levien) Inconsolata v 3.000
- Expand width and weight range, create variable font

7 April 2017 (Alexei Vanyashin) Inconsolata v 2.002
Restored vertical space to original amount between bars in equal signs(=). Fixes issue #8 https://github.com/cyrealtype/Inconsolata/issues/8

Expand Down
54 changes: 54 additions & 0 deletions METADATA.pb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,24 @@ designer: "Raph Levien"
license: "OFL"
category: "MONOSPACE"
date_added: "2010-02-19"
fonts {
name: "Inconsolata"
style: "normal"
weight: 200
filename: "Inconsolata-ExtraLight.ttf"
post_script_name: "Inconsolata-ExtraLight"
full_name: "Inconsolata ExtraLight"
copyright: "Copyright 2006 The Inconsolata Project Authors"
}
fonts {
name: "Inconsolata"
style: "normal"
weight: 300
filename: "Inconsolata-Light.ttf"
post_script_name: "Inconsolata-Light"
full_name: "Inconsolata Light"
copyright: "Copyright 2006 The Inconsolata Project Authors"
}
fonts {
name: "Inconsolata"
style: "normal"
Expand All @@ -12,6 +30,24 @@ fonts {
full_name: "Inconsolata"
copyright: "Copyright 2006 The Inconsolata Project Authors"
}
fonts {
name: "Inconsolata"
style: "normal"
weight: 500
filename: "Inconsolata-Medium.ttf"
post_script_name: "Inconsolata-Medium"
full_name: "Inconsolata Medium"
copyright: "Copyright 2006 The Inconsolata Project Authors"
}
fonts {
name: "Inconsolata"
style: "normal"
weight: 600
filename: "Inconsolata-SemiBold.ttf"
post_script_name: "Inconsolata-SemiBold"
full_name: "Inconsolata SemiBold"
copyright: "Copyright 2006 The Inconsolata Project Authors"
}
fonts {
name: "Inconsolata"
style: "normal"
Expand All @@ -21,6 +57,24 @@ fonts {
full_name: "Inconsolata Bold"
copyright: "Copyright 2006 The Inconsolata Project Authors"
}
fonts {
name: "Inconsolata"
style: "normal"
weight: 800
filename: "Inconsolata-ExtraBold.ttf"
post_script_name: "Inconsolata-ExtraBold"
full_name: "Inconsolata ExtraBold"
copyright: "Copyright 2006 The Inconsolata Project Authors"
}
fonts {
name: "Inconsolata"
style: "normal"
weight: 900
filename: "Inconsolata-Black.ttf"
post_script_name: "Inconsolata-Black"
full_name: "Inconsolata Black"
copyright: "Copyright 2006 The Inconsolata Project Authors"
}
subsets: "latin"
subsets: "latin-ext"
subsets: "menu"
59 changes: 55 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ They are available in two families.
```
- **"Ligconsolata"** exposes the ligatures as `liga`. These are enabled by default. This is the family you should use in your text editor.

Note: the Ligconsolata variant has not yet been upgraded to version 3.000, as we're prioritizing the non-ligature variants.

## Changelog v.3.000

Upgrade to 2-axis variable font family, with widths from 50 to 200, and weights from 200 to 900.

## Changelog v.2.013

- Removed ligatures for `fi` and `fl`.
Expand Down Expand Up @@ -58,6 +64,8 @@ This license is copied below, and is also available with a FAQ at:

## Inconsolata Build Instructions

Inconsolata fonts can be built using either export from Glyphs or using [fontmake]. The font files committed to this repo are done using fontmake.

### Source Files

Inconsolata source files are available in `.glyphs` format located in the `/sources` directory.
Expand All @@ -78,7 +86,45 @@ Inconsolata source files are available in `.glyphs` format located in the `/sour
6. Update the _Rename Glyphs_ value for "Ligconsolata Bold".
4. Export the font, as explained below.

### Font Export options
### Exporting a variable font using fontmake

It's possible to export the project as a single variable font. It's just a bit tricky, because the font uses components with varying 2x2 components, triggering a [bug](https://github.com/googlefonts/fontmake/issues/595) which is present in both [fontmake] and Glyphs export. Thus, there's an inco_fix.py script in the sources directory that detects this case and decomposes just those components. Run that script before exporting. The script also decomposes corner components, which makes the resulting `glyphs` file suitable for fontmake export as well (fontmake currently has no support for corner components).

You can copy the script into the Scripts folder for Glyphs, which will make it available in the Script menu, or you can just copy it into the Macro Panel.

After running the script, the following fontmake invocation will generate a variable font:

```
fontmake -g sources/Inconsolata-vf.glyphs -o variable
```

This is the version in the fonts/ directory, as it is slightly smaller than the version generated by Glyphs.

We do not check the *result* of the inco_fix script into version control, as we want to preserve editability. It's entirely possible that a future version of fontmake (or Glyphs itself) will be able to handle the source file without running a script.

### Exporting instances using fontmake

The source file contains 15 instances, including all weights of the normal (100) width, and also all masters. This is a reasonable complement for working on the font. Run the gen_instances.py script to generate a total of 72 instances; all combinations of the weights from 200 to 900, and widths 50, 70, 80, 90, 110, 120, 150, and 200.

There are two other instances for Ligconsolata, and fontmake will attempt to generate those, but the "Rename Glyphs" custom parameter doesn't seem to be respected by fontmake, so these won't have ligatures enabled. Use the Glyphs export instead (detailed below).

Then run this command to generate OTF:

```
fontmake -g sources/Inconsolata-vf.glyphs -i -o otf
```

And this command to generate autohinted TTF:

```
fontmake -g sources/Inconsolata-vf.glyphs -i -o ttf -a
```

These are the versions in the fonts/ directory.

### Font Export options (from Glyphs)

This is the preferred way to generate the Ligconsolata instances, but

* TTF and OTF files should be exported into `/fonts/ttf` and `/fonts/otf` folders.

Expand All @@ -87,10 +133,14 @@ Inconsolata source files are available in `.glyphs` format located in the `/sour
![Font Export Options](documentation/font-export.png)

* `OTFs` should be generated with these options:
* [X] Remove Overlap
* [X] Autohint
* [X] Remove Overlap
* [X] Autohint
* [ ] Save as TTF
* [X] Export destination: $REPO_PATH/fonts/otf
* [X] Export destination: $REPO_PATH/fonts/otf

### Future work

In addition, we want to export a subset not including Vietnamese script coverage, to avoid over-large line spacing on older applications (such as terminals and text editors) that don't understand the "use typo metrics" flag (see https://github.com/googlefonts/Inconsolata/issues/35).

----

Expand All @@ -110,3 +160,4 @@ Copyright 2006 The Inconsolata Project Authors
[4]: http://scripts.sil.org/OFL
[5]: http://cyreal.org
[6]: https://groups.google.com/forum/#!searchin/googlefonts-discuss/inconsolata%7Csort:relevance/googlefonts-discuss/wgVuOx9yo5k/2QSUQ78CCQAJ
[fontmake]: https://github.com/googlefonts/fontmake
Binary file added fonts/otf/Inconsolata-Black.otf
Binary file not shown.
Binary file modified fonts/otf/Inconsolata-Bold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-Condensed.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-CondensedBlack.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-CondensedBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-CondensedExtraBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-CondensedExtraLight.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-CondensedLight.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-CondensedMedium.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-CondensedSemiBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-Expanded.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExpandedBlack.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExpandedBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExpandedExtraBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExpandedExtraLight.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExpandedLight.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExpandedMedium.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExpandedSemiBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExtraBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExtraCondensed.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExtraCondensedBlack.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExtraCondensedBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExtraCondensedExtraBold.otf
Binary file not shown.
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExtraCondensedLight.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExtraCondensedMedium.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExtraCondensedSemiBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExtraExpanded.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExtraExpandedBlack.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExtraExpandedBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExtraExpandedExtraBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExtraExpandedExtraLight.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExtraExpandedLight.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExtraExpandedMedium.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExtraExpandedSemiBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-ExtraLight.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-Light.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-Medium.otf
Binary file not shown.
Binary file modified fonts/otf/Inconsolata-Regular.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-SemiBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-SemiCondensed.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-SemiCondensedBlack.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-SemiCondensedBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-SemiCondensedExtraBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-SemiCondensedExtraLight.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-SemiCondensedLight.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-SemiCondensedMedium.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-SemiCondensedSemiBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-SemiExpanded.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-SemiExpandedBlack.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-SemiExpandedBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-SemiExpandedExtraBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-SemiExpandedExtraLight.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-SemiExpandedLight.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-SemiExpandedMedium.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-SemiExpandedSemiBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-UltraCondensed.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-UltraCondensedBlack.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-UltraCondensedBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-UltraCondensedExtraBold.otf
Binary file not shown.
Binary file not shown.
Binary file added fonts/otf/Inconsolata-UltraCondensedLight.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-UltraCondensedMedium.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-UltraCondensedSemiBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-UltraExpanded.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-UltraExpandedBlack.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-UltraExpandedBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-UltraExpandedExtraBold.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-UltraExpandedExtraLight.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-UltraExpandedLight.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-UltraExpandedMedium.otf
Binary file not shown.
Binary file added fonts/otf/Inconsolata-UltraExpandedSemiBold.otf
Binary file not shown.
Binary file modified fonts/otf/Ligconsolata-Bold.otf
Binary file not shown.
Binary file modified fonts/otf/Ligconsolata-Regular.otf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-Black.ttf
Binary file not shown.
Binary file modified fonts/ttf/Inconsolata-Bold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-Condensed.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-CondensedBlack.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-CondensedBold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-CondensedExtraBold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-CondensedExtraLight.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-CondensedLight.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-CondensedMedium.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-CondensedSemiBold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-Expanded.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExpandedBlack.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExpandedBold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExpandedExtraBold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExpandedExtraLight.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExpandedLight.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExpandedMedium.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExpandedSemiBold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExtraBold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExtraCondensed.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExtraCondensedBlack.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExtraCondensedBold.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExtraCondensedLight.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExtraCondensedMedium.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExtraCondensedSemiBold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExtraExpanded.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExtraExpandedBlack.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExtraExpandedBold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExtraExpandedExtraBold.ttf
Binary file not shown.
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExtraExpandedLight.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExtraExpandedMedium.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExtraExpandedSemiBold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-ExtraLight.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-Light.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-Medium.ttf
Binary file not shown.
Binary file modified fonts/ttf/Inconsolata-Regular.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-SemiBold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-SemiCondensed.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-SemiCondensedBlack.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-SemiCondensedBold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-SemiCondensedExtraBold.ttf
Binary file not shown.
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-SemiCondensedLight.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-SemiCondensedMedium.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-SemiCondensedSemiBold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-SemiExpanded.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-SemiExpandedBlack.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-SemiExpandedBold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-SemiExpandedExtraBold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-SemiExpandedExtraLight.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-SemiExpandedLight.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-SemiExpandedMedium.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-SemiExpandedSemiBold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-UltraCondensed.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-UltraCondensedBlack.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-UltraCondensedBold.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-UltraCondensedLight.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-UltraCondensedMedium.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-UltraCondensedSemiBold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-UltraExpanded.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-UltraExpandedBlack.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-UltraExpandedBold.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-UltraExpandedExtraBold.ttf
Binary file not shown.
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-UltraExpandedLight.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-UltraExpandedMedium.ttf
Binary file not shown.
Binary file added fonts/ttf/Inconsolata-UltraExpandedSemiBold.ttf
Binary file not shown.
Binary file modified fonts/ttf/Ligconsolata-Bold.ttf
Binary file not shown.
Binary file modified fonts/ttf/Ligconsolata-Regular.ttf
Binary file not shown.
Binary file added fonts/variable/Inconsolata-VF.ttf
Binary file not shown.
Loading

0 comments on commit d7269b5

Please sign in to comment.