#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;
LT_END,
//LT_ENVIRONMENT_DEFAULT,
//LT_FANCYHDR,
- LT_FILL_BOTTOM,
- LT_FILL_TOP,
//LT_FIRST_COUNTER,
LT_FONT,
LT_FREE_SPACING,
endlabeltype = END_LABEL_NO_LABEL;
// Should or should not. That is the question.
// spacing.set(Spacing::OneHalf);
- fill_top = false;
- fill_bottom = false;
newline_allowed = true;
free_spacing = false;
pass_thru = false;
{ "end", LT_END },
{ "endlabelstring", LT_ENDLABELSTRING },
{ "endlabeltype", LT_ENDLABELTYPE },
- { "fill_bottom", LT_FILL_BOTTOM },
- { "fill_top", LT_FILL_TOP },
{ "font", LT_FONT },
{ "freespacing", LT_FREE_SPACING },
{ "htmlattr", LT_HTMLATTR },
{ "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 >> parsep;
break;
- case LT_FILL_TOP: // fill top flag
- lex >> fill_top;
- break;
-
- case LT_FILL_BOTTOM: // fill bottom flag
- lex >> fill_bottom;
- break;
-
case LT_NEWLINE: // newlines allowed?
lex >> newline_allowed;
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.");
+ 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()
smatch sub;
while (regex_search(preamble, sub, reg)) {
string const key = sub.str(1);
- string translated;
- if (isAscii(key))
- translated = to_utf8(getMessages(lang->code()).get(key));
- else {
- lyxerr << "Warning: not translating `" << key
- << "' because it is not pure ASCII." << endl;
- translated = key;
- }
+ string translated = to_utf8(lang->translateLayout(key));
preamble = subst(preamble, sub.str(), translated);
}
#endif
}
-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_;
}
namespace {
- string makeMarginValue(double d) {
+ string makeMarginValue(char const * side, double d) {
ostringstream os;
- os << d << "ex";
+ os << "margin-" << side << ": " << d << "ex;\n";
return os.str();
}
}
// main font
htmldefaultstyle_ = font.asCSS();
- // top and bottom margins
+ // bottom margins
string tmp;
if (topsep > 0)
- tmp += "margin-top: " + makeMarginValue(topsep) + ";\n";
+ tmp += makeMarginValue("top", topsep);
if (bottomsep > 0)
- tmp += "margin-bottom: " + makeMarginValue(bottomsep) + ";\n";
+ tmp += makeMarginValue("bottom", bottomsep);
+ if (!leftmargin.empty()) {
+ // we can't really do what LyX does with the margin, so
+ // we'll just figure out how many characters it is
+ int const len = leftmargin.length();
+ tmp += makeMarginValue("left", len);
+ }
+ if (!rightmargin.empty()) {
+ int const len = rightmargin.length();
+ tmp += makeMarginValue("right", len);
+ }
+
if (!tmp.empty()) {
if (!htmldefaultstyle_.empty())
htmldefaultstyle_ += from_ascii("\n");