Merge branch 'mashehu-master'

patched-fonts/FiraCode/Retina/readme.md

@@ -7,7 +7,7 @@ Font creator
 
 Version
 
-:   1.102
+:   1.206
 
 Source
 
@@ -90,7 +90,7 @@ Combinations are no longer included by default because of the large inflation in
 
 
 ```sh
-# 2046 Possible Combinations:
+#     2046 Possible Combinations:
 
 ./font-patcher FiraCode-Retina.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather --material
 ./font-patcher FiraCode-Retina.ttf  --use-single-width-glyphs --windows --fontawesome --octicons --fontlinux --pomicons --powerlineextra --fontawesomeextension --powersymbols --weather

patched-fonts/FiraCode/readme.md

@@ -7,7 +7,7 @@ Font creator
 
 Version
 
-:   1.102
+:   1.206
 
 Source
 

src/unpatched-fonts/FiraCode/README.md

@@ -0,0 +1,179 @@
+## Fira Code: monospaced font with programming ligatures
+
+<img src="http://s.tonsky.me/imgs/fira_code_logo.svg">
+
+### Problem
+
+Programmers use a lot of symbols, often encoded with several characters. For the human brain, sequences like `->`, `<=` or `:=` are single logical tokens, even if they take two or three characters on the screen. Your eye spends a non-zero amount of energy to scan, parse and join multiple characters into a single logical one. Ideally, all programming languages should be designed with full-fledged Unicode symbols for operators, but that’s not the case yet.
+
+### Solution
+
+#### [Download v1.206](https://github.com/tonsky/FiraCode/releases/download/1.206/FiraCode_1.206.zip) · [How to install](https://github.com/tonsky/FiraCode/wiki) · [Troubleshooting](https://github.com/tonsky/FiraCode/wiki#troubleshooting) · [News & updates](https://twitter.com/FiraCode)
+
+<a href="https://patreon.com/tonsky" target="_blank"><img src="./fira_code_patreon.png"></a>
+
+Fira Code is an extension of the Fira Mono font containing a set of ligatures for common programming multi-character combinations. This is just a font rendering feature: underlying code remains ASCII-compatible. This helps to read and understand code faster. For some frequent sequences like `..` or `//`, ligatures allow us to correct spacing.
+
+<img src="./showcases/all_ligatures.png">
+
+### Code examples
+
+Ruby:
+
+<img src="./showcases/ruby.png">
+
+JavaScript:
+
+<img src="./showcases/javascript.png">
+
+PHP:
+
+<img src="./showcases/php.png">
+
+Erlang:
+
+<img src="./showcases/erlang.png">
+
+Elixir:
+
+<img src="/showcases/elixir.png">
+
+Go:
+
+<img src="./showcases/go.png">
+
+LiveScript:
+
+<img src="./showcases/livescript.png">
+
+Clojure:
+
+<img src="./showcases/clojure.png">
+
+Swift:
+
+<img src="./showcases/swift.png">
+
+
+### Terminal support
+
+| Works              | Doesn’t work       |
+| ------------------ | ------------------ |
+| **Butterfly**      | **Alacritty**      |
+| **Hyper.app**      | **cmd.exe**        |
+| **iTerm 2** ([3.1+](https://gitlab.com/gnachman/iterm2/issues/3568#note_13118332)) | **Cmder** |
+| **Kitty**          | **ConEmu**         |
+| **Konsole**        | **GNOME Terminal** | 
+| **mintty** ([2.8.3+](https://github.com/mintty/mintty/issues/601))| **mate-terminal** |
+| **QTerminal**      | **PuTTY**          |
+| **Terminal.app**   | **rxvt**           |
+| **Termux**         | **ZOC** (Windows)  |
+| **Token2Shell/MD** | **gtkterm, guake, LXTerminal, sakura, Terminator, xfce4-terminal,** and other libvte-based terminals ([bug report](https://bugzilla.gnome.org/show_bug.cgi?id=584160)) |
+| **upterm**         |
+| **ZOC** (macOS)    |
+
+### Editor support
+
+| Works | Doesn’t work   |
+| ----- | -------------- |
+| **Abricotine** | **Arduino IDE** |
+| **Android Studio** (2.3+, [instructions](https://github.com/tonsky/FiraCode/wiki/Intellij-products-instructions)) | **Adobe Dreamweaver** |
+| **Anjuta** (unless at the EOF) | **Delphi IDE** |
+| **AppCode** (2016.2+, [instructions](https://github.com/tonsky/FiraCode/wiki/Intellij-products-instructions)) | **Eclipse** (Win, [vote here](https://bugs.eclipse.org/bugs/show_bug.cgi?id=398656)) |
+| **Atom** 1.1 or newer ([instructions](https://github.com/tonsky/FiraCode/wiki/Atom-instructions)) | Standalone **Emacs** ([workaround](https://github.com/tonsky/FiraCode/wiki/Emacs-instructions)) |
+| **BBEdit/TextWrangler** (v. 11 only, [instructions](https://github.com/tonsky/FiraCode/wiki/BBEdit-instructions)) | **gVim** (Windows [workaround](https://github.com/tonsky/FiraCode/issues/462)) |
+| **Brackets** (with [this plugin](https://github.com/polo2ro/firacode-in-brackets)) | **IDLE** |
+| **Chocolat** | **KDevelop 4** |
+| **CLion** (2016.2+, [instructions](https://github.com/tonsky/FiraCode/wiki/Intellij-products-instructions)) | **Monkey Studio IDE** |
+| **Cloud9** ([instructions](https://github.com/tonsky/FiraCode/wiki/Cloud9-Instructions)) |  |
+| **Coda 2** |  |
+| **CodeLite** |  |
+| **Eclipse** (Mac 4.7+, Linux) |  |
+| **elementary Code** |  |
+| **Geany** |
+| **gEdit / Pluma** |
+| **GNOME Builder** |
+| **IntelliJ IDEA** (2016.2+, [instructions](https://github.com/tonsky/FiraCode/wiki/Intellij-products-instructions)) |
+| **Kate, KWrite** |
+| **Komodo** |
+| **Leafpad** |
+| **LibreOffice** |
+| **LightTable** ([instructions](https://github.com/tonsky/FiraCode/wiki/LightTable-instructions)) |
+| **LINQPad** |
+| **MacVim** 7.4 or newer ([instructions](https://github.com/tonsky/FiraCode/wiki/MacVim-instructions)) |
+| **Mancy** |
+| **Meld** |
+| **Mousepad** |
+| **NeoVim-gtk** |
+| **NetBeans** |
+| **Notepad** (Win) |
+| **Notepad++** (with a [workaround](https://github.com/notepad-plus-plus/notepad-plus-plus/issues/2287#issuecomment-256638098))  |
+| **PhpStorm** (2016.2+, [instructions](https://github.com/tonsky/FiraCode/wiki/Intellij-products-instructions)) |
+| **PyCharm** (2016.2+, [instructions](https://github.com/tonsky/FiraCode/wiki/Intellij-products-instructions)) |
+| **QtCreator** |
+| **Rider** |
+| **RStudio** ([instructions](https://github.com/tonsky/FiraCode/wiki/RStudio-instructions)) |
+| **RubyMine** (2016.2+, [instructions](https://github.com/tonsky/FiraCode/wiki/Intellij-products-instructions)) |
+| **Scratch** |
+| **SublimeText** (3146+) |
+| **Spyder IDE** (only with Qt5) |
+| **SuperCollider 3** |
+| **TextAdept** (Linux, Mac) |
+| **TextEdit** |
+| **TextMate 2** |
+| **VimR** ([instructions](https://github.com/qvacua/vimr/wiki#ligatures)) |
+| **Visual Studio 2015** |
+| **Visual Studio 2017** |
+| **Visual Studio Code** ([instructions](https://github.com/tonsky/FiraCode/wiki/VS-Code-Instructions)) |
+| **WebStorm** (2016.2+, [instructions](https://github.com/tonsky/FiraCode/wiki/Intellij-products-instructions)) |
+| **Xamarin Studio/Monodevelop** |
+| **Xcode** (8.0+, otherwise [with plugin](https://github.com/robertvojta/LigatureXcodePlugin)) |
+| Probably work: **Smultron, Vico** | Under question: **Code::Blocks IDE** |
+
+### Browser support
+
+```html
+<!-- HTML -->
+<link rel="stylesheet" href="https://cdn.rawgit.com/tonsky/FiraCode/1.206/distr/fira_code.css">
+```
+
+```css
+/* CSS */
+@import url(https://cdn.rawgit.com/tonsky/FiraCode/1.206/distr/fira_code.css);
+```
+
+- IE 10+, Edge: enable with `font-feature-settings: "calt" 1;`
+- Firefox
+- Safari
+- Chromium-based browsers (Chrome, Opera)
+- ACE
+- CodeMirror (enable with `font-variant-ligatures: contextual;`)
+
+### Projects using Fira Code
+
+- All [JetBrains products](https://www.jetbrains.com/)
+- [CodePen](https://codepen.io/)
+- [Blink Shell](http://www.blink.sh/)
+- [Klipse](http://app.klipse.tech/)
+- [IlyaBirman.net](http://ilyabirman.net/)
+- [EvilMartians.com](https://evilmartians.com/)
+- [Web Maker](https://webmakerapp.com/)
+- [FromScratch](https://fromscratch.rocks/)
+- [PEP20.org](https://pep20.org/)
+
+### Alternatives
+
+Other monospaced fonts with ligatures:
+
+- [Hasklig](https://github.com/i-tu/Hasklig) (free)
+- [PragmataPro](http://www.fsd.it/fonts/pragmatapro.htm) (€59)
+- [Monoid](http://larsenwork.com/monoid/) (free)
+- [Fixedsys Excelsior](https://github.com/kika/fixedsys) (free)
+- [Iosevka](https://be5invis.github.io/Iosevka/) (free)
+- [DejaVu Sans Code](https://github.com/SSNikolaevich/DejaVuSansCode) (free)
+
+### Credits
+
+- Author: Nikita Prokopov [@nikitonsky](https://twitter.com/nikitonsky)
+- Based on: [Fira Mono](https://github.com/mozilla/Fira)
+- Inspired by: [Hasklig](https://github.com/i-tu/Hasklig)

src/unpatched-fonts/FiraCode/README.rst

@@ -1,10 +0,0 @@
-Fura Code Powerline
-====================
-
-:Font creator: Nikita Prokopov
-:Version: 1.102
-:Source: https://github.com/tonsky/FiraCode
-:License: SIL OPEN FONT LICENSE Version 1.1
-:Patched by: `Jamie Rolfs <https://github.com/jrolfs>`_
-
-Fira Code is a Fira Mono font extended with a set of ligatures for common programming multi-character combinations. This is just a font rendering feature: underlying code remains ASCII-compatible. This helps to read and understand code faster. For some frequent sequences like `..` or `//` ligatures allow us to correct spacing.