updates to minipage inset

[lyx.git] / src / insets / insetquotes.C

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index a9b676918854943974a497937afc02c0caf63657..378649e3f884b28922f868d15953e87ef64c072d 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -78,7 +78,7 @@ InsetQuotes::InsetQuotes(char c, BufferParams const & params)
        : language(params.quotes_language), times(params.quotes_times)
 {
        // Decide whether left or right 
-       switch(c) {
+       switch (c) {
        case ' ': case '(': case '{': case '[': case '-': case ':':
        case LyXParagraph::META_HFILL:
        case LyXParagraph::META_NEWLINE: 
@@ -146,7 +146,7 @@ string const InsetQuotes::DispString() const
        if (times == InsetQuotes::DoubleQ)
                disp += disp;
 
-       if (lyxrc.font_norm == "iso8859-1") 
+       if (lyxrc.font_norm_type == LyXRC::ISO_8859_1)
                if (disp == "<<")
                        disp = '«';
                else if (disp == ">>")
@@ -227,16 +227,22 @@ void InsetQuotes::Read(Buffer const *, LyXLex & lex)
 }
 
 
+extern bool use_babel;
+
 int InsetQuotes::Latex(Buffer const * buf, ostream & os,
                       bool /*fragile*/, bool) const
 {
-       string doclang = buf->GetLanguage()->lang();
+       string const doclang = buf->GetLanguage()->lang();
        int quoteind = quote_index[side][language];
        string qstr;
        
        if (lyxrc.fontenc == "T1") {
                qstr = latex_quote_t1[times][quoteind];
+#ifdef DO_USE_DEFAULT_LANGUAGE
        } else if (doclang == "default") {
+#else
+       } else if (!use_babel) {
+#endif
                qstr = latex_quote_ot1[times][quoteind];
        } else if (language == InsetQuotes::FrenchQ 
                 && times == InsetQuotes::DoubleQ
@@ -272,7 +278,7 @@ int InsetQuotes::Linuxdoc(Buffer const *, ostream & os) const
 
 int InsetQuotes::DocBook(Buffer const *, ostream & os) const
 {
-       if(times == InsetQuotes::DoubleQ) {
+       if (times == InsetQuotes::DoubleQ) {
                if (side == InsetQuotes::LeftQ)
                        os << "&ldquo;";
                else