From e23243ec786337653b273d9d72eacb21de28499c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 14 May 2024 15:35:43 +0530
Subject: [PATCH] Use PSname in faces preview panel

---
 kittens/choose_fonts/backend.py |  1 +
 kittens/choose_fonts/faces.go   | 12 ++++++------
 kittens/choose_fonts/types.go   |  1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/kittens/choose_fonts/backend.py b/kittens/choose_fonts/backend.py
index 791662ab9..047921965 100644
--- a/kittens/choose_fonts/backend.py
+++ b/kittens/choose_fonts/backend.py
@@ -85,6 +85,7 @@ def render_face_sample(font: Descriptor, opts: Options, dpi_x: float, dpi_y: flo
     metadata = {
         'variable_data': get_variable_data_for_face(face),
         'style': font['style'],
+        'psname': face.postscript_name(),
     }
     if is_variable(font):
         ns = get_named_style(face)
diff --git a/kittens/choose_fonts/faces.go b/kittens/choose_fonts/faces.go
index d16b65ff7..69c39fbe2 100644
--- a/kittens/choose_fonts/faces.go
+++ b/kittens/choose_fonts/faces.go
@@ -71,12 +71,12 @@ func (self *faces) draw_screen() (err error) {
 	}
 
 	slot := 0
-	d := func(setting, title, setting_val string) {
+	d := func(setting, title string) {
 		if int(sz.HeightCells)-y < num_lines+1 {
 			return
 		}
 		lp.MoveCursorTo(1, y+1)
-		_, y, str = self.handler.render_lines.InRectangle([]string{title + fmt.Sprintf(" (%s %s)", setting, setting_val)}, 0, y, int(sz.WidthCells), int(sz.HeightCells), &self.handler.mouse_state, self.on_click)
+		_, y, str = self.handler.render_lines.InRectangle([]string{title + " - " + previews[setting].Psname}, 0, y, int(sz.WidthCells), int(sz.HeightCells), &self.handler.mouse_state, self.on_click)
 		lp.QueueWriteString(str)
 		if y+num_lines < int(sz.HeightCells) {
 			lp.MoveCursorTo(1, y+1)
@@ -85,10 +85,10 @@ func (self *faces) draw_screen() (err error) {
 			y += num_lines + 1
 		}
 	}
-	d(`font_family`, styled("fg=magenta bold", "R")+`egular`, key.settings.font_family)
-	d(`bold_font`, styled("fg=magenta bold", "B")+`old`, key.settings.bold_font)
-	d(`italic_font`, styled("fg=magenta bold", "I")+`talic`, key.settings.italic_font)
-	d(`bold_italic_font`, "B"+styled("fg=magenta bold", "o")+`ld-Italic`, key.settings.bold_italic_font)
+	d(`font_family`, styled("fg=magenta bold", "R")+`egular`)
+	d(`bold_font`, styled("fg=magenta bold", "B")+`old`)
+	d(`italic_font`, styled("fg=magenta bold", "I")+`talic`)
+	d(`bold_italic_font`, "B"+styled("fg=magenta bold", "o")+`ld-Italic`)
 
 	return
 }
diff --git a/kittens/choose_fonts/types.go b/kittens/choose_fonts/types.go
index c3edac8b8..3a92e6329 100644
--- a/kittens/choose_fonts/types.go
+++ b/kittens/choose_fonts/types.go
@@ -90,6 +90,7 @@ type RenderedSampleTransmit struct {
 	Path                 string             `json:"path"`
 	Variable_data        VariableData       `json:"variable_data"`
 	Style                string             `json:"style"`
+	Psname               string             `json:"psname"`
 	Variable_named_style NamedStyle         `json:"variable_named_style"`
 	Variable_axis_map    map[string]float64 `json:"variable_axis_map"`
 }