anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-30 05:12:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update lilypond converter settings (#12618)

Browse Source 
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.
This commit is contained in:
Juergen Spitzmueller 2024-04-21 11:42:40 +02:00
parent fe6cc89c54
commit 6f65cbdce2
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/configure.py
View File

@ -1198,15 +1198,15 @@ def checkConverterEntries():
version_number = match.groups()[0] version_number = match.groups()[0]
version = version_number.split('.') version = version_number.split('.')
if int(version[0]) > 2 or (len(version) > 1 and int(version[0]) == 2 and int(version[1]) >= 11): 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" "" addToRC(r'''\converter lilypond eps "lilypond -dbackend=eps --ps $$i" "needauth"
\converter lilypond png "lilypond -dbackend=eps -dsafe --png $$i" ""''') \converter lilypond png "lilypond -dbackend=eps --png $$i" "needauth"''')
addToRC(r'\converter lilypond pdf6 "lilypond -dbackend=eps -dsafe --pdf $$i" ""') addToRC(r'\converter lilypond pdf6 "lilypond -dbackend=eps --pdf $$i" "needauth"')
logger.info('+ found LilyPond version %s.' % version_number) 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): 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" ""''') \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): 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) logger.info('+ found LilyPond version %s.' % version_number)
else: else:
logger.info('+ found LilyPond, but version %s is too old.' % version_number) 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 # even when requested with --pdf. This is a problem if a user
# clicks View PDF after having done a View DVI. To circumvent # clicks View PDF after having done a View DVI. To circumvent
# this, use different output folders for eps and pdf outputs. # 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 latex "lilypond-book --lily-output-dir=ly-eps $$i" "needauth"')
addToRC(r'\converter lilypond-book pdflatex "lilypond-book --safe --pdf --latex-program=pdflatex --lily-output-dir=ly-pdf $$i" ""') 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 --safe --pdf --latex-program=platex --lily-output-dir=ly-pdf $$i" ""') 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 --safe --pdf --latex-program=xelatex --lily-output-dir=ly-pdf $$i" ""') 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 --safe --pdf --latex-program=lualatex --lily-output-dir=ly-pdf $$i" ""') 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 --safe --latex-program=dvilualatex --lily-output-dir=ly-eps $$i" ""') 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) logger.info('+ found LilyPond-book version %s.' % version_number)
else: else:
logger.info('+ found LilyPond-book, but version %s is too old.' % version_number) logger.info('+ found LilyPond-book, but version %s is too old.' % version_number)

2
status.23x
View File

@ -17,6 +17,8 @@ What's new
- Fix nested underwave (\uwave) (bug 12922). - Fix nested underwave (\uwave) (bug 12922).
- Update lilypond converter settings (bug 12618).
* MISCELLANEOUS * MISCELLANEOUS