From 9be7345ba6ed9f77e38355af2cb2cafb1ac3a44d Mon Sep 17 00:00:00 2001 From: pagedown Date: Fri, 5 Nov 2021 11:03:22 +0800 Subject: [PATCH 1/2] Capitalize menu item and adjust the order of menu items following the convention --- kitty/cocoa_window.m | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/kitty/cocoa_window.m b/kitty/cocoa_window.m index 3d8385bb6..2a335324c 100644 --- a/kitty/cocoa_window.m +++ b/kitty/cocoa_window.m @@ -380,7 +380,16 @@ cocoa_create_global_menu(void) { keyEquivalent:@""]; [appMenu addItem:[NSMenuItem separatorItem]]; MENU_ITEM(appMenu, @"Preferences…", edit_config_file); - MENU_ITEM(appMenu, @"Reload preferences", reload_config); + MENU_ITEM(appMenu, @"Reload Preferences", reload_config); + [appMenu addItem:[NSMenuItem separatorItem]]; + + NSMenu* servicesMenu = [[NSMenu alloc] init]; + [NSApp setServicesMenu:servicesMenu]; + [[appMenu addItemWithTitle:@"Services" + action:NULL + keyEquivalent:@""] setSubmenu:servicesMenu]; + [servicesMenu release]; + [appMenu addItem:[NSMenuItem separatorItem]]; [appMenu addItemWithTitle:[NSString stringWithFormat:@"Hide %@", app_name] action:@selector(hide:) @@ -394,15 +403,6 @@ cocoa_create_global_menu(void) { keyEquivalent:@""]; [appMenu addItem:[NSMenuItem separatorItem]]; - NSMenu* servicesMenu = [[NSMenu alloc] init]; - [NSApp setServicesMenu:servicesMenu]; - [[appMenu addItemWithTitle:@"Services" - action:NULL - keyEquivalent:@""] setSubmenu:servicesMenu]; - [servicesMenu release]; - - [appMenu addItem:[NSMenuItem separatorItem]]; - [[appMenu addItemWithTitle:@"Secure Keyboard Entry" action:@selector(toggleSecureInput:) keyEquivalent:@"s"] @@ -470,7 +470,7 @@ cocoa_create_global_menu(void) { keyEquivalent:@""]; NSMenu* helpMenu = [[NSMenu alloc] initWithTitle:@"Help"]; [helpMenuItem setSubmenu:helpMenu]; - [[helpMenu addItemWithTitle:[NSString stringWithFormat:@"Visit %@ website", app_name] + [[helpMenu addItemWithTitle:[NSString stringWithFormat:@"Visit %@ Website", app_name] action:@selector(open_kitty_website_url:) keyEquivalent:@"?"] setTarget:global_menu_target]; From 2e95cd7a6298fa17ea85b6691d646e4251dba4e2 Mon Sep 17 00:00:00 2001 From: pagedown Date: Fri, 5 Nov 2021 17:19:34 +0800 Subject: [PATCH 2/2] Docs: Describes the priority order of auto bold fonts --- kitty/fonts/core_text.py | 2 +- kitty/options/definition.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kitty/fonts/core_text.py b/kitty/fonts/core_text.py index b656ae341..6718fc0f2 100644 --- a/kitty/fonts/core_text.py +++ b/kitty/fonts/core_text.py @@ -65,7 +65,7 @@ def find_best_match(family: str, bold: bool = False, italic: bool = False, ignor ] == italic else 0 monospace_match = 1 if candidate['monospace'] else 0 is_regular_width = not candidate['expanded'] and not candidate['condensed'] - # prefer demi-bold to bold to heavy, less bold means less chance of + # prefer semi-bold to bold to heavy, less bold means less chance of # overflow weight_distance_from_medium = abs(candidate['weight']) return style_match, monospace_match, 1 if is_regular_width else 0, 1 - weight_distance_from_medium diff --git a/kitty/options/definition.py b/kitty/options/definition.py index d907e3ccd..542ea4550 100644 --- a/kitty/options/definition.py +++ b/kitty/options/definition.py @@ -33,9 +33,11 @@ opt('font_family', 'monospace', long_text=''' You can specify different fonts for the bold/italic/bold-italic variants. To get a full list of supported fonts use the `kitty list-fonts` command. -By default they are derived automatically, by the OSes font system. Setting -them manually is useful for font families that have many weight variants like -Book, Medium, Thick, etc. For example:: +By default they are derived automatically, by the OSes font system. When +bold_font or bold_italic_font is set to :code:`auto`, the priority of bold +fonts is semi-bold, bold, heavy. Setting them manually is useful for font +families that have many weight variants like Book, Medium, Thick, etc. +For example:: font_family Operator Mono Book bold_font Operator Mono Medium