X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.cpp;h=85fe11a8abebe336c26f44a022d08418ece50c29;hb=f37a1b8aeaf8f3a3a66a22bf0b396f7d1ceca2ff;hp=32f565297ee9a8ee4fd0354c2b12560374fc6e01;hpb=9577dae301866e69016c26300826114a611ea779;p=lyx.git

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 32f565297e..85fe11a8ab 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -16,7 +16,7 @@
 #include "Language.h"
 #include "TextClass.h"
 #include "Lexer.h"
-#include "Font.h"
+#include "FontInfo.h"
 
 #include "support/Messages.h"
 #include "support/debug.h"
@@ -101,6 +101,8 @@ enum LayoutTags {
 	LT_HTMLLABELFIRST,
 	LT_HTMLPREAMBLE,
 	LT_HTMLSTYLE,
+	LT_HTMLFORCECSS,
+	LT_INPREAMBLE,
 	LT_INTITLE // keep this last!
 };
 
@@ -112,6 +114,7 @@ Layout::Layout()
 	margintype = MARGIN_STATIC;
 	latextype = LATEX_PARAGRAPH;
 	intitle = false;
+	inpreamble = false;
 	optionalargs = 0;
 	needprotect = false;
 	keepempty = false;
@@ -140,6 +143,7 @@ Layout::Layout()
 	toclevel = NOT_IN_TOC;
 	commanddepth = 0;
 	htmllabelfirst_ = false;
+	htmlforcecss_ = false;
 }
 
 
@@ -162,7 +166,8 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 		{ "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 },
@@ -172,6 +177,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 		{ "htmlstyle",      LT_HTMLSTYLE },
 		{ "htmltag",        LT_HTMLTAG },
 		{ "innertag",       LT_INNERTAG },
+		{ "inpreamble",     LT_INPREAMBLE },
 		{ "intitle",        LT_INTITLE },
 		{ "itemsep",        LT_ITEMSEP },
 		{ "itemtag",        LT_ITEMTAG },
@@ -297,6 +303,10 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 			lex >> intitle;
 			break;
 
+		case LT_INPREAMBLE:
+			lex >> inpreamble;
+			break;
+
 		case LT_TOCLEVEL:
 			lex >> toclevel;
 			break;
@@ -491,7 +501,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 			break;
 
 		case LT_HTMLITEM:
-			lex >> htmlitem_;
+			lex >> htmlitemtag_;
 			break;
 	
 		case LT_HTMLITEMATTR:
@@ -499,7 +509,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 			break;
 	
 		case LT_HTMLLABEL:
-			lex >> htmllabel_;
+			lex >> htmllabeltag_;
 			break;
 
 		case LT_HTMLLABELATTR: 
@@ -514,6 +524,9 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 			htmlstyle_ = from_utf8(lex.getLongString("EndHTMLStyle"));
 			break;
 
+		case LT_HTMLFORCECSS:
+			lex >> htmlforcecss_;
+
 		case LT_HTMLPREAMBLE:
 			htmlpreamble_ = from_utf8(lex.getLongString("EndPreamble"));
 			break;
@@ -863,6 +876,111 @@ docstring const Layout::babelpreamble(Language const * lang) const
 }
 
 
+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())
+		htmllabeltag_ = "span";
+	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) {
+		if (!isalpha(*it))
+			continue;
+		if (islower(*it))
+			d += *it;
+		else 
+			d += lowercase(*it);
+	}
+	// are there other characters we need to remove?
+	defaultcssclass_ = to_utf8(d);
+	return defaultcssclass_;
+}
+
+
+// NOTE There is a whole ton of stuff that could go into this.
+// Things like bottomsep, topsep, and parsep could become various
+// sorts of margins or padding, for example. But for now we are
+// going to keep it simple.
+void Layout::makeDefaultCSS() const {
+	// this never needs to be redone, since reloading layouts will
+	// wipe out what we did before.
+	if (!htmldefaultstyle_.empty()) 
+		return;
+	docstring const mainfontCSS = font.asCSS();
+	if (!mainfontCSS.empty())
+		htmldefaultstyle_ = 
+			from_ascii(htmltag() + "." + defaultCSSClass() + " {\n") +
+			mainfontCSS + from_ascii("\n}\n");
+	if (labelfont == font || htmllabeltag() == "NONE")
+		return;
+	docstring const labelfontCSS = labelfont.asCSS();
+	if (!labelfontCSS.empty())
+		htmldefaultstyle_ +=
+			from_ascii(htmllabeltag() + "." + defaultCSSLabelClass() + " {\n") +
+			labelfontCSS + from_ascii("\n}\n");
+}
+
+
 bool Layout::operator==(Layout const & rhs) const
 {
 	// This is enough for the applications we actually make,