mirror of
https://github.com/ryanoasis/nerd-fonts.git
synced 2024-09-12 09:41:47 +02:00
Merge pull request #1551 from ryanoasis/feature/Powerline-rounded-overlap
Increase Powerline rounded overlap
This commit is contained in:
Fini
GitHub
commit
a55893d107
8 changed files with 76 additions and 30 deletions
|
|
@ -29,7 +29,7 @@ Note: Usually you need to call the scripts in this directory while actually bein
|
|||
* `standardize-and-complete-readmes.sh`: Used by `gotta-patch-em-all-font-patcher!.sh`
|
||||
* `test-fonts.sh`: Print-to-debug all glyphs we patch in [4]
|
||||
* `test-powerlines.sh`: Print-to-debug powerline examples [4]
|
||||
* `tests.sh`: Create some font usage gif movie? [x]
|
||||
* `test-vertical-lines.sh`: Print-to-debug powerline examples [4]
|
||||
* `update-all-contributors-website.py`: Update the contributors page on `nerdfonts.com` (i.e. gh-pages) [7]
|
||||
* `update-gitignore.sh`: Correct gitignore file for not-released-in-repo fonts [8]
|
||||
* `version-bump.sh`: Change version number in all scripts on a new release [1]
|
||||
|
|
@ -42,4 +42,3 @@ Note: Usually you need to call the scripts in this directory while actually bein
|
|||
[6] Used by CI (github casks workflow)
|
||||
[7] Used by CI (github contributors workflow)
|
||||
[8] Used by CI (github fontjson workflow)
|
||||
[x] Probably not used by anything
|
||||
|
|
|
|||
24
bin/scripts/test-vertical-lines.sh
Executable file
24
bin/scripts/test-vertical-lines.sh
Executable file
|
|
@ -0,0 +1,24 @@
|
|||
#!/usr/bin/env bash
|
||||
# Nerd Fonts Version: 3.1.1
|
||||
# Script Version: 1.0.0
|
||||
#
|
||||
# A more conceise version of the Powerline test, designed to show
|
||||
# the dreaded 'faint vertical lines' phenomenon from LCD antialiasing
|
||||
|
||||
COL_A='\033[48;5;51m\033[38;5;200m'
|
||||
COL_B='\033[48;5;200m\033[38;5;51m'
|
||||
|
||||
printf "\
|
||||
${COL_A} \n\
|
||||
Under \ue0b2${COL_B} lap ${COL_A}\ue0b0 and \ue0b6${COL_B} top ${COL_A}\ue0b4 mop \n\
|
||||
${COL_A}Over \ue0b2${COL_B} lap ${COL_A}\ue0b0 and \ue0b6${COL_B} top ${COL_A}\ue0b4 mop trop lop klop\n\
|
||||
\n"
|
||||
|
||||
COL_A='\033[48;5;238m\033[38;5;253m'
|
||||
COL_B='\033[48;5;253m\033[38;5;238m'
|
||||
|
||||
printf "\
|
||||
${COL_A} \n\
|
||||
Under \ue0b2${COL_B} lap ${COL_A}\ue0b0 and \ue0b6${COL_B} top ${COL_A}\ue0b4 mop \n\
|
||||
${COL_A}Over \ue0b2${COL_B} lap ${COL_A}\ue0b0 and \ue0b6${COL_B} top ${COL_A}\ue0b4 mop trop lop klop\n\
|
||||
\n"
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
# Nerd Fonts Version: 3.1.1
|
||||
# Script Version: 1.0.1
|
||||
|
||||
clear
|
||||
echo "Click to start"
|
||||
|
||||
# Window geometry
|
||||
# source: https://www.maketecheasier.com/record-screen-as-animated-gif-ubuntu/
|
||||
XWININFO=$(xwininfo)
|
||||
read -r X < <(awk -F: '/Absolute upper-left X/{print $2}' <<< "$XWININFO")
|
||||
read -r Y < <(awk -F: '/Absolute upper-left Y/{print $2}' <<< "$XWININFO")
|
||||
read -r W < <(awk -F: '/Width/{print $2}' <<< "$XWININFO")
|
||||
read -r H < <(awk -F: '/Height/{print $2}' <<< "$XWININFO")
|
||||
|
||||
byzanz-record -c --exec=./test-fonts.sh --x="$X" --y="$Y" --width="$W" --height="$H" "rec3.gif"
|
||||
|
||||
convert -coalesce "rec3.gif" "results/nerd-fonts.png"
|
||||
convert -append "$(ls -v results/*.png)" ./test-combined.png
|
||||
|
||||
16
font-patcher
16
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.10.1"
|
||||
script_version = "4.10.2"
|
||||
|
||||
version = "3.1.1"
|
||||
projectName = "Nerd Fonts"
|
||||
|
|
@ -857,9 +857,9 @@ class font_patcher:
|
|||
0xe0b3: {'align': 'r', 'valign': 'c', 'stretch': 'xy', 'params': {'xy-ratio': 0.7}},
|
||||
|
||||
# Rounded arcs
|
||||
0xe0b4: {'align': 'l', 'valign': 'c', 'stretch': 'xy', 'params': {'overlap': 0.01, 'xy-ratio': 0.59}},
|
||||
0xe0b4: {'align': 'l', 'valign': 'c', 'stretch': 'xy', 'params': {'overlap': 0.06, 'xy-ratio': 0.59}},
|
||||
0xe0b5: {'align': 'l', 'valign': 'c', 'stretch': 'xy', 'params': {'xy-ratio': 0.5}},
|
||||
0xe0b6: {'align': 'r', 'valign': 'c', 'stretch': 'xy', 'params': {'overlap': 0.01, 'xy-ratio': 0.59}},
|
||||
0xe0b6: {'align': 'r', 'valign': 'c', 'stretch': 'xy', 'params': {'overlap': 0.06, 'xy-ratio': 0.59}},
|
||||
0xe0b7: {'align': 'r', 'valign': 'c', 'stretch': 'xy', 'params': {'xy-ratio': 0.5}},
|
||||
|
||||
# Bottom Triangles
|
||||
|
|
@ -1067,11 +1067,11 @@ class font_patcher:
|
|||
{'Enabled': True, 'Name': "Devicons", 'Filename': "devicons/devicons.ttf", 'Exact': False, 'SymStart': 0xE600, 'SymEnd': 0xE6C5, 'SrcStart': 0xE700, 'ScaleRules': DEVI_SCALE_LIST, 'Attributes': SYM_ATTR_DEFAULT},
|
||||
{'Enabled': self.args.powerline, 'Name': "Powerline Symbols", 'Filename': "powerline-symbols/PowerlineSymbols.otf", 'Exact': True, 'SymStart': 0xE0A0, 'SymEnd': 0xE0A2, 'SrcStart': None, 'ScaleRules': None, 'Attributes': SYM_ATTR_POWERLINE},
|
||||
{'Enabled': self.args.powerline, 'Name': "Powerline Symbols", 'Filename': "powerline-symbols/PowerlineSymbols.otf", 'Exact': True, 'SymStart': 0xE0B0, 'SymEnd': 0xE0B3, 'SrcStart': None, 'ScaleRules': None, 'Attributes': SYM_ATTR_POWERLINE},
|
||||
{'Enabled': self.args.powerlineextra, 'Name': "Powerline Extra Symbols", 'Filename': "PowerlineExtraSymbols.otf", 'Exact': True, 'SymStart': 0xE0A3, 'SymEnd': 0xE0A3, 'SrcStart': None, 'ScaleRules': None, 'Attributes': SYM_ATTR_POWERLINE},
|
||||
{'Enabled': self.args.powerlineextra, 'Name': "Powerline Extra Symbols", 'Filename': "PowerlineExtraSymbols.otf", 'Exact': True, 'SymStart': 0xE0B4, 'SymEnd': 0xE0C8, 'SrcStart': None, 'ScaleRules': None, 'Attributes': SYM_ATTR_POWERLINE},
|
||||
{'Enabled': self.args.powerlineextra, 'Name': "Powerline Extra Symbols", 'Filename': "PowerlineExtraSymbols.otf", 'Exact': True, 'SymStart': 0xE0CA, 'SymEnd': 0xE0CA, 'SrcStart': None, 'ScaleRules': None, 'Attributes': SYM_ATTR_POWERLINE},
|
||||
{'Enabled': self.args.powerlineextra, 'Name': "Powerline Extra Symbols", 'Filename': "PowerlineExtraSymbols.otf", 'Exact': True, 'SymStart': 0xE0CC, 'SymEnd': 0xE0D4, 'SrcStart': None, 'ScaleRules': None, 'Attributes': SYM_ATTR_POWERLINE},
|
||||
{'Enabled': self.args.powerlineextra, 'Name': "Powerline Extra Symbols", 'Filename': "PowerlineExtraSymbols.otf", 'Exact': True, 'SymStart': 0x2630, 'SymEnd': 0x2630, 'SrcStart': None, 'ScaleRules': None, 'Attributes': SYM_ATTR_TRIGRAPH},
|
||||
{'Enabled': self.args.powerlineextra, 'Name': "Powerline Extra Symbols", 'Filename': "powerline-extra/PowerlineExtraSymbols.otf", 'Exact': True, 'SymStart': 0xE0A3, 'SymEnd': 0xE0A3, 'SrcStart': None, 'ScaleRules': None, 'Attributes': SYM_ATTR_POWERLINE},
|
||||
{'Enabled': self.args.powerlineextra, 'Name': "Powerline Extra Symbols", 'Filename': "powerline-extra/PowerlineExtraSymbols.otf", 'Exact': True, 'SymStart': 0xE0B4, 'SymEnd': 0xE0C8, 'SrcStart': None, 'ScaleRules': None, 'Attributes': SYM_ATTR_POWERLINE},
|
||||
{'Enabled': self.args.powerlineextra, 'Name': "Powerline Extra Symbols", 'Filename': "powerline-extra/PowerlineExtraSymbols.otf", 'Exact': True, 'SymStart': 0xE0CA, 'SymEnd': 0xE0CA, 'SrcStart': None, 'ScaleRules': None, 'Attributes': SYM_ATTR_POWERLINE},
|
||||
{'Enabled': self.args.powerlineextra, 'Name': "Powerline Extra Symbols", 'Filename': "powerline-extra/PowerlineExtraSymbols.otf", 'Exact': True, 'SymStart': 0xE0CC, 'SymEnd': 0xE0D4, 'SrcStart': None, 'ScaleRules': None, 'Attributes': SYM_ATTR_POWERLINE},
|
||||
{'Enabled': self.args.powerlineextra, 'Name': "Powerline Extra Symbols", 'Filename': "powerline-extra/PowerlineExtraSymbols.otf", 'Exact': True, 'SymStart': 0x2630, 'SymEnd': 0x2630, 'SrcStart': None, 'ScaleRules': None, 'Attributes': SYM_ATTR_TRIGRAPH},
|
||||
{'Enabled': self.args.pomicons, 'Name': "Pomicons", 'Filename': "Pomicons.otf", 'Exact': True, 'SymStart': 0xE000, 'SymEnd': 0xE00A, 'SrcStart': None, 'ScaleRules': None, 'Attributes': SYM_ATTR_DEFAULT},
|
||||
{'Enabled': self.args.fontawesome, 'Name': "Font Awesome", 'Filename': "font-awesome/FontAwesome.otf", 'Exact': True, 'SymStart': 0xF000, 'SymEnd': 0xF2E0, 'SrcStart': None, 'ScaleRules': FONTA_SCALE_LIST, 'Attributes': SYM_ATTR_FONTA},
|
||||
{'Enabled': self.args.fontawesomeextension, 'Name': "Font Awesome Extension", 'Filename': "font-awesome-extension.ttf", 'Exact': False, 'SymStart': 0xE000, 'SymEnd': 0xE0A9, 'SrcStart': 0xE200, 'ScaleRules': None, 'Attributes': SYM_ATTR_DEFAULT}, # Maximize
|
||||
|
|
|
|||
21
src/glyphs/powerline-extra/LICENSE
Normal file
21
src/glyphs/powerline-extra/LICENSE
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
MIT License
|
||||
|
||||
Copyright (c) 2016 Ryan L McIntyre
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
Binary file not shown.
13
src/glyphs/powerline-extra/README.md
Normal file
13
src/glyphs/powerline-extra/README.md
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
# Powerline Extra
|
||||
|
||||
For more information have a look at the upstream website: https://github.com/ryanoasis/powerline-extra-symbols
|
||||
|
||||
## Source modified
|
||||
|
||||
* Add missing Ice Waveform Mirrored glyph (0xE0CA)
|
||||
* Add Trigraph Heaven glyph (0x2630)
|
||||
* Simplify Waveform glyphs (0xE0C8, 0xE0CA)
|
||||
* Glyph 0xE0B4 and 0xE0B6 got an additional 7% strip on their straight side.
|
||||
* Change version of font to 1.001
|
||||
|
||||
Version: 1.000 (from about 2016)
|
||||
9
src/glyphs/powerline-symbols/README.md
Normal file
9
src/glyphs/powerline-symbols/README.md
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
# Powerline Symbols
|
||||
|
||||
For more information have a look at the upstream website: https://github.com/powerline/powerline
|
||||
|
||||
## Source modified
|
||||
|
||||
* Glyph 0xE0B0 and 0xE0B2 got an additional 7% strip on their straight side.
|
||||
|
||||
Version: 1.000 (from about 2013)
|
||||
Loading…
Reference in a new issue