Enable the external inset to handle unknown templates gracefully.

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

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index a1d05e0567eaf706c38cd712c0d6041885d633bc..3d7d57b42c54e4c6646db4de87e1238a031f1d66 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -10,29 +10,28 @@
 
 #include <config.h>
 
-
 #include "insetquotes.h"
 
-#include "support/LAssert.h"
-#include "support/lstrings.h"
-#include "BufferView.h"
-#include "LaTeXFeatures.h"
-#include "frontends/Painter.h"
 #include "buffer.h"
+#include "BufferView.h"
 #include "debug.h"
-#include "frontends/font_metrics.h"
+#include "dimension.h"
 #include "language.h"
+#include "LaTeXFeatures.h"
+#include "latexrunparams.h"
 #include "lyxfont.h"
+#include "lyxlex.h"
 #include "lyxrc.h"
 #include "paragraph.h"
-#include "lyxlex.h"
+#include "metricsinfo.h"
+#include "frontends/font_metrics.h"
+#include "frontends/Painter.h"
+#include "support/LAssert.h"
+#include "support/lstrings.h"
 
 using std::ostream;
 using std::endl;
 
-// Quotes. Used for the various quotes. German, English, French,
-// Danish, Polish, all either double or single.
-
 namespace {
 
 // codes used to read/write quotes to LyX files
@@ -73,9 +72,7 @@ InsetQuotes::InsetQuotes(string const & str)
 }
 
 
-InsetQuotes::InsetQuotes(quote_language l,
-                        quote_side s,
-                        quote_times t)
+InsetQuotes::InsetQuotes(quote_language l, quote_side s, quote_times t)
        : language_(l), side_(s), times_(t)
 {}
 
@@ -174,33 +171,22 @@ string const InsetQuotes::dispString(Language const * loclang) const
 }
 
 
-int InsetQuotes::ascent(BufferView *, LyXFont const & font) const
+void InsetQuotes::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       return font_metrics::maxAscent(font);
-}
-
-
-int InsetQuotes::descent(BufferView *, LyXFont const & font) const
-{
-       return font_metrics::maxDescent(font);
-}
-
+       LyXFont & font = mi.base.font;
+       dim.asc = font_metrics::maxAscent(font);
+       dim.des = font_metrics::maxDescent(font);
+       dim.wid = 0;
 
-int InsetQuotes::width(BufferView *, LyXFont const & font) const
-{
        string const text = dispString(font.language());
-       int w = 0;
-
        for (string::size_type i = 0; i < text.length(); ++i) {
                if (text[i] == ' ')
-                       w += font_metrics::width('i', font);
+                       dim.wid += font_metrics::width('i', font);
                else if (i == 0 || text[i] != text[i - 1])
-                       w += font_metrics::width(text[i], font);
+                       dim.wid += font_metrics::width(text[i], font);
                else
-                       w += font_metrics::width(',', font);
+                       dim.wid += font_metrics::width(',', font);
        }
-
-       return w;
 }
 
 
@@ -217,18 +203,17 @@ LyXFont const InsetQuotes::convertFont(LyXFont const & f) const
 #endif
 
 
-void InsetQuotes::draw(BufferView * bv, LyXFont const & font,
-                      int baseline, float & x) const
+void InsetQuotes::draw(PainterInfo & pi, int x, int y) const
 {
-       string const text = dispString(font.language());
+       string const text = dispString(pi.base.font.language());
 
        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);
+               pi.pain.text(x, y, text[0], pi.base.font);
+               int const t = font_metrics::width(',', pi.base.font);
+               pi.pain.text(x + t, y, text[0], pi.base.font);
+       } else {
+               pi.pain.text(x, y, text, pi.base.font);
+       }
 }
 
 
@@ -253,10 +238,8 @@ void InsetQuotes::read(Buffer const *, LyXLex & lex)
 }
 
 
-extern bool use_babel;
-
 int InsetQuotes::latex(Buffer const * buf, ostream & os,
-                      bool /*fragile*/, bool /* free_spc */) const
+                      LatexRunParams const & runparams) const
 {
        // How do we get the local language here??
        lyx::pos_type curr_pos = parOwner()->getPositionOfInset(this);
@@ -292,7 +275,7 @@ int InsetQuotes::latex(Buffer const * buf, ostream & os,
 #ifdef DO_USE_DEFAULT_LANGUAGE
        } else if (doclang == "default") {
 #else
-       } else if (!use_babel) {
+       } else if (!runparams.use_babel) {
 #endif
                qstr = latex_quote_ot1[times_][quoteind];
        } else {
@@ -341,6 +324,7 @@ int InsetQuotes::docbook(Buffer const *, ostream & os, bool) 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
@@ -351,7 +335,7 @@ void InsetQuotes::validate(LaTeXFeatures & features) const
            && lyxrc.fontenc != "T1") {
                if (times_ == SingleQ)
                        switch (type) {
-                       case ',': features.require("quotesinglbase");  break;
+                               case ',': features.require("quotesinglbase");  break;
                        case '<': features.require("guilsinglleft");  break;
                        case '>': features.require("guilsinglright"); break;
                        default: break;
@@ -367,9 +351,9 @@ void InsetQuotes::validate(LaTeXFeatures & features) const
 }
 
 
-Inset * InsetQuotes::clone(Buffer const &, bool) const
+Inset * InsetQuotes::clone() const
 {
-  return new InsetQuotes(language_, side_, times_);
+       return new InsetQuotes(language_, side_, times_);
 }