Hi,

in [1], Ihor fixed a bug I reported in ox-odt. Unfortunately, this fix
broke figures with several lines of captions such as:

    #+CAPTION: first line,
    #+CAPTION: second line
    [[file:media/myPicture.png]]

This is because, in this case, org-odt-plain-text is called at some
point with " " as value for `text`. In this context, both `leading` and
`trailing` temporary variables contain the same value as `text`, making
the `substring` call crash.

The attached patch fixes the issue by considering that there is no
leading/trailing content when the input only contains spaces.

Best

[1] https://list.orgmode.org/orgmode/87v8i3y135....@cassou.me/

Emacs  : GNU Emacs 28.2 (build 1, x86_64-pc-linux-gnu, X toolkit, cairo version 
1.16.0, Xaw3d scroll bars)
Package: Org mode version 9.7-pre (release_9.6.4-346-g7d41bd @ 
/home/cassou/.emacs.d/lib/org/lisp/)
-- 
Damien Cassou

"Success is the ability to go from one failure to another without
losing enthusiasm." --Winston Churchill
>From 7d41bd49bc22d457a2a84e360b3ab4dc22eb587a Mon Sep 17 00:00:00 2001
From: Damien Cassou <dam...@cassou.me>
Date: Sun, 30 Apr 2023 16:18:30 +0200
Subject: [PATCH] org-odt-plain-text: Fix when text contains only spaces

* lisp/ox-odt.el (org-odt-plain-text): Do not crash when input only
consists of spacing.
---
 lisp/ox-odt.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index 2ac34c8db..15c9037e9 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -2927,6 +2927,9 @@ (defun org-odt-plain-text (text info)
                                     (match-string 0 output)))
                       (trailing (and (string-match (rx (1+ blank) eos) output)
                                      (match-string 0 output))))
+                  (when (length= leading (length output))
+                    (setq leading "")
+                    (setq trailing ""))
                   (insert
                    (substring
                     output
-- 
2.38.4

Reply via email to