Update Iosevka to 2.1.0

patched-fonts/Iosevka/Bold-Italic/readme.md

@@ -219,7 +219,7 @@ Combinations are no longer included by default because of the large inflation in
 
 
 ```sh
-# 2046 Possible Combinations:
+#     2046 Possible Combinations:
 
 ./font-patcher iosevka-term-bolditalic.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather --material
 ./font-patcher iosevka-term-bolditalic.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather

patched-fonts/Iosevka/Bold/readme.md

@@ -219,7 +219,7 @@ Combinations are no longer included by default because of the large inflation in
 
 
 ```sh
-# 2046 Possible Combinations:
+#     2046 Possible Combinations:
 
 ./font-patcher iosevka-bold.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather --material
 ./font-patcher iosevka-bold.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather

patched-fonts/Iosevka/Extra-Light-Italic/readme.md

@@ -219,7 +219,7 @@ Combinations are no longer included by default because of the large inflation in
 
 
 ```sh
-# 2046 Possible Combinations:
+#     2046 Possible Combinations:
 
 ./font-patcher iosevka-extralightitalic.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather --material
 ./font-patcher iosevka-extralightitalic.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather

patched-fonts/Iosevka/Light/readme.md

@@ -219,7 +219,7 @@ Combinations are no longer included by default because of the large inflation in
 
 
 ```sh
-# 2046 Possible Combinations:
+#     2046 Possible Combinations:
 
 ./font-patcher iosevka-term-light.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather --material
 ./font-patcher iosevka-term-light.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather

patched-fonts/Iosevka/Medium-Italic/readme.md

@@ -219,7 +219,7 @@ Combinations are no longer included by default because of the large inflation in
 
 
 ```sh
-# 2046 Possible Combinations:
+#     2046 Possible Combinations:
 
 ./font-patcher iosevka-term-mediumitalic.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather --material
 ./font-patcher iosevka-term-mediumitalic.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather

patched-fonts/Iosevka/Medium-Oblique/readme.md

@@ -219,7 +219,7 @@ Combinations are no longer included by default because of the large inflation in
 
 
 ```sh
-# 2046 Possible Combinations:
+#     2046 Possible Combinations:
 
 ./font-patcher iosevka-mediumoblique.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather --material
 ./font-patcher iosevka-mediumoblique.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather

patched-fonts/Iosevka/Medium/readme.md

@@ -219,7 +219,7 @@ Combinations are no longer included by default because of the large inflation in
 
 
 ```sh
-# 2046 Possible Combinations:
+#     2046 Possible Combinations:
 
 ./font-patcher iosevka-medium.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather --material
 ./font-patcher iosevka-medium.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather

patched-fonts/Iosevka/Oblique/readme.md

@@ -219,7 +219,7 @@ Combinations are no longer included by default because of the large inflation in
 
 
 ```sh
-# 2046 Possible Combinations:
+#     2046 Possible Combinations:
 
 ./font-patcher iosevka-term-oblique.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather --material
 ./font-patcher iosevka-term-oblique.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather

patched-fonts/Iosevka/Regular/readme.md

@@ -219,7 +219,7 @@ Combinations are no longer included by default because of the large inflation in
 
 
 ```sh
-# 2046 Possible Combinations:
+#     2046 Possible Combinations:
 
 ./font-patcher iosevka-regular.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather --material
 ./font-patcher iosevka-regular.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather

patched-fonts/Iosevka/Thin-Oblique/readme.md

@@ -219,7 +219,7 @@ Combinations are no longer included by default because of the large inflation in
 
 
 ```sh
-# 2046 Possible Combinations:
+#     2046 Possible Combinations:
 
 ./font-patcher iosevka-thinoblique.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather --material
 ./font-patcher iosevka-thinoblique.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather

patched-fonts/Iosevka/Thin/readme.md

