Merge remote-tracking branch 'upstream/master'

bin/scripts/lib/fonts.json

@@ -3,10 +3,17 @@
     {
       "unpatchedName": "3270",
       "patchedName": "3270",
-      "imagePreviewFont": "3270Medium Nerd Font",
+      "imagePreviewFont": "3270 Nerd Font",
       "linkPreviewFont": "font3270",
       "description": "derived from the x3270 font, a modern format of a font with high nostalgic value"
     },
+    {
+      "unpatchedName": "Agave",
+      "patchedName": "Agave",
+      "imagePreviewFont": "Agave Nerd Font",
+      "linkPreviewFont": "agave",
+      "description": "A small, monospace, outline font that is geometrically regular and simple"
+    },
     {
       "unpatchedName": "AnonymousPro",
       "patchedName": "Anonymice",
@@ -31,7 +38,7 @@
     {
       "unpatchedName": "BigBlueTerminal",
       "patchedName": "BigBlueTerminal",
-      "imagePreviewFont": "BigBlue_Terminal_437TT Nerd Font",
+      "imagePreviewFont": "BigBlueTerminal Nerd Font",
       "linkPreviewFont": false,
       "description": "nostalgic, closely based on IBM's 8x14 EGA/VGA charset"
     },
@@ -42,6 +49,13 @@
       "linkPreviewFont": "bitstream-vera",
       "description": "dotted zero, compact lowercase characters"
     },
+    {
+      "unpatchedName": "Cascadia Code",
+      "patchedName": "Caskaydia Cove",
+      "imagePreviewFont": "Caskaydia Cove Nerd Font",
+      "linkPreviewFont": "cascadia-code",
+      "description": "A fun, new monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal"
+    },
     {
       "unpatchedName": "IBMPlex",
       "patchedName": "BlexMono",
@@ -63,6 +77,13 @@
       "linkPreviewFont": "cousine",
       "description": "similar to Courier New with better readablitiy, dotted zeros"
     },
+    {
+      "unpatchedName": "DaddyTimeMono",
+      "patchedName": "DaddyTimeMono",
+      "imagePreviewFont": "DaddyTimeMono Nerd Font",
+      "linkPreviewFont": "daddytimemono",
+      "description": "A monospaced font for programmers and other terminal groupies"
+    },
     {
       "unpatchedName": "DejaVuSansMono",
       "patchedName": "DejaVuSansMono",
@@ -101,7 +122,7 @@
     {
       "unpatchedName": "Go-Mono",
       "patchedName": "Go-Mono",
-      "imagePreviewFont": "GoMono Nerd Font",
+      "imagePreviewFont": "Go-Mono Nerd Font",
       "linkPreviewFont": "go-mono",
       "description": "created specifically for the Go project, looks particularly clear for use with the Go language"
     },
@@ -140,6 +161,13 @@
       "linkPreviewFont": "hermit",
       "description": "symbols stand out from common text"
     },
+    {
+      "unpatchedName": "iA Writer",
+      "patchedName": "iM Writing",
+      "imagePreviewFont": "iM Writing Nerd Font",
+      "linkPreviewFont": "ia-writer-mono",
+      "description": "A heavy modification of IBM's Plex font"
+    },
     {
       "unpatchedName": "Inconsolata",
       "patchedName": "Inconsolata",
@@ -168,6 +196,13 @@
       "linkPreviewFont": "iosevka",
       "description": "narrow and horizontally tight characters, slashed zero"
     },
+    {
+      "unpatchedName": "JetBrainsMono",
+      "patchedName": "JetBrainsMono",
+      "imagePreviewFont": "JetBrainsMono Nerd Font",
+      "linkPreviewFont": "jetbrainsmono",
+      "description": "JetBrains officially created font for developers"
+    },
     {
       "unpatchedName": "Lekton",
       "patchedName": "Lekton",
@@ -185,7 +220,7 @@
     {
       "unpatchedName": "Meslo",
       "patchedName": "Meslo",
-      "imagePreviewFont": "MesloLGM Nerd Font",
+      "imagePreviewFont": "Meslo Nerd Font",
       "linkPreviewFont": "meslo",
       "description": "slashed zeros, customized version of Apple's Menlo"
     },
@@ -213,28 +248,28 @@
     {
       "unpatchedName": "MPlus",
       "patchedName": "MPlus",
-      "imagePreviewFont": "mplus Nerd Font",
+      "imagePreviewFont": "MPlus Nerd Font",
       "linkPreviewFont": false,
       "description": "Multiple styles and weights, many glyph sets (e.g. Kana glyphs)"
     },
     {
       "unpatchedName": "Noto",
       "patchedName": "Noto",
-      "imagePreviewFont": "NotoSans Nerd Font",
+      "imagePreviewFont": "Noto Nerd Font",
       "linkPreviewFont": "noto",
       "description": "`0` and `O` very similar, characters are either very curvy or straight lined"
     },
     {
       "unpatchedName": "ProFont",
       "patchedName": "ProFont",
-      "imagePreviewFont": "ProFontIIx Nerd Font",
+      "imagePreviewFont": "ProFont Nerd Font",
       "linkPreviewFont": "profont",
       "description": "looks best with anti-aliasing turned off, squared off character corners, vertically tight small `s`"
     },
     {
       "unpatchedName": "ProggyClean",
       "patchedName": "ProggyClean",
-      "imagePreviewFont": "ProggyCleanTT Nerd Font",
+      "imagePreviewFont": "ProggyClean Nerd Font",
       "linkPreviewFont": "proggy-clean",
       "description": "Designed particularly for use at small point sizes"
     },
@@ -245,6 +280,13 @@
       "linkPreviewFont": "opendyslexic",
       "description": "designed specifically to alleviate reading errors caused by dyslexia"
     },
