enum LayoutTags {
LT_ALIGN = 1,
LT_ALIGNPOSSIBLE,
+ LT_ARGUMENT,
LT_MARGIN,
LT_BOTTOMSEP,
LT_CATEGORY,
LT_ENDLABELTYPE,
LT_LATEXNAME,
LT_LATEXPARAM,
- LT_OPTARGS,
LT_LATEXTYPE,
+ LT_LEFTDELIM,
LT_LEFTMARGIN,
LT_NEED_PROTECT,
LT_NEWLINE,
LT_HTMLTITLE,
LT_SPELLCHECK,
LT_REFPREFIX,
- LT_REQARGS,
+ LT_RESETARGS,
+ LT_RIGHTDELIM,
LT_INTITLE // keep this last!
};
htmlforcecss_ = false;
htmltitle_ = false;
spellcheck = true;
- optargs = 0;
- reqargs = 0;
}
LexerKeyword layoutTags[] = {
{ "align", LT_ALIGN },
{ "alignpossible", LT_ALIGNPOSSIBLE },
+ { "argument", LT_ARGUMENT },
{ "babelpreamble", LT_BABELPREAMBLE },
{ "bottomsep", LT_BOTTOMSEP },
{ "category", LT_CATEGORY },
{ "latexname", LT_LATEXNAME },
{ "latexparam", LT_LATEXPARAM },
{ "latextype", LT_LATEXTYPE },
+ { "leftdelim", LT_LEFTDELIM },
{ "leftmargin", LT_LEFTMARGIN },
{ "margin", LT_MARGIN },
{ "needprotect", LT_NEED_PROTECT },
{ "newline", LT_NEWLINE },
{ "nextnoindent", LT_NEXTNOINDENT },
{ "obsoletedby", LT_OBSOLETEDBY },
- { "optionalargs", LT_OPTARGS },
{ "parbreakisnewline", LT_PARBREAK_IS_NEWLINE },
{ "parindent", LT_PARINDENT },
{ "parsep", LT_PARSEP },
{ "passthru", LT_PASS_THRU },
{ "preamble", LT_PREAMBLE },
{ "refprefix", LT_REFPREFIX },
- { "requiredargs", LT_REQARGS },
{ "requires", LT_REQUIRES },
+ { "resetargs", LT_RESETARGS },
+ { "rightdelim", LT_RIGHTDELIM },
{ "rightmargin", LT_RIGHTMARGIN },
{ "spacing", LT_SPACING },
{ "spellcheck", LT_SPELLCHECK },
lex >> toclevel;
break;
- case LT_OPTARGS:
- lex >> optargs;
+ case LT_RESETARGS:
+ bool reset;
+ lex >> reset;
+ if (reset) {
+ latexargs_.clear();
+ itemargs_.clear();
+ }
break;
- case LT_REQARGS:
- lex >> reqargs;
+ case LT_ARGUMENT:
+ readArgument(lex);
break;
case LT_NEED_PROTECT:
latexparam_ = subst(latexparam_, """, "\"");
break;
+ case LT_LEFTDELIM:
+ lex >> leftdelim_;
+ leftdelim_ = support::subst(leftdelim_, from_ascii("<br/>"),
+ from_ascii("\n"));
+ break;
+
+ case LT_RIGHTDELIM:
+ lex >> rightdelim_;
+ rightdelim_ = support::subst(rightdelim_, from_ascii("<br/>"),
+ from_ascii("\n"));
+ break;
+
case LT_INNERTAG:
lex >> innertag_;
break;
}
+void Layout::readArgument(Lexer & lex)
+{
+ latexarg arg;
+ arg.mandatory = false;
+ bool error = false;
+ bool finished = false;
+ arg.font = inherit_font;
+ arg.labelfont = inherit_font;
+ string id;
+ lex >> id;
+ bool const itemarg = prefixIs(id, "item:");
+
+ while (!finished && lex.isOK() && !error) {
+ lex.next();
+ string const tok = ascii_lowercase(lex.getString());
+
+ if (tok.empty()) {
+ continue;
+ } else if (tok == "endargument") {
+ finished = true;
+ } else if (tok == "labelstring") {
+ lex.next();
+ arg.labelstring = lex.getDocString();
+ } else if (tok == "menustring") {
+ lex.next();
+ arg.menustring = lex.getDocString();
+ } else if (tok == "mandatory") {
+ lex.next();
+ arg.mandatory = lex.getBool();
+ } else if (tok == "leftdelim") {
+ lex.next();
+ arg.ldelim = lex.getDocString();
+ arg.ldelim = support::subst(arg.ldelim, from_ascii("<br/>"),
+ from_ascii("\n"));
+ } else if (tok == "rightdelim") {
+ lex.next();
+ arg.rdelim = lex.getDocString();
+ arg.rdelim = support::subst(arg.rdelim, from_ascii("<br/>"),
+ from_ascii("\n"));
+ } else if (tok == "tooltip") {
+ lex.next();
+ arg.tooltip = lex.getDocString();
+ } else if (tok == "requires") {
+ lex.next();
+ arg.requires = lex.getString();
+ } else if (tok == "decoration") {
+ lex.next();
+ arg.decoration = lex.getString();
+ } else if (tok == "font") {
+ arg.font = lyxRead(lex, arg.font);
+ } else if (tok == "labelfont") {
+ arg.labelfont = lyxRead(lex, arg.labelfont);
+ } else {
+ lex.printError("Unknown tag");
+ error = true;
+ }
+ }
+ if (arg.labelstring.empty())
+ LYXERR0("Incomplete Argument definition!");
+ else if (itemarg)
+ itemargs_[id] = arg;
+ else
+ latexargs_[id] = arg;
+}
+
+
+int Layout::optArgs() const
+{
+ int nr = 0;
+ LaTeXArgMap::const_iterator it = latexargs_.begin();
+ for (; it != latexargs_.end(); ++it) {
+ if (!(*it).second.mandatory)
+ ++nr;
+ }
+ return nr;
+}
+
+
+int Layout::requiredArgs() const
+{
+ int nr = 0;
+ LaTeXArgMap::const_iterator it = latexargs_.begin();
+ for (; it != latexargs_.end(); ++it) {
+ if ((*it).second.mandatory)
+ ++nr;
+ }
+ return nr;
+}
+
+
string const & Layout::htmltag() const
{
if (htmltag_.empty())
}
-docstring Layout::htmlstyle() const {
+docstring Layout::htmlstyle() const
+{
if (!htmlstyle_.empty() && !htmlforcecss_)
return htmlstyle_;
if (htmldefaultstyle_.empty())
d = from_ascii("lyx_");
else
d += '_';
- } else if (islower(c))
+ } else if (isLower(c))
d += c;
else
// this is slow, so do it only if necessary
namespace {
- string makeMarginValue(char const * side, double d) {
- ostringstream os;
- os << "margin-" << side << ": " << d << "ex;\n";
- return os.str();
- }
+
+string makeMarginValue(char const * side, double d)
+{
+ ostringstream os;
+ os << "margin-" << side << ": " << d << "ex;\n";
+ return os.str();
+}
+
}
-void Layout::makeDefaultCSS() const {
+void Layout::makeDefaultCSS() const
+{
// this never needs to be redone, since reloading layouts will
// wipe out what we did before.
if (!htmldefaultstyle_.empty())