#include "support/lassert.h"
#include "support/lstrings.h"
#include "support/Messages.h"
-
#include "support/regex.h"
+#include "support/textutils.h"
+
using namespace std;
using namespace lyx::support;
{ "htmllabel", LT_HTMLLABEL },
{ "htmllabelattr", LT_HTMLLABELATTR },
{ "htmllabelfirst", LT_HTMLLABELFIRST },
- { "htmlpremable", LT_HTMLPREAMBLE },
+ { "htmlpreamble", LT_HTMLPREAMBLE },
{ "htmlstyle", LT_HTMLSTYLE },
{ "htmltag", LT_HTMLTAG },
{ "htmltitle", LT_HTMLTITLE },
}
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.");
+ if (inpreamble && latextype != LATEX_COMMAND && latextype != LATEX_PARAGRAPH) {
+ LYXERR0("InPreamble not permitted except with command and paragraph layouts.");
LYXERR0("Layout name: " << name());
inpreamble = false;
}
namespace {
-docstring const i18npreamble(Language const * lang, docstring const & templ)
+docstring const i18npreamble(Language const * lang, docstring const & templ, bool const polyglossia)
{
if (templ.empty())
return templ;
- string preamble = subst(to_utf8(templ), "$$lang", lang->babel());
+ string preamble = polyglossia ?
+ subst(to_utf8(templ), "$$lang", lang->polyglossia()) :
+ subst(to_utf8(templ), "$$lang", lang->babel());
#ifdef TEX2LYX
// tex2lyx does not have getMessages()
}
-docstring const Layout::langpreamble(Language const * lang) const
+docstring const Layout::langpreamble(Language const * lang, bool const polyglossia) const
{
- return i18npreamble(lang, langpreamble_);
+ return i18npreamble(lang, langpreamble_, polyglossia);
}
-docstring const Layout::babelpreamble(Language const * lang) const
+docstring const Layout::babelpreamble(Language const * lang, bool const polyglossia) const
{
- return i18npreamble(lang, babelpreamble_);
+ return i18npreamble(lang, babelpreamble_, polyglossia);
}
docstring::const_iterator it = name().begin();
docstring::const_iterator en = name().end();
for (; it != en; ++it) {
- if (!isalpha(*it))
- continue;
- if (islower(*it))
- d += *it;
- else
- d += lowercase(*it);
+ char_type const c = *it;
+ if (!isAlphaASCII(c)) {
+ if (d.empty())
+ // make sure we don't start with an underscore,
+ // as that sometimes causes problems.
+ d = from_ascii("lyx_");
+ else
+ d += '_';
+ } else if (islower(c))
+ d += c;
+ else
+ // this is slow, so do it only if necessary
+ d += lowercase(c);
}
- // are there other characters we need to remove?
defaultcssclass_ = to_utf8(d);
return defaultcssclass_;
}