#include "Language.h"
#include "TextClass.h"
#include "Lexer.h"
-#include "Font.h"
+#include "FontInfo.h"
#include "support/Messages.h"
#include "support/debug.h"
#include "support/lassert.h"
#include "support/lstrings.h"
-#include <boost/regex.hpp>
+#include "support/regex.h"
using namespace std;
using namespace lyx::support;
LT_HTMLLABELFIRST,
LT_HTMLPREAMBLE,
LT_HTMLSTYLE,
- LT_HTMLFORCEDEFAULT,
+ LT_HTMLFORCECSS,
+ LT_INPREAMBLE,
+ LT_HTMLTITLE,
+ LT_SPELLCHECK,
+ LT_REFPREFIX,
+ LT_REQARGS,
LT_INTITLE // keep this last!
};
margintype = MARGIN_STATIC;
latextype = LATEX_PARAGRAPH;
intitle = false;
- optionalargs = 0;
+ inpreamble = false;
needprotect = false;
keepempty = false;
font = inherit_font;
toclevel = NOT_IN_TOC;
commanddepth = 0;
htmllabelfirst_ = false;
- htmlforcedefault_ = false;
+ htmlforcecss_ = false;
+ htmltitle_ = false;
+ spellcheck = true;
+ optargs = 0;
+ reqargs = 0;
}
{ "font", LT_FONT },
{ "freespacing", LT_FREE_SPACING },
{ "htmlattr", LT_HTMLATTR },
- { "htmlforcedefault", LT_HTMLFORCEDEFAULT },
+ { "htmlforcecss", LT_HTMLFORCECSS },
{ "htmlitem", LT_HTMLITEM },
{ "htmlitemattr", LT_HTMLITEMATTR },
{ "htmllabel", LT_HTMLLABEL },
{ "htmlpremable", LT_HTMLPREAMBLE },
{ "htmlstyle", LT_HTMLSTYLE },
{ "htmltag", LT_HTMLTAG },
+ { "htmltitle", LT_HTMLTITLE },
{ "innertag", LT_INNERTAG },
+ { "inpreamble", LT_INPREAMBLE },
{ "intitle", LT_INTITLE },
{ "itemsep", LT_ITEMSEP },
{ "itemtag", LT_ITEMTAG },
{ "parskip", LT_PARSKIP },
{ "passthru", LT_PASS_THRU },
{ "preamble", LT_PREAMBLE },
+ { "refprefix", LT_REFPREFIX },
+ { "requiredargs", LT_REQARGS },
{ "requires", LT_REQUIRES },
{ "rightmargin", LT_RIGHTMARGIN },
{ "spacing", LT_SPACING },
+ { "spellcheck", LT_SPELLCHECK },
{ "textfont", LT_TEXTFONT },
{ "toclevel", LT_TOCLEVEL },
{ "topsep", LT_TOPSEP }
lex >> intitle;
break;
+ case LT_INPREAMBLE:
+ lex >> inpreamble;
+ break;
+
case LT_TOCLEVEL:
lex >> toclevel;
break;
case LT_OPTARGS:
- lex >> optionalargs ;
+ lex >> optargs;
+ break;
+
+ case LT_REQARGS:
+ lex >> reqargs;
break;
case LT_NEED_PROTECT:
requires_.insert(req.begin(), req.end());
break;
}
+
+ case LT_REFPREFIX: {
+ docstring arg;
+ lex >> arg;
+ if (arg == "OFF")
+ refprefix.clear();
+ else
+ refprefix = arg;
+ break;
+ }
case LT_HTMLTAG:
lex >> htmltag_;
htmlstyle_ = from_utf8(lex.getLongString("EndHTMLStyle"));
break;
- case LT_HTMLFORCEDEFAULT:
- lex >> htmlforcedefault_;
+ case LT_HTMLFORCECSS:
+ lex >> htmlforcecss_;
case LT_HTMLPREAMBLE:
htmlpreamble_ = from_utf8(lex.getLongString("EndPreamble"));
break;
+
+ case LT_HTMLTITLE:
+ lex >> htmltitle_;
+ break;
+ case LT_SPELLCHECK:
+ lex >> spellcheck;
+ break;
}
}
lex.popTable();
+ // make sure we only have inpreamble = true for commands
+ if (inpreamble && latextype != LATEX_COMMAND) {
+ LYXERR0("InPreamble not permitted except with Command-type layouts.");
+ LYXERR0("Layout name: " << name());
+ inpreamble = false;
+ }
return !error;
}
LASSERT(false, /**/);
#else
// FIXME UNICODE
- // boost::regex is not unicode-safe.
+ // lyx::regex is not unicode-safe.
// Should use QRegExp or (boost::u32regex, but that requires ICU)
- static boost::regex const reg("_\\(([^\\)]+)\\)");
- boost::smatch sub;
- while (boost::regex_search(preamble, sub, reg)) {
+ static regex const reg("_\\(([^\\)]+)\\)");
+ smatch sub;
+ while (regex_search(preamble, sub, reg)) {
string const key = sub.str(1);
string translated;
if (isAscii(key))
docstring Layout::htmlstyle() const {
- if (!htmlstyle_.empty() && !htmlforcedefault_)
+ if (!htmlstyle_.empty() && !htmlforcecss_)
return htmlstyle_;
if (htmldefaultstyle_.empty())
makeDefaultCSS();
// sorts of margins or padding, for example. But for now we are
// going to keep it simple.
void Layout::makeDefaultCSS() const {
-#ifdef TEX2LYX
- // tex2lyx does not have FontInfo::asCSS()
- return;
-#else
// this never needs to be redone, since reloading layouts will
// wipe out what we did before.
if (!htmldefaultstyle_.empty())
htmldefaultstyle_ +=
from_ascii(htmllabeltag() + "." + defaultCSSLabelClass() + " {\n") +
labelfontCSS + from_ascii("\n}\n");
-#endif
}