X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetlatexaccent.C;h=a7cc82eb0a2061db79a51636950434e99e42336f;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=b98fd082c3db1debda12ce466f77687cfc5a87fc;hpb=132fe5e1322fbc86a32692df51eba78d6b4e479c;p=lyx.git

diff --git a/src/insets/insetlatexaccent.C b/src/insets/insetlatexaccent.C
index b98fd082c3..a7cc82eb0a 100644
--- a/src/insets/insetlatexaccent.C
+++ b/src/insets/insetlatexaccent.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  * 	 
  *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -18,22 +18,25 @@
 #include "debug.h"
 #include "lyxrc.h"
 #include "support/lstrings.h"
+#include "BufferView.h"
 #include "Painter.h"
+#include "font.h"
+#include "language.h"
 
-extern LyXRC * lyxrc;
+using std::ostream;
+using std::endl;
 
 /* LatexAccent. Proper handling of accented characters */
 /* This part is done by Ivan Schreter, schreter@ccsun.tuke.sk */
 /* Later modified by Lars G. Bjønnes, larsbj@lyx.org */
 
 InsetLatexAccent::InsetLatexAccent()
-{
-	candisp = false;
-}
+	: candisp(false)
+{}
 
 
-InsetLatexAccent::InsetLatexAccent(string const & string)
-	: contents(string)
+InsetLatexAccent::InsetLatexAccent(string const & str)
+	: contents(str)
 {
 	checkContents();
 }
@@ -44,7 +47,10 @@ void InsetLatexAccent::checkContents()
 {
         candisp = false;
 
-	if (contents.empty() || contents.length() < 2) return;
+	if (contents.empty() || contents.length() < 2) {
+		lyxerr[Debug::KEY] << "Cannot decode: " << contents << endl;
+		return;
+	}
 
 	// REMOVE IN 0.13
 	// Dirty Hack for backward compability. remove in 0.13 (Lgb)
@@ -84,7 +90,10 @@ void InsetLatexAccent::checkContents()
 			contents = tmp;
 		}
 	}
-        if (contents[0] != '\\') return; // demand that first char is a '\\'
+        if (contents[0] != '\\') { // demand that first char is a '\\'
+		lyxerr[Debug::KEY] << "Cannot decode: " << contents << endl;
+		return;
+	}
 
 	lyxerr[Debug::KEY] << "Decode: " << contents << endl;
 
@@ -178,7 +187,7 @@ void InsetLatexAccent::checkContents()
  		plusasc = true; // at the top (not really needed)
  		break;
 	default:
- 	        printf ("Default\n");
+		lyxerr[Debug::KEY] << "Default" << endl;
 		// unknow accent (or something else)
                 return;
         }
