From 3e39feb04698f1ef15d30c6d933c715311d0f42c Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Thu, 17 Oct 2019 14:59:26 +0200 Subject: [PATCH] info: No need to put TM and (R) as exponents The font glyphs already put those characters in the upper right of where the character should be. --- panels/info-overview/info-cleanup.c | 8 ++++---- tests/info/info-cleanup-test.txt | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c index eb81c9b4c..5a7392722 100644 --- a/panels/info-overview/info-cleanup.c +++ b/panels/info-overview/info-cleanup.c @@ -37,13 +37,13 @@ prettify_info (const char *info) int i; static const ReplaceStrings rs[] = { { "Mesa DRI ", ""}, - { "Intel[(]R[)]", "Intel\302\256"}, - { "Core[(]TM[)]", "Core\342\204\242"}, - { "Atom[(]TM[)]", "Atom\342\204\242"}, + { "Intel[(]R[)]", "Intel\302\256"}, + { "Core[(]TM[)]", "Core\342\204\242"}, + { "Atom[(]TM[)]", "Atom\342\204\242"}, { "Gallium .* on (AMD .*)", "\\1"}, { "(AMD .*) [(].*", "\\1"}, { "(AMD [A-Z])(.*)", "\\1\\L\\2\\E"}, - { "AMD", "AMD\302\256"}, + { "AMD", "AMD\302\256"}, { "Graphics Controller", "Graphics"}, }; diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt index 29f4e79fc..6dc72a56e 100644 --- a/tests/info/info-cleanup-test.txt +++ b/tests/info/info-cleanup-test.txt @@ -1,8 +1,8 @@ -Intel(R) Core(TM) i5-4590T CPU @ 2.00GHz Intel® Core i5-4590T CPU @ 2.00GHz -Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile -Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile -Gallium 0.4 on AMD KAVERI AMD® Kaveri -AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD® Kaveri -AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD® Kaveri -Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD® Kaveri -Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD® Kaveri +Intel(R) Core(TM) i5-4590T CPU @ 2.00GHz Intel® Core™ i5-4590T CPU @ 2.00GHz +Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile +Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile +Gallium 0.4 on AMD KAVERI AMD® Kaveri +AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD® Kaveri +AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD® Kaveri +Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD® Kaveri +Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD® Kaveri