From 3291254263af0765b2222f95c04d21ad0312e9c0 Mon Sep 17 00:00:00 2001
From: Guido Cella <guido@guidocella.xyz>
Date: Sat, 9 Nov 2024 16:52:38 +0100
Subject: [PATCH] options: rename --sub-ass-line-spacing to --sub-line-spacing

Because it also affects plain text subtitles.
---
 DOCS/interface-changes/sub-ass-options.txt | 1 +
 DOCS/man/options.rst                       | 2 +-
 options/options.c                          | 4 ++--
 options/options.h                          | 2 +-
 sub/sd_ass.c                               | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 DOCS/interface-changes/sub-ass-options.txt

diff --git a/DOCS/interface-changes/sub-ass-options.txt b/DOCS/interface-changes/sub-ass-options.txt
new file mode 100644
index 0000000000..9e74cf4c67
--- /dev/null
+++ b/DOCS/interface-changes/sub-ass-options.txt
@@ -0,0 +1 @@
+rename `--sub-ass-line-spacing` to `--sub-line-spacing`
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index c672fcf27f..fe346d96f7 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -2521,7 +2521,7 @@ Subtitles
         of animations with some badly authored ASS scripts. It is recommended
         to not use this option, unless really needed.
 
-``--sub-ass-line-spacing=<value>``
+``--sub-line-spacing=<value>``
     Set line spacing value for SSA/ASS renderer.
 
 ``--sub-ass-shaper=<simple|complex>``
diff --git a/options/options.c b/options/options.c
index 625b284ebb..b62b43f202 100644
--- a/options/options.c
+++ b/options/options.c
@@ -296,8 +296,8 @@ const struct m_sub_options mp_subtitle_sub_opts = {
         {"sub-gray", OPT_BOOL(sub_gray)},
         {"sub-ass", OPT_BOOL(ass_enabled), .flags = UPDATE_SUB_HARD},
         {"sub-scale", OPT_FLOAT(sub_scale), M_RANGE(0, 100)},
-        {"sub-ass-line-spacing", OPT_FLOAT(ass_line_spacing),
-            M_RANGE(-1000, 1000)},
+        {"sub-line-spacing", OPT_FLOAT(sub_line_spacing), M_RANGE(-1000, 1000)},
+        {"sub-ass-line-spacing", OPT_REPLACED("sub-line-spacing")},
         {"sub-use-margins", OPT_BOOL(sub_use_margins)},
         {"sub-ass-force-margins", OPT_BOOL(ass_use_margins)},
         {"sub-ass-vsfilter-color-compat", OPT_CHOICE(ass_vsfilter_color_compat,
diff --git a/options/options.h b/options/options.h
index 573dc04002..0175f4c2cc 100644
--- a/options/options.h
+++ b/options/options.h
@@ -106,7 +106,7 @@ struct mp_subtitle_opts {
     float sub_gauss;
     bool sub_gray;
     bool ass_enabled;
-    float ass_line_spacing;
+    float sub_line_spacing;
     bool ass_use_margins;
     bool sub_use_margins;
     int ass_vsfilter_color_compat;
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index 9e61c8c756..d5b610bac9 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -536,7 +536,7 @@ static void configure_ass(struct sd *sd, struct mp_osd_res *dim,
     }
     if (converted || shared_opts->ass_style_override[sd->order]) {
         set_sub_pos = 100.0f - shared_opts->sub_pos[sd->order];
-        set_line_spacing = opts->ass_line_spacing;
+        set_line_spacing = opts->sub_line_spacing;
         set_hinting = opts->ass_hinting;
     }
     if (total_override || shared_opts->ass_style_override[sd->order] == ASS_STYLE_OVERRIDE_SCALE) {