@@ -189,7 +198,7 @@ void InsetLatexAccent::checkContents()
 	// special clause for \i{}, \j{} \l{} and \L{}
 	if ((modtype == DOT_LESS_I || modtype == DOT_LESS_J
 	     || modtype == lSLASH || modtype == LSLASH)
-	    && contents[3] == '}' ) {
+	    && contents[3] == '}') {
 		switch (modtype) {
 		case DOT_LESS_I: ic = 'i'; break;
 		case DOT_LESS_J: ic = 'j'; break;
@@ -223,13 +232,13 @@ void InsetLatexAccent::checkContents()
 				remdot = true;
 			else
 				return;
-		} else if ( (ic == 'i'|| ic == 'j') && contents[4] == '}') {
+		} else if ((ic == 'i'|| ic == 'j') && contents[4] == '}') {
 			// Do a rewrite: \<foo>{i} --> \<foo>{\i}
 			string temp = contents;
 			temp.erase(3, string::npos);
 			temp += '\\';
 			temp += char(ic);
-			for(string::size_type j = 4;
+			for (string::size_type j = 4;
 			    j < contents.length(); ++j)
 				temp+= contents[j];
 			contents= temp;
@@ -252,7 +261,7 @@ void InsetLatexAccent::checkContents()
 }
 
 
-int InsetLatexAccent::ascent(Painter &, LyXFont const & font) const
+int InsetLatexAccent::ascent(BufferView *, LyXFont const & font) const
 {
 	// This function is a bit too simplistix and is just a
 	// "try to make a fit for all accents" approach, to
@@ -261,55 +270,55 @@ int InsetLatexAccent::ascent(Painter &, LyXFont const & font) const
 	int max;
 	if (candisp) {
 		if (ic == ' ')
-			max = font.ascent('a');
+			max = lyxfont::ascent('a', font);
 		else
-			max = font.ascent(ic);
+			max = lyxfont::ascent(ic, font);
 		if (plusasc) 
-			max += (font.maxAscent() + 3) / 3;
+			max += (lyxfont::maxAscent(font) + 3) / 3;
 	} else
-		max = font.maxAscent() + 4;
+		max = lyxfont::maxAscent(font) + 4;
 	return max;
 }
 
 
-int InsetLatexAccent::descent(Painter &, LyXFont const & font) const
+int InsetLatexAccent::descent(BufferView *, LyXFont const & font) const
 {
 	int max;
 	if (candisp) {
 		if (ic == ' ') 
-			max = font.descent('a');
+			max = lyxfont::descent('a', font);
                 else
-                	max = font.descent(ic);
+                	max = lyxfont::descent(ic, font);
                 if (plusdesc)
                 	max += 3;
 	} else
-		max = font.maxDescent() + 4;
+		max = lyxfont::maxDescent(font) + 4;
 	return max;
 }
 
 
-int InsetLatexAccent::width(Painter &, LyXFont const & font) const
+int InsetLatexAccent::width(BufferView *, LyXFont const & font) const
 {
 	if (candisp)
-		return font.textWidth(&ic, 1);
+		return lyxfont::width(ic, font);
         else
-                return font.stringWidth(contents) + 4;
+                return lyxfont::width(contents, font) + 4;
 }
 
 
-int InsetLatexAccent::Lbearing(LyXFont const & font) const
+int InsetLatexAccent::lbearing(LyXFont const & font) const
 {
-	return font.lbearing(ic);
+	return lyxfont::lbearing(ic, font);
 }
 
 
-int InsetLatexAccent::Rbearing(LyXFont const & font) const
+int InsetLatexAccent::rbearing(LyXFont const & font) const
 {
-	return font.rbearing(ic);
+	return lyxfont::rbearing(ic, font);
 }
 
 
-bool InsetLatexAccent::DisplayISO8859_9(Painter & pain, LyXFont const & font,
+bool InsetLatexAccent::displayISO8859_9(BufferView * bv, LyXFont const & font,
 					int baseline, 
 					float & x) const
 {
@@ -343,8 +352,8 @@ bool InsetLatexAccent::DisplayISO8859_9(Painter & pain, LyXFont const & font,
 	}
 	if (tmpic != ic) {
 		char ch = char(tmpic);
-		pain.text(x, baseline, ch, font);
-		x += width(pain, font);
+		bv->painter().text(int(x), baseline, ch, font);
+		x += width(bv, font);
 		return true;
 	}
 	else
@@ -352,28 +361,34 @@ bool InsetLatexAccent::DisplayISO8859_9(Painter & pain, LyXFont const & font,
 }
 
 
-void InsetLatexAccent::draw(Painter & pain, LyXFont const & font,
-			    int baseline, float & x) const
+void InsetLatexAccent::draw(BufferView * bv, LyXFont const & font0,
+			    int baseline, float & x, bool) const
 {
-	if (lyxrc->font_norm == "iso8859-9")
-		if (DisplayISO8859_9(pain, font, baseline, x))	
+	Painter & pain = bv->painter();
+
+	if (lyxrc.font_norm_type == LyXRC::ISO_8859_9)
+		if (displayISO8859_9(bv, font0, baseline, x))	
 			return;
 	
 	/* draw it! */ 
 	// All the manually drawn accents in this function could use an
 	// overhaul. Different ways of drawing (what metrics to use)
 	// should also be considered.
+
+	LyXFont font(font0);
+	if (lyxrc.font_norm_type == LyXRC::ISO_10646_1)
+		font.setLanguage(english_language);
 	
 	if (candisp) {
-		int asc = ascent(pain, font);
-		int desc = descent(pain, font);
-		int wid = width(pain, font);
-		float x2 = x + (Rbearing(font) - Lbearing(font)) / 2.0;
+		int asc = ascent(bv, font);
+		int desc = descent(bv, font);
+		int wid = width(bv, font);
+		float x2 = x + (rbearing(font) - lbearing(font)) / 2.0;
 		float hg;
 		int y;
 		if (plusasc) {
 			// mark at the top
-			hg = font.maxDescent();
+			hg = lyxfont::maxDescent(font);
 			y = baseline - asc;
 
 			if (font.shape() == LyXFont::ITALIC_SHAPE)
@@ -391,23 +406,23 @@ void InsetLatexAccent::draw(Painter & pain, LyXFont const & font,
 		pain.text(int(x), baseline, ic, font);
 
 		if (remdot) {
-			int tmpvar = baseline - font.ascent('i');
+			int tmpvar = baseline - lyxfont::ascent('i', font);
 			float tmpx = 0;
 			if (font.shape() == LyXFont::ITALIC_SHAPE)
 				tmpx += (8.0 * hg) / 10.0; // italic
 			lyxerr[Debug::KEY] << "Removing dot." << endl;
 			// remove the dot first
 			pain.fillRectangle(int(x + tmpx), tmpvar, wid,
-					   font.ascent('i') -
-					   font.ascent('x') - 1,
-					   LColor::background);
+					   lyxfont::ascent('i', font) -
+					   lyxfont::ascent('x', font) - 1,
+					   backgroundColor());
 			// the five lines below is a simple hack to
 			// make the display of accent 'i' and 'j'
 			// better. It makes the accent be written
 			// closer to the top of the dot-less 'i' or 'j'.
 			char tmpic = ic; // store the ic when we
 			ic = 'x';        // calculates the ascent of
-			asc = ascent(pain, font); // the dot-less version (here: 'x')
+			asc = ascent(bv, font); // the dot-less version (here: 'x')
 			ic = tmpic;      // set the orig ic back
 			y = baseline - asc; // update to new y coord.
 		}
@@ -415,160 +430,80 @@ void InsetLatexAccent::draw(Painter & pain, LyXFont const & font,
 		switch (modtype) {
 		case ACUTE:     // acute 0xB4
  		{
-#if 0
-			pain.line(int(x2), int(y + hg),
-				  int(x2 + hg35), y + hg35);
-#else
-			pain.text(x2 - (font.rbearing(0xB4) - font.lbearing(0xB4)) / 2,
-				  baseline - font.ascent(ic) - font.descent(0xB4) - (font.ascent(0xB4) + font.descent(0xB4)) / 2,
+			pain.text(int(x2 - (lyxfont::rbearing(0xB4, font) - lyxfont::lbearing(0xB4, font)) / 2),
+				  baseline - lyxfont::ascent(ic, font) - lyxfont::descent(0xB4, font) - (lyxfont::ascent(0xB4, font) + lyxfont::descent(0xB4, font)) / 2,
 				  char(0xB4), font);
-#endif
 			break;
 		}
 		case GRAVE:     // grave 0x60
 		{
-#if 0
-			pain.line(int(x2), int(y + hg),
-				  int(x2 - hg35), y + hg35);
-#else
-			pain.text(x2 - (font.rbearing(0x60) - font.lbearing(0x60)) / 2,
-				  baseline - font.ascent(ic) - font.descent(0x60) - (font.ascent(0x60) + font.descent(0x60)) / 2.0,
+			pain.text(int(x2 - (lyxfont::rbearing(0x60, font) - lyxfont::lbearing(0x60, font)) / 2),
+				  int(baseline - lyxfont::ascent(ic, font) - lyxfont::descent(0x60, font) - (lyxfont::ascent(0x60, font) + lyxfont::descent(0x60, font)) / 2.0),
 				  char(0x60), font);
-#endif
 			break;
 		}
 		case MACRON:     // macron
 		{
-#if 0
-			pain.line(int(x2 - wid * 0.4),
-				  int(y + hg),
-				  int(x2 + wid * 0.4),
-				  int(y + hg));
-#else
-			pain.text(x2 - (font.rbearing(0xAF) - font.lbearing(0xAF)) / 2,
-				  baseline - font.ascent(ic) - font.descent(0xAF) - (font.ascent(0xAF) + font.descent(0xAF)),
+			pain.text(int(x2 - (lyxfont::rbearing(0xAF, font) - lyxfont::lbearing(0xAF, font)) / 2),
+				  baseline - lyxfont::ascent(ic, font) - lyxfont::descent(0xAF, font) - (lyxfont::ascent(0xAF, font) + lyxfont::descent(0xAF, font)),
 				  char(0xAF), font);
-#endif
 			break;
 		}
 		case TILDE:     // tilde
 		{
-#if 0
-			if (hg35 > 2.0) hg35 -= 1.0;
-			x2 += (hg35 / 2.0);
-			int xp[4], yp[4];
-			
-			xp[0] = int(x2 - 2.0 * hg35);
-			yp[0] = int(y + hg);
-			
-			xp[1] = int(x2 - hg35);
-			yp[1] = int(y + hg35);
-			
-			xp[2] = int(x2);
-			yp[2] = int(y + hg);
-			
-			xp[3] = int(x2 + hg35);
-			yp[3] = int(y + hg35);
-			
-			pain.lines(xp, yp, 4);
-#else
-			pain.text(x2 - (font.rbearing('~') - font.lbearing('~')) / 2,
-				  baseline - font.ascent(ic) - font.descent('~') - (font.ascent('~') + font.descent('~')) / 2,
+			pain.text(int(x2 - (lyxfont::rbearing('~', font) - lyxfont::lbearing('~', font)) / 2),
+				  baseline - lyxfont::ascent(ic, font) - lyxfont::descent('~', font) - (lyxfont::ascent('~', font) + lyxfont::descent('~', font)) / 2,
 				  '~', font);
-#endif
 			break;
 		}
 		case UNDERBAR:     // underbar 0x5F
 		{
-#if 0
-			pain.line(int(x2 - wid * 0.4),
-				  y + hg / 2.0,
-				  int(x2 + wid * 0.4),
-				  y + hg / 2.0);
-#else
-			pain.text(x2 - (font.rbearing(0x5F) - font.lbearing(0x5F)) / 2, baseline,
+			pain.text(int(x2 - (lyxfont::rbearing(0x5F, font) - lyxfont::lbearing(0x5F, font)) / 2), baseline,
 				  char(0x5F), font);
-#endif
 			break;
 		}
 		case CEDILLA:     // cedilla
 		{
-#if 0
-			int xp[4], yp[4];
-			
-			xp[0] = int(x2);
-			yp[0] = y;
-			
-			xp[1] = int(x2);
-			yp[1] = y + int(hg / 3.0);
-			
-			xp[2] = int(x2 + (hg / 3.0));
-			yp[2] = y + int(hg / 2.0);
-			
-			xp[3] = int(x2 - (hg / 4.0));
-			yp[3] = y + int(hg);
-
-			pain.lines(xp, yp, 4);
-#else
-			pain.text(x2 - (font.rbearing(0xB8) - font.lbearing(0xB8)) / 2, baseline,
+			pain.text(int(x2 - (lyxfont::rbearing(0xB8, font) - lyxfont::lbearing(0xB8, font)) / 2), baseline,
 				  char(0xB8), font);
 			
-#endif
 			break;
 		}
 		case UNDERDOT:     // underdot
 		{
-#if 0
-			pain.arc(int(x2), y + hg35,
-				     3, 3, 0, 360 * 64);
-#else
-			pain.text(x2 - (font.rbearing('.') - font.lbearing('.')) / 2.0,
-				  baseline + 3.0 / 2.0 * (font.ascent('.') + font.descent('.')),
+			pain.text(int(x2 - (lyxfont::rbearing('.', font) - lyxfont::lbearing('.', font)) / 2.0),
+				  int(baseline + 3.0 / 2.0 * (lyxfont::ascent('.', font) + lyxfont::descent('.', font))),
 				  '.', font);
-#endif
 			break;
 		}
 
 		case DOT:    // dot
 		{
-#if 0
-			pain.arc(int(x2), y + hg * 0.5,
-				     (hg + 3.0)/5.0,
-				     (hg + 3.0)/5.0,
-				     0, 360 * 64);
-#else
-			pain.text(x2 - (font.rbearing('.') - font.lbearing('.')) / 2.0,
-				  baseline - font.ascent(ic) - font.descent('.') - (font.ascent('.') + font.descent('.')) / 2,
+			pain.text(int(x2 - (lyxfont::rbearing('.', font) - lyxfont::lbearing('.', font)) / 2.0),
+				  baseline - lyxfont::ascent(ic, font) - lyxfont::descent('.', font) - (lyxfont::ascent('.', font) + lyxfont::descent('.', font)) / 2,
 				  '.', font);
-#endif
 			break;
 		}
 
 		case CIRCLE:     // circle
 		{
-#if 0
-			pain.arc(int(x2 - (hg / 2.0)),
-				 y + (hg / 2.0), hg, hg , 0,
-				 360 * 64);
-#else
 			LyXFont tmpf(font);
 			tmpf.decSize().decSize();
-			pain.text(x2 - (tmpf.rbearing(0xB0) - tmpf.lbearing(0xB0)) / 2.0,
-				  baseline - font.ascent(ic) - tmpf.descent(0xB0) - (tmpf.ascent(0xB0) + tmpf.descent(0xB0)) / 3.0,
+			pain.text(int(x2 - (lyxfont::rbearing(0xB0, tmpf) - lyxfont::lbearing(0xB0, tmpf)) / 2.0),
+				  int(baseline - lyxfont::ascent(ic, font) - lyxfont::descent(0xB0, tmpf) - (lyxfont::ascent(0xB0, tmpf) + lyxfont::descent(0xB0, tmpf)) / 3.0),
 				  char(0xB0), tmpf);
-#endif
 			break;
 		}
 		case TIE:     // tie
 		{
-			pain.arc(int(x2 + hg35), y + hg / 2.0,
-				 2 * hg, hg, 0, 360 * 32);
+			pain.arc(int(x2 + hg35), int(y + hg / 2.0),
+				 int(2 * hg), int(hg), 0, 360 * 32);
 			break;
 		}
 		case BREVE:     // breve
 		{
 			pain.arc(int(x2 - (hg / 2.0)), y,
-				 hg, hg, 0, -360*32);
+				 int(hg), int(hg), 0, -360*32);
 			break;
 		}
 		case CARON:    // caron
@@ -602,76 +537,28 @@ void InsetLatexAccent::draw(Painter & pain, LyXFont const & font,
 		}
 		case HUNGARIAN_UMLAUT:    // hung. umlaut
 		{
-#if 0
-			int xs1[2], xs2[2], ys1[2], ys2[2];
-			
-			xs1[0] = int(x2 - (hg / 2.0));
-			ys1[0] = int(y + hg);
-			
-			xs2[0] = int(x2 + hg35 - (hg / 2.0));
-			ys2[0] = int(y + hg35);
-			
-			xs1[1] = int(x2 + (hg / 2.0));
-			ys1[1] = int(y + hg);
-			
-			xs2[1] = int(x2 + hg35 + (hg / 2.0));
-			ys2[1] = int(y + hg35);
-
-			pain.segments(xs1, ys1, xs2, ys2, 2);
-#else
-			pain.text(x2 - (font.rbearing('´') - font.lbearing('´')),
-				  baseline - font.ascent(ic) - font.descent('´') - (font.ascent('´') + font.descent('´')) / 2,
+			pain.text(int(x2 - (lyxfont::rbearing('´', font) - lyxfont::lbearing('´', font))),
+				  baseline - lyxfont::ascent(ic, font) - lyxfont::descent('´', font) - (lyxfont::ascent('´', font) + lyxfont::descent('´', font)) / 2,
 				  '´', font);
-			pain.text(x2,
-				  baseline - font.ascent(ic) - font.descent('´') - (font.ascent('´') + font.descent('´')) / 2,
+			pain.text(int(x2),
+				  baseline - lyxfont::ascent(ic, font) - lyxfont::descent('´', font) - (lyxfont::ascent('´', font) + lyxfont::descent('´', font)) / 2,
 				  '´', font);
-#endif
 			break;
 		}
 		case UMLAUT:    // umlaut
 		{
-#if 0
-			float rad = hg / 2.0;
-			if (rad <= 1.0) {
-				pain.point(int(x2 - 4.0 * hg / 7.0),
-					   y + hg35);
-				pain.point(int(x2 + 4.0 * hg / 7.0),
-					   y + hg35);
-			} else {
-				rad += .5; // this ensures that f.ex. 1.5 will
-				// not be rounded down to .5 and then
-				// converted to int = 0
-				pain.arc(int(x2 - 2.0 * hg / 4.0),
-					     y + hg35,
-					     rad, rad,
-					     0, 360 * 64);
-				pain.arc(int(x2 + 2.0 * hg / 4.0),
-					    y + hg35,
-					    rad, rad, 0, 360*64);
-			}
-#else
-			pain.text(x2 - (font.rbearing('¨') - font.lbearing('¨')) / 2,
-				  baseline - font.ascent(ic) - font.descent('¨') - ( font.ascent('¨') + font.descent('¨')) / 2,
+			pain.text(int(x2 - (lyxfont::rbearing('¨', font) - lyxfont::lbearing('¨', font)) / 2),
+				  baseline - lyxfont::ascent(ic, font) - lyxfont::descent('¨', font) - (lyxfont::ascent('¨', font) + lyxfont::descent('¨', font)) / 2,
 				  '¨', font);
-#endif
 			break;
 		}
 		case CIRCUMFLEX:    // circumflex
 		{
-#if 0
-			int xp[3], yp[3];
-			
-			xp[0] = int(x2 - hg35); yp[0] = y + int(hg);
-			xp[1] = int(x2);        yp[1] = int(y + hg35);
-			xp[2] = int(x2 + hg35); yp[2] = y + int(hg);
-			pain.lines(xp, yp, 3);
-#else
 			LyXFont tmpf(font);
 			tmpf.decSize().decSize().decSize();
-			pain.text(x2 - (tmpf.rbearing(0x5E) - tmpf.lbearing(0x5E)) / 2,
-				  baseline - font.ascent(ic) - tmpf.descent(0x5E) - (tmpf.ascent(0x5E) + tmpf.descent(0x5E)) / 3.0,
+			pain.text(int(x2 - (lyxfont::rbearing(0x5E, tmpf) - lyxfont::lbearing(0x5E, tmpf)) / 2),
+				  int(baseline - lyxfont::ascent(ic, font) - lyxfont::descent(0x5E, tmpf) - (lyxfont::ascent(0x5E, tmpf) + lyxfont::descent(0x5E, tmpf)) / 3.0),
 				  char(0x5E), tmpf);
-#endif
 			break;
 		}
 		case OGONEK:    // ogonek
@@ -718,97 +605,82 @@ void InsetLatexAccent::draw(Painter & pain, LyXFont const & font,
 		}
 	} else {
 		pain.fillRectangle(int(x + 1),
-				   baseline - ascent(pain, font) + 1,
-				   width(pain, font) - 2,
-				   ascent(pain, font)
-				   + descent(pain, font) - 2);
-		pain.rectangle(int(x + 1), baseline - ascent(pain, font) + 1,
-			       width(pain, font) - 2,
-			       ascent(pain, font) + descent(pain, font) - 2);
+				   baseline - ascent(bv, font) + 1,
+				   width(bv, font) - 2,
+				   ascent(bv, font)
+				   + descent(bv, font) - 2,
+				   backgroundColor());
+		pain.rectangle(int(x + 1), baseline - ascent(bv, font) + 1,
+			       width(bv, font) - 2,
+			       ascent(bv, font) + descent(bv, font) - 2);
 		pain.text(int(x + 2), baseline, contents, font);
 	}
-	x +=  width(pain, font);
+	x +=  width(bv, font);
 }
 
 
-void InsetLatexAccent::Write(ostream & os) const
+void InsetLatexAccent::write(Buffer const *, ostream & os) const
 {
 	os << "\\i " << contents << "\n";
 }
 
 
-void InsetLatexAccent::Read(LyXLex & lex)
+void InsetLatexAccent::read(Buffer const *, LyXLex & lex)
 {
-	lex.EatLine();
-	contents = lex.GetString();
+	lex.eatLine();
+	contents = lex.getString();
 	checkContents();
 }
 
 
-int InsetLatexAccent::Latex(ostream & os, signed char /*fragile*/, bool/*fs*/) const
+int InsetLatexAccent::latex(Buffer const *, ostream & os,
+			    bool /*fragile*/, bool/*fs*/) const
 {
 	os << contents;
 	return 0;
 }
 
 
-#ifndef USE_OSTREAM_ONLY
-int InsetLatexAccent::Latex(string & file, signed char /*fragile*/, bool /*fs*/) const
-{
-	file += contents;
-	return 0;
-}
-
-
-int InsetLatexAccent::Linuxdoc(string & file) const
+int InsetLatexAccent::ascii(Buffer const *, ostream & os, int) const
 {
-	file += contents;
-	return 0;
-}
-
-
-int InsetLatexAccent::DocBook(string & file) const
-{
-	file += contents;
+	os << contents;
 	return 0;
 }
 
-#else
 
-int InsetLatexAccent::Linuxdoc(ostream & os) const
+int InsetLatexAccent::linuxdoc(Buffer const *, ostream & os) const
 {
 	os << contents;
 	return 0;
 }
 
 
-int InsetLatexAccent::DocBook(ostream & os) const
+int InsetLatexAccent::docbook(Buffer const *, ostream & os) const
 {
 	os << contents;
 	return 0;
 }
-#endif
 
 
-bool InsetLatexAccent::Deletable() const
+bool InsetLatexAccent::deletable() const
 {
 	return true;
 }
 
 
-bool InsetLatexAccent::DirectWrite() const
+bool InsetLatexAccent::directWrite() const
 {
 	return true;
 }
 
 
-Inset * InsetLatexAccent::Clone() const
+Inset * InsetLatexAccent::clone(Buffer const &, bool) const
 {
 	return new InsetLatexAccent(contents);
 }
 
 
-Inset::Code InsetLatexAccent::LyxCode() const
+Inset::Code InsetLatexAccent::lyxCode() const
 {
 	return Inset::ACCENT_CODE;
 }