DocBook: make openParTag/closeTag use paragraphs instead of layouts.

[features.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 722d7c1d8dd427d71af125f099a3e0e8d0da2f74..f678e73a7facbc5c0732d20c70cdc2c36df8f502 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -992,7 +992,7 @@ string BufferParams::readToken(Lexer & lex, string const & token,
                                        branch_ptr->setColor(color);
                                // Update also the Color table:
                                if (color == "none")
-                                       color = lcolor.getX11Name(Color_background);
+                                       color = lcolor.getX11HexName(Color_background);
                                // FIXME UNICODE
                                lcolor.setColor(to_utf8(branch), color);
                        }
@@ -1021,7 +1021,7 @@ string BufferParams::readToken(Lexer & lex, string const & token,
                                        index_ptr->setColor(color);
                                // Update also the Color table:
                                if (color == "none")
-                                       color = lcolor.getX11Name(Color_background);
+                                       color = lcolor.getX11HexName(Color_background);
                                // FIXME UNICODE
                                if (!shortcut.empty())
                                        lcolor.setColor(to_utf8(shortcut), color);
@@ -2730,6 +2730,8 @@ OutputParams::FLAVOR BufferParams::getOutputFlavor(string const & format) const
        //       something with formats.
        if (dformat == "xhtml")
                result = OutputParams::HTML;
+       else if (dformat == "docbook5")
+               result = OutputParams::DOCBOOK5;
        else if (dformat == "text")
                result = OutputParams::TEXT;
        else if (dformat == "lyx")