latextype_(NOLATEXTYPE), font_(sane_font),
labelfont_(sane_font), bgcolor_(Color_error),
htmlforcecss_ (false), htmlisblock_(true),
- multipar_(false), custompars_(true), forceplain_(false),
+ multipar_(true), custompars_(true), forceplain_(false),
passthru_(false), needprotect_(false), freespacing_(false),
keepempty_(false), forceltr_(false), intoc_(false)
{
}
+string const & InsetLayout::htmltag() const
+{
+ if (htmltag_.empty())
+ htmltag_ = multipar_ ? "div" : "span";
+ return htmltag_;
+}
+
+
string const & InsetLayout::htmlattr() const
{
if (htmlattr_.empty())
{
if (!htmldefaultstyle_.empty())
return;
- if (!htmltag_.empty()) {
- docstring const mainfontCSS = font_.asCSS();
- if (!mainfontCSS.empty())
- htmldefaultstyle_ =
- from_ascii(htmltag() + "." + defaultCSSClass() + " {\n") +
- mainfontCSS + from_ascii("\n}\n");
- }
- /*
- At present, we do not have default tags, etc, for the label.
- if (labelfont_ == font_)
- return;
- docstring const labelfontCSS = labelfont_.asCSS();
- if (!labelfontCSS.empty())
- htmldefaultstyle_ +=
-. from_ascii(htmllabeltag() + "." + defaultCSSLabelClass() + " {\n") +
- labelfontCSS + from_ascii("\n}\n");
- */
+ docstring const mainfontCSS = font_.asCSS();
+ if (!mainfontCSS.empty())
+ htmldefaultstyle_ =
+ from_ascii(htmltag() + "." + defaultCSSClass() + " {\n") +
+ mainfontCSS + from_ascii("\n}\n");
}
+
docstring InsetLayout::htmlstyle() const
{
if (!htmlstyle_.empty() && !htmlforcecss_)
return htmlstyle_;
- if (htmldefaultstyle_.empty())
+ if (htmldefaultstyle_.empty())
makeDefaultCSS();
docstring retval = htmldefaultstyle_;
if (!htmlstyle_.empty())
- retval += '\n' + htmlstyle_;
+ retval += '\n' + htmlstyle_ + '\n';
return retval;
}