Support halfline and fullline also in vspace.

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 5ea8866ce29c8c22d6db1d0d89ef8fa600b23e34..3487f4b45eb22e4d13c24411820dd48f74991a18 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -481,8 +481,7 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                runparams.bibtex_command = bp.bibtexCommand();
                runparams.index_command = (bp.index_command == "default") ?
                        string() : bp.index_command;
-               runparams.document_language = bp.language->babel();
-               runparams.xindy_language = bp.language->xindy();
+               runparams.document_language = bp.language->lang();
                // Some macros rely on font encoding
                runparams.main_fontenc = bp.main_font_encoding();
                runparams.only_childbibs = !bp.useBiblatex()
@@ -595,8 +594,8 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                        // FIXME KILLED
                        // Check changed return value here.
                        RetVal const retval = runLaTeX(*buffer, command, runparams, errorList);
-                               if (retval != SUCCESS)
-                                       return retval;
+                       if (retval != SUCCESS)
+                               return retval;
                } else {
                        if (conv.need_aux() && !run_latex) {
                                // We are not importing, we have a buffer
@@ -866,7 +865,7 @@ Converters::RetVal Converters::runLaTeX(Buffer const & buffer, string const & co
                });
        int const result = latex.run(terr);
 
-       if (result == Systemcall::KILLED) {
+       if (result == Systemcall::KILLED || result == Systemcall::TIMEOUT) {
                Alert::error(_("Export canceled"),
                        _("The export process was terminated by the user."));
                return KILLED;
@@ -875,11 +874,12 @@ Converters::RetVal Converters::runLaTeX(Buffer const & buffer, string const & co
        if (result & LaTeX::ERRORS)
                buffer.bufferErrors(terr, errorList);
 
-       if ((result & LaTeX::UNDEF_CIT) || (result & LaTeX::UNDEF_REF)) {
+       if ((result & LaTeX::UNDEF_CIT) || (result & LaTeX::UNDEF_UNKNOWN_REF)) {
                buffer.bufferRefs(terr, errorList);
                if (errorList.empty())
                        errorList.push_back(ErrorItem(_("Undefined reference"),
-                               _("Undefined reference or citation was found during the build, please check the Log."),
+                               _("Undefined references or citations were found during the build.\n"
+                                 "Please check the warnings in the LaTeX log (Document > LaTeX Log)."),
                                &buffer));
        }
 
@@ -912,7 +912,7 @@ Converters::RetVal Converters::runLaTeX(Buffer const & buffer, string const & co
                        LaTeX::NO_LOGFILE |
                        LaTeX::ERRORS |
                        LaTeX::UNDEF_CIT |
-                       LaTeX::UNDEF_REF |
+                       LaTeX::UNDEF_UNKNOWN_REF |
                        LaTeX::NO_OUTPUT;
 
        return (result & ERROR_MASK) == 0 ? SUCCESS : FAILURE;