fix #832

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

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index 4b7e678edf9268b8b2df05eaebc6b8f76d918f95..a1d05e0567eaf706c38cd712c0d6041885d633bc 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -1,18 +1,15 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file insetquotes.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Jean-Marc Lasgouttes
  *
- *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "insetquotes.h"
 
@@ -20,14 +17,15 @@
 #include "support/lstrings.h"
 #include "BufferView.h"
 #include "LaTeXFeatures.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
 #include "buffer.h"
 #include "debug.h"
-#include "font.h"
+#include "frontends/font_metrics.h"
 #include "language.h"
 #include "lyxfont.h"
 #include "lyxrc.h"
 #include "paragraph.h"
+#include "lyxlex.h"
 
 using std::ostream;
 using std::endl;
@@ -52,19 +50,19 @@ int quote_index[2][6] = {
 
 // Corresponding LaTeX code, for double and single quotes.
 char const * const latex_quote_t1[2][5] =
-{ { "\\quotesinglbase{}",  "'", "`",
+{ { "\\quotesinglbase ",  "'", "`",
     "\\guilsinglleft{}", "\\guilsinglright{}" },
   { ",,", "''", "``", "<<", ">>" } };
 
 char const * const latex_quote_ot1[2][5] =
-{ { "\\quotesinglbase{}",  "'", "`",
+{ { "\\quotesinglbase ",  "'", "`",
     "\\guilsinglleft{}", "\\guilsinglright{}" },
-  { "\\quotedblbase{}", "''", "``",
+  { "\\quotedblbase ", "''", "``",
     "\\guillemotleft{}", "\\guillemotright{}" } };
 
 char const * const latex_quote_babel[2][5] =
-{ { "\\glq{}",  "'", "`", "\\flq{}", "\\frq{}" },
-  { "\\glqq{}", "''", "``", "\\flqq{}", "\\frqq{}" } };
+{ { "\\glq ",  "'", "`", "\\flq{}", "\\frq{}" },
+  { "\\glqq ", "''", "``", "\\flqq{}", "\\frqq{}" } };
 
 } // namespace anon
 
@@ -88,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:
@@ -154,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) {
@@ -175,9 +165,9 @@ string const InsetQuotes::dispString(Language const * loclang) const
        // in french, spaces are added inside double quotes
        if (times_ == DoubleQ && prefixIs(loclang->code(), "fr")) {
                if (side_ == LeftQ)
-                       disp += " ";
+                       disp += ' ';
                else
-                       disp = " " + disp;
+                       disp.insert(string::size_type(0), 1, ' ');
        }
 
        return disp;
@@ -186,13 +176,13 @@ string const InsetQuotes::dispString(Language const * loclang) const
 
 int InsetQuotes::ascent(BufferView *, LyXFont const & font) const
 {
-       return lyxfont::maxAscent(font);
+       return font_metrics::maxAscent(font);
 }
 
 
 int InsetQuotes::descent(BufferView *, LyXFont const & font) const
 {
-       return lyxfont::maxDescent(font);
+       return font_metrics::maxDescent(font);
 }
 
 
@@ -203,11 +193,11 @@ int InsetQuotes::width(BufferView *, LyXFont const & font) const
 
        for (string::size_type i = 0; i < text.length(); ++i) {
                if (text[i] == ' ')
-                       w += lyxfont::width('i', font);
-               else if (i == 0 || text[i] != text[i-1])
-                       w += lyxfont::width(text[i], font);
+                       w += font_metrics::width('i', font);
+               else if (i == 0 || text[i] != text[i - 1])
+                       w += font_metrics::width(text[i], font);
                else
-                       w += lyxfont::width(',', font);
+                       w += font_metrics::width(',', font);
        }
 
        return w;
@@ -228,11 +218,16 @@ 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());
 
-       bv->painter().text(int(x), baseline, text, font);
+       if (text.length() == 2 && text[0] == text[1]) {
+               bv->painter().text(int(x), baseline, text[0], font);
+               int x2 = int(x + font_metrics::width(',', font));
+               bv->painter().text(x2, baseline, text[0], font);
+       } else
+               bv->painter().text(int(x), baseline, text, font);
        x += width(bv, font);
 }
 
@@ -266,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;
 
@@ -308,19 +310,19 @@ int InsetQuotes::latex(Buffer const * buf, ostream & os,
 
 int InsetQuotes::ascii(Buffer const *, ostream & os, int) const
 {
-       os << "\"";
+       os << '"';
        return 0;
 }
 
 
 int InsetQuotes::linuxdoc(Buffer const *, ostream & os) const
 {
-       os << "\"";
+       os << '"';
        return 0;
 }
 
 
-int InsetQuotes::docbook(Buffer const *, ostream & os) const
+int InsetQuotes::docbook(Buffer const *, ostream & os, bool) const
 {
        if (times_ == DoubleQ) {
                if (side_ == LeftQ)