@@ -219,7 +219,7 @@ Combinations are no longer included by default because of the large inflation in
 
 
 ```sh
-# 2046 Possible Combinations:
+#     2046 Possible Combinations:
 
 ./font-patcher iosevka-thin.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather --material
 ./font-patcher iosevka-thin.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather

src/unpatched-fonts/Iosevka/README.md

@@ -4,8 +4,6 @@ Coders’ typeface, built from code.
 
 ![](https://raw.githubusercontent.com/be5invis/Iosevka/master/images/preview-all.png)
 
-Chinese and Japanese users → [Inziu Iosevka for Chinese and Japanese.](http://be5invis.github.io/Iosevka/inziu.html) (A **hinted** Composite with M+ and Source Han Sans.)
-
 ## Installation
 
 Quit your editor/program. Unzip and open the folder.
@@ -17,10 +15,11 @@ Quit your editor/program. Unzip and open the folder.
 * **Linux** : Copy the TTF files to your fonts directory → Run `sudo fc-cache`. 
   - Arch Linux users can install the font from the AUR [here](https://aur.archlinux.org/packages/ttf-iosevka) using an AUR wrapper or by doing it manually. [All variants](https://aur.archlinux.org/packages/?O=0&SeB=nd&K=ttf-iosevka&SB=n&SO=a&PP=50&do_Search=Go).
   - Void Linux users can install the font with `xbps-install font-iosevka`.
+* **FreeBSD**: The font can be installed with `pkg install iosevka`.
 
 ## Weights, Variants and OpenType features
 
-The typeface contains seven weights (thin, extra-light, light, regular, medium, bold and heavy) alongside with both italic and oblique versions, with the same metrics as the regular one. 
+The typeface contains 9 weights (Thin to Heavy) alongside with both italic and oblique versions, with the same metrics as the regular one. 
 
 ![Weights sample](https://raw.githubusercontent.com/be5invis/Iosevka/master/images/weights.png)
 
@@ -46,55 +45,76 @@ Iosevka supports Language-Specific Ligations, which is the ligation set enabled
 
 To build Iosevka you should:
 
-1. Ensure that [`nodejs`](http://nodejs.org) (≥ 8.4), [`ttfautohint`](http://www.freetype.org/ttfautohint/), [`otfcc`](https://github.com/caryll/otfcc) (≥ 0.9.3) and GNU `make` (≥ 4.1; BSD `make` may not work) are runnable in your terminal.
-   - Windows users may need to install MinGW and make POSIX utilities accessible (`mkdir.exe`, `cp.exe`, `cat.exe` and `rm.exe`, in particular) from Command Prompt. Utilities provided by [Git for Windows](https://git-for-windows.github.io/) or MSYS2 works fine.
+1. Ensure that [`nodejs`](http://nodejs.org) (≥ 8.4), [`ttfautohint`](http://www.freetype.org/ttfautohint/), [`otfcc`](https://github.com/caryll/otfcc) (≥ 0.9.3).
 2. Install necessary libs by `npm install`. If you’ve installed them, upgrade to the latest.
-3. `make` (or `gmake`).
+3. `npm run build -- contents:iosevka`.
 
 
-You will find TTFs in the `dist/` directory.
-
-### Building the Web Font
-
-The `webfonts/` directory is used to build Iosevka for web font uses. To build the web fonts you should:
-
-1. Build Iosevka.
-2. Ensure that `sfnt2woff` and `woff2_compress` are installed and runnable.
-3. Run `make web` .
-
-The web fonts will be generated into `dist/iosevka/web` and `dist/iosevka-slab/web`.
+You will find TTFs, as well as WOFF(2) web fonts and one Webfont CSS in the `dist/` directory.
 
 ## Build Your Own Style
 
-![Styles Preview](https://raw.githubusercontent.com/be5invis/Iosevka/master/images/variants.png)
+Since version 2.0, Iosevka would no longer support building via `makefile`. To initialize a custom build, you need:
 
-Iosevka comes with several visual styles, however they are inactive using the default build. To build these variants, you should perform custom build:
+1. Create `private-build-plans.toml` file.
 
-1. `make custom-config [set=<name>]` with the parameters listed below to create a configuration. The `set=<name>` part is optional, it will be set to `custom` when absent.
-2. `make custom [set=<name>]` to acquire your custom font.
-   - `make custom-web [set=<name>]` is for web fonts.
+2. Add a build plan into `private-build-plans.toml`, following this format:
 
-The first step, `make custom-config` takes following parameters to set styles of your custom build. All of them are optional, and would default to Iosevka’s default configuration:
+   ```toml
+   [buildPlans.iosevka-custom]            # <iosevka-custom> is your plan name
+   family = "Iosevka Custom"              # Font menu family name
+   design = ["common styles"]             # Common styles
+   upright = ["upright-only", "styles"]   # Upright-only styles
+   italic = ["italic-only", "styles"]     # Italic-only styles
+   oblique = ["oblique-only", "styles"]   # Oblique-only styles
+   
+   # Override default building weights
+   # When buildPlans.<plan name>.weights is absent
+   # All weights would built and mapped to default shape/CSS
+   [buildPlans.iosevka-custom.weights.regular]
+   shape = 400                            # Weight for glyph shapes
+   menu  = 400                            # Weight for menu name
+   css   = 400                            # Weight for WebFont CSS
+   
+   [buildPlans.iosevka-custom.weights.bold]
+   shape = 700
+   menu  = 700
+   css   = 700
+   
+   # Override default building slant sets
+   # Format: <upright|italic|oblique> = <"normal"|"italic"|"oblique">
+   # When this section is absent, all slants would be built.
+   [buildPlans.iosevka-custom.slants]
+   upright = "normal"
+   italic = "italic"
+   oblique = "oblique"
+   ```
 
-* `design='<styles>'`, styles for your custom font set.
-* `upright='<styles>'`, styles for uprights only.
-* `italic='<styles>'`, styles for italics only.
-* `oblique='<styles>'`, styles for obliques only.
+3. Run `npm run build -- contents:<your plan name>` and the built fonts would be available in `dist/`. Aside from `contents:<plan>`, other options are:
 
-You can add arbitary styles for these variables, for example, `make custom-config upright='v-l-zshaped v-i-zshaped' && make custom` will create a variant with Z-shaped letter `l` and `i` for uprights.
+   1. `contents:<plan>` : TTF (Hinted and Unhinted), WOFF(2) and Webfont CSS;
+   2. `ttf:<plan>` : TTF;
+   3. `ttf-unhinted:<plan>` : Unhinted TTF only;
+   4. `woff:<plan>` : TTF and WOFF only;
+   5. `woff2:<plan>` : TTF and WOFF2 only;
 
-The current available styles are:
+The current available styles for `design`/`upright`/`italic`/`oblique` options are:
 
 * Styles for general shape:
   * `sans` : Sans serif (default).
-  * `slab` : Slab serif. When present, the family of your font would be `Iosevka Slab`.
+  * `slab` : Slab serif.
 * Styles related to ligations and spacing:
-  - `term` : Disable ligations. When this style is present, the font built will not contain ligatures, and its family name will be set to “`Iosevka Term`”. In case of your OS or editor cannot handle ligatures correctly, you can disable ligations with it.
+  - `term` : Disable ligations and exact monospace.
+    - The font built will not contain ligatures.
+    - All glyphs wider than one letter would be deleted.
+    - In case of your OS or editor cannot handle ligatures correctly, you can disable ligations with it.
+  - `termlig` : Similar to `term`, the font is exact monospace to make `fontconfig` happy, while ligations are still present.
+  - `nolig` : Disable ligation only.
   - `type` : Make some symbols, like arrows (`→`) and mathematical operators full-width.
-  - `stress-fw` : When included, full-width characters varying form `U+FF00` to `U+FFFF` will be boxed to present a clear distinguish between ASCII and Full-width. The family name will be set to “`Iosevka StFW`”.
+  - `stress-fw` : When included, full-width characters varying form `U+FF00` to `U+FFFF` will be boxed to present a clear distinguish between ASCII and Full-width.
 * All registered `ss##` and `cv##` feature tags, including:
   * `ss01`~`ss10` : Predefined stylistic sets based on other Monospace fonts.
