commit fc6680feaa1b187614ae20c346de58de88cfa6b6
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Sun Jul 26 17:37:36 2026 +0200
Fixup 86c06ea93c7: rename odt3 to odt2
When dropping eLyXer support, the odt3 format has been renamed to odt2, but
not its converters.
This broke import/export of odt via pandoc.
(cherry picked from commit c495f9e65616e11952c37709bcd4ee6ed2327980)
---
lib/configure.py | 4 ++--
status.25x | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/configure.py b/lib/configure.py
index 9aea675a5a..b535c5bfbc 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -981,7 +981,7 @@ def checkConverterEntries():
rc_entry = [ r'\converter odt latex "%%" ""' ])
#
checkProg('an Open Document (Pandoc) -> LaTeX converter', ['pandoc -s -f
odt -o $$o -t latex $$i'],
- rc_entry = [ r'\converter odt3 latex "%%" ""' ])
+ rc_entry = [ r'\converter odt2 latex "%%" ""' ])
#
checkProg('DocBook converter -> PDF (docbook)',
['pandoc -f docbook -t latex --pdf-engine=lualatex --toc -o $$o
$$i', # Since Pandoc 2.0
@@ -1020,7 +1020,7 @@ def checkConverterEntries():
rc_entry = [ r'\converter latex rtf "%%" "needaux"' ])
#
checkProg('a LaTeX -> Open Document (Pandoc) converter', ['pandoc -s -f
latex -o $$o -t odt $$i'],
- rc_entry = [ r'\converter latex odt3 "%%" ""' ])
+ rc_entry = [ r'\converter latex odt2 "%%" ""' ])
#
checkProg('a LaTeX -> MS Word Office Open XML converter', ['pandoc -s -f
latex -o $$o -t docx $$i'],
rc_entry = [ r'\converter latex word2 "%%" ""' ])
diff --git a/status.25x b/status.25x
index 2a1c9c483f..10df9df0e3 100644
--- a/status.25x
+++ b/status.25x
@@ -71,6 +71,8 @@ What's new
- Fix order of theorem definitions for pandoc processing (bug 13307).
+- Fix support for import/export of ODT documents using pandoc.
+
* USER INTERFACE
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
