prepare for 1.1.6pre2

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

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index 940333d9b7f29f4aad020ab4cce52335e6128734..41f4be19d5d635823e1f2a85144d85426a9e92ee 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -31,8 +31,6 @@ using std::endl;
 // Quotes. Used for the various quotes. German, English, French,
 // Danish, Polish, all either double or single.
 
-extern BufferView * current_view;
-
 // codes used to read/write quotes to LyX files
 static char const * const language_char = "esgpfa";
 static char const * const side_char = "lr" ;
@@ -73,21 +71,16 @@ InsetQuotes::InsetQuotes(InsetQuotes::quote_language l,
                         InsetQuotes::quote_side s,
                         InsetQuotes::quote_times t)
        : language(l), side(s), times(t)
-{
-}
+{}
 
 
 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:
-#warning think about this
-#if 0
-       case LyXParagraph::META_PROTECTED_SEPARATOR:
-#endif
        case LyXParagraph::META_NEWLINE: 
                side = InsetQuotes::LeftQ;   // left quote 
                break;
@@ -146,14 +139,14 @@ void InsetQuotes::ParseString(string const & s)
 }
 
 
-string InsetQuotes::DispString() const
+string const InsetQuotes::DispString() const
 {
        string disp;
        disp += quote_char[quote_index[side][language]];
        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 == ">>")
@@ -163,19 +156,19 @@ string InsetQuotes::DispString() const
 }
 
 
-int InsetQuotes::ascent(Painter &, LyXFont const & font) const
+int InsetQuotes::ascent(BufferView *, LyXFont const & font) const
 {
        return lyxfont::maxAscent(font);
 }
 
 
-int InsetQuotes::descent(Painter &, LyXFont const & font) const
+int InsetQuotes::descent(BufferView *, LyXFont const & font) const
 {
        return lyxfont::maxDescent(font);
 }
 
 
-int InsetQuotes::width(Painter &, LyXFont const & font) const
+int InsetQuotes::width(BufferView *, LyXFont const & font) const
 {
        string text = DispString();
        int w = 0;
@@ -193,25 +186,26 @@ int InsetQuotes::width(Painter &, LyXFont const & font) const
 }
 
 
-LyXFont InsetQuotes::ConvertFont(LyXFont font)
+LyXFont const InsetQuotes::ConvertFont(LyXFont const & f) const
 {
-       /* quotes-insets cannot be latex of any kind */
+       LyXFont font(f);
+       // quotes-insets cannot be latex of any kind
        font.setLatex(LyXFont::OFF);
        return font;
 }
 
 
-void InsetQuotes::draw(Painter & pain, LyXFont const & font,
-                      int baseline, float & x) const
+void InsetQuotes::draw(BufferView * bv, LyXFont const & font,
+                      int baseline, float & x, bool) const
 {
        string text = DispString();
 
-       pain.text(int(x), baseline, text, font);
-       x += width(pain, font);
+       bv->painter().text(int(x), baseline, text, font);
+       x += width(bv, font);
 }
 
 
-void InsetQuotes::Write(ostream & os) const
+void InsetQuotes::Write(Buffer const *, ostream & os) const
 {
        string text;
        text += language_char[language];
@@ -221,63 +215,64 @@ void InsetQuotes::Write(ostream & os) const
 }
 
 
-void InsetQuotes::Read(LyXLex & lex)
+void InsetQuotes::Read(Buffer const *, LyXLex & lex)
 {
        lex.nextToken();
        ParseString(lex.GetString());
+       lex.next();
+       string tmp(lex.GetString());
+       if (tmp != "\\end_inset")
+               lyxerr << "LyX Warning: Missing \\end_inset "
+                       "in InsetQuotes::Read." << endl;
 }
 
 
-int InsetQuotes::Latex(ostream & os, signed char /*fragile*/, bool) const
+int InsetQuotes::Latex(Buffer const * buf, ostream & os,
+                      bool /*fragile*/, bool) const
 {
-       string doclang = 
-               current_view->buffer()->GetLanguage();
+       string doclang = buf->GetLanguage()->lang();
        int quoteind = quote_index[side][language];
        string qstr;
        
        if (lyxrc.fontenc == "T1") {
                qstr = latex_quote_t1[times][quoteind];
-       }
-       else if (doclang == "default") {
+       } else if (doclang == "default") {
                qstr = latex_quote_ot1[times][quoteind];
-       } 
-       else if (language == InsetQuotes::FrenchQ 
+       } else if (language == InsetQuotes::FrenchQ 
                 && times == InsetQuotes::DoubleQ
                 && doclang == "frenchb") {
                if (side == InsetQuotes::LeftQ) 
                        qstr = "\\og{}";
                else 
                        qstr = " \\fg{}";
-       } 
-       else 
+       } else 
                qstr = latex_quote_babel[times][quoteind];
 
-       // protect against !` and ?` ligatures.
-       // Is it very bad of us to always protect against those ligatures?
-#if 0
-       if ((suffixIs(file, '?') || suffixIs(file, '!'))
-           && qstr[0] == '`')
-               qstr = "{}" + qstr;
-#else
        // Always guard against unfortunate ligatures (!` ?`)
        qstr.insert(0, "{}");
-#endif
 
        os << qstr;
        return 0;
 }
 
 
-int InsetQuotes::Linuxdoc(ostream & os) const
+int InsetQuotes::Ascii(Buffer const *, ostream & os, int) const
+{
+       os << "\"";
+       return 0;
+}
+
+
+int InsetQuotes::Linuxdoc(Buffer const *, ostream & os) const
 {
        os << "\"";
        return 0;
 }
 
 
-int InsetQuotes::DocBook(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
@@ -296,7 +291,7 @@ void InsetQuotes::Validate(LaTeXFeatures & features) const
 {
        char type = quote_char[quote_index[side][language]];
 
-       if (current_view->buffer()->GetLanguage() == "default" 
+       if (features.bufferParams().language->lang() == "default" 
            && lyxrc.fontenc != "T1") {
                if (times == InsetQuotes::SingleQ) 
                        switch (type) {
@@ -316,7 +311,7 @@ void InsetQuotes::Validate(LaTeXFeatures & features) const
 }
 
 
-Inset * InsetQuotes::Clone() const
+Inset * InsetQuotes::Clone(Buffer const &) const
 {
   return new InsetQuotes(language, side, times);
 }