Make sure we center displayed equations.

[lyx.git] / src / insets / InsetQuotes.cpp

diff --git a/src/insets/InsetQuotes.cpp b/src/insets/InsetQuotes.cpp
index 8a183fa0fae0860b35a149719caa42c896869397..ba5a127564e0c5eb17d6e5d91ad6bcfc40fcfd0a 100644 (file)
--- a/src/insets/InsetQuotes.cpp
+++ b/src/insets/InsetQuotes.cpp
@@ -95,21 +95,14 @@ InsetQuotes::InsetQuotes(Buffer * buf, string const & str) : Inset(buf)
        parseString(str);
 }
 
-InsetQuotes::InsetQuotes(Buffer * buf, char_type c) : Inset(buf)
-{
-       if (buf) {
-               language_ = buf->params().quotes_language;
-               times_ = buf->params().quotes_times;
-       }
-       setSide(c);
-}
-
-
 InsetQuotes::InsetQuotes(Buffer * buf, char_type c, QuoteTimes t)
        : Inset(buf), times_(t)
 {
        if (buf)
                language_ = buf->params().quotes_language;
+       else
+               language_ = EnglishQuotes;
+
        setSide(c);
 }
 
@@ -307,26 +300,30 @@ int InsetQuotes::plaintext(odocstringstream & os,
 }
 
 
-int InsetQuotes::docbook(odocstream & os, OutputParams const &) const
-{
+docstring InsetQuotes::getQuoteEntity() const {
        if (times_ == DoubleQuotes) {
                if (side_ == LeftQuote)
-                       os << "&ldquo;";
+                       return from_ascii("&ldquo;");
                else
-                       os << "&rdquo;";
-       } else {
-               if (side_ == LeftQuote)
-                       os << "&lsquo;";
-               else
-                       os << "&rsquo;";
+                       return from_ascii("&rdquo;");
        }
+       if (side_ == LeftQuote)
+               return from_ascii("&lsquo;");
+       else
+               return from_ascii("&rsquo;");
+}
+
+
+int InsetQuotes::docbook(odocstream & os, OutputParams const &) const
+{
+       os << getQuoteEntity();
        return 0;
 }
 
 
-docstring InsetQuotes::xhtml(XHTMLStream & xs, OutputParams const & op) const
+docstring InsetQuotes::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
-       docbook(xs.os(), op);
+       xs << XHTMLStream::ESCAPE_NONE << getQuoteEntity();
        return docstring();
 }
 
@@ -337,7 +334,7 @@ void InsetQuotes::toString(odocstream & os) const
 }
 
 
-void InsetQuotes::forOutliner(docstring & os, size_t) const
+void InsetQuotes::forOutliner(docstring & os, size_t const, bool const) const
 {
        os += displayString();
 }
@@ -345,13 +342,12 @@ void InsetQuotes::forOutliner(docstring & os, size_t) const
 
 void InsetQuotes::validate(LaTeXFeatures & features) const
 {
-       bool const use_babel = features.useBabel();
        char type = quote_char[quote_index[side_][language_]];
 
 #ifdef DO_USE_DEFAULT_LANGUAGE
        if (features.bufferParams().language->lang() == "default"
 #else
-       if (!use_babel
+       if (!features.useBabel()
 #endif
            && lyxrc.fontenc != "T1") {
                if (times_ == SingleQuotes)