From 4955610f94e4b0f47f247000ebf8a5396246c6c5 Mon Sep 17 00:00:00 2001 From: sporteka Date: Fri, 14 Aug 2026 17:14:16 +0300 Subject: [PATCH 1/2] * main/main_loop.c: Fix misleading font size range help description. The help text said "font size range for GUI configurator [1-100]" but the actual default range is 1-200 when USE_FREETYPE is enabled and 1-10000 otherwise. Use conditional compilation to show the correct default. --- ChangeLog | 7 +++++++ main/main_loop.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bf1a5030..fe9160b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2026-08-14 sporteka + + * main/main_loop.c: + Fix misleading "font size range for GUI configurator [1-100]" + help description. The actual default range is 1-200 when + USE_FREETYPE is enabled and 1-10000 otherwise. + 2026-08-14 Araki Ken * ui_im_candidate_screen.[ch]: diff --git a/main/main_loop.c b/main/main_loop.c index 9640fd4a..ea91100f 100644 --- a/main/main_loop.c +++ b/main/main_loop.c @@ -220,7 +220,11 @@ int main_loop_init(int argc, char **argv) { bl_conf_add_opt(conf, 'h', "help", 1, "help", "show this help message"); bl_conf_add_opt(conf, 'v', "version", 1, "version", "show version message"); bl_conf_add_opt(conf, 'R', "fsrange", 0, "font_size_range", - "font size range for GUI configurator [1-100]"); +#ifdef USE_FREETYPE + "font size range for GUI configurator [1-200]"); +#else + "font size range for GUI configurator [1-10000]"); +#endif #ifdef COMPOSE_DECSP_FONT bl_conf_add_opt(conf, 'Y', "decsp", 1, "compose_dec_special_font", "compose dec special font [false]"); From 12a5490a9d1f6eab2b69aef92021bec5c74dcc21 Mon Sep 17 00:00:00 2001 From: sporteka Date: Fri, 14 Aug 2026 18:38:58 +0300 Subject: [PATCH 2/2] * man/mlterm.1, etc/main, etc/main.ja, doc/ja/README.ja: Fix other hardcoded font size range default descriptions. The man page said the default is 1-10000 and the sample config files said 1-100, while the actual default range is 1-200 when USE_FREETYPE is enabled and 1-10000 otherwise. --- ChangeLog | 8 ++++++++ doc/ja/README.ja | 2 +- etc/main | 2 +- etc/main.ja | 2 +- man/mlterm.1 | 3 ++- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe9160b0..9b7c74c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2026-08-14 sporteka + + * man/mlterm.1, etc/main, etc/main.ja, doc/ja/README.ja: + Fix other hardcoded font size range default descriptions. + The man page said the default is 1-10000 and the sample config + files said 1-100, while the actual default range is 1-200 when + USE_FREETYPE is enabled and 1-10000 otherwise. + 2026-08-14 sporteka * main/main_loop.c: diff --git a/doc/ja/README.ja b/doc/ja/README.ja index 3befe70a..7644501d 100644 --- a/doc/ja/README.ja +++ b/doc/ja/README.ja @@ -642,7 +642,7 @@ comment -*- mode: text; tab-width:2; indent-tabs-mode:nil; coding:euc-jp -*- 指定した場合には、fontsize オプションを変更しても、フォントサイズは(上記 例では 14 pixel のまま)変わらなくなるため、注意してください。 - o font_size_range (*1-10000*) + o font_size_range (*1-200*) 変更可能なフォントサイズの範囲 フォーマットは以下のとおり。 diff --git a/etc/main b/etc/main index dbe907fb..933e3d63 100644 --- a/etc/main +++ b/etc/main @@ -63,7 +63,7 @@ # fontsize = 16 -# font_size_range = 1-100 +# font_size_range = 1-200 # hide_underline = false diff --git a/etc/main.ja b/etc/main.ja index 061766cc..63f4e706 100644 --- a/etc/main.ja +++ b/etc/main.ja @@ -88,7 +88,7 @@ # fontsize = 16 # 変更可能なフォントサイズの範囲 -# font_size_range = 1-100 +# font_size_range = 1-200 # アンダーラインを描画しない。 # hide_underline = false diff --git a/man/mlterm.1 b/man/mlterm.1 index aff03026..3a09cba1 100644 --- a/man/mlterm.1 +++ b/man/mlterm.1 @@ -221,7 +221,8 @@ The default is \fBtrue\fR. \fB\-R\fR, \fB\-\-fsrange\fR=\fIrange\fR Set acceptable range of font size. The format is "\fIminsize\fR-\fImaxsize\fR", where \fIminsize\fR and -\fImaxsize\fR are font sizes in pixel (default \fB1-10000\fR). +\fImaxsize\fR are font sizes in pixel (default \fB1-200\fR when freetype +support is enabled, \fB1-10000\fR otherwise). The GUI configurator and other means for setting fontsize should honor the range. .TP