-  * `cv01`~`cv45` : Standalone character variants.
+  * `cv01`~`cv53` : Standalone character variants.
 * Styles for ligation sets, include:
   * `ligset-haskell`: Default ligation set would be assigned to Haskell.
   * `ligset-idris`: Default ligation set would be assigned to Idris.
@@ -105,6 +125,36 @@ The current available styles are:
   * `ligset-fstar`: Default ligation set would be assigned to F\*.
   * `ligset-swift`: Default ligation set would be assigned to Swift.
   * `ligset-purescript`: Default ligation set would be assigned to PureScript.
+* Styles for further customizing default (`calt`) ligation sets. When any of these styles present in your configuration, the `ligset-*` styles would be overridden.
+  * `calt-clear`: Clear the `calt` ligation set.
+  * `calt-center-ops`: Vertically align some of the operators (like `*`) to the center position it is before or after a "center" operator (like `+`);
+  * `calt-arrow`: Enable ligation set that forms arrows;
+  * `calt-arrow2`: Enable ligation for more arrows, like `>>=`;
+  * `calt-html-comment`: Enable ligation for `<!--` and `<!---`;
+  * `calt-eqeq`: Enable ligation for `==` and `===`;
+  * `calt-ineq`: Enable ligation for `<=` and `>=`;
+  * `calt-arrowZALE`: Enable ligation for `<=` to form a left double arrow;
+  * `calt-arrowZAGE`: Enable ligation for `>=` to form a right inverse double arrow;
+  * `calt-exeq`: Enable ligation for `!=` and `!==`;
+  * `calt-slasheq`: Enable ligation for `/=` and `/==`;
+  * `calt-plusplus`: Enable ligation for `++` and further plus-chaining;
+  * `calt-llgg`: Enable ligation for `<<`, `>>` and other angle-bracket chaining;
+  * `calt-trig`: Enable ligation for `<|`, `|>` , `<||`, and other bar-and-angle-bracket symbols;
+  * `calt-dotoper`: Treat dot (`.`) as operator and perform chained centering;
+  * `calt-brst`: Center asterisk in `(*` and `*)`;
+  * `calt-logic`: Enable ligation for `/\` and `\/`;
+  * `calt-colons`: Enable ligation for `::` and `:::` ;
+* Styles for changing the line space (leading):
+  * `leading-750`, `leading-1000`, `leading-1250`, `leading-1500`, `leading-1750`, `leading-2000`: Change the line space. Default is `leading-1250`.
+* Styles for changing Powerline symbols' position:
+  * `powerline-scale-y-750`, `powerline-scale-y-875`, `powerline-scale-y-1000`, `powerline-scale-y-1125`, `powerline-scale-y-1250`, `powerline-scale-y-1375`, `powerline-scale-y-1500`: Resize the Powerline symbols vertically, from 75% to 150%.
+  * `powerline-scale-x-750`, `powerline-scale-x-875`, `powerline-scale-x-1000`, `powerline-scale-x-1125`, `powerline-scale-x-1250`, `powerline-scale-x-1375`, `powerline-scale-x-1500`: Resize the Powerline symbols horizontally, from 75% to 150%.
+  * `powerline-shift-y-n500`, `powerline-shift-y-n450`, `powerline-shift-y-n400`, `powerline-shift-y-n350`, `powerline-shift-y-n300`, `powerline-shift-y-n250`, `powerline-shift-y-n200`, `powerline-shift-y-n150`, `powerline-shift-y-n100`, `powerline-shift-y-n50`, `powerline-shift-y-0`, `powerline-shift-y-p50`, `powerline-shift-y-p100`, `powerline-shift-y-p150`, `powerline-shift-y-p200`, `powerline-shift-y-p250`, `powerline-shift-y-p300`, `powerline-shift-y-p350`, `powerline-shift-y-p400`, `powerline-shift-y-p450`, `powerline-shift-y-p500`: Shift the Powerline symbols vertically, from -0.5em to +0.5em.
+  * `powerline-shift-x-n500`, `powerline-shift-x-n450`, `powerline-shift-x-n400`, `powerline-shift-x-n350`, `powerline-shift-x-n300`, `powerline-shift-x-n250`, `powerline-shift-x-n200`, `powerline-shift-x-n150`, `powerline-shift-x-n100`, `powerline-shift-x-n50`, `powerline-shift-x-0`, `powerline-shift-x-p50`, `powerline-shift-x-p100`, `powerline-shift-x-p150`, `powerline-shift-x-p200`, `powerline-shift-x-p250`, `powerline-shift-x-p300`, `powerline-shift-x-p350`, `powerline-shift-x-p400`, `powerline-shift-x-p450`, `powerline-shift-x-p500`: Shift the Powerline symbols horizontally, from -0.5em to +0.5em.
+* Styles for changing the width:
+  * `expanded`: Expand the width by 10%;
+  * `compressed`: Compress the width by 10%.
+  * NOTE: these styles are highly experimental. Handle with extreme care.
 * Styles for individual characters. They are easy-to-understand names of the `cv##` styles, including:
   * Styles for letter `l`:
     * `v-l-hooky` : Hooky `l`.
