* Licence details can be found in the file COPYING.
*
* \author Martin Vermeer
- * \author Richard Heck
+ * \author Richard Kimberly Heck
*
* Full author contact details are available in file CREDITS.
*/
#include "InsetLayout.h"
#include "ColorSet.h"
-#include "Layout.h"
#include "Lexer.h"
#include "TextClass.h"
using std::set;
using std::vector;
-namespace lyx {
-
-InsetLayout::InsetLayout() :
- name_(from_ascii("undefined")), lyxtype_(STANDARD),
- labelstring_(from_ascii("UNDEFINED")), contentaslabel_(false),
- decoration_(DEFAULT), latextype_(NOLATEXTYPE), font_(inherit_font),
- labelfont_(sane_font), bgcolor_(Color_error),
- htmlforcecss_ (false), htmlisblock_(true),
- multipar_(true), custompars_(true), forceplain_(false),
- passthru_(false), parbreakisnewline_(false), freespacing_(false),
- keepempty_(false), forceltr_(false),
- needprotect_(false), intoc_(false), spellcheck_(true),
- resetsfont_(true), display_(true), forcelocalfontswitch_(false)
-{
- labelfont_.setColor(Color_error);
-}
+using namespace lyx::support;
+namespace lyx {
-InsetLayout::InsetDecoration translateDecoration(std::string const & str)
+InsetDecoration translateDecoration(std::string const & str)
{
- if (support::compare_ascii_no_case(str, "classic") == 0)
- return InsetLayout::CLASSIC;
- if (support::compare_ascii_no_case(str, "minimalistic") == 0)
- return InsetLayout::MINIMALISTIC;
- if (support::compare_ascii_no_case(str, "conglomerate") == 0)
- return InsetLayout::CONGLOMERATE;
- return InsetLayout::DEFAULT;
+ if (compare_ascii_no_case(str, "classic") == 0)
+ return InsetDecoration::CLASSIC;
+ if (compare_ascii_no_case(str, "minimalistic") == 0)
+ return InsetDecoration::MINIMALISTIC;
+ if (compare_ascii_no_case(str, "conglomerate") == 0)
+ return InsetDecoration::CONGLOMERATE;
+ return InsetDecoration::DEFAULT;
}
namespace {
-InsetLayout::InsetLaTeXType translateLaTeXType(std::string const & str)
+InsetLaTeXType translateLaTeXType(std::string const & str)
{
- if (support::compare_ascii_no_case(str, "command") == 0)
- return InsetLayout::COMMAND;
- if (support::compare_ascii_no_case(str, "environment") == 0)
- return InsetLayout::ENVIRONMENT;
- if (support::compare_ascii_no_case(str, "none") == 0)
- return InsetLayout::NOLATEXTYPE;
- return InsetLayout::ILT_ERROR;
+ if (compare_ascii_no_case(str, "command") == 0)
+ return InsetLaTeXType::COMMAND;
+ if (compare_ascii_no_case(str, "environment") == 0)
+ return InsetLaTeXType::ENVIRONMENT;
+ if (compare_ascii_no_case(str, "none") == 0)
+ return InsetLaTeXType::NOLATEXTYPE;
+ return InsetLaTeXType::ILT_ERROR;
}
-} // namespace anon
+} // namespace
-bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
+bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
+ bool validating)
{
enum {
+ IL_ADDTOTOC,
+ IL_ALLOWED_IN_INSET,
+ IL_ALLOWED_IN_LAYOUT,
+ IL_ALLOWED_OCCURRENCES,
+ IL_ALLOWED_OCCURRENCES_PER_ITEM,
IL_ARGUMENT,
IL_BABELPREAMBLE,
IL_BGCOLOR,
IL_CUSTOMPARS,
IL_DECORATION,
IL_DISPLAY,
+ IL_EDITEXTERNAL,
+ IL_FIXEDWIDTH_PREAMBLE_ENCODING,
IL_FONT,
IL_FORCE_LOCAL_FONT_SWITCH,
IL_FORCELTR,
+ IL_FORCEOWNLINES,
IL_FORCEPLAIN,
IL_FREESPACING,
IL_HTMLTAG,
IL_HTMLATTR,
+ IL_HTMLCLASS,
IL_HTMLFORCECSS,
IL_HTMLINNERTAG,
IL_HTMLINNERATTR,
IL_HTMLLABEL,
IL_HTMLSTYLE,
IL_HTMLPREAMBLE,
+ IL_DOCBOOKTAG,
+ IL_DOCBOOKATTR,
+ IL_DOCBOOKTAGTYPE,
+ IL_DOCBOOKSECTION,
+ IL_DOCBOOKININFO,
+ IL_DOCBOOKARGUMENTBEFOREMAINTAG,
+ IL_DOCBOOKARGUMENTAFTERMAINTAG,
+ IL_DOCBOOKNOTINPARA,
+ IL_DOCBOOKWRAPPERTAG,
+ IL_DOCBOOKWRAPPERTAGTYPE,
+ IL_DOCBOOKWRAPPERATTR,
+ IL_DOCBOOKITEMTAG,
+ IL_DOCBOOKITEMTAGTYPE,
+ IL_DOCBOOKITEMATTR,
+ IL_DOCBOOKITEMWRAPPERTAG,
+ IL_DOCBOOKITEMWRAPPERTAGTYPE,
+ IL_DOCBOOKITEMWRAPPERATTR,
+ IL_DOCBOOKINNERTAG,
+ IL_DOCBOOKINNERTAGTYPE,
+ IL_DOCBOOKINNERATTR,
+ IL_DOCBOOKNOFONTINSIDE,
+ IL_DOCBOOKRENDERASIMAGE,
+ IL_INHERITFONT,
IL_INTOC,
+ IL_ISTOCCAPTION,
IL_LABELFONT,
IL_LABELSTRING,
IL_LANGPREAMBLE,
IL_LATEXTYPE,
IL_LEFTDELIM,
IL_LYXTYPE,
+ IL_OBSOLETEDBY,
IL_KEEPEMPTY,
+ IL_MENUSTRING,
IL_MULTIPAR,
+ IL_NEEDCPROTECT,
+ IL_NEEDMBOXPROTECT,
IL_NEEDPROTECT,
+ IL_NEWLINE_CMD,
IL_PASSTHRU,
+ IL_PASSTHRU_CHARS,
+ IL_PARBREAKIGNORED,
IL_PARBREAKISNEWLINE,
IL_PREAMBLE,
IL_REQUIRES,
LexerKeyword elementTags[] = {
+ { "addtotoc", IL_ADDTOTOC },
+ { "allowedininsets", IL_ALLOWED_IN_INSET },
+ { "allowedinlayouts", IL_ALLOWED_IN_LAYOUT },
+ { "allowedoccurrences", IL_ALLOWED_OCCURRENCES },
+ { "allowedoccurrencesperitem", IL_ALLOWED_OCCURRENCES_PER_ITEM },
{ "argument", IL_ARGUMENT },
{ "babelpreamble", IL_BABELPREAMBLE },
{ "bgcolor", IL_BGCOLOR },
{ "contentaslabel", IL_CONTENTASLABEL },
- { "copystyle", IL_COPYSTYLE },
+ { "copystyle", IL_COPYSTYLE },
{ "counter", IL_COUNTER},
{ "custompars", IL_CUSTOMPARS },
{ "decoration", IL_DECORATION },
{ "display", IL_DISPLAY },
+ { "docbookargumentaftermaintag", IL_DOCBOOKARGUMENTAFTERMAINTAG },
+ { "docbookargumentbeforemaintag", IL_DOCBOOKARGUMENTBEFOREMAINTAG },
+ { "docbookattr", IL_DOCBOOKATTR },
+ { "docbookininfo", IL_DOCBOOKININFO },
+ { "docbookinnerattr", IL_DOCBOOKINNERATTR },
+ { "docbookinnertag", IL_DOCBOOKINNERTAG },
+ { "docbookinnertagtype", IL_DOCBOOKINNERTAGTYPE },
+ { "docbookitemattr", IL_DOCBOOKITEMATTR },
+ { "docbookitemtag", IL_DOCBOOKITEMTAG },
+ { "docbookitemtagtype", IL_DOCBOOKITEMTAGTYPE },
+ { "docbookitemwrapperattr", IL_DOCBOOKITEMWRAPPERATTR },
+ { "docbookitemwrappertag", IL_DOCBOOKITEMWRAPPERTAG },
+ { "docbookitemwrappertagtype", IL_DOCBOOKITEMWRAPPERTAGTYPE },
+ { "docbooknofontinside", IL_DOCBOOKNOFONTINSIDE },
+ { "docbooknotinpara", IL_DOCBOOKNOTINPARA },
+ { "docbookrenderasimage", IL_DOCBOOKRENDERASIMAGE },
+ { "docbooksection", IL_DOCBOOKSECTION },
+ { "docbooktag", IL_DOCBOOKTAG },
+ { "docbooktagtype", IL_DOCBOOKTAGTYPE },
+ { "docbookwrapperattr", IL_DOCBOOKWRAPPERATTR },
+ { "docbookwrappertag", IL_DOCBOOKWRAPPERTAG },
+ { "docbookwrappertagtype", IL_DOCBOOKWRAPPERTAGTYPE },
+ { "editexternal", IL_EDITEXTERNAL },
{ "end", IL_END },
+ { "fixedwidthpreambleencoding", IL_FIXEDWIDTH_PREAMBLE_ENCODING },
{ "font", IL_FONT },
{ "forcelocalfontswitch", IL_FORCE_LOCAL_FONT_SWITCH },
{ "forceltr", IL_FORCELTR },
+ { "forceownlines", IL_FORCEOWNLINES },
{ "forceplain", IL_FORCEPLAIN },
{ "freespacing", IL_FREESPACING },
{ "htmlattr", IL_HTMLATTR },
+ { "htmlclass", IL_HTMLCLASS },
{ "htmlforcecss", IL_HTMLFORCECSS },
{ "htmlinnerattr", IL_HTMLINNERATTR},
{ "htmlinnertag", IL_HTMLINNERTAG},
{ "htmlpreamble", IL_HTMLPREAMBLE },
{ "htmlstyle", IL_HTMLSTYLE },
{ "htmltag", IL_HTMLTAG },
+ { "inheritfont", IL_INHERITFONT },
{ "intoc", IL_INTOC },
+ { "istoccaption", IL_ISTOCCAPTION },
{ "keepempty", IL_KEEPEMPTY },
{ "labelfont", IL_LABELFONT },
{ "labelstring", IL_LABELSTRING },
{ "latextype", IL_LATEXTYPE },
{ "leftdelim", IL_LEFTDELIM },
{ "lyxtype", IL_LYXTYPE },
+ { "menustring", IL_MENUSTRING },
{ "multipar", IL_MULTIPAR },
+ { "needcprotect", IL_NEEDCPROTECT },
+ { "needmboxprotect", IL_NEEDMBOXPROTECT },
{ "needprotect", IL_NEEDPROTECT },
+ { "newlinecmd", IL_NEWLINE_CMD },
+ { "obsoletedby", IL_OBSOLETEDBY },
+ { "parbreakignored", IL_PARBREAKIGNORED },
{ "parbreakisnewline", IL_PARBREAKISNEWLINE },
{ "passthru", IL_PASSTHRU },
+ { "passthruchars", IL_PASSTHRU_CHARS },
{ "preamble", IL_PREAMBLE },
{ "refprefix", IL_REFPREFIX },
{ "requires", IL_REQUIRES },
lex.pushTable(elementTags);
- labelfont_ = inherit_font;
- bgcolor_ = Color_none;
+ if (labelfont_ == sane_font)
+ labelfont_ = inherit_font;
+ if (bgcolor_ == Color_error)
+ bgcolor_ = Color_none;
bool getout = false;
// whether we've read the CustomPars or ForcePlain tag
// for issuing a warning in case MultiPars comes later
bool readCustomOrPlain = false;
- string tmp;
+ string tmp;
while (!getout && lex.isOK()) {
int le = lex.lex();
switch (le) {
case Lexer::LEX_UNDEF:
lex.printError("Unknown InsetLayout tag");
+ if (validating)
+ return false;
continue;
default:
break;
LYXERR0("Flex insets must have names of the form `Flex:<name>'.\n"
"This one has the name `" << to_utf8(name_) << "'\n"
"Ignoring LyXType declaration.");
+ // this is not really a reason to abort
+ if (validating)
+ return false;
break;
}
string lt;
lex >> lt;
lyxtype_ = translateLyXType(lt);
- if (lyxtype_ == NOLYXTYPE)
+ if (lyxtype_ == InsetLyXType::NOLYXTYPE) {
LYXERR0("Unknown LyXType `" << lt << "'.");
- if (lyxtype_ == CHARSTYLE)
+ // this is not really a reason to abort
+ if (validating)
+ return false;
+ }
+ if (lyxtype_ == InsetLyXType::CHARSTYLE) {
+ // by default, charstyles force the plain layout
multipar_ = false;
+ forceplain_ = true;
+ }
break;
}
case IL_LATEXTYPE: {
string lt;
lex >> lt;
latextype_ = translateLaTeXType(lt);
- if (latextype_ == ILT_ERROR)
+ if (latextype_ == InsetLaTeXType::ILT_ERROR) {
LYXERR0("Unknown LaTeXType `" << lt << "'.");
+ // this is not really a reason to abort
+ if (validating)
+ return false;
+ }
break;
}
case IL_LABELSTRING:
lex >> labelstring_;
break;
+ case IL_MENUSTRING:
+ lex >> menustring_;
+ break;
case IL_DECORATION:
lex >> tmp;
decoration_ = translateDecoration(tmp);
break;
case IL_LATEXPARAM:
lex >> tmp;
- latexparam_ = support::subst(tmp, """, "\"");
+ latexparam_ = subst(tmp, """, "\"");
break;
case IL_LEFTDELIM:
lex >> leftdelim_;
- leftdelim_ = support::subst(leftdelim_, from_ascii("<br/>"),
+ leftdelim_ = subst(leftdelim_, from_ascii("<br/>"),
from_ascii("\n"));
break;
+ case IL_FIXEDWIDTH_PREAMBLE_ENCODING:
+ lex >> fixedwidthpreambleencoding_;
+ break;
case IL_FORCE_LOCAL_FONT_SWITCH:
lex >> forcelocalfontswitch_;
break;
case IL_RIGHTDELIM:
lex >> rightdelim_;
- rightdelim_ = support::subst(rightdelim_, from_ascii("<br/>"),
+ rightdelim_ = subst(rightdelim_, from_ascii("<br/>"),
from_ascii("\n"));
break;
case IL_LABELFONT:
case IL_FORCELTR:
lex >> forceltr_;
break;
+ case IL_FORCEOWNLINES:
+ lex >> forceownlines_;
+ break;
+ case IL_INHERITFONT:
+ lex >> inheritfont_;
+ break;
case IL_INTOC:
lex >> intoc_;
break;
case IL_PASSTHRU:
lex >> passthru_;
break;
+ case IL_PASSTHRU_CHARS:
+ lex >> passthru_chars_;
+ break;
+ case IL_NEWLINE_CMD:
+ lex >> newline_cmd_;
+ break;
+ case IL_PARBREAKIGNORED:
+ lex >> parbreakignored_;
+ break;
case IL_PARBREAKISNEWLINE:
lex >> parbreakisnewline_;
break;
case IL_NEEDPROTECT:
lex >> needprotect_;
break;
+ case IL_NEEDCPROTECT:
+ lex >> needcprotect_;
+ break;
+ case IL_NEEDMBOXPROTECT:
+ lex >> needmboxprotect_;
+ break;
case IL_CONTENTASLABEL:
lex >> contentaslabel_;
break;
// initialize with a known style
docstring style;
lex >> style;
- style = support::subst(style, '_', ' ');
+ style = subst(style, '_', ' ');
// We don't want to apply the algorithm in DocumentClass::insetLayout()
// here. So we do it the long way.
- TextClass::InsetLayouts::const_iterator it =
+ TextClass::InsetLayouts::const_iterator it =
tclass.insetLayouts().find(style);
if (it != tclass.insetLayouts().end()) {
docstring const tmpname = name_;
name_ = tmpname;
} else {
LYXERR0("Cannot copy unknown InsetLayout `"
+ << style << "' to InsetLayout `"
+ << name() << "'\n"
+ << "All InsetLayouts so far:");
+ TextClass::InsetLayouts::const_iterator lit =
+ tclass.insetLayouts().begin();
+ TextClass::InsetLayouts::const_iterator len =
+ tclass.insetLayouts().end();
+ for (; lit != len; ++lit)
+ lyxerr << lit->second.name() << "\n";
+ // this is not really a reason to abort
+ if (validating)
+ return false;
+ }
+ break;
+ }
+ case IL_OBSOLETEDBY: {
+ docstring style;
+ lex >> style;
+ style = subst(style, '_', ' ');
+
+ // We don't want to apply the algorithm in DocumentClass::insetLayout()
+ // here. So we do it the long way.
+ TextClass::InsetLayouts::const_iterator it =
+ tclass.insetLayouts().find(style);
+ if (it != tclass.insetLayouts().end()) {
+ docstring const tmpname = name_;
+ this->operator=(it->second);
+ name_ = tmpname;
+ if (obsoleted_by().empty())
+ obsoleted_by_ = style;
+ } else {
+ LYXERR0("Cannot replace InsetLayout `"
+ << name()
+ << "' with unknown InsetLayout `"
<< style << "'\n"
<< "All InsetLayouts so far:");
- TextClass::InsetLayouts::const_iterator lit =
+ TextClass::InsetLayouts::const_iterator lit =
tclass.insetLayouts().begin();
- TextClass::InsetLayouts::const_iterator len =
+ TextClass::InsetLayouts::const_iterator len =
tclass.insetLayouts().end();
for (; lit != len; ++lit)
lyxerr << lit->second.name() << "\n";
+ // this is not really a reason to abort
+ if (validating)
+ return false;
}
break;
}
bgcolor_ = lcolor.getFromLyXName(tmp);
break;
case IL_PREAMBLE:
- preamble_ = from_utf8(lex.getLongString("EndPreamble"));
+ preamble_ = lex.getLongString(from_ascii("EndPreamble"));
break;
case IL_BABELPREAMBLE:
- babelpreamble_ = from_utf8(lex.getLongString("EndBabelPreamble"));
+ babelpreamble_ = lex.getLongString(from_ascii("EndBabelPreamble"));
break;
case IL_LANGPREAMBLE:
- langpreamble_ = from_utf8(lex.getLongString("EndLangPreamble"));
+ langpreamble_ = lex.getLongString(from_ascii("EndLangPreamble"));
break;
case IL_REFPREFIX:
lex >> refprefix_;
case IL_HTMLATTR:
lex >> htmlattr_;
break;
+ case IL_HTMLCLASS:
+ lex >> htmlclass_;
+ break;
case IL_HTMLFORCECSS:
lex >> htmlforcecss_;
break;
lex >> htmlisblock_;
break;
case IL_HTMLSTYLE:
- htmlstyle_ = from_utf8(lex.getLongString("EndHTMLStyle"));
+ htmlstyle_ = lex.getLongString(from_ascii("EndHTMLStyle"));
break;
case IL_HTMLPREAMBLE:
- htmlpreamble_ = from_utf8(lex.getLongString("EndPreamble"));
+ htmlpreamble_ = lex.getLongString(from_ascii("EndPreamble"));
+ break;
+ case IL_DOCBOOKTAG:
+ lex >> docbooktag_;
+ break;
+ case IL_DOCBOOKATTR:
+ lex >> docbookattr_;
+ break;
+ case IL_DOCBOOKTAGTYPE:
+ lex >> docbooktagtype_;
+ break;
+ case IL_DOCBOOKINNERTAG:
+ lex >> docbookinnertag_;
+ break;
+ case IL_DOCBOOKINNERATTR:
+ lex >> docbookinnerattr_;
+ break;
+ case IL_DOCBOOKINNERTAGTYPE:
+ lex >> docbookinnertagtype_;
+ break;
+ case IL_DOCBOOKININFO:
+ lex >> docbookininfo_;
+ break;
+ case IL_DOCBOOKARGUMENTBEFOREMAINTAG:
+ lex >> docbookargumentbeforemaintag_;
+ break;
+ case IL_DOCBOOKARGUMENTAFTERMAINTAG:
+ lex >> docbookargumentaftermaintag_;
+ break;
+ case IL_DOCBOOKNOTINPARA:
+ lex >> docbooknotinpara_;
+ break;
+ case IL_DOCBOOKSECTION:
+ lex >> docbooksection_;
+ break;
+ case IL_DOCBOOKITEMTAG:
+ lex >> docbookitemtag_;
+ break;
+ case IL_DOCBOOKITEMTAGTYPE:
+ lex >> docbookitemtagtype_;
+ break;
+ case IL_DOCBOOKITEMATTR:
+ lex >> docbookitemattr_;
+ break;
+ case IL_DOCBOOKITEMWRAPPERTAG:
+ lex >> docbookitemwrappertag_;
+ break;
+ case IL_DOCBOOKITEMWRAPPERTAGTYPE:
+ lex >> docbookitemwrappertagtype_;
+ break;
+ case IL_DOCBOOKITEMWRAPPERATTR:
+ lex >> docbookitemwrapperattr_;
+ break;
+ case IL_DOCBOOKWRAPPERTAG:
+ lex >> docbookwrappertag_;
+ break;
+ case IL_DOCBOOKWRAPPERTAGTYPE:
+ lex >> docbookwrappertagtype_;
+ break;
+ case IL_DOCBOOKWRAPPERATTR:
+ lex >> docbookwrapperattr_;
+ break;
+ case IL_DOCBOOKNOFONTINSIDE:
+ lex >> docbooknofontinside_;
+ break;
+ case IL_DOCBOOKRENDERASIMAGE:
+ lex >> docbookrenderasimage_;
break;
case IL_REQUIRES: {
lex.eatLine();
- vector<string> const req
- = support::getVectorFromString(lex.getString());
- requires_.insert(req.begin(), req.end());
+ vector<string> const req
+ = getVectorFromString(lex.getString(true));
+ required_.insert(req.begin(), req.end());
break;
}
case IL_SPELLCHECK:
case IL_DISPLAY:
lex >> display_;
break;
+ case IL_ADDTOTOC:
+ lex >> toc_type_;
+ add_to_toc_ = !toc_type_.empty();
+ break;
+ case IL_ISTOCCAPTION:
+ lex >> is_toc_caption_;
+ break;
+ case IL_EDITEXTERNAL:
+ lex >> edit_external_;
+ break;
+ case IL_ALLOWED_IN_INSET: {
+ docstring allowed = lex.getLongString(from_ascii("EndAllowedInInsets"));
+ allowed = subst(allowed, from_ascii("\n"), docstring());
+ allowed = subst(allowed, from_ascii("\t"), docstring());
+ allowed = subst(allowed, from_ascii("\""), docstring());
+ allowed = subst(allowed, '_', ' ');
+ vector<docstring> const allowances =
+ getVectorFromString(allowed, from_ascii(","), false, true);
+ allowed_in_insets_.clear();
+ allowed_in_insets_.insert(allowances.begin(), allowances.end());
+ break;
+ }
+
+ case IL_ALLOWED_IN_LAYOUT: {
+ docstring allowed = lex.getLongString(from_ascii("EndAllowedInLayouts"));
+ allowed = subst(allowed, from_ascii("\n"), docstring());
+ allowed = subst(allowed, from_ascii("\t"), docstring());
+ allowed = subst(allowed, from_ascii("\""), docstring());
+ allowed = subst(allowed, '_', ' ');
+ vector<docstring> const allowances =
+ getVectorFromString(allowed, from_ascii(","), false, true);
+ allowed_in_layouts_.clear();
+ allowed_in_layouts_.insert(allowances.begin(), allowances.end());
+ break;
+ }
+ case IL_ALLOWED_OCCURRENCES:
+ lex >> allowed_occurrences_;
+ break;
+ case IL_ALLOWED_OCCURRENCES_PER_ITEM:
+ lex >> allowed_occurrences_per_item_;
+ break;
case IL_END:
getout = true;
break;
// Here add element to list if getout == true
if (!getout)
return false;
-
+
// The label font is generally used as-is without
// any realization against a given context.
labelfont_.realize(sane_font);
}
-InsetLayout::InsetLyXType translateLyXType(std::string const & str)
+InsetLyXType translateLyXType(std::string const & str)
{
-
- if (support::compare_ascii_no_case(str, "charstyle") == 0)
- return InsetLayout::CHARSTYLE;
- if (support::compare_ascii_no_case(str, "custom") == 0)
- return InsetLayout::CUSTOM;
- if (support::compare_ascii_no_case(str, "element") == 0)
- return InsetLayout::ELEMENT;
- if (support::compare_ascii_no_case(str, "end") == 0)
- return InsetLayout::END;
- if (support::compare_ascii_no_case(str, "standard") == 0)
- return InsetLayout::STANDARD;
- return InsetLayout::NOLYXTYPE;
+ if (compare_ascii_no_case(str, "charstyle") == 0)
+ return InsetLyXType::CHARSTYLE;
+ if (compare_ascii_no_case(str, "custom") == 0)
+ return InsetLyXType::CUSTOM;
+ if (compare_ascii_no_case(str, "end") == 0)
+ return InsetLyXType::END;
+ if (compare_ascii_no_case(str, "standard") == 0)
+ return InsetLyXType::STANDARD;
+ return InsetLyXType::NOLYXTYPE;
}
{
if (htmltag_.empty())
htmltag_ = multipar_ ? "div" : "span";
- return htmltag_;
+ return htmltag_;
}
-string const & InsetLayout::htmlattr() const
+string const & InsetLayout::htmlclass() const
{
- if (htmlattr_.empty())
- htmlattr_ = "class=\"" + defaultCSSClass() + "\"";
- return htmlattr_;
+ if (htmlclass_.empty())
+ htmlclass_ = defaultCSSClass();
+ return htmlclass_;
+}
+
+
+std::string const & InsetLayout::htmlGetAttrString() const {
+ if (!htmlfullattrs_.empty())
+ return htmlfullattrs_;
+ htmlfullattrs_ = htmlclass();
+ if (!htmlfullattrs_.empty())
+ htmlfullattrs_ = "class='" + htmlfullattrs_ + "'";
+ if (!htmlattr_.empty())
+ htmlfullattrs_ += " " + htmlattr_;
+ return htmlfullattrs_;
}
{
if (htmlinnerattr_.empty())
htmlinnerattr_ = "class=\"" + defaultCSSClass() + "_inner\"";
- return htmlinnerattr_;
+ return htmlinnerattr_;
}
string InsetLayout::defaultCSSClass() const
-{
+{
if (!defaultcssclass_.empty())
return defaultcssclass_;
string d;
else if (isLower(*it))
d += *it;
else
- d += support::lowercase(*it);
+ d += lowercase(*it);
}
// are there other characters we need to remove?
defaultcssclass_ = d;
void InsetLayout::makeDefaultCSS() const
{
- if (!htmldefaultstyle_.empty())
+ if (!htmldefaultstyle_.empty())
return;
docstring const mainfontCSS = font_.asCSS();
if (!mainfontCSS.empty())
- htmldefaultstyle_ =
+ htmldefaultstyle_ =
from_ascii(htmltag() + "." + defaultCSSClass() + " {\n") +
mainfontCSS + from_ascii("\n}\n");
}
-docstring InsetLayout::htmlstyle() const
-{
+docstring InsetLayout::htmlstyle() const
+{
if (!htmlstyle_.empty() && !htmlforcecss_)
return htmlstyle_;
if (htmldefaultstyle_.empty())
return retval;
}
+
+std::string const & InsetLayout::docbookininfo() const
+{
+ // Same as Layout::docbookininfo.
+ // Indeed, a trilean. Only titles should be "maybe": otherwise, metadata is "always", content is "never".
+ if (docbookininfo_.empty() || (docbookininfo_ != "never" && docbookininfo_ != "always" && docbookininfo_ != "maybe"))
+ docbookininfo_ = "never";
+ return docbookininfo_;
+}
+
+
+std::string InsetLayout::docbooktagtype() const
+{
+ if (docbooktagtype_ != "block" && docbooktagtype_ != "paragraph" && docbooktagtype_ != "inline")
+ docbooktagtype_ = "block";
+ return docbooktagtype_;
+}
+
+
+std::string InsetLayout::docbookinnertagtype() const
+{
+ if (docbookinnertagtype_ != "block" && docbookinnertagtype_ != "paragraph" && docbookinnertagtype_ != "inline")
+ docbookinnertagtype_ = "block";
+ return docbookinnertagtype_;
+}
+
+
+std::string InsetLayout::docbookwrappertagtype() const
+{
+ if (docbookwrappertagtype_ != "block" && docbookwrappertagtype_ != "paragraph" && docbookwrappertagtype_ != "inline")
+ docbookwrappertagtype_ = "block";
+ return docbookwrappertagtype_;
+}
+
+
+std::string InsetLayout::docbookitemtagtype() const
+{
+ if (docbookitemtagtype_ != "block" && docbookitemtagtype_ != "paragraph" && docbookitemtagtype_ != "inline")
+ docbookitemtagtype_ = "block";
+ return docbookitemtagtype_;
+}
+
+
+std::string InsetLayout::docbookitemwrappertagtype() const
+{
+ if (docbookitemwrappertagtype_ != "block" && docbookitemwrappertagtype_ != "paragraph" && docbookitemwrappertagtype_ != "inline")
+ docbookitemwrappertagtype_ = "block";
+ return docbookitemwrappertagtype_;
+}
+
+
void InsetLayout::readArgument(Lexer & lex)
{
Layout::latexarg arg;
arg.mandatory = false;
arg.autoinsert = false;
+ arg.insertcotext = false;
+ arg.insertonnewline = false;
bool error = false;
bool finished = false;
arg.font = inherit_font;
arg.labelfont = inherit_font;
+ arg.is_toc_caption = false;
+ arg.free_spacing = false;
+ arg.passthru = PT_INHERITED;
+ arg.nodelims = false;
string nr;
lex >> nr;
- bool const postcmd = support::prefixIs(nr, "post:");
+ bool const postcmd = prefixIs(nr, "post:");
while (!finished && lex.isOK() && !error) {
lex.next();
- string const tok = support::ascii_lowercase(lex.getString());
+ string const tok = ascii_lowercase(lex.getString());
if (tok.empty()) {
continue;
} else if (tok == "autoinsert") {
lex.next();
arg.autoinsert = lex.getBool();
+ } else if (tok == "insertcotext") {
+ lex.next();
+ arg.insertcotext = lex.getBool();
+ } else if (tok == "insertonnewline") {
+ lex.next();
+ arg.insertonnewline = lex.getBool();
} else if (tok == "leftdelim") {
lex.next();
arg.ldelim = lex.getDocString();
- arg.ldelim = support::subst(arg.ldelim,
+ arg.ldelim = 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,
+ arg.rdelim = subst(arg.rdelim,
from_ascii("<br/>"), from_ascii("\n"));
} else if (tok == "defaultarg") {
lex.next();
lex.next();
arg.tooltip = lex.getDocString();
} else if (tok == "requires") {
- lex.next();
- arg.requires = lex.getString();
+ lex.eatLine();
+ arg.required = trim(lex.getString(true));
} else if (tok == "decoration") {
lex.next();
arg.decoration = lex.getString();
+ } else if (tok == "newlinecmd") {
+ lex.next();
+ arg.newlinecmd = lex.getString();
} else if (tok == "font") {
arg.font = lyxRead(lex, arg.font);
} else if (tok == "labelfont") {
arg.labelfont = lyxRead(lex, arg.labelfont);
+ } else if (tok == "passthruchars") {
+ lex.next();
+ arg.pass_thru_chars = lex.getDocString();
+ } else if (tok == "passthru") {
+ lex.next();
+ docstring value = lex.getDocString();
+ if (value == "true" || value == "1")
+ arg.passthru = PT_TRUE;
+ else if (value == "false" || value == "0")
+ arg.passthru = PT_FALSE;
+ else
+ arg.passthru = PT_INHERITED;
+ } else if (tok == "istoccaption") {
+ lex.next();
+ arg.is_toc_caption = lex.getBool();
+ } else if (tok == "freespacing") {
+ lex.next();
+ arg.free_spacing = lex.getBool();
+ } else if (tok == "docbooktag") {
+ lex.next();
+ arg.docbooktag = lex.getDocString();
+ } else if (tok == "docbookattr") {
+ lex.next();
+ arg.docbookattr = lex.getDocString();
+ } else if (tok == "docbooktagtype") {
+ lex.next();
+ arg.docbooktagtype = lex.getDocString();
+ } else if (tok == "docbookargumentbeforemaintag") {
+ lex.next();
+ arg.docbookargumentbeforemaintag = lex.getBool();
+ } else if (tok == "docbookargumentaftermaintag") {
+ lex.next();
+ arg.docbookargumentaftermaintag = lex.getBool();
} else {
lex.printError("Unknown tag");
error = true;
}
-unsigned int InsetLayout::optArgs() const
+int InsetLayout::optArgs() const
{
- unsigned int nr = 0;
- Layout::LaTeXArgMap::const_iterator it = args().begin();
- for (; it != args().end(); ++it) {
+ int nr = 0;
+ Layout::LaTeXArgMap const args = InsetLayout::args();
+ Layout::LaTeXArgMap::const_iterator it = args.begin();
+ for (; it != args.end(); ++it) {
if (!(*it).second.mandatory)
++nr;
}
}
-unsigned int InsetLayout::requiredArgs() const
+int InsetLayout::requiredArgs() const
{
- unsigned int nr = 0;
- Layout::LaTeXArgMap::const_iterator it = args().begin();
- for (; it != args().end(); ++it) {
+ int nr = 0;
+ Layout::LaTeXArgMap const args = InsetLayout::args();
+ Layout::LaTeXArgMap::const_iterator it = args.begin();
+ for (; it != args.end(); ++it) {
if ((*it).second.mandatory)
++nr;
}
projects / lyx.git / blobdiff