// You should also run the development/tools/updatelayouts.py script,
// to update the format of all of our layout files.
//
-int const LAYOUT_FORMAT = 87; // rkh: master --> parent for counters
+int const LAYOUT_FORMAT = 95; // tcuvelier: DocBookRenderAsImage
// Layout format for the current lyx file format. Controls which format is
TC_OUTPUTTYPE = 1,
TC_OUTPUTFORMAT,
TC_INPUT,
+ TC_INPUT_GLOBAL,
TC_STYLE,
TC_MODIFYSTYLE,
TC_PROVIDESTYLE,
TC_DEFAULTSTYLE,
TC_INSETLAYOUT,
+ TC_MODIFYINSETLAYOUT,
+ TC_PROVIDEINSETLAYOUT,
TC_NOINSETLAYOUT,
TC_NOSTYLE,
TC_COLUMNS,
{ "htmltocsection", TC_HTMLTOCSECTION },
{ "ifcounter", TC_IFCOUNTER },
{ "input", TC_INPUT },
+ { "inputglobal", TC_INPUT_GLOBAL },
{ "insetlayout", TC_INSETLAYOUT },
{ "leftmargin", TC_LEFTMARGIN },
{ "maxcitenames", TC_MAXCITENAMES },
+ { "modifyinsetlayout", TC_MODIFYINSETLAYOUT },
{ "modifystyle", TC_MODIFYSTYLE },
{ "nocounter", TC_NOCOUNTER },
{ "nofloat", TC_NOFLOAT },
{ "pagesize", TC_PAGESIZE },
{ "pagestyle", TC_PAGESTYLE },
{ "preamble", TC_PREAMBLE },
+ { "provideinsetlayout", TC_PROVIDEINSETLAYOUT },
{ "provides", TC_PROVIDES },
{ "providesmodule", TC_PROVIDESMODULE },
{ "providestyle", TC_PROVIDESTYLE },
}
// used below to track whether we are in an IfStyle or IfCounter tag.
- bool modifystyle = false;
- bool providestyle = false;
+ bool modify = false;
+ bool provide = false;
bool ifcounter = false;
+ bool only_global = false;
switch (static_cast<TextClassTags>(le)) {
}
break;
+ case TC_INPUT_GLOBAL:
+ only_global = true;
+ // fall through
case TC_INPUT: // Include file
if (lexrc.next()) {
FileName tmp;
if (!path().empty() && (prefixIs(inc, "./") ||
prefixIs(inc, "../")))
tmp = fileSearch(path(), inc, "layout");
- else
+ else {
+ // InputGlobal only searches in the system and
+ // build directories. This allows to reuse and
+ // modify files in the user directory.
tmp = libFileSearch("layouts", inc,
- "layout");
+ "layout", must_exist, only_global);
+ }
if (tmp.empty()) {
lexrc.printError("Could not find input file: " + inc);
break;
case TC_MODIFYSTYLE:
- modifystyle = true;
+ modify = true;
// fall through
case TC_PROVIDESTYLE:
// if modifystyle is true, then we got here by falling through
// so we are not in an ProvideStyle block
- if (!modifystyle)
- providestyle = true;
+ if (!modify)
+ provide = true;
// fall through
case TC_STYLE: {
if (!lexrc.next()) {
// If the layout already exists, then we want to add it to
// the existing layout, as long as we are not in an ProvideStyle
// block.
- if (have_layout && !providestyle) {
+ if (have_layout && !provide) {
Layout & lay = operator[](name);
error = !readStyle(lexrc, lay, rt);
}
// If the layout does not exist, then we want to create a new
// one, but not if we are in a ModifyStyle block.
- else if (!have_layout && !modifystyle) {
+ else if (!have_layout && !modify) {
Layout layout;
layout.setName(name);
error = !readStyle(lexrc, layout, rt);
rightmargin_ = lexrc.getDocString();
break;
+ case TC_MODIFYINSETLAYOUT:
+ modify = true;
+ // fall through
+ case TC_PROVIDEINSETLAYOUT:
+ // if modifyinsetlayout is true, then we got here by falling through
+ // so we are not in an ProvideInsetLayout block
+ if (!modify)
+ provide = true;
+ // fall through
case TC_INSETLAYOUT: {
if (!lexrc.next()) {
lexrc.printError("No name given for InsetLayout: `$$Token'.");
}
docstring const name = subst(lexrc.getDocString(), '_', ' ');
bool const validating = (rt == VALIDATION);
+ bool const have_layout = name.empty() ? false : hasInsetLayout(name);
if (name.empty()) {
string s = "Could not read name for InsetLayout: `$$Token' "
+ lexrc.getString() + " is probably not valid UTF-8!";
// in which case we want to report the error
if (validating)
error = true;
- } else if (hasInsetLayout(name)) {
+ } else if (have_layout && !provide) {
InsetLayout & il = insetlayoutlist_[name];
error = !il.read(lexrc, *this, validating);
- } else {
+ } else if (!modify && !have_layout) {
InsetLayout il;
il.setName(name);
error = !il.read(lexrc, *this, validating);
if (!error)
insetlayoutlist_[name] = il;
+ } else {
+ InsetLayout il;
+ // We just scan the rest of the style and discard it.
+ il.read(lexrc, *this);
}
break;
}
FT_HTMLATTR,
FT_HTMLTAG,
FT_DOCBOOKATTR,
+ FT_DOCBOOKFLOATTYPE,
FT_DOCBOOKTAG,
FT_DOCBOOKTAGTYPE,
+ FT_DOCBOOKCAPTION,
FT_LISTCOMMAND,
FT_REFPREFIX,
FT_ALLOWED_PLACEMENT,
{ "allowssideways", FT_ALLOWS_SIDEWAYS },
{ "allowswide", FT_ALLOWS_WIDE },
{ "docbookattr", FT_DOCBOOKATTR },
+ { "docbookcaption", FT_DOCBOOKCAPTION },
+ { "docbookfloattype", FT_DOCBOOKFLOATTYPE },
{ "docbooktag", FT_DOCBOOKTAG },
{ "docbooktagtype", FT_DOCBOOKTAGTYPE },
{ "end", FT_END },
docstring htmlstyle;
string htmltag;
string docbookattr;
+ string docbookcaption;
string docbooktag;
string docbooktagtype;
+ string docbookfloattype;
string listname;
string listcommand;
string name;
lexrc.next();
docbookattr = lexrc.getString();
break;
+ case FT_DOCBOOKCAPTION:
+ lexrc.next();
+ docbookcaption = lexrc.getString();
+ break;
case FT_DOCBOOKTAG:
lexrc.next();
docbooktag = lexrc.getString();
lexrc.next();
docbooktagtype = lexrc.getString();
break;
+ case FT_DOCBOOKFLOATTYPE:
+ lexrc.next();
+ docbookfloattype = lexrc.getString();
+ break;
case FT_END:
getout = true;
break;
+ default:
+ LYXERR0("Unhandled value " << le << " in TextClass::readFloat.");
+ break;
}
}
}
Floating fl(type, placement, ext, within, style, name,
listname, listcommand, refprefix, allowed_placement,
- htmltag, htmlattr, htmlstyle, docbookattr,
- docbooktagtype, required, usesfloat, ispredefined,
+ htmltag, htmlattr, htmlstyle, docbooktag, docbookattr,
+ docbooktagtype, docbookfloattype, docbookcaption,
+ required, usesfloat, ispredefined,
allowswide, allowssideways);
floatlist_.newFloat(fl);
// each float has its own counter
<< to_utf8(makeDisplayPath(layout_file.absFileName()))
<< "'\n(Check `" << name_
<< "')\nCheck your installation and "
- "try Options/Reconfigure..."
+ "try Tools/Reconfigure..."
<< endl;
}
}
-DocumentClassPtr getDocumentClass(
- LayoutFile const & baseClass, LayoutModuleList const & modlist,
- string const & cengine, bool const clone)
+DocumentClassPtr getDocumentClass(LayoutFile const & baseClass, LayoutModuleList const & modlist,
+ string const & cengine, bool clone, bool internal)
{
+ bool const show_warnings = !clone && !internal;
DocumentClassPtr doc_class =
DocumentClassPtr(new DocumentClass(baseClass));
for (auto const & mod : modlist) {
LyXModule * lm = theModuleList[mod];
if (!lm) {
- docstring const msg =
- bformat(_("The module %1$s has been requested by\n"
- "this document but has not been found in the list of\n"
- "available modules. If you recently installed it, you\n"
- "probably need to reconfigure LyX.\n"), from_utf8(mod));
- if (!clone)
+ if (show_warnings) {
+ docstring const msg =
+ bformat(_("The module %1$s has been requested by\n"
+ "this document but has not been found in the list of\n"
+ "available modules. If you recently installed it, you\n"
+ "probably need to reconfigure LyX.\n"), from_utf8(mod));
frontend::Alert::warning(_("Module not available"), msg);
+ }
continue;
}
- if (!lm->isAvailable() && !clone) {
+ if (!lm->isAvailable() && show_warnings) {
docstring const prereqs = from_utf8(getStringFromVector(lm->prerequisites(), "\n\t"));
docstring const msg =
bformat(_("The module %1$s requires a package that is not\n"
FileName layout_file = libFileSearch("layouts", lm->getFilename());
if (!doc_class->read(layout_file, TextClass::MODULE)) {
docstring const msg =
- bformat(_("Error reading module %1$s\n"), from_utf8(mod));
+ bformat(_("Error reading module %1$s\n"), from_utf8(mod));
frontend::Alert::warning(_("Read Error"), msg);
}
}
LyXCiteEngine * ce = theCiteEnginesList[cengine];
if (!ce) {
- docstring const msg =
- bformat(_("The cite engine %1$s has been requested by\n"
- "this document but has not been found in the list of\n"
- "available engines. If you recently installed it, you\n"
- "probably need to reconfigure LyX.\n"), from_utf8(cengine));
- if (!clone)
+ if (show_warnings) {
+ docstring const msg =
+ bformat(_("The cite engine %1$s has been requested by\n"
+ "this document but has not been found in the list of\n"
+ "available engines. If you recently installed it, you\n"
+ "probably need to reconfigure LyX.\n"), from_utf8(cengine));
frontend::Alert::warning(_("Cite Engine not available"), msg);
- } else if (!ce->isAvailable() && !clone) {
+ }
+ } else if (!ce->isAvailable() && show_warnings) {
docstring const prereqs = from_utf8(getStringFromVector(ce->prerequisites(), "\n\t"));
docstring const msg =
bformat(_("The cite engine %1$s requires a package that is not\n"
FileName layout_file = libFileSearch("citeengines", ce->getFilename());
if (!doc_class->read(layout_file, TextClass::CITE_ENGINE)) {
docstring const msg =
- bformat(_("Error reading cite engine %1$s\n"), from_utf8(cengine));
+ bformat(_("Error reading cite engine %1$s\n"), from_utf8(cengine));
frontend::Alert::warning(_("Read Error"), msg);
}
}