From 330e52b9cbc121fa03a4cc29dde52b0f897b0089 Mon Sep 17 00:00:00 2001 From: Scott Kostyshak Date: Sun, 7 Aug 2016 13:31:41 -0400 Subject: [PATCH] Fix dviluatex exports of Sweave/knitr/Lily/noweb After the fix at fe06ef0e, several converter chains to DVI (dviluatex) were broken because they had previously gone through an incorrect link in the chain. This commit adds converters for the above formats to dviluatex and fixes the following ctests: export/examples/Literate_dvi3_texF export/examples/Literate_dvi3_systemF export/examples/knitr_dvi3_texF export/examples/knitr_dvi3_systemF export/examples/lilypond_dvi3_texF export/examples/lilypond_dvi3_systemF export/examples/noweb2lyx_dvi3_texF export/examples/noweb2lyx_dvi3_systemF export/examples/sweave_dvi3_texF export/examples/sweave_dvi3_systemF export/templates/RJournal_dvi3_texF --- lib/configure.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/configure.py b/lib/configure.py index 75345fb93f..d3d1c31bfe 100644 --- a/lib/configure.py +++ b/lib/configure.py @@ -758,19 +758,22 @@ def checkConverterEntries(): rc_entry = [r'''\converter literate latex "%%" "" \converter literate pdflatex "%%" "" \converter literate xetex "%%" "" -\converter literate luatex "%%" ""''']) +\converter literate luatex "%%" "" +\converter literate dviluatex "%%" ""''']) # checkProg('a Sweave -> LaTeX converter', ['Rscript --verbose --no-save --no-restore $$s/scripts/lyxsweave.R $$p$$i $$p$$o $$e $$r'], rc_entry = [r'''\converter sweave latex "%%" "" \converter sweave pdflatex "%%" "" \converter sweave xetex "%%" "" -\converter sweave luatex "%%" ""''']) +\converter sweave luatex "%%" "" +\converter sweave dviluatex "%%" ""''']) # checkProg('a knitr -> LaTeX converter', ['Rscript --verbose --no-save --no-restore $$s/scripts/lyxknitr.R $$p$$i $$p$$o $$e $$r'], rc_entry = [r'''\converter knitr latex "%%" "" \converter knitr pdflatex "%%" "" \converter knitr xetex "%%" "" -\converter knitr luatex "%%" ""''']) +\converter knitr luatex "%%" "" +\converter knitr dviluatex "%%" ""''']) # checkProg('a Sweave -> R/S code converter', ['Rscript --verbose --no-save --no-restore $$s/scripts/lyxstangle.R $$i $$e $$r'], rc_entry = [ r'\converter sweave r "%%" ""' ]) @@ -1065,6 +1068,7 @@ def checkConverterEntries(): addToRC(r'\converter lilypond-book pdflatex "lilypond-book --safe --pdf --latex-program=pdflatex --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" ""') logger.info('+ found LilyPond-book version %s.' % version_number) else: logger.info('+ found LilyPond-book, but version %s is too old.' % version_number) -- 2.39.5