[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lyx-cvs
Subject:    [LyX/2.2.x] ABOVE and CENTERED labels need special treatment.
From:       Richard Heck <rgheck () lyx ! org>
Date:       2016-06-30 3:56:52
Message-ID: 20160630035652.0A33928025D () lyx ! lyx ! org
[Download RAW message or body]

commit bfeee826b4004ff5baa5aa7a42082ea1f9e00a0e
Author: Richard Heck <rgheck@lyx.org>
Date:   Wed Jun 29 23:55:11 2016 -0400

    ABOVE and CENTERED labels need special treatment.
    
    Fixes bug #8843.
    
    (cherry picked from commit 08bf9781ee86ea7fe2c9f3a0d670cad92807a017)
---
 src/output_xhtml.cpp |   14 ++++++++++++--
 status.22x           |    2 ++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index e960e2c..c6b3c78 100644
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -1057,14 +1057,24 @@ void makeCommand(Buffer const & buf,
 		    documentClass().counters().step(style.counter, OutputUpdate);
 
 	bool const make_parid = !runparams.for_toc && runparams.html_make_pars;
+	
+	if (style.labeltype == LABEL_ABOVE)
+		xs << html::StartTag("div")
+		   << pbegin->params().labelString()
+		   << html::EndTag("div");
+	else if (style.labeltype == LABEL_CENTERED)
+		xs << html::StartTag("div", "style = \"text-align: center;\"")
+		   << pbegin->params().labelString()
+		   << html::EndTag("div");
 
 	openParTag(xs, style, pbegin->params(),
 	           make_parid ? pbegin->magicLabel() : "");
 
 	// Label around sectioning number:
 	// FIXME Probably need to account for LABEL_MANUAL
-	// FIXME Probably also need now to account for labels ABOVE and CENTERED.
-	if (style.labeltype != LABEL_NO_LABEL) {
+	if (style.labeltype != LABEL_NO_LABEL &&
+	    style.labeltype != LABEL_ABOVE &&
+	    style.labeltype != LABEL_CENTERED ) {
 		openLabelTag(xs, style);
 		xs << pbegin->params().labelString();
 		closeLabelTag(xs, style);
diff --git a/status.22x b/status.22x
index 5f12f11..f13c03b 100644
--- a/status.22x
+++ b/status.22x
@@ -171,6 +171,8 @@ What's new
 
 - Fix output of vertical space in the middle of a paragraph (bug 8154).
 
+- Fix output of ABOVE and CENTERED label types (bug 8843).
+
 - Output correct entities for named delimiters (bug 8280).
 
 - Added class attribute for mathbb to allow customization (part of bug

[prev in list] [next in list] [prev in thread] [next in thread]