#include <config.h>
+#include "LaTeX.h"
+
#include "Buffer.h"
#include "BufferList.h"
#include "BufferParams.h"
-#include "LaTeX.h"
#include "LyXRC.h"
#include "LyX.h"
#include "DepTable.h"
#include "Encoding.h"
+#include "Language.h"
#include "support/debug.h"
+#include "support/docstring.h"
#include "support/convert.h"
#include "support/FileName.h"
#include "support/filetools.h"
#include "support/Systemcall.h"
#include "support/os.h"
-#include "support/regex.h"
-
#include <fstream>
+#include <regex>
#include <stack>
if (!rp.index_command.empty())
tmp = rp.index_command;
+
+ Language const * doc_lang = languages.getLanguage(rp.document_language);
if (contains(tmp, "$$x")) {
// This adds appropriate [te]xindy options
// such as language and codepage (for the
// main document language/encoding) as well
// as input markup (latex or xelatex)
- string xdyopts = rp.xindy_language;
+ string xdyopts = doc_lang ? doc_lang->xindy() : string();
if (!xdyopts.empty())
xdyopts = "-L " + xdyopts;
if (rp.isFullUnicode() && rp.encoding->package() == Encoding::none) {
"idx file has been made, running index processor ("
<< tmp << ") on file " << f);
- tmp = subst(tmp, "$$lang", rp.document_language);
+ if (doc_lang) {
+ tmp = subst(tmp, "$$lang", doc_lang->babel());
+ tmp = subst(tmp, "$$lcode", doc_lang->code());
+ }
if (rp.use_indices) {
tmp = lyxrc.splitindex_command + " -m " + quoteName(tmp);
LYXERR(Debug::LATEX,
} else if (regex_match(token, sub, biberError)) {
retval |= BIBTEX_ERROR;
string errstr = N_("Biber error: ") + sub.str(2);
- string msg = token;
terr.insertError(0,
from_local8bit(errstr),
- from_local8bit(msg));
+ from_local8bit(token));
}
prevtoken = token;
}
string prevtoken;
while (getline(ifs, token)) {
token = rtrim(token, "\r");
- smatch sub;
if (prefixIs(token, "!! "))
prevtoken = token;
else if (!prevtoken.empty()) {
} else if (prefixIs(token, "ERROR: ")) {
retval |= BIBTEX_ERROR;
string errstr = N_("Xindy error: ") + token.substr(6);
- string msg = token;
terr.insertError(0,
from_local8bit(errstr),
- from_local8bit(msg));
+ from_local8bit(token));
}
}
return retval;