Merge pull request #1490 from ryanoasis/feature/inverted-pl-arrowheads

Add inverse powerline arrow heads
ryanoasis · Mar 29, 2024 · c32041c · c32041c
2 parents 8bb2704 + 5d463f0
commit c32041c
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 28 deletions.
diff --git a/bin/scripts/lib/i_ple.sh b/bin/scripts/lib/i_ple.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-# Powerline Extra Symbols (38 icons, 3 aliases)
-# Codepoints: E0A0-E0A3 E0B0-E0BF E0C0-E0C8 E0CC-E0CF E0D0-E0D2 E0D4
+# Powerline Extra Symbols (40 icons, 3 aliases)
+# Codepoints: E0A0-E0A3 E0B0-E0BF E0C0-E0C8 E0CC-E0CF E0D0-E0D2 E0D4 E0D6-E0D7
 test -n "$__i_ple_loaded" && return || __i_ple_loaded=1
 i='' i_pl_branch=$i
 i='' i_pl_line_number=$i
@@ -43,4 +43,6 @@ i='' i_ple_lego_block_facing=$i
 i='' i_ple_lego_block_sideways=$i
 i='' i_ple_trapezoid_top_bottom=$i
 i='' i_ple_trapezoid_top_bottom_mirrored=$i
+i='' i_pl_right_hard_divider_inverse=$i
+i='' i_pl_left_hard_divider_inverse=$i
 unset i
