1.2.16: Changed behavior: Merging now combines lines

I kept running into this with short subtitles. If
you prefer it the other way (keeping line breaks),
let me know and we can make it an option.

* subed/subed-srt.el (subed--merge-with-next): Add
a space instead of a newline.
* subed/subed-vtt.el (subed--merge-with-next): Add
a space instead of a newline.
* tests/test-subed-common.el ("subed-common"):
Update merge test.
* tests/test-subed-srt.el ("subed-srt"): Update
merge test.
* tests/test-subed-vtt.el ("subed-vtt"): Update
merge test.

NEWS.org

@@ -1,11 +1,21 @@
 #+OPTIONS: toc:nil
 
 * subed news
+
+** Version 1.2.16 - 2024-10-06 - Sacha Chua
+
+- subed-merge-with-next separates subtitles
+  with spaces instead of newlines. If you prefer
+  it the other way (keeping line breaks), let me
+  know and we can make it an option.
+
+- subed-create-file regenerates IDs.
+
 ** Version 1.2.15 - 2024-09-06 - Sacha Chua
 
 - Bugfix: Handle extra attributes after VTT timestamps (for example, from YouTube VTTs).
   Thanks to Jeff Trull for reporting this!
-  
+
 ** Version 1.2.14 - 2024-07-05 - Sacha Chua
 
 - Bugfix: subed-waveform should now handle the

subed/subed-srt.el

@@ -283,7 +283,7 @@ Use the format-specific function for MAJOR-MODE."
               (setq new-end (subed-timestamp-to-msecs (match-string 0))))
             (subed-jump-to-subtitle-text)
             (delete-region pos (point))
-            (insert "\n")
+            (insert " ")
             (let ((subed-enforce-time-boundaries nil))
               (subed-set-subtitle-time-stop new-end))
             (run-hooks 'subed-subtitle-merged-hook)

subed/subed-vtt.el

@@ -358,7 +358,7 @@ Use the format-specific function for MAJOR-MODE."
               (setq new-end (subed-timestamp-to-msecs (match-string 0))))
             (subed-jump-to-subtitle-text)
             (delete-region pos (point))
-            (insert "\n")
+            (insert " ")
             (let ((subed-enforce-time-boundaries nil))
               (subed-set-subtitle-time-stop new-end))
             (run-hooks 'subed-subtitle-merged-hook))

subed/subed.el

@@ -1,6 +1,6 @@
 ;;; subed.el --- A major mode for editing subtitles  -*- lexical-binding: t; -*-
 
-;; Version: 1.2.15
+;; Version: 1.2.16
 ;; Maintainer: Sacha Chua <[email protected]>
 ;; Author: Random User
 ;; Keywords: convenience, files, hypermedia, multimedia

tests/test-subed-common.el

@@ -3651,9 +3651,7 @@ Baz.
        (subed-merge-region (point-min) (point-max))
        (expect (buffer-string) :to-equal "1
 00:01:01,000 --> 00:03:15,500
-Foo.
-Bar.
-Baz.
+Foo. Bar. Baz.
 ")))
     (it "merges some subtitles."
       (with-temp-srt-buffer
@@ -3662,8 +3660,7 @@ Baz.
        (subed-merge-region (point-min) (point))
        (expect (buffer-string) :to-equal "1
 00:01:01,000 --> 00:02:10,345
-Foo.
-Bar.
+Foo. Bar.
 
 3
 00:03:03,45 --> 00:03:15,5
@@ -3680,8 +3677,7 @@ Foo.
 
 2
 00:02:02,234 --> 00:03:15,500
-Bar.
-Baz.
+Bar. Baz.
 "))))
 
   (describe "Merging a region and setting the text"

tests/test-subed-srt.el

@@ -1542,7 +1542,7 @@ This is second subtitle.
        (insert mock-srt-data)
        (subed-jump-to-subtitle-text 2)
        (subed-merge-with-next)
-       (expect (subed-subtitle-text) :to-equal "Bar.\nBaz.")
+       (expect (subed-subtitle-text) :to-equal "Bar. Baz.")
        (expect (subed-subtitle-msecs-start) :to-equal 122234)
        (expect (subed-subtitle-msecs-stop) :to-equal 195500)))
     (it "handles lines that are all numbers."
@@ -1585,8 +1585,7 @@ This is the third subtitle.
 4
 00:00:03,000 --> 00:00:06,000
 This is the fourth subtitle.
-123456789
-This is the sixth subtitle."))))
+123456789 This is the sixth subtitle."))))
 
   (describe "A comment"
     (it "is validated."

tests/test-subed-vtt.el

@@ -1704,7 +1704,7 @@ This is another test here.
        (insert mock-vtt-data)
        (subed-jump-to-subtitle-text "00:02:02.234")
        (subed-merge-with-next)
-       (expect (subed-subtitle-text) :to-equal "Bar.\nBaz.")
+       (expect (subed-subtitle-text) :to-equal "Bar. Baz.")
        (expect (subed-subtitle-msecs-start) :to-equal 122234)
        (expect (subed-subtitle-msecs-stop) :to-equal 195500)))
 		(it "updates looping."