// Do not remove the comment below, so we get merge conflict in
// independent branches. Instead add your own.
-int const LYX_FORMAT = 349; // jspitzm: initial XeTeX support
+int const LYX_FORMAT = 351; // uwestoehr: support for page background color
typedef map<string, bool> DepClean;
typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
LYXERR0("Branch " << branchName << " does not exist.");
dr.setError(true);
docstring const msg =
- bformat(_("Branch \%1$s\" does not exist."), branchName);
+ bformat(_("Branch \"%1$s\" does not exist."), branchName);
dr.setMessage(msg);
} else {
branch->setSelected(func.action == LFUN_BRANCH_ACTIVATE);
string Buffer::getDefaultOutputFormat() const
{
+ if (!params().defaultOutputFormat.empty()
+ && params().defaultOutputFormat != "default")
+ return params().defaultOutputFormat;
typedef vector<Format const *> Formats;
Formats formats = exportableFormats(true);
if (isDocBook()
|| isLiterate()
|| params().useXetex
- || params().encoding().package() == Encoding::japanese)
+ || params().encoding().package() == Encoding::japanese) {
+ if (formats.empty())
+ return string();
// return the first we find
return formats.front()->name();
+ }
return lyxrc.default_view_format;
}