From ff74f9be83a80f58d26f7ac9802a59b587866d9f Mon Sep 17 00:00:00 2001 From: Fini Jastrow Date: Fri, 13 Jan 2023 08:55:33 +0100 Subject: [PATCH 1/4] Clean up icons.tsv [why] The 'new' in the middle can be confusing. What is the meaning? Also the offsets are easier to graps if they are all equally wide (i.e. have leading padding zeros). See https://github.com/ryanoasis/nerd-fonts/pull/990#discussion_r1016193488 Signed-off-by: Fini Jastrow --- src/svgs/icons.tsv | 149 ++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 75 deletions(-) diff --git a/src/svgs/icons.tsv b/src/svgs/icons.tsv index 93c81f13a0..f18094bcc5 100644 --- a/src/svgs/icons.tsv +++ b/src/svgs/icons.tsv @@ -10,81 +10,80 @@ # # offset name (in i_seti.sh) filename (.svg) # -0 i_custom_folder_npm npm-folder_nf.svg -1 i_custom_folder_git git-folder_nf.svg -1 i_custom_folder_git_branch -2 i_custom_folder_config config-folder_nf.svg -3 i_custom_folder_github octocat-folder_nf.svg -4 i_custom_folder_open open-folder_nf.svg -5 i_custom_folder folder_nf.svg -6 i_seti_stylus stylus.svg -7 i_seti_project project.svg -8 i_custom_play_arrow play-arrow_nf.svg -8 i_seti_play_arrow -9 i_seti_sass sass.svg -10 i_seti_rails rails.svg -11 i_seti_ruby ruby.svg -12 i_seti_python python.svg -13 i_seti_heroku heroku.svg -14 i_seti_php php.svg -15 i_seti_markdown markdown.svg -16 i_seti_license license.svg -17 i_seti_json less.svg -17 i_seti_less -18 i_seti_javascript javascript.svg -19 i_seti_image image.svg -20 i_seti_html html.svg -21 i_seti_mustache mustache.svg -22 i_seti_gulp gulp.svg -23 i_seti_grunt grunt.svg -24 i_custom_default file_nf.svg -24 i_seti_default -24 i_seti_text -25 i_seti_folder folder.svg -26 i_seti_css css.svg -27 i_seti_config config.svg -28 i_seti_npm npm.svg -28 i_seti_npm_ignored -29 i_custom_home home_nf.svg -29 i_seti_home -30 i_seti_ejs ejs.svg -31 i_seti_xml xml.svg -32 i_seti_bower bower.svg -33 i_seti_coffee coffee.svg -33 i_seti_cjsx -34 i_seti_twig twig.svg -35 i_custom_cpp cpp_nf.svg -36 i_custom_c c_nf.svg -37 i_seti_haskell haskell.svg -38 i_seti_lua lua.svg -39 i_indent_line separator_nf.svg -39 i_indentation_line -39 i_indent_dotted_guide -40 i_seti_karma karma.svg -41 i_seti_favicon favicon.svg -42 i_seti_julia julia.svg -43 i_seti_react react.svg -44 i_custom_go go_nf.svg -45 i_seti_go go.svg -46 i_seti_typescript typescript.svg -47 i_custom_msdos ms-dos_nf.svg -48 i_custom_windows windows.svg -49 i_custom_vim vim_nf.svg -50 i_custom_elm elm_nf.svg -50 i_seti_elm -51 i_custom_elixir elixir_nf.svg -51 i_seti_elixir -52 i_custom_electron electron_nf.svg -53 i_custom_crystal crystal_nf.svg -53 i_seti_crystal -54 i_custom_purescript purescript_nf.svg -54 i_seti_purescript -55 i_seti_puppet puppet.svg -55 i_custom_puppet -56 i_custom_emacs emacs_nf.svg -57 i_custom_orgmode orgmode_nf.svg -58 i_custom_kotlin kotlin_nf.svg -# new +000 i_custom_folder_npm npm-folder_nf.svg +001 i_custom_folder_git git-folder_nf.svg +001 i_custom_folder_git_branch +002 i_custom_folder_config config-folder_nf.svg +003 i_custom_folder_github octocat-folder_nf.svg +004 i_custom_folder_open open-folder_nf.svg +005 i_custom_folder folder_nf.svg +006 i_seti_stylus stylus.svg +007 i_seti_project project.svg +008 i_custom_play_arrow play-arrow_nf.svg +008 i_seti_play_arrow +009 i_seti_sass sass.svg +010 i_seti_rails rails.svg +011 i_seti_ruby ruby.svg +012 i_seti_python python.svg +013 i_seti_heroku heroku.svg +014 i_seti_php php.svg +015 i_seti_markdown markdown.svg +016 i_seti_license license.svg +017 i_seti_json less.svg +017 i_seti_less +018 i_seti_javascript javascript.svg +019 i_seti_image image.svg +020 i_seti_html html.svg +021 i_seti_mustache mustache.svg +022 i_seti_gulp gulp.svg +023 i_seti_grunt grunt.svg +024 i_custom_default file_nf.svg +024 i_seti_default +024 i_seti_text +025 i_seti_folder folder.svg +026 i_seti_css css.svg +027 i_seti_config config.svg +028 i_seti_npm npm.svg +028 i_seti_npm_ignored +029 i_custom_home home_nf.svg +029 i_seti_home +030 i_seti_ejs ejs.svg +031 i_seti_xml xml.svg +032 i_seti_bower bower.svg +033 i_seti_coffee coffee.svg +033 i_seti_cjsx +034 i_seti_twig twig.svg +035 i_custom_cpp cpp_nf.svg +036 i_custom_c c_nf.svg +037 i_seti_haskell haskell.svg +038 i_seti_lua lua.svg +039 i_indent_line separator_nf.svg +039 i_indentation_line +039 i_indent_dotted_guide +040 i_seti_karma karma.svg +041 i_seti_favicon favicon.svg +042 i_seti_julia julia.svg +043 i_seti_react react.svg +044 i_custom_go go_nf.svg +045 i_seti_go go.svg +046 i_seti_typescript typescript.svg +047 i_custom_msdos ms-dos_nf.svg +048 i_custom_windows windows.svg +049 i_custom_vim vim_nf.svg +050 i_custom_elm elm_nf.svg +050 i_seti_elm +051 i_custom_elixir elixir_nf.svg +051 i_seti_elixir +052 i_custom_electron electron_nf.svg +053 i_custom_crystal crystal_nf.svg +053 i_seti_crystal +054 i_custom_purescript purescript_nf.svg +054 i_seti_purescript +055 i_seti_puppet puppet.svg +055 i_custom_puppet +056 i_custom_emacs emacs_nf.svg +057 i_custom_orgmode orgmode_nf.svg +058 i_custom_kotlin kotlin_nf.svg 058 i_seti_kotlin 059 i_seti_apple apple.svg 060 i_seti_argdown argdown.svg From edca0d19e4c712f635679256aa5f4bf3a55ffdee Mon Sep 17 00:00:00 2001 From: igna_martinoli Date: Sun, 6 Nov 2022 15:11:42 -0300 Subject: [PATCH 2/4] Improve Assembly icon [what] Adds consistance with other low level languages icons like C/C++. Reverted the change on `asm.svg`, added `asm_nf.svg`, modified `icons.tsv` [note] Closes https://github.com/ryanoasis/nerd-fonts/issues/857. Closes [990#pullrequestreview-1171459043](https://github.com/ryanoasis/nerd-fonts/pull/990#pullrequestreview-1171459043) Signed-off-by: igna_martinoli [Note by Fini: Squashed two commits.] Signed-off-by: Fini Jastrow --- src/svgs/asm_nf.svg | 49 +++++++++++++++++++++++++++++++++++++++++++++ src/svgs/icons.tsv | 1 + 2 files changed, 50 insertions(+) create mode 100644 src/svgs/asm_nf.svg diff --git a/src/svgs/asm_nf.svg b/src/svgs/asm_nf.svg new file mode 100644 index 0000000000..dd98f4831f --- /dev/null +++ b/src/svgs/asm_nf.svg @@ -0,0 +1,49 @@ + + + + + + + + + + diff --git a/src/svgs/icons.tsv b/src/svgs/icons.tsv index f18094bcc5..2138638a58 100644 --- a/src/svgs/icons.tsv +++ b/src/svgs/icons.tsv @@ -84,6 +84,7 @@ 056 i_custom_emacs emacs_nf.svg 057 i_custom_orgmode orgmode_nf.svg 058 i_custom_kotlin kotlin_nf.svg +59 i_custom_asm asm_nf.svg 058 i_seti_kotlin 059 i_seti_apple apple.svg 060 i_seti_argdown argdown.svg From 2dde4acd83b00408609e685b767c5fe88d5c604c Mon Sep 17 00:00:00 2001 From: Fini Jastrow Date: Fri, 13 Jan 2023 09:22:08 +0100 Subject: [PATCH 3/4] Fix i_custom_asm codepoint [why] The new asm icon replaces the apple icon. I believe this has been entered as offset by mistake. [how] Add new icon to bottom. Signed-off-by: Fini Jastrow --- src/svgs/icons.tsv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/svgs/icons.tsv b/src/svgs/icons.tsv index 2138638a58..b3ec4dc16f 100644 --- a/src/svgs/icons.tsv +++ b/src/svgs/icons.tsv @@ -84,7 +84,6 @@ 056 i_custom_emacs emacs_nf.svg 057 i_custom_orgmode orgmode_nf.svg 058 i_custom_kotlin kotlin_nf.svg -59 i_custom_asm asm_nf.svg 058 i_seti_kotlin 059 i_seti_apple apple.svg 060 i_seti_argdown argdown.svg @@ -207,3 +206,4 @@ 174 i_seti_yml yml.svg 175 i_seti_zig zig.svg 176 i_seti_zip zip.svg +177 i_custom_asm asm_nf.svg From 2fc092df72271167a1ef8fb5ff06edb99360d224 Mon Sep 17 00:00:00 2001 From: Fini Jastrow Date: Fri, 13 Jan 2023 09:41:53 +0100 Subject: [PATCH 4/4] CI: Add updated i_seti.sh [why] When we add new icons to the original-source the generator updates the cheat sheet list. But that is never committed to the repo. Signed-off-by: Fini Jastrow --- .github/workflows/packsvgs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/packsvgs.yml b/.github/workflows/packsvgs.yml index 8c9aafebcf..d046e25d7b 100644 --- a/.github/workflows/packsvgs.yml +++ b/.github/workflows/packsvgs.yml @@ -77,7 +77,7 @@ jobs: uses: EndBug/add-and-commit@v9 with: fetch: false - add: 'src/glyphs/original-source.otf' + add: "['src/glyphs/original-source.otf', 'bin/scripts/lib/i_seti.sh']" message: "[ci] Rebuild original-source font" committer_name: GitHub Actions committer_email: 41898282+github-actions[bot]@users.noreply.github.com