#include "support/debug.h"
#include "support/lstrings.h"
+#include "support/textutils.h"
#include <vector>
passthru_(false), parbreakisnewline_(false), freespacing_(false),
keepempty_(false), forceltr_(false),
needprotect_(false), intoc_(false), spellcheck_(true),
- resetsfont_(true)
+ resetsfont_(true), display_(true)
{
labelfont_.setColor(Color_error);
}
bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
{
enum {
+ IL_BABELPREAMBLE,
IL_BGCOLOR,
IL_CONTENTASLABEL,
IL_COPYSTYLE,
IL_COUNTER,
IL_CUSTOMPARS,
IL_DECORATION,
+ IL_DISPLAY,
IL_FONT,
IL_FORCELTR,
IL_FORCEPLAIN,
IL_INTOC,
IL_LABELFONT,
IL_LABELSTRING,
+ IL_LANGPREAMBLE,
IL_LATEXNAME,
IL_LATEXPARAM,
IL_LATEXTYPE,
LexerKeyword elementTags[] = {
+ { "babelpreamble", IL_BABELPREAMBLE },
{ "bgcolor", IL_BGCOLOR },
{ "contentaslabel", IL_CONTENTASLABEL },
{ "copystyle", IL_COPYSTYLE },
{ "counter", IL_COUNTER},
{ "custompars", IL_CUSTOMPARS },
{ "decoration", IL_DECORATION },
+ { "display", IL_DISPLAY },
{ "end", IL_END },
{ "font", IL_FONT },
{ "forceltr", IL_FORCELTR },
{ "keepempty", IL_KEEPEMPTY },
{ "labelfont", IL_LABELFONT },
{ "labelstring", IL_LABELSTRING },
+ { "langpreamble", IL_LANGPREAMBLE },
{ "latexname", IL_LATEXNAME },
{ "latexparam", IL_LATEXPARAM },
{ "latextype", IL_LATEXTYPE },
lex.pushTable(elementTags);
- FontInfo font = inherit_font;
labelfont_ = inherit_font;
bgcolor_ = Color_none;
bool getout = false;
// way this sort of thing is handled in Layout::read(), namely, by
// using the Lexer.
case IL_LYXTYPE: {
+ // make sure that we have the right sort of name.
+ if (name_ != from_ascii("undefined")
+ && name_.substr(0,5) != from_ascii("Flex:")) {
+ LYXERR0("Flex insets must have names of the form `Flex:<name>'.\n"
+ "This one has the name `" << to_utf8(name_) << "'\n"
+ "Ignoring LyXType declaration.");
+ break;
+ }
string lt;
lex >> lt;
lyxtype_ = translateLyXType(lt);
case IL_PREAMBLE:
preamble_ = from_utf8(lex.getLongString("EndPreamble"));
break;
+ case IL_BABELPREAMBLE:
+ babelpreamble_ = from_utf8(lex.getLongString("EndBabelPreamble"));
+ break;
+ case IL_LANGPREAMBLE:
+ langpreamble_ = from_utf8(lex.getLongString("EndLangPreamble"));
+ break;
case IL_REFPREFIX:
lex >> refprefix_;
break;
case IL_RESETSFONT:
lex >> resetsfont_;
break;
+ case IL_DISPLAY:
+ lex >> display_;
+ break;
case IL_END:
getout = true;
break;
string::const_iterator it = n.begin();
string::const_iterator en = n.end();
for (; it != en; ++it) {
- if (!isalpha(*it))
+ if (!isAlphaASCII(*it))
d += "_";
- else if (islower(*it))
+ else if (isLower(*it))
d += *it;
else
d += support::lowercase(*it);