From: Richard Heck <rgheck@comcast.net>
Date: Wed, 15 Sep 2010 14:18:19 +0000 (+0000)
Subject: Auto-generate centering info for centered labels.
X-Git-Tag: 2.0.0~2597
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0675c802a761a5ddde0c452cc31daf4f4e2c285a;p=features.git

Auto-generate centering info for centered labels.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35393 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/layouts/stdstruct.inc b/lib/layouts/stdstruct.inc
index 8c9eb2b60e..0eb7a1918f 100644
--- a/lib/layouts/stdstruct.inc
+++ b/lib/layouts/stdstruct.inc
@@ -35,10 +35,10 @@ Style Abstract
 	EndFont
 	HTMLLabel             div
 	HTMLLabelFirst        1
+	HTMLForceCSS          1
 	HTMLStyle
 		div.abstract {
-			margin-top: 2em;
-			margin-bottom: 2em;
+			margin: 4ex;
 		}
 		div.abstract_item {
 			font-size: small;
diff --git a/src/Layout.cpp b/src/Layout.cpp
index daf298f509..9a75637331 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -1049,15 +1049,21 @@ void Layout::makeDefaultCSS() const {
 			from_ascii(htmltag() + "." + defaultCSSClass() + " {\n") +
 			htmldefaultstyle_ + from_ascii("\n}\n");
 	
-	if (labelfont == font || htmllabeltag() == "NONE")
+	if (labeltype == LABEL_NO_LABEL || htmllabeltag() == "NONE")
 		return;
 	
+	docstring labelCSS;
+	
 	// label font
-	docstring const labelfontCSS = labelfont.asCSS();
-	if (!labelfontCSS.empty())
+	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") +
-			labelfontCSS + from_ascii("\n}\n");
+			labelCSS + from_ascii("\n}\n");
 }