X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcommand.C;h=69322ae8905cc40caa50164553a0d2bf939f3760;hb=3c8aba3b556871fb1100a2f98cd93d5d4e3f70c9;hp=d6af5cc01726bac1657d714fc054773ee4473796;hpb=a0cf758d5a79140045c2a90e2ff5878e0b391bcc;p=lyx.git

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index d6af5cc017..69322ae890 100644
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.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.
  *
  * ====================================================== */
 
@@ -18,6 +18,10 @@
 #include "debug.h"
 #include "Painter.h"
 
+using std::ostream;
+using std::endl;
+
+
 InsetCommand::InsetCommand()
 {
 }
@@ -32,7 +36,6 @@ InsetCommand::InsetCommand(string const & cmd, string const & arg,
 
 int InsetCommand::ascent(Painter & pain, LyXFont const &) const
 {
-#if 1
 	LyXFont font(LyXFont::ALL_SANE);
 	font.decSize();
 	
@@ -48,17 +51,11 @@ int InsetCommand::ascent(Painter & pain, LyXFont const &) const
 			      false, width, ascent, descent);
 	}
 	return ascent;
-#else
-	LyXFont f = font;
-	f.decSize();
-	return f.maxAscent() + 3;
-#endif
 }
 
 
 int InsetCommand::descent(Painter & pain, LyXFont const &) const
 {
-#if 1
 	LyXFont font(LyXFont::ALL_SANE);
 	font.decSize();
 	
@@ -74,17 +71,11 @@ int InsetCommand::descent(Painter & pain, LyXFont const &) const
 			      false, width, ascent, descent);
 	}
 	return descent;
-#else
-	LyXFont f = font;
-	f.decSize();
-	return f.maxDescent() + 3;
-#endif
 }
 
 
 int InsetCommand::width(Painter & pain, LyXFont const &) const
 {
-#if 1
 	LyXFont font(LyXFont::ALL_SANE);
 	font.decSize();
 	
@@ -99,13 +90,7 @@ int InsetCommand::width(Painter & pain, LyXFont const &) const
 			      LColor::commandbg, LColor::commandframe,
 			      false, width, ascent, descent);
 	}
-	return width;
-#else
-	LyXFont f = font;
-	f.decSize();
-	string s = getScreenLabel();
-	return 10 + f.stringWidth(s);
-#endif
+	return width + 4;
 }
 
 
@@ -113,7 +98,6 @@ void InsetCommand::draw(Painter & pain, LyXFont const &,
 			int baseline, float & x) const
 {
 	// Draw it as a box with the LaTeX text
-#if 1
 	LyXFont font(LyXFont::ALL_SANE);
 	font.setColor(LColor::command).decSize();
 
@@ -121,50 +105,19 @@ void InsetCommand::draw(Painter & pain, LyXFont const &,
 	string s = getScreenLabel();
 
 	if (Editable()) {
-		pain.buttonText(int(x), baseline, s, font, true, width);
+		pain.buttonText(int(x)+2, baseline, s, font, true, width);
 	} else {
-		pain.rectText(int(x), baseline, s, font,
+		pain.rectText(int(x)+2, baseline, s, font,
 			      LColor::commandbg, LColor::commandframe,
 			      true, width);
 	}
 
-	x += width;
-#else
-		
-	x += 3;
-
-	pain.fillRectangle(int(x), baseline - ascent(pain, font) + 1,
-			   width(pain, font) - 6,
-			   ascent(pain, font) + descent(pain, font) - 2,
-			   LColor::insetbg);
-        // Tell whether this slows down the drawing  (ale)
-	// lets draw editable and non-editable insets differently
-        if (Editable()) {
-		int y = baseline - ascent(pain, font) + 1;
-		int w = width(pain, font) - 6;
-		int h = ascent(pain, font) + descent(pain, font) - 2;
-		pain.rectangle(int(x), y, w, h, LColor::insetframe);
-	} else {
-		
-		pain.rectangle(int(x), baseline - ascent(pain, font) + 1,
-			       width(pain, font) - 6,
-			       ascent(pain, font) + descent(pain, font) - 2,
-			       LColor::insetframe); 
-	}
-        string s = getScreenLabel();
-       	LyXFont f(font);
-	f.decSize();
-	f.setColor(LColor::none);
-	f.setLatex(LyXFont::OFF);
-	pain.text(int(x + 2), baseline, s, f);
-	
-	x +=  width(pain, font) - 3;
-#endif
+	x += width + 4;
 }
 
 
 // In lyxf3 this will be just LaTeX
-void InsetCommand::Write(ostream & os)
+void InsetCommand::Write(ostream & os) const
 {
 	os << "LatexCommand " << getCommand() << "\n";
 }
@@ -244,27 +197,26 @@ void InsetCommand::Read(LyXLex & lex)
 }
 
 
-int InsetCommand::Latex(ostream & os, signed char /*fragile*/)
+int InsetCommand::Latex(ostream & os, bool /*fragile*/, bool/*fs*/) const
 {
 	os << getCommand();
 	return 0;
 }
 
 
-int InsetCommand::Latex(string & file, signed char /*fragile*/)
+int InsetCommand::Ascii(ostream &) const
 {
-	file += getCommand();
 	return 0;
 }
 
 
-int InsetCommand::Linuxdoc(string &/*file*/)
+int InsetCommand::Linuxdoc(ostream &) const
 {
 	return 0;
 }
 
 
-int InsetCommand::DocBook(string &/*file*/)
+int InsetCommand::DocBook(ostream &) const
 {
 	return 0;
 }