+    {
+      "unpatchedName": "Overpass",
+      "patchedName": "Overpass",
+      "imagePreviewFont": "Overpass Nerd Font",
+      "linkPreviewFont": "overpass",
+      "description": "An open source font family inspired by Highway Gothic"
+    },
     {
       "unpatchedName": "RobotoMono",
       "patchedName": "RobotoMono",
@@ -259,6 +301,13 @@
       "linkPreviewFont": "share-tech",
       "description": "dotted zeros, distinguishable 1 and l, curved and straight character lines"
     },
+    {
+      "unpatchedName": "Source Code Pro",
+      "patchedName": "Sauce Code Pro",
+      "imagePreviewFont": "Sauce Code Pro Nerd Font",
+      "linkPreviewFont": "source-code-pro",
+      "description": "Monospaced font family for user interface and coding environments"
+    },
     {
       "unpatchedName": "SpaceMono",
       "patchedName": "SpaceMono",
@@ -293,7 +342,14 @@
       "imagePreviewFont": "UbuntuMono Nerd Font",
       "linkPreviewFont": "ubuntu",
       "description": "dotted zeros, used the `n`, `o`, `H` & `O` Latin characters as a base for design"
+    },
+    {
+      "unpatchedName": "VictorMono",
+      "patchedName": "VictorMono",
+      "imagePreviewFont": "VictorMono Nerd Font",
+      "linkPreviewFont": "victor-mono",
+      "description": "clean, crisp and narrow, with a large x-height and clear punctuation"
     }
   ]
 }
-  
+  

bin/scripts/update-all-contributors-website.py

@@ -0,0 +1,54 @@
+import fileinput
+import string
+import re
+
+file = open("../../CONTRIBUTORS.md", "r")
+contributorContents = file.read()
+file.close()
+
+# print(contributorContents)
+
+
+file = open("/home/ryan/projects/nerd-fonts-gh-pages/_posts/2017-01-05-all-contributors.md", "r")
+webContributorContents = file.read()
+file.close()
+
+# print(webContributorContents)
+
+# search and replace
+starting_text = '<!-- UPDATE START -->'
+ending_text = '<!-- UPDATE END -->'
+to_replace = webContributorContents[webContributorContents.find(starting_text)+len(starting_text):webContributorContents.rfind(ending_text)]
+
+print('re replace')
+print('-------------------------------------------------')
+print(to_replace)
+
+# Remove markdown that won't work as-is in the jekyll page:
+transformedContributorContents = re.sub('[![All Contributors](.*)\(#contributors\)\n', '', contributorContents)
+transformedContributorContents = re.sub('Thanks goes to these wonderful people(.*):\n', '', transformedContributorContents)
+transformedContributorContents = string.replace(transformedContributorContents, '## Contributors\n\n', '')
+transformedContributorContents = string.replace(transformedContributorContents, 'This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!', '')
+
+# Fix the formatting for the grid table:
+transformedContributorContents = string.replace(transformedContributorContents, ' [<img src=', '\n<div markdown="1">\n[<img class="lzy_img" data-src=')
+transformedContributorContents = string.replace(transformedContributorContents, '") |', '")\n</div>')
+transformedContributorContents = string.replace(transformedContributorContents, '| :---: | :---: | :---: | :---: | :---: | :---: | :---: |', '')
+transformedContributorContents = string.replace(transformedContributorContents, '<!-- ALL-CONTRIBUTORS-LIST:END -->', '')
+transformedContributorContents = string.replace(transformedContributorContents, '|\n', '') # @TODO fixme
+
+
+print('transformed contr contents')
+print('-------------------------------------------------')
+print(transformedContributorContents)
+
+webContributorContents = string.replace(webContributorContents, to_replace, transformedContributorContents)
+
+print('final out')
+print('-------------------------------------------------')
+print(webContributorContents)
+
+
+# write the updated all contributors to the website
+file = open("/home/ryan/projects/nerd-fonts-gh-pages/_posts/2017-01-05-all-contributors.md", "w")
+file.write(webContributorContents)

patched-fonts/JetBrainsMono/Regular/readme.md

@@ -2,7 +2,7 @@
 
 # JetBrainsMono
 A typeface made for developers. \
-More about font features & design can be found on [it's page](https://jetbrains.com/mono/)
+More about font features & design can be found on [its page](https://jetbrains.com/mono/).
 
 # **Installation**
 
@@ -14,12 +14,12 @@ Select JetBrains Mono in the IDE settings: go to `Preferences/Settings` → `Edi
 
 ### Another IDE or an older version of a JetBrains IDE
 
-1. [Download font](https://download.jetbrains.com/fonts/JetBrainsMono-1.0.0.zip?fromGitHub).
+1. [Download font](https://download.jetbrains.com/fonts/JetBrainsMono-1.0.0.zip?fromGitHub). 
 2. Unzip the archive and install the font:
    - Mac. Select all font files in the folder and double-click them. Click the *"Install Font"* button.
    - Windows. Select all font files in the folder, right-click any of them, then pick *"Install"* from the menu.
    - Ubuntu. Open a terminal with `Ctrl`+`Alt`+`T` and run the following:
-
+   
       ```
       cd <name_of_our_archive.zip>
       unzip "\*.zip" -d ${HOME}/.fonts
@@ -67,8 +67,9 @@ Nikita Prokopov\
 Eugene Auduchinok\
 Tatiana Tulupenko\
 Dmitrij Batrak\
-IntelliJ Platfrom UX Team\
+IntelliJ Platform UX Team\
 Web Team
+
 ## Which font?
 
 ### TL;DR