#include <config.h>
#include "Layout.h"
+#include "FontInfo.h"
#include "Language.h"
-#include "TextClass.h"
#include "Lexer.h"
-#include "Font.h"
+#include "output_xhtml.h"
+#include "TextClass.h"
-#include "support/Messages.h"
#include "support/debug.h"
#include "support/lassert.h"
#include "support/lstrings.h"
+#include "support/Messages.h"
+#include "support/regex.h"
+#include "support/textutils.h"
-#include <boost/regex.hpp>
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,
LT_PASS_THRU,
+ LT_PARBREAK_IS_NEWLINE,
//LT_HEADINGS,
LT_ITEMSEP,
LT_KEEPEMPTY,
LT_HTMLLABELFIRST,
LT_HTMLPREAMBLE,
LT_HTMLSTYLE,
+ 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;
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;
+ parbreak_is_newline = false;
toclevel = NOT_IN_TOC;
commanddepth = 0;
htmllabelfirst_ = false;
+ htmlforcecss_ = false;
+ htmltitle_ = false;
+ spellcheck = true;
+ optargs = 0;
+ reqargs = 0;
}
{ "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 },
+ { "htmlattr", LT_HTMLATTR },
+ { "htmlforcecss", LT_HTMLFORCECSS },
{ "htmlitem", LT_HTMLITEM },
{ "htmlitemattr", LT_HTMLITEMATTR },
{ "htmllabel", LT_HTMLLABEL },
{ "htmllabelattr", LT_HTMLLABELATTR },
{ "htmllabelfirst", LT_HTMLLABELFIRST },
- { "htmlpremable", LT_HTMLPREAMBLE },
+ { "htmlpreamble", 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 },
{ "nextnoindent", LT_NEXTNOINDENT },
{ "obsoletedby", LT_OBSOLETEDBY },
{ "optionalargs", LT_OPTARGS },
+ { "parbreakisnewline", LT_PARBREAK_IS_NEWLINE },
{ "parindent", LT_PARINDENT },
{ "parsep", LT_PARSEP },
{ "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:
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 >> pass_thru;
break;
+ case LT_PARBREAK_IS_NEWLINE:
+ lex >> parbreak_is_newline;
+ break;
+
case LT_SPACING: // setspace.sty
readSpacing(lex);
break;
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_;
break;
case LT_HTMLITEM:
- lex >> htmlitem_;
+ lex >> htmlitemtag_;
break;
case LT_HTMLITEMATTR:
break;
case LT_HTMLLABEL:
- lex >> htmllabel_;
+ lex >> htmllabeltag_;
break;
case LT_HTMLLABELATTR:
htmlstyle_ = from_utf8(lex.getLongString("EndHTMLStyle"));
break;
+ case LT_HTMLFORCECSS:
+ lex >> htmlforcecss_;
+ break;
+
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 && latextype != LATEX_PARAGRAPH) {
+ LYXERR0("InPreamble not permitted except with command and paragraph layouts.");
+ LYXERR0("Layout name: " << name());
+ inpreamble = false;
+ }
- return !error;
+ return finished && !error;
}
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()
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))
- 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);
+}
+
+
+string const & Layout::htmltag() const
+{
+ if (htmltag_.empty())
+ htmltag_ = "div";
+ return htmltag_;
+}
+
+
+string const & Layout::htmlattr() const
+{
+ if (htmlattr_.empty())
+ htmlattr_ = "class=\"" + defaultCSSClass() + "\"";
+ return htmlattr_;
+}
+
+
+string const & Layout::htmlitemtag() const
+{
+ if (htmlitemtag_.empty())
+ htmlitemtag_ = "div";
+ return htmlitemtag_;
+}
+
+
+string const & Layout::htmlitemattr() const
+{
+ if (htmlitemattr_.empty())
+ htmlitemattr_ = "class=\"" + defaultCSSItemClass() + "\"";
+ return htmlitemattr_;
+}
+
+
+string const & Layout::htmllabeltag() const
+{
+ if (htmllabeltag_.empty()) {
+ if (labeltype != LABEL_TOP_ENVIRONMENT &&
+ labeltype != LABEL_CENTERED_TOP_ENVIRONMENT)
+ htmllabeltag_ = "span";
+ else
+ htmllabeltag_ = "div";
+ }
+ return htmllabeltag_;
+}
+
+
+string const & Layout::htmllabelattr() const
+{
+ if (htmllabelattr_.empty())
+ htmllabelattr_ = "class=\"" + defaultCSSLabelClass() + "\"";
+ return htmllabelattr_;
+}
+
+
+docstring Layout::htmlstyle() const {
+ if (!htmlstyle_.empty() && !htmlforcecss_)
+ return htmlstyle_;
+ if (htmldefaultstyle_.empty())
+ makeDefaultCSS();
+ docstring retval = htmldefaultstyle_;
+ if (!htmlstyle_.empty())
+ retval += '\n' + htmlstyle_;
+ return retval;
+}
+
+
+string Layout::defaultCSSClass() const
+{
+ if (!defaultcssclass_.empty())
+ return defaultcssclass_;
+ docstring d;
+ docstring::const_iterator it = name().begin();
+ docstring::const_iterator en = name().end();
+ for (; it != en; ++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);
+ }
+ defaultcssclass_ = to_utf8(d);
+ return defaultcssclass_;
+}
+
+
+namespace {
+ string makeMarginValue(char const * side, double d) {
+ ostringstream os;
+ os << "margin-" << side << ": " << d << "ex;\n";
+ return os.str();
+ }
+}
+
+
+void Layout::makeDefaultCSS() const {
+ // this never needs to be redone, since reloading layouts will
+ // wipe out what we did before.
+ if (!htmldefaultstyle_.empty())
+ return;
+
+ // main font
+ htmldefaultstyle_ = font.asCSS();
+
+ // bottom margins
+ string tmp;
+ if (topsep > 0)
+ tmp += makeMarginValue("top", topsep);
+ if (bottomsep > 0)
+ 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");
+ htmldefaultstyle_ += from_ascii(tmp);
+ }
+
+// tex2lyx does not see output_xhtml.cpp
+#ifndef TEX2LYX
+ // alignment
+ string where = alignmentToCSS(align);
+ if (!where.empty()) {
+ htmldefaultstyle_ += from_ascii("text-align: " + where + ";\n");
+ }
+#endif
+
+ // wrap up what we have, if anything
+ if (!htmldefaultstyle_.empty())
+ htmldefaultstyle_ =
+ from_ascii(htmltag() + "." + defaultCSSClass() + " {\n") +
+ htmldefaultstyle_ + from_ascii("\n}\n");
+
+ if (labeltype == LABEL_NO_LABEL || htmllabeltag() == "NONE")
+ return;
+
+ docstring labelCSS;
+
+ // label font
+ if (labelfont != font)
+ labelCSS = labelfont.asCSS() + from_ascii("\n");
+ if (labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
+ labelCSS += from_ascii("text-align: center;\n");
+
+ if (!labelCSS.empty())
+ htmldefaultstyle_ +=
+ from_ascii(htmllabeltag() + "." + defaultCSSLabelClass() + " {\n") +
+ labelCSS + from_ascii("\n}\n");
}