fix #832

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

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index d3dec8129e62e68aa6a30499e297313597b99605..a1d05e0567eaf706c38cd712c0d6041885d633bc 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -10,9 +10,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "insetquotes.h"
 
@@ -89,8 +86,9 @@ InsetQuotes::InsetQuotes(char c, BufferParams const & params)
        // Decide whether left or right
        switch (c) {
        case ' ': case '(':
-       case Paragraph::META_HFILL:
-       case Paragraph::META_NEWLINE:
+#warning eh ? I am lost here ...
+       //case Paragraph::META_HFILL:
+       // case Paragraph::META_NEWLINE:
                side_ = LeftQ;   // left quote
                break;
        default:
@@ -155,15 +153,6 @@ string const InsetQuotes::dispString(Language const * loclang) const
        if (times_ == DoubleQ)
                disp += disp;
 
-       if (lyxrc.font_norm_type == LyXRC::ISO_8859_1
-           || lyxrc.font_norm_type == LyXRC::ISO_8859_3
-           || lyxrc.font_norm_type == LyXRC::ISO_8859_4
-           || lyxrc.font_norm_type == LyXRC::ISO_8859_9) {
-               if (disp == "'")
-                       disp = "´";
-               else if (disp == "''")
-                       disp = "´´";
-       }
        if (lyxrc.font_norm_type == LyXRC::ISO_8859_1
            || lyxrc.font_norm_type == LyXRC::ISO_8859_9
            || lyxrc.font_norm_type == LyXRC::ISO_8859_15) {
@@ -229,7 +218,7 @@ LyXFont const InsetQuotes::convertFont(LyXFont const & f) const
 
 
 void InsetQuotes::draw(BufferView * bv, LyXFont const & font,
-                      int baseline, float & x, bool) const
+                      int baseline, float & x) const
 {
        string const text = dispString(font.language());
 
@@ -272,10 +261,17 @@ int InsetQuotes::latex(Buffer const * buf, ostream & os,
        // How do we get the local language here??
        lyx::pos_type curr_pos = parOwner()->getPositionOfInset(this);
        lyx::Assert(curr_pos != -1);
+
+#warning FIXME. We _must_ find another way to get the language. (Lgb)
+#if 0
+       // This cannot be used. (Lgb)
        string const curr_lang =
                parOwner()->getFont(buf->params,
                                    curr_pos).language()->babel();
-
+#else
+       // And this is not the way... (Lgb)
+       string const curr_lang = buf->params.language->lang();
+#endif
        const int quoteind = quote_index[side_][language_];
        string qstr;