diff --git a/bin/scripts/test-fonts.sh b/bin/scripts/test-fonts.sh
@@ -146,7 +146,7 @@ function test-fonts() {
   echo; echo
 
   echo "Nerd Fonts - Powerline Extra"
-  print-unicode-ranges e0a3 e0a3 e0b4 e0c8 e0cc e0d2 e0d4 e0d4
+  print-unicode-ranges e0a3 e0a3 e0b4 e0c8 e0cc e0d2 e0d4 e0d4 e0d6 e0d7
   echo; echo
 
   echo "Nerd Fonts - Symbols original"

diff --git a/bin/scripts/test-powerlines.sh b/bin/scripts/test-powerlines.sh
@@ -8,11 +8,11 @@
 text1='Testing'
 text2='Nerd Fonts'
 
-leftSymbolsCodes=('E0B0' 'E0B4' 'E0B8' 'E0BC' 'E0C0' 'E0C4' 'E0C6' 'E0C8' 'E0CC' 'E0CD' 'E0CE' 'E0CF' 'E0D0' 'E0D1' 'E0D2')
-leftSymbols=('' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
-rightSymbolsCodes=('E0B2' 'E0B6' 'E0BA' 'E0BE' 'E0C2' 'E0C5' 'E0C7' 'E0CA' 'E0CC' 'E0CD' 'E0CE' 'E0CF' 'E0D0' 'E0D1' 'E0D4')
-rightSymbols=('' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
-isWide=(0 0 0 0 1 1 1 1 1 1 1 1 1 1 0)
+leftSymbolsCodes=('E0B0' 'E0B4' 'E0B8' 'E0BC' 'E0C0' 'E0C4' 'E0C6' 'E0C8' 'E0CC' 'E0CD' 'E0CE' 'E0CF' 'E0D0' 'E0D1' 'E0D2' 'E0D6')
+leftSymbols=('' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
+rightSymbolsCodes=('E0B2' 'E0B6' 'E0BA' 'E0BE' 'E0C2' 'E0C5' 'E0C7' 'E0CA' 'E0CC' 'E0CD' 'E0CE' 'E0CF' 'E0D0' 'E0D1' 'E0D4' 'E0D7')
+rightSymbols=('' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
+isWide=(0 0 0 0 1 1 1 1 1 1 1 1 1 1 0 0)
 
 colorReset='\033[0m'
 #colorBgWhite='\033[107m'

diff --git a/bin/scripts/test-vertical-lines.sh b/bin/scripts/test-vertical-lines.sh
@@ -1,27 +1,24 @@
 #!/usr/bin/env bash
 # Nerd Fonts Version: 3.1.1
-# Script Version: 1.0.1
+# Script Version: 1.1.0
 #
 # A more conceise version of the Powerline test, designed to show
 # the dreaded 'faint vertical lines' phenomenon from LCD antialiasing
 
+function some_output {
+    printf "\
+%s                                                         \n\
+Under \ue0b2%s lap %s\ue0b0 and \ue0b6%s top %s\ue0b4 mop   \ue0b2\ue0d6 \ue0d7\ue0b0     \n\
+%sOver \ue0b2%s lap %s\ue0b0 and \ue0b6%s top %s\ue0b4 mop trop lop klop\n\
+                                      \n" \
+"${1}" "${2}" "${1}" "${2}" "${1}" \
+"${1}" "${2}" "${1}" "${2}" "${1}"
+}
+
 COL_A=$(printf '\033[48;5;51m\033[38;5;200m')
 COL_B=$(printf '\033[48;5;200m\033[38;5;51m')
 COL_C=$(printf '\033[48;5;238m\033[38;5;253m')
 COL_D=$(printf '\033[48;5;253m\033[38;5;238m')
 
-printf "\
-%s                                                         \n\
-Under \ue0b2%s lap %s\ue0b0 and \ue0b6%s top %s\ue0b4 mop             \n\
-%sOver \ue0b2%s lap %s\ue0b0 and \ue0b6%s top %s\ue0b4 mop trop lop klop\n\
-                                      \n" \
-"${COL_A}" "${COL_B}" "${COL_A}" "${COL_B}" "${COL_A}" \
-"${COL_A}" "${COL_B}" "${COL_A}" "${COL_B}" "${COL_A}"
-
-printf "\
-%s                                                         \n\
-Under \ue0b2%s lap %s\ue0b0 and \ue0b6%s top %s\ue0b4 mop             \n\
-%sOver \ue0b2%s lap %s\ue0b0 and \ue0b6%s top %s\ue0b4 mop trop lop klop\n\
-                                      \n" \
-"${COL_C}" "${COL_D}" "${COL_C}" "${COL_D}" "${COL_C}" \
-"${COL_C}" "${COL_D}" "${COL_C}" "${COL_D}" "${COL_C}"
+some_output "${COL_A}" "${COL_B}"
+some_output "${COL_C}" "${COL_D}"
diff --git a/font-patcher b/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.11.0"
+script_version = "4.12.0"
 
 version = "3.1.1"
 projectName = "Nerd Fonts"
@@ -857,6 +857,10 @@ class font_patcher:
             0xe0b2: {'align': 'r', 'valign': 'c', 'stretch': '^xy', 'params': {'overlap': 0.06, 'xy-ratio': 0.7}},
             0xe0b3: {'align': 'r', 'valign': 'c', 'stretch': '^xy', 'params': {'xy-ratio': 0.7}},
 
+            # Inverse arrow tips
+            0xe0d6: {'align': 'l', 'valign': 'c', 'stretch': '^xy', 'params': {'overlap': 0.05, 'xy-ratio': 0.7}},
+            0xe0d7: {'align': 'r', 'valign': 'c', 'stretch': '^xy', 'params': {'overlap': 0.05, 'xy-ratio': 0.7}},
+
             # Rounded arcs
             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}},
@@ -1071,7 +1075,7 @@ class font_patcher:
             {'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': 0xE0CC, 'SymEnd': 0xE0D7, '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},

diff --git a/src/glyphs/powerline-extra/PowerlineExtraSymbols.otf b/src/glyphs/powerline-extra/PowerlineExtraSymbols.otf
diff --git a/src/glyphs/powerline-extra/README.md b/src/glyphs/powerline-extra/README.md
@@ -2,12 +2,15 @@
 
 For more information have a look at the upstream website: https://github.com/ryanoasis/powerline-extra-symbols
 
+Version: 1.000 (from about 2016)
+
 ## 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
+* Add inverse triangular glyphs at 0xE0D6 and 0xE0D7
+* Change version of font to 1.100
 
-Version: 1.000 (from about 2016)
+Version: 1.100 (our version)