namespace {
-int const LYX_FORMAT = 256;
+int const LYX_FORMAT = 263;
} // namespace anon
params().headheight.erase();
params().headsep.erase();
params().footskip.erase();
+ for (int i = 0; i < 4; ++i) {
+ params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i];
+ params().temp_bullet(i) = ITEMIZE_DEFAULTS[i];
+ }
ErrorList & errorList = errorLists_["Parse"];
FileName const tmpfile(tempName());
if (tmpfile.empty()) {
Alert::error(_("Conversion failed"),
- bformat(_("%1$s is from an earlier"
+ bformat(_("%1$s is from a different"
" version of LyX, but a temporary"
" file for converting it could"
" not be created."),
FileName const lyx2lyx = libFileSearch("lyx2lyx", "lyx2lyx");
if (lyx2lyx.empty()) {
Alert::error(_("Conversion script not found"),
- bformat(_("%1$s is from an earlier"
+ bformat(_("%1$s is from a different"
" version of LyX, but the"
" conversion script lyx2lyx"
" could not be found."),
cmd_ret const ret = runCommand(command_str);
if (ret.first != 0) {
Alert::error(_("Conversion script failed"),
- bformat(_("%1$s is from an earlier version"
+ bformat(_("%1$s is from a different version"
" of LyX, but the lyx2lyx script"
" failed to convert it."),
from_utf8(filename.absFilename())));
lyxerr[Debug::LATEX] << "LaTeXFile for inclusion made."
<< endl;
}
+ runparams_in.encoding = runparams.encoding;
// Just to be sure. (Asger)
texrow().newline();
busy(true);
// get LaTeX-Filename
- string const name = getLatexName(false);
string const path = temppath();
+ string const name = addName(path, getLatexName());
string const org_path = filePath();
support::Path p(path); // path to LaTeX file
message(_("Running chktex..."));
// Generate the LaTeX file if neccessary
- OutputParams runparams;
+ OutputParams runparams(¶ms().encoding());
runparams.flavor = OutputParams::LATEX;
runparams.nice = false;
makeLaTeXFile(FileName(name), org_path, runparams);
Alert::error(_("chktex failure"),
_("Could not run chktex successfully."));
} else if (res > 0) {
+ ErrorList & errorList = errorLists_["ChkTeX"];
+ // Clear out old errors
+ errorList.clear();
// Fill-in the error list with the TeX errors
- bufferErrors(*this, terr, errorLists_["ChkTeX"]);
+ bufferErrors(*this, terr, errorList);
}
busy(false);
void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
pit_type par_end, bool full_source)
{
- OutputParams runparams;
+ OutputParams runparams(¶ms().encoding());
runparams.nice = true;
runparams.flavor = OutputParams::LATEX;
runparams.linelen = lyxrc.plaintext_linelen;