LT_ALIGN = 1,
LT_ALIGNPOSSIBLE,
LT_ARGUMENT,
+ LT_AUTONESTS,
+ LT_AUTONESTEDBY,
LT_MARGIN,
LT_BOTTOMSEP,
LT_CATEGORY,
LT_HTMLITEM,
LT_HTMLITEMATTR,
LT_HTMLLABEL,
- LT_HTMLLABELATTR,
+ LT_HTMLLABELATTR,
LT_HTMLLABELFIRST,
LT_HTMLPREAMBLE,
LT_HTMLSTYLE,
/////////////////////
Layout::Layout()
- : add_to_toc_(false), is_toc_caption_(false)
+ : add_to_toc_(false), is_toc_caption_(true)
{
unknown_ = false;
margintype = MARGIN_STATIC;
{ "align", LT_ALIGN },
{ "alignpossible", LT_ALIGNPOSSIBLE },
{ "argument", LT_ARGUMENT },
+ { "autonests", LT_AUTONESTS },
{ "babelpreamble", LT_BABELPREAMBLE },
{ "bottomsep", LT_BOTTOMSEP },
{ "category", LT_CATEGORY },
{ "innertag", LT_INNERTAG },
{ "inpreamble", LT_INPREAMBLE },
{ "intitle", LT_INTITLE },
+ { "isautonestedby", LT_AUTONESTEDBY },
{ "istoccaption", LT_ISTOCCAPTION },
{ "itemcommand", LT_ITEMCOMMAND },
{ "itemsep", LT_ITEMSEP },
error = true;
continue;
- default:
+ default:
break;
}
switch (static_cast<LayoutTags>(le)) {
if (obsoleted_by().empty())
obsoleted_by_ = style;
} else {
- LYXERR0("Cannot replace with unknown style `"
+ LYXERR0("Cannot replace with unknown style `"
<< style << '\'');
//lex.printError("Cannot replace with"
case LT_ALIGN:
readAlign(lex);
break;
-
+
case LT_ALIGNPOSSIBLE:
readAlignPossible(lex);
break;
// FIXME: this means LT_LABELSTRING_APPENDIX may only
// occur after LT_LABELSTRING
lex >> labelstring_;
- labelstring_ = trim(labelstring_);
labelstring_appendix_ = labelstring_;
break;
case LT_ENDLABELSTRING:
- lex >> endlabelstring_;
- endlabelstring_ = trim(endlabelstring_);
+ lex >> endlabelstring_;
break;
case LT_LABELSTRING_APPENDIX:
- lex >> labelstring_appendix_;
- labelstring_appendix_ = trim(labelstring_appendix_);
+ lex >> labelstring_appendix_;
break;
case LT_LABELCOUNTER:
- lex >> counter;
- counter = trim(counter);
+ lex >> counter;
break;
case LT_PAR_GROUP:
requires_.insert(req.begin(), req.end());
break;
}
-
+
+ case LT_AUTONESTS: {
+ docstring const autonest =
+ subst(subst(subst(lex.getLongString(from_ascii("EndAutoNests")),
+ from_ascii("\n"), docstring()),
+ from_ascii(" "), docstring()),
+ from_ascii("\t"), docstring());
+ vector<docstring> const autonests =
+ getVectorFromString(autonest);
+ autonests_.insert(autonests.begin(), autonests.end());
+ break;
+ }
+
+ case LT_AUTONESTEDBY: {
+ docstring const autonest =
+ subst(subst(subst(lex.getLongString(from_ascii("EndIsAutoNestedBy")),
+ from_ascii("\n"), docstring()),
+ from_ascii(" "), docstring()),
+ from_ascii("\t"), docstring());
+ vector<docstring> const autonests =
+ getVectorFromString(autonest);
+ autonested_by_.insert(autonests.begin(), autonests.end());
+ break;
+ }
+
case LT_REFPREFIX: {
docstring arg;
lex >> arg;
case LT_HTMLTAG:
lex >> htmltag_;
break;
-
+
case LT_HTMLATTR:
lex >> htmlattr_;
break;
case LT_HTMLITEM:
lex >> htmlitemtag_;
break;
-
+
case LT_HTMLITEMATTR:
lex >> htmlitemattr_;
break;
-
+
case LT_HTMLLABEL:
lex >> htmllabeltag_;
break;
- case LT_HTMLLABELATTR:
+ case LT_HTMLLABELATTR:
lex >> htmllabelattr_;
break;
case LT_HTMLLABELFIRST:
lex >> htmllabelfirst_;
break;
-
+
case LT_HTMLSTYLE:
htmlstyle_ = lex.getLongString(from_ascii("EndHTMLStyle"));
break;
case LT_HTMLPREAMBLE:
htmlpreamble_ = lex.getLongString(from_ascii("EndPreamble"));
break;
-
+
case LT_HTMLTITLE:
lex >> htmltitle_;
break;
}
os << '\n';
}
+ if (!autonests_.empty()) {
+ os << "\tAutoNests\n\t";
+ for (set<docstring>::const_iterator it = autonests_.begin();
+ it != autonests_.end(); ++it) {
+ if (it != autonests_.begin())
+ os << ',';
+ os << to_utf8(*it);
+ }
+ os << "\n\tEndAutoNests\n";
+ }
+ if (!autonested_by_.empty()) {
+ os << "\tIsAutoNestedBy\n\t";
+ for (set<docstring>::const_iterator it = autonested_by_.begin();
+ it != autonested_by_.end(); ++it) {
+ if (it != autonested_by_.begin())
+ os << ',';
+ os << to_utf8(*it);
+ }
+ os << "\n\tIsAutoNestedBy\n";
+ }
if (refprefix.empty())
os << "\tRefPrefix OFF\n";
else
}
-string const & Layout::htmltag() const
-{
+string const & Layout::htmltag() const
+{
if (htmltag_.empty())
htmltag_ = "div";
return htmltag_;
}
-string const & Layout::htmlattr() const
-{
+string const & Layout::htmlattr() const
+{
if (htmlattr_.empty())
htmlattr_ = "class=\"" + defaultCSSClass() + "\"";
- return htmlattr_;
+ return htmlattr_;
}
-string const & Layout::htmlitemtag() const
-{
+string const & Layout::htmlitemtag() const
+{
if (htmlitemtag_.empty())
htmlitemtag_ = "div";
- return htmlitemtag_;
+ return htmlitemtag_;
}
-string const & Layout::htmlitemattr() const
-{
+string const & Layout::htmlitemattr() const
+{
if (htmlitemattr_.empty())
htmlitemattr_ = "class=\"" + defaultCSSItemClass() + "\"";
- return htmlitemattr_;
+ return htmlitemattr_;
}
-string const & Layout::htmllabeltag() const
-{
- if (htmllabeltag_.empty()) {
- if (labeltype != LABEL_ABOVE &&
- labeltype != LABEL_CENTERED)
+string const & Layout::htmllabeltag() const
+{
+ if (htmllabeltag_.empty())
htmllabeltag_ = "span";
- else
- htmllabeltag_ = "div";
- }
- return htmllabeltag_;
+ return htmllabeltag_;
}
-string const & Layout::htmllabelattr() const
-{
+string const & Layout::htmllabelattr() const
+{
if (htmllabelattr_.empty())
htmllabelattr_ = "class=\"" + defaultCSSLabelClass() + "\"";
- return htmllabelattr_;
+ return htmllabelattr_;
}
{
if (!htmlstyle_.empty() && !htmlforcecss_)
return htmlstyle_;
- if (htmldefaultstyle_.empty())
+ if (htmldefaultstyle_.empty())
makeDefaultCSS();
docstring retval = htmldefaultstyle_;
if (!htmlstyle_.empty())
string Layout::defaultCSSClass() const
-{
+{
if (!defaultcssclass_.empty())
return defaultcssclass_;
docstring d;
return os.str();
}
-}
+} // namespace
void Layout::makeDefaultCSS() const
{
// this never needs to be redone, since reloading layouts will
// wipe out what we did before.
- if (!htmldefaultstyle_.empty())
+ if (!htmldefaultstyle_.empty())
return;
-
+
// main font
htmldefaultstyle_ = font.asCSS();
-
+
// bottom margins
string tmp;
if (topsep > 0)
if (bottomsep > 0)
tmp += makeMarginValue("bottom", bottomsep);
if (!leftmargin.empty()) {
- // we can't really do what LyX does with the margin, so
+ // we can't really do what LyX does with the margin, so
// we'll just figure out how many characters it is
int const len = leftmargin.length();
tmp += makeMarginValue("left", len);
int const len = rightmargin.length();
tmp += makeMarginValue("right", len);
}
-
+
if (!tmp.empty()) {
if (!htmldefaultstyle_.empty())
htmldefaultstyle_ += from_ascii("\n");
// wrap up what we have, if anything
if (!htmldefaultstyle_.empty())
- htmldefaultstyle_ =
+ htmldefaultstyle_ =
from_ascii(htmltag() + "." + defaultCSSClass() + " {\n") +
htmldefaultstyle_ + from_ascii("\n}\n");
-
+
if (labeltype == LABEL_NO_LABEL || htmllabeltag() == "NONE")
return;
-
+
docstring labelCSS;
-
+
// label font
if (labelfont != font)
labelCSS = labelfont.asCSS() + from_ascii("\n");
if (labeltype == LABEL_CENTERED)
labelCSS += from_ascii("text-align: center;\n");
-
+
if (!labelCSS.empty())
htmldefaultstyle_ +=
from_ascii(htmllabeltag() + "." + defaultCSSLabelClass() + " {\n") +
projects / lyx.git / blobdiff