From d01730862b2e427000ce1bb4fe0271a70e5b2353 Mon Sep 17 00:00:00 2001 From: Christopher Vagnetoft Date: Fri, 26 Sep 2025 15:26:26 +0200 Subject: [PATCH] Fix unicode glyphs --- Makefile | 6 ++++++ src/Editor/Editor.php | 2 +- src/List/TreeList.php | 16 ++++++++-------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index f4fd4ca..575d3b1 100644 --- a/Makefile +++ b/Makefile @@ -7,3 +7,9 @@ jsonedit.phar: composer .PHONY: composer composer: test -d vendor || composer install + +.PHONY: push-deb +push-deb: + curl --user $(GITEA_CREDENTIALS) \ + --upload-file jsonedit.deb \ + https://dev.noccylabs.info/api/packages/noccylabs/debian/pool/any/main/upload diff --git a/src/Editor/Editor.php b/src/Editor/Editor.php index c1991d2..ed42deb 100644 --- a/src/Editor/Editor.php +++ b/src/Editor/Editor.php @@ -1053,7 +1053,7 @@ class Editor $this->term->setCursor(1, $h); echo "\e[37;40m\e[K"; foreach ($keys as $key=>$info) - echo "\e[2m\u{f104}\e[22;97;1m{$key}\e[22;37;2m\u{f105} \e[22;33m{$info}\e[37m "; + echo "\e[2m[\e[22;97;1m{$key}\e[22;37;2m] \e[22;33m{$info}\e[37m "; //echo "\e[37;40;2m\u{e0b6}\e[7;37m{$key} \e[22m {$info} \e[27m\u{e0b4}\e[0m"; //echo " \e[1m{$key}\e[2m \e[3m{$info}\e[0m \e[90m\u{2502}\e[0m"; } diff --git a/src/List/TreeList.php b/src/List/TreeList.php index e5b63c7..663e2e1 100644 --- a/src/List/TreeList.php +++ b/src/List/TreeList.php @@ -25,16 +25,16 @@ class TreeList implements Countable, IteratorAggregate /** @var array */ public array $list = []; - private const TREE_FOLD_OPEN = "\u{f0fe}"; - private const TREE_FOLD_CLOSE = "\u{f146}"; + private const TREE_FOLD_OPEN = "\u{25b8}"; + private const TREE_FOLD_CLOSE = "\u{25be}"; private const TREE_INDENT_GUIDE = "\u{258e} "; private const TREE_INDENT = " "; - private const ICON_NUMERIC = "\u{f89f}"; - private const ICON_STRING = "\u{f10e}"; - private const ICON_BOOL_TRUE = "\u{f657}"; - private const ICON_BOOL_FALSE = "\u{f630}"; - private const ICON_NULL = "\u{f141}"; + private const ICON_NUMERIC = "\u{2960}"; + private const ICON_STRING = "\u{275e}"; + private const ICON_BOOL_TRUE = "\u{2611}"; + private const ICON_BOOL_FALSE = "\u{2610}"; + private const ICON_NULL = "\u{2609}"; public array $searchResults = []; @@ -227,7 +227,7 @@ class TreeList implements Countable, IteratorAggregate } echo (is_int($entry->key) ?(Settings::$highlightIndices - ?"\e[{$keyStyle};2m\u{e0b6}\e[7m#{$entry->key}\e[27m\u{e0b4}\e[22;37m " + ?"\e[{$keyStyle};2m[\e[7m#{$entry->key}\e[27m]\e[22;37m " :"\e[{$keyStyle};2m#{$entry->key}\e[22;37m " ) :(Settings::$editorQuotedKeys