X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetquotes.C;h=fe09f6e0479a2838012c611c67993d657a3f220f;hb=3c8aba3b556871fb1100a2f98cd93d5d4e3f70c9;hp=0982214fe2d525bf0b6403d99690af1a9532b510;hpb=1c9a8d27a26b5f76562914f0e81aa98334f8c06a;p=lyx.git

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index 0982214fe2..fe09f6e047 100644
--- 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,6 +23,10 @@
 #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.
@@ -80,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;
@@ -95,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):"
@@ -103,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);
@@ -160,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);
 }
 
 
@@ -177,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;
@@ -223,7 +224,7 @@ void InsetQuotes::Read(LyXLex & lex)
 }
 
 
-int InsetQuotes::Latex(ostream & os, signed char /*fragile*/, bool) const
+int InsetQuotes::Latex(ostream & os, bool /*fragile*/, bool) const
 {
 	string doclang = 
 		current_view->buffer()->GetLanguage();
@@ -249,6 +250,7 @@ int InsetQuotes::Latex(ostream & os, signed char /*fragile*/, bool) const
 
 	// 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] == '`')
@@ -263,6 +265,13 @@ int InsetQuotes::Latex(ostream & os, signed char /*fragile*/, bool) const
 }
 
 
+int InsetQuotes::Ascii(ostream & os) const
+{
+	os << "\"";
+	return 0;
+}
+
+
 int InsetQuotes::Linuxdoc(ostream & os) const
 {
 	os << "\"";