X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLayout.cpp;h=7291a60bf14fd7d9242b401b4ef7d569da2c668c;hb=dc8c4f3eab6e01f3767de765423fda5e4d6c5124;hp=6b30f5a37b9f5aa2a240c7f213337e633d06a443;hpb=eb121f99935579ca4c459cf0265b6f39dbddd6c1;p=lyx.git
diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 6b30f5a37b..7291a60bf1 100644
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -29,6 +29,8 @@ using std::string;
using std::set;
using std::vector;
+using namespace lyx::support;
+
namespace lyx {
InsetLayout::InsetLayout() :
@@ -42,7 +44,7 @@ InsetLayout::InsetLayout() :
freespacing_(false), keepempty_(false), forceltr_(false),
forceownlines_(false), needprotect_(false), intoc_(false),
spellcheck_(true), resetsfont_(false), display_(true),
- forcelocalfontswitch_(false)
+ forcelocalfontswitch_(false), add_to_toc_(false), is_toc_caption_(false)
{
labelfont_.setColor(Color_error);
}
@@ -50,11 +52,11 @@ InsetLayout::InsetLayout() :
InsetLayout::InsetDecoration translateDecoration(std::string const & str)
{
- if (support::compare_ascii_no_case(str, "classic") == 0)
+ if (compare_ascii_no_case(str, "classic") == 0)
return InsetLayout::CLASSIC;
- if (support::compare_ascii_no_case(str, "minimalistic") == 0)
+ if (compare_ascii_no_case(str, "minimalistic") == 0)
return InsetLayout::MINIMALISTIC;
- if (support::compare_ascii_no_case(str, "conglomerate") == 0)
+ if (compare_ascii_no_case(str, "conglomerate") == 0)
return InsetLayout::CONGLOMERATE;
return InsetLayout::DEFAULT;
}
@@ -63,11 +65,11 @@ namespace {
InsetLayout::InsetLaTeXType translateLaTeXType(std::string const & str)
{
- if (support::compare_ascii_no_case(str, "command") == 0)
+ if (compare_ascii_no_case(str, "command") == 0)
return InsetLayout::COMMAND;
- if (support::compare_ascii_no_case(str, "environment") == 0)
+ if (compare_ascii_no_case(str, "environment") == 0)
return InsetLayout::ENVIRONMENT;
- if (support::compare_ascii_no_case(str, "none") == 0)
+ if (compare_ascii_no_case(str, "none") == 0)
return InsetLayout::NOLATEXTYPE;
return InsetLayout::ILT_ERROR;
}
@@ -78,6 +80,7 @@ InsetLayout::InsetLaTeXType translateLaTeXType(std::string const & str)
bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
{
enum {
+ IL_ADDTOTOC,
IL_ARGUMENT,
IL_BABELPREAMBLE,
IL_BGCOLOR,
@@ -104,6 +107,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
IL_HTMLSTYLE,
IL_HTMLPREAMBLE,
IL_INTOC,
+ IL_ISTOCCAPTION,
IL_LABELFONT,
IL_LABELSTRING,
IL_LANGPREAMBLE,
@@ -117,6 +121,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
IL_MULTIPAR,
IL_NEEDPROTECT,
IL_PASSTHRU,
+ IL_PASSTHRU_CHARS,
IL_PARBREAKISNEWLINE,
IL_PREAMBLE,
IL_REQUIRES,
@@ -130,6 +135,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
LexerKeyword elementTags[] = {
+ { "addtotoc", IL_ADDTOTOC },
{ "argument", IL_ARGUMENT },
{ "babelpreamble", IL_BABELPREAMBLE },
{ "bgcolor", IL_BGCOLOR },
@@ -157,6 +163,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
{ "htmlstyle", IL_HTMLSTYLE },
{ "htmltag", IL_HTMLTAG },
{ "intoc", IL_INTOC },
+ { "istoccaption", IL_ISTOCCAPTION },
{ "keepempty", IL_KEEPEMPTY },
{ "labelfont", IL_LABELFONT },
{ "labelstring", IL_LABELSTRING },
@@ -171,6 +178,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
{ "obsoletedby", IL_OBSOLETEDBY },
{ "parbreakisnewline", IL_PARBREAKISNEWLINE },
{ "passthru", IL_PASSTHRU },
+ { "passthruchars", IL_PASSTHRU_CHARS },
{ "preamble", IL_PREAMBLE },
{ "refprefix", IL_REFPREFIX },
{ "requires", IL_REQUIRES },
@@ -242,11 +250,11 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
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("
"),
+ leftdelim_ = subst(leftdelim_, from_ascii("
"),
from_ascii("\n"));
break;
case IL_FIXEDWIDTH_PREAMBLE_ENCODING:
@@ -257,7 +265,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
break;
case IL_RIGHTDELIM:
lex >> rightdelim_;
- rightdelim_ = support::subst(rightdelim_, from_ascii("
"),
+ rightdelim_ = subst(rightdelim_, from_ascii("
"),
from_ascii("\n"));
break;
case IL_LABELFONT:
@@ -296,6 +304,9 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
case IL_PASSTHRU:
lex >> passthru_;
break;
+ case IL_PASSTHRU_CHARS:
+ lex >> passthru_chars_;
+ break;
case IL_PARBREAKISNEWLINE:
lex >> parbreakisnewline_;
break;
@@ -315,7 +326,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
// 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.
@@ -342,7 +353,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
case IL_OBSOLETEDBY: {
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.
@@ -434,7 +445,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
case IL_REQUIRES: {
lex.eatLine();
vector const req
- = support::getVectorFromString(lex.getString());
+ = getVectorFromString(lex.getString(true));
requires_.insert(req.begin(), req.end());
break;
}
@@ -447,6 +458,13 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
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_END:
getout = true;
break;
@@ -468,15 +486,15 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
InsetLayout::InsetLyXType translateLyXType(std::string const & str)
{
- if (support::compare_ascii_no_case(str, "charstyle") == 0)
+ if (compare_ascii_no_case(str, "charstyle") == 0)
return InsetLayout::CHARSTYLE;
- if (support::compare_ascii_no_case(str, "custom") == 0)
+ if (compare_ascii_no_case(str, "custom") == 0)
return InsetLayout::CUSTOM;
- if (support::compare_ascii_no_case(str, "element") == 0)
+ if (compare_ascii_no_case(str, "element") == 0)
return InsetLayout::ELEMENT;
- if (support::compare_ascii_no_case(str, "end") == 0)
+ if (compare_ascii_no_case(str, "end") == 0)
return InsetLayout::END;
- if (support::compare_ascii_no_case(str, "standard") == 0)
+ if (compare_ascii_no_case(str, "standard") == 0)
return InsetLayout::STANDARD;
return InsetLayout::NOLYXTYPE;
}
@@ -520,7 +538,7 @@ string InsetLayout::defaultCSSClass() const
else if (isLower(*it))
d += *it;
else
- d += support::lowercase(*it);
+ d += lowercase(*it);
}
// are there other characters we need to remove?
defaultcssclass_ = d;
@@ -557,16 +575,18 @@ void InsetLayout::readArgument(Lexer & lex)
Layout::latexarg arg;
arg.mandatory = false;
arg.autoinsert = false;
+ arg.insertcotext = false;
bool error = false;
bool finished = false;
arg.font = inherit_font;
arg.labelfont = inherit_font;
+ arg.is_toc_caption = 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;
@@ -584,15 +604,21 @@ void InsetLayout::readArgument(Lexer & lex)
} else if (tok == "autoinsert") {
lex.next();
arg.autoinsert = lex.getBool();
+ } else if (tok == "insertcotext") {
+ lex.next();
+ arg.insertcotext = lex.getBool();
+ } else if (tok == "insertcotext") {
+ lex.next();
+ arg.insertcotext = 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("
"), 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("
"), from_ascii("\n"));
} else if (tok == "defaultarg") {
lex.next();
@@ -613,6 +639,12 @@ void InsetLayout::readArgument(Lexer & lex)
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 == "istoccaption") {
+ lex.next();
+ arg.is_toc_caption = lex.getBool();
} else {
lex.printError("Unknown tag");
error = true;