Merge pull request #1215 from ryanoasis/feature/keep-symlink-dir [skip ci]

Reintroduce Octicons file-symlink-directory

bin/scripts/lib/i_oct.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-# Octicons (309 icons)
-# Codepoints: 2665-F532 with gaps
+# Octicons (310 icons)
+# Codepoints: 2665-F533 with gaps
 # Nerd Fonts Version: 3.0.0
 # Script Version: (autogenerated)
 test -n "$__i_oct_loaded" && return || __i_oct_loaded=1
@@ -136,7 +136,7 @@ i='' i_oct_triangle_up=$i
 i='' i_oct_git_compare=$i
 i='' i_oct_logo_gist=$i
 i='' i_oct_file_symlink_file=$i
-i='' i_oct_bookmark_slash=$i
+i='' i_oct_file_symlink_directory=$i
 i='' i_oct_squirrel=$i
 i='' i_oct_globe=$i
 i='' i_oct_unmute=$i
@@ -313,4 +313,5 @@ i='' i_oct_x_circle=$i
 i='' i_oct_x_circle_fill=$i
 i='' i_oct_zoom_in=$i
 i='' i_oct_zoom_out=$i
+i='' i_oct_bookmark_slash=$i
 unset i

font-patcher

@@ -6,7 +6,7 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 # Change the script version when you edit this script:
-script_version = "4.2.1"
+script_version = "4.3.0"
 
 version = "3.0.0"
 projectName = "Nerd Fonts"
@@ -994,7 +994,7 @@ class font_patcher:
                 ],
                 [0xf09c, 0xf09f, 0xf0de], # bells
                 range(0xf2c2, 0xf2c5 + 1), # move to
