The speed patch: redraw only rows that have changed

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

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index 074d7f67f4f4431d50bc149f91d3ebca0c13a897..7a85306c6d5cff8ca1ce9eb9603e94fcfd3b5630 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -17,10 +17,10 @@
 #include "debug.h"
 #include "language.h"
 #include "LaTeXFeatures.h"
-#include "latexrunparams.h"
 #include "lyxlex.h"
 #include "lyxrc.h"
 #include "metricsinfo.h"
+#include "outputparams.h"
 #include "paragraph.h"
 #include "paragraph_funcs.h"
 
@@ -93,13 +93,23 @@ InsetQuotes::InsetQuotes(quote_language l, quote_side s, quote_times t)
 
 InsetQuotes::InsetQuotes(char c, BufferParams const & params)
        : language_(params.quotes_language), times_(params.quotes_times)
+{
+       getPosition(c);
+}
+
+
+InsetQuotes::InsetQuotes(char c, quote_language l, quote_times t)
+       : language_(l), times_(t)
+{
+       getPosition(c);
+}
+
+
+void InsetQuotes::getPosition(char c)
 {
        // Decide whether left or right
        switch (c) {
-       case ' ': case '(':
-#warning eh ? I am lost here ...
-       //case Paragraph::META_HFILL:
-       // case Paragraph::META_NEWLINE:
+       case ' ': case '(': case '[':
                side_ = LeftQ;   // left quote
                break;
        default:
@@ -244,7 +254,7 @@ void InsetQuotes::write(Buffer const &, ostream & os) const
 
 void InsetQuotes::read(Buffer const &, LyXLex & lex)
 {
-       lex.nextToken();
+       lex.next();
        parseString(lex.getString());
        lex.next();
        if (lex.getString() != "\\end_inset") {
@@ -253,37 +263,18 @@ void InsetQuotes::read(Buffer const &, LyXLex & lex)
 }
 
 
-int InsetQuotes::latex(Buffer const & buf, ostream & os,
-                      LatexRunParams const & runparams) const
+int InsetQuotes::latex(Buffer const &, ostream & os,
+                      OutputParams const & runparams) const
 {
-       // How do we get the local language here??
-       lyx::pos_type curr_pos = ownerPar(buf, this).getPositionOfInset(this);
-       BOOST_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;
 
        if (language_ == FrenchQ && times_ == DoubleQ
-           && curr_lang == "frenchb") {
+           && prefixIs(runparams.local_font->language()->code(), "fr")) {
                if (side_ == LeftQ)
                        qstr = "\\og "; //the spaces are important here
                else
                        qstr = " \\fg{}"; //and here
-       } else if (language_ == FrenchQ && times_ == DoubleQ
-                  && curr_lang == "french") {
-               if (side_ == LeftQ)
-                       qstr = "<< "; //the spaces are important here
-               else
-                       qstr = " >>"; //and here
        } else if (lyxrc.fontenc == "T1") {
                qstr = latex_quote_t1[times_][quoteind];
 #ifdef DO_USE_DEFAULT_LANGUAGE
@@ -305,8 +296,8 @@ int InsetQuotes::latex(Buffer const & buf, ostream & os,
 }
 
 
-int InsetQuotes::ascii(Buffer const &, ostream & os,
-                      LatexRunParams const &) const
+int InsetQuotes::plaintext(Buffer const &, ostream & os,
+                      OutputParams const &) const
 {
        os << '"';
        return 0;
@@ -314,7 +305,7 @@ int InsetQuotes::ascii(Buffer const &, ostream & os,
 
 
 int InsetQuotes::linuxdoc(Buffer const &, ostream & os,
-                         LatexRunParams const &) const
+                         OutputParams const &) const
 {
        os << '"';
        return 0;
@@ -322,7 +313,7 @@ int InsetQuotes::linuxdoc(Buffer const &, ostream & os,
 
 
 int InsetQuotes::docbook(Buffer const &, ostream & os,
-                        LatexRunParams const &) const
+                        OutputParams const &) const
 {
        if (times_ == DoubleQ) {
                if (side_ == LeftQ)
@@ -339,6 +330,13 @@ int InsetQuotes::docbook(Buffer const &, ostream & os,
 }
 
 
+int InsetQuotes::textString(Buffer const & buf, ostream & os,
+                      OutputParams const & op) const
+{
+       return plaintext(buf, os, op);
+}
+
+
 void InsetQuotes::validate(LaTeXFeatures & features) const
 {
        bool const use_babel = features.useBabel();
@@ -368,13 +366,13 @@ void InsetQuotes::validate(LaTeXFeatures & features) const
 }
 
 
-auto_ptr<InsetBase> InsetQuotes::clone() const
+auto_ptr<InsetBase> InsetQuotes::doClone() const
 {
        return auto_ptr<InsetBase>(new InsetQuotes(language_, side_, times_));
 }
 
 
-InsetOld::Code InsetQuotes::lyxCode() const
+InsetBase::Code InsetQuotes::lyxCode() const
 {
-  return InsetOld::QUOTE_CODE;
+  return InsetBase::QUOTE_CODE;
 }