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

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index d069cc2d6b..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.
  *
  * ====================================================== */
 
@@ -22,11 +22,15 @@
 #include "buffer.h"
 #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
@@ -80,7 +84,6 @@ InsetQuotes::InsetQuotes(char c, BufferParams const & params)
 	switch(c) {
 	case ' ': case '(': case '{': case '[': case '-': case ':':
 	case LyXParagraph::META_HFILL:
-	case LyXParagraph::META_PROTECTED_SEPARATOR:
 	case LyXParagraph::META_NEWLINE: 
 		side = InsetQuotes::LeftQ;   // left quote 
 		break;
@@ -92,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):"
@@ -100,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);
@@ -145,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 == ">>")
@@ -155,30 +159,30 @@ string InsetQuotes::DispString() const
 }
 
 
-int InsetQuotes::Ascent(LyXFont const & font) const
+int InsetQuotes::ascent(Painter &, LyXFont const & font) const
 {
-	return font.maxAscent();
+	return lyxfont::maxAscent(font);
 }
 
 
-int InsetQuotes::Descent(LyXFont const & font) const
+int InsetQuotes::descent(Painter &, LyXFont const & font) const
 {
-	return font.maxDescent();
+	return lyxfont::maxDescent(font);
 }
 
 
-int InsetQuotes::Width(LyXFont const & font) const
+int InsetQuotes::width(Painter &, LyXFont const & font) const
 {
 	string text = DispString();
 	int w = 0;
 
 	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;
@@ -193,17 +197,17 @@ LyXFont InsetQuotes::ConvertFont(LyXFont font)
 }
 
 
-void InsetQuotes::Draw(LyXFont font, LyXScreen & scr,
-		       int baseline, float & x)
+void InsetQuotes::draw(Painter & pain, LyXFont const & font,
+		       int baseline, float & x) const
 {
 	string text = DispString();
 
-	scr.drawString(font, text, baseline, int(x));
-	x += Width(font);
+	pain.text(int(x), baseline, text, font);
+	x += width(pain, font);
 }
 
 
-void InsetQuotes::Write(ostream & os)
+void InsetQuotes::Write(ostream & os) const
 {
 	string text;
 	text += language_char[language];
@@ -220,23 +224,14 @@ void InsetQuotes::Read(LyXLex & lex)
 }
 
 
-int InsetQuotes::Latex(ostream & os, signed char /*fragile*/)
-{
-	string quote;
-	int res = Latex(quote, 0);
-	os << quote;
-	return res;
-}
-
-
-int InsetQuotes::Latex(string & file, signed char /*fragile*/)
+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") {
@@ -254,35 +249,48 @@ int InsetQuotes::Latex(string & file, signed char /*fragile*/)
 		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)
+int InsetQuotes::Ascii(ostream & os) const
 {
-	file += "\"";
+	os << "\"";
+	return 0;
+}
+
 
+int InsetQuotes::Linuxdoc(ostream & os) const
+{
+	os << "\"";
 	return 0;
 }
 
 
-int InsetQuotes::DocBook(string & file)
+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;
 }
@@ -293,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;