-                [0xf07b, 0xf0a1, 0xf0d6], # bookmarks
+                [0xf07b, 0xf0a1, 0xf0d6, 0xf306], # bookmarks
         ]}
         WEATH_SCALE_LIST = {'ScaleGroups': [
             [0xf03c, 0xf042, 0xf045 ], # degree signs
@@ -1043,7 +1043,7 @@ class font_patcher:
             {'Enabled': self.args.octicons,             'Name': "Octicons",                'Filename': "octicons/octicons.ttf",                          'Exact': False, 'SymStart': 0xF000, 'SymEnd': 0xF105, 'SrcStart': 0xF400, 'ScaleRules': OCTI_SCALE_LIST,  'Attributes': SYM_ATTR_DEFAULT},  # Magnifying glass
             {'Enabled': self.args.octicons,             'Name': "Octicons",                'Filename': "octicons/octicons.ttf",                          'Exact': True,  'SymStart': 0x2665, 'SymEnd': 0x2665, 'SrcStart': None,   'ScaleRules': OCTI_SCALE_LIST,  'Attributes': SYM_ATTR_DEFAULT},  # Heart
             {'Enabled': self.args.octicons,             'Name': "Octicons",                'Filename': "octicons/octicons.ttf",                          'Exact': True,  'SymStart': 0X26A1, 'SymEnd': 0X26A1, 'SrcStart': None,   'ScaleRules': OCTI_SCALE_LIST,  'Attributes': SYM_ATTR_DEFAULT},  # Zap
-            {'Enabled': self.args.octicons,             'Name': "Octicons",                'Filename': "octicons/octicons.ttf",                          'Exact': False, 'SymStart': 0xF27C, 'SymEnd': 0xF305, 'SrcStart': 0xF4A9, 'ScaleRules': OCTI_SCALE_LIST,  'Attributes': SYM_ATTR_DEFAULT},
+            {'Enabled': self.args.octicons,             'Name': "Octicons",                'Filename': "octicons/octicons.ttf",                          'Exact': False, 'SymStart': 0xF27C, 'SymEnd': 0xF306, 'SrcStart': 0xF4A9, 'ScaleRules': OCTI_SCALE_LIST,  'Attributes': SYM_ATTR_DEFAULT},
             {'Enabled': self.args.codicons,             'Name': "Codicons",                'Filename': "codicons/codicon.ttf",                           'Exact': True,  'SymStart': 0xEA60, 'SymEnd': 0xEBEB, 'SrcStart': None,   'ScaleRules': CODI_SCALE_LIST,  'Attributes': SYM_ATTR_DEFAULT},
             {'Enabled': self.args.custom,               'Name': "Custom",                  'Filename': self.args.custom,                                 'Exact': True,  'SymStart': 0x0000, 'SymEnd': 0x0000, 'SrcStart': None,   'ScaleRules': None,             'Attributes': CUSTOM_ATTR}
         ]

src/glyphs/octicons/file-symlink-directory-16.svg

@@ -0,0 +1 @@
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m1.75 1c-0.966 0-1.75 0.784-1.75 1.75v1.75c0 1 1.5 1 1.5 0v-1.75c0-0.138 0.112-0.25 0.25-0.25h3.25c0.0783 1.53e-4 0.152 0.037 0.199 0.0996l0.9 1.2c0.33 0.44 0.85 0.699 1.4 0.699h6.75c0.138 0 0.25 0.112 0.25 0.25v8.5c0 0.138-0.112 0.25-0.25 0.25h-9c-1 0-1 1.5 0 1.5h9c0.966 0 1.75-0.784 1.75-1.75v-8.5c0-0.966-0.784-1.75-1.75-1.75h-6.75c-0.0783-1.53e-4 -0.152-0.037-0.199-0.0996l-0.9-1.2c-0.33-0.44-0.85-0.699-1.4-0.699zm2.49 5.32c-0.135 0.00422-0.242 0.115-0.242 0.25v1.92h-0.23c-2.08-0.0119-3.77 1.67-3.77 3.75v1.01c1.63e-4 1 1.5 1 1.5 0v-1.01c-1.69e-5 -1.25 1.01-2.26 2.26-2.25l0.238 0.00195v1.94c0.0015 0.217 0.261 0.329 0.42 0.182l2.88-2.68c0.107-0.099 0.107-0.268 0-0.367l-2.88-2.68c-0.0482-0.0446-0.112-0.0685-0.178-0.0664z"/></svg>

src/glyphs/octicons/file-symlink-directory-24.svg

@@ -0,0 +1 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3.75 3c-0.966 0-1.75 0.784-1.75 1.75v4.74c0 1 1.5 1 1.5 0v-4.74c0-0.138 0.112-0.25 0.25-0.25h4.97c0.0828 2.38e-4 0.16 0.0411 0.207 0.109l1.4 2.06c0.326 0.479 0.868 0.766 1.45 0.766h8.47c0.138 0 0.25 0.112 0.25 0.25v11.6c0 0.138-0.112 0.25-0.25 0.25h-13.5c-1 0-1 1.5 0 1.5h13.5c0.966 0 1.75-0.784 1.75-1.75v-11.6c0-0.967-0.784-1.75-1.75-1.75h-8.47c-0.083 0-0.161-0.0404-0.207-0.109l-1.4-2.06c-0.327-0.479-0.867-0.766-1.45-0.766zm5.95 5.99c-0.0441 0.00229-0.0877 0.00751-0.131 0.0176-0.569 0.132-0.775 0.835-0.369 1.25l2.11 2.24h-5.22c-2.26 8.6e-5 -4.09 1.83-4.09 4.09v3.16c0 1 1.5 1 1.5 0v-3.16c8.6e-5 -1.43 1.16-2.59 2.59-2.59h5.22l-2.11 2.24c-0.188 0.194-0.258 0.475-0.182 0.734 0.164 0.564 0.882 0.729 1.28 0.293l3.29-3.5c0.271-0.289 0.271-0.739 0-1.03l-3.29-3.5c-0.12-0.133-0.284-0.218-0.461-0.24-0.044-0.00555-0.0887-0.00619-0.133-0.00391z"/></svg>

src/glyphs/octicons/generate

@@ -8,7 +8,8 @@ import subprocess
 import fontforge
 
 # Double-quotes required here, for version-bump.sh:
-version = "2.3.3"
+# version-bump.sh is not working here, need to adjust manually!
+version = "3.0.0"
 
 archive = 'v18.3.0.tar.gz'
 
@@ -70,7 +71,7 @@ print('Fetching octicons archive "{}"\n'.format(archive))
 if subprocess.call('curl -OL https://github.com/primer/octicons/archive/' + archive, shell=True):
     sys.exit('Error fetching octicons archive')
 print('\nUnpacking octicons archive')
-if subprocess.call('rm -rf icons octicons-* && tar zxf *.gz && mv octicons-*/icons . && rm -rf octicons-*', shell=True):
+if subprocess.call('rm -rf icons octicons-* && tar zxf *.gz && mv octicons-*/icons . && rm -rf octicons-* && cp file-symlink-directory-*.svg icons', shell=True):
     sys.exit('Error unpacking archive')
 
 svgs = os.listdir(vectorsdir)

src/glyphs/octicons/mapping

@@ -130,7 +130,7 @@ F0AA F47E triangle-up
 F0AC F47F git-compare
 F0AD F480 logo-gist
 F0B0 F481 file-symlink-file
-F0B1 F482 bookmark-slash
+F0B1 F482 file-symlink-directory
 F0B2 F483 squirrel
 F0B6 F484 globe
 F0BA F485 unmute
@@ -307,3 +307,4 @@ F302 F52F x-circle
 F303 F530 x-circle-fill
 F304 F531 zoom-in
 F305 F532 zoom-out
+F306 F533 bookmark-slash