X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_xhtml.cpp;h=d8299ce5c4511a30df32133583a5f86fde4c6aa1;hb=fa8dae4201fc25da685a21de0f8968678df8f119;hp=0a8222c8fb31cad5d0b96ffa946a73877ee44ecd;hpb=a5cb2afc1bceab54f450dbf7673d764645c87984;p=lyx.git

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 0a8222c8fb..d8299ce5c4 100644
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -32,6 +32,7 @@
 #include "support/debug.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
+#include "support/textutils.h"
 
 #include <vector>
 
@@ -128,11 +129,10 @@ docstring cleanAttr(docstring const & str)
 	docstring newname;
 	docstring::const_iterator it = str.begin();
 	docstring::const_iterator en = str.end();
-	for (; it != en; ++it)
-		if (isalnum(*it))
-			newname += *it;
-		else
-			newname += '_';
+	for (; it != en; ++it) {
+		char_type const c = *it;
+		newname += isAlnumASCII(c) ? c : char_type('_');
+	}
 	return newname;	
 }
 
@@ -286,6 +286,20 @@ XHTMLStream & XHTMLStream::operator<<(char_type c)
 }
 
 
+XHTMLStream & XHTMLStream::operator<<(char c)
+{
+	clearTagDeque();
+	if (nextraw_) {
+		os_ << c;
+		nextraw_ = false;
+	} else {
+		string const d = html::escapeChar(c);
+		os_ << from_ascii(d);
+	}
+	return *this;
+}
+
+
 XHTMLStream & XHTMLStream::operator<<(int i)
 {
 	clearTagDeque();
@@ -491,6 +505,20 @@ inline void openTag(XHTMLStream & xs, Layout const & lay)
 }
 
 
+void openTag(XHTMLStream & xs, Layout const & lay, 
+             ParagraphParameters const & params)
+{
+	// FIXME Are there other things we should handle here?
+	string const align = alignmentToCSS(params.align());
+	if (align.empty()) {
+		openTag(xs, lay);
+		return;
+	}
+	string attrs = lay.htmlattr() + " style='text-align: " + align + ";'";
+	xs << html::StartTag(lay.htmltag(), attrs);
+}
+
+
 inline void closeTag(XHTMLStream & xs, Layout const & lay)
 {
 	xs << html::EndTag(lay.htmltag());
@@ -515,6 +543,20 @@ inline void openItemTag(XHTMLStream & xs, Layout const & lay)
 }
 
 
+void openItemTag(XHTMLStream & xs, Layout const & lay, 
+             ParagraphParameters const & params)
+{
+	// FIXME Are there other things we should handle here?
+	string const align = alignmentToCSS(params.align());
+	if (align.empty()) {
+		openItemTag(xs, lay);
+		return;
+	}
+	string attrs = lay.htmlattr() + " style='text-align: " + align + ";'";
+	xs << html::StartTag(lay.htmlitemtag(), attrs);
+}
+
+
 inline void closeItemTag(XHTMLStream & xs, Layout const & lay)
 {
 	xs << html::EndTag(lay.htmlitemtag());
@@ -587,7 +629,7 @@ ParagraphList::const_iterator makeParagraphs(Buffer const & buf,
 		bool const opened = runparams.html_make_pars &&
 			(par != pbegin || !runparams.html_in_par);
 		if (opened)
-			openTag(xs, lay);
+			openTag(xs, lay, par->params());
 		docstring const deferred = 
 			par->simpleLyXHTMLOnePar(buf, xs, runparams, text.outerFont(distance(begin, par)));
 
@@ -694,46 +736,52 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf,
 					closeItemTag(xs, *lastlay);
 					lastlay = 0;
 				}
-				if (isNormalEnv(style)) {
-					// in this case, we print the label only for the first 
-					// paragraph (as in a theorem).
-					openItemTag(xs, style);
-					if (par == pbegin && style.htmllabeltag() != "NONE") {
-						docstring const lbl = 
-								pbegin->params().labelString();
-						if (!lbl.empty()) {
+				
+				bool const labelfirst = style.htmllabelfirst();
+				if (!labelfirst)
+					openItemTag(xs, style, par->params());
+				
+				// label output
+				if (style.labeltype != LABEL_NO_LABEL && 
+				    style.htmllabeltag() != "NONE") {
+					if (isNormalEnv(style)) {
+						// in this case, we print the label only for the first 
+						// paragraph (as in a theorem).
+						if (par == pbegin) {
+							docstring const lbl = 
+									pbegin->params().labelString();
+							if (!lbl.empty()) {
+								openLabelTag(xs, style);
+								xs << lbl;
+								closeLabelTag(xs, style);
+							}
+							xs.cr();
+						}
+					}	else { // some kind of list
+						if (style.labeltype == LABEL_MANUAL) {
 							openLabelTag(xs, style);
-							xs << lbl;
+							sep = par->firstWordLyXHTML(xs, runparams);
 							closeLabelTag(xs, style);
+							xs.cr();
+						}
+						else {
+							openLabelTag(xs, style);
+							xs << par->params().labelString();
+							closeLabelTag(xs, style);
+							xs.cr();
 						}
-						xs.cr();
-					}
-				}	else { // some kind of list
-					bool const labelfirst = style.htmllabelfirst();
-					if (!labelfirst)
-						openItemTag(xs, style);
-					if (style.labeltype == LABEL_MANUAL
-					    && style.htmllabeltag() != "NONE") {
-						openLabelTag(xs, style);
-						sep = par->firstWordLyXHTML(xs, runparams);
-						closeLabelTag(xs, style);
-						xs.cr();
-					}
-					else if (style.labeltype != LABEL_NO_LABEL
-					         && style.htmllabeltag() != "NONE") {
-						openLabelTag(xs, style);
-						xs << par->params().labelString();
-						closeLabelTag(xs, style);
-						xs.cr();
 					}
-					if (labelfirst)
-						openItemTag(xs, style);
-				}
+				} // end label output
+
+				if (labelfirst)
+					openItemTag(xs, style, par->params());
+
 				par->simpleLyXHTMLOnePar(buf, xs, runparams, 
 					text.outerFont(distance(begin, par)), sep);
 				++par;
-				// We may not want to close the tag yet, in particular,
-				// if we're not at the end...
+
+				// We may not want to close the tag yet, in particular:
+				// If we're not at the end...
 				if (par != pend 
 					//  and are doing items...
 					 && !isNormalEnv(style)
@@ -789,7 +837,7 @@ void makeCommand(Buffer const & buf,
 	if (!style.counter.empty())
 		buf.params().documentClass().counters().step(style.counter, OutputUpdate);
 
-	openTag(xs, style);
+	openTag(xs, style, pbegin->params());
 
 	// Label around sectioning number:
 	// FIXME Probably need to account for LABEL_MANUAL
@@ -875,4 +923,20 @@ void xhtmlParagraphs(Text const & text,
 }
 
 
+string alignmentToCSS(LyXAlignment align) {
+	switch (align) {
+	case LYX_ALIGN_BLOCK:
+		// we are NOT going to use text-align: justify!!
+	case LYX_ALIGN_LEFT:
+		return "left";
+	case LYX_ALIGN_RIGHT:
+		return "right";
+	case LYX_ALIGN_CENTER:
+		return "center";
+	default:
+		break;
+	}
+	return "";
+}
+
 } // namespace lyx