Improvements to Parser::verbatimStuff

[lyx.git] / src / output_xhtml.cpp

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 3653c5e75b9a5fba82c7285d02d8bbfb787d2957..c894f89cef8150d0c88f48b6ae694cf5b8adc66c 100644 (file)
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -71,7 +71,8 @@ docstring escapeChar(char_type c, XHTMLStream::EscapeSettings e)
 
 
 // escape what needs escaping
-docstring htmlize(docstring const & str, XHTMLStream::EscapeSettings e) {
+docstring htmlize(docstring const & str, XHTMLStream::EscapeSettings e)
+{
        odocstringstream d;
        docstring::const_iterator it = str.begin();
        docstring::const_iterator en = str.end();
@@ -109,7 +110,8 @@ string escapeChar(char c, XHTMLStream::EscapeSettings e)
 
 
 // escape what needs escaping
-string htmlize(string const & str, XHTMLStream::EscapeSettings e) {
+string htmlize(string const & str, XHTMLStream::EscapeSettings e)
+{
        ostringstream d;
        string::const_iterator it = str.begin();
        string::const_iterator en = str.end();
@@ -915,10 +917,10 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf,
 
 
 void makeCommand(Buffer const & buf,
-                                         XHTMLStream & xs,
-                                         OutputParams const & runparams,
-                                         Text const & text,
-                                         ParagraphList::const_iterator const & pbegin)
+                XHTMLStream & xs,
+                OutputParams const & runparams,
+                Text const & text,
+                ParagraphList::const_iterator const & pbegin)
 {
        Layout const & style = pbegin->layout();
        if (!style.counter.empty())
@@ -928,6 +930,7 @@ void makeCommand(Buffer const & buf,
 
        // 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) {
                openLabelTag(xs, style);
                xs << pbegin->params().labelString();
@@ -972,7 +975,7 @@ void xhtmlParagraphs(Text const & text,
                                buf.masterBuffer()->params().documentClass().getTOCLayout();
                        docstring const cnt = lay.counter;
                        if (!cnt.empty()) {
-                               Counters const & cnts =
+                               Counters & cnts =
                                        buf.masterBuffer()->params().documentClass().counters();
                                cnts.reset(cnt);
                        }
@@ -1020,7 +1023,8 @@ void xhtmlParagraphs(Text const & text,
 }
 
 
-string alignmentToCSS(LyXAlignment align) {
+string alignmentToCSS(LyXAlignment align)
+{
        switch (align) {
        case LYX_ALIGN_BLOCK:
                // we are NOT going to use text-align: justify!!