commit 6f65cbdce2be06827b84da3807dd355e62401260
Author: Juergen Spitzmueller <[email protected]>
Date: Sun Apr 21 11:42:40 2024 +0200
Update lilypond converter settings (#12618)
As of v. 2.23.12, the safe mode is no longer supported and results in
error.
We thus remove the -safe flags from the converter and use our own
needauth flag instead.
---
lib/configure.py | 22 +++++++++++-----------
status.23x | 2 ++
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/lib/configure.py b/lib/configure.py
index 69aeeaf96b..747299050a 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1198,15 +1198,15 @@ def checkConverterEntries():
version_number = match.groups()[0]
version = version_number.split('.')
if int(version[0]) > 2 or (len(version) > 1 and int(version[0]) ==
2 and int(version[1]) >= 11):
- addToRC(r'''\converter lilypond eps "lilypond
-dbackend=eps -dsafe --ps $$i" ""
-\converter lilypond png "lilypond -dbackend=eps -dsafe --png $$i"
""''')
- addToRC(r'\converter lilypond pdf6 "lilypond
-dbackend=eps -dsafe --pdf $$i" ""')
+ addToRC(r'''\converter lilypond eps "lilypond
-dbackend=eps --ps $$i" "needauth"
+\converter lilypond png "lilypond -dbackend=eps --png $$i"
"needauth"''')
+ addToRC(r'\converter lilypond pdf6 "lilypond
-dbackend=eps --pdf $$i" "needauth"')
logger.info('+ found LilyPond version %s.' % version_number)
elif int(version[0]) > 2 or (len(version) > 1 and int(version[0])
== 2 and int(version[1]) >= 6):
- addToRC(r'''\converter lilypond eps "lilypond -b eps
--ps --safe $$i" ""
+ addToRC(r'''\converter lilypond eps "lilypond -b eps
--ps $$i" "needauth"
\converter lilypond png "lilypond -b eps --png $$i" ""''')
if int(version[0]) > 2 or (len(version) > 1 and
int(version[0]) == 2 and int(version[1]) >= 9):
- addToRC(r'\converter lilypond pdf6 "lilypond -b
eps --pdf --safe $$i" ""')
+ addToRC(r'\converter lilypond pdf6 "lilypond -b
eps --pdf $$i" "needauth"')
logger.info('+ found LilyPond version %s.' % version_number)
else:
logger.info('+ found LilyPond, but version %s is too old.' %
version_number)
@@ -1228,12 +1228,12 @@ def checkConverterEntries():
# even when requested with --pdf. This is a problem if a
user
# clicks View PDF after having done a View DVI. To
circumvent
# this, use different output folders for eps and pdf
outputs.
- addToRC(r'\converter lilypond-book latex "lilypond-book
--safe --lily-output-dir=ly-eps $$i" ""')
- addToRC(r'\converter lilypond-book pdflatex "lilypond-book
--safe --pdf --latex-program=pdflatex --lily-output-dir=ly-pdf $$i" ""')
- addToRC(r'\converter lilypond-book-ja platex "lilypond-book
--safe --pdf --latex-program=platex --lily-output-dir=ly-pdf $$i" ""')
- addToRC(r'\converter lilypond-book xetex "lilypond-book
--safe --pdf --latex-program=xelatex --lily-output-dir=ly-pdf $$i" ""')
- addToRC(r'\converter lilypond-book luatex "lilypond-book
--safe --pdf --latex-program=lualatex --lily-output-dir=ly-pdf $$i" ""')
- addToRC(r'\converter lilypond-book dviluatex "lilypond-book
--safe --latex-program=dvilualatex --lily-output-dir=ly-eps $$i" ""')
+ addToRC(r'\converter lilypond-book latex "lilypond-book
--lily-output-dir=ly-eps $$i" "needauth"')
+ addToRC(r'\converter lilypond-book pdflatex "lilypond-book
--pdf --latex-program=pdflatex --lily-output-dir=ly-pdf $$i" "needauth"')
+ addToRC(r'\converter lilypond-book-ja platex "lilypond-book
--pdf --latex-program=platex --lily-output-dir=ly-pdf $$i" "needauth"')
+ addToRC(r'\converter lilypond-book xetex "lilypond-book
--pdf --latex-program=xelatex --lily-output-dir=ly-pdf $$i" "needauth"')
+ addToRC(r'\converter lilypond-book luatex "lilypond-book
--pdf --latex-program=lualatex --lily-output-dir=ly-pdf $$i" "needauth"')
+ addToRC(r'\converter lilypond-book dviluatex "lilypond-book
--latex-program=dvilualatex --lily-output-dir=ly-eps $$i" "needauth"')
logger.info('+ found LilyPond-book version %s.' %
version_number)
else:
logger.info('+ found LilyPond-book, but version %s is too
old.' % version_number)
diff --git a/status.23x b/status.23x
index 49fad99f7d..4660c725d9 100644
--- a/status.23x
+++ b/status.23x
@@ -17,6 +17,8 @@ What's new
- Fix nested underwave (\uwave) (bug 12922).
+- Update lilypond converter settings (bug 12618).
+
* MISCELLANEOUS
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