@@ -121,6 +171,9 @@ The current available styles are:
   * Styles for letter `a`:
     * `v-a-doublestorey` : Double-storey `a` (default for upright and oblique).
     * `v-a-singlestorey` : Single-storey `a` (default for italic).
+  * Styles for letter `f`:
+    * `v-f-straight`: `f` without bottom hook (default for upright and oblique).
+    * `v-f-tailed`: `f` with a leftward bottom hook (default for italic).
   * Styles for letter `g`:
     * `v-g-doublestorey` : Double-storey `g` (default for upright and oblique).
     * `v-g-singlestorey` : Single-storey `g` (default for italic).
@@ -134,11 +187,20 @@ The current available styles are:
   * Styles for letter `Q`:
     * `v-q-taily` : `Q` with a curly tail (default).
     * `v-q-straight` : `Q` with a straight tail in the old versions.
+  * Styles for letter `y`:
+    * `v-y-straight`: More-straight letter `y`.
+    * `v-y-curly`: Curly, cursive-like `y`.
   * Styles for zero (`0`):
     * `v-zero-slashed` : Slashed Zero `0` (default).
     * `v-zero-dotted` : Dotted Zero `0`.
     * `v-zero-unslashed` : O-like `0`.
-  * Styles for ASCII tilde (`~`), asterisk (`*`), paragaraph(`¶`), underscore (`_`) and ASCII Caret (^):
+  * Styles for one (`1`)
+    * `v-one-serifed` : `1` with bottom serif (default for Slab).
+    * `v-one-hooky` : `1` without bottom serif (default for Sans).
+  * Styles for three (`3`):
+    * `v-three-flattop` : Flat top `3` (Like Museo Sans / Montserrat).
+    * `v-three-twoarks` : Arched top `3` (default).
+  * Styles for ASCII tilde (`~`), asterisk (`*`), paragraph(`¶`), underscore (`_`) and ASCII Caret (`^`):
     * `v-tilde-high` : Higher tilde `~`.
     * `v-tilde-low` : Lower tilde `~` (default).
     * `v-asterisk-high` : Higher asterisk `*` (default).
