also for branch: new export flavor "DVILUATEX", fixes bug #7713, patch from Jürgen

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39461 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/configure.py b/lib/configure.py
index 3d38d1e9b2b91dbca0696b7a254538bc53abbb34..575189021fbd105add8f4a3ed4d29d81acbe464f 100644 (file)
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -466,7 +466,7 @@ def checkLuatex():
             logger.info(msg + ' yes')
             addToRC(r'\converter luatex      pdf5       "%s"   "latex=lualatex"' % LUATEX)
             if DVILUATEX != '':
-                addToRC(r'\converter luatex      dvi3        "%s"      "latex=lualatex"' % DVILUATEX)   
+                addToRC(r'\converter luatex      dvi3        "%s"      "latex=dvilualatex"' % DVILUATEX)
         # remove temporary files
         removeFiles(['luatest.tex', 'luatest.log', 'luatest.aux', 'luatest.pdf'])
 

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 238225bcb38492f4687cd1fe9f7d412bc8264873..8151cc5128a719fad5ec4673c3d517cbe0884448 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -3421,6 +3421,8 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
                        runparams.flavor = OutputParams::PDFLATEX;
                else if (backend_format == "luatex")
                        runparams.flavor = OutputParams::LUATEX;
+               else if (backend_format == "dviluatex")
+                       runparams.flavor = OutputParams::DVILUATEX;
                else if (backend_format == "xetex")
                        runparams.flavor = OutputParams::XETEX;
        }

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 74b5ab5e6a199aec2384c81f4b1937f5764937c2..09b970b01a4873e052e5d6f765b1f88405ba4d85 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1119,6 +1119,7 @@ void BufferParams::validate(LaTeXFeatures & features) const
 
                switch (features.runparams().flavor) {
                case OutputParams::LATEX:
+               case OutputParams::DVILUATEX:
                        if (dvipost) {
                                features.require("ct-dvipost");
                                features.require("dvipost");
@@ -2120,9 +2121,12 @@ vector<string> BufferParams::backends() const
        if (v.back() == "latex") {
                v.push_back("pdflatex");
                v.push_back("luatex");
+               v.push_back("dviluatex");
                v.push_back("xetex");
-       } else if (v.back() == "xetex")
+       } else if (v.back() == "xetex") {
                v.push_back("luatex");
+               v.push_back("dviluatex");
+       }
        v.push_back("xhtml");
        v.push_back("text");
        v.push_back("lyx");
@@ -2620,7 +2624,8 @@ void BufferParams::writeEncodingPreamble(otexstream & os,
                return;
        // LuaTeX neither, but with tex fonts, we need to load
        // the luainputenc package.
-       if (features.runparams().flavor == OutputParams::LUATEX) {
+       if (features.runparams().flavor == OutputParams::LUATEX
+               || features.runparams().flavor == OutputParams::DVILUATEX) {
                if (!useNonTeXFonts && inputenc != "default"
                    && ((inputenc == "auto" && language->encoding()->package() == Encoding::inputenc)
                        || (inputenc != "auto" && encoding().package() == Encoding::inputenc))) {

diff --git a/src/Converter.cpp b/src/Converter.cpp
index ff1d7093bf53d58554d88fdf79bc8ecad49ae883..16ff6033d41d07c71e7cac8fe0c6966281e5a26d 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -266,6 +266,8 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path)
                                return OutputParams::XETEX;
                        if (conv.latex_flavor == "lualatex")
                                return OutputParams::LUATEX;
+                       if (conv.latex_flavor == "dvilualatex")
+                               return OutputParams::DVILUATEX;
                        if (conv.latex_flavor == "pdflatex")
                                return OutputParams::PDFLATEX;
                if (conv.xml)
@@ -776,6 +778,7 @@ vector<string> Converters::savers() const
        v.push_back("latex");
        v.push_back("literate");
        v.push_back("luatex");
+       v.push_back("dviluatex");
        v.push_back("lyx");
        v.push_back("xhtml");
        v.push_back("pdflatex");

diff --git a/src/Format.cpp b/src/Format.cpp
index a528ce20c8c5bb5e49132a270687029690648383..cd2d238dc81ffe3c5cee127d0503cf3ccebf5bd0 100644 (file)
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -422,6 +422,7 @@ typedef Translator<OutputParams::FLAVOR, string> FlavorTranslator;
 FlavorTranslator initFlavorTranslator()
 {
        FlavorTranslator f(OutputParams::LATEX, "latex");
+       f.addPair(OutputParams::DVILUATEX, "dviluatex");
        f.addPair(OutputParams::LUATEX, "luatex");
        f.addPair(OutputParams::PDFLATEX, "pdflatex");
        f.addPair(OutputParams::XETEX, "xetex");

diff --git a/src/OutputParams.cpp b/src/OutputParams.cpp
index dc3d396426a7bf81359feba25c4e5b652b11a365..a0e7a1c40a2f590d4dbbeb90a9adeb4c7313e530 100644 (file)
--- a/src/OutputParams.cpp
+++ b/src/OutputParams.cpp
@@ -45,14 +45,14 @@ OutputParams::~OutputParams()
 
 bool OutputParams::isLaTeX() const
 {
-       return flavor == LATEX || flavor == LUATEX 
+       return flavor == LATEX || flavor == LUATEX || flavor == DVILUATEX
                || flavor == PDFLATEX || flavor == XETEX; 
 }
 
 
 bool OutputParams::isFullUnicode() const
 {
-       return flavor == LUATEX || flavor == XETEX; 
+       return flavor == LUATEX|| flavor == DVILUATEX || flavor == XETEX;
 }
 
 } // namespace lyx

diff --git a/src/OutputParams.h b/src/OutputParams.h
index 50009ebbbcf6461b261188bbcb29c16a93cdde51..1a7326ddd8b52bb1a2d893e92456db816bbbc661 100644 (file)
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -28,6 +28,7 @@ class Language;
 class OutputParams {
 public:
        enum FLAVOR {
+               DVILUATEX,
                LATEX,
                LUATEX,
                PDFLATEX,

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index d77893f67c25b06b8b1261c3e0c3467931370ef7..16be7bc53a377051c62d3bf2eda388049d12df27 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -43,6 +43,7 @@
 #include "support/filetools.h"
 #include "support/foreach.h"
 #include "support/gettext.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Package.h"
@@ -1526,7 +1527,7 @@ void PrefSpellchecker::on_spellcheckerCB_currentIndexChanged(int index)
 {
        QString spellchecker = spellcheckerCB->itemData(index).toString();
        
-       compoundWordCB->setEnabled(spellchecker != QString("native"));
+       compoundWordCB->setEnabled(spellchecker == QString("aspell"));
 }
        
        
@@ -1924,6 +1925,7 @@ void PrefFileformats::updateView()
                formatsCB->addItem(qt_(cit->prettyname()),
                                QVariant(form_->formats().getNumber(cit->name())));
                if (form_->converters().isReachable("latex", cit->name())
+                   || form_->converters().isReachable("dviluatex", cit->name())
                    || form_->converters().isReachable("pdflatex", cit->name())
                    || form_->converters().isReachable("luatex", cit->name())
                    || form_->converters().isReachable("xetex", cit->name()))

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index f3ea34c011eb735ea1cdfd329cdb190e23c6496e..8126d459a9f9d5b637a6c2feae246db2a59a3240 100644 (file)
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -36,18 +36,18 @@
 
 #include "graphics/PreviewLoader.h"
 
+#include "support/bind.h"
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/ExceptionMessage.h"
 #include "support/filetools.h"
 #include "support/gettext.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "support/Translator.h"
-
-#include "support/bind.h"
 
 #include <sstream>
+#include <vector>
 
 using namespace std;
 using namespace lyx::support;
@@ -729,6 +729,7 @@ void InsetExternal::validate(LaTeXFeatures & features) const
        string format;
        switch (features.runparams().flavor) {
        case OutputParams::LATEX:
+       case OutputParams::DVILUATEX:
                format = "LaTeX";
                break;
        case OutputParams::LUATEX:

diff --git a/status.20x b/status.20x
index acf95cb556f0570f28c500e5f396f93a29107bbb..49396b59e5613e7796b6153849daa6237f6cf525 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -121,6 +121,8 @@ What's new
 - Improve import of LaTeX documents with non-ASCII contents before loading
   the inputenc package (bug 7509).
 
+- The export format DVI (LuaTeX) is now correctly created (bug7713).
+
 - Macros that use other macros now output properly to XHTML (bug 7532).
 
 - Fixed XHTML output for tables that use multirow.
@@ -136,7 +138,7 @@ What's new
 - On Windows, allow to automatically switch TeX engines without the need
   of manually saving the preferences after reconfiguring (bug 7557).
 
-- Fix dvi forward search on Windows when compiling with MSVC.
+- Fix DVI forward search on Windows when compiling with MSVC.
 
 - Calculate relative pathnames to master documents when master is in a
   directory above the child (bug 7540).