X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLayout.cpp;h=f2b701dfb8057f81bb21b03d0242a519b9cc0ec4;hb=996505c2ae981187d34580633fca410972c2493d;hp=7ffff946a0359b1bdfe2a71fac01b23a105c4b74;hpb=70899f0c154bed67e376080169f52e853bb9e9bd;p=lyx.git

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 7ffff946a0..f2b701dfb8 100644
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -15,7 +15,6 @@
 #include "InsetLayout.h"
 
 #include "ColorSet.h"
-#include "Font.h"
 #include "Lexer.h"
 #include "TextClass.h"
 
@@ -35,7 +34,8 @@ InsetLayout::InsetLayout() :
 	labelstring_(from_ascii("UNDEFINED")), decoration_(DEFAULT),
 	latextype_(NOLATEXTYPE), font_(sane_font), 
 	labelfont_(sane_font), bgcolor_(Color_error), 
-	multipar_(false), custompars_(false), forceplain_(true), 
+	htmlforcecss_ (false), htmlisblock_(true),
+	multipar_(true), custompars_(true), forceplain_(false), 
 	passthru_(false), needprotect_(false), freespacing_(false), 
 	keepempty_(false), forceltr_(false), intoc_(false)
 { 
@@ -75,6 +75,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 	enum {
 		IL_BGCOLOR,
 		IL_COPYSTYLE,
+		IL_COUNTER,
 		IL_CUSTOMPARS,
 		IL_DECORATION,
 		IL_FONT,
@@ -83,6 +84,11 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		IL_FREESPACING,
 		IL_HTMLTAG,
 		IL_HTMLATTR,
+		IL_HTMLFORCECSS,
+		IL_HTMLINNERTAG,
+		IL_HTMLINNERATTR,
+		IL_HTMLISBLOCK,
+		IL_HTMLLABEL,
 		IL_HTMLSTYLE,
 		IL_HTMLPREAMBLE,
 		IL_INTOC,
@@ -105,6 +111,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 	LexerKeyword elementTags[] = {
 		{ "bgcolor", IL_BGCOLOR },
 		{ "copystyle", IL_COPYSTYLE }, 
+		{ "counter", IL_COUNTER},
 		{ "custompars", IL_CUSTOMPARS },
 		{ "decoration", IL_DECORATION },
 		{ "end", IL_END },
@@ -113,6 +120,11 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		{ "forceplain", IL_FORCEPLAIN },
 		{ "freespacing", IL_FREESPACING },
 		{ "htmlattr", IL_HTMLATTR },
+		{ "htmlforcecss", IL_HTMLFORCECSS },
+		{ "htmlinnerattr", IL_HTMLINNERATTR},
+		{ "htmlinnertag", IL_HTMLINNERTAG},
+		{ "htmlisblock", IL_HTMLISBLOCK},
+		{ "htmllabel", IL_HTMLLABEL },
 		{ "htmlpreamble", IL_HTMLPREAMBLE },
 		{ "htmlstyle", IL_HTMLSTYLE },
 		{ "htmltag", IL_HTMLTAG },
@@ -205,6 +217,9 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 			custompars_ = multipar_;
 			forceplain_ = !multipar_;
 			break;
+		case IL_COUNTER:
+			lex >> counter_;
+			break;
 		case IL_CUSTOMPARS:
 			lex >> custompars_;
 			readCustomOrPlain = true;
@@ -272,6 +287,21 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 		case IL_HTMLATTR:
 			lex >> htmlattr_;
 			break;
+		case IL_HTMLFORCECSS:
+			lex >> htmlforcecss_;
+			break;
+		case IL_HTMLINNERTAG:
+			lex >> htmlinnertag_;
+			break;
+		case IL_HTMLINNERATTR:
+			lex >> htmlinnerattr_;
+			break;
+		case IL_HTMLLABEL:
+			lex >> htmllabel_;
+			break;
+		case IL_HTMLISBLOCK:
+			lex >> htmlisblock_;
+			break;
 		case IL_HTMLSTYLE:
 			htmlstyle_ = from_utf8(lex.getLongString("EndHTMLStyle"));
 			break;
@@ -320,4 +350,76 @@ InsetLayout::InsetLyXType translateLyXType(std::string const & str)
 	return InsetLayout::NOLYXTYPE;
 }
 
+
+string const & InsetLayout::htmltag() const
+{
+	if (htmltag_.empty())
+		htmltag_ = multipar_ ? "div" : "span";
+	return htmltag_; 
+}
+
+
+string const & InsetLayout::htmlattr() const
+{
+	if (htmlattr_.empty())
+		htmlattr_ = "class=\"" + defaultCSSClass() + "\"";
+	return htmlattr_; 
+}
+
+
+string const & InsetLayout::htmlinnerattr() const
+{
+	if (htmlinnerattr_.empty())
+		htmlinnerattr_ = "class=\"" + defaultCSSClass() + "_inner\"";
+	return htmlinnerattr_; 
+}
+
+
+string InsetLayout::defaultCSSClass() const
+{ 
+	if (!defaultcssclass_.empty())
+		return defaultcssclass_;
+	string d;
+	string n = to_utf8(name());
+	string::const_iterator it = n.begin();
+	string::const_iterator en = n.end();
+	for (; it != en; ++it) {
+		if (!isalpha(*it))
+			d += "_";
+		else if (islower(*it))
+			d += *it;
+		else
+			d += support::lowercase(*it);
+	}
+	// are there other characters we need to remove?
+	defaultcssclass_ = d;
+	return defaultcssclass_;
+}
+
+
+void InsetLayout::makeDefaultCSS() const
+{
+	if (!htmldefaultstyle_.empty()) 
+		return;
+	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())
+		makeDefaultCSS();
+	docstring retval = htmldefaultstyle_;
+	if (!htmlstyle_.empty())
+		retval += '\n' + htmlstyle_ + '\n';
+	return retval;
+}
+
+
 } //namespace lyx