#include "support/lassert.h"
#include "support/lstrings.h"
-#include <boost/regex.hpp>
+#include "support/regex.h"
using namespace std;
using namespace lyx::support;
break;
}
- case LT_REFPREFIX:
- lex >> refprefix;
+ case LT_REFPREFIX: {
+ docstring arg;
+ lex >> arg;
+ if (arg == "OFF")
+ refprefix.clear();
+ else
+ refprefix = arg;
break;
+ }
case LT_HTMLTAG:
lex >> htmltag_;
}
}
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))