diff --git a/font-patcher b/font-patcher index d14729d3d..f2e50833c 100755 --- a/font-patcher +++ b/font-patcher @@ -42,7 +42,7 @@ parser.add_argument('-w', '--windows', dest='windows', action='store_true', help parser.add_argument('-c', '--complete', dest='complete', action='store_true', help='Add all available Glyphs', default=False) parser.add_argument('--fontawesome', dest='fontawesome', action='store_true', help='Add Font Awesome Glyphs (http://fontawesome.io/)', default=False) parser.add_argument('--fontawesomeextension', dest='fontawesomeextension', action='store_true', help='Add Font Awesome Extension Glyphs (https://andrelzgava.github.io/font-awesome-extension/)', default=False) -parser.add_argument('--fontlinux', dest='fontlinux', action='store_true', help='Add Font Linux Glyphs (https://github.com/Lukas-W/font-linux)', default=False) +parser.add_argument('--fontlinux', '--fontlogos', dest='fontlinux', action='store_true', help='Add Font Linux and other open source Glyphs (https://github.com/Lukas-W/font-logos)', default=False) parser.add_argument('--octicons', dest='octicons', action='store_true', help='Add Octicons Glyphs (https://octicons.github.com)', default=False) parser.add_argument('--powersymbols', dest='powersymbols', action='store_true', help='Add IEC Power Symbols (https://unicodepowersymbol.com/)', default=False) parser.add_argument('--pomicons', dest='pomicons', action='store_true', help='Add Pomicon Glyphs (https://github.com/gabrielelana/pomicons)', default=False) @@ -114,7 +114,7 @@ if args.pomicons: if args.fontlinux: additionalFontNameSuffix += " L" - verboseAdditionalFontNameSuffix += " Plus Font Linux" + verboseAdditionalFontNameSuffix += " Plus Font Logos (Font Linux)" # if all source glyphs included simplify the name if args.fontawesome and args.fontawesomeextension and args.octicons and args.powersymbols and args.pomicons and args.powerlineextra and args.fontlinux: @@ -367,7 +367,7 @@ PATCH_SET = [ { 'Enabled': args.pomicons, 'Name': "Pomicons", 'Filename': "Pomicons.otf", 'Exact': True, 'SymStart': 0xE000, 'SymEnd': 0xE00A, 'SrcStart': None, 'SrcEnd': None, 'ScaleGlyph': None, 'Attributes': SYM_ATTR_DEFAULT }, { 'Enabled': args.fontawesome, 'Name': "Font Awesome", 'Filename': "FontAwesome.otf", 'Exact': True, 'SymStart': 0xF000, 'SymEnd': 0xF2E0, 'SrcStart': None, 'SrcEnd': None, 'ScaleGlyph': FONTA_SCALE_LIST,'Attributes': SYM_ATTR_FONTA }, { 'Enabled': args.fontawesomeextension, 'Name': "Font Awesome Extension", 'Filename': "font-awesome-extension.ttf", 'Exact': False, 'SymStart': 0xE000, 'SymEnd': 0xE0A9, 'SrcStart': 0xE200, 'SrcEnd': 0xE2A9, 'ScaleGlyph': None, 'Attributes': SYM_ATTR_DEFAULT }, # Maximize - { 'Enabled': args.fontlinux, 'Name': "Font Linux", 'Filename': "font-linux.ttf", 'Exact': fontlinuxExactEncodingPosition, 'SymStart': 0xF100, 'SymEnd': 0xF115, 'SrcStart': 0xF300, 'SrcEnd': 0xF315, 'ScaleGlyph': None, 'Attributes': SYM_ATTR_DEFAULT }, + { 'Enabled': args.fontlinux, 'Name': "Font Logos (Font Linux)", 'Filename': "font-logos.ttf", 'Exact': fontlinuxExactEncodingPosition, 'SymStart': 0xF100, 'SymEnd': 0xF11C, 'SrcStart': 0xF300, 'SrcEnd': 0xF31C, 'ScaleGlyph': None, 'Attributes': SYM_ATTR_DEFAULT }, { 'Enabled': args.powersymbols, 'Name': "Power Symbols", 'Filename': "Unicode_IEC_symbol_font.otf", 'Exact': True, 'SymStart': 0x23FB, 'SymEnd': 0x23FE, 'SrcStart': None, 'SrcEnd': None, 'ScaleGlyph': None, 'Attributes': SYM_ATTR_DEFAULT }, # Power, Power On/Off, Power On, Sleep { 'Enabled': args.powersymbols, 'Name': "Power Symbols", 'Filename': "Unicode_IEC_symbol_font.otf", 'Exact': True, 'SymStart': 0x2B58, 'SymEnd': 0x2B58, 'SrcStart': None, 'SrcEnd': None, 'ScaleGlyph': None, 'Attributes': SYM_ATTR_DEFAULT }, # Heavy Circle (aka Power Off) { 'Enabled': args.octicons, 'Name': "Octions", 'Filename': "octicons.ttf", 'Exact': octiconsExactEncodingPosition, 'SymStart': 0xF000, 'SymEnd': 0xF105, 'SrcStart': 0xF400, 'SrcEnd': 0xF505, 'ScaleGlyph': OCTI_SCALE_LIST, 'Attributes': SYM_ATTR_DEFAULT }, # Magnifying glass diff --git a/images/fontforge-glyph-set-font-linux.png b/images/fontforge-glyph-set-font-linux.png deleted file mode 100644 index 86c2ff880..000000000 Binary files a/images/fontforge-glyph-set-font-linux.png and /dev/null differ diff --git a/images/fontforge-glyph-set-font-logos.png b/images/fontforge-glyph-set-font-logos.png new file mode 100644 index 000000000..cdc942bb1 Binary files /dev/null and b/images/fontforge-glyph-set-font-logos.png differ diff --git a/readme.md b/readme.md index 1858aa9a8..0c71831c3 100644 --- a/readme.md +++ b/readme.md @@ -86,7 +86,7 @@ _If you..._ * **`39`** already [patched font families](#patched-fonts) * Over **`87,000`** unique combinations/variations of patched fonts [(more details)](#combinations) * Over **`1,300`** glyphs/icons combined [(more details)](#combinations) - * Current glyph sets include: [Powerline with Extra Symbols][ryanoasis-powerline-extra-symbols], [Font Awesome][font-awesome], [Devicons][vorillaz-devicons], [Octicons][octicons], [Font Linux][font-linux], [Pomicons][gabrielelana-pomicons] + * Current glyph sets include: [Powerline with Extra Symbols][ryanoasis-powerline-extra-symbols], [Font Awesome][font-awesome], [Devicons][vorillaz-devicons], [Octicons][octicons], [Font Logos][font-linux] (Formerly [Font Linux][font-linux]), [Pomicons][gabrielelana-pomicons] * **Monospaced (fixed-pitch, fixed-width)** _or_ **double-width (non-monospaced)** glyphs version of each font * This refers to the Nerd Font glyphs themselves not necessarily the Font as a whole * A Developer/Contributor provided [bash script](#gotta-patch-em-all) to re-patch all the fonts @@ -139,10 +139,10 @@ _If you..._ ![image](images/fontforge-glyph-set-font-iec-power-1.png) ![image](images/fontforge-glyph-set-font-iec-power-2.png) -### [Font Linux][font-linux] -> Font-linux is an icon font containing logos of popular linux distributions for inclusion in websites. / ([repo][font-linux]) +### [Font Logos][font-linux] (Formerly [Font Linux][font-linux]) +> Font-logos is an icon font containing logos of popular linux distributions and other open source software for inclusion in websites. / ([repo][font-linux]) -![image](images/fontforge-glyph-set-font-linux.png) +![image](images/fontforge-glyph-set-font-logos.png) ### [Pomicons][gabrielelana-pomicons] > 8 symbols for the ["Pomodoro Technique"®](https://cirillocompany.de/pages/pomodoro-technique). / ([repo][gabrielelana-pomicons]) @@ -238,7 +238,7 @@ echo $i_oct_heart - [Font Awesome][font-awesome] - [Font Awesome Extension][font-awesome-extension] - [GitHub Octicons][octicons] -- [Font Linux][font-linux] +- [Font Logos][font-linux] (Formerly [Font Linux][font-linux]) - [Powerline Extra Symbols][ryanoasis-powerline-extra-symbols] - [IEC Power Symbols][website-iecpower] - [Pomicons][gabrielelana-pomicons] @@ -404,7 +404,8 @@ optional arguments: --fontawesome Add Font Awesome Glyphs (http://fontawesome.io/) --fontawesomeextension Add Font Awesome Extension Glyphs (https://andrelzgava.github.io/font-awesome-extension/) - --fontlinux Add Font Linux Glyphs (https://github.com/Lukas-W/font-linux) + --fontlinux, --fontlogos + Add Font Linux and other open source Glyphs (https://github.com/Lukas-W/font-logos) --octicons Add Octicons Glyphs (https://octicons.github.com) --powersymbols Add IEC Power Symbols (https://unicodepowersymbol.com/) --pomicons Add Pomicon Glyphs (https://github.com/gabrielelana/pomicons) @@ -499,7 +500,7 @@ Repo References [font-awesome]:https://github.com/FortAwesome/Font-Awesome [font-awesome-extension]:https://github.com/AndreLZGava/font-awesome-extension [octicons]:https://github.com/primer/octicons -[font-linux]:https://github.com/Lukas-W/font-linux +[font-linux]:https://github.com/Lukas-W/font-logos [gabrielelana-pomicons]:https://github.com/gabrielelana/pomicons [Seti-UI]:https://atom.io/themes/seti-ui [ryanoasis-powerline-extra-symbols]:https://github.com/ryanoasis/powerline-extra-symbols diff --git a/src/glyphs/font-linux.ttf b/src/glyphs/font-linux.ttf deleted file mode 100644 index 0bc38678e..000000000 Binary files a/src/glyphs/font-linux.ttf and /dev/null differ diff --git a/src/glyphs/font-logos.ttf b/src/glyphs/font-logos.ttf new file mode 100644 index 000000000..1b96ab013 Binary files /dev/null and b/src/glyphs/font-logos.ttf differ