ws changes only

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

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index 14097c37de270fa80d734c262c0b1df246ddfa62..7bd95b97c90462010e1ec4dfeed88ae0352e7fa6 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -5,7 +5,7 @@
  *
  * \author Jean-Marc Lasgouttes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -13,30 +13,42 @@
 #include "insetquotes.h"
 
 #include "buffer.h"
-#include "BufferView.h"
+#include "bufferparams.h"
 #include "debug.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 "metricsinfo.h"
+#include "paragraph.h"
+#include "paragraph_funcs.h"
+
 #include "frontends/font_metrics.h"
 #include "frontends/Painter.h"
-#include "support/LAssert.h"
+
 #include "support/lstrings.h"
 
-using namespace lyx::support;
 
-using std::ostream;
+using lyx::support::prefixIs;
+
 using std::endl;
+using std::string;
+using std::auto_ptr;
+using std::ostream;
+
 
 namespace {
 
-// codes used to read/write quotes to LyX files
+/* codes used to read/write quotes to LyX files
+ * e    ``english''
+ * s    ''spanish''
+ * g    ,,german``
+ * p    ,,polish''
+ * f    <<french>>
+ * a    >>danish<<
+ */
+
 char const * const language_char = "esgpfa";
 char const * const side_char = "lr" ;
 char const * const times_char = "sd";
@@ -189,6 +201,7 @@ void InsetQuotes::metrics(MetricsInfo & mi, Dimension & dim) const
                else
                        dim.wid += font_metrics::width(',', font);
        }
+       dim_ = dim;
 }
 
 
@@ -219,7 +232,7 @@ void InsetQuotes::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-void InsetQuotes::write(Buffer const *, ostream & os) const
+void InsetQuotes::write(Buffer const &, ostream & os) const
 {
        string text;
        text += language_char[language_];
@@ -229,7 +242,7 @@ void InsetQuotes::write(Buffer const *, ostream & os) const
 }
 
 
-void InsetQuotes::read(Buffer const *, LyXLex & lex)
+void InsetQuotes::read(Buffer const &, LyXLex & lex)
 {
        lex.nextToken();
        parseString(lex.getString());
@@ -240,22 +253,21 @@ void InsetQuotes::read(Buffer const *, LyXLex & lex)
 }
 
 
-int InsetQuotes::latex(Buffer const * buf, ostream & os,
+int InsetQuotes::latex(Buffer const & buf, ostream & os,
                       LatexRunParams const & runparams) const
 {
        // How do we get the local language here??
-       lyx::pos_type curr_pos = parOwner()->getPositionOfInset(this);
-       Assert(curr_pos != -1);
+       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();
+               parOwner()->getFont(buf->params, curr_pos).language()->babel();
 #else
        // And this is not the way... (Lgb)
-       string const curr_lang = buf->params.language->lang();
+       string const curr_lang = buf.params().language->lang();
 #endif
        const int quoteind = quote_index[side_][language_];
        string qstr;
@@ -293,21 +305,21 @@ int InsetQuotes::latex(Buffer const * buf, ostream & os,
 }
 
 
-int InsetQuotes::ascii(Buffer const *, ostream & os, int) const
+int InsetQuotes::ascii(Buffer const &, ostream & os, int) const
 {
        os << '"';
        return 0;
 }
 
 
-int InsetQuotes::linuxdoc(Buffer const *, ostream & os) const
+int InsetQuotes::linuxdoc(Buffer const &, ostream & os) const
 {
        os << '"';
        return 0;
 }
 
 
-int InsetQuotes::docbook(Buffer const *, ostream & os, bool) const
+int InsetQuotes::docbook(Buffer const &, ostream & os, bool) const
 {
        if (times_ == DoubleQ) {
                if (side_ == LeftQ)
@@ -353,13 +365,13 @@ void InsetQuotes::validate(LaTeXFeatures & features) const
 }
 
 
-InsetBase * InsetQuotes::clone() const
+auto_ptr<InsetBase> InsetQuotes::clone() const
 {
-       return new InsetQuotes(language_, side_, times_);
+       return auto_ptr<InsetBase>(new InsetQuotes(language_, side_, times_));
 }
 
 
-Inset::Code InsetQuotes::lyxCode() const
+InsetOld::Code InsetQuotes::lyxCode() const
 {
-  return Inset::QUOTE_CODE;
+  return InsetOld::QUOTE_CODE;
 }