@@ -154,7 +216,7 @@ The current available styles are:
     * `v-at-fourfold` : The traditional, four-fold At symbol.
     * `v-at-short` : The shorter, Fira-like At symbol introduced in Iosevka 1.8.
   * Styles for Eszet (`ß`):
-    * `v-eszet-traditional` : Tratidional, Fraktur-like Eszet.
+    * `v-eszet-traditional` : Traditional, Fraktur-like Eszet.
     * `v-eszet-sulzbacher` : A more modern, beta-like Eszet (default).
   * Styles for curly brackets (`{}`):
     * `v-brace-straight` : More straight braces.
@@ -162,10 +224,16 @@ The current available styles are:
   * Styles for dollar symbol (`$`):
     * `v-dollar-open` : Dollar symbol with open contour.
     * `v-dollar-through` : Dollar symbol with strike-through vertical bar (default).
+    * `v-dollar-opencap` : Dollar symbol with open contour, not exceeding baseline and ascender.
+    * `v-dollar-throughcap` : Dollar symbol with strike-through vertical bar, not exceeding baseline and ascender.
   * Styles for Number sign (`#`):
     * `v-numbersign-upright` : Number sign with vertical bars (default).
     * `v-numbersign-slanted` : Number sign with slanted bars.
 
+## For Chinese and Japanese users...
+
+→ [Sarasa Gothic](https://github.com/be5invis/Sarasa-Gothic).
+
 ---
 
 ![Family Matrix](https://raw.githubusercontent.com/be5invis/Iosevka/master/images/matrix.png)