clear()->erase() ; lots of using directives for cxx

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

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index 0e731c4c960c1a83be630816923682c859213d23..fe09f6e0479a2838012c611c67993d657a3f220f 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -23,11 +23,14 @@
 #include "LaTeXFeatures.h"
 #include "support/lstrings.h"
 #include "Painter.h"
+#include "font.h"
+
+using std::ostream;
+using std::endl;
 
 // Quotes. Used for the various quotes. German, English, French,
 // Danish, Polish, all either double or single.
 
-extern LyXRC * lyxrc;
 extern BufferView * current_view;
 
 // codes used to read/write quotes to LyX files
@@ -81,10 +84,6 @@ InsetQuotes::InsetQuotes(char c, BufferParams const & params)
        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;
@@ -96,7 +95,6 @@ InsetQuotes::InsetQuotes(char c, BufferParams const & params)
 
 void InsetQuotes::ParseString(string const & s)
 {
-       int i;
        string str(s);
        if (str.length() != 3) {
                lyxerr << "ERROR (InsetQuotes::InsetQuotes):"
@@ -104,6 +102,8 @@ void InsetQuotes::ParseString(string const & s)
                str = "eld";
        }
 
+       int i;
+       
        for (i = 0; i < 6; ++i) {
                if (str[0] == language_char[i]) {
                        language = InsetQuotes::quote_language(i);
@@ -149,7 +149,7 @@ string InsetQuotes::DispString() const
        if (times == InsetQuotes::DoubleQ)
                disp += disp;
 
-       if (lyxrc->font_norm == "iso8859-1") 
+       if (lyxrc.font_norm == "iso8859-1") 
                if (disp == "<<")
                        disp = '«';
                else if (disp == ">>")
@@ -161,13 +161,13 @@ string InsetQuotes::DispString() const
 
 int InsetQuotes::ascent(Painter &, LyXFont const & font) const
 {
-       return font.maxAscent();
+       return lyxfont::maxAscent(font);
 }
 
 
 int InsetQuotes::descent(Painter &, LyXFont const & font) const
 {
-       return font.maxDescent();
+       return lyxfont::maxDescent(font);
 }
 
 
@@ -178,11 +178,11 @@ int InsetQuotes::width(Painter &, LyXFont const & font) const
 
        for (string::size_type i = 0; i < text.length(); ++i) {
                if (text[i] == ' ')
-                       w += font.width('i');
+                       w += lyxfont::width('i', font);
                else if (i == 0 || text[i] != text[i-1])
-                       w += font.width(text[i]);
+                       w += lyxfont::width(text[i], font);
                else
-                       w += font.width(',');
+                       w += lyxfont::width(',', font);
        }
 
        return w;
@@ -224,23 +224,14 @@ void InsetQuotes::Read(LyXLex & lex)
 }
 
 
-int InsetQuotes::Latex(ostream & os, signed char /*fragile*/) const
-{
-       string quote;
-       int res = Latex(quote, 0);
-       os << quote;
-       return res;
-}
-
-
-int InsetQuotes::Latex(string & file, signed char /*fragile*/) const
+int InsetQuotes::Latex(ostream & os, bool /*fragile*/, bool) const
 {
        string doclang = 
                current_view->buffer()->GetLanguage();
        int quoteind = quote_index[side][language];
        string qstr;
        
-       if (lyxrc->fontenc == "T1") {
+       if (lyxrc.fontenc == "T1") {
                qstr = latex_quote_t1[times][quoteind];
        }
        else if (doclang == "default") {
@@ -258,35 +249,48 @@ int InsetQuotes::Latex(string & file, signed char /*fragile*/) const
                qstr = latex_quote_babel[times][quoteind];
 
        // protect against !` and ?` ligatures.
+       // Is it very bad of us to always protect against those ligatures?
+       // CHECK
+#if 0
        if ((suffixIs(file, '?') || suffixIs(file, '!'))
            && qstr[0] == '`')
                qstr = "{}" + qstr;
+#else
+       // Always guard against unfortunate ligatures (!` ?`)
+       qstr.insert(0, "{}");
+#endif
 
-       file += qstr;
+       os << qstr;
        return 0;
 }
 
 
-int InsetQuotes::Linuxdoc(string & file) const
+int InsetQuotes::Ascii(ostream & os) const
 {
-       file += "\"";
+       os << "\"";
+       return 0;
+}
 
+
+int InsetQuotes::Linuxdoc(ostream & os) const
+{
+       os << "\"";
        return 0;
 }
 
 
-int InsetQuotes::DocBook(string & file) const
+int InsetQuotes::DocBook(ostream & os) const
 {
        if(times == InsetQuotes::DoubleQ) {
                if (side == InsetQuotes::LeftQ)
-                       file += "&ldquo;";
+                       os << "&ldquo;";
                else
-                       file += "&rdquo;";
+                       os << "&rdquo;";
        } else {
                if (side == InsetQuotes::LeftQ)
-                       file += "&lsquo;";
+                       os << "&lsquo;";
                else
-                       file += "&rsquo;";
+                       os << "&rsquo;";
        }
        return 0;
 }
@@ -297,7 +301,7 @@ void InsetQuotes::Validate(LaTeXFeatures & features) const
        char type = quote_char[quote_index[side][language]];
 
        if (current_view->buffer()->GetLanguage() == "default" 
-           && lyxrc->fontenc != "T1") {
+           && lyxrc.fontenc != "T1") {
                if (times == InsetQuotes::SingleQ) 
                        switch (type) {
                        case ',': features.quotesinglbase = true; break;