From 7543e4a3a862852c7033043646e4c44894bd20e5 Mon Sep 17 00:00:00 2001 From: Fini Jastrow Date: Fri, 19 Jan 2024 16:42:49 +0100 Subject: [PATCH 1/2] Add inverse powerline arrow heads Fixes: #1451 See also (merged but not released): https://github.com/ryanoasis/powerline-extra-symbols/commit/eb6b9721a893bf97268dfed507680467ef91c189 Signed-off-by: Fini Jastrow --- bin/scripts/lib/i_ple.sh | 6 ++++-- bin/scripts/test-fonts.sh | 2 +- bin/scripts/test-powerlines.sh | 10 +++++----- font-patcher | 8 ++++++-- .../powerline-extra/PowerlineExtraSymbols.otf | Bin 50940 -> 51036 bytes src/glyphs/powerline-extra/README.md | 7 +++++-- 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/bin/scripts/lib/i_ple.sh b/bin/scripts/lib/i_ple.sh index 4658a42c0..15ff802e8 100644 --- 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 index 3ffda2cd0..a46ede349 100755 --- 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 index 145902d12..6d7b930a5 100755 --- 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/font-patcher b/font-patcher index 9611cb3e6..efed1c301 100755 --- 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 index b290259b75945971e0d9c5539643a023d5422f52..b1477fe5443d6098952d4556005b9b13e3195b41 100644 GIT binary patch delta 2410 zcmb7Gdr(wW82`?_cX#1}K-w}nTo8FFF2b&o!icn(;({!`kjW4QMZuhv6(yW37aUV# zgVNgsl4fF=Hd-^SW0PrO7%I**+VrxtF*VDg@sFb2efyku*P3M=V zE{n|RhcLMf;LN!@C9=JdX3E-mX}Ste1gxUX_9&UmM(aR}3rbhktzTWcHeRdMrR%g> zTR9iUj=6-dEprOM!7;Q^xLAPX-W2Wi1J}P5J5+VVM#iF)!o`ab8G>7#XT!G->E2irJyF_+{XzAdX7Lv0U5{njVuD8H-d9 zg*(^%h>Z2P*@{PkLA)HgTsNOQMaqeZJV&;WU1TqLpL|4m$u)A9VVEc;j?pmLOab#W zvxcc-`dOYGV_V9{kg!?WnN#Z5u0}J}_H5WpqVm7*iSSsWIYmAt`D8XRkOERj=8z(C znskvf?E9lMAF5io|;(GA)_0k>i(W^3uoYIv7?jNxWoe3X0tY+tkUtWQ_K0u2Mhp#N5>ZuB&XA zYf0u^foW%gV6P84X83q_{e2??Nd%=xRZW6^kjG`9(vq89Lw*6}Uc)@jmkiWBZCFY& zxYrHU&7j=&+l}fJz5%ab94}?ldw-1{<{PD5o_Civ%O+cDA1rklDfc3dkS~SOh+YrM zr1wT+yFEt2rL41y+q0@XXK-y9npsU1E%!GX>A)&%l*t6{xYtUB9y?IsG2RmxT`zdO z7BsFhsgJCC1F^#tyqkWsB)Q>zdXLW$YDf%6UPl^-yeRu`wyxk|oL0^`ld=L}@8d-||l*1=Q zIqQ`oBA*nc7;)9KH5LpQP=kZRd>Rbs@M%zv$r|)n6pn0BgR=3CmNn?{TF^Lr8k7Tr zv;W0pLCT<1sKG%h&Tfi^Wu7Ufe}hC-;Jy z4s1H8r}zUa{d*b#s@S@?%PI_9pxjMfuZU>ymI;cfREp#EazYaNyS!yq8hVz3P1s$R zIK3P`fo?LEq!Jx@g|v}=;%3U275F!Lf%%@zV;8U=v%TyOY#+CftKu$lSGhkphho1n zS9LQ~EnYlXqOxa5xRkcIQ%hM}Ygf5ql>7w|j!!hi0fXNP1m^7OIl<9B+9#gqneh+1 CSX=l2 delta 2279 zcmb7FeNa?Y6hG&^$1XewR&<%nMG;sOQCR#a8O6X97jg#+WGX~NQ*aX56h@k{79G>V z@S|ISXlZ_=rZtn#8mGiC5*wx&O|h9~Y{oL3tn7~xck%7|I(NTtZA+au_nz}R_uSv_ zzB|8}dvTNKZV?^DrKQCnLlcOQ^h7~HQpp~1JV4Yl0LQn^nlZBgMu8pR)E@wlR$P)b zzPsU_dH^&KUa+XP%6|1qoCQE%L$$Lti>scGe)wV=tsSQEXblzO)(G*G|3V|RrnbHj zw&DhW?jeMKt*vT&$__ebjz!17h88Hp1xMfAO(4O?6bPJUEl;yayl#;^8@p^VvE5-1u}D z0~s(DG9il^bTn9gWN&n!8PdlP9?9~fX37R|RiJCW;HqR>qB4gKic92l2AZY4gLs}t z(~&>pVJ7<_YGFn(R^l?O$91?Fci}-ij%V;EydemJK}Zxbgek&op+dMM^og>vOdf{H z+tK-`{1}snqY7{qTCos|@JXDF9e4u2#7;bkUtt%1ji<01PvbXG#LTf17fnhujIPKi z$;`<I%C;j zjASLrjqKaxsgy;g*x5@dJo}Wgv{argOtrJ~sgo&-Hrv^1Gp`*pH?r)s-59ByPn%)->3Bu|UzPrAtBlF=dg@P+RqL9txuDQR@f;?`krp~+E=@=*!YSLTO zKu5M}o++0*gDa}l^I{OVr)$!Nt4&6;yo#Zfody zl9>8yea;K;xO~nF9^d8gJC8{G&I`0Ux$^?R<#*m#c_&@LIN9lUUJ!HV@q>^NC~)Tm zmRx@4@l~JmD4VF=9!icZ=gI?4^ z!R7ZLF9fy!#pEE$uvFy1AQka@8T}sof5rzO$llcauxUjhvG;~#|`wRUB^D5L?{;)2`7bfVvblOej;{>z2X(|rc@yX zaY$#?UymBWCUlf4n>#8*1Gt+&r)eUcgim_qx6aB4qwmFyp=UG!hJ!$lH9{eq*Znzr I Date: Fri, 29 Mar 2024 14:42:58 +0100 Subject: [PATCH 2/2] tests: Add new glyphs to vertical lines test and improve the script code in general Signed-off-by: Fini Jastrow --- bin/scripts/test-vertical-lines.sh | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/bin/scripts/test-vertical-lines.sh b/bin/scripts/test-vertical-lines.sh index 0083e5ab6..c9d0721f4 100755